Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
80b3ad9
Teste dados MongoDB Compass
GlauberBatista Jul 19, 2018
e721e14
Teste dados MongoDB Compass
GlauberBatista Jul 19, 2018
1901c36
Teste add planilha ramais em colaboradores
GlauberBatista Jul 20, 2018
7b03247
Ajustes no modelo e html
GlauberBatista Jul 20, 2018
e1f7379
Inserção de dados
GlauberBatista Jul 23, 2018
920f24a
Tela manutenção de Funcionário
GlauberBatista Aug 3, 2018
dae3cdc
Tela manutenção de Funcionário
GlauberBatista Aug 3, 2018
fde4d4a
Tela manutenção de Funcionário
GlauberBatista Aug 3, 2018
afc097c
Tela de Reportagem
GlauberBatista Aug 7, 2018
31d2c7a
Tela de Reportagem
GlauberBatista Aug 7, 2018
879537f
Login Google
GlauberBatista Aug 10, 2018
6e40dc5
Login Google
GlauberBatista Aug 15, 2018
6dba532
Cálculo de total de horas trabalhadas (dias úteis e feriados)
GlauberBatista Aug 17, 2018
0b9cd04
Controle de Acesso
GlauberBatista Aug 20, 2018
92c24ae
Controle de Sessão
GlauberBatista Aug 20, 2018
75eff68
Ajustes de interface
GlauberBatista Aug 22, 2018
fcd27b7
Início do Rateio
GlauberBatista Aug 28, 2018
ef8ff5b
Ajustes em rateio
GlauberBatista Aug 30, 2018
733d2b6
Rateio para colaboradores sem CC
GlauberBatista Aug 30, 2018
94f525a
Rateio para colaboradores sem CC
GlauberBatista Aug 30, 2018
2ca11c9
Ajustes em rateio
GlauberBatista Sep 3, 2018
76123c9
Rateio V. 1
GlauberBatista Sep 4, 2018
565bed5
Ajustes rateio
GlauberBatista Sep 5, 2018
4b83e00
Add colaborador
GlauberBatista Sep 5, 2018
5d160a6
Disciplinas na reportagem
GlauberBatista Sep 12, 2018
d0ba100
Reportagem por disciplina
GlauberBatista Sep 13, 2018
a917e14
Alpha Version
GlauberBatista Sep 19, 2018
ab6b3ae
Versão 1.1.0
GlauberBatista Sep 20, 2018
ae36518
Versão 1.1.1
GlauberBatista Sep 20, 2018
4548971
Versão 1.1.2
GlauberBatista Sep 20, 2018
9096888
Versão 1.2.0
GlauberBatista Sep 21, 2018
487c9ea
Update README.md
GlauberBatista Sep 24, 2018
af65900
Update README.md
GlauberBatista Sep 24, 2018
a549867
Ajustes de interface
GlauberBatista Sep 25, 2018
ba59268
Merge branch 'feature/initial-structure' of https://github.com/Glaube…
GlauberBatista Sep 25, 2018
f016504
Ajustes de interface 2
GlauberBatista Sep 25, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Rateio (API)
# [Rateio (API)](http://s3sira.pitang.com.s3-website-us-east-1.amazonaws.com)
Rateio, a [Pitang] app for Time Reporting.
This is a free [AWS Lambda] api written with [Serverless].

Expand Down Expand Up @@ -80,6 +80,7 @@ $ yarn deploy
* **Bruno Monteiro** - [Github](https://github.com/bunomonteiro)
* **Afonso Amorim** - [Github](https://github.com/afonsosa)
* **Carlos Victor Gomes** - [Github](https://github.com/carlosvictor)
* **Glauber Henrique** - [Github](https://github.com/GlauberBatista)

## Recommendations

Expand Down
9 changes: 8 additions & 1 deletion config/env.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,12 @@ JWT_PRIVATE_KEY: ba4ecff460bb6ed7edbf9c78baed594a
JWT_EXPIRES_IN: 15m

# MONGO
DB_CONNECTION_STRING: mongodb+srv://rateioapp:QS9eVJ8JRrpLDfbK@rateio-t9ydd.mongodb.net/test
#DB_CONNECTION_STRING: mongodb+srv://rateioapp:QS9eVJ8JRrpLDfbK@rateio-t9ydd.mongodb.net/test
#DB_CONNECTION_STRING: mongodb+srv://rateioapp:QS9eVJ8JRrpLDfbK@rateio-t9ydd.mongodb.net/hom
#DB_CONNECTION_STRING: mongodb://localhost:27017/rateio


# Glauber Atlas DB
#DB_CONNECTION_STRING: mongodb://localhost:27017/development
DB_CONNECTION_STRING: mongodb+srv://dev:admin@dev-oa1nw.mongodb.net/test
#DB_CONNECTION_STRING: mongodb+srv://dev:admin@dev-oa1nw.mongodb.net/development
3 changes: 1 addition & 2 deletions controller/auth/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ function socialLogin(request, response) {
*/
function validate(request, response) {
const statusCode = authLogin.validateToken(request.body.token) ? httpStatus.Ok : httpStatus.Unauthorized;

response.status(statusCode).end();
}

Expand All @@ -64,4 +63,4 @@ module.exports = {
socialLogin,
validate,
refreshToken
}
};
5 changes: 1 addition & 4 deletions controller/auth/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@ const jwt = require('jsonwebtoken');
function regularLogin(credencials) {
return new Promise((resolve, reject) => {
try {
// TODO: validar e obter dados do usuário
const user = { email: undefined, username: credencials.username /* ... */ };
const token = createRateioToken({ email: user.username });

resolve({user, token});
} catch (e) {
reject('AUTH0001');
Expand All @@ -34,7 +32,6 @@ function validateWithProvider(email, socialToken) {
const requestOptions = {
qs: { access_token: socialToken }
};

request(variables.social.google.authValidateUri, requestOptions, (error, response, body) => {
if(!error && response.statusCode == 200){
let jsonBody = JSON.parse(body);
Expand Down Expand Up @@ -131,4 +128,4 @@ module.exports = {
socialLogin,
validateToken,
refreshToken
}
};
161 changes: 0 additions & 161 deletions controller/coastcenter/index.js

This file was deleted.

Loading