From 9ae41863682908d712b266057ac0684ff5b24cdd Mon Sep 17 00:00:00 2001 From: chrisWolter Date: Tue, 8 Dec 2020 08:44:02 +0100 Subject: [PATCH 01/11] Removed Unused component --- src/components/HelloWorld.vue | 58 ----------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 src/components/HelloWorld.vue diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue deleted file mode 100644 index 879051a..0000000 --- a/src/components/HelloWorld.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - From 0cc5bd5708b297dda3c4ec4e23ab514468081245 Mon Sep 17 00:00:00 2001 From: chrisWolter Date: Tue, 8 Dec 2020 08:44:17 +0100 Subject: [PATCH 02/11] Update router --- src/router/index.js | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index acefcd2..bb828af 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,8 @@ import Vue from 'vue' import VueRouter from 'vue-router' -import Home from '../App' +import Home from '../views/Home' +import SignIn from '../views/SignIn' +import { userService } from '@/services/user.service' Vue.use(VueRouter) @@ -8,7 +10,20 @@ const routes = [ { path: '/', name: 'Home', - component: Home + component: Home, + beforeEnter: guard + }, + { + path: '/signin', + name: 'SignIn', + component: SignIn, + beforeEnter: (to, from, next) => { + if (userService.isLoggedIn()) { + next({ name: 'Home' }) + } else { + next() + } + } } ] @@ -18,4 +33,12 @@ const router = new VueRouter({ routes }) +function guard (to, from, next) { + if (userService.isLoggedIn()) { + next() + } else { + next({ name: 'SignIn' }) + } +} + export default router From bacfbc50c2e177ddeba39575b809b99f75a4dc33 Mon Sep 17 00:00:00 2001 From: chrisWolter Date: Tue, 8 Dec 2020 08:44:53 +0100 Subject: [PATCH 03/11] Add Bootstrap --- src/assets/app.sass | 22 ++++++++++++++++++++++ src/main.js | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 src/assets/app.sass diff --git a/src/assets/app.sass b/src/assets/app.sass new file mode 100644 index 0000000..e42f2bd --- /dev/null +++ b/src/assets/app.sass @@ -0,0 +1,22 @@ +@import '~bootstrap/scss/mixins' +@import '~bootstrap/scss/bootstrap-grid' +@import '~bootstrap/scss/_utilities' +@import '~bootstrap/scss/variables' +@import 'node_modules/bootstrap/scss/bootstrap.scss' +@import 'node_modules/bootstrap-vue/src/index.scss' +@import url('https://fonts.googleapis.com/css2?family=Titillium+Web:ital,wght@0,200;0,300;0,400;0,600;0,700;0,900;1,200;1,300;1,400;1,600;1,700&display=swap') + + +$primary: #b51683 + + +body + font-family: 'Titillium Web', sans-serif + padding: 0 + margin: 0 + +.sy-color + color: $primary + +.sy-background + background-color: $primary \ No newline at end of file diff --git a/src/main.js b/src/main.js index cca9a23..ff40289 100644 --- a/src/main.js +++ b/src/main.js @@ -3,6 +3,8 @@ import App from './App.vue' import './registerServiceWorker' import router from './router' import { BootstrapVue } from 'bootstrap-vue' +import './assets/app.sass' +import Notifications from 'vue-notification' import firebase from 'firebase/app' import * as fbService from './services/firebase.service' @@ -12,6 +14,8 @@ Vue.prototype.$firebase = firebase fbService.fBInit() +Vue.use(Notifications, { max: 5 }) + Vue.config.productionTip = false new Vue({ From 2ea55c6fd400ddc83b11d59ae7fb4bb238709566 Mon Sep 17 00:00:00 2001 From: chrisWolter Date: Tue, 8 Dec 2020 08:45:19 +0100 Subject: [PATCH 04/11] styled main --- src/App.vue | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/src/App.vue b/src/App.vue index 55df315..d742d7b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,28 +1,9 @@ - - From 9401ea30a1a22c0b1b5eeaa40325800b5f0c72bb Mon Sep 17 00:00:00 2001 From: chrisWolter Date: Tue, 8 Dec 2020 08:45:34 +0100 Subject: [PATCH 05/11] Add Login Page --- src/views/Home.vue | 3 ++ src/views/SignIn.vue | 109 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 src/views/Home.vue create mode 100644 src/views/SignIn.vue diff --git a/src/views/Home.vue b/src/views/Home.vue new file mode 100644 index 0000000..fb3bcef --- /dev/null +++ b/src/views/Home.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/SignIn.vue b/src/views/SignIn.vue new file mode 100644 index 0000000..9a3f52f --- /dev/null +++ b/src/views/SignIn.vue @@ -0,0 +1,109 @@ + + + + + From d050d786316140c41bee01974f53eb67c57ae28b Mon Sep 17 00:00:00 2001 From: Stephan Strittmatter Date: Wed, 9 Dec 2020 00:58:53 +0100 Subject: [PATCH 06/11] updated dependencies --- package-lock.json | 225 +++++++++++++++++++++++----------------------- package.json | 10 +-- 2 files changed, 118 insertions(+), 117 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ada32b..6b3078a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1673,9 +1673,9 @@ } }, "@types/connect": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz", - "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", + "version": "3.4.34", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz", + "integrity": "sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==", "dev": true, "requires": { "@types/node": "*" @@ -1704,9 +1704,9 @@ } }, "@types/express-serve-static-core": { - "version": "4.17.14", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.14.tgz", - "integrity": "sha512-uFTLwu94TfUFMToXNgRZikwPuZdOtDgs3syBtAIr/OXorL1kJqUJT9qCLnRZ5KBOWfZQikQ2xKgR2tnDj1OgDA==", + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.15.tgz", + "integrity": "sha512-pb71P0BrBAx7cQE+/7QnA1HTQUkdBKMlkPY7lHUMn0YvPJkL2UA+KW3BdWQ309IT+i9En/qm45ZxpjIcpgEhNQ==", "dev": true, "requires": { "@types/node": "*", @@ -1884,9 +1884,9 @@ } }, "@types/webpack-sources": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.0.0.tgz", - "integrity": "sha512-a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz", + "integrity": "sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==", "dev": true, "requires": { "@types/node": "*", @@ -2214,6 +2214,16 @@ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "cacache": { "version": "13.0.1", "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz", @@ -2240,6 +2250,53 @@ "unique-filename": "^1.1.1" } }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -2256,6 +2313,16 @@ "minipass": "^3.1.1" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "terser-webpack-plugin": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz", @@ -2272,6 +2339,18 @@ "terser": "^4.6.12", "webpack-sources": "^1.4.3" } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.1.1", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.1.tgz", + "integrity": "sha512-wz/+HFg/3SBayHWAlZXARcnDTl3VOChrfW9YnxvAweiuyKX/7IGx1ad/4yJHmwhgWlOVYMAbTiI7GV8G33PfGQ==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } } } }, @@ -3238,9 +3317,9 @@ "integrity": "sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==" }, "bootstrap-vue": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.19.0.tgz", - "integrity": "sha512-IjAXUSrRU5Qu9x3uwUcoj6LtysKbCVeWoJOsODyI/WokStUr95M+tTIajXUjIrB/Nsk0fS+RNvZnm2sWeNFrhg==", + "version": "2.20.1", + "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.20.1.tgz", + "integrity": "sha512-s+w83q0T2mo/RbFwTM8gExbLJMEOYpdTUqmyFaHv2Ir+TFprMvTWpeAzeNuawJ130W1gePZ3LW3cNp1t/tZbOw==", "requires": { "@nuxt/opencollective": "^0.3.2", "bootstrap": ">=4.5.3 <5.0.0", @@ -3752,9 +3831,9 @@ } }, "cli-highlight": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.8.tgz", - "integrity": "sha512-mFuTW5UOV3/S0wZE9/1b0EcAM0XOJIhoAWPhWm5voiJ6ugVBkvYBIEL7sbHo9sEtWdEmwDIWab32qpaRI3cfqQ==", + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.9.tgz", + "integrity": "sha512-t8RNIZgiI24i/mslZ8XT8o660RUj5ZbUJpEZrZa/BNekTzdC2LfMRAnt0Y7sgzNM4FGW5tmWg/YnbTH8o1eIOQ==", "dev": true, "requires": { "chalk": "^4.0.0", @@ -4344,9 +4423,9 @@ } }, "core-js": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.0.tgz", - "integrity": "sha512-W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA==" + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.1.tgz", + "integrity": "sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg==" }, "core-js-compat": { "version": "3.8.0", @@ -5095,9 +5174,9 @@ }, "dependencies": { "domelementtype": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz", - "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz", + "integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==", "dev": true } } @@ -6909,9 +6988,9 @@ "dev": true }, "highlight.js": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.0.tgz", - "integrity": "sha512-EfrUGcQ63oLJbj0J0RI9ebX6TAITbsDBLbsjr881L/X5fMO9+oadKzEF21C7R3ULKG6Gv3uoab2HiqVJa/4+oA==", + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz", + "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==", "dev": true }, "hmac-drbg": { @@ -7517,10 +7596,13 @@ } }, "is-arguments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", - "dev": true + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz", + "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==", + "dev": true, + "requires": { + "call-bind": "^1.0.0" + } }, "is-arrayish": { "version": "0.2.1", @@ -11265,9 +11347,9 @@ "dev": true }, "sass": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz", - "integrity": "sha512-ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==", + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.30.0.tgz", + "integrity": "sha512-26EUhOXRLaUY7+mWuRFqGeGGNmhB1vblpTENO1Z7mAzzIZeVxZr9EZoaY1kyGLFWdSOZxRMAufiN2mkbO6dAlw==", "dev": true, "requires": { "chokidar": ">=2.0.0 <4.0.0" @@ -13032,87 +13114,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.1.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.0.tgz", - "integrity": "sha512-fTtCdI7VeyNK0HP4q4y9Z9ts8TUeaF+2/FjKx8CJ/7/Oem1rCX7zIJe+d+jLrVnVNQjENd3gqmANraLcdRWwnQ==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-notification": { "version": "1.3.20", "resolved": "https://registry.npmjs.org/vue-notification/-/vue-notification-1.3.20.tgz", diff --git a/package.json b/package.json index 7298b6c..5c4ca7c 100644 --- a/package.json +++ b/package.json @@ -14,14 +14,14 @@ "@fortawesome/free-solid-svg-icons": "^5.15.1", "@fortawesome/vue-fontawesome": "^2.0.0", "bootstrap": "^4.5.3", - "bootstrap-vue": "^2.18.1", - "core-js": "^3.6.5", + "bootstrap-vue": "^2.20.1", + "core-js": "^3.8.1", "dotenv": "^8.2.0", "firebase": "^7.23.0", "register-service-worker": "^1.7.1", "vue": "^2.6.12", - "vue-radial-progress": "^0.3.2", "vue-notification": "^1.3.20", + "vue-radial-progress": "^0.3.2", "vue-router": "^3.2.0", "vuex": "^3.4.0" }, @@ -31,7 +31,7 @@ "@vue/cli-plugin-pwa": "^4.1.0", "@vue/cli-plugin-router": "^4.1.0", "@vue/cli-plugin-vuex": "^4.1.0", - "@vue/cli-service": "^4.1.0", + "@vue/cli-service": "^4.5.9", "@vue/eslint-config-standard": "^5.1.2", "babel-eslint": "^10.1.0", "eslint": "^6.7.2", @@ -41,7 +41,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^6.2.2", "lint-staged": "^9.5.0", - "sass": "^1.26.5", + "sass": "^1.30.0", "sass-loader": "^8.0.2", "vue-template-compiler": "^2.6.11" }, From 5eab952166796f9edc6d890c4cd6466911416380 Mon Sep 17 00:00:00 2001 From: Stephan Strittmatter Date: Wed, 9 Dec 2020 01:22:45 +0100 Subject: [PATCH 07/11] updated description in form --- src/views/SignIn.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/SignIn.vue b/src/views/SignIn.vue index 9a3f52f..dfe0e43 100644 --- a/src/views/SignIn.vue +++ b/src/views/SignIn.vue @@ -25,21 +25,23 @@ - + - - Your initials will be used as a username. This in connection with your email ensures a uniqueness. - Example: mmn - + required /> - + Date: Wed, 9 Dec 2020 01:25:04 +0100 Subject: [PATCH 08/11] removed md format warnings --- README.md | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index d6fa3b7..59ac6f8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # COVID-Bouncer-Admin + Administration of [COVID-Bouncer](https://github.com/Sybit-Education/COVID-Bouncer) [![Sybit](https://img.shields.io/badge/-Sybit-b71583.svg)](https://www.sybit.de/) @@ -14,22 +15,26 @@ The app is a Vue.js app. For this hackathon we wanted to try two main technologi * Google Firebase to persist data ## Development -``` + +```sh npm install ``` ### Compiles and hot-reloads for development -``` + +```sh npm run serve ``` ### Compiles and minifies for production -``` + +```sh npm run build ``` ### Lints and fixes files -``` + +```sh npm run lint ``` @@ -43,29 +48,32 @@ VUE_APP_FIREBASE_AUTH_DOMAIN="xxxx" VUE_APP_FIREBASE_DATABASE_URL="xxx" VUE_APP_FIREBASE_PROJECT_ID="xxx" VUE_APP_FIREBASE_STORAGE_BUCKET="xxxx" -VUE_APP_FIREBASE_MESAGING_SENDER_ID="xxx" +VUE_APP_FIREBASE_MESSAGING_SENDER_ID="xxx" VUE_APP_FIREBASE_APP_ID="xxxx" VUE_APP_FIREBASE_MEASUREMENT_ID="xxxx" ``` + You will get the values if you create a web application for Google Firestore. ## Deployment setup -### Before -``` + +### Before + +```sh npm install -g firebase-tools -``` -``` firebase login ``` + ### Deploying a Vue Site with Firebase Hosting -https://www.youtube.com/watch?v=a-0W40NM0dI + + ## Manually deployment + ### Serve before deploy -```javascript + +```h npm run test-deploy -``` -```javascript npm run deploy ``` From fbea10d415b87f6a4a8bb3e063a22b63e30ac509 Mon Sep 17 00:00:00 2001 From: chrisWolter Date: Thu, 10 Dec 2020 07:56:07 +0100 Subject: [PATCH 09/11] rename variables --- src/assets/app.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/app.sass b/src/assets/app.sass index e42f2bd..a8a8181 100644 --- a/src/assets/app.sass +++ b/src/assets/app.sass @@ -15,8 +15,8 @@ body padding: 0 margin: 0 -.sy-color +.app-color color: $primary -.sy-background +.app-background background-color: $primary \ No newline at end of file From 3e1fdec3c2251b5e83b8cd20ad0c33c6243c143a Mon Sep 17 00:00:00 2001 From: chrisWolter Date: Thu, 10 Dec 2020 07:56:26 +0100 Subject: [PATCH 10/11] removed unused styling --- src/views/SignIn.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/views/SignIn.vue b/src/views/SignIn.vue index dfe0e43..1d9a3e5 100644 --- a/src/views/SignIn.vue +++ b/src/views/SignIn.vue @@ -100,11 +100,6 @@ export default { .signIn-button border: none font-weight: bold -.input-first-name - width: 100% - border: none - border-bottom: 2px solid black - margin-bottom: 2rem .input-styling:focus box-shadow: 0 0 0 0.2rem rgba(181, 22, 131, 0.25) border: none From 48c9c3fc33208d353a3cea98c585ad0baf8c68a4 Mon Sep 17 00:00:00 2001 From: chrisWolter Date: Thu, 10 Dec 2020 07:57:11 +0100 Subject: [PATCH 11/11] fixed spelling --- src/views/SignIn.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/SignIn.vue b/src/views/SignIn.vue index 1d9a3e5..e37920d 100644 --- a/src/views/SignIn.vue +++ b/src/views/SignIn.vue @@ -41,7 +41,7 @@ + description="Inital master password to get access to instance.">