diff --git a/appinfo/routes.php b/appinfo/routes.php index 53403b63157c29ac256c48a192e5f7be14a119c7..c9a721bda8489577ea818a5cdf7213fa668dd005 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -59,16 +59,6 @@ return [ ], // Settings - [ - 'name' => 'settings#set_menu_state', - 'url' => '/settings/menuState', - 'verb' => 'POST' - ], - [ - 'name' => 'settings#get_menu_state', - 'url' => '/settings/menuState', - 'verb' => 'GET' - ], [ 'name' => 'settings#set_volume_state', 'url' => '/settings/volumeState', diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php index 9ee3b8b20042d177e13739002e2d5f2e23292cb0..64375ce6e644ea9eeefda99c922fde38c57c7403 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -95,39 +95,6 @@ class SettingsController extends ApiController { return new JSONResponse(['status' => 'success'], Http::STATUS_OK); } - /** - * set menu state - * - * @param string $menuState - * @return JSONResponse - * - * @NoAdminRequired - */ - public function setMenuState($menuState = ""): JSONResponse { - if ($menuState = 'SEARCH') { - return new JSONResponse(['status' => 'success'], Http::STATUS_OK); - }; - $legalArguments = ['TOP', 'RECENT', 'NEW', 'FAVORITES', 'CATEGORIES']; - if (!in_array($menuState, $legalArguments)) { - return new JSONResponse(['status' => 'error'], Http::STATUS_BAD_REQUEST); - } - return $this->setSetting( - 'menuState', - $menuState - ); - } - - /** - * get menu state - * - * @return JSONResponse - * - * @NoAdminRequired - */ - public function getMenuState(): JSONResponse { - return $this->getSetting('menuState', 'menuState', 'TOP'); - } - /** * set player volume * diff --git a/src/router.js b/src/router.js index 0d368b30baaa6ce683daa2e1e1f58e3d23a61d39..e600e9692f3d2a01ccf6341c7a2f6f30019757a2 100644 --- a/src/router.js +++ b/src/router.js @@ -23,7 +23,6 @@ import Vue from 'vue' import Router from 'vue-router' import { generateUrl } from '@nextcloud/router' -import axios from '@nextcloud/axios' import Main from './components/Main' import Show from './views/Show' @@ -31,20 +30,20 @@ import Episode from './views/Episode' import Browse from './views/Browse' import BrowseAll from './views/BrowseAll' import NotImplemented from './views/NotImplemented' -import store from './store.js' - -import BrowseEmpty from './views/placeholder/Browse' Vue.use(Router) -const requesttoken = axios.defaults.headers.requesttoken const router = new Router({ base: generateUrl('/apps/podcast/'), linkActiveClass: 'active', routes: [ + { + path: '/', + redirect: '/listening', + }, { path: '/listening', - component: BrowseEmpty, + component: NotImplemented, name: 'LISTENING', }, { @@ -83,23 +82,4 @@ const router = new Router({ ], }) -router.beforeEach((to, from, next) => { - - if (to.name) { - store.dispatch('setMenuState', to.name) - next() - } else { - axios.defaults.headers.requesttoken = requesttoken - axios - .get(generateUrl('/apps/podcast/settings/menuState')) - .then(async response => { - const { - data: { menuState: value }, - } = response - next({ name: value }) - }) - } - -}) - export default router