From c73e919829fd43d0f133609a8457790d447baa13 Mon Sep 17 00:00:00 2001
From: Jakob <jakob.roehrl@web.de>
Date: Thu, 28 Nov 2019 19:19:09 +0100
Subject: [PATCH 1/5] 1st try

Signed-off-by: Jakob <jakob.roehrl@web.de>
---
 lib/Controller/PageController.php |  2 +-
 src/Photos.vue                    |  2 ++
 src/services/MapsInstalled.js     | 26 ++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 src/services/MapsInstalled.js

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 593f7c1b..e4fb631f 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -68,6 +68,7 @@ class PageController extends Controller {
 		$this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
 
 		$this->initialStateService->provideInitialState($this->appName, 'mimes', Application::MIMES);
+		$this->initialStateService->provideInitialState($this->appName, 'maps', Application::MAPS);
 
 		Util::addScript($this->appName, 'photos');
 		Util::addStyle($this->appName, 'icons');
@@ -75,5 +76,4 @@ class PageController extends Controller {
 		$response = new TemplateResponse($this->appName, 'main');
 		return $response;
 	}
-
 }
diff --git a/src/Photos.vue b/src/Photos.vue
index acd5057a..bb477f00 100644
--- a/src/Photos.vue
+++ b/src/Photos.vue
@@ -22,6 +22,7 @@
 
 <template>
 	<Content app-name="photos">
+		{{MapsInstalled}}
 		<AppNavigation>
 			<AppNavigationItem :to="{name: 'root'}"
 				class="app-navigation__photos"
@@ -53,6 +54,7 @@ import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
 import svgplaceholder from './assets/file-placeholder.svg'
 import imgplaceholder from './assets/image.svg'
 import videoplaceholder from './assets/video.svg'
+import MapsInstalled from './services/MapsInstalled'
 
 export default {
 	name: 'Photos',
diff --git a/src/services/MapsInstalled.js b/src/services/MapsInstalled.js
new file mode 100644
index 00000000..2290e67f
--- /dev/null
+++ b/src/services/MapsInstalled.js
@@ -0,0 +1,26 @@
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import { loadState } from '@nextcloud/initial-state'
+
+const maps = loadState('maps')
+export default maps

From 10778fd6bef59381cf6d224f0ef77bf29302d930 Mon Sep 17 00:00:00 2001
From: Jakob <jakob.roehrl@web.de>
Date: Wed, 4 Dec 2019 10:42:57 +0100
Subject: [PATCH 2/5] get map info

Signed-off-by: Jakob <jakob.roehrl@web.de>
---
 lib/Controller/PageController.php | 7 +++++--
 src/Photos.vue                    | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index e4fb631f..6a8baa96 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -33,6 +33,7 @@ use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IInitialStateService;
 use OCP\IRequest;
 use OCP\Util;
+use OCP\IConfig;
 
 class PageController extends Controller {
 
@@ -47,12 +48,14 @@ class PageController extends Controller {
 	public function __construct($appName,
 								IRequest $request,
 								IEventDispatcher $eventDispatcher,
+								IConfig $config,
 								IInitialStateService $initialStateService) {
-		parent::__construct($appName, $request);
+		parent::__construct($appName, $request, $config);
 
 		$this->appName = $appName;
 		$this->eventDispatcher = $eventDispatcher;
 		$this->initialStateService = $initialStateService;
+		$this->config = $config;
 
 	}
 
@@ -68,7 +71,7 @@ class PageController extends Controller {
 		$this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
 
 		$this->initialStateService->provideInitialState($this->appName, 'mimes', Application::MIMES);
-		$this->initialStateService->provideInitialState($this->appName, 'maps', Application::MAPS);
+		$this->initialStateService->provideInitialState($this->appName, 'maps', $this->config->getAppValue('maps', 'enabled', 'no') === 'yes');
 
 		Util::addScript($this->appName, 'photos');
 		Util::addStyle($this->appName, 'icons');
diff --git a/src/Photos.vue b/src/Photos.vue
index bb477f00..8e1e0dd8 100644
--- a/src/Photos.vue
+++ b/src/Photos.vue
@@ -70,6 +70,7 @@ export default {
 			svgplaceholder,
 			imgplaceholder,
 			videoplaceholder,
+			MapsInstalled
 		}
 	},
 }

From 74120cc0e33eff540104a7912d05d896ab430bcd Mon Sep 17 00:00:00 2001
From: Jakob <jakob.roehrl@web.de>
Date: Wed, 4 Dec 2019 11:50:33 +0100
Subject: [PATCH 3/5] UI

Signed-off-by: Jakob <jakob.roehrl@web.de>
---
 lib/Controller/PageController.php               |  2 +-
 src/Photos.vue                                  | 17 ++++++++++++-----
 .../{MapsInstalled.js => isMapsInstalled.js}    |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)
 rename src/services/{MapsInstalled.js => isMapsInstalled.js} (95%)

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 6a8baa96..5fd2ca0d 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -50,7 +50,7 @@ class PageController extends Controller {
 								IEventDispatcher $eventDispatcher,
 								IConfig $config,
 								IInitialStateService $initialStateService) {
-		parent::__construct($appName, $request, $config);
+		parent::__construct($appName, $request);
 
 		$this->appName = $appName;
 		$this->eventDispatcher = $eventDispatcher;
diff --git a/src/Photos.vue b/src/Photos.vue
index 8e1e0dd8..07157786 100644
--- a/src/Photos.vue
+++ b/src/Photos.vue
@@ -22,7 +22,6 @@
 
 <template>
 	<Content app-name="photos">
-		{{MapsInstalled}}
 		<AppNavigation>
 			<AppNavigationItem :to="{name: 'root'}"
 				class="app-navigation__photos"
@@ -33,7 +32,7 @@
 			<AppNavigationItem :to="{name: 'albums'}" :title="t('photos', 'Your albums')" icon="icon-files-dark" />
 			<AppNavigationItem :to="{name: 'shared'}" :title="t('photos', 'Shared albums')" icon="icon-share" />
 			<AppNavigationItem :to="{name: 'tags'}" :title="t('photos', 'Tagged photos')" icon="icon-tag" />
-			<AppNavigationItem :to="{name: 'maps'}" :title="t('photos', 'Locations')" icon="icon-address" />
+			<AppNavigationItem :to="mapsLink" :title="t('photos', 'Locations')" icon="icon-address" />
 		</AppNavigation>
 		<AppContent :class="{ 'icon-loading': loading }">
 			<router-view v-show="!loading" :loading.sync="loading" />
@@ -54,7 +53,7 @@ import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
 import svgplaceholder from './assets/file-placeholder.svg'
 import imgplaceholder from './assets/image.svg'
 import videoplaceholder from './assets/video.svg'
-import MapsInstalled from './services/MapsInstalled'
+import isMapsInstalled from './services/isMapsInstalled'
 
 export default {
 	name: 'Photos',
@@ -69,10 +68,18 @@ export default {
 			loading: true,
 			svgplaceholder,
 			imgplaceholder,
-			videoplaceholder,
-			MapsInstalled
+			videoplaceholder
 		}
 	},
+	computed: {
+		mapsLink() {
+			if (isMapsInstalled) {
+				return 'apps/maps'
+			} else {
+				return 'https://apps.nextcloud.com/apps/maps'
+			}
+		}
+	}
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/services/MapsInstalled.js b/src/services/isMapsInstalled.js
similarity index 95%
rename from src/services/MapsInstalled.js
rename to src/services/isMapsInstalled.js
index 2290e67f..1c841628 100644
--- a/src/services/MapsInstalled.js
+++ b/src/services/isMapsInstalled.js
@@ -22,5 +22,5 @@
 
 import { loadState } from '@nextcloud/initial-state'
 
-const maps = loadState('maps')
+const maps = loadState('photos', 'maps')
 export default maps

From 903091675cb3e6ba7c4779650fcf82413c8167f5 Mon Sep 17 00:00:00 2001
From: Jakob <jakob.roehrl@web.de>
Date: Wed, 4 Dec 2019 13:39:52 +0100
Subject: [PATCH 4/5] routing

Signed-off-by: Jakob <jakob.roehrl@web.de>
---
 src/Photos.vue      | 12 ++++++------
 src/router/index.js |  9 +++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/Photos.vue b/src/Photos.vue
index 07157786..e5376bbb 100644
--- a/src/Photos.vue
+++ b/src/Photos.vue
@@ -32,7 +32,7 @@
 			<AppNavigationItem :to="{name: 'albums'}" :title="t('photos', 'Your albums')" icon="icon-files-dark" />
 			<AppNavigationItem :to="{name: 'shared'}" :title="t('photos', 'Shared albums')" icon="icon-share" />
 			<AppNavigationItem :to="{name: 'tags'}" :title="t('photos', 'Tagged photos')" icon="icon-tag" />
-			<AppNavigationItem :to="mapsLink" :title="t('photos', 'Locations')" icon="icon-address" />
+			<AppNavigationItem :to="mapsLink" :title="t('photos', 'Locations')" icon="icon-address" target="_blank" />
 		</AppNavigation>
 		<AppContent :class="{ 'icon-loading': loading }">
 			<router-view v-show="!loading" :loading.sync="loading" />
@@ -68,18 +68,18 @@ export default {
 			loading: true,
 			svgplaceholder,
 			imgplaceholder,
-			videoplaceholder
+			videoplaceholder,
 		}
 	},
 	computed: {
 		mapsLink() {
 			if (isMapsInstalled) {
-				return 'apps/maps'
+				return {name: 'MapsInstalled'}
 			} else {
-				return 'https://apps.nextcloud.com/apps/maps'
+				return {name: 'MapsNotInstalled'}
 			}
-		}
-	}
+		},
+	},
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/router/index.js b/src/router/index.js
index a5372a59..69d09608 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -84,8 +84,13 @@ export default new Router({
 			}),
 		},
 		{
-			path: '/maps',
-			name: 'maps',
+			path: generateUrl('apps/maps', ''),
+			name: 'MapsInstalled',
+			redirect: '',
+		},
+		{
+			path: generateUrl('settings/apps/integration/maps', ''),
+			name: 'MapsNotInstalled',
 			redirect: '',
 		},
 	],

From 82a63d9897c02ab12b334f0caf955744f7a03f17 Mon Sep 17 00:00:00 2001
From: Jakob <jakob.roehrl@web.de>
Date: Thu, 5 Dec 2019 08:40:41 +0100
Subject: [PATCH 5/5] route adjustments

Signed-off-by: Jakob <jakob.roehrl@web.de>
---
 src/Photos.vue                                | 12 +----------
 src/router/index.js                           | 20 +++++++++++--------
 ...{isMapsInstalled.js => IsMapsInstalled.js} |  0
 3 files changed, 13 insertions(+), 19 deletions(-)
 rename src/services/{isMapsInstalled.js => IsMapsInstalled.js} (100%)

diff --git a/src/Photos.vue b/src/Photos.vue
index e5376bbb..acd5057a 100644
--- a/src/Photos.vue
+++ b/src/Photos.vue
@@ -32,7 +32,7 @@
 			<AppNavigationItem :to="{name: 'albums'}" :title="t('photos', 'Your albums')" icon="icon-files-dark" />
 			<AppNavigationItem :to="{name: 'shared'}" :title="t('photos', 'Shared albums')" icon="icon-share" />
 			<AppNavigationItem :to="{name: 'tags'}" :title="t('photos', 'Tagged photos')" icon="icon-tag" />
-			<AppNavigationItem :to="mapsLink" :title="t('photos', 'Locations')" icon="icon-address" target="_blank" />
+			<AppNavigationItem :to="{name: 'maps'}" :title="t('photos', 'Locations')" icon="icon-address" />
 		</AppNavigation>
 		<AppContent :class="{ 'icon-loading': loading }">
 			<router-view v-show="!loading" :loading.sync="loading" />
@@ -53,7 +53,6 @@ import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
 import svgplaceholder from './assets/file-placeholder.svg'
 import imgplaceholder from './assets/image.svg'
 import videoplaceholder from './assets/video.svg'
-import isMapsInstalled from './services/isMapsInstalled'
 
 export default {
 	name: 'Photos',
@@ -71,15 +70,6 @@ export default {
 			videoplaceholder,
 		}
 	},
-	computed: {
-		mapsLink() {
-			if (isMapsInstalled) {
-				return {name: 'MapsInstalled'}
-			} else {
-				return {name: 'MapsNotInstalled'}
-			}
-		},
-	},
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/router/index.js b/src/router/index.js
index 69d09608..c6cc453c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -27,9 +27,15 @@ import Vue from 'vue'
 import Albums from '../views/Albums'
 import Timeline from '../views/Timeline'
 import Tags from '../views/Tags'
+import isMapsInstalled from '../services/IsMapsInstalled'
 
 Vue.use(Router)
 
+let mapsPath = generateUrl('/apps/maps')
+if (!isMapsInstalled) {
+	mapsPath = generateUrl('/settings/apps/integration/maps')
+}
+
 export default new Router({
 	mode: 'history',
 	// if index.php is in the url AND we got this far, then it's working:
@@ -84,14 +90,12 @@ export default new Router({
 			}),
 		},
 		{
-			path: generateUrl('apps/maps', ''),
-			name: 'MapsInstalled',
-			redirect: '',
-		},
-		{
-			path: generateUrl('settings/apps/integration/maps', ''),
-			name: 'MapsNotInstalled',
-			redirect: '',
+			path: '/maps',
+			name: 'maps',
+			// router-link doesn't support external url, let's force the redirect
+			beforeEnter() {
+				location.href = mapsPath
+			},
 		},
 	],
 })
diff --git a/src/services/isMapsInstalled.js b/src/services/IsMapsInstalled.js
similarity index 100%
rename from src/services/isMapsInstalled.js
rename to src/services/IsMapsInstalled.js