diff --git a/.gitignore b/.gitignore index 768ce16..6ec157c 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 # public folder src/main/resources/public 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/.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 4c34fff..0000000 --- a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml +++ /dev/null @@ -1,87 +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 ce5f54b..0000000 --- a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 247c73e..8310c4f 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,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 71e4604..3f82b10 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") }] } ];