From 01d5f3cec1954ca5501c21b5a2176d24ea6295fd Mon Sep 17 00:00:00 2001
From: paolo <paolo.arena77@gmail.com>
Date: Sun, 14 Oct 2018 22:10:00 +0200
Subject: [PATCH] Prima del salvataggio USER

---
 .env                                  |  19 ++-
 .env.development                      |   5 -
 .env.production                       |  13 ++
 quasar.conf.js                        |   1 +
 src/components/views/login/signup.vue | 164 ++++++++++++++++++++------
 src/i18n.js                           |  53 +++++++--
 src/store/index.js                    |   2 +
 src/store/mutation-types.js           |   2 +
 tools/tools.js                        |  13 ++
 9 files changed, 217 insertions(+), 55 deletions(-)
 delete mode 100644 .env.development
 create mode 100644 .env.production
 create mode 100644 tools/tools.js

diff --git a/.env b/.env
index bb2a290..17cb3be 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,16 @@
-VUE_APP_URL = "PROVA ENV! FUNZIONA"
-PROVA_PAOLO = "PROVA ENV FUNZIONA!"
+## SVILUPPO !!!
 
-PAO_APP_ID = ''
-MASTER_KEY = ''
+VUE_APP_URL = "prova SVILUPPO!"
+PROVA_PAOLO = "PROVA SVILUPPO"
+
+MONGODB_HOST = 'http://localhost:3000'
+
+PAO_APP_ID = 'KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF'
+MASTER_KEY = 'KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T'
+
+LOGO_REG = quasar-logo-full.svg
+
+
+TEST_EMAIL=paolo@prova.com
+TEST_USERNAME = paoloar77
+TEST_PASSWORD = mypassword
diff --git a/.env.development b/.env.development
deleted file mode 100644
index fea5918..0000000
--- a/.env.development
+++ /dev/null
@@ -1,5 +0,0 @@
-VUE_APP_URL = "prova SVILUPPO!"
-PROVA_PAOLO = "PROVA SVILUPPO"
-
-PAO_APP_ID = 'KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF'
-MASTER_KEY = 'KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T'
diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..0a84f4e
--- /dev/null
+++ b/.env.production
@@ -0,0 +1,13 @@
+VUE_APP_URL = "PROVA ENV! FUNZIONA"
+PROVA_PAOLO = "PROVA ENV FUNZIONA!"
+
+PAO_APP_ID = ''
+MASTER_KEY = ''
+
+MONGODB_HOST = 'http://localhost:3000'
+
+LOGO_REG = 'quasar-logo-full.svg'
+
+TEST_EMAIL=
+TEST_USERNAME =
+TEST_PASSWORD =
diff --git a/quasar.conf.js b/quasar.conf.js
index 9849354..3d80cb3 100644
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -80,6 +80,7 @@ module.exports = function (ctx) {
         'QChip',
         'QCollapsible',
         'QInput',
+        'QCheckbox',
 
       ],
       directives: [
diff --git a/src/components/views/login/signup.vue b/src/components/views/login/signup.vue
index cfb6b6b..027e1cd 100644
--- a/src/components/views/login/signup.vue
+++ b/src/components/views/login/signup.vue
@@ -1,76 +1,168 @@
 <template>
     <div>
-        <!--Prova URL :  {{envHelper('PROVA_PAOLO')}}-->
+        <q-page padding class="">
+            <div class="text-center">
+                <p>
+                    <!--<img src="../../../assets/quasar-logo-full.svg">-->
+                    <img :src="`../../../assets/`+`${env('LOGO_REG')}`">
+                </p>
+            </div>
 
-        <q-input
-                v-model="email"
-                @blur="$v.form.email.$touch"
-                :error="$v.form.email.$error"
-                :float-label="getFormSignup.email"
-        />
-        <q-input
-                v-model="form.password"
-                @blur="$v.form.password.$touch"
-                :error="$v.form.password.$error"
-                float-label="Password"
-        />
+            <!--Prova URL :  {{env('PROVA_PAOLO')}}-->
 
-        <q-btn color="primary" @click="submit">Submit</q-btn>
+            <q-field
+                    :helper="$t('reg.richiesto')"
+                    :error="$v.form.email.$error"
+                    :error-label="$t('reg.email') + ` ${errorMsg($v.form.email)}`"
+            >
+                <q-input
+                        v-model="form.email"
+                        :before="[{icon: 'mail', handler () {}}]"
+                        @blur="$v.form.email.$touch"
+                        :error="$v.form.email.$error"
+                        :float-label="$t('reg.email')"
+                />
+            </q-field>
+
+            <q-field
+                    :helper="$t('reg.richiesto')"
+                    :error="$v.form.username.$error"
+                    :error-label="$t('reg.username') + ` ${errorMsg($v.form.username)}`"
+            >
+                <q-input
+                        v-model="form.username"
+                        :before="[{icon: 'person', handler () {}}]"
+                        @blur="$v.form.username.$touch"
+                        :error="$v.form.username.$error"
+                        :float-label="$t('reg.username')"
+                />
+            </q-field>
+
+            <q-field
+                    :helper="$t('reg.richiesto')"
+                    :error="$v.form.password.$error"
+                    :error-label="$t('reg.password') + ` ${errorMsg($v.form.password)}`"
+            >
+                <q-input
+                        v-model="form.password"
+                        :before="[{icon: 'vpn_key', handler () {}}]"
+                        @blur="$v.form.password.$touch"
+                        :error="$v.form.password.$error"
+                        :float-label="$t('reg.password')"
+                />
+            </q-field>
+
+            <q-field
+                    :helper="$t('reg.richiesto')"
+                    :error="$v.form.confirmpassword.$error"
+                    :error-label="$t('reg.password') + ` ${errorMsg($v.form.confirmpassword)}`"
+            >
+                <q-input
+                        v-model="form.confirmpassword"
+                        :before="[{icon: 'vpn_key', handler () {}}]"
+                        @blur="$v.form.confirmpassword.$touch"
+                        :error="$v.form.confirmpassword.$error"
+                        :float-label="$t('reg.confirmpassword')"
+                />
+            </q-field>
+
+            <q-field
+                    :helper="$t('reg.richiesto')"
+                    :error="$v.form.terms.$error"
+                    :error-label="$t('reg.terms') + ` ${errorMsg($v.form.terms)}`"
+            >
+
+                <q-checkbox
+                        v-model="form.terms"
+                        :before="[{icon: 'vpn_key', handler () {}}]"
+                        color="secondary"
+                        @blur="$v.form.terms.$touch"
+                        :error="$v.form.terms.$error"
+                        :float-label="$t('reg.terms')"
+                        :label="$t('reg.terms')"
+                />
+            </q-field>
+
+
+            <q-btn color="primary" @click="submit">Submit</q-btn>
+        </q-page>
     </div>
 </template>
 
 <script>
-  import {required, email} from 'vuelidate/lib/validators'
+  import {
+    required,
+    email,
+    numeric,
+    minValue,
+    minLength,
+    maxLength,
+    sameAs,
+    requiredUnless
+  } from 'vuelidate/lib/validators'
 
-  import {mapGetters} from 'vuex'
+  import {mapGetters, mapActions} from 'vuex'
+  import * as types from '../../../store/mutation-types'
 
   export default {
     data() {
       return {
         url: process.env.VUE_APP_URL,
         form: {
-          email: '',
-          username: '',
+          email: process.env.TEST_EMAIL,
+          username: process.env.TEST_USERNAME,
+          password: process.env.TEST_PASSWORD,
+          confirmpassword: process.env.TEST_PASSWORD,
           dateOfBirth: '',
-          password: '',
-          terms: false,
+          terms: true,
         }
       }
     },
-    computed:{
+    computed: {
       ...mapGetters("glob", [
         'getUsername',
         'getPassword',
         'getEmail',
         'getDateOfBirth',
       ]),
-      envHelper(){
+      env() {
         return env
       }
     },
     validations: {
       form: {
         email: {required, email},
-        password: {required, minLen: minLength(6)},
-        confirmPassword: {
-          sameAs: sameAs(vm => {
-            return vm.password
-          })
-        },
-        terms: {
-          required: requiredUnless(vm => {
-            return vm.country === 'germany'
-          })
+        password: {required, minLength: minLength(8), maxLength: maxLength(20)},
+        username: {required, minLength: minLength(6), maxLength: maxLength(20)},
+        confirmpassword: {
+          sameAsPassword: sameAs('password')
         },
+        terms: { required },
 
       }
     },
     methods: {
+      ...mapActions("user", {
+        signup: types.USER_SIGNUP,
+      }),
+      errorMsg(item) {
+        if (!item.$error) return '';
+        if (item.$params.email && !item.email) return this.$t('reg.err.email');
+        if (!item.required) return this.$t('reg.err.required');
+        if (!item.minLength) return this.$t('reg.err.atleast') + ` ${item.$params.minLength.min} ` + this.$t('reg.err.char');
+        if (!item.maxLength) return this.$t('reg.err.notmore') + ` ${item.$params.maxLength.max} ` + this.$t('reg.err.char');
+        return '';
+      },
       submit() {
         this.$v.form.$touch();
 
+        if (!this.form.terms) {
+          this.$q.notify(this.$t('reg.err.terms'));
+          return
+        }
+
         if (this.$v.form.$error) {
-          this.$q.notify('Please review fields again.')
+          this.$q.notify(this.$t('reg.err.errore_generico'));
           return
         }
 
@@ -81,12 +173,12 @@
           dateOfBirth: this.dateOfBirth,
           confirmPassword: this.confirmPassword,
           terms: this.terms,
-        }
+        };
         console.log(formData);
-        this.$store.dispatch('signup', formData)
+        this.signup(formData);
 
         // ...
       }
-    }
+    },
   }
 </script>
diff --git a/src/i18n.js b/src/i18n.js
index fb8a9a8..38925e2 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -1,19 +1,52 @@
 const messages = {
-  enUs: {
-    msg: {
-      hello: 'Hello!',
-      myAppName: 'FreePlanet',
-      myDescriz: 'The first Free app for Everyone'
-
-    }
-  },
   it: {
     msg: {
       hello: 'Buongiorno!',
       myAppName: 'FreePlanet',
       myDescriz: 'La prima App Libera e per Tutti'
-    }
-  }
+    },
+    reg: {
+      richiesto: '* Richiesto',
+      email: 'Email',
+      username : 'Nome Utente',
+      password: 'Password',
+      confirmpassword: 'Ripeti password',
+      terms: "Accetti i termini e le condizioni?",
+      err: {
+        required: 'è richiesto',
+        email: 'dev\'essere una email valida',
+        errore_generico: 'Si prega di compilare correttamente i campi',
+        atleast: 'dev\'essere lungo almeno di',
+        notmore: 'non dev\'essere lungo più di',
+        char: 'caratteri',
+        terms: 'Devi accettare le condizioni, per continuare.'
+      }
+    },
+  },
+  enUs: {
+    msg: {
+      hello: 'Hello!',
+      myAppName: 'FreePlanet',
+      myDescriz: 'The first Free app for Everyone'
+    },
+    reg: {
+      richiesto: '* Required',
+      email: 'Email',
+      username : 'Username',
+      password: 'Password',
+      confirmpassword: 'Repeat password',
+      terms: "Do you agree with the terms & conditions?",
+      err: {
+        required: 'is required',
+        email: 'must be a valid email',
+        errore_generico: 'Please review fields again',
+        atleast: 'must be at least',
+        notmore: 'must not be more than',
+        char: 'characters long',
+        terms: 'You need to agree with the terms & conditions.'
+      }
+    },
+  },
 };
 
 export default messages;
diff --git a/src/store/index.js b/src/store/index.js
index 9eb44c4..5cfe4af 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -3,6 +3,7 @@ import Vuex from 'vuex'
 
 import example from './module-example/index'
 import glob from './modules/glob';
+import user from './modules/user';
 import types from './mutation-types'
 
 Vue.use(Vuex);
@@ -16,6 +17,7 @@ Vue.filter('time', timestamp => {
 export default new Vuex.Store({
   modules: {
     glob,
+    user,
     example
   },
 
diff --git a/src/store/mutation-types.js b/src/store/mutation-types.js
index 1b1e068..c2bad87 100644
--- a/src/store/mutation-types.js
+++ b/src/store/mutation-types.js
@@ -14,6 +14,8 @@ export const USER_EMAIL = 'email';
 export const USER_PASSWORD = 'password';
 export const USER_DATEOFBIRTH = 'dateofbirth';
 
+export const USER_SIGNUP = 'signup';
+
 
 
 
diff --git a/tools/tools.js b/tools/tools.js
new file mode 100644
index 0000000..8178f3e
--- /dev/null
+++ b/tools/tools.js
@@ -0,0 +1,13 @@
+var sendRequest = function (url, method, body)
+{
+  const options = {
+    method: method,
+    mode: 'no-cors',
+    headers: new Headers({'content-type': 'application/json'}),
+    mode: 'no-cors'
+  };
+
+  options.body = JSON.stringify(body);
+
+  return fetch(url, options);
+}();