From 43f2484e54532c6b799aa66498f648768c6de784 Mon Sep 17 00:00:00 2001 From: paolo Date: Sat, 13 Oct 2018 19:14:58 +0200 Subject: [PATCH] Iniziato il SignUp --- .env | 5 + .env.development | 5 + package-lock.json | 43 +- package.json | 8 +- quasar.conf.js | 44 +- src/App.vue | 212 ++----- src/components/Header.vue | 246 +++++++- src/components/layout/content-header.vue | 10 +- src/components/layout/drawer/drawer.vue | 137 +++-- src/components/layout/drawer/menuOne.vue | 101 ++-- src/components/layout/drawer/menuTwo.vue | 38 -- .../layout/toolbar/messagePopover.vue | 9 +- src/components/layout/toolbar/toolbar.vue | 51 -- src/components/views/Auth.vue | 24 + src/components/views/AuthSuccess.vue | 35 ++ src/components/views/Error404.vue | 58 ++ src/components/views/auth/old_signin.vue | 102 ++++ src/components/views/auth/old_signup.vue | 235 ++++++++ .../views/dashboard/one/dashboard.vue | 6 +- .../form/advancedFormOne/advancedFormOne.vue | 107 ++++ .../form/advancedFormOne/cardUserData.vue | 70 +++ .../views/form/embeeded/eDateTime.vue | 112 ++++ src/components/views/form/embeeded/eInput.vue | 108 ++++ .../views/form/embeeded/eSelect.vue | 115 ++++ .../views/form/embeeded/embeeded.vue | 119 ++++ .../views/form/simpleForm/modalAdress.vue | 98 ++++ .../views/form/simpleForm/simpleForm.vue | 92 +++ .../views/form/simpleForm/userForm.vue | 46 ++ src/components/views/login/login.vue | 10 +- src/components/views/login/signup.vue | 92 +++ src/components/views/pricing/cardPlanOne.vue | 53 ++ src/components/views/pricing/cardPlanTwo.vue | 111 ++++ .../pricing/plansBenefits/benefitFour.vue | 25 + .../pricing/plansBenefits/benefitOne.vue | 39 ++ .../pricing/plansBenefits/benefitThree.vue | 28 + .../pricing/plansBenefits/benefitTwo.vue | 28 + src/components/views/pricing/pricing.vue | 121 ++++ src/components/views/test/pao.vue | 19 + src/css/app.styl | 47 +- src/index.template.html | 1 + src/layouts/MyLayout.vue | 26 - src/pages/Error404.vue | 39 +- src/pages/Index.vue | 12 +- src/plugins/vuelidate.js | 5 + src/router/routes.js | 15 +- src/statics/icons/flag_de.svg | 5 + src/statics/icons/flag_es.svg | 544 ++++++++++++++++++ src/statics/icons/flag_gb.svg | 15 + src/statics/icons/flag_it.svg | 7 + src/statics/icons/flag_us.svg | 10 + src/store/index.js | 1 + src/store/modules/glob.js | 87 ++- src/store/mutation-types.js | 14 + 53 files changed, 3072 insertions(+), 518 deletions(-) create mode 100644 .env create mode 100644 .env.development delete mode 100644 src/components/layout/toolbar/toolbar.vue create mode 100644 src/components/views/Auth.vue create mode 100644 src/components/views/AuthSuccess.vue create mode 100644 src/components/views/Error404.vue create mode 100644 src/components/views/auth/old_signin.vue create mode 100644 src/components/views/auth/old_signup.vue create mode 100644 src/components/views/form/advancedFormOne/advancedFormOne.vue create mode 100644 src/components/views/form/advancedFormOne/cardUserData.vue create mode 100644 src/components/views/form/embeeded/eDateTime.vue create mode 100644 src/components/views/form/embeeded/eInput.vue create mode 100644 src/components/views/form/embeeded/eSelect.vue create mode 100644 src/components/views/form/embeeded/embeeded.vue create mode 100644 src/components/views/form/simpleForm/modalAdress.vue create mode 100644 src/components/views/form/simpleForm/simpleForm.vue create mode 100644 src/components/views/form/simpleForm/userForm.vue create mode 100644 src/components/views/login/signup.vue create mode 100644 src/components/views/pricing/cardPlanOne.vue create mode 100644 src/components/views/pricing/cardPlanTwo.vue create mode 100644 src/components/views/pricing/plansBenefits/benefitFour.vue create mode 100644 src/components/views/pricing/plansBenefits/benefitOne.vue create mode 100644 src/components/views/pricing/plansBenefits/benefitThree.vue create mode 100644 src/components/views/pricing/plansBenefits/benefitTwo.vue create mode 100644 src/components/views/pricing/pricing.vue create mode 100644 src/components/views/test/pao.vue delete mode 100644 src/layouts/MyLayout.vue create mode 100644 src/plugins/vuelidate.js create mode 100644 src/statics/icons/flag_de.svg create mode 100644 src/statics/icons/flag_es.svg create mode 100644 src/statics/icons/flag_gb.svg create mode 100644 src/statics/icons/flag_it.svg create mode 100644 src/statics/icons/flag_us.svg diff --git a/.env b/.env new file mode 100644 index 0000000..bb2a290 --- /dev/null +++ b/.env @@ -0,0 +1,5 @@ +VUE_APP_URL = "PROVA ENV! FUNZIONA" +PROVA_PAOLO = "PROVA ENV FUNZIONA!" + +PAO_APP_ID = '' +MASTER_KEY = '' diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..fea5918 --- /dev/null +++ b/.env.development @@ -0,0 +1,5 @@ +VUE_APP_URL = "prova SVILUPPO!" +PROVA_PAOLO = "PROVA SVILUPPO" + +PAO_APP_ID = 'KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF' +MASTER_KEY = 'KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T' diff --git a/package-lock.json b/package-lock.json index f89c190..739fd91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1418,6 +1418,15 @@ } } }, + "axios": { + "version": "0.18.0", + "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz", + "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", + "requires": { + "follow-redirects": "1.5.8", + "is-buffer": "1.1.6" + } + }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", @@ -3314,6 +3323,12 @@ "is-obj": "1.0.1" } }, + "dotenv": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.1.0.tgz", + "integrity": "sha512-/veDn2ztgRlB7gKmE3i9f6CmDIyXAy6d5nBq+whO9SLX+Zs1sXEgFLPi+aSuWqUuusMfbi84fT8j34fs1HaYUw==", + "dev": true + }, "duplexer": { "version": "0.1.1", "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", @@ -3974,7 +3989,6 @@ "version": "1.5.8", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.8.tgz", "integrity": "sha512-sy1mXPmv7kLAMKW/8XofG7o9T+6gAjzdZK4AJF6ryqQYUa/hnzgiypoeUecZ53x7XiqKNEpNqLtS97MshW2nxg==", - "dev": true, "requires": { "debug": "3.1.0" }, @@ -3983,7 +3997,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -3991,8 +4004,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, @@ -5384,8 +5396,7 @@ "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-callable": { "version": "1.1.4", @@ -5697,6 +5708,12 @@ "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=", "dev": true }, + "json-loader": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz", + "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", + "dev": true + }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -7691,8 +7708,7 @@ "quasar-extras": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/quasar-extras/-/quasar-extras-2.0.8.tgz", - "integrity": "sha512-FYZ1ypeUSTjR0PKNrvjke6nAvMdQXwiO0QZGcw6avXEPbfYOasj4NkFNvpt4O9ZPealiUit//G5NmvcjXkGp5g==", - "dev": true + "integrity": "sha512-FYZ1ypeUSTjR0PKNrvjke6nAvMdQXwiO0QZGcw6avXEPbfYOasj4NkFNvpt4O9ZPealiUit//G5NmvcjXkGp5g==" }, "quasar-framework": { "version": "0.17.17", @@ -8062,6 +8078,11 @@ "inherits": "2.0.3" } }, + "roboto-font": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/roboto-font/-/roboto-font-0.1.0.tgz", + "integrity": "sha1-w+4Z2Cygh7x0JCPA+ZdDhFVeGf0=" + }, "route-cache": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/route-cache/-/route-cache-0.4.4.tgz", @@ -9572,6 +9593,12 @@ "integrity": "sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ==", "dev": true }, + "vue-cli-plugin-quasar": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/vue-cli-plugin-quasar/-/vue-cli-plugin-quasar-0.17.1.tgz", + "integrity": "sha512-PXDENbzifnEzMjfbZt0nrjZp1FM4ShF+fBcXJ/EOxMpQ8Wo6/8YdXOUK8j+2OPdfYW2e+if/dvSsrXDOkAoUSg==", + "dev": true + }, "vue-hot-reload-api": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz", diff --git a/package.json b/package.json index 23e368b..fbd06ee 100644 --- a/package.json +++ b/package.json @@ -12,17 +12,23 @@ "test": "echo \"No test specified\" && exit 0" }, "dependencies": { + "axios": "^0.18.0", "chart": "^0.1.2", "chart.js": "^2.7.2", "countup.js": "^1.9.3", + "quasar-extras": "^2.0.8", + "roboto-font": "^0.1.0", "vivus": "^0.4.4", "vue-i18n": "^8.1.0", "vue-i18n-loader": "^1.0.0", "vuelidate": "^0.7.4" }, "devDependencies": { + "dotenv": "^6.1.0", + "json-loader": "^0.5.7", "quasar-cli": "^0.17.0", - "strip-ansi": "=3.0.1" + "strip-ansi": "=3.0.1", + "vue-cli-plugin-quasar": "^0.17.1" }, "engines": { "node": ">= 8.9.0", diff --git a/quasar.conf.js b/quasar.conf.js index cf2ef8e..9849354 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -1,34 +1,52 @@ // Configuration for your app +const webpack = require('webpack'); +const path = require('path'); + +// Get our env variables +const envparser = require('./config/envparser'); module.exports = function (ctx) { return { // app plugins (/src/plugins) - plugins: ['i18n', 'aggiuntivi'], + plugins: ['i18n', 'axios', 'aggiuntivi', 'vuelidate'], css: [ 'app.styl' ], extras: [ - ctx.theme.mat ? 'roboto-font' : null, - 'material-icons' // optional, you are not bound to it - // 'ionicons', + //ctx.theme.mat ? : null, + 'roboto-font', + 'material-icons', // optional, you are not bound to it + 'ionicons', // 'mdi', - // 'fontawesome' + 'fontawesome' ], supportIE: false, build: { scopeHoisting: true, + env: envparser(), // vueRouterMode: 'history', // vueCompiler: true, // gzip: true, // analyze: true, // extractCSS: false, extendWebpack(cfg) { + + // Create an alias for our helper + cfg.resolve.alias.env = path.resolve(__dirname, 'config/helpers/env.js') + + // Make our helper function Global + cfg.plugins.push( + new webpack.ProvidePlugin({ + 'env': 'env' // this variable is our alias, it's not a string + }) + ) + } }, devServer: { // https: true, // port: 8080, - open: true // opens browser window automatically + open: false // opens browser window automatically }, framework: { components: [ @@ -54,6 +72,15 @@ module.exports = function (ctx) { 'QCardActions', 'QField', 'QSelect', + 'QPopover', + 'QToggle', + 'QFab', + 'QInfiniteScroll', + 'QAjaxBar', + 'QChip', + 'QCollapsible', + 'QInput', + ], directives: [ 'Ripple' @@ -62,10 +89,11 @@ module.exports = function (ctx) { plugins: [ 'Notify', 'ActionSheet' ], - // iconSet: ctx.theme.mat ? 'material-icons' : 'ionicons' + //iconSet: ctx.theme.mat ? 'material-icons' : 'ionicons', + iconSet: 'fontawesome', + //iconSet: 'roboto-font', i18n: 'it' // Quasar language }, - framework: 'all', // --- includes everything; for dev only! // animations: 'all' --- includes all animations animations: [], ssr: { diff --git a/src/App.vue b/src/App.vue index cf2cb01..7b0613b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,32 +1,28 @@ - diff --git a/src/components/Header.vue b/src/components/Header.vue index 65f6635..013c481 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -5,6 +5,7 @@ color="primary" :glossy="$q.theme === 'mat'" :inverted="$q.theme === 'ios'" + class="toolbar" > {{$t('msg.myDescriz')}} - - ]" - v-model="lang" - /> +
+ + +
- - -

{{ $t('msg.hello') }}

- - - - Essential Links - - - - - + + @@ -67,7 +52,16 @@ import {Quasar} from 'quasar'; + import drawer from '../components/layout/drawer/drawer.vue' + import messagePopover from '../components/layout/toolbar/messagePopover.vue' + import signup from '../components/views/auth/old_signup'; + export default { + components: { + drawer, + messagePopover, + appsignup: signup, + }, created() { //this.$store.dispatch('initStocks'); }, @@ -76,6 +70,12 @@ }, data: function () { return { + selectOpLang: [ + {label: 'Italian', icon: 'fa-facebook', value: 'it'}, + {label: 'English (US)', icon: 'fa-flag-us', value: 'en-us'}, + {label: 'Spanish', icon: 'fa-flag-es', value: 'es'}, + {label: 'German', icon: 'fa-flag-de', value: 'de'} + ], lang: this.$q.i18n.lang, leftDrawerOpen: this.$q.platform.is.desktop } @@ -109,3 +109,193 @@ } + + diff --git a/src/components/layout/content-header.vue b/src/components/layout/content-header.vue index aa30bb3..42cb8cf 100644 --- a/src/components/layout/content-header.vue +++ b/src/components/layout/content-header.vue @@ -27,16 +27,20 @@ diff --git a/src/components/layout/drawer/drawer.vue b/src/components/layout/drawer/drawer.vue index e77f173..a30c9b9 100644 --- a/src/components/layout/drawer/drawer.vue +++ b/src/components/layout/drawer/drawer.vue @@ -1,37 +1,40 @@ diff --git a/src/components/layout/drawer/menuOne.vue b/src/components/layout/drawer/menuOne.vue index 9acf4c5..41db8c8 100644 --- a/src/components/layout/drawer/menuOne.vue +++ b/src/components/layout/drawer/menuOne.vue @@ -1,43 +1,47 @@ diff --git a/src/components/layout/drawer/menuTwo.vue b/src/components/layout/drawer/menuTwo.vue index d9a9ddc..2ad35e7 100644 --- a/src/components/layout/drawer/menuTwo.vue +++ b/src/components/layout/drawer/menuTwo.vue @@ -1,45 +1,7 @@ diff --git a/src/components/layout/toolbar/messagePopover.vue b/src/components/layout/toolbar/messagePopover.vue index 24fa173..c855570 100644 --- a/src/components/layout/toolbar/messagePopover.vue +++ b/src/components/layout/toolbar/messagePopover.vue @@ -22,7 +22,8 @@ - diff --git a/src/components/views/Auth.vue b/src/components/views/Auth.vue new file mode 100644 index 0000000..157598b --- /dev/null +++ b/src/components/views/Auth.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/components/views/AuthSuccess.vue b/src/components/views/AuthSuccess.vue new file mode 100644 index 0000000..a54ad9b --- /dev/null +++ b/src/components/views/AuthSuccess.vue @@ -0,0 +1,35 @@ + + + diff --git a/src/components/views/Error404.vue b/src/components/views/Error404.vue new file mode 100644 index 0000000..76b34f8 --- /dev/null +++ b/src/components/views/Error404.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/components/views/auth/old_signin.vue b/src/components/views/auth/old_signin.vue new file mode 100644 index 0000000..ffbeadc --- /dev/null +++ b/src/components/views/auth/old_signin.vue @@ -0,0 +1,102 @@ + + + + + \ No newline at end of file diff --git a/src/components/views/auth/old_signup.vue b/src/components/views/auth/old_signup.vue new file mode 100644 index 0000000..41cfdd5 --- /dev/null +++ b/src/components/views/auth/old_signup.vue @@ -0,0 +1,235 @@ + + + + + diff --git a/src/components/views/dashboard/one/dashboard.vue b/src/components/views/dashboard/one/dashboard.vue index 4b7bdef..84c1ec5 100644 --- a/src/components/views/dashboard/one/dashboard.vue +++ b/src/components/views/dashboard/one/dashboard.vue @@ -1,4 +1,5 @@