diff --git a/packages/common/components/src/provider/popup-provider.tsx b/packages/common/components/src/provider/popup-provider.tsx new file mode 100644 index 000000000..f6ef68ca1 --- /dev/null +++ b/packages/common/components/src/provider/popup-provider.tsx @@ -0,0 +1,5 @@ +function PopupProvider({ children }: { children: React.ReactNode }) { + return <>{children}; +} + +export { PopupProvider }; diff --git a/packages/common/components/src/ui/layout/base.tsx b/packages/common/components/src/ui/layout/base.tsx index 21d2ca7c6..f5db1c50a 100644 --- a/packages/common/components/src/ui/layout/base.tsx +++ b/packages/common/components/src/ui/layout/base.tsx @@ -1,10 +1,11 @@ import type { QueryClient } from "@tanstack/react-query"; -import type { MenuItem } from "../../api"; import { QueryProvider } from "../../provider/query-provider"; +import { PopupProvider } from "../../provider/popup-provider"; +import type { MenuItem } from "../../api"; +import { SidebarProvider } from "../sidebar"; import { LNB } from "../lnb"; import { Header } from "../header"; import { Footer } from "./footer"; -import { SidebarProvider } from "../sidebar"; import "./common.css"; export function BaseLayout({ @@ -20,20 +21,25 @@ export function BaseLayout({ }) { return ( - -
-
-
- -
-
- {children} + + +
+
+
+ +
+
+ {children} +
+
-
-
- + + ); } diff --git a/packages/common/config/src/initialize-config.ts b/packages/common/config/src/initialize-config.ts index e25010321..5076e65c9 100644 --- a/packages/common/config/src/initialize-config.ts +++ b/packages/common/config/src/initialize-config.ts @@ -24,6 +24,7 @@ let isInitialized = false; let envConfig: EnvConfig = { ...defaultConfig }; export function initializeConfig(values: Partial): void { + console.log("initializeConfig >>>> values: ", values); if (isInitialized) { console.warn("Configuration already initialized. Skipping."); return; diff --git a/packages/common/config/src/initializer.ts b/packages/common/config/src/initializer.ts index 896225d88..1e814e8bb 100644 --- a/packages/common/config/src/initializer.ts +++ b/packages/common/config/src/initializer.ts @@ -18,3 +18,22 @@ export function initializeNextClientConfig(): void { }; initializeConfig(env); } + +export function initializeViteClientConfig(): void { + if (typeof window === "undefined") { + console.warn("initializeViteClientConfig called on the server. Skipping."); + return; + } + + const env: Partial = { + PORT: import.meta.env.VITE_PORT, + PROXY_HOST: import.meta.env.VITE_PROXY_HOST, + SERVER_API_URL: import.meta.env.VITE_SERVER_API_URL, + SITE_ID: import.meta.env.VITE_SITE_ID, + CLAIM_NAME: import.meta.env.VITE_CLAIM_NAME, + ACCESS_TOKEN: import.meta.env.VITE_ACCESS_TOKEN, + REFRESH_TOKEN: import.meta.env.VITE_REFRESH_TOKEN, + AUTH_USER_ID: import.meta.env.VITE_AUTH_USER_ID, + }; + initializeConfig(env); +} diff --git a/packages/common/network/client.ts b/packages/common/network/client.ts index 1b82d31c6..6f9ee3bd2 100644 --- a/packages/common/network/client.ts +++ b/packages/common/network/client.ts @@ -51,6 +51,7 @@ class Client { public static getInstance(config: ClientConfig): Client { if (!Client.instance) { + console.log("getInstance >>>> config: ", config); Client.instance = new Client(config); } return Client.instance;