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 @@