Signed-off-by: Jakob <jakob.roehrl@web.de>
This commit is contained in:
Jakob 2019-12-04 11:50:33 +01:00
parent 10778fd6be
commit 74120cc0e3
3 changed files with 14 additions and 7 deletions

View File

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

View File

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

View File

@ -22,5 +22,5 @@
import { loadState } from '@nextcloud/initial-state'
const maps = loadState('maps')
const maps = loadState('photos', 'maps')
export default maps