From 76d42d30ef635240937527bd8aa3afd55bee6209 Mon Sep 17 00:00:00 2001 From: Timo Volkmann Date: Tue, 26 Mar 2019 22:26:23 +0100 Subject: [PATCH 1/4] header und cache overview --- frontend/quasar.conf.js | 3 +- frontend/src/layouts/MyLayout.vue | 15 ++-- frontend/src/pages/Index.vue | 107 +++++++++++++++-------------- frontend/src/statics/buga_logo.svg | 1 + frontend/src/statics/osm_mock.png | Bin 0 -> 5574558 bytes 5 files changed, 69 insertions(+), 57 deletions(-) create mode 100644 frontend/src/statics/buga_logo.svg create mode 100644 frontend/src/statics/osm_mock.png diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js index ab65a8f..d66cdbf 100644 --- a/frontend/quasar.conf.js +++ b/frontend/quasar.conf.js @@ -56,7 +56,8 @@ module.exports = function (ctx) { 'QInput', 'QFab', 'QFabAction', - 'QDialog' + 'QDialog', + 'QFooter' ], directives: [ diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue index 4faab9f..b2bc480 100644 --- a/frontend/src/layouts/MyLayout.vue +++ b/frontend/src/layouts/MyLayout.vue @@ -1,8 +1,15 @@ @@ -75,7 +73,7 @@ export default { methods: { fetchTodos () { - this.$axios.get('http://localhost:8080/allCaches') + this.$axios.get('http://localhost:8080/api/allCaches') .then((response) => { console.log("Caches: " + this.caches); this.caches = response.data; From 67d6ad1b6b28433ae16e544f0a900c6cea5cc063 Mon Sep 17 00:00:00 2001 From: Timo Volkmann Date: Wed, 27 Mar 2019 19:21:20 +0100 Subject: [PATCH 4/4] adopted changes from kathy, some changes and implemented api/allCaches, api/login --- frontend/quasar.conf.js | 2 + frontend/src/layouts/MyLayout.vue | 90 +++++++++++++------------- frontend/src/pages/Index.vue | 101 +++++++++++------------------- frontend/src/pages/Overview.vue | 59 ++++++++++++++--- 4 files changed, 137 insertions(+), 115 deletions(-) diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js index ccad930..0528ca8 100644 --- a/frontend/quasar.conf.js +++ b/frontend/quasar.conf.js @@ -61,6 +61,8 @@ module.exports = function (ctx) { 'QPageSticky', 'QAvatar', 'QSpinnerPuff', + 'QExpansionItem', + 'QParallax', ], directives: [ diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue index d588e8c..ed0e123 100644 --- a/frontend/src/layouts/MyLayout.vue +++ b/frontend/src/layouts/MyLayout.vue @@ -2,7 +2,7 @@ - + BuGa Geocaching @@ -15,7 +15,7 @@ @click="leftDrawerOpen = !leftDrawerOpen" aria-label="Menu" > - + @@ -27,103 +27,105 @@ show-if-above content-class=""> - Essential Links + BuGa Geocaching - + - Docs - v1.quasar-framework.org + Startseite - + - Github - github.com/quasarframework + Caches - + - Discord Chat Channel - chat.quasar-framework.org + Rangliste - + - Forum - forum.quasar-framework.org + Profil - + - Twitter - @quasarframework + Login - + diff --git a/frontend/src/pages/Index.vue b/frontend/src/pages/Index.vue index 6eb6f66..2d9c188 100644 --- a/frontend/src/pages/Index.vue +++ b/frontend/src/pages/Index.vue @@ -1,74 +1,49 @@ diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue index 0834139..5295f00 100644 --- a/frontend/src/pages/Overview.vue +++ b/frontend/src/pages/Overview.vue @@ -15,7 +15,7 @@ - +
@@ -23,16 +23,39 @@ - - + + - -
Alarms
- Lorem ipsum dolor sit amet consectetur adipisicing elit. + + + + + + + + + + {{ cache.name }} + + {{ cache.rankingPoints }} Punkte / + Size {{ cache.stationen.length }} + + {{ cache.description.substring(0,80) }} ... + + + + + + + + +
@@ -40,6 +63,12 @@ +