Remove vue fragment

This commit is contained in:
Michel Roux 2023-08-28 21:18:14 +02:00
parent 78ee567e88
commit 928a11e95e
7 changed files with 27 additions and 44 deletions

9
package-lock.json generated
View File

@ -15,7 +15,6 @@
"@nextcloud/router": "^2.1.2",
"@nextcloud/vue": "8.0.0-beta.4",
"vue": "^2",
"vue-fragment": "^1.6.0",
"vue-material-design-icons": "^5.2.0",
"vue-router": "^3",
"vuex": "^3"
@ -17114,14 +17113,6 @@
"vue": "^2.6.0"
}
},
"node_modules/vue-fragment": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.6.0.tgz",
"integrity": "sha512-a5T8ZZZK/EQzgVShEl374HbobUJ0a7v12BzOzS6Z/wd/5EE/5SffcyHC+7bf9hP3L7Yc0hhY/GhMdwFQ25O/8A==",
"peerDependencies": {
"vue": "^2.5.16"
}
},
"node_modules/vue-hot-reload-api": {
"version": "2.3.4",
"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",

View File

@ -24,7 +24,6 @@
"@nextcloud/router": "^2.1.2",
"@nextcloud/vue": "8.0.0-beta.4",
"vue": "^2",
"vue-fragment": "^1.6.0",
"vue-material-design-icons": "^5.2.0",
"vue-router": "^3",
"vuex": "^3"

View File

@ -1,7 +1,8 @@
<template>
<NcContent app-name="repod">
<GPodder v-if="!AppConfig.repod.gpodder" />
<Index v-if="AppConfig.repod.gpodder" />
<Subscriptions v-if="AppConfig.repod.gpodder" />
<router-view v-if="AppConfig.repod.gpodder" :key="$route.path" />
<Bar />
</NcContent>
</template>
@ -10,16 +11,16 @@
import '@nextcloud/dialogs/dist/index.css'
import Bar from './components/Player/Bar.vue'
import GPodder from './views/GPodder.vue'
import Index from './views/Index.vue'
import { NcContent } from '@nextcloud/vue'
import Subscriptions from './components/Sidebar/Subscriptions.vue'
export default {
name: 'App',
components: {
Bar,
GPodder,
Index,
NcContent,
Subscriptions,
},
}
</script>

View File

@ -1,5 +1,5 @@
<template>
<fragment>
<div>
<NcLoadingIcon v-if="loading" />
<ul v-if="!loading" :style="{marginBottom: currentEpisode ? '6rem' : 'auto'}">
<NcListItem v-for="episode in episodes"
@ -27,7 +27,7 @@
</template>
</NcListItem>
</ul>
</fragment>
</div>
</template>
<script>

View File

@ -1,5 +1,5 @@
<template>
<fragment>
<div>
<PauseButton v-if="!paused"
class="pointer"
:size="50"
@ -11,7 +11,7 @@
<StopButton class="pointer"
:size="30"
@click="stop" />
</fragment>
</div>
</template>
<script>

View File

@ -1,24 +1,21 @@
<template>
<fragment>
<NcAppNavigation>
<NcAppContentList>
<router-link to="/">
<NcAppNavigationNew :text="t('Add a podcast')">
<template #icon>
<Plus :size="20" />
</template>
</NcAppNavigationNew>
</router-link>
<NcLoadingIcon v-if="loading" />
<ul v-if="!loading" :style="{marginBottom: currentEpisode ? '6rem' : 'auto'}">
<Item v-for="subscriptionUrl of subscriptions"
:key="subscriptionUrl"
:url="subscriptionUrl" />
</ul>
</NcAppContentList>
</NcAppNavigation>
<router-view :key="$route.path" />
</fragment>
<NcAppNavigation>
<NcAppContentList>
<router-link to="/">
<NcAppNavigationNew :text="t('Add a podcast')">
<template #icon>
<Plus :size="20" />
</template>
</NcAppNavigationNew>
</router-link>
<NcLoadingIcon v-if="loading" />
<ul v-if="!loading" :style="{marginBottom: currentEpisode ? '6rem' : 'auto'}">
<Item v-for="subscriptionUrl of subscriptions"
:key="subscriptionUrl"
:url="subscriptionUrl" />
</ul>
</NcAppContentList>
</NcAppNavigation>
</template>
<script>
@ -28,12 +25,12 @@ import {
NcAppNavigationNew,
NcLoadingIcon,
} from '@nextcloud/vue'
import Item from '../components/Sidebar/Item.vue'
import Item from './Item.vue'
import Plus from 'vue-material-design-icons/Plus.vue'
import { showError } from '@nextcloud/dialogs'
export default {
name: 'Index',
name: 'Subscriptions',
components: {
Item,
NcAppContentList,

View File

@ -1,7 +1,6 @@
import Vuex, { Store } from 'vuex'
import { translate, translatePlural } from '@nextcloud/l10n'
import App from './App.vue'
import { Plugin } from 'vue-fragment'
import Vue from 'vue'
import { generateFilePath } from '@nextcloud/router'
import modules from './modules/index.js'
@ -14,12 +13,8 @@ const t = (...args) => translate('repod', ...args)
const n = (...args) => translatePlural('repod', ...args)
Vue.mixin({ methods: { t, n } })
Vue.use(Plugin)
Vue.use(Vuex)
Vue.prototype.OC = window.OC
Vue.prototype.OCA = window.OCA
Vue.prototype.OCP = window.OCP
Vue.prototype.AppConfig = window.oc_appconfig
const store = new Store({ modules })