From a2b55ca1c0733375e8e213ff512bd5074d3949bf Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Tue, 28 Apr 2020 23:27:03 +0200 Subject: [PATCH 01/27] Add gitlab ci --- .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..f82ae43 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,30 @@ +build-vue: + image: docker:latest + stage: build + services: + - docker:dind + script: + - cd frontend + - docker build --pull -t vue . + only: + - merge_requests + + +build-backend: + image: docker:latest + stage: build + services: + - docker:dind + script: + - cd backend + - docker build --pull -t backend . + only: + - merge_requests + +build-android: + image: debian + stage: build + script: + - echo "To be done" + only: + - merge_requests From b3a508b4d4362a2201a1141b1e1704f8fd8424b7 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Wed, 29 Apr 2020 00:43:56 +0200 Subject: [PATCH 02/27] Change only to rules block Because only is a deprecated feature --- .gitlab-ci.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f82ae43..1bcdeae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,9 +6,8 @@ build-vue: script: - cd frontend - docker build --pull -t vue . - only: - - merge_requests - + rules: + - if: $CI_MERGE_REQUEST_ID build-backend: image: docker:latest @@ -18,13 +17,13 @@ build-backend: script: - cd backend - docker build --pull -t backend . - only: - - merge_requests + rules: + - if: $CI_MERGE_REQUEST_ID build-android: image: debian stage: build script: - echo "To be done" - only: - - merge_requests + rules: + - if: $CI_MERGE_REQUEST_ID From 8b728b180e6c0904e9132f59409ddccd4255c447 Mon Sep 17 00:00:00 2001 From: Tim Zieger Date: Wed, 29 Apr 2020 11:57:58 +0200 Subject: [PATCH 03/27] login view --- frontend/src/router/index.js | 13 +++--- frontend/src/views/Login.vue | 81 ++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 frontend/src/views/Login.vue diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index a518691..1dbb26c 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -5,6 +5,8 @@ import Profile from "../views/profile.vue"; import missing from "../views/missing.vue"; import Info from "../views/Info.vue"; import TimeRecords from "../views/TimeRecords.vue"; +import About from "../views/About.vue"; +import Login from "../views/Login.vue"; Vue.use(VueRouter); const routes = [ @@ -18,6 +20,11 @@ const routes = [ name: "TimeRecords", component: TimeRecords }, + { + path: "/login", + name: "Login", + component: Login + }, { path: "/profile/:id", name: "Profile", @@ -38,11 +45,7 @@ const routes = [ { 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") + component: About }, { path: '*', diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue new file mode 100644 index 0000000..05f3465 --- /dev/null +++ b/frontend/src/views/Login.vue @@ -0,0 +1,81 @@ + + + + + From da7aaf68ecc0f25c1eee8f4d3070d9f202ffe228 Mon Sep 17 00:00:00 2001 From: the_kellner Date: Thu, 30 Apr 2020 13:36:35 +0200 Subject: [PATCH 04/27] implement click on logo as link to homepage --- frontend/src/components/layout/Header.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/layout/Header.vue b/frontend/src/components/layout/Header.vue index d5098bd..d3a527b 100644 --- a/frontend/src/components/layout/Header.vue +++ b/frontend/src/components/layout/Header.vue @@ -1,7 +1,7 @@