surya/freeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When Registration OK, go to Login and show message to verify email.

Browse Source
This commit is contained in:
Paolo Arena
2019-01-01 03:22:01 +01:00
parent 7a217c3ca9
commit d0de816ceb
10 changed files with 56 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/envparser.js
View File

@@ -12,7 +12,7 @@ switch (process.env.NODE_ENV) {
path = `.env`
}
console.log("PATH", path)
// console.log("PATH", path)
const parsedEnv = DotEnv.config({ path }).parsed;
module.exports = function () {

18
package-lock.json generated
View File

@@ -10537,6 +10537,19 @@
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
"integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
},
"graphql": {
"version": "0.13.2",
"resolved": "http://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz",
"integrity": "sha512-QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==",
"requires": {
"iterall": "1.2.2"
}
},
"graphql-tag": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.0.tgz",
"integrity": "sha512-9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w=="
},
"growly": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
@@ -11883,6 +11896,11 @@
"handlebars": "4.0.12"
}
},
"iterall": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz",
"integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="
},
"javascript-stringify": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-1.6.0.tgz",

20
src/i18n.js
View File

@@ -18,6 +18,16 @@ const messages = {
authentication:{
login: {
facebook: 'Facebook'
},
email_verification: {
title: 'Inizia la tua registrazione',
introduce_email: 'inserisci la tua email',
email: 'Email',
invalid_email: 'La tua email è invalida',
verify_email: 'Verifica la tua email',
go_login: 'Torna al Login',
incorrect_input: 'Inserimento incorretto.',
link_sent: 'Per confermare la Registrazione, leggi la tua casella di posta e Clicca su "Verifica Email".\nSe non la trovi, cerca nella cartella Spam.'
}
}
},
@@ -91,6 +101,16 @@ const messages = {
authentication:{
login: {
facebook: 'Facebook'
},
email_verification: {
title: 'Begin your registration',
introduce_email: 'Enter your email',
email: 'Email',
invalid_email: 'Your email is invalid',
verify_email: 'Verify your email',
go_login: 'Back to Login',
incorrect_input: 'Incorrect input.',
link_sent: 'To confirm the Registration, read your mailbox and click on "Verify email".\nIf you can not find it check your junk mail or spam.'
}
}
},

1
src/layouts/drawer/drawer.vue
View File

@@ -1,6 +1,5 @@
<template>
<div>
User: {{ Username}}
<div id="profile" v-if="Username">
<img :src="photo" style='height: 80px' class="inline-block">
<img src="../img/avatar-1.svg" id="avatar" class="inline-block">

10
src/router/route-config.ts
View File

@@ -10,11 +10,11 @@ export const RouteConfig: VueRouteConfig[] = [
path: '/',
meta: { name: 'Home' }
},
{ path: '/test', component: () => import('@/views/login/test.vue'), meta: { name: 'Test' } },
{ path: '/test', component: () => import('@/views/login/test.vue'), meta: { name: 'Test' } },
{ path: '/signup', component: () => import('@/views/login/signup/signup.vue'), meta: { name: 'Registration' } },
{ path: '/signin', component: () => import('@/views/login/signin/signin.vue'), meta: { name: 'Login' } }
{ path: '/signin', component: () => import('@/views/login/signin/signin.vue'), meta: { name: 'Login' } },
{ path: '/vreg', component: () => import('@/views/login/vreg.vue'), meta: { name: 'Verify Reg' } }
/*
{ path: '/vreg', component: () => import('@/views/login/vreg.vue'), meta: { name: 'Verify Reg' } },
{
path: '/requestresetpwd',
component: () => import('@/views/login/requestresetpwd.vue'),
@@ -24,7 +24,9 @@ export const RouteConfig: VueRouteConfig[] = [
path: '/updatepwd',
component: () => import('@/views/login/updatepassword.vue'),
meta: { name: 'Update your Password' }
},
}
{
path: '/simpleform',
component: () => import('@/views/form/simpleForm/simpleForm.vue'),

15
src/store/mutation-types.ts
View File

@@ -1,24 +1,9 @@
export const SET_VALUE = 'SET_VALUE'
export const SET_DEFFERED_PROMPT = 'defprompt'
export const SET_LOGIN_PAGE = 'setloginpage'
export const SET_LAYOUT_NEEDED = 'setlayneeded'
export const SET_MOBILE_MODE = 'setmobilemode'
export const SET_MENU_COLLAPSED = 'setmenucoll'
export const SET_POSTS = 'setposts'
export const SET_FORM_SIGNUP = 'formsignup'
// USER:
export const USER_REC = 'user_rec'
export const USER_USERNAME = 'username'
export const USER_EMAIL = 'email'
export const USER_LANG = 'lang'
export const USER_PASSWORD = 'password'
export const USER_DATEOFBIRTH = 'dateofbirth'
export const USER_SIGNUP = 'signup'
export const USER_SIGNIN = 'signin'
export const USER_AUTOLOGIN = 'autologin'
export const USER_LOGOUT = 'logout'
export const USER_VREG = 'vreg'
export const USER_REQUESTRESETPWD = 'requestpwd'
export const USER_UPDATEPWD = 'resetpwd'

116
src/views/login/login.vue
View File

@@ -1,116 +0,0 @@
<template>
<div>
<div class="card text-white text-center width-3of4 bg-width-2of5 gt-bg-width-1of4 sm-auto " id="login">
<div class="card-title" :class="finalBgColor">
<svg id="logo" viewBox="0 0 483 483"
style="enable-background:new 0 0 460 460;"
xml:space="preserve" width="128px" height="128px"
v-html="logoMethod">
</svg>
<h4>{{logo}}</h4>
</div>
<div class="card-content bg-white ">
<div class="stacked-label">
<input required class="full-width" type="email" v-model="email">
<label>Email</label>
</div>
<div class="stacked-label">
<input required class="full-width" type="password" v-model="password">
<label>Password</label>
</div>
</div>
<div class="card-actions inline-block vertical-middle">
<button class="push" @click="login()">Login</button>
<button class="red fit" :class="buttonClass" @click="login()">Login Google</button>
<button class="blue fit" :class="buttonClass" @click="login()">Login Facebook</button>
</div>
</div>
</div>
</template>
<script type="text/javascript">
/* eslint-disable */
import {mapActions} from 'vuex'
import * as types from '../../store/mutation-types'
import Vivus from 'vivus'
import logoData from './logoData'
import { Platform } from 'quasar'
export default {
mounted () {
this.setLayoutNeeded(false);
this.setIsLoginPage(true);
this.startAnimation()
},
beforeDestroy () {
this.setLayoutNeeded(true);
this.setIsLoginPage(false);
},
computed: {
heightSize (){
if (Platform.is.desktop) {
return 'items-center'
}
return ''
},
finalBgColor () {
return `bg-${this.bgColor}-${this.toneColor}`
},
logoMethod () {
return logoData[this.logo]
}
},
data () {
return {
logos: Object.keys(logoData),
logo: 'Digitalizer',
email: 'quasar@admin.com',
password: '123456',
bgColor: 'purple',
toneColor: 10,
colors: ['purple', 'blue', 'red', 'green', 'amber'],
colorTones: ['2', '4', '6', '8', '10'],
buttonClasses: ['normal','outline', 'clear', 'push', 'bordered', 'round'],
buttonClass: 'normal',
vivus: ''
}
},
methods: {
...mapActions("glob", {
'setLayoutNeeded': types.SET_LAYOUT_NEEDED,
'setIsLoginPage': types.SET_LOGIN_PAGE
}),
login () {
this.setLayoutNeeded(true)
this.setIsLoginPage(false)
this.$router.push('/')
},
startAnimation () {
this.vivus = new Vivus('logo', {
duration: 400,
forceRender: false
}, function(element) {
for (let item of element.el.children[0].children) {
item.setAttribute('style', 'fill:white')
item.setAttribute('style', 'fill:white')
}
}
)
}
}
}
</script>
<style scoped>
.card {
margin-bottom: 0px;
}
.card-content {
min-height: 160px;
}
button {
margin-bottom: 4%;
}
h4 {
font-weight: 300;
}
</style>

4
src/views/login/signin/signin.ts
View File

@@ -11,6 +11,7 @@ import { validations, TSignin } from './signin-validate'
import { validationMixin } from 'vuelidate'
import './signin.scss'
import router from '@router'
// import {Loading, QSpinnerFacebook, QSpinnerGears} from 'quasar'
@@ -116,6 +117,9 @@ export default class Signin extends Vue {
console.log(this.signin)
UserStore.actions.signin(this.signin)
.then((riscode) => {
if (riscode === rescodes.OK) {
router.push('/signin')
}
this.checkErrors(riscode)
this.$q.loading.hide()
}).catch(error => {

8
src/views/login/signup/signup.ts
View File

@@ -91,10 +91,11 @@ export default class Signup extends Vue {
return process.env
}
showNotif(msg: any) {
this.$q.notify(msg)
showNotif(params: any) {
this.$q.notify(params)
}
public errorMsg(cosa: string, item: any) {
try {
if (!item.$error) return ''
@@ -132,7 +133,8 @@ export default class Signup extends Vue {
} else if (riscode === rescodes.DUPLICATE_USERNAME_ID) {
this.showNotif(this.$t('reg.err.duplicate_username'))
} else if (riscode === rescodes.OK) {
this.$router.push('/')
this.$router.push('/signin')
this.showNotif({type: 'warning', textColor: 'black', message: this.$t('components.authentication.email_verification.link_sent')})
} else {
this.showNotif('Errore num ' + riscode)
}

2
src/views/login/signup/signup.vue
View File

@@ -43,6 +43,7 @@
>
<q-input
v-model="signup.password"
type="password"
:before="[{icon: 'vpn_key', handler () {}}]"
@blur="$v.signup.password.$touch"
:error="$v.signup.password.$error"
@@ -55,6 +56,7 @@
>
<q-input
v-model="signup.repeatPassword"
type="password"
:before="[{icon: 'vpn_key', handler () {}}]"
@blur="$v.signup.repeatPassword.$touch"
:error="$v.signup.repeatPassword.$error"