Merge branch 'master' into feature/upload-progress-indicators-take-two
This commit is contained in:
commit
04d2e59928
@ -1,5 +1,6 @@
|
||||
<template>
|
||||
<VueFinalModal
|
||||
class="vfm-modal"
|
||||
overlay-transition="vfm-fade"
|
||||
content-transition="vfm-fade"
|
||||
@closed="layoutStore.closeHovers"
|
||||
@ -7,7 +8,6 @@
|
||||
initialFocus: '#focus-prompt',
|
||||
fallbackFocus: 'div.vfm__content',
|
||||
}"
|
||||
style="z-index: 9999999"
|
||||
>
|
||||
<slot />
|
||||
</VueFinalModal>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
</button>
|
||||
<button
|
||||
class="button button--flat"
|
||||
@click="layoutStore.currentPrompt?.confirm()"
|
||||
@click="layoutStore.currentPrompt?.confirm"
|
||||
tabindex="2"
|
||||
>
|
||||
{{ t("buttons.delete") }}
|
||||
|
||||
@ -178,3 +178,7 @@ html[dir="rtl"] .breadcrumbs a {
|
||||
.vue-number-input__button::after {
|
||||
background: var(--textSecondary) !important;
|
||||
}
|
||||
|
||||
.vfm-modal {
|
||||
z-index: 9999999 !important;
|
||||
}
|
||||
|
||||
@ -234,6 +234,10 @@ main .spinner .bounce2 {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
#previewer .vjs-error-display {
|
||||
margin-top: 40%;
|
||||
}
|
||||
|
||||
#previewer .preview .info {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
@ -265,6 +269,7 @@ main .spinner .bounce2 {
|
||||
#previewer .pdf {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
margin-top: 4em;
|
||||
}
|
||||
|
||||
#previewer h2.message {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import { useAuthStore } from "@/stores/auth";
|
||||
import router from "@/router";
|
||||
import { JwtPayload, jwtDecode } from "jwt-decode";
|
||||
import { baseURL } from "./constants";
|
||||
import { baseURL, noAuth } from "./constants";
|
||||
import { StatusError } from "@/api/utils";
|
||||
|
||||
export function parseToken(token: string) {
|
||||
@ -98,5 +98,9 @@ export function logout() {
|
||||
authStore.clearUser();
|
||||
|
||||
localStorage.setItem("jwt", "");
|
||||
router.push({ path: "/login" });
|
||||
if (noAuth) {
|
||||
window.location.reload();
|
||||
} else {
|
||||
router.push({path: "/login"});
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user