WIP: common/network 수정중
This commit is contained in:
@@ -0,0 +1,5 @@
|
||||
function PopupProvider({ children }: { children: React.ReactNode }) {
|
||||
return <>{children}</>;
|
||||
}
|
||||
|
||||
export { PopupProvider };
|
||||
@@ -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 (
|
||||
<QueryProvider queryClient={queryClient}>
|
||||
<SidebarProvider>
|
||||
<div className="flex-1">
|
||||
<Header />
|
||||
<div className="flex h-[calc(100vh-50px)]">
|
||||
<LNB currentPath={currentPath} handleMenuClick={handleMenuClick} />
|
||||
<div className="flex flex-1 flex-col">
|
||||
<div className="max-h-[calc(100%-50px)] flex-1 overflow-auto">
|
||||
{children}
|
||||
<PopupProvider>
|
||||
<SidebarProvider>
|
||||
<div className="flex-1">
|
||||
<Header />
|
||||
<div className="flex h-[calc(100vh-50px)]">
|
||||
<LNB
|
||||
currentPath={currentPath}
|
||||
handleMenuClick={handleMenuClick}
|
||||
/>
|
||||
<div className="flex flex-1 flex-col">
|
||||
<div className="max-h-[calc(100%-50px)] flex-1 overflow-auto">
|
||||
{children}
|
||||
</div>
|
||||
<Footer />
|
||||
</div>
|
||||
<Footer />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</SidebarProvider>
|
||||
</SidebarProvider>
|
||||
</PopupProvider>
|
||||
</QueryProvider>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ let isInitialized = false;
|
||||
let envConfig: EnvConfig = { ...defaultConfig };
|
||||
|
||||
export function initializeConfig(values: Partial<EnvConfig>): void {
|
||||
console.log("initializeConfig >>>> values: ", values);
|
||||
if (isInitialized) {
|
||||
console.warn("Configuration already initialized. Skipping.");
|
||||
return;
|
||||
|
||||
@@ -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<EnvConfig> = {
|
||||
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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user