Skip to content

Commit

Permalink
Merge pull request #45 from jadson179/develop
Browse files Browse the repository at this point in the history
## VERSÃO 1.0.8
  • Loading branch information
gtjadsonsantos authored Jun 12, 2020
2 parents 83b9d6c + 2825ec4 commit 8b72ae7
Show file tree
Hide file tree
Showing 183 changed files with 1,333 additions and 506 deletions.
Binary file added .Dockerfile.swp
Binary file not shown.
9 changes: 4 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#FROM node:10.21.0
FROM node:10-alpine
FROM node:10.21.0

#BEGIN BACKEND
RUN mkdir -p /backend
COPY ./backend /backend
WORKDIR /backend
RUN yarn global add sqlite3 && yarn global add node-pre-gyp && yarn && yarn add axios body-parser cors express jsonwebtoken knex multer socket.io sqlite sqlite3
#END BACKEND

Expand All @@ -13,7 +11,8 @@ RUN mkdir -p /frontend
COPY ./frontend /frontend
RUN cd /frontend && yarn && yarn build && rm -rf /frontend
#END FRONTEND

EXPOSE 3333

CMD [ "yarn","start"]
WORKDIR /backend

CMD [ "yarn","start"]
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ Faça o download do repositório
git clone https://github.com/jadson179/PAINEL.git
```

### CONFIGURE ALGUMAS VARIÁVEIS DE AMBIENTE NO FRONTEND
### CONFIGURE ALGUMAS VARIÁVEIS DE AMBIENTE NO [docker-compose.yml](docker-compose.yml)

Essa configuração permite que o frontend conheça o backend do painel e juntamente a isso, a configuração da api de tempo do yahoo. É necessário ter uma conta de desenvolvedor no yahoo e criar um app na plataforma para ter acesso aos dados de configuração para a api. [Criar Conta](https://developer.yahoo.com/api/)


```Dockerfile
# docker-compose.yml
# docker-compose.yml

## Visualização da configuração que deve ser previamente feita

Expand All @@ -68,10 +68,10 @@ Essa configuração permite que o frontend conheça o backend do painel e juntam
Retorne a raiz do projeto e suba o container da aplicação

```bash
docker-compose up --build -d
docker-compose up -d
```

`Acesse`: http://0.0.0.0:8080
`Acesse`: http://0.0.0.0:3333


### AUTENTICAÇÃO INICIAL
Expand Down
17 changes: 17 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,20 @@ a ação irá duplicar o usuário administrador e assim o servidor irá para de
## VERSÂO 1.0.7

* Update Interface web.

## VERSÃO 1.0.8

**BACKEND**
* Refatoração do backend
* * Armazenamento das imagens de previsão do tempo no backend do painel
* * Melhorias nos controllers
* * Leitura de variáveis de ambiente caso existam

**FRONTEND**
* Funcionaliade para gestão de andares
* Refatoração do frontend
* * Alterado endereço das imagens da api de previsão do tempo, para pegar na propria aplicação
* * Retirado a responsabilidade do componente administração gerenciar/manter o estado do menu, foi incluido o redux para o mesmo
* Funcionalidade para mudar a cor da aplicação


22 changes: 11 additions & 11 deletions backend/build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"files": {
"main.css": "/static/css/main.d752ac21.chunk.css",
"main.js": "/static/js/main.9146634a.chunk.js",
"main.js.map": "/static/js/main.9146634a.chunk.js.map",
"main.css": "/static/css/main.3393c3b5.chunk.css",
"main.js": "/static/js/main.48fbb9f3.chunk.js",
"main.js.map": "/static/js/main.48fbb9f3.chunk.js.map",
"runtime-main.js": "/static/js/runtime-main.fc75219d.js",
"runtime-main.js.map": "/static/js/runtime-main.fc75219d.js.map",
"static/js/2.cee3160d.chunk.js": "/static/js/2.cee3160d.chunk.js",
"static/js/2.cee3160d.chunk.js.map": "/static/js/2.cee3160d.chunk.js.map",
"static/js/2.14780ccd.chunk.js": "/static/js/2.14780ccd.chunk.js",
"static/js/2.14780ccd.chunk.js.map": "/static/js/2.14780ccd.chunk.js.map",
"index.html": "/index.html",
"precache-manifest.ca88da5e340ea324f602ae4fb2bbb9c6.js": "/precache-manifest.ca88da5e340ea324f602ae4fb2bbb9c6.js",
"precache-manifest.d8f72a256ab81f4e8ed31db078c93839.js": "/precache-manifest.d8f72a256ab81f4e8ed31db078c93839.js",
"service-worker.js": "/service-worker.js",
"static/css/main.d752ac21.chunk.css.map": "/static/css/main.d752ac21.chunk.css.map",
"static/js/2.cee3160d.chunk.js.LICENSE.txt": "/static/js/2.cee3160d.chunk.js.LICENSE.txt"
"static/css/main.3393c3b5.chunk.css.map": "/static/css/main.3393c3b5.chunk.css.map",
"static/js/2.14780ccd.chunk.js.LICENSE.txt": "/static/js/2.14780ccd.chunk.js.LICENSE.txt"
},
"entrypoints": [
"static/js/runtime-main.fc75219d.js",
"static/js/2.cee3160d.chunk.js",
"static/css/main.d752ac21.chunk.css",
"static/js/main.9146634a.chunk.js"
"static/js/2.14780ccd.chunk.js",
"static/css/main.3393c3b5.chunk.css",
"static/js/main.48fbb9f3.chunk.js"
]
}
2 changes: 1 addition & 1 deletion backend/build/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css" media="all" rel="stylesheet"><title>Painel de Salas</title><link href="/static/css/main.d752ac21.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,f,l=r[0],i=r[1],a=r[2],c=0,s=[];c<l.length;c++)f=l[c],Object.prototype.hasOwnProperty.call(o,f)&&o[f]&&s.push(o[f][0]),o[f]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=f(f.s=t[0]))}return e}var n={},o={1:0},u=[];function f(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.m=e,f.c=n,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,r){if(1&r&&(e=f(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)f.d(t,n,function(r){return e[r]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var l=this.webpackJsonpfrontend=this.webpackJsonpfrontend||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var a=0;a<l.length;a++)r(l[a]);var p=i;t()}([])</script><script src="/static/js/2.cee3160d.chunk.js"></script><script src="/static/js/main.9146634a.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css" media="all" rel="stylesheet"><title>Painel de Salas</title><link href="/static/css/main.3393c3b5.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,f,l=r[0],i=r[1],a=r[2],c=0,s=[];c<l.length;c++)f=l[c],Object.prototype.hasOwnProperty.call(o,f)&&o[f]&&s.push(o[f][0]),o[f]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=f(f.s=t[0]))}return e}var n={},o={1:0},u=[];function f(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.m=e,f.c=n,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,r){if(1&r&&(e=f(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)f.d(t,n,function(r){return e[r]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var l=this.webpackJsonpfrontend=this.webpackJsonpfrontend||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var a=0;a<l.length;a++)r(l[a]);var p=i;t()}([])</script><script src="/static/js/2.14780ccd.chunk.js"></script><script src="/static/js/main.48fbb9f3.chunk.js"></script></body></html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "84f8b09753e2008d437ba254a9026c3b",
"url": "/index.html"
},
{
"revision": "ad59d9d756f822220f67",
"url": "/static/css/main.07beb1d1.chunk.css"
},
{
"revision": "521e7788b8bcb8340b81",
"url": "/static/js/2.c7dc53fc.chunk.js"
},
{
"revision": "d99dc0b0a88053e0f18d3e0d5e386ee4",
"url": "/static/js/2.c7dc53fc.chunk.js.LICENSE.txt"
},
{
"revision": "ad59d9d756f822220f67",
"url": "/static/js/main.d92aab34.chunk.js"
},
{
"revision": "68a9665f6992de0c4239",
"url": "/static/js/runtime-main.fc75219d.js"
}
]);
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "75fc9d03de9ab1c43acc766e79397692",
"url": "/index.html"
},
{
"revision": "f33ce3936b0cfde74162",
"url": "/static/css/main.10a7dfc8.chunk.css"
},
{
"revision": "c52f24b82e2985846aa9",
"url": "/static/js/2.14780ccd.chunk.js"
},
{
"revision": "d99dc0b0a88053e0f18d3e0d5e386ee4",
"url": "/static/js/2.14780ccd.chunk.js.LICENSE.txt"
},
{
"revision": "f33ce3936b0cfde74162",
"url": "/static/js/main.6616a40c.chunk.js"
},
{
"revision": "68a9665f6992de0c4239",
"url": "/static/js/runtime-main.fc75219d.js"
}
]);
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "7605a7ff0b0e52c489fa9652798b4844",
"url": "/index.html"
},
{
"revision": "73fcbd4b45e32d50ccf9",
"url": "/static/css/main.07beb1d1.chunk.css"
},
{
"revision": "521e7788b8bcb8340b81",
"url": "/static/js/2.c7dc53fc.chunk.js"
},
{
"revision": "d99dc0b0a88053e0f18d3e0d5e386ee4",
"url": "/static/js/2.c7dc53fc.chunk.js.LICENSE.txt"
},
{
"revision": "73fcbd4b45e32d50ccf9",
"url": "/static/js/main.d49a7899.chunk.js"
},
{
"revision": "68a9665f6992de0c4239",
"url": "/static/js/runtime-main.fc75219d.js"
}
]);
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "7e5e2e35bb57c1948f5a781b813022d8",
"url": "/index.html"
},
{
"revision": "0d1c5b7092b25431202a",
"url": "/static/css/main.10a7dfc8.chunk.css"
},
{
"revision": "c52f24b82e2985846aa9",
"url": "/static/js/2.14780ccd.chunk.js"
},
{
"revision": "d99dc0b0a88053e0f18d3e0d5e386ee4",
"url": "/static/js/2.14780ccd.chunk.js.LICENSE.txt"
},
{
"revision": "0d1c5b7092b25431202a",
"url": "/static/js/main.607da80d.chunk.js"
},
{
"revision": "68a9665f6992de0c4239",
"url": "/static/js/runtime-main.fc75219d.js"
}
]);
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "a562670a95d058d9742dacc1682ae6cb",
"url": "/index.html"
},
{
"revision": "1038e6ecc309d9b2d2a7",
"url": "/static/css/main.10a7dfc8.chunk.css"
},
{
"revision": "c52f24b82e2985846aa9",
"url": "/static/js/2.14780ccd.chunk.js"
},
{
"revision": "d99dc0b0a88053e0f18d3e0d5e386ee4",
"url": "/static/js/2.14780ccd.chunk.js.LICENSE.txt"
},
{
"revision": "1038e6ecc309d9b2d2a7",
"url": "/static/js/main.d5f2fd7e.chunk.js"
},
{
"revision": "68a9665f6992de0c4239",
"url": "/static/js/runtime-main.fc75219d.js"
}
]);
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "d97b13359238119fcdf6b31a82c176e5",
"url": "/index.html"
},
{
"revision": "a3d941671ce3dce70488",
"url": "/static/css/main.10a7dfc8.chunk.css"
},
{
"revision": "c52f24b82e2985846aa9",
"url": "/static/js/2.14780ccd.chunk.js"
},
{
"revision": "d99dc0b0a88053e0f18d3e0d5e386ee4",
"url": "/static/js/2.14780ccd.chunk.js.LICENSE.txt"
},
{
"revision": "a3d941671ce3dce70488",
"url": "/static/js/main.c75043b7.chunk.js"
},
{
"revision": "68a9665f6992de0c4239",
"url": "/static/js/runtime-main.fc75219d.js"
}
]);
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "73877fe11f4c4acc00f8c49b905e6e2b",
"url": "/index.html"
},
{
"revision": "599ed5d69e06120abe92",
"url": "/static/css/main.10a7dfc8.chunk.css"
},
{
"revision": "c52f24b82e2985846aa9",
"url": "/static/js/2.14780ccd.chunk.js"
},
{
"revision": "d99dc0b0a88053e0f18d3e0d5e386ee4",
"url": "/static/js/2.14780ccd.chunk.js.LICENSE.txt"
},
{
"revision": "599ed5d69e06120abe92",
"url": "/static/js/main.7f8a005c.chunk.js"
},
{
"revision": "68a9665f6992de0c4239",
"url": "/static/js/runtime-main.fc75219d.js"
}
]);
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "d9d7dcf95edf263a7d40782eed824ab6",
"url": "/index.html"
},
{
"revision": "d75a57051d12143f22cd",
"url": "/static/css/main.3393c3b5.chunk.css"
},
{
"revision": "c52f24b82e2985846aa9",
"url": "/static/js/2.14780ccd.chunk.js"
},
{
"revision": "d99dc0b0a88053e0f18d3e0d5e386ee4",
"url": "/static/js/2.14780ccd.chunk.js.LICENSE.txt"
},
{
"revision": "d75a57051d12143f22cd",
"url": "/static/js/main.0b22df15.chunk.js"
},
{
"revision": "68a9665f6992de0c4239",
"url": "/static/js/runtime-main.fc75219d.js"
}
]);
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "fe1f13e5df5e18bb3fde0d7f4324c502",
"url": "/index.html"
},
{
"revision": "29157614f9223f363f1a",
"url": "/static/css/main.07beb1d1.chunk.css"
},
{
"revision": "521e7788b8bcb8340b81",
"url": "/static/js/2.c7dc53fc.chunk.js"
},
{
"revision": "d99dc0b0a88053e0f18d3e0d5e386ee4",
"url": "/static/js/2.c7dc53fc.chunk.js.LICENSE.txt"
},
{
"revision": "29157614f9223f363f1a",
"url": "/static/js/main.0dd0ef57.chunk.js"
},
{
"revision": "68a9665f6992de0c4239",
"url": "/static/js/runtime-main.fc75219d.js"
}
]);
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "eef2255ff4d6467aa16cc8eb8ef9751c",
"url": "/index.html"
},
{
"revision": "16dc6092a693299de589",
"url": "/static/css/main.10a7dfc8.chunk.css"
},
{
"revision": "c52f24b82e2985846aa9",
"url": "/static/js/2.14780ccd.chunk.js"
},
{
"revision": "d99dc0b0a88053e0f18d3e0d5e386ee4",
"url": "/static/js/2.14780ccd.chunk.js.LICENSE.txt"
},
{
"revision": "16dc6092a693299de589",
"url": "/static/js/main.739469c0.chunk.js"
},
{
"revision": "68a9665f6992de0c4239",
"url": "/static/js/runtime-main.fc75219d.js"
}
]);
Loading

0 comments on commit 8b72ae7

Please sign in to comment.