diff options
author | devlinjunker <devlin.junker@gmail.com> | 2023-10-01 10:44:34 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-01 10:44:34 -0700 |
commit | 0aa4b103907988d0754124dc084da699340ca375 (patch) | |
tree | 2432cb80acb09fbd97cca481f3035c191108dbc0 /src | |
parent | ba9d512239eb5ed9b80648cfde291d483e6e390e (diff) | |
parent | e6f5edbb0c1c83f32cefd77a004d250543a77fc9 (diff) |
Merge branch 'vue-rewrite' into share-item
Signed-off-by: devlinjunker <devlin.junker@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/components/AddFeed.vue | 5 | ||||
-rw-r--r-- | src/components/Sidebar.vue | 14 | ||||
-rw-r--r-- | src/components/SidebarFeedLinkActions.vue | 1 | ||||
-rw-r--r-- | src/components/feed-display/FeedItemRow.vue | 2 | ||||
-rw-r--r-- | src/main.js | 10 |
5 files changed, 25 insertions, 7 deletions
diff --git a/src/components/AddFeed.vue b/src/components/AddFeed.vue index 6e0aac0a8..77f5e5b6e 100644 --- a/src/components/AddFeed.vue +++ b/src/components/AddFeed.vue @@ -151,6 +151,11 @@ export default Vue.extend({ || (this.createNewFolder && (this.newFolderName === '' || this.folderNameExists()))) }, }, + created() { + if (this.$route.query.subscribe_to) { + this.feedUrl = this.$route.query.subscribe_to as string + } + }, methods: { /** * Adds a New Feed via the Vuex Store diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index f29e6503e..805b3bdb4 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -48,7 +48,8 @@ :name="topLevelItem.name || topLevelItem.title" :icon="''" :to="isFolder(topLevelItem) ? { name: ROUTES.FOLDER, params: { folderId: topLevelItem.id.toString() }} : { name: ROUTES.FEED, params: { feedId: topLevelItem.id.toString() } }" - :allow-collapse="true"> + :allow-collapse="true" + :force-menu="true"> <template #default> <NcAppNavigationItem v-for="feed in topLevelItem.feeds" :key="feed.name" @@ -85,14 +86,13 @@ </template> <template #actions> <SidebarFeedLinkActions v-if="topLevelItem.name === undefined && !topLevelItem.url.includes('news/sharedwithme')" :feed-id="topLevelItem.id" /> - <NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-checkmark" @click="markFolderRead(topLevelItem)"> {{ t("news", "Mark read") }} </NcActionButton> <NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-rename" @click="renameFolder(topLevelItem)"> {{ t("news", "Rename") }} </NcActionButton> - <NcActionButton icon="icon-delete" @click="deleteFolder(topLevelItem)"> + <NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-delete" @click="deleteFolder(topLevelItem)"> {{ t("news", "Delete") }} </NcActionButton> </template> @@ -121,7 +121,6 @@ import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js' import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew.js' import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js' import NcAppNavigationNewItem from '@nextcloud/vue/dist/Components/NcAppNavigationNewItem.js' -// import AppNavigationCounter from '@nextcloud/vue/dist/Components/AppNavigationCounter' import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js' import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js' @@ -136,6 +135,7 @@ import { ROUTES } from '../routes' import { ACTIONS, AppState } from '../store' import AddFeed from './AddFeed.vue' +import SidebarFeedLinkActions from './SidebarFeedLinkActions.vue' import { Folder } from '../types/Folder' import { Feed } from '../types/Feed' @@ -175,6 +175,7 @@ export default Vue.extend({ EarthIcon, FolderPlusIcon, PlusIcon, + SidebarFeedLinkActions, }, data: () => { return { @@ -186,6 +187,11 @@ export default Vue.extend({ ...mapState(['feeds', 'folders', 'items']), ...mapState(SideBarState), }, + created() { + if (this.$route.query.subscribe_to) { + this.showAddFeed = true + } + }, methods: { newFolder(value: string) { const folderName = value.trim() diff --git a/src/components/SidebarFeedLinkActions.vue b/src/components/SidebarFeedLinkActions.vue index 8ae1e258b..4c7f082c8 100644 --- a/src/components/SidebarFeedLinkActions.vue +++ b/src/components/SidebarFeedLinkActions.vue @@ -86,7 +86,6 @@ <RssIcon /> </template> </NcAppNavigationItem> - </span> </template> diff --git a/src/components/feed-display/FeedItemRow.vue b/src/components/feed-display/FeedItemRow.vue index a84f0a907..45b9f34ae 100644 --- a/src/components/feed-display/FeedItemRow.vue +++ b/src/components/feed-display/FeedItemRow.vue @@ -207,7 +207,7 @@ export default Vue.extend({ align-self: start; } - .button-container .action-item .button-vue, .button-container .material-design-icon { + .feed-item-row .button-container .button-vue, .feed-item-row .button-container .button-vue .button-vue__wrapper, .feed-item-row .button-container .material-design-icon { width: 30px !important; min-width: 30px; min-height: 30px; diff --git a/src/main.js b/src/main.js index e2ddda527..571646471 100644 --- a/src/main.js +++ b/src/main.js @@ -23,6 +23,14 @@ const store = new Store(mainStore) export default new Vue({ router, store, - el: '#content', + el: '#q-app', render: (h) => h(App), }) + +/** + * Closes warning messages generated by PHP code + */ +function closeCronWarning() { + document.getElementById('cron-warning').style.display = 'none' +} +document.getElementById('close-cron-warning').onclick = closeCronWarning |