From bbb135eb506e47eaeee7a5c34194ac05b0732a47 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Tue, 9 Jan 2024 11:41:52 +0100
Subject: [PATCH] fix: leftovers

---
 src/lib/components/consent.svelte | 33 ++++++++++++++++++-------------
 src/lib/layout/footer.svelte      |  7 +++++++
 src/routes/+layout.svelte         |  8 +++++---
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/lib/components/consent.svelte b/src/lib/components/consent.svelte
index 56fd12fab..b5fb8e64e 100644
--- a/src/lib/components/consent.svelte
+++ b/src/lib/components/consent.svelte
@@ -1,6 +1,18 @@
 <script lang="ts" context="module">
+    type Consent = {
+        key: string;
+        accepted: Record<string, boolean>;
+    };
     export const settings = writable<boolean>(false);
     export const show = writable<boolean>(false);
+    export const consent = writable<Consent>(
+        JSON.parse(globalThis?.localStorage?.getItem('consent') ?? null)
+    );
+    consent.subscribe((value) => {
+        if (browser) {
+            globalThis.localStorage.setItem('consent', JSON.stringify(value));
+        }
+    });
 </script>
 
 <script lang="ts">
@@ -8,11 +20,7 @@
     import { Modal } from '.';
     import { Button } from '$lib/elements/forms';
     import { writable } from 'svelte/store';
-
-    type Consent = {
-        key: string;
-        accepted: Record<string, boolean>;
-    };
+    import { browser } from '$app/environment';
 
     const key = new Date('2023-11-07');
     const dispatch = createEventDispatcher();
@@ -20,13 +28,10 @@
     let selected = {};
 
     onMount(() => {
-        const consent: Consent = JSON.parse(localStorage.getItem('consent'));
-        if (consent) {
-            const date = new Date(consent.key);
+        if ($consent) {
+            const date = new Date($consent.key);
             if (key > date) {
                 show.set(true);
-            } else {
-                dispatch('confirm', consent);
             }
         } else {
             show.set(true);
@@ -34,7 +39,7 @@
     });
 
     function saveSettings(obj: Consent) {
-        localStorage.setItem('consent', JSON.stringify(obj));
+        consent.set(obj);
     }
 
     function confirmChoices(choices: Consent['accepted']) {
@@ -59,7 +64,7 @@
     }
 </script>
 
-{#if show}
+{#if $show}
     <div class="card is-consent">
         <p>
             By clicking "Accept all", you agree to the storing of cookies on your device to analyze
@@ -68,7 +73,7 @@
 
         <div class="u-flex u-margin-block-start-16 u-main-space-between u-cross-center">
             <div>
-                <Button secondary on:click={() => (settings.set(true))}>Cookie settings</Button>
+                <Button secondary on:click={() => settings.set(true)}>Cookie settings</Button>
             </div>
             <div class="u-flex u-gap-16">
                 <Button on:click={rejectAll} secondary>Only required</Button>
@@ -78,7 +83,7 @@
     </div>
 {/if}
 
-{#if settings}
+{#if $settings}
     <Modal bind:show={$settings} title="Cookie Preferences">
         <p>
             We use cookies to improve your site experience. The "strictly necessary" cookies are
diff --git a/src/lib/layout/footer.svelte b/src/lib/layout/footer.svelte
index 7c318ad55..efc2e228b 100644
--- a/src/lib/layout/footer.svelte
+++ b/src/lib/layout/footer.svelte
@@ -1,4 +1,6 @@
 <script>
+    import { settings } from '$lib/components/consent.svelte';
+    import Button from '$lib/elements/forms/button.svelte';
     import { isCloud } from '$lib/system';
     import { version } from '$routes/console/store';
 
@@ -39,6 +41,11 @@
                     <span class="text">Privacy</span>
                 </a>
             </li>
+            <li class="inline-links-item">
+                <Button text on:click={() => settings.set(true)}>
+                    <span class="text">Support</span>
+                </Button>
+            </li>
         </ul>
     </div>
     <div class="main-footer-end">
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index f26327087..5bde43af4 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -16,7 +16,7 @@
     import Loading from './loading.svelte';
     import { loading, requestedMigration } from './store';
     import { parseIfString } from '$lib/helpers/object';
-    import Consent from '$lib/components/consent.svelte';
+    import Consent, { consent } from '$lib/components/consent.svelte';
 
     if (browser) {
         window.VERCEL_ANALYTICS_ID = import.meta.env.VERCEL_ANALYTICS_ID?.toString() ?? false;
@@ -52,7 +52,7 @@
             /**
              * LogRocket
              */
-            if (isCloud && isTrackingAllowed()) {
+            if ($consent?.accepted?.logrocket && isCloud && isTrackingAllowed()) {
                 LogRocket.init('rgthvf/appwrite', {
                     dom: {
                         inputSanitizer: true
@@ -125,7 +125,9 @@
 </script>
 
 <Notifications />
-<Consent />
+{#if isCloud}
+    <Consent />
+{/if}
 
 <slot />