From 109095e35e8a8642dba77711e785cc8ae842d1aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Thu, 7 Dec 2023 19:51:23 +0100 Subject: [PATCH] feat: re-introduce background sync --- src/routes/+layout.svelte | 3 -- src/routes/Footer.svelte | 4 +++ src/routes/SyncOverlay.svelte | 60 +++++++++-------------------------- 3 files changed, 19 insertions(+), 48 deletions(-) diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 50a744e6..f22ee9bb 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -23,7 +23,6 @@ import Footer from "./Footer.svelte" import {runLayoutDetection} from "$lib/os-layout.js" import PageTransition from "./PageTransition.svelte" - import SyncOverlay from "./SyncOverlay.svelte" import {restoreFromFile} from "$lib/backup/backup" import {goto} from "$app/navigation" @@ -77,8 +76,6 @@ - - diff --git a/src/routes/Footer.svelte b/src/routes/Footer.svelte index 1e578eca..49cd9bb1 100644 --- a/src/routes/Footer.svelte +++ b/src/routes/Footer.svelte @@ -7,6 +7,7 @@ import {detectLocale, locales} from "../i18n/i18n-util" import {loadLocaleAsync} from "../i18n/i18n-util.async" import {tick} from "svelte" + import SyncOverlay from "./SyncOverlay.svelte" let locale = (browser && (localStorage.getItem("locale") as Locales)) || detectLocale() $: if (browser) @@ -45,6 +46,9 @@ > + + +
  • diff --git a/src/routes/SyncOverlay.svelte b/src/routes/SyncOverlay.svelte index 145e77ee..e487295e 100644 --- a/src/routes/SyncOverlay.svelte +++ b/src/routes/SyncOverlay.svelte @@ -1,49 +1,30 @@ - - {#if message === "downloading"} -

    {$LL.sync.TITLE_READ()}

    - {:else} -

    {$LL.sync.TITLE_WRITE()}

    - {/if} - -
    +{#if $syncStatus !== "done"} +
    + + {#if $syncStatus === "downloading"} +
    {$LL.sync.TITLE_READ()}
    + {:else} +
    {$LL.sync.TITLE_WRITE()}
    + {/if} +
    +{/if}