Merge remote-tracking branch 'origin/navbar'

src/app/[...not_found]/page.tsx

@@ -0,0 +1,31 @@
+import routeFactory from '@/assets/constants/routeFactory';
+import images from '@/assets/images/images';
+import Button from '@/components/uikit/button';
+import { t } from '@/locales/translates';
+
+export default function NotFound() {
+  return (
+    <div className="container mx-auto my-32 flex flex-col items-center justify-center gap-6">
+      <h2 className="text-center text-4xl md:text-[5rem]">
+        {t('pages_notFound_title') as string}
+      </h2>
+      <p className="text-center text-xl text-gray-300 md:text-2xl">
+        {t('pages_notFound_description') as string}
+      </p>
+      <div>
+        <img
+          alt="404 page"
+          src={images.notFound.src}
+          className="aspect-square"
+        />
+      </div>
+      <Button
+        link={routeFactory.home.route()}
+        endIcon="showMore"
+        className="w-fit"
+      >
+        {t('pages_notFound_button') as string}
+      </Button>
+    </div>
+  );
+}

src/app/[locale]/contact-us/page.tsx

@@ -21,18 +21,21 @@ export default async function Contact({
         imageSrc={images.blogBanner.src}
       />
 
-      <div className="flex w-full flex-col bg-gray-200 pt-4 md:pt-28">
-        <div className="relative container mx-auto flex w-full flex-col items-stretch overflow-hidden rounded-lg md:flex-row">
+      <div className="relative flex w-full flex-col bg-gray-200 pt-4 md:pt-28">
+        <div className="absolute inset-x-0 inset-y-64 z-10 flex items-end justify-start">
+          <div className="max-md:hidden md:w-1/2">
+            <Image
+              alt="footer-bg"
+              src={images.factoryVector}
+              className="h-full w-full object-cover"
+            />
+          </div>
+        </div>
+        <div className="container mx-auto flex w-full flex-col items-stretch overflow-hidden rounded-lg md:flex-row">
           <TouchUs />
           <ContactForm />
         </div>
-        <div className="absolute -bottom-[17.32rem] w-1/2 max-md:hidden md:w-2/5">
-          <Image
-            alt="footer-bg"
-            src={images.factoryVector}
-            className="h-full w-full object-cover"
-          />
-        </div>
+
         <div className="mt-4 w-full md:mt-28">
           <div className="h-64 w-full overflow-hidden rounded-lg bg-gray-200">
             <ContactMap />