Skip to content

Commit

Permalink
Changes in generate AccessToken
Browse files Browse the repository at this point in the history
  • Loading branch information
froeder committed Jun 23, 2018
1 parent 8d8faca commit 7f41067
Show file tree
Hide file tree
Showing 11 changed files with 153 additions and 36 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
- file:fileserver
- exam:examserver
extra_hosts:
- "staticserver:10.100.10.180"
- "staticserver:172.16.27.156"
networks:
- thisnet
depends_on:
Expand Down
41 changes: 20 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
"dependencies": {
"axios": "^0.18.0",
"material-design-icons-iconfont": "^3.0.3",
"moment": "^2.22.2",
"register-service-worker": "^1.0.0",
"vue": "^2.5.16",
"vue-moment": "^4.0.0",
"vue-router": "^3.0.1",
"vuetify": "^1.0.19",
"vuex": "^3.0.1"
Expand Down
10 changes: 3 additions & 7 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<v-app>
<v-navigation-drawer persistent :clipped="clipped" v-model="drawer" enable-resize-watcher fixed>
<v-navigation-drawer temporary :clipped="clipped" v-model="drawer" enable-resize-watcher fixed>
<v-list>
<v-list-tile value="true" v-for="(item, i) in items" :key="i" @click="linkto(item.linkpath)">
<v-list-tile-action>
Expand All @@ -25,21 +25,17 @@
</template>

<script>
import Toolbar from './menu/Toolbar'
import Footer from './menu/Footer'
import NavigationDrawer from './menu/NavigationDrawer'
export default {
components: {
Toolbar,
Footer,
NavigationDrawer
Footer
},
data() {
return {
title: 'MVP-Saúde',
clipped: false,
drawer: true,
drawer: false,
fixed: false,
items: [
{
Expand Down
1 change: 1 addition & 0 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import 'material-design-icons-iconfont/dist/material-design-icons.css'
Vue.config.productionTip = false

Vue.use(Vuetify)
Vue.use(require('vue-moment'));

new Vue({
router,
Expand Down
7 changes: 6 additions & 1 deletion src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@ export default new Vuex.Store({
state: {
token: null,
loading: false,
fileUploadProgress: 0
fileUploadProgress: 0,
user_logged: ''
},

actions: {
async [events.actions.REGISTER](context, userData) {
return await axios.post('api/auth/register', userData)
},
async [events.actions.COMPLETE_REGISTER](context, userData) {
return await axios.post('api/organization/register', userData)
},
async [events.actions.LOGIN]({commit}, credentials) {
const {data} = await axios.post('api/auth/login', credentials)
commit(events.mutations.SET_TOKEN, data.token)
this.state.user_logged = credentials.email
},
async [events.actions.UPLOAD_FILE]({commit}, formData) {
const onUploadProgress = (progressEvent) => {
Expand Down
48 changes: 48 additions & 0 deletions src/views/CompleteUserRegister.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<template>
<v-container grid-list-xl text-xs-center>
<v-layout row wrap>
<v-flex xs10 offset-xs1>
<v-card>
<v-card-title>
<h1>Registrando novo usuário</h1>
</v-card-title>
<v-card-text>
<v-form ref="form" v-model="valid" lazy-validation autocomplete="off">
<v-text-field v-model="user.email" :rules="emailRules" id="email" label="E-mail" prepend-icon="email" type="texst"
required></v-text-field>
<v-text-field v-model="user.password" :rules="passwordRules" id="password" label="Senha" prepend-icon="lock"
type="password" required></v-text-field>
<v-text-field v-model="repassword" :rules="repasswordRules" id="repassword" label="Confirma a senha" prepend-icon="lock"
type="password" required></v-text-field>
<div class="text-xs-center">
<v-btn color="info" :large="true" to="/">Voltar</v-btn>
<v-btn color="success" :large="true" :disabled="!valid" @click="submit">SALVAR</v-btn>
</div>
</v-form>
</v-card-text>
</v-card>
</v-flex>
</v-layout>
</v-container>
</template>

<script>
/* eslint-disable no-console */
export default {
data: () => ({
}),
methods: {
async submit() {
try {
await this.$store.dispatch('REGISTER', this.user)
this.$router.push({path: '/confirmation'})
} catch (err) {
//TODO EXIBIR MENSAGEM DE ERRO NA TELA ATRAVES DE UM TOAST OU ALGO DO TIPO
console.log(err)
}
}
}
}
</script>
65 changes: 62 additions & 3 deletions src/views/GenerateToken.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,64 @@
<template>
<div>
<h1>Tela para Geração dos Tokens</h1>
</div>
<v-container grid-list-xl text-xs-center>
<v-layout row wrap>
<v-flex xs10 offset-xs1>
<v-card>
<v-card-title>
<h1>Gerar token</h1>
</v-card-title>
<v-card-text>
<div class="text-xs-center">
<v-btn @click="generateAccessToken()">
Clique para gerar
<v-icon>settings</v-icon>
</v-btn>
</div>
<p>
Token: {{accessToken.token}} <br>
Data expiração: {{accessToken.expirationDate}}
</p>
</v-card-text>
</v-card>
</v-flex>
</v-layout>
</v-container>
</template>

<script>
import moment from 'moment'
export default {
data () {
return {
accessToken: {
token: '',
createAt: '',
expirationDate: '',
user_email: ''
}
}
},
methods:{
generateAccessToken (){
var user_email = this.$store.state.user_logged
var number_1 = Math.floor((Math.random() * 10) + 1)
var number_2 = Math.floor((Math.random() * 10) + 1)
var number_3 = Math.floor((Math.random() * 10) + 1)
var charsAcessToken = "";
var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
for (var i = 0; i < 3; i++){
charsAcessToken += possible.charAt(Math.floor(Math.random() * possible.length));
}
this.accessToken.token = charsAcessToken + number_1 + number_2 + number_3
this.accessToken.createAt = moment().subtract(10, 'days').calendar()
// this.accessToken.expirationDate = this.accessToken.createAt.add(7, 'days')
var expiration = moment().add(7, 'd')
this.accessToken.expirationDate = expiration._d
// console.log(this.accessToken)
}
}
}
</script>

8 changes: 7 additions & 1 deletion src/views/Home.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
<template>
<v-container>
<v-card>
<v-card-title>Meu Perfil</v-card-title>
<v-card-title>
<h2>Meu Perfil</h2>
</v-card-title>
<v-card-text>
<p>Nome: </p>
<p>Último arquivo enviado: </p>
</v-card-text>
</v-card>
</v-container>
</template>
Expand Down
1 change: 1 addition & 0 deletions src/views/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
try {
await this.$store.dispatch('LOGIN', this.credentials)
this.$router.push({path: '/home'})
console.log(this.$store.state.user_logged)
} catch (err) {
//TODO EXIBIR MENSAGEM DE ERRO NA TELA ATRAVES DE UM TOAST OU ALGO DO TIPO
console.log(err)
Expand Down
4 changes: 2 additions & 2 deletions src/views/SendFile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
color="teal">
{{ progress }} %
</v-progress-circular>
<p v-if="uploadedFiledata">
<v-alert :value="true" type="success" v-if="uploadedFiledata">
Parabens, o arquivo {{uploadedFiledata.filename}} foi carregado com sucesso
</p>
</v-alert>
<v-alert v-if="errorUpload" :value="true" type="error">
O arquivo nao foi enviado
</v-alert>
Expand Down

0 comments on commit 7f41067

Please sign in to comment.