From 7a72715117110a6abc00b04e055e6037daac8bec Mon Sep 17 00:00:00 2001 From: Katharina Will Date: Sat, 23 Mar 2019 17:24:02 +0100 Subject: [PATCH 1/2] Designed pages CacheView and Login --- frontend/quasar.conf.js | 10 +- frontend/src/layouts/MyLayout.vue | 4 +- frontend/src/pages/CacheView.vue | 199 ++++++++++++++++++++++++++++++ frontend/src/pages/Login.vue | 52 ++++++++ frontend/src/router/routes.js | 10 ++ 5 files changed, 272 insertions(+), 3 deletions(-) diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js index 3f82b10..00b6c98 100644 --- a/frontend/quasar.conf.js +++ b/frontend/quasar.conf.js @@ -46,7 +46,15 @@ module.exports = function (ctx) { 'QCardSection', 'QCardActions', 'QCheckbox', - 'QSeparator' + 'QSeparator', + 'QTabs', + 'QTab', + 'QRouteTab', + 'QTabPanels', + 'QTabPanel', + 'QInput', + 'QFab', + 'QFabAction' ], directives: [ diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue index da749d4..80c2afb 100644 --- a/frontend/src/layouts/MyLayout.vue +++ b/frontend/src/layouts/MyLayout.vue @@ -1,6 +1,6 @@ + + diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index e69de29..8b5ee79 100644 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -0,0 +1,52 @@ + + + diff --git a/frontend/src/router/routes.js b/frontend/src/router/routes.js index 8571b3d..2a9eed2 100644 --- a/frontend/src/router/routes.js +++ b/frontend/src/router/routes.js @@ -8,6 +8,16 @@ const routes = [ path: "/dashboard/", component: () => import("layouts/MyLayout.vue"), children: [{ path: "", component: () => import("pages/Dashboard.vue") }] + }, + { + path: "/cacheview/", + component: () => import("layouts/MyLayout.vue"), + children: [{ path: "", component: () => import("pages/CacheView.vue") }] + }, + { + path: "/login/", + component: () => import("layouts/MyLayout.vue"), + children: [{ path: "", component: () => import("pages/Login.vue") }] } ]; From fdeab95b3d0452063d41e3b4136f355d90e6b6f3 Mon Sep 17 00:00:00 2001 From: Katharina Will Date: Mon, 25 Mar 2019 17:32:50 +0100 Subject: [PATCH 2/2] deleted files for fixes --- .idea/checkstyle-idea.xml | 16 ---------------- .idea/compiler.xml | 11 ----------- .idea/encodings.xml | 4 ---- .idea/inspectionProfiles/Project_Default.xml | 6 ------ .idea/misc.xml | 9 --------- .idea/modules.xml | 10 ---------- ....de.hhn.labsw.labswp_2019_sose_geocaching.iml | 12 ------------ .idea/vcs.xml | 6 ------ 8 files changed, 74 deletions(-) delete mode 100644 .idea/checkstyle-idea.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/modules/LabSWPS.de.hhn.labsw.labswp_2019_sose_geocaching.iml delete mode 100644 .idea/vcs.xml diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml deleted file mode 100644 index 3918e38..0000000 --- a/.idea/checkstyle-idea.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 8b96030..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 15a15b2..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 03d9549..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index e62185c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 9db8a1d..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/LabSWPS.de.hhn.labsw.labswp_2019_sose_geocaching.iml b/.idea/modules/LabSWPS.de.hhn.labsw.labswp_2019_sose_geocaching.iml deleted file mode 100644 index 92b5305..0000000 --- a/.idea/modules/LabSWPS.de.hhn.labsw.labswp_2019_sose_geocaching.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file