فهرست منبع

favicon 配置修改;navbar 跳转链接修改

fogwind 2 ساعت پیش
والد
کامیت
80f05bbc3a

src/app/favicon.svg → public/favicon.svg


+ 6 - 1
src/app/layout.tsx

@@ -54,7 +54,12 @@ export const outfit = localFont({
 });
 
 export async function generateMetadata() {
-  return generateMetadataForPage("", staticSeo.default);
+  return {
+    icons: {
+      icon: "/favicon.svg",
+    },
+    ...generateMetadataForPage("", staticSeo.default)
+  };
 }
 
 export default async function RootLayout({

+ 0 - 23
src/components/layout/navbar/CartAndUserActions.tsx

@@ -1,23 +0,0 @@
-import { Suspense } from "react";
-import Cart from "@/components/cart";
-import UserAccount from "@components/customer/credentials";
-import { IconSkeleton } from "@/components/common/skeleton/IconSkeleton";
-
-
-export function CartAndUserActions() {
-  return (
-    <div className="flex max-w-fit gap-2 md:gap-4">
-
-     
-        <Cart />
-      
-      <Suspense fallback={<IconSkeleton />}>
-        
-
-            <UserAccount />
-
-       
-      </Suspense>
-    </div>
-  );
-}

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 39 - 0
src/components/layout/navbar/NavbarActions.tsx


+ 11 - 41
src/components/layout/navbar/index.tsx

@@ -1,20 +1,14 @@
 import Link from "next/link";
 import { Suspense } from "react";
-// import Search from "./Search";
-// import { SearchSkeleton } from "@/components/common/skeleton/SearchSkeleton";
 import LogoIcon from "@components/common/icons/LogoIcon";
 import MobileMenuTrigger from "./MobileMenuTrigger";
-import { CartAndUserActions } from "./CartAndUserActions";
+import { NavbarActions } from "./NavbarActions";
 import { NavigationSkeleton } from "./NavigationSkeleton";
-import { ActionsSkeleton } from "./ActionsSkeleton";
 import { NavbarErrorBoundary } from "@/components/error/ErrorBoundary";
 
 import { 
-  // GET_TREE_CATEGORIES,
   GET_TREEFRONT_MENUS } from "@/graphql";
-// import { cachedGraphQLRequest } from "@utils/hooks/useCache";
 import { serverGraphqlFetch } from "@utils/bagisto/index";
-// import { TreeCategoriesResponse } from "@/types/theme/category-tree";
 import NavbarSearchIcon from "./NavbarSearchIcon"
 import type { GetTreefrontMenusResult } from "@/types/theme/menus";
 import { authOptions } from "@utils/auth";
@@ -23,37 +17,14 @@ export default async function Navbar() {
 
     const session = await getServerSession(authOptions);// 游客是null
     const isGuest = session === null;
-  // const { data } = await cachedGraphQLRequest<TreeCategoriesResponse>(
-  //   "category",
-  //   GET_TREE_CATEGORIES,
-  //   { parentId: 1 },
-  // );
-  // console.log('TreeCategoriesResponse --- ',data)
-  // const categories = data?.treeCategories || [];
-   const { data: menudata } = await serverGraphqlFetch<
-  GetTreefrontMenusResult
->({
-  query: GET_TREEFRONT_MENUS,
-});
-console.log('GetTreefrontMenusResult --- ',menudata)
-  const menudatas =menudata? menudata.treefrontMenus:[];
-  // const filteredCategories = categories
-  //   .filter((cat: any) => cat.id !== "1")
-  //   .map((cat: any) => {
-  //     const translation = cat.translation;
-  //     return {
-  //       id: cat.id,
-  //       _id: cat._id,
-  //       name: translation?.name || "",
-  //       slug: translation?.slug || "",
-  //     };
-  //   })
-  //   .filter((item: any) => item.name && item.slug);
 
-  // const menuData = [
-  //   { id: "all", name: "All", slug: "" },
-  //   ...filteredCategories.slice(0, 3),
-  // ];
+    const { data: menudata } = await serverGraphqlFetch<
+      GetTreefrontMenusResult
+    >({
+      query: GET_TREEFRONT_MENUS,
+    });
+    console.log('GetTreefrontMenusResult --- ',menudata)
+    const menudatas =menudata? menudata.treefrontMenus:[];
 
   return (
     <NavbarErrorBoundary>
@@ -81,10 +52,9 @@ console.log('GetTreefrontMenusResult --- ',menudata)
               <LogoIcon />
             </Link>
 
-            {/* 3. DYNAMIC HOLE: Auth & Cart (Blocked by Session/Cookies) */}
-            <Suspense fallback={<ActionsSkeleton />}>
-              <CartAndUserActions />
-            </Suspense>
+
+            <NavbarActions isGuest={isGuest} />
+
           </div>
         </nav>
       </header>