From bbd0c7e03094ecdbf7a8aa5642ed904be74ce33b Mon Sep 17 00:00:00 2001 From: Timo Volkmann Date: Wed, 26 Jun 2019 13:52:05 +0200 Subject: [PATCH] added manual and fixed some bugs --- .../build.gradle | 7 + .../frontend/quasar.conf.js | 6 +- .../frontend/src/layouts/MyLayout.vue | 15 + .../frontend/src/pages/Manual.vue | 45 + .../frontend/src/pages/Overview.vue | 16 +- .../frontend/src/pages/StationView.vue | 6 +- .../frontend/src/router/routes.js | 11 +- .../manual/1.-Anmelden_42893657.html | 78 + .../manual/1.-Cache-erstellen_42893683.html | 81 + .../1.-Startseite-aufrufen_42893636.html | 75 + .../manual/2.-Cache-starten_42893673.html | 72 + .../manual/2.-Caches_42893665.html | 78 + .../manual/2.-Station-erstellen_42893685.html | 87 + .../manual/3.-TOP10-Rangliste_42893668.html | 87 + .../4.-Das-Profil-und-Teams_42893681.html | 75 + .../manual/4.-Konto-anlegen_42893660.html | 75 + .../manual/42893623.html | 55 + .../manual/42893625.html | 55 + .../manual/42893627.html | 55 + .../manual/42893676.html | 75 + .../manual/42893687.html | 75 + .../manual/42893690.html | 78 + .../manual/Abmelden_42893671.html | 58 + ...efangene-und-beendete-Caches_42893679.html | 72 + .../manual/Bedienungsanleitung_42893462.html | 72 + .../Die-Navigationsleiste_42893642.html | 75 + .../manual/attachments/42893462/42893645.png | Bin 0 -> 271118 bytes .../manual/attachments/42893462/42893646.png | Bin 0 -> 279951 bytes .../manual/attachments/42893462/42893648.png | Bin 0 -> 279951 bytes .../manual/attachments/42893462/42893649.png | Bin 0 -> 271539 bytes .../manual/attachments/42893636/42893637.png | Bin 0 -> 563037 bytes .../manual/attachments/42893636/42893638.png | Bin 0 -> 276599 bytes .../manual/attachments/42893636/42893640.png | Bin 0 -> 549446 bytes .../manual/attachments/42893642/42893695.png | Bin 0 -> 92325 bytes .../manual/attachments/42893642/42893697.png | Bin 0 -> 92325 bytes .../manual/attachments/42893642/42893699.png | Bin 0 -> 87877 bytes .../manual/attachments/42893657/42894160.png | Bin 0 -> 14650 bytes .../manual/attachments/42893657/42894161.png | Bin 0 -> 14571 bytes .../manual/attachments/42893657/42894162.png | Bin 0 -> 12868 bytes .../manual/attachments/42893657/42894164.png | Bin 0 -> 12868 bytes .../manual/attachments/42893660/42893729.png | Bin 0 -> 24672 bytes .../manual/attachments/42893660/42893731.png | Bin 0 -> 25356 bytes .../manual/attachments/42893660/42894261.png | Bin 0 -> 27369 bytes .../manual/attachments/42893665/42893706.png | Bin 0 -> 52527 bytes .../manual/attachments/42893665/42893708.png | Bin 0 -> 52527 bytes .../manual/attachments/42893665/42893709.png | Bin 0 -> 424355 bytes .../manual/attachments/42893665/42893711.png | Bin 0 -> 52186 bytes .../manual/attachments/42893668/42893715.png | Bin 0 -> 54351 bytes .../manual/attachments/42893668/42893717.png | Bin 0 -> 23477 bytes .../manual/attachments/42893668/42893719.png | Bin 0 -> 23477 bytes .../manual/attachments/42893668/42893721.png | Bin 0 -> 23477 bytes .../manual/attachments/42893668/42893722.png | Bin 0 -> 54444 bytes .../manual/attachments/42893668/42893724.png | Bin 0 -> 23314 bytes .../manual/attachments/42893668/42893726.png | Bin 0 -> 23314 bytes .../manual/attachments/42893673/42894188.png | Bin 0 -> 11462 bytes .../manual/attachments/42893673/42894190.png | Bin 0 -> 202834 bytes .../manual/attachments/42893676/42894205.png | Bin 0 -> 179173 bytes .../manual/attachments/42893676/42894207.png | Bin 0 -> 177218 bytes .../manual/attachments/42893676/42894210.png | Bin 0 -> 39331 bytes .../manual/attachments/42893679/42894227.png | Bin 0 -> 36576 bytes .../manual/attachments/42893679/42894230.png | Bin 0 -> 4956 bytes .../manual/attachments/42893681/42894249.png | Bin 0 -> 31185 bytes .../manual/attachments/42893681/42894253.png | Bin 0 -> 33328 bytes .../manual/attachments/42893681/42894254.png | Bin 0 -> 4760 bytes .../manual/attachments/42893683/42894078.png | Bin 0 -> 2520 bytes .../manual/attachments/42893683/42894090.png | Bin 0 -> 36770 bytes .../manual/attachments/42893683/42894091.png | Bin 0 -> 36402 bytes .../manual/attachments/42893683/42894093.png | Bin 0 -> 36960 bytes .../manual/attachments/42893683/42894103.png | Bin 0 -> 7789 bytes .../manual/attachments/42893685/42894140.png | Bin 0 -> 242115 bytes .../manual/attachments/42893685/42894141.png | Bin 0 -> 282181 bytes .../manual/attachments/42893685/42894143.png | Bin 0 -> 242406 bytes .../manual/attachments/42893685/42894145.png | Bin 0 -> 242406 bytes .../manual/attachments/42893685/42894147.png | Bin 0 -> 287530 bytes .../manual/attachments/42893685/42894149.png | Bin 0 -> 287530 bytes .../manual/attachments/42893685/42894152.png | Bin 0 -> 1021 bytes .../manual/attachments/42893687/42894129.png | Bin 0 -> 7007 bytes .../manual/attachments/42893687/42894130.png | Bin 0 -> 8156 bytes .../manual/attachments/42893687/42894131.png | Bin 0 -> 9322 bytes .../manual/attachments/42893690/42894107.png | Bin 0 -> 17506 bytes .../manual/attachments/42893690/42894109.png | Bin 0 -> 17506 bytes .../manual/attachments/42893690/42894111.png | Bin 0 -> 12183 bytes .../manual/attachments/42893690/42894114.png | Bin 0 -> 12183 bytes .../manual/images/icons/bullet_blue.gif | Bin 0 -> 60 bytes .../manual/index.html | 172 + .../manual/styles/site.css | 4305 +++++++++++++++++ .../settings.gradle | 2 +- 87 files changed, 5951 insertions(+), 12 deletions(-) create mode 100644 labswp_2019_sose_geocaching_frontend/frontend/src/pages/Manual.vue create mode 100755 labswp_2019_sose_geocaching_frontend/manual/1.-Anmelden_42893657.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/1.-Cache-erstellen_42893683.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/1.-Startseite-aufrufen_42893636.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/2.-Cache-starten_42893673.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/2.-Caches_42893665.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/2.-Station-erstellen_42893685.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/3.-TOP10-Rangliste_42893668.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/4.-Das-Profil-und-Teams_42893681.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/4.-Konto-anlegen_42893660.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/42893623.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/42893625.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/42893627.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/42893676.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/42893687.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/42893690.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/Abmelden_42893671.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/Angefangene-und-beendete-Caches_42893679.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/Bedienungsanleitung_42893462.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/Die-Navigationsleiste_42893642.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893462/42893645.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893462/42893646.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893462/42893648.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893462/42893649.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893636/42893637.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893636/42893638.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893636/42893640.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893642/42893695.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893642/42893697.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893642/42893699.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893657/42894160.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893657/42894161.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893657/42894162.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893657/42894164.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893660/42893729.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893660/42893731.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893660/42894261.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893665/42893706.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893665/42893708.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893665/42893709.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893665/42893711.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893668/42893715.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893668/42893717.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893668/42893719.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893668/42893721.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893668/42893722.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893668/42893724.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893668/42893726.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893673/42894188.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893673/42894190.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893676/42894205.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893676/42894207.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893676/42894210.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893679/42894227.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893679/42894230.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893681/42894249.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893681/42894253.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893681/42894254.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893683/42894078.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893683/42894090.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893683/42894091.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893683/42894093.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893683/42894103.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893685/42894140.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893685/42894141.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893685/42894143.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893685/42894145.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893685/42894147.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893685/42894149.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893685/42894152.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893687/42894129.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893687/42894130.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893687/42894131.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893690/42894107.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893690/42894109.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893690/42894111.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/attachments/42893690/42894114.png create mode 100755 labswp_2019_sose_geocaching_frontend/manual/images/icons/bullet_blue.gif create mode 100755 labswp_2019_sose_geocaching_frontend/manual/index.html create mode 100755 labswp_2019_sose_geocaching_frontend/manual/styles/site.css diff --git a/labswp_2019_sose_geocaching_frontend/build.gradle b/labswp_2019_sose_geocaching_frontend/build.gradle index 0965012..816bdf3 100644 --- a/labswp_2019_sose_geocaching_frontend/build.gradle +++ b/labswp_2019_sose_geocaching_frontend/build.gradle @@ -16,6 +16,13 @@ node { war { from 'web/' // adds a file-set to the root of the archive + from('manual') { + into 'manual' + } +// with { +// from('manual') +// into 'manual' +// } webInf { from 'WEB-INF' } // adds a file-set to the WEB-INF dir. webXml = file('WEB-INF/web.xml') // copies a file to WEB-INF/web.xml baseName = 'buga19geocaching' diff --git a/labswp_2019_sose_geocaching_frontend/frontend/quasar.conf.js b/labswp_2019_sose_geocaching_frontend/frontend/quasar.conf.js index ae72d80..9858ac5 100644 --- a/labswp_2019_sose_geocaching_frontend/frontend/quasar.conf.js +++ b/labswp_2019_sose_geocaching_frontend/frontend/quasar.conf.js @@ -117,12 +117,14 @@ module.exports = function (ctx) { ? { // Base URL for API-Calls: DEV API: JSON.stringify('http://localhost:8080'), //API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocaching'), - USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement') + USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement'), + MANUAL_URI: JSON.stringify('http://localhost:3333') } : { // Base URL for API-Calls: PRODUCTION (build) //API: JSON.stringify('http://localhost:8080'), API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocachingbackend'), - USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement') + USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement'), + MANUAL_URI: JSON.stringify('/manual/index.html') } }, diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/layouts/MyLayout.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/layouts/MyLayout.vue index 1522443..74cc8d1 100644 --- a/labswp_2019_sose_geocaching_frontend/frontend/src/layouts/MyLayout.vue +++ b/labswp_2019_sose_geocaching_frontend/frontend/src/layouts/MyLayout.vue @@ -193,6 +193,20 @@ Login + + + + + + Hilfe + + @@ -239,6 +253,7 @@ name: "MyLayout", data() { return { + manualURI: process.env.MANUAL_URI, leftDrawerOpen: this.$q.platform.is.desktop, clickCounter: 0, }; diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Manual.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Manual.vue new file mode 100644 index 0000000..5051e8e --- /dev/null +++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Manual.vue @@ -0,0 +1,45 @@ + + + + diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Overview.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Overview.vue index 712ba53..a67c6e3 100644 --- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Overview.vue +++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Overview.vue @@ -93,9 +93,11 @@
- +
@@ -197,9 +199,11 @@
- +
diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/StationView.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/StationView.vue index 20c7c2c..7ffffb2 100644 --- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/StationView.vue +++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/StationView.vue @@ -1,7 +1,7 @@