View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/541 Closes #520 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Marie <marie@kaifa.ch>
This commit is contained in:
commit
8f3549b494
3 changed files with 11 additions and 6 deletions
|
@ -224,7 +224,7 @@ export async function mainBoot() {
|
||||||
if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) {
|
if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) {
|
||||||
toast(i18n.tsx.welcomeBackWithName({
|
toast(i18n.tsx.welcomeBackWithName({
|
||||||
name: $i.name || $i.username,
|
name: $i.name || $i.username,
|
||||||
}));
|
}), true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
miLocalStorage.setItem('lastUsed', Date.now().toString());
|
miLocalStorage.setItem('lastUsed', Date.now().toString());
|
||||||
|
|
|
@ -14,7 +14,8 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
>
|
>
|
||||||
<div v-if="showing" class="_acrylic" :class="$style.root" :style="{ zIndex }">
|
<div v-if="showing" class="_acrylic" :class="$style.root" :style="{ zIndex }">
|
||||||
<div style="padding: 16px 24px;">
|
<div style="padding: 16px 24px;">
|
||||||
{{ message }}
|
<Mfm v-if="renderMfm" :text="message" plain/>
|
||||||
|
<template v-else>{{ message }}</template>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Transition>
|
</Transition>
|
||||||
|
@ -26,9 +27,12 @@ import { onMounted, ref } from 'vue';
|
||||||
import * as os from '@/os.js';
|
import * as os from '@/os.js';
|
||||||
import { defaultStore } from '@/store.js';
|
import { defaultStore } from '@/store.js';
|
||||||
|
|
||||||
defineProps<{
|
withDefaults(defineProps<{
|
||||||
message: string;
|
message: string;
|
||||||
}>();
|
renderMfm: boolean;
|
||||||
|
}>(), {
|
||||||
|
renderMfm: false,
|
||||||
|
});
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
(ev: 'closed'): void;
|
(ev: 'closed'): void;
|
||||||
|
|
|
@ -211,9 +211,10 @@ export function pageWindow(path: string) {
|
||||||
}, {}, 'closed');
|
}, {}, 'closed');
|
||||||
}
|
}
|
||||||
|
|
||||||
export function toast(message: string) {
|
export function toast(message: string, renderMfm = false) {
|
||||||
popup(MkToast, {
|
popup(MkToast, {
|
||||||
message,
|
message,
|
||||||
|
renderMfm,
|
||||||
}, {}, 'closed');
|
}, {}, 'closed');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue