From 3b7dd8cd0125d2949cdd08e0783e3c4cd1c08f87 Mon Sep 17 00:00:00 2001
From: c00b3r <sanuyOKmaklaren0@gmail.com>
Date: Wed, 9 Jul 2025 17:15:46 +0500
Subject: [PATCH] refactor: update localization text and clean up layout
 components

---
 public/locales/en.json           |  2 +-
 src/app/(main)/blog/layout.tsx   | 13 ++++-----
 src/app/(main)/blog/page.tsx     | 16 ++++++------
 src/app/(main)/layout.tsx        | 12 ++++-----
 src/components/Layout/Footer.tsx | 45 +++++++++++++++++---------------
 src/components/Layout/Header.tsx |  2 +-
 6 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/public/locales/en.json b/public/locales/en.json
index 3292f5c..bda2651 100644
--- a/public/locales/en.json
+++ b/public/locales/en.json
@@ -4,7 +4,7 @@
     "about": "About",
     "blog": "Blog",
     "projects": "Projects",
-    "submit_request": "Get Started",
+    "submit_request": "Contact us",
     "main": "Main Page",
     "case": "View cases",
     "contacts": "Contacts"
diff --git a/src/app/(main)/blog/layout.tsx b/src/app/(main)/blog/layout.tsx
index 0553cc8..8ae7e4a 100644
--- a/src/app/(main)/blog/layout.tsx
+++ b/src/app/(main)/blog/layout.tsx
@@ -1,14 +1,15 @@
-import { NotFoundPage } from '@/components/pages/NotFoundPage';
-import { StoriesButton } from '@/ui/StoriesButton';
-import { Title } from '@/ui/Title';
-import { Metadata, ResolvingMetadata } from 'next';
+import { NotFoundPage } from "@/components/pages/NotFoundPage";
+import { StoriesButton } from "@/ui/StoriesButton";
+import { Title } from "@/ui/Title";
+import { Metadata, ResolvingMetadata } from "next";
+import { InProcess } from "@/components/pages/InProcess";
 
 export async function generateMetadata(
   {},
   __: ResolvingMetadata
 ): Promise<Metadata> {
   return {
-    title: 'Blog',
+    title: "Blog",
   };
 }
 
@@ -29,6 +30,6 @@ export default async function BlogLayout({
     //   </div>
     //   <div className="grid grid-cols-6 lg:gap-x-[0.833vw]">{children}</div>
     // </section>
-    <NotFoundPage/>
+    <InProcess />
   );
 }
diff --git a/src/app/(main)/blog/page.tsx b/src/app/(main)/blog/page.tsx
index b15e001..97fa346 100644
--- a/src/app/(main)/blog/page.tsx
+++ b/src/app/(main)/blog/page.tsx
@@ -1,20 +1,20 @@
-import { api } from '@/api';
-import { ArticlesList } from '@/components/pages/BlogPage/ArticlesList';
-import { ArticlesPageActions } from '@/components/pages/BlogPage/ArticlesPageActions';
-import { IArticle } from '@/types/IArticle';
+import { api } from "@/api";
+import { ArticlesList } from "@/components/pages/BlogPage/ArticlesList";
+import { ArticlesPageActions } from "@/components/pages/BlogPage/ArticlesPageActions";
+import { IArticle } from "@/types/IArticle";
 import {
   dehydrate,
   HydrationBoundary,
   QueryClient,
-} from '@tanstack/react-query';
-import { Suspense } from 'react';
+} from "@tanstack/react-query";
+import { Suspense } from "react";
 
 export default async function BlogPage() {
   const queryClient = new QueryClient();
 
   await queryClient.prefetchQuery({
-    queryKey: ['articles'],
-    queryFn: () => api.get('articles').json<IArticle[]>(),
+    queryKey: ["articles"],
+    queryFn: () => api.get("articles").json<IArticle[]>(),
   });
 
   return (
diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx
index 2e58c82..9771f01 100644
--- a/src/app/(main)/layout.tsx
+++ b/src/app/(main)/layout.tsx
@@ -1,11 +1,11 @@
-import { Feedback } from '@/components/Layout/Feedback';
-import { Footer } from '@/components/Layout/Footer';
-import dynamic from 'next/dynamic';
-import { PropsWithChildren } from 'react';
+import { Feedback } from "@/components/Layout/Feedback";
+import { Footer } from "@/components/Layout/Footer";
+import dynamic from "next/dynamic";
+import { PropsWithChildren } from "react";
 
 export default function MainLayout({ children }: PropsWithChildren) {
   const Header = dynamic(
-    () => import('@/components/Layout/Header').then((mod) => mod.Header),
+    () => import("@/components/Layout/Header").then((mod) => mod.Header),
     { ssr: false }
   );
 
@@ -14,7 +14,7 @@ export default function MainLayout({ children }: PropsWithChildren) {
       <Header />
       <main className="flex-1 md:max-lg:pt-[120px] pt-25 md:max-lg:px-4 lg:px-[1.389vw] px-[10px] overflow-clip relative">
         {children}
-        <Feedback />
+        {/* <Feedback /> */}
       </main>
       <Footer />
     </div>
diff --git a/src/components/Layout/Footer.tsx b/src/components/Layout/Footer.tsx
index 5832219..916987b 100644
--- a/src/components/Layout/Footer.tsx
+++ b/src/components/Layout/Footer.tsx
@@ -1,36 +1,39 @@
-'use client'
+"use client";
 
-import Link from 'next/link';
-import { PropsWithChildren } from 'react';
-import ArrowMoreIcon from '../../../public/icons/arrow_more.svg';
-import RutubeIcon from '../../../public/icons/rutube.svg';
-import TelegramIcon from '../../../public/icons/tg.svg';
-import VkIcon from '../../../public/icons/vk.svg';
-import YoutubeIcon from '../../../public/icons/youtube.svg';
-import { useTranslations } from 'next-intl';
-import { useLocale } from 'next-intl';
+import Link from "next/link";
+import { PropsWithChildren } from "react";
+import ArrowMoreIcon from "../../../public/icons/arrow_more.svg";
+import RutubeIcon from "../../../public/icons/rutube.svg";
+import TelegramIcon from "../../../public/icons/tg.svg";
+import VkIcon from "../../../public/icons/vk.svg";
+import YoutubeIcon from "../../../public/icons/youtube.svg";
+import { useTranslations } from "next-intl";
+import { useLocale } from "next-intl";
 
 export function Footer() {
-  const t = useTranslations("footer")
+  const t = useTranslations("footer");
 
   return (
-    <footer className="lg:px-5 lg:pb-5 md:max-lg:px-4 md:max-lg:pb-4 px-[10px] pb-[10px] space-y-6 mb-0">
+    <footer
+      className="lg:px-5 lg:pb-5 md:max-lg:px-4 md:max-lg:pb-4 px-[10px] pb-[10px] pt-10 space-y-6 mb-0"
+      id="footer"
+    >
       <div className="max-md:flex-col lg:gap-[0.833vw] md:max-lg:gap-[1.042vw] flex gap-[1.111vw]">
         <Link
-          href={'tel:' + '+971 58 506 0097'.replaceAll(' ', '')}
+          href={"tel:" + "+971 58 506 0097".replaceAll(" ", "")}
           className="lg:p-[1.667vw] p-6 flex flex-col justify-between max-md:gap-y-10 bg-[linear-gradient(to_top_left,#7A7A7A50,transparent)] lg:rounded-[1.111vw] rounded-2xl lg:aspect-[696/248] lg:w-[48.333vw] md:max-lg:w-[47.656vw] hover:bg-[#37393B99] bg-transparent transition-colors"
         >
-          <p className="text-[#7A7A7A] text1 font-medium">{t('call')}</p>
+          <p className="text-[#7A7A7A] text1 font-medium">{t("call")}</p>
           <div className="lg:line2 md:max-lg:heading1 line2 flex items-center font-medium">
             +971 58 506 0097
             <ArrowMoreIcon className="text-white lg:w-[5.556vw] lg:h-[5.556vw] md:max-lg:w-[4.167vw] md:max-lg:h-[4.167vw] w-[10vw] h-[10vw]" />
           </div>
         </Link>
         <Link
-          href={'mailto:' + 'sam@graff.tech'}
+          href={"mailto:" + "sam@graff.tech"}
           className="lg:p-[1.667vw] p-6 flex flex-col justify-between max-md:gap-y-10 bg-[linear-gradient(to_top_left,#7A7A7A50,transparent)] lg:rounded-[1.111vw] rounded-2xl lg:aspect-[624/248] lg:w-[43.333vw] md:max-lg:w-[47.656vw] hover:bg-[#37393B99] bg-transparent transition-colors"
         >
-          <p className="text-[#7A7A7A] text1 font-medium">{t('write')}</p>
+          <p className="text-[#7A7A7A] text1 font-medium">{t("write")}</p>
           <div className="lg:line2 md:max-lg:heading1 line2 flex items-center font-medium">
             sam@graff.tech
             <ArrowMoreIcon className="text-white lg:w-[5.556vw] lg:h-[5.556vw] md:max-lg:w-[4.167vw] md:max-lg:h-[4.167vw] w-[10vw] h-[10vw]" />
@@ -53,16 +56,16 @@ export function Footer() {
       </div>
       <div className="lg:gap-x-[1.667vw] gap-y-2 lg:flex grid">
         <Link
-          href={'/policy'}
+          href={"/policy"}
           className="text-[#37393B] text1 font-medium leading-[18.9px] w-fit"
         >
-          {t('privacy')}
+          {t("privacy")}
         </Link>
         <p className="text-[#37393B] text1 font-medium leading-[18.9px] col-start-1">
-          {t('copyright')}
+          {t("copyright")}
         </p>
         <Link
-          href={'https://graff.tech'}
+          href={"https://graff.tech"}
           className="text-[#37393B] text1 font-medium leading-[18.9px] lg:w-fit md:col-start-2 md:text-right w-full"
         >
           graff.tech
@@ -75,7 +78,7 @@ export function Footer() {
 export function ContactLink({
   children,
   href,
-  className = '',
+  className = "",
 }: PropsWithChildren<{ href: string; className?: string }>) {
   return (
     <Link
diff --git a/src/components/Layout/Header.tsx b/src/components/Layout/Header.tsx
index 7b76acc..77ff8e8 100644
--- a/src/components/Layout/Header.tsx
+++ b/src/components/Layout/Header.tsx
@@ -127,7 +127,7 @@ export function Header() {
             />
             <div className="md:justify-end flex justify-center flex-1">
               <Link
-                href={"/form"}
+                href={"#footer"}
                 className="btnm bg-gradient font-medium lg:px-[1.667vw] lg:py-[1.181vw] py-[17px] px-6 text-nowrap lg:rounded-[1.111vw] rounded-2xl flex items-center"
               >
                 {t("submit_request")}