diff --git a/src/legacy_scripts/feedSettings.js b/src/legacy_scripts/feedSettings.js deleted file mode 100644 index 4bb132a6..00000000 --- a/src/legacy_scripts/feedSettings.js +++ /dev/null @@ -1,76 +0,0 @@ -/** - * @copyright Copyright (c) 2016 Joas Schilling - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -$(function() { - OCA.Activity = OCA.Activity || {}; - - OCA.Activity.FeedSettings = { - urlInput: null, - enableCheckbox: null, - - init: function () { - this.urlInput = $('#rssurl'); - this.enableCheckbox = $('#enable_rss'); - this.enableCheckbox.change(_.bind(this._toggle, this)); - }, - - _toggle: function (event) { - var self = this; - - $.ajax({ - url: OC.generateUrl('/apps/activity/settings/feed'), - type: 'post', - data: { - enable: event.target.checked - }, - success: function(response) { - if (event.target.checked) { - self.urlInput.find('input').val(response.data.rsslink); - self.urlInput.removeClass('hidden'); - } else { - self.urlInput.addClass('hidden'); - self.urlInput.find('input').val(response.data.rsslink); - } - } - }); - } - }; - - // Clipboard! - var clipboard = new Clipboard('#rssurl .icon-clippy'); - clipboard.on('success', function(e) { - $input = $(e.trigger); - OC.Notification.show(t('core', 'Copied!'), {type: 'success'}); - }); - clipboard.on('error', function (e) { - $input = $(e.trigger); - var actionMsg = ''; - if (/iPhone|iPad/i.test(navigator.userAgent)) { - actionMsg = t('core', 'Not supported!'); - } else if (/Mac/i.test(navigator.userAgent)) { - actionMsg = t('core', 'Press ⌘-C to copy.'); - } else { - actionMsg = t('core', 'Press Ctrl-C to copy.'); - } - OC.Notification.show(actionMsg, {type: 'error'}); - }); - - OCA.Activity.FeedSettings.init(); -}); diff --git a/src/routes.ts b/src/routes.ts index d961f6cc..5ccdb84f 100644 --- a/src/routes.ts +++ b/src/routes.ts @@ -1,5 +1,28 @@ +/** + * @copyright Copyright (c) 2023 Nextcloud GmbH + * + * @author Ferdinand Thiessen + * + * @license AGPL-3.0-or-later + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + import type { RouteConfig } from 'vue-router' -import ActivityFeed from './views/ActivityFeed.vue' +import ActivityAppFeed from './views/ActivityAppFeed.vue' +import ActivityAppNavigation from './views/ActivityAppNavigation.vue' export const routes = [ { @@ -8,8 +31,13 @@ export const routes = [ redirect: { path: '/all' }, }, { - path: '/:view', - component: ActivityFeed, - props: true, + path: '/:filter', + components: { + default: ActivityAppFeed, + navigation: ActivityAppNavigation, + }, + props: { + default: true, + }, }, ] as RouteConfig[] diff --git a/src/views/ActivityApp.vue b/src/views/ActivityApp.vue index 0b4a6845..2038cca1 100644 --- a/src/views/ActivityApp.vue +++ b/src/views/ActivityApp.vue @@ -1,9 +1,9 @@