From 8f484e8425dd92615d325e646ae1e6d2a87ac3fc Mon Sep 17 00:00:00 2001
From: bicochan <chanii8@naver.com>
Date: Tue, 18 Mar 2025 14:29:40 +0900
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20sidebar=20=EC=9E=91=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/common/components/package.json       |   2 +
 packages/common/components/src/api/index.ts   |   1 +
 packages/common/components/src/api/menu.ts    |  27 +++++
 packages/common/components/src/api/user.ts    |   2 +-
 packages/common/components/src/config/api.ts  |   3 +
 .../src/{hooks => lib}/use-mobile.tsx         |   0
 .../components/src/ui/collapsible/index.tsx   |   9 ++
 .../common/components/src/ui/header/index.tsx |   2 +-
 .../common/components/src/ui/layout/base.tsx  |  23 ++--
 .../common/components/src/ui/layout/lnb.tsx   | 104 ------------------
 .../common/components/src/ui/layout/vbase.tsx |   4 +-
 .../common/components/src/ui/lnb/index.tsx    | 100 +++++++++++++++++
 packages/common/components/src/ui/lnb/lib.ts  |  36 ++++++
 .../components/src/ui/sidebar/index.tsx       |   4 +-
 pnpm-lock.yaml                                |   6 +
 15 files changed, 203 insertions(+), 120 deletions(-)
 create mode 100644 packages/common/components/src/api/menu.ts
 rename packages/common/components/src/{hooks => lib}/use-mobile.tsx (100%)
 create mode 100644 packages/common/components/src/ui/collapsible/index.tsx
 delete mode 100644 packages/common/components/src/ui/layout/lnb.tsx
 create mode 100644 packages/common/components/src/ui/lnb/index.tsx
 create mode 100644 packages/common/components/src/ui/lnb/lib.ts

diff --git a/packages/common/components/package.json b/packages/common/components/package.json
index 7556b9738..ca2986403 100644
--- a/packages/common/components/package.json
+++ b/packages/common/components/package.json
@@ -26,9 +26,11 @@
   },
   "dependencies": {
     "@common/assets": "workspace:*",
+    "@frontend-opensource/use-react-hooks": "^1.1.4",
     "@minoru/react-dnd-treeview": "^3.5.0",
     "@radix-ui/react-accordion": "^1.2.3",
     "@radix-ui/react-checkbox": "^1.1.4",
+    "@radix-ui/react-collapsible": "^1.1.3",
     "@radix-ui/react-dialog": "^1.1.6",
     "@radix-ui/react-dropdown-menu": "^2.1.6",
     "@radix-ui/react-label": "^2.1.2",
diff --git a/packages/common/components/src/api/index.ts b/packages/common/components/src/api/index.ts
index 6674d19fa..98bc9323f 100644
--- a/packages/common/components/src/api/index.ts
+++ b/packages/common/components/src/api/index.ts
@@ -1,2 +1,3 @@
 export * from "./client";
+export * from "./menu";
 export * from "./user";
diff --git a/packages/common/components/src/api/menu.ts b/packages/common/components/src/api/menu.ts
new file mode 100644
index 000000000..e9899c111
--- /dev/null
+++ b/packages/common/components/src/api/menu.ts
@@ -0,0 +1,27 @@
+import { client } from "./client";
+import { ENDPOINT } from "../config";
+
+export interface MenuItem {
+  menuCd: number;
+  menuKornNm: string;
+  menuEngNm: string;
+  parentId: number | null;
+  sortSeq: number;
+  iconNm?: string;
+  children: MenuItem[] | null;
+  levelNo: number;
+  urlPath: string;
+  menuLnkgTypeCd: string;
+  menuLnkgSn: number;
+  qrcd: string;
+  useYn: string;
+  otptYn: string;
+  requiredUrlPath: boolean;
+}
+
+export const getMenuList = async (siteId: string) => {
+  const response = await client.get<MenuItem[]>(
+    `${ENDPOINT.CMS_SERVICE.MENU_ROLES}/${siteId}`,
+  );
+  return response.data;
+};
diff --git a/packages/common/components/src/api/user.ts b/packages/common/components/src/api/user.ts
index 36e39461d..760f2c78b 100644
--- a/packages/common/components/src/api/user.ts
+++ b/packages/common/components/src/api/user.ts
@@ -1,5 +1,5 @@
-import { ENDPOINT } from "../config";
 import { client } from "./client";
+import { ENDPOINT } from "../config";
 
 export interface IUser {
   regDt: string;
diff --git a/packages/common/components/src/config/api.ts b/packages/common/components/src/config/api.ts
index 6d1f59655..715f969d4 100644
--- a/packages/common/components/src/config/api.ts
+++ b/packages/common/components/src/config/api.ts
@@ -3,6 +3,9 @@ import { PROXY_HOST } from "./env";
 export const BASE_URL = `${PROXY_HOST}/server`;
 
 export const ENDPOINT = {
+  CMS_SERVICE: {
+    MENU_ROLES: "/cms-service/api/v1/menu-roles",
+  },
   USER_SERVICE: {
     USERS: "/user-service/api/v1/users",
   },
diff --git a/packages/common/components/src/hooks/use-mobile.tsx b/packages/common/components/src/lib/use-mobile.tsx
similarity index 100%
rename from packages/common/components/src/hooks/use-mobile.tsx
rename to packages/common/components/src/lib/use-mobile.tsx
diff --git a/packages/common/components/src/ui/collapsible/index.tsx b/packages/common/components/src/ui/collapsible/index.tsx
new file mode 100644
index 000000000..a23e7a281
--- /dev/null
+++ b/packages/common/components/src/ui/collapsible/index.tsx
@@ -0,0 +1,9 @@
+import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"
+
+const Collapsible = CollapsiblePrimitive.Root
+
+const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger
+
+const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent
+
+export { Collapsible, CollapsibleTrigger, CollapsibleContent }
diff --git a/packages/common/components/src/ui/header/index.tsx b/packages/common/components/src/ui/header/index.tsx
index 55bca0be6..cbeb95058 100644
--- a/packages/common/components/src/ui/header/index.tsx
+++ b/packages/common/components/src/ui/header/index.tsx
@@ -20,7 +20,7 @@ export function Header({ viewOnly }: { viewOnly?: boolean }) {
   });
 
   return (
-    <header className="sticky top-0 box-border flex h-[5rem] w-full items-center justify-between border-b border-solid border-border bg-background">
+    <header className="sticky top-0 z-30 box-border flex h-[5rem] w-full items-center justify-between border-b border-solid border-border bg-background">
       <div className="flex items-center">
         <div className="MobMenuBtn">
           <img src={images.menuBtn} />
diff --git a/packages/common/components/src/ui/layout/base.tsx b/packages/common/components/src/ui/layout/base.tsx
index 19b64511f..1f2ad58a3 100644
--- a/packages/common/components/src/ui/layout/base.tsx
+++ b/packages/common/components/src/ui/layout/base.tsx
@@ -1,6 +1,7 @@
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
-import { LNB } from "./lnb";
+import { SidebarProvider } from "../sidebar";
+import { LNB } from "../lnb";
 import { Header } from "../header";
 import { Footer } from "./footer";
 
@@ -11,18 +12,20 @@ const queryClient = new QueryClient();
 export function BaseLayout({ children }: { children: React.ReactNode }) {
   return (
     <QueryClientProvider client={queryClient}>
-      <div>
-        <Header />
-        <div className="flex h-[calc(100vh-50px)]">
-          <LNB />
-          <div className="flex flex-1 flex-col">
-            <div className="max-h-[calc(100%-50px)] flex-1 overflow-auto">
-              {children}
+      <SidebarProvider>
+        <div className="flex-1">
+          <Header />
+          <div className="flex h-[calc(100vh-50px)]">
+            <LNB />
+            <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>
     </QueryClientProvider>
   );
 }
diff --git a/packages/common/components/src/ui/layout/lnb.tsx b/packages/common/components/src/ui/layout/lnb.tsx
deleted file mode 100644
index f7d3a9be8..000000000
--- a/packages/common/components/src/ui/layout/lnb.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-export function LNB() {
-  return (
-    <div
-      id="lnb"
-      className="!w-[22rem] overflow-auto border-r border-solid border-border bg-background"
-    >
-      <ul>
-        <li id="m_dashboard">
-          <a href="#none" className="!bg-background">
-            Dashboard
-            <i
-              className="diveicon di-diveicon di-chevron-down arrow"
-              aria-hidden="true"
-            />
-          </a>
-        </li>
-        <div className="mline">PAGES</div>
-        <li id="m_page_board">
-          <a href="#none" className="!bg-background">
-            콘텐츠 관리
-            <i className="diveicon di-chevron-down arrow" aria-hidden="true" />
-          </a>
-        </li>
-        <li id="m_page_mem">
-          <a href="#none" className="!bg-background">
-            로그인 & 회원관리
-            <i className="diveicon di-chevron-down arrow" aria-hidden="true" />
-          </a>
-        </li>
-        <li id="m_page_manage">
-          <a href="#none" className="!bg-background">
-            페이지 관리
-            <i className="diveicon di-chevron-down arrow" aria-hidden="true" />
-          </a>
-        </li>
-        <li id="m_page_example">
-          <a href="#none" className="!bg-background">
-            샘플 페이지
-            <i className="diveicon di-chevron-down arrow" aria-hidden="true" />
-          </a>
-        </li>
-        <li id="m_layouts">
-          <a href="#none" className="!bg-background">
-            페이지 레이아웃
-            <i className="diveicon di-chevron-down arrow" aria-hidden="true" />
-          </a>
-        </li>
-        <div className="mline">COMPONENTS</div>
-        <li id="m_charts">
-          <a href="#none" className="!bg-background">
-            Charts
-            <i className="diveicon di-chevron-down arrow" aria-hidden="true" />
-          </a>
-        </li>
-        <li id="m_tables">
-          <a href="#none" className="!bg-background">
-            Tables
-            <i className="diveicon di-chevron-down arrow" aria-hidden="true" />
-          </a>
-        </li>
-        <li id="m_elements">
-          <a href="#none" className="!bg-background">
-            Elements
-            <i className="diveicon di-chevron-down arrow" aria-hidden="true" />
-          </a>
-        </li>
-        <li id="m_tabs">
-          <a href="#none" className="!bg-background">
-            Tabs
-            <i className="diveicon di-chevron-down arrow" aria-hidden="true" />
-          </a>
-        </li>
-        <li id="m_popup">
-          <a href="#none" className="!bg-background">
-            Modal
-            <i className="diveicon di-chevron-down arrow" aria-hidden="true" />
-          </a>
-        </li>
-        <li id="m_swipe">
-          <a href="#none" className="!bg-background">
-            Swipe
-            <i className="diveicon di-chevron-down arrow" aria-hidden="true" />
-          </a>
-        </li>
-        <li id="m_icon">
-          <a href="#none" className="!bg-background">
-            Font Icon
-          </a>
-        </li>
-        <div className="mline">OTHERS</div>
-        <li id="m_elements">
-          <a href="#none" className="!bg-background">
-            Menu Label <span className="ar_label_box red">NEW</span>
-          </a>
-        </li>
-        <li id="m_elements">
-          <a href="#none" className="!bg-background">
-            External Link
-          </a>
-        </li>
-      </ul>
-    </div>
-  );
-}
diff --git a/packages/common/components/src/ui/layout/vbase.tsx b/packages/common/components/src/ui/layout/vbase.tsx
index 5a4ca8df4..43d3fdf1d 100644
--- a/packages/common/components/src/ui/layout/vbase.tsx
+++ b/packages/common/components/src/ui/layout/vbase.tsx
@@ -1,6 +1,6 @@
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
-import { LNB } from "./lnb";
+import { LNB } from "../lnb";
 import { Header } from "../header";
 import { Footer } from "./footer";
 
@@ -14,7 +14,7 @@ export function VBaseLayout({ children }: { children: React.ReactNode }) {
       <div>
         <Header viewOnly />
         <div className="flex h-[calc(100vh-50px)]">
-          <LNB />
+          <LNB viewOnly />
           <div className="flex flex-1 flex-col">
             <div className="max-h-[calc(100%-50px)] flex-1 overflow-auto">
               {children}
diff --git a/packages/common/components/src/ui/lnb/index.tsx b/packages/common/components/src/ui/lnb/index.tsx
new file mode 100644
index 000000000..b1a7fe094
--- /dev/null
+++ b/packages/common/components/src/ui/lnb/index.tsx
@@ -0,0 +1,100 @@
+import { useState } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { ChevronRight } from "lucide-react";
+import { cn } from "../../lib/utils";
+import { ENDPOINT, SITE_ID } from "../../config";
+import { getMenuList, type MenuItem } from "../../api";
+import {
+  Sidebar,
+  SidebarContent,
+  SidebarMenu,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarMenuSub,
+} from "../sidebar";
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from "../collapsible";
+import { getParentIds } from "./lib";
+
+export function LNB({ viewOnly }: { viewOnly?: boolean }) {
+  const { data: menuList } = useQuery({
+    queryKey: [ENDPOINT.CMS_SERVICE.MENU_ROLES],
+    queryFn: () => getMenuList(SITE_ID),
+    enabled: !viewOnly,
+  });
+
+  const [openMenuIds, setOpenMenuIds] = useState<number[]>([]);
+
+  function MenuItem({ item }: { item: MenuItem }) {
+    if (item.children) {
+      return <MenuGroup item={item} />;
+    }
+
+    return (
+      <SidebarMenuItem>
+        <SidebarMenuButton className="h-auto py-4 text-[1.4rem] text-label transition-colors hover:bg-accent">
+          <i className={cn("diveicon ml-2", `di-${item.iconNm}`)} />
+          {item.menuKornNm}
+        </SidebarMenuButton>
+      </SidebarMenuItem>
+    );
+  }
+
+  function MenuGroup({ item }: { item: MenuItem }) {
+    const isOpen = openMenuIds.includes(item.menuCd);
+
+    const handleOpenChange = (open: boolean) => {
+      if (open) {
+        if (!openMenuIds.includes(item.menuCd)) {
+          const parentIds = getParentIds(item.menuCd)(menuList ?? []);
+          setOpenMenuIds([...parentIds, item.menuCd]);
+        }
+      } else {
+        setOpenMenuIds((prev) => prev.filter((id) => id !== item.menuCd));
+      }
+    };
+
+    return (
+      <Collapsible open={isOpen} onOpenChange={handleOpenChange}>
+        <SidebarMenuItem>
+          <CollapsibleTrigger asChild>
+            <div className="group flex items-center justify-between rounded-sm py-4 pr-2 hover:bg-accent data-[state=open]:text-primary">
+              <SidebarMenuButton className="group/menu-button text-[1.4rem] group-data-[state=open]:bg-transparent">
+                <i
+                  className={cn(
+                    "diveicon ml-2 text-label group-data-[state=open]:text-primary",
+                    `di-${item.iconNm}`,
+                  )}
+                />
+                <span className="text-label group-hover/menu-button:text-foreground group-data-[state=open]:text-primary">
+                  {item.menuKornNm}
+                </span>
+              </SidebarMenuButton>
+              <ChevronRight className="size-6 text-label group-data-[state=open]:rotate-90" />
+            </div>
+          </CollapsibleTrigger>
+          <CollapsibleContent>
+            <SidebarMenuSub className="mr-0">
+              {item.children?.map((child) => (
+                <MenuItem key={child.menuCd} item={child} />
+              ))}
+            </SidebarMenuSub>
+          </CollapsibleContent>
+        </SidebarMenuItem>
+      </Collapsible>
+    );
+  }
+
+  return (
+    <Sidebar className="border-border bg-background px-4 py-[6rem]">
+      <SidebarContent className="bg-background">
+        <SidebarMenu className="gap-0">
+          {menuList?.map((item) => <MenuItem key={item.menuCd} item={item} />)}
+        </SidebarMenu>
+      </SidebarContent>
+    </Sidebar>
+  );
+}
diff --git a/packages/common/components/src/ui/lnb/lib.ts b/packages/common/components/src/ui/lnb/lib.ts
new file mode 100644
index 000000000..4ad81fcd0
--- /dev/null
+++ b/packages/common/components/src/ui/lnb/lib.ts
@@ -0,0 +1,36 @@
+import type { MenuItem } from "../../api";
+
+function getParentIds(menuCd: number): (menuList: MenuItem[]) => number[] {
+  return (menuList: MenuItem[]) => {
+    const parentIds: number[] = [];
+    let currentId = menuCd;
+
+    while (true) {
+      const menu = findMenuById(currentId)(menuList);
+      if (!menu || !menu.parentId) break;
+      parentIds.push(menu.parentId);
+      currentId = menu.parentId;
+    }
+
+    return parentIds;
+  };
+}
+
+function findMenuById(
+  menuCd: number,
+): (menuList: MenuItem[]) => MenuItem | undefined {
+  function findInMenu(items: MenuItem[]): MenuItem | undefined {
+    for (const item of items) {
+      if (item.menuCd === menuCd) return item;
+      if (item.children) {
+        const found = findInMenu(item.children);
+        if (found) return found;
+      }
+    }
+    return undefined;
+  }
+
+  return findInMenu;
+}
+
+export { getParentIds, findMenuById };
diff --git a/packages/common/components/src/ui/sidebar/index.tsx b/packages/common/components/src/ui/sidebar/index.tsx
index eee581419..317fb46de 100644
--- a/packages/common/components/src/ui/sidebar/index.tsx
+++ b/packages/common/components/src/ui/sidebar/index.tsx
@@ -3,7 +3,7 @@ import { Slot } from "@radix-ui/react-slot";
 import { type VariantProps, cva } from "class-variance-authority";
 import { PanelLeft } from "lucide-react";
 
-import { useIsMobile } from "../../hooks/use-mobile";
+import { useIsMobile } from "../../lib/use-mobile";
 import { cn } from "../../lib/utils";
 import { Button } from "../button";
 import { Input } from "../input";
@@ -25,7 +25,7 @@ import {
 
 const SIDEBAR_COOKIE_NAME = "sidebar_state";
 const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
-const SIDEBAR_WIDTH = "16rem";
+const SIDEBAR_WIDTH = "22rem";
 const SIDEBAR_WIDTH_MOBILE = "18rem";
 const SIDEBAR_WIDTH_ICON = "3rem";
 const SIDEBAR_KEYBOARD_SHORTCUT = "b";
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e0f40b152..70c256d33 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -354,6 +354,9 @@ importers:
       '@common/assets':
         specifier: workspace:*
         version: link:../assets
+      '@frontend-opensource/use-react-hooks':
+        specifier: ^1.1.4
+        version: 1.1.4
       '@minoru/react-dnd-treeview':
         specifier: ^3.5.0
         version: 3.5.0(dnd-core@16.0.1)(react-dnd@16.0.1)(react-dom@18.3.1)(react@18.3.1)
@@ -363,6 +366,9 @@ importers:
       '@radix-ui/react-checkbox':
         specifier: ^1.1.4
         version: 1.1.4(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-collapsible':
+        specifier: ^1.1.3
+        version: 1.1.3(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1)
       '@radix-ui/react-dialog':
         specifier: ^1.1.6
         version: 1.1.6(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1)
-- 
2.47.1.windows.1


From a13ea5d6e96acd47c712c7f6442c67090c8e4439 Mon Sep 17 00:00:00 2001
From: bicochan <chanii8@naver.com>
Date: Tue, 18 Mar 2025 17:42:12 +0900
Subject: [PATCH 2/3] =?UTF-8?q?design:=20=EC=82=AC=EC=9D=B4=ED=8A=B8=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/cs/src/pages/site/ui/site-page.tsx           | 6 +++---
 packages/common/components/src/ui/table/table.css | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/cs/src/pages/site/ui/site-page.tsx b/apps/cs/src/pages/site/ui/site-page.tsx
index b693de757..feace6285 100644
--- a/apps/cs/src/pages/site/ui/site-page.tsx
+++ b/apps/cs/src/pages/site/ui/site-page.tsx
@@ -53,9 +53,9 @@ function SitePage() {
   return (
     <SitePageLayout>
       <div className="card card-border !mt-6">
-        <div className="card card-border !border-[#dbe2e6] !bg-[#eef7ff]">
+        <div className="card card-border">
           <form onSubmit={handleSubmit} className="flex items-center gap-2 p-2">
-            <label htmlFor="" className="mr-2 text-[#657481]">
+            <label htmlFor="" className="mr-2 text-label">
               사이트명
             </label>
             <Input
@@ -72,7 +72,7 @@ function SitePage() {
         </div>
         <div className="card card-border">
           <div className="card-header">
-            <h3 className="text-2xl font-medium text-[#666]">사이트 목록</h3>
+            <h3 className="text-2xl font-medium text-label">사이트 목록</h3>
             <Button onClick={() => router.push("/site/register")}>등록</Button>
           </div>
           <div className="card !m-[1.2rem] h-[49rem] overflow-auto !p-0">
diff --git a/packages/common/components/src/ui/table/table.css b/packages/common/components/src/ui/table/table.css
index 5f49d89d8..132239b57 100644
--- a/packages/common/components/src/ui/table/table.css
+++ b/packages/common/components/src/ui/table/table.css
@@ -5,7 +5,7 @@
     @apply bg-[#5987bf] px-4 py-[1.2rem] text-[1.3rem] font-medium leading-[1.2] text-[#fff];
   }
   .table-ui td {
-    @apply border-b border-b-border px-2 py-[1.2rem] text-[1.3rem] font-normal leading-[1.2] text-[#666];
+    @apply border-b border-b-border px-2 py-[1.2rem] text-[1.3rem] font-normal leading-[1.2] text-label;
   }
 
   .table-ui.secondary th {
-- 
2.47.1.windows.1


From 25a2ac57161c76e3e09a84e15d53d516241a8718 Mon Sep 17 00:00:00 2001
From: bicochan <chanii8@naver.com>
Date: Wed, 19 Mar 2025 09:38:49 +0900
Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=EC=9D=B8=EC=A6=9D=20=EB=B0=8F?=
 =?UTF-8?q?=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=A1=9C=EC=A7=81=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/cs/src/entities/auth/ui/auth-wrapper.tsx | 43 ++++++++++---------
 .../cs/src/pages/auth/login/ui/login-page.tsx |  5 ++-
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/apps/cs/src/entities/auth/ui/auth-wrapper.tsx b/apps/cs/src/entities/auth/ui/auth-wrapper.tsx
index ba175e697..705c03231 100644
--- a/apps/cs/src/entities/auth/ui/auth-wrapper.tsx
+++ b/apps/cs/src/entities/auth/ui/auth-wrapper.tsx
@@ -1,44 +1,47 @@
 "use client";
 
+import { useEffect } from "react";
 import { useRouter } from "next/navigation";
-import { useQuery } from "@tanstack/react-query";
 import { client } from "@/shared/api";
-import { ENDPOINT, AUTH_USER_ID } from "@/shared/config";
-import { getCookie, useUserStore } from "@/shared/lib";
 import type { IUserInfo } from "@/shared/store";
+import { getCookie, useUserStore } from "@/shared/lib";
+import { ENDPOINT, AUTH_USER_ID } from "@/shared/config";
 import { LoginApi } from "../api/login-service";
 
 const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
   const router = useRouter();
-  const { setUserInfo } = useUserStore((state) => state);
+  const { userInfo, setUserInfo } = useUserStore((state) => state);
 
-  useQuery({
-    queryKey: [ENDPOINT.USER_SERVICE.USERS],
-    queryFn: async () => {
+  async function authCheck() {
+    const userId = getCookie(AUTH_USER_ID);
+    if (!userId) {
+      throw new Error("Missing required authentication tokens");
+    }
+
+    const response = await client.get<IUserInfo>(
+      `${ENDPOINT.USER_SERVICE.USERS}/${userId}`,
+    );
+    if (!userInfo) setUserInfo(response.data);
+  }
+
+  useEffect(() => {
+    (async () => {
       try {
-        const userId = getCookie(AUTH_USER_ID);
-
-        if (!userId) {
-          throw new Error("Missing required authentication tokens");
-        }
-
-        const response = await client.get<IUserInfo>(
-          `${ENDPOINT.USER_SERVICE.USERS}/${userId}`,
-        );
-        setUserInfo(response.data);
-        return response;
+        await authCheck();
       } catch (error) {
         console.error(error);
+
         try {
           await LoginApi.silentRefresh();
+          await authCheck();
         } catch (refreshError) {
           console.error("Token refresh failed:", refreshError);
           setUserInfo(null);
           router.push("/auth/login");
         }
       }
-    },
-  });
+    })();
+  }, []);
 
   return <>{children}</>;
 };
diff --git a/apps/cs/src/pages/auth/login/ui/login-page.tsx b/apps/cs/src/pages/auth/login/ui/login-page.tsx
index d5e12966a..b5545f256 100644
--- a/apps/cs/src/pages/auth/login/ui/login-page.tsx
+++ b/apps/cs/src/pages/auth/login/ui/login-page.tsx
@@ -4,8 +4,10 @@ import Image from "next/image";
 import { images } from "@common/assets";
 import { LoginApi } from "@/entities/auth";
 import "./login.css";
+import { useRouter } from "next/navigation";
 
 function LoginPage() {
+  const router = useRouter();
   const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
 
@@ -13,7 +15,8 @@ function LoginPage() {
     const userId = formData.get("id") as string;
     const password = formData.get("password") as string;
 
-    LoginApi.login({ userId, password });
+    await LoginApi.login({ userId, password });
+    router.push("/site");
   };
 
   return (
-- 
2.47.1.windows.1