Flaschengeist/flaschengeist-frontend
Flaschengeist
/
flaschengeist-frontend
7
0
Fork 1
Code Issues Pull Requests Projects Releases Activity

release v2.0.0 #4

Merged
crimsen merged 481 commits from develop into master 2024-01-18 15:15:08 +00:00
Conversation 0 Commits 481 Files Changed 156 +9 -3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d54b398c14 - Show all commits

6
src/boot/axios.ts
View File

@ -40,9 +40,13 @@ export default boot<UserSessionState>(({ app, store, router }) => {
e.code === 'ECONNABORTED' || e.code === 'ECONNABORTED' ||
(e.response && e.response.status >= 502 && e.response.status <= 504) (e.response && e.response.status >= 502 && e.response.status <= 504)
) { ) {
const current = router.currentRoute.value;
let next = current.path;
if ((current.name == 'login' || current.name == 'offline') && current.query.redirect)
next = <string>current.query.redirect;
return router.push({ return router.push({
name: 'offline', name: 'offline',
query: { redirect: router.currentRoute.value.fullPath }, query: { redirect: next },
}); });
} else if (e.response && e.response.status == 401) { } else if (e.response && e.response.status == 401) {
if (router.currentRoute.value.name !== 'login') if (router.currentRoute.value.name !== 'login')

6
src/pages/Offline.vue
View File

@ -46,8 +46,10 @@ export default defineComponent({
const ival = setInterval(() => { const ival = setInterval(() => {
reload.value -= 1; reload.value -= 1;
if (reload.value === 0) { if (reload.value === 0) {
const path = <string | null>router.currentRoute.value.query.redirect || '/login'; const path = router.currentRoute.value.query.redirect;
void router.replace({ path: path }); console.log('Offline: ');
console.log(path);
void router.replace(path ? { path: <string>path } : { name: 'login' });
} }
}, 1000); }, 1000);
onUnmounted(() => clearInterval(ival)); onUnmounted(() => clearInterval(ival));