From 87f39f0ef46c14cdc1737ae8642d8f346974e43f Mon Sep 17 00:00:00 2001 From: Timo Volkmann Date: Thu, 21 Mar 2019 16:57:29 +0100 Subject: [PATCH 1/2] added pages for Sprint 1 --- .idea/inspectionProfiles/Project_Default.xml | 6 + build.gradle | 2 +- frontend/quasar.conf.js | 11 +- frontend/src/layouts/MyLayout.vue | 25 ++- frontend/src/pages/CacheView.vue | 0 frontend/src/pages/Dashboard.vue | 14 ++ frontend/src/pages/Index.vue | 184 ++++++++++++++++++- frontend/src/pages/Login.vue | 0 frontend/src/router/routes.js | 5 + 9 files changed, 231 insertions(+), 16 deletions(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 frontend/src/pages/CacheView.vue create mode 100644 frontend/src/pages/Dashboard.vue create mode 100644 frontend/src/pages/Login.vue diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..03d9549 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index f75cae0..69c8d4c 100644 --- a/build.gradle +++ b/build.gradle @@ -35,5 +35,5 @@ tasks.withType(NpmTask) { } } -assemble.dependsOn npm_install +npm_run_build.dependsOn npm_install assemble.dependsOn npm_run_build diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js index 45b0014..fcf07d6 100644 --- a/frontend/quasar.conf.js +++ b/frontend/quasar.conf.js @@ -37,7 +37,16 @@ module.exports = function (ctx) { 'QList', 'QItem', 'QItemSection', - 'QItemLabel' + 'QItemLabel', + 'QTable', + 'QTh', + 'QTr', + 'QTd', + 'QCard', + 'QCardSection', + 'QCardActions', + 'QCheckbox', + 'QSeparator' ], directives: [ diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue index 1faa642..da749d4 100644 --- a/frontend/src/layouts/MyLayout.vue +++ b/frontend/src/layouts/MyLayout.vue @@ -1,11 +1,11 @@ diff --git a/frontend/src/pages/Index.vue b/frontend/src/pages/Index.vue index 45b19b2..4f72725 100644 --- a/frontend/src/pages/Index.vue +++ b/frontend/src/pages/Index.vue @@ -1,13 +1,185 @@ - + diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/router/routes.js b/frontend/src/router/routes.js index 439376e..8571b3d 100644 --- a/frontend/src/router/routes.js +++ b/frontend/src/router/routes.js @@ -3,6 +3,11 @@ const routes = [ path: "/", component: () => import("layouts/MyLayout.vue"), children: [{ path: "", component: () => import("pages/Index.vue") }] + }, + { + path: "/dashboard/", + component: () => import("layouts/MyLayout.vue"), + children: [{ path: "", component: () => import("pages/Dashboard.vue") }] } ]; From e9b3e3d9d14d12a1d0cc0f5ba5ee3cfec807c012 Mon Sep 17 00:00:00 2001 From: Timo Volkmann Date: Thu, 21 Mar 2019 17:07:30 +0100 Subject: [PATCH 2/2] added some IntelliJ files to .gitignore --- .gitignore | 3 +- ....hhn.labsw.labswp_2019_sose_geocaching.iml | 13 --- ...labsw.labswp_2019_sose_geocaching.main.iml | 61 -------------- ...labsw.labswp_2019_sose_geocaching.test.iml | 82 ------------------- 4 files changed, 1 insertion(+), 158 deletions(-) delete mode 100644 .idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.iml delete mode 100644 .idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml delete mode 100644 .idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml diff --git a/.gitignore b/.gitignore index dfa50d0..172e300 100644 --- a/.gitignore +++ b/.gitignore @@ -20,8 +20,7 @@ .idea/**/uiDesigner.xml .idea/**/dbnavigator.xml labswp_2019_sose_geocaching.iml -.idea/modules/labswp_2019_sose_geocaching_main.iml -.idea/modules/labswp_2019_sose_geocaching_test.iml +.idea/modules diff --git a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.iml b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.iml deleted file mode 100644 index f377552..0000000 --- a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml deleted file mode 100644 index e5923c1..0000000 --- a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml deleted file mode 100644 index 9501f06..0000000 --- a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file