Compare commits

..

No commits in common. "9005b519f37837dc229ed2ac6fe6826bf6d0342b" and "062da252640fbb1f56f71089510a2cebf019ebe0" have entirely different histories.

8 changed files with 38 additions and 69 deletions

View File

@ -32,10 +32,6 @@ class Application extends App implements IBootstrap
/** @var IInitialState $initialState */ /** @var IInitialState $initialState */
$initialState = $appContainer->get(IInitialState::class); $initialState = $appContainer->get(IInitialState::class);
if (null === $appManager->getAppInfo(self::GPODDERSYNC_ID)) {
$appManager->disableApp(self::GPODDERSYNC_ID);
}
$gpoddersync = $appManager->isEnabledForUser(self::GPODDERSYNC_ID); $gpoddersync = $appManager->isEnabledForUser(self::GPODDERSYNC_ID);
if (!$gpoddersync) { if (!$gpoddersync) {
try { try {

View File

@ -1,5 +1,5 @@
<template> <template>
<NcAppContent :class="{ episode, padding }"> <NcAppContent :class="{ padding: episode }">
<slot /> <slot />
</NcAppContent> </NcAppContent>
</template> </template>
@ -14,12 +14,6 @@ export default {
components: { components: {
NcAppContent, NcAppContent,
}, },
props: {
padding: {
type: Boolean,
default: true,
},
},
computed: { computed: {
...mapState(usePlayer, ['episode']), ...mapState(usePlayer, ['episode']),
}, },
@ -27,11 +21,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
.episode { .padding {
padding-bottom: 6rem; padding-bottom: 6rem;
} }
.padding {
padding: 15px 51px;
}
</style> </style>

View File

@ -1,22 +0,0 @@
<template>
<NcEmptyContent class="empty">
<slot />
</NcEmptyContent>
</template>
<script>
import { NcEmptyContent } from '@nextcloud/vue'
export default {
name: 'EmptyContent',
components: {
NcEmptyContent,
},
}
</script>
<style scoped>
.empty {
height: 100%;
}
</style>

View File

@ -1,12 +1,7 @@
<template> <template>
<div class=""> <div>
<Loading v-if="!currentFavoriteData" class="loading" /> <Loading v-if="!currentFavoriteData" class="loading" />
<NcAvatar <NcAvatar v-if="currentFavoriteData" />
v-if="currentFavoriteData"
:display-name="currentFavoriteData.author || currentFavoriteData.title"
:is-no-user="true"
:size="256"
:url="currentFavoriteData.imageUrl" />
</div> </div>
</template> </template>
@ -17,7 +12,7 @@ import { mapState } from 'pinia'
import { useSubscriptions } from '../../store/subscriptions.js' import { useSubscriptions } from '../../store/subscriptions.js'
export default { export default {
name: 'Favorites', name: 'Item',
components: { components: {
Loading, Loading,
NcAvatar, NcAvatar,
@ -31,7 +26,7 @@ export default {
computed: { computed: {
...mapState(useSubscriptions, ['favs']), ...mapState(useSubscriptions, ['favs']),
currentFavoriteData() { currentFavoriteData() {
return this.favs.find((fav) => fav.url === this.url) return this.favs.find((fav) => fav.url === this.url)?.data
}, },
}, },
} }

View File

@ -1,5 +1,5 @@
<template> <template>
<AppContent> <AppContent class="main">
<NcTextField v-model="search" :label="t('repod', 'Find a podcast')"> <NcTextField v-model="search" :label="t('repod', 'Find a podcast')">
<template #icon> <template #icon>
<Magnify :size="20" /> <Magnify :size="20" />
@ -35,3 +35,9 @@ export default {
}), }),
} }
</script> </script>
<style scoped>
.main {
padding: 15px 51px;
}
</style>

View File

@ -1,14 +1,14 @@
<template> <template>
<AppContent :padding="false"> <AppContent>
<Loading v-if="loading" /> <Loading v-if="loading" />
<EmptyContent <NcEmptyContent
v-if="failed" v-if="failed"
class="error" class="error"
:name="t('repod', 'Error loading feed')"> :name="t('repod', 'Error loading feed')">
<template #icon> <template #icon>
<Alert /> <Alert />
</template> </template>
</EmptyContent> </NcEmptyContent>
<Banner <Banner
v-if="feed" v-if="feed"
:author="feed.author" :author="feed.author"
@ -24,9 +24,9 @@
import Alert from 'vue-material-design-icons/Alert.vue' import Alert from 'vue-material-design-icons/Alert.vue'
import AppContent from '../components/Atoms/AppContent.vue' import AppContent from '../components/Atoms/AppContent.vue'
import Banner from '../components/Feed/Banner.vue' import Banner from '../components/Feed/Banner.vue'
import EmptyContent from '../components/Atoms/EmptyContent.vue'
import Episodes from '../components/Feed/Episodes.vue' import Episodes from '../components/Feed/Episodes.vue'
import Loading from '../components/Atoms/Loading.vue' import Loading from '../components/Atoms/Loading.vue'
import { NcEmptyContent } from '@nextcloud/vue'
import axios from '@nextcloud/axios' import axios from '@nextcloud/axios'
import { decodeUrl } from '../utils/url.js' import { decodeUrl } from '../utils/url.js'
import { generateUrl } from '@nextcloud/router' import { generateUrl } from '@nextcloud/router'
@ -37,9 +37,9 @@ export default {
Alert, Alert,
AppContent, AppContent,
Banner, Banner,
EmptyContent,
Episodes, Episodes,
Loading, Loading,
NcEmptyContent,
}, },
data: () => ({ data: () => ({
failed: false, failed: false,

View File

@ -1,6 +1,6 @@
<template> <template>
<AppContent> <NcAppContent class="content">
<EmptyContent class="empty" :name="t('repod', 'Missing required app')"> <NcEmptyContent :name="t('repod', 'Missing required app')">
<template #action> <template #action>
<NcButton :href="gPodderSyncUrl"> <NcButton :href="gPodderSyncUrl">
{{ t('repod', 'Install GPodder Sync') }} {{ t('repod', 'Install GPodder Sync') }}
@ -9,24 +9,22 @@
<template #icon> <template #icon>
<Alert /> <Alert />
</template> </template>
</EmptyContent> </NcEmptyContent>
</AppContent> </NcAppContent>
</template> </template>
<script> <script>
import { NcAppContent, NcButton, NcEmptyContent } from '@nextcloud/vue'
import Alert from 'vue-material-design-icons/Alert.vue' import Alert from 'vue-material-design-icons/Alert.vue'
import AppContent from '../components/Atoms/AppContent.vue'
import EmptyContent from '../components/Atoms/EmptyContent.vue'
import { NcButton } from '@nextcloud/vue'
import { generateUrl } from '@nextcloud/router' import { generateUrl } from '@nextcloud/router'
export default { export default {
name: 'GPodder', name: 'GPodder',
components: { components: {
Alert, Alert,
AppContent, NcAppContent,
EmptyContent,
NcButton, NcButton,
NcEmptyContent,
}, },
computed: { computed: {
gPodderSyncUrl() { gPodderSyncUrl() {

View File

@ -1,6 +1,6 @@
<template> <template>
<AppContent> <AppContent>
<EmptyContent <NcEmptyContent
v-if="!favs.length" v-if="!favs.length"
class="empty" class="empty"
:description=" :description="
@ -10,12 +10,12 @@
<template #icon> <template #icon>
<StarOffIcon :size="20" /> <StarOffIcon :size="20" />
</template> </template>
</EmptyContent> </NcEmptyContent>
<ul v-if="favs.length"> <ul v-if="favs.length">
<li <li
v-for="url in favs.sort((fav) => fav.lastPub).map((fav) => fav.url)" v-for="url in favs.sort((fav) => fav.lastPub).map((fav) => fav.url)"
:key="url"> :key="url">
<Favorites :url="url" /> <Item :url="url" />
</li> </li>
</ul> </ul>
</AppContent> </AppContent>
@ -23,8 +23,8 @@
<script> <script>
import AppContent from '../components/Atoms/AppContent.vue' import AppContent from '../components/Atoms/AppContent.vue'
import EmptyContent from '../components/Atoms/EmptyContent.vue' import Item from '../components/Home/Item.vue'
import Favorites from '../components/Home/Favorites.vue' import { NcEmptyContent } from '@nextcloud/vue'
import StarOffIcon from 'vue-material-design-icons/StarOff.vue' import StarOffIcon from 'vue-material-design-icons/StarOff.vue'
import { mapState } from 'pinia' import { mapState } from 'pinia'
import { useSubscriptions } from '../store/subscriptions.js' import { useSubscriptions } from '../store/subscriptions.js'
@ -33,8 +33,8 @@ export default {
name: 'Home', name: 'Home',
components: { components: {
AppContent, AppContent,
EmptyContent, Item,
Favorites, NcEmptyContent,
StarOffIcon, StarOffIcon,
}, },
computed: { computed: {
@ -42,3 +42,9 @@ export default {
}, },
} }
</script> </script>
<style scoped>
.empty {
height: 100%;
}
</style>