MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix currentRoute

This commit is contained in:
Kasper Seweryn 2022-04-30 20:07:40 +02:00 committed by Georg Krause
parent 260fdb2501
commit 51435d0742
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/components/audio/PlayButton.vue
View File

@ -193,7 +193,7 @@ export default {
return null return null
}, },
onTrackPage () { onTrackPage () {
return this.$router.currentRoute.name === 'library.tracks.detail' return this.$router.currentRoute.value.name === 'library.tracks.detail'
} }
}, },
watch: { watch: {

2
front/src/components/library/Home.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<main <main
:key="$router.currentRoute.name" :key="$router.currentRoute.value.name"
v-title="labels.title" v-title="labels.title"
> >
<section class="ui vertical stripe segment"> <section class="ui vertical stripe segment">

2
front/src/components/library/Library.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="main pusher page-library"> <div class="main pusher page-library">
<router-view :key="$router.currentRoute.fullPath" /> <router-view :key="$router.currentRoute.value.fullPath" />
</div> </div>
</template> </template>

4
front/src/init/axios.ts
View File

@ -29,8 +29,8 @@ export const install: InitModule = ({ app, store, router }) => {
error.backendErrors = [] error.backendErrors = []
if (store.state.auth.authenticated && !store.state.auth.oauth.accessToken && error.response.status === 401) { if (store.state.auth.authenticated && !store.state.auth.oauth.accessToken && error.response.status === 401) {
store.commit('auth/authenticated', false) store.commit('auth/authenticated', false)
logger.default.warn('Received 401 response from API, redirecting to login form', router.currentRoute.fullPath) logger.default.warn('Received 401 response from API, redirecting to login form', router.currentRoute.value.fullPath)
await router.push({ name: 'login', query: { next: router.currentRoute.fullPath } }) await router.push({ name: 'login', query: { next: router.currentRoute.value.fullPath } })
} }
if (error.response.status === 404) { if (error.response.status === 404) {

4
front/src/types.ts
View File

@ -1,6 +1,6 @@
import type { App } from 'vue' import type { App } from 'vue'
import type { Store } from 'vuex' import type { Store } from 'vuex'
import type VueRouter from 'vue-router' import { Router } from 'vue-router'
declare global { declare global {
interface Window { interface Window {
@ -12,7 +12,7 @@ declare global {
// App structure stuff // App structure stuff
export interface InitModuleContext { export interface InitModuleContext {
app: App app: App
router: VueRouter router: Router
store: Store<any> store: Store<any>
} }

7
front/src/utils/index.ts
View File

@ -1,6 +1,6 @@
import { startCase } from 'lodash-es' import { startCase } from 'lodash-es'
import { Store } from 'vuex' import { Store } from 'vuex'
import VueRouter from 'vue-router' import { Router } from 'vue-router'
import { APIErrorResponse } from '~/types' import { APIErrorResponse } from '~/types'
export function setUpdate (obj: object, statuses: { [key: string]: unknown }, value: unknown) { export function setUpdate (obj: object, statuses: { [key: string]: unknown }, value: unknown) {
@ -51,9 +51,10 @@ export function setCsrf (xhr: XMLHttpRequest) {
} }
} }
export async function checkRedirectToLogin (store: Store<any>, router: VueRouter) { // TODO (wvffle): Use navigation guards
export async function checkRedirectToLogin (store: Store<any>, router: Router) {
if (!store.state.auth.authenticated) { if (!store.state.auth.authenticated) {
return router.push({ name: 'login', query: { next: router.currentRoute.fullPath } }) return router.push({ name: 'login', query: { next: router.currentRoute.value.fullPath } })
} }
} }