From 7a217c3ca9471494d203a13841fb150e068b752f Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Wed, 26 Dec 2018 21:02:16 +0100 Subject: [PATCH] .env.production file eliminated ! (-> .env) .env.production worked in local added myconfig messagepopup working (but not ready yet) added Graphql (only module) --- .env.development | 11 + .gitignore | 3 + config/envparser.js | 16 +- package.json | 10 +- quasar.conf.js | 13 +- src/App.vue | 14 +- src/boot/local-storage.js | 62 ++++++ src/classes/AlertsController.ts | 201 ----------------- src/classes/DateController.ts | 26 --- src/classes/FormController.ts | 205 ------------------ src/classes/index.ts | 3 - src/components/Counter.vue | 20 -- src/components/Header.vue | 8 +- src/components/HelloWorld.ts | 6 - src/components/hello-world.html | 29 --- src/error-handler/graphql.js | 19 ++ src/error-handler/index.js | 21 ++ src/i18n.js | 40 +++- src/layouts/drawer/drawer.vue | 32 +-- src/layouts/drawer/menuOne.vue | 2 +- src/layouts/drawer/menuTwo.vue | 7 - src/layouts/toolbar/messagePopover.vue | 84 ------- .../messagePopover/messagePopover.scss | 17 ++ .../toolbar/messagePopover/messagePopover.ts | 70 ++++++ .../toolbar/messagePopover/messagePopover.vue | 26 +++ src/model/GlobalStore.ts | 7 +- src/{config => myconfig}/index.ts | 5 + src/pages/Dashboard.vue | 21 -- src/plugins/error-handler.js | 7 + src/plugins/i18n.js | 2 +- src/plugins/local-storage.js | 7 + src/plugins/myconfig.js | 9 + src/root/home/home.ts | 8 +- src/store/Api/Instance.ts | 1 - src/store/Api/index.ts | 2 +- src/store/Modules/GlobalStore.ts | 6 +- src/typings/libs/axios.d.ts | 8 + src/typings/libs/errorHandler.d.ts | 8 + src/typings/libs/myconfig.d.ts | 8 + src/views/login/signin/signin.ts | 24 ++ src/views/login/signin/signin.vue | 14 +- src/views/login/signup/signup.ts | 5 +- 42 files changed, 430 insertions(+), 657 deletions(-) create mode 100644 .env.development create mode 100644 src/boot/local-storage.js delete mode 100644 src/classes/AlertsController.ts delete mode 100644 src/classes/DateController.ts delete mode 100644 src/classes/FormController.ts delete mode 100644 src/classes/index.ts delete mode 100644 src/components/Counter.vue delete mode 100644 src/components/HelloWorld.ts delete mode 100644 src/components/hello-world.html create mode 100644 src/error-handler/graphql.js create mode 100644 src/error-handler/index.js delete mode 100644 src/layouts/drawer/menuTwo.vue delete mode 100644 src/layouts/toolbar/messagePopover.vue create mode 100644 src/layouts/toolbar/messagePopover/messagePopover.scss create mode 100644 src/layouts/toolbar/messagePopover/messagePopover.ts create mode 100644 src/layouts/toolbar/messagePopover/messagePopover.vue rename src/{config => myconfig}/index.ts (64%) delete mode 100644 src/pages/Dashboard.vue create mode 100644 src/plugins/error-handler.js create mode 100644 src/plugins/local-storage.js create mode 100644 src/plugins/myconfig.js create mode 100644 src/typings/libs/axios.d.ts create mode 100644 src/typings/libs/errorHandler.d.ts create mode 100644 src/typings/libs/myconfig.d.ts diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..79519a9 --- /dev/null +++ b/.env.development @@ -0,0 +1,11 @@ +APP_ID='1' +VUE_APP_URL='prova SVILUPPO!' +PROVA_PAOLO='PROVA SVILUPPO' +LANG_DEFAULT='it' +MONGODB_HOST='http://localhost:3000' +PAO_APP_ID='KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF' +MASTER_KEY='KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T' +LOGO_REG='quasar-logo-full.svg' +TEST_EMAIL='paolo.arena77@gmail.com' +TEST_USERNAME='paoloar77' +TEST_PASSWORD='mypassword@1A' diff --git a/.gitignore b/.gitignore index f3f00b0..d03be54 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,6 @@ yarn-error.log* # Coverage coverage /_PROVE +/_LOCALE +deploy.sh +deploy_production.sh diff --git a/config/envparser.js b/config/envparser.js index 4646105..68e5393 100644 --- a/config/envparser.js +++ b/config/envparser.js @@ -1,5 +1,19 @@ const DotEnv = require('dotenv') -const parsedEnv = DotEnv.config().parsed; + +let path +switch (process.env.NODE_ENV) { + case 'test': + path = `.env.test` + break + case 'development': + path = `.env.development` + break + default: + path = `.env` +} + +console.log("PATH", path) +const parsedEnv = DotEnv.config({ path }).parsed; module.exports = function () { // Let's stringify our variables diff --git a/package.json b/package.json index 607ee11..f9bd040 100644 --- a/package.json +++ b/package.json @@ -5,16 +5,16 @@ "scripts": { "lint": "tslint --project tsconfig.json", "lint:fix": "tslint --project tsconfig.json --fix", - "dev": "NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m pwa", - "dev:ssr": "NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m ssr", - "pwa": "NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m pwa", + "dev": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m pwa", + "dev:ssr": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m ssr", + "pwa": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m pwa", "test:unit": "jest", "test:cover": "jest --coverage", "build": "quasar build -m pwa", "build:clean": "quasar clean", "serve": "quasar serve ./dist/pwa-mat", "serve:coverage": "quasar serve test/coverage/lcov-report/ --cache 0 --port 8788", - "deploy": "now dist/pwa-mat" + "deploy": "deploy.sh" }, "dependencies": { "quasar-extras": "^2.0.8", @@ -26,6 +26,8 @@ "bcrypt": "^3.0.2", "bcryptjs": "^2.4.3", "dotenv": "^6.1.0", + "graphql": "^0.13.2", + "graphql-tag": "^2.8.0", "element-ui": "^2.3.6", "google-translate-api": "^2.3.0", "js-cookie": "^2.2.0", diff --git a/quasar.conf.js b/quasar.conf.js index d6d6e19..982c92c 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -59,7 +59,7 @@ module.exports = function (ctx) { store: 'src/store/index.ts' }, // app plugins (/src/plugins) - plugins: ['i18n', 'axios', 'vee-validate'], + plugins: ['i18n', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler'], css: [ 'app.styl' ], @@ -78,8 +78,8 @@ module.exports = function (ctx) { scopeHoisting: true, vueRouterMode: 'history', vueCompiler: true, - gzip: true, - analyze: true, + gzip: false, // gzip true + analyze: false, // true // extractCSS: false, chainWebpack(config) { extendTypescriptToWebpack(config); @@ -93,8 +93,15 @@ module.exports = function (ctx) { .test(/\.pug$/) .use('pug') .loader('pug-plain-loader') + /*config.module + .rule('template-engine') + .test(/\.(gql|graphql)$/) + .loader('graphql-tag/loader') */ } }, + dev: { + env: require('./.env.development'), + }, devServer: { https: false, port: 8080, diff --git a/src/App.vue b/src/App.vue index 135a9d4..d21866d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -17,8 +17,6 @@ diff --git a/src/components/Header.vue b/src/components/Header.vue index 1f86e75..b35c475 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -1,6 +1,6 @@