Mirrors/cobalt
1
0
Fork 0
mirror of https://github.com/wukko/cobalt.git synced 2025-02-24 12:08:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

web: load turnstile only in save tab and only once

Browse source 
turnstile will stay in background after being loaded once (just like before), but now it will not load on pages other than save if they are opened first
This commit is contained in:
wukko 2024-09-05 00:04:41 +06:00
parent f0f5d7be7e
commit 49460bd16d
No known key found for this signature in database
GPG key ID: 3E30B3F26C7B4AA2
3 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
web/src/components/misc/Turnstile.svelte
View file

@ -2,7 +2,7 @@
import env from "$lib/env"; import env from "$lib/env";
import { onMount } from "svelte"; import { onMount } from "svelte";
import { turnstileLoaded } from "$lib/state/turnstile"; import { turnstileLoaded, turnstileCreated } from "$lib/state/turnstile";
let turnstileElement: HTMLElement; let turnstileElement: HTMLElement;
let turnstileScript: HTMLElement; let turnstileScript: HTMLElement;
@ -10,6 +10,9 @@
onMount(() => { onMount(() => {
const sitekey = env.TURNSTILE_KEY; const sitekey = env.TURNSTILE_KEY;
if (!sitekey) return; if (!sitekey) return;
$turnstileCreated = true;
const setup = () => { const setup = () => {
window.turnstile?.render(turnstileElement, { window.turnstile?.render(turnstileElement, {
sitekey, sitekey,

1
web/src/lib/state/turnstile.ts
View file

@ -1,3 +1,4 @@
import { writable } from "svelte/store"; import { writable } from "svelte/store";
export const turnstileLoaded = writable(false); export const turnstileLoaded = writable(false);
export const turnstileCreated = writable(false);

25
web/src/routes/+layout.svelte
View file

@ -1,18 +1,21 @@
<script lang="ts"> <script lang="ts">
import { afterNavigate } from "$app/navigation";
import { updated } from "$app/stores";
import { browser } from "$app/environment";
import env from "$lib/env";
import settings from "$lib/state/settings";
import { device, app } from "$lib/device";
import locale from "$lib/i18n/locale";
import currentTheme, { statusBarColors } from "$lib/state/theme";
import "@fontsource/ibm-plex-mono/400.css"; import "@fontsource/ibm-plex-mono/400.css";
import "@fontsource/ibm-plex-mono/400-italic.css"; import "@fontsource/ibm-plex-mono/400-italic.css";
import "@fontsource/ibm-plex-mono/500.css"; import "@fontsource/ibm-plex-mono/500.css";
import { page } from "$app/stores";
import { updated } from "$app/stores";
import { browser } from "$app/environment";
import { afterNavigate } from "$app/navigation";
import env from "$lib/env";
import settings from "$lib/state/settings";
import locale from "$lib/i18n/locale";
import { device, app } from "$lib/device";
import { turnstileCreated } from "$lib/state/turnstile";
import currentTheme, { statusBarColors } from "$lib/state/theme";
import Sidebar from "$components/sidebar/Sidebar.svelte"; import Sidebar from "$components/sidebar/Sidebar.svelte";
import Turnstile from "$components/misc/Turnstile.svelte"; import Turnstile from "$components/misc/Turnstile.svelte";
import NotchSticker from "$components/misc/NotchSticker.svelte"; import NotchSticker from "$components/misc/NotchSticker.svelte";
@ -64,7 +67,7 @@
<DialogHolder /> <DialogHolder />
<Sidebar /> <Sidebar />
<div id="content"> <div id="content">
{#if env.TURNSTILE_KEY} {#if (env.TURNSTILE_KEY && $page.url.pathname === "/") || $turnstileCreated}
<Turnstile /> <Turnstile />
{/if} {/if}
<slot></slot> <slot></slot>