From e89db60b582bd084b3ea51e7f5ebf6e90cbf2f81 Mon Sep 17 00:00:00 2001 From: Koper Date: Thu, 7 Dec 2023 23:57:02 +0700 Subject: [PATCH] My last commit while I am still 35 --- www/app/[domain]/domainContext.tsx | 3 ++- .../[domain]/transcripts/[transcriptId]/shareModal.tsx | 6 ++++-- www/app/lib/edgeConfig.ts | 8 +++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/www/app/[domain]/domainContext.tsx b/www/app/[domain]/domainContext.tsx index ed86a27f..6b6d65b5 100644 --- a/www/app/[domain]/domainContext.tsx +++ b/www/app/[domain]/domainContext.tsx @@ -13,6 +13,7 @@ export const DomainContext = createContext({ }, api_url: "", websocket_url: "", + zulip_streams: "", }); export const DomainContextProvider = ({ @@ -42,7 +43,7 @@ export const featureEnabled = ( featureName: "requireLogin" | "privacy" | "browse" | "sendToZulip", ) => { const context = useContext(DomainContext); - console.log(context.features, featureName); + return context.features[featureName] as boolean | undefined; }; diff --git a/www/app/[domain]/transcripts/[transcriptId]/shareModal.tsx b/www/app/[domain]/transcripts/[transcriptId]/shareModal.tsx index d782abd0..339f2769 100644 --- a/www/app/[domain]/transcripts/[transcriptId]/shareModal.tsx +++ b/www/app/[domain]/transcripts/[transcriptId]/shareModal.tsx @@ -1,8 +1,9 @@ -import React, { useState, useEffect } from "react"; +import React, { useContext, useState, useEffect } from "react"; import SelectSearch from "react-select-search"; import { getZulipMessage, sendZulipMessage } from "../../../lib/zulip"; import { GetTranscript, GetTranscriptTopic } from "../../../api"; import "react-select-search/style.css"; +import { DomainContext } from "../../domainContext"; type ShareModal = { show: boolean; @@ -28,9 +29,10 @@ const ShareModal = (props: ShareModal) => { const [includeTopics, setIncludeTopics] = useState(false); const [isLoading, setIsLoading] = useState(true); const [streams, setStreams] = useState([]); + const { zulip_streams } = useContext(DomainContext); useEffect(() => { - fetch(process.env.NEXT_PUBLIC_ZULIIPSTREAMS_HOSTNAME + "/streams.json") + fetch(zulip_streams + "/streams.json") .then((response) => { if (!response.ok) { throw new Error("Network response was not ok"); diff --git a/www/app/lib/edgeConfig.ts b/www/app/lib/edgeConfig.ts index c2ba081d..a15f871e 100644 --- a/www/app/lib/edgeConfig.ts +++ b/www/app/lib/edgeConfig.ts @@ -3,14 +3,15 @@ import { isDevelopment } from "./utils"; const localConfig = { features: { - requireLogin: true, + requireLogin: false, privacy: true, - browse: true, - sendToZulip: false, + browse: false, + sendToZulip: true, }, api_url: "http://127.0.0.1:1250", websocket_url: "ws://127.0.0.1:1250", auth_callback_url: "http://localhost:3000/auth-callback", + zulip_streams: "https://d3ow1y42gqfmk.cloudfront.net", }; type EdgeConfig = { @@ -25,6 +26,7 @@ type EdgeConfig = { auth_callback_url: string; websocket_url: string; api_url: string; + zulip_streams: string; }; };