From 90ae68f816a9d762c687cae883b69959093db823 Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Tue, 21 Aug 2018 20:37:38 -0500 Subject: [PATCH] Finally got it! Dropping Bootstrap and Vue Awesome was the key --- src/app/package.json | 9 ++------- src/app/public/index.html | 2 ++ src/app/src/App.vue | 5 ++++- src/app/src/auth/AuthService.js | 1 - src/app/src/components/Journal.vue | 2 +- src/app/src/components/common/Navigation.vue | 2 +- src/app/src/router.js | 8 -------- src/app/vue.config.js | 9 ++++++--- src/app/yarn.lock | 2 +- 9 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/app/package.json b/src/app/package.json index c5e7df5..a52b3af 100644 --- a/src/app/package.json +++ b/src/app/package.json @@ -9,16 +9,12 @@ "build": "vue-cli-service build", "lint": "vue-cli-service lint", "apistart": "cd ../api/MyPrayerJournal.Api && dotnet run", - "vue": "vue-cli-service build && cd ../api/MyPrayerJournal.Api && dotnet run" + "vue": "vue-cli-service build --modern && cd ../api/MyPrayerJournal.Api && dotnet run" }, - "sideEffects": [ - "**/*.css" - ], "dependencies": { "auth0-js": "^9.7.3", "axios": "^0.18.0", "moment": "^2.18.1", - "pug": "^2.0.1", "vue": "^2.5.15", "vue-progressbar": "^0.7.3", "vue-router": "^3.0.0", @@ -30,9 +26,8 @@ "@vue/cli-plugin-eslint": "^3.0.0", "@vue/cli-service": "^3.0.0", "@vue/eslint-config-standard": "^3.0.0", - "css-loader": "^1.0.0", + "pug": "^2.0.1", "pug-plain-loader": "^1.0.0", - "vue-style-loader": "^4.1.2", "vue-template-compiler": "^2.5.17" } } diff --git a/src/app/public/index.html b/src/app/public/index.html index 63dbfd1..2d26491 100644 --- a/src/app/public/index.html +++ b/src/app/public/index.html @@ -5,6 +5,8 @@ + + myPrayerJournal diff --git a/src/app/src/App.vue b/src/app/src/App.vue index a7e6f02..c28a592 100644 --- a/src/app/src/App.vue +++ b/src/app/src/App.vue @@ -29,7 +29,7 @@ export default { Navigation }, data () { - return { version } + return {} }, mounted () { this.$refs.toast.setOptions({ position: 'bottom right' }) @@ -37,6 +37,9 @@ export default { computed: { toast () { return this.$refs.toast + }, + version () { + return version.endsWith('.0') ? version.substr(0, version.length - 2) : version } } } diff --git a/src/app/src/auth/AuthService.js b/src/app/src/auth/AuthService.js index 51544f9..85e7f5c 100644 --- a/src/app/src/auth/AuthService.js +++ b/src/app/src/auth/AuthService.js @@ -8,7 +8,6 @@ import mutations from '@/store/mutation-types' var tokenRenewalTimeout export default class AuthService { - constructor () { this.login = this.login.bind(this) this.setSession = this.setSession.bind(this) diff --git a/src/app/src/components/Journal.vue b/src/app/src/components/Journal.vue index db7129f..f891dac 100644 --- a/src/app/src/components/Journal.vue +++ b/src/app/src/components/Journal.vue @@ -69,4 +69,4 @@ export default { justify-content: center; align-items: flex-start; } - \ No newline at end of file + diff --git a/src/app/src/components/common/Navigation.vue b/src/app/src/components/common/Navigation.vue index b7979db..7142dd3 100644 --- a/src/app/src/components/common/Navigation.vue +++ b/src/app/src/components/common/Navigation.vue @@ -93,4 +93,4 @@ export default { padding-left: 1.25rem; padding-right: 1.25rem; } - \ No newline at end of file + diff --git a/src/app/src/router.js b/src/app/src/router.js index 6c0b68d..a30db29 100644 --- a/src/app/src/router.js +++ b/src/app/src/router.js @@ -79,13 +79,5 @@ export default new Router({ name: 'LogOn', component: LogOn } -// { -// path: '/about', -// name: 'about', -// // route level code-splitting -// // this generates a separate chunk (about.[hash].js) for this route -// // which is lazy-loaded when the route is visited. -// component: () => import(/* webpackChunkName: "about" */ './views/About.vue') -// } ] }) diff --git a/src/app/vue.config.js b/src/app/vue.config.js index 1239b98..63fc1a7 100644 --- a/src/app/vue.config.js +++ b/src/app/vue.config.js @@ -1,6 +1,9 @@ +const webpack = require('webpack') module.exports = { outputDir: '../api/MyPrayerJournal.Api/wwwroot', - css: { - modules: true + configureWebpack: { + plugins: [ + new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/) + ] } -} \ No newline at end of file +} diff --git a/src/app/yarn.lock b/src/app/yarn.lock index da0decd..593e800 100644 --- a/src/app/yarn.lock +++ b/src/app/yarn.lock @@ -7008,7 +7008,7 @@ vue-router@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.1.tgz#d9b05ad9c7420ba0f626d6500d693e60092cc1e9" -vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: +vue-style-loader@^4.1.0: version "4.1.2" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8" dependencies: