Serve front office config from Nginx.

README.dev.md

@@ -94,5 +94,4 @@ Give a look to the `getChannelIdForStall` function to know how we're generating
 
 ## Keys used in the code
 
-* `VITE_NOSTR_MARKET_SQUARE_CHANNEL_ID` - Nostr channel id of the Market Square for each community
 * `VITE_NOSTR_PM_STALL_PUBLIC_KEY` - Nostr public key of Plebeian Market's market stall

services/nginx/Dockerfile

@@ -1,6 +1,7 @@
 FROM nginx:1.25-alpine-slim
 
-RUN rm /etc/nginx/conf.d/default.conf
+RUN mkdir /front-office-config && rm /etc/nginx/conf.d/default.conf
+COPY ./web/frontoffice/static/config-pm.json /front-office-config/config.json
 COPY ./services/nginx/nginx.conf /etc/nginx/conf.d/nginx.conf
 
 EXPOSE 80

services/nginx/nginx.conf

@@ -44,6 +44,10 @@ server {
         alias /media/;
     }
 
+    location /front-office-config {
+        alias /front-office-config/;
+    }
+
     location / {
         add_header Access-Control-Allow-Origin *;
         root /front-office-app;

web/Dockerfile

@@ -6,8 +6,6 @@ COPY ./web /web
 
 COPY ./install.sh /web/frontoffice/static/
 
-RUN mv /web/frontoffice/static/config-pm.json /web/frontoffice/static/config.json
-
 RUN cd /web/shared \
  && npm install
 

web/backoffice/.env

@@ -1,4 +1,3 @@
 VITE_TWITTER_USER=@PlebeianMarket
 VITE_PM_DESCRIPTION="Self-sovereign marketplace built on Bitcoin and Lightning"
 VITE_SITE_NAME="Plebeian Market"
-VITE_NOSTR_MARKET_SQUARE_CHANNEL_ID="4211fc228be5af10923f56e60b1b11b8e63bf0ac7dbd3e1e3d767392fdaed4a9"

web/backoffice/.env.production

@@ -1,3 +1,2 @@
 VITE_BASE_URL=${WWW_BASE_URL}/
 VITE_API_BASE_URL=${API_BASE_URL}/
-VITE_NOSTR_MARKET_SQUARE_CHANNEL_ID="dd7aee9576b3d85287c37808cec29260d1a97e83bee4f15153d52851ff7db719"

web/frontoffice/.env

@@ -1,5 +1,4 @@
 VITE_TWITTER_USER=@PlebeianMarket
 VITE_PM_DESCRIPTION="Self-sovereign marketplace built on Bitcoin and Lightning"
 VITE_SITE_NAME="Plebeian Market"
-VITE_NOSTR_MARKET_SQUARE_CHANNEL_ID="4211fc228be5af10923f56e60b1b11b8e63bf0ac7dbd3e1e3d767392fdaed4a9"
 VITE_NOSTR_PM_STALL_PUBLIC_KEY="76cc29acb8008c68b105cf655d34de0b1f7bc0215eaae6bbc83173d6d3f7b987"

web/frontoffice/.env.production

@@ -1,4 +1,3 @@
 VITE_BASE_URL=${WWW_BASE_URL}/
 VITE_API_BASE_URL=${API_BASE_URL}/
-VITE_NOSTR_MARKET_SQUARE_CHANNEL_ID="dd7aee9576b3d85287c37808cec29260d1a97e83bee4f15153d52851ff7db719"
 VITE_NOSTR_PM_STALL_PUBLIC_KEY="28c62ad00fe085a7b2b54a05fdf333367e3e6a4d9650ad1c159f964705b76928"

web/frontoffice/src/lib/components/nostr/Button.svelte

@@ -1,27 +1,23 @@
 <script lang="ts">
     import { sendMessage } from "$sharedLib/services/nostr";
-    import { getChannelIdForStallOwner, pmChannelNostrRoomId } from '$sharedLib/nostr/utils'
+    import { getMarketSquareChannelId } from '$sharedLib/nostr/utils'
     import { Info } from "$lib/stores";
 
     export let pmURL: string | null;
 
-    let nostrRoomId;
+    let nostrRoomId: string | null;
     let message: string;
     let textConfirmationVisible: boolean;
 
-    function getNostrTextModal(location: 'stall' | 'mktSquare' | 'nostrFeed') {
+    async function getNostrTextModal(location: 'mktSquare' | 'nostrFeed') {
         switch (location) {
-            case 'stall':
-                message = 'Hi people! I just listed a new product. Give it a look:';
-//                nostrRoomId = getChannelIdForStallOwner($user);
-                break;
             case 'mktSquare':
                 message = 'Hey! Check the new product I just listed!';
-                nostrRoomId = pmChannelNostrRoomId;
+                nostrRoomId = await getMarketSquareChannelId();
                 break;
             case 'nostrFeed':
                 message = 'Check the product I just published at Plebeian Market!';
-                nostrRoomId = false;
+                nostrRoomId = null;
                 break;
         }
 
@@ -86,9 +82,8 @@
         Share on Nostr
     </label>
     <ul tabindex="0" class="dropdown-content menu p-2 shadow bg-secondary rounded-box w-72">
-        <li><a href="#anchorId" on:click|preventDefault={() => getNostrTextModal("stall")}>My Stall</a></li>
-        <li><a href="#anchorId" on:click|preventDefault={() => getNostrTextModal("mktSquare")}>Market Square</a></li>
-        <li><a href="#anchorId" on:click|preventDefault={() => getNostrTextModal("nostrFeed")}>Public Nostr</a></li>
+        <li><a href="#anchorId" on:click|preventDefault={async () => await getNostrTextModal("mktSquare")}>Market Square</a></li>
+        <li><a href="#anchorId" on:click|preventDefault={async () => await getNostrTextModal("nostrFeed")}>Public Nostr</a></li>
     </ul>
 </div>
 

web/frontoffice/src/routes/marketsquare/+page.svelte

@@ -1,7 +1,14 @@
 <script lang="ts">
+    import { onMount } from 'svelte';
     import NostrChat from "$lib/components/nostr/Chat.svelte";
-    import { pmChannelNostrRoomId } from "$sharedLib/nostr/utils"
+    import { getMarketSquareChannelId } from "$sharedLib/nostr/utils"
     import Titleh1 from "$sharedLib/components/layout/Title-h1.svelte";
+
+    let nostrRoomId: string | null = null;
+
+    onMount(async () => {
+        nostrRoomId = await getMarketSquareChannelId();
+    });
 </script>
 
 <svelte:head>
@@ -10,4 +17,6 @@
 
 <Titleh1>Market Square</Titleh1>
 
-<NostrChat messageLimit={75} nostrRoomId={pmChannelNostrRoomId} isMarketSquare={true} />
+{#if nostrRoomId !== null}
+    <NostrChat messageLimit={75} {nostrRoomId} isMarketSquare={true} />
+{/if}

web/frontoffice/static/config-example.json

@@ -3,5 +3,6 @@
     ""
   ],
   "homepage_banner_image": "",
-  "backend_present": false
+  "backend_present": false,
+  "market_square_channel_id": ""
 }

web/frontoffice/static/config-pm.json

@@ -7,5 +7,6 @@
     "03b5036dc3db82604307c1964d2b926417a91c3b11ef75ba6ca55019e9b7a62a"
   ],
   "homepage_banner_image": "",
-  "backend_present": true
+  "backend_present": true,
+  "market_square_channel_id": "dd7aee9576b3d85287c37808cec29260d1a97e83bee4f15153d52851ff7db719"
 }

web/shared/src/lib/nostr/utils.ts

@@ -2,11 +2,17 @@ import {getEventHash, nip05, nip19, Kind, getSignature, getPublicKey} from "nost
 import {goto} from "$app/navigation";
 import {get} from "svelte/store";
 import {NostrPrivateKey, NostrPublicKey, NostrLoginMethod, stalls, token, Error} from "$sharedLib/stores";
-import {getApiBaseUrl, isStaging, isDevelopment} from "$sharedLib/utils";
+import {getApiBaseUrl, isStaging, getConfigurationFromFile} from "$sharedLib/utils";
 import {sendPrivateMessage} from "$sharedLib/services/nostr";
 import { v4 as uuidv4 } from "uuid";
 
-export const pmChannelNostrRoomId = import.meta.env.VITE_NOSTR_MARKET_SQUARE_CHANNEL_ID;
+export async function getMarketSquareChannelId() {
+    let configJson = await getConfigurationFromFile();
+    if (configJson) {
+        return configJson['market_square_channel_id'];
+    }
+}
+
 export const pmStallPubkey = import.meta.env.VITE_NOSTR_PM_STALL_PUBLIC_KEY;
 
 // NB: keep in sync with `api/config.py`

web/shared/src/lib/utils.ts

@@ -133,7 +133,7 @@ export function getMonthName(month: number) {
 }
 
 export async function getConfigurationFromFile() {
-    let response = await fetch('/config.json')
+    let response = await fetch('/front-office-config/config.json')
 
     if (!response.ok) {
         return false;