Отчет за 30.09.24

*Обновление QoL в рамках авторизации через смс код (добавил фокус на custom компонент / возможность навигации / arial label для слабо видящих-глухонемых[скрин ридеры] ) * Работа над товарами по категориям (подготовка инфраструктуры ожидание согласование дизайна страницы товаров по категориям)
hays0503 · Sep 30, 2024 · 9f60ff4 · 9f60ff4
1 parent fd4f794
commit 9f60ff4
Show file tree

Hide file tree

Showing 36 changed files with 753 additions and 4 deletions.
diff --git a/app/[locale]/[city]/catalog/[slug]/page.tsx b/app/[locale]/[city]/catalog/[slug]/page.tsx
@@ -0,0 +1,11 @@
+"use server";
+import { headers } from 'next/headers'
+import { isMobileDevice } from "@/shared/tools/responsive";
+import { CatalogPage } from '@/_pages/CatalogPage';
+
+const Page = async ({ params }: { params: any }) => {
+  const mobile = isMobileDevice(headers().get('user-agent')||"");
+  return <CatalogPage params={{ ...params, mobile }} />;
+};
+
+export default Page;
diff --git a/app/[locale]/[city]/login/layout.tsx b/app/[locale]/[city]/login/layout.tsx
@@ -0,0 +1,38 @@
+import { UrlApiWithDomain, UrlRevalidate } from "@/shared/api/url";
+import type { Metadata } from "next";
+import { unstable_setRequestLocale } from "next-intl/server";
+
+export const metadata: Metadata = {
+  title: "dev.SCK-1.kz",
+  description: "Сайт в разработке dev.SCK-1.kz",
+};
+
+
+export async function generateStaticParams() {
+  const fetchCity = await (
+    await fetch(UrlApiWithDomain.getCity, {
+      ...UrlRevalidate.getCity,
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+    })
+  ).json();
+  const city = fetchCity.map((i: any) => ({ city: i.additional_data.EN }));
+  return city;
+}
+
+export default async function RootLayout({
+  children,
+  params: { locale, city },
+}: {
+  children: React.ReactNode;
+  params: { locale: string; city: string };
+}) {
+  unstable_setRequestLocale(locale);
+  return (
+    <html lang={locale}>
+      <body>{children}</body>
+    </html>
+  );
+}
diff --git a/app/[locale]/[city]/login/page.tsx b/app/[locale]/[city]/login/page.tsx
@@ -0,0 +1,11 @@
+"use server";
+import { headers } from 'next/headers'
+import { isMobileDevice } from "@/shared/tools/responsive";
+import { LoginPage } from '@/_pages/LoginPage';
+
+const Page = async ({ params }: { params: any }) => {
+  const mobile = isMobileDevice(headers().get('user-agent')||"");
+  return <LoginPage params={{ ...params, mobile }} />;
+};
+
+export default Page;
diff --git a/public/google-logo.svg b/public/google-logo.svg
diff --git a/public/vk-logo.svg b/public/vk-logo.svg
diff --git a/src/_pages/AccountPage/ui/AccountPage.tsx b/src/_pages/AccountPage/ui/AccountPage.tsx
@@ -50,7 +50,7 @@ export async function AccountPage({ params }: { params: any }) {
             <section>
               <AccountMenu params={params} />
             </section>
-            <footer>
+            <footer style={{position:"relative",width:"100%",bottom:"0"}}>
                 <FooterMobileSCK params={params} />
                 <FooterSCK params={params} />
             </footer>

diff --git a/src/_pages/CatalogPage/api/index.ts b/src/_pages/CatalogPage/api/index.ts
@@ -0,0 +1 @@
+export { }
diff --git a/src/_pages/CatalogPage/config/index.ts b/src/_pages/CatalogPage/config/index.ts
@@ -0,0 +1 @@
+export { }
diff --git a/src/_pages/CatalogPage/index.ts b/src/_pages/CatalogPage/index.ts
@@ -0,0 +1,4 @@
+export * from './api'
+export * from './config'
+export * from './model'
+export * from './ui'
diff --git a/src/_pages/CatalogPage/model/index.ts b/src/_pages/CatalogPage/model/index.ts
@@ -0,0 +1 @@
+export { }
diff --git a/src/_pages/CatalogPage/ui/CatalogPage.tsx b/src/_pages/CatalogPage/ui/CatalogPage.tsx
@@ -0,0 +1,78 @@
+"use server";
+
+import { ProvidersClient } from "@/_app/providers/providersClient";
+import { ProvidersServer } from "@/_app/providers/providersServer";
+import { FooterMobileSCK } from "@/features/FooterMobileSCK";
+import { FooterSCK } from "@/features/FooterSCK";
+import { UrlApi, UrlApiWithDomain, UrlRevalidate } from "@/shared/api/url";
+import { Catalog } from "@/widgets/Catalog";
+
+import { HeaderSCK } from "@/widgets/HeaderSCK";
+import { Flex } from "antd";
+
+export default async function CatalogPage({params}: {params: any}) {
+  const fetchCity = await (
+    await fetch(UrlApiWithDomain.getCity, {
+      ...UrlRevalidate.getCity,
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+    })
+  ).json();
+
+  const fetchCategory = await (
+    await fetch(UrlApiWithDomain.getCategory, {
+      ...UrlRevalidate.getCategory,
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+    })
+  ).json();
+
+  const UrlProductCatalog = `${UrlApi.getProducts}filter_by_cat/${params.slug}`;
+  const UrlProductCatalogWithDomain = `${UrlApiWithDomain.getProducts}filter_by_cat/${params.slug}`;
+
+  console.log(UrlProductCatalog);
+  console.log(UrlProductCatalogWithDomain);
+
+  const fetchProductCatalog = await (
+    await fetch(UrlProductCatalogWithDomain, {
+      ...UrlRevalidate.getProducts,
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+    })
+  ).json();
+
+
+  const fallback = {
+    [UrlApi.getCity]: fetchCity,
+    [UrlApi.getCategory]: fetchCategory,
+    [UrlProductCatalog]: fetchProductCatalog
+  };
+
+  return (
+    <>
+      <ProvidersServer>
+        <ProvidersClient
+          fallback={fallback}
+          params={params}
+        >
+          <Flex vertical={true}>
+            <HeaderSCK params={params} carousel />
+            <section>
+              <Catalog params={params} />
+            </section>
+            <footer style={{position:"relative",width:"100%",bottom:"0"}}>
+                <FooterMobileSCK params={params} />
+                <FooterSCK params={params} />
+            </footer>
+          </Flex>
+        </ProvidersClient>
+      </ProvidersServer>
+    </>
+  );
+}
diff --git a/src/_pages/CatalogPage/ui/index.ts b/src/_pages/CatalogPage/ui/index.ts
@@ -0,0 +1,3 @@
+import CatalogPage from './CatalogPage.tsx'
+
+export { CatalogPage }
diff --git a/src/_pages/LoginPage/index.ts b/src/_pages/LoginPage/index.ts
@@ -0,0 +1 @@
+export * from './ui'
diff --git a/src/_pages/LoginPage/ui/LoginPage.tsx b/src/_pages/LoginPage/ui/LoginPage.tsx
@@ -0,0 +1,90 @@
+"use server";
+
+import { ProvidersClient } from "@/_app/providers/providersClient";
+import { ProvidersServer } from "@/_app/providers/providersServer";
+import { FooterMobileSCK } from "@/features/FooterMobileSCK";
+import { FooterSCK } from "@/features/FooterSCK";
+import { UrlApi, UrlApiWithDomain, UrlRevalidate } from "@/shared/api/url";
+import { Populates } from "@/shared/types/populates";
+
+import { HeaderSCK } from "@/widgets/HeaderSCK";
+import { Login } from "@/widgets/Login";
+import { Sale } from "@/widgets/Sale";
+import { Flex } from "antd";
+export default async function LoginPage({ params }: { params: any }) {
+  const fetchCity = await (
+    await fetch(UrlApiWithDomain.getCity, {
+      ...UrlRevalidate.getCity,
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+    })
+  ).json();
+
+  const fetchCategory = await (
+    await fetch(UrlApiWithDomain.getCategory, {
+      ...UrlRevalidate.getCategory,
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+    })
+  ).json();
+
+  const fetchPopulates = await (
+    await fetch(UrlApiWithDomain.getPopulates, {
+      ...UrlRevalidate.getPopulates,
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+    })
+  ).json();
+
+  const PopularProductsByIds = `by_ids/${fetchPopulates
+    .flatMap((i: Populates) => i.products)
+    .join(",")}`;
+  const UrlApiPopularProductsByIds = UrlApi.getProducts + PopularProductsByIds;
+  const UrlApiWithDomainPopularProductsByIds =
+    UrlApiWithDomain.getProducts + PopularProductsByIds;
+  const fetchPopularProductsByIds = await (
+    await fetch(UrlApiWithDomainPopularProductsByIds, {
+      ...UrlRevalidate.getProducts,
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+    })
+  ).json();
+
+  const fallback = {
+    [UrlApi.getCity]: fetchCity,
+    [UrlApi.getCategory]: fetchCategory,
+    [UrlApi.getPopulates]: fetchPopulates,
+    [UrlApiPopularProductsByIds]: fetchPopularProductsByIds,
+  };
+
+  return (
+    <>
+      <ProvidersServer>
+        <ProvidersClient
+          fallback={fallback}
+          // fallback={{}}
+          params={params}
+        >
+          <Flex vertical={true} gap={"15px"}>
+            <HeaderSCK params={params}/>
+            <section>
+              <Login params={params} />
+            </section>
+            <footer style={{position:"relative",width:"100%",bottom:"0"}}>
+                <FooterMobileSCK params={params} />
+                <FooterSCK params={params} />
+            </footer>
+          </Flex>
+        </ProvidersClient>
+      </ProvidersServer>
+    </>
+  );
+}
diff --git a/src/_pages/LoginPage/ui/index.ts b/src/_pages/LoginPage/ui/index.ts
@@ -0,0 +1,3 @@
+import LoginPage from './LoginPage.tsx'
+
+export { LoginPage }
diff --git a/src/_pages/MainPage/MainPage.tsx b/src/_pages/MainPage/MainPage.tsx
@@ -78,7 +78,7 @@ export async function MainPage({ params }: { params: any }) {
             <section>
               <Sale params={params} />
             </section>
-            <footer>
+            <footer style={{position:"relative",width:"100%",bottom:"0"}}>
                 <FooterMobileSCK params={params} />
                 <FooterSCK params={params} />
             </footer>

diff --git a/src/_pages/ProductPage/ui/ProductPage.tsx b/src/_pages/ProductPage/ui/ProductPage.tsx
@@ -64,7 +64,7 @@ export default async function ProductPage({ params }: { params: any }) {
             <section>
               <ProductDetailCard params={params}/>
             </section>
-            <footer>
+            <footer style={{position:"relative",width:"100%",bottom:"0"}}>
             <FooterMobileSCK params={params} />
             <FooterSCK params={params} />
             </footer>

diff --git a/src/features/ProductShowcase/api/index.ts b/src/features/ProductShowcase/api/index.ts
@@ -0,0 +1 @@
+export { }
diff --git a/src/features/ProductShowcase/config/index.ts b/src/features/ProductShowcase/config/index.ts
@@ -0,0 +1 @@
+export { }
diff --git a/src/features/ProductShowcase/index.ts b/src/features/ProductShowcase/index.ts
@@ -0,0 +1,4 @@
+export * from './api'
+export * from './config'
+export * from './model'
+export * from './ui'
diff --git a/src/features/ProductShowcase/model/index.ts b/src/features/ProductShowcase/model/index.ts
@@ -0,0 +1 @@
+export { }
diff --git a/src/features/ProductShowcase/ui/ProductShowcase.tsx b/src/features/ProductShowcase/ui/ProductShowcase.tsx
@@ -0,0 +1,41 @@
+
+import { CarouselShopSCK } from "@/entities/CarouselShopSCK";
+import { ProductCard } from "@/entities/ProductCard";
+import { useGetCityParams } from "@/shared/hook/useGetCityParams";
+import useSelectCurrentCity from "@/shared/hook/useSelectCurrentCity";
+import { Products } from "@/shared/types/products";
+import { Flex } from "antd";
+
+
+export default function ProductShowcase({
+  params,
+  products,
+}: {
+  params: any;
+  products: Products[];
+}) {
+  const currentCityEN = useGetCityParams();
+  const currentCityRU = useSelectCurrentCity("en", currentCityEN)?.name_city!;
+  // Нам нечего демонстрировать 
+  if (products.length === 0) {
+    return null;
+  }
+
+  const filteredProductsCurrentCity = products.filter((i: Products) => {
+    return i?.price?.hasOwnProperty(currentCityRU);
+  });
+  const {deviceType} = JSON.parse(params.mobile.value);
+  return (
+    <Flex
+      gap={"15px"}
+      style={{
+        width: "80%",
+        backgroundColor: "#fffffff6",
+      }}
+    >
+        {filteredProductsCurrentCity.map((i: Products) => (
+          <ProductCard key={i.id} product={i} currentCityRU={currentCityRU} params={params}/>
+        ))}
+    </Flex>
+  );
+}
diff --git a/src/features/ProductShowcase/ui/index.ts b/src/features/ProductShowcase/ui/index.ts
@@ -0,0 +1,3 @@
+import ProductShowcase from './ProductShowcase.tsx'
+
+export { ProductShowcase }
diff --git a/src/features/ShopWindow/ui/ShopWindow.tsx b/src/features/ShopWindow/ui/ShopWindow.tsx
@@ -18,7 +18,6 @@ export default function ShopWindow({
     return i?.price?.hasOwnProperty(currentCityRU);
   });
   const {deviceType} = JSON.parse(params.mobile.value);
-  console.log("deviceType",deviceType)
   return (
     <Flex
       gap={"15px"}

diff --git a/src/widgets/Catalog/api/index.ts b/src/widgets/Catalog/api/index.ts
@@ -0,0 +1 @@
+export { }
diff --git a/src/widgets/Catalog/config/index.ts b/src/widgets/Catalog/config/index.ts
@@ -0,0 +1 @@
+export { }
diff --git a/src/widgets/Catalog/index.ts b/src/widgets/Catalog/index.ts
@@ -0,0 +1,4 @@
+export * from './api'
+export * from './config'
+export * from './model'
+export * from './ui'
diff --git a/src/widgets/Catalog/model/index.ts b/src/widgets/Catalog/model/index.ts
@@ -0,0 +1 @@
+export { }