Remove vue fragment
All checks were successful
repod / nextcloud (push) Successful in 58s
repod / nodejs (push) Successful in 1m37s

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/router": "^2.1.2",
"@nextcloud/vue": "8.0.0-beta.4", "@nextcloud/vue": "8.0.0-beta.4",
"vue": "^2", "vue": "^2",
"vue-fragment": "^1.6.0",
"vue-material-design-icons": "^5.2.0", "vue-material-design-icons": "^5.2.0",
"vue-router": "^3", "vue-router": "^3",
"vuex": "^3" "vuex": "^3"
@ -17114,14 +17113,6 @@
"vue": "^2.6.0" "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": { "node_modules/vue-hot-reload-api": {
"version": "2.3.4", "version": "2.3.4",
"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", "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/router": "^2.1.2",
"@nextcloud/vue": "8.0.0-beta.4", "@nextcloud/vue": "8.0.0-beta.4",
"vue": "^2", "vue": "^2",
"vue-fragment": "^1.6.0",
"vue-material-design-icons": "^5.2.0", "vue-material-design-icons": "^5.2.0",
"vue-router": "^3", "vue-router": "^3",
"vuex": "^3" "vuex": "^3"

View File

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

View File

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

View File

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

View File

@ -1,5 +1,4 @@
<template> <template>
<fragment>
<NcAppNavigation> <NcAppNavigation>
<NcAppContentList> <NcAppContentList>
<router-link to="/"> <router-link to="/">
@ -17,8 +16,6 @@
</ul> </ul>
</NcAppContentList> </NcAppContentList>
</NcAppNavigation> </NcAppNavigation>
<router-view :key="$route.path" />
</fragment>
</template> </template>
<script> <script>
@ -28,12 +25,12 @@ import {
NcAppNavigationNew, NcAppNavigationNew,
NcLoadingIcon, NcLoadingIcon,
} from '@nextcloud/vue' } 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 Plus from 'vue-material-design-icons/Plus.vue'
import { showError } from '@nextcloud/dialogs' import { showError } from '@nextcloud/dialogs'
export default { export default {
name: 'Index', name: 'Subscriptions',
components: { components: {
Item, Item,
NcAppContentList, NcAppContentList,

View File

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