Global config to backstore (#398)

* Loading config variables also in backstore * Wait some ms before assuming there is no configuration file * Updating npm packages
PlebeianApp · Feb 16, 2024 · 958308b · 958308b
1 parent 2daefea
commit 958308b
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 39 deletions.
diff --git a/web/backoffice/package-lock.json b/web/backoffice/package-lock.json
diff --git a/web/backoffice/package.json b/web/backoffice/package.json
@@ -7,14 +7,14 @@
     "@sveltejs/vite-plugin-svelte": "^3.0.2",
     "autoprefixer": "^10.4.17",
     "btc2fiat": "*",
-    "daisyui": "^4.6.1",
+    "daisyui": "^4.7.2",
     "eslint": "^8.56.0",
     "eslint-plugin-svelte": "^2.35.1",
     "nostr-tools": "^1.13.1",
     "npm-run-all": "4.x",
-    "postcss": "^8.4.33",
-    "svelte": "^4.2.9",
-    "svelte-check": "^3.6.3",
+    "postcss": "^8.4.35",
+    "svelte": "^4.2.11",
+    "svelte-check": "^3.6.4",
     "svelte-toasts": "1.x",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.0.0",

diff --git a/web/backoffice/src/routes/+layout.js b/web/backoffice/src/routes/+layout.js
@@ -0,0 +1,16 @@
+import {getConfigurationFromFile} from "$sharedLib/utils";
+import {fileConfiguration} from "$sharedLib/stores";
+import { browser } from "$app/environment";
+
+// Load configuration from file before
+// any other component code runs
+async function loadConfig() {
+    let config = await getConfigurationFromFile() ?? {};
+    config.backend_present = true;
+    fileConfiguration.set(config);
+}
+
+if (browser) {
+    loadConfig()
+        .catch(error => console.log('Error while trying to load config from file:', error));
+}
diff --git a/web/backoffice/src/routes/+layout.svelte b/web/backoffice/src/routes/+layout.svelte
@@ -5,13 +5,51 @@
     import { browser } from '$app/environment';
     import { page } from '$app/stores';
     import { user } from "$lib/stores";
-    import { Info, Error, token, NostrPublicKey } from "$sharedLib/stores";
+    import {
+        Info,
+        Error,
+        token,
+        NostrPublicKey,
+        fileConfiguration,
+        isSuperAdmin,
+        NostrGlobalConfig
+    } from "$sharedLib/stores";
     import type { Placement } from "$sharedLib/stores";
     import { getProfile } from "$lib/services/api";
     import Navbar from "$sharedLib/components/Navbar.svelte";
     import Footer from "$sharedLib/components/Footer.svelte";
     import LoginModalLightning from "$lib/components/auth/Modal.svelte";
     import LoginModal from "$sharedLib/components/login/Modal.svelte";
+    import {getConfigurationKey, subscribeConfiguration} from "$sharedLib/services/nostr";
+
+    function subscribeGlobalConf() {
+        let receivedAt = 0;
+
+        const serializedGlobalConfig = localStorage.getItem("NostrGlobalConfig");
+        if (serializedGlobalConfig) {
+            $NostrGlobalConfig = JSON.parse(serializedGlobalConfig);
+            receivedAt = parseInt(localStorage.getItem("NostrGlobalConfigReceivedAt") ?? '0');
+        }
+
+        subscribeConfiguration($fileConfiguration.admin_pubkeys, [getConfigurationKey('site_specific_config')],
+            (setup, rcAt) => {
+                if (rcAt > receivedAt) {
+                    receivedAt = rcAt;
+
+                    $NostrGlobalConfig = setup;
+                    localStorage.setItem('NostrGlobalConfig', JSON.stringify(setup));
+                    localStorage.setItem('NostrGlobalConfigReceivedAt', receivedAt.toString());
+                }
+            });
+    }
+
+    $: if ($fileConfiguration?.admin_pubkeys?.length > 0) {
+        subscribeGlobalConf();
+    }
+
+    $: if ($NostrPublicKey && $fileConfiguration?.admin_pubkeys?.includes($NostrPublicKey)) {
+        $isSuperAdmin = true;
+    }
 
 	const infoUnsubscribe = Info.subscribe(value => {
         if (value) {

diff --git a/web/frontoffice/package-lock.json b/web/frontoffice/package-lock.json
diff --git a/web/frontoffice/package.json b/web/frontoffice/package.json
@@ -15,7 +15,7 @@
     "eslint-plugin-svelte": "^2.35.1",
     "npm-run-all": "4.x",
     "postcss": "^8.4.35",
-    "svelte": "^4.2.10",
+    "svelte": "^4.2.11",
     "svelte-check": "^3.6.4",
     "svelte-dnd-action": "^0.9.38",
     "svelte-meta-tags": "^3.1.0",

diff --git a/web/shared/package-lock.json b/web/shared/package-lock.json
diff --git a/web/shared/package.json b/web/shared/package.json
@@ -35,8 +35,8 @@
 		"eslint": "^8.56.0",
 		"eslint-plugin-svelte": "^2.35.1",
 		"publint": "^0.2.7",
-		"svelte": "^4.2.10",
-		"svelte-check": "^3.6.3",
+		"svelte": "^4.2.11",
+		"svelte-check": "^3.6.4",
 		"tslib": "^2.6.2",
 		"typescript": "^5.0.0",
 		"vite": "^5.0.12"

diff --git a/web/shared/src/lib/components/Navbar.svelte b/web/shared/src/lib/components/Navbar.svelte
@@ -99,6 +99,11 @@
 
         virtualPages = getPages();
 
+        let retries = 5;
+        while ((!$fileConfiguration || Object.keys($fileConfiguration).length === 0) && retries-- > 0) {
+            await new Promise(resolve => setTimeout(resolve, 30));
+        }
+
         if ($fileConfiguration?.admin_pubkeys?.length > 0) {
             let allPagesListReceivedAt = 0;