Merge branch 'master' into feature/upload-progress-indicators-take-two

This commit is contained in:
Oleg Lobanov 2024-04-28 20:13:06 +02:00 committed by GitHub
commit 04d2e59928
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 4 deletions

View File

@ -1,5 +1,6 @@
<template> <template>
<VueFinalModal <VueFinalModal
class="vfm-modal"
overlay-transition="vfm-fade" overlay-transition="vfm-fade"
content-transition="vfm-fade" content-transition="vfm-fade"
@closed="layoutStore.closeHovers" @closed="layoutStore.closeHovers"
@ -7,7 +8,6 @@
initialFocus: '#focus-prompt', initialFocus: '#focus-prompt',
fallbackFocus: 'div.vfm__content', fallbackFocus: 'div.vfm__content',
}" }"
style="z-index: 9999999"
> >
<slot /> <slot />
</VueFinalModal> </VueFinalModal>

View File

@ -17,7 +17,7 @@
</button> </button>
<button <button
class="button button--flat" class="button button--flat"
@click="layoutStore.currentPrompt?.confirm()" @click="layoutStore.currentPrompt?.confirm"
tabindex="2" tabindex="2"
> >
{{ t("buttons.delete") }} {{ t("buttons.delete") }}

View File

@ -178,3 +178,7 @@ html[dir="rtl"] .breadcrumbs a {
.vue-number-input__button::after { .vue-number-input__button::after {
background: var(--textSecondary) !important; background: var(--textSecondary) !important;
} }
.vfm-modal {
z-index: 9999999 !important;
}

View File

@ -234,6 +234,10 @@ main .spinner .bounce2 {
height: 100%; height: 100%;
} }
#previewer .vjs-error-display {
margin-top: 40%;
}
#previewer .preview .info { #previewer .preview .info {
position: absolute; position: absolute;
top: 50%; top: 50%;
@ -265,6 +269,7 @@ main .spinner .bounce2 {
#previewer .pdf { #previewer .pdf {
width: 100%; width: 100%;
height: 100%; height: 100%;
margin-top: 4em;
} }
#previewer h2.message { #previewer h2.message {

View File

@ -1,7 +1,7 @@
import { useAuthStore } from "@/stores/auth"; import { useAuthStore } from "@/stores/auth";
import router from "@/router"; import router from "@/router";
import { JwtPayload, jwtDecode } from "jwt-decode"; import { JwtPayload, jwtDecode } from "jwt-decode";
import { baseURL } from "./constants"; import { baseURL, noAuth } from "./constants";
import { StatusError } from "@/api/utils"; import { StatusError } from "@/api/utils";
export function parseToken(token: string) { export function parseToken(token: string) {
@ -98,5 +98,9 @@ export function logout() {
authStore.clearUser(); authStore.clearUser();
localStorage.setItem("jwt", ""); localStorage.setItem("jwt", "");
router.push({ path: "/login" }); if (noAuth) {
window.location.reload();
} else {
router.push({path: "/login"});
}
} }