#loyiha dizayni o'zgardi, ma'lumotlar serverdan yuklanmoqda, rus tili…

… qo'shildi, muammolar bartaraf etildi (katta yangilanish)
elmurodvokhidov · Jan 16, 2025 · 0d37b94 · 0d37b94
1 parent c22af17
commit 0d37b94
Show file tree

Hide file tree

Showing 39 changed files with 859 additions and 282 deletions.
diff --git a/app/about/page.tsx b/app/about/page.tsx
@@ -1,27 +1,20 @@
 import About from '@/components/About';
 import Contact from '@/components/Contact';
-import Navbar from '@/components/Navbar'
 import SectionHeader from '@/components/SectionHeader'
 import WhyUs from '@/components/WhyUs';
-import { useTranslations } from 'next-intl';
+import { getVideoByType } from '@/lib/actions/video.actions';
 
-export default function Page() {
-    const t = useTranslations('about');
+export default async function Page() {
+    const videoUrl = await getVideoByType('about');
 
     return (
         <div>
             {/* Birinchi bo'lak */}
-            <section className="h-screen relative overflow-hidden">
-                {/* Navbar Componenti */}
-                <Navbar />
-
-                {/* Sahifaning asosiy bosh bo'lagi */}
-                <SectionHeader
-                    title={t('text1')}
-                    description={t('header')}
-                    src="videos/nuts2.mp4"
-                />
-            </section>
+            <SectionHeader
+                title='about.text1'
+                description='about.header'
+                src={videoUrl}
+            />
 
             {/* Umumiy qism */}
             <section className="section">

diff --git a/app/contact/page.tsx b/app/contact/page.tsx
@@ -1,25 +1,18 @@
 import ContactForm from '@/components/ContactForm'
-import Navbar from '@/components/Navbar'
 import SectionHeader from '@/components/SectionHeader'
-import { useTranslations } from 'next-intl';
+import { getVideoByType } from '@/lib/actions/video.actions';
 
-export default function Page() {
-    const t = useTranslations();
+export default async function Page() {
+    const videoUrl = await getVideoByType('contact');
 
     return (
         <div>
             {/* Birinchi bo'lak */}
-            <section className="h-screen relative overflow-hidden">
-                {/* Navbar Componenti */}
-                <Navbar />
-
-                {/* Sahifaning asosiy bosh bo'lagi */}
-                <SectionHeader
-                    title={t('contact.text3')}
-                    description={t('contact.header')}
-                    src="videos/contact.mp4"
-                />
-            </section>
+            <SectionHeader
+                title='contact.text3'
+                description='contact.header'
+                src={videoUrl}
+            />
 
             {/* Umumiy qism */}
             <section className="section lg:!px-20 !my-32">
@@ -33,12 +26,7 @@ export default function Page() {
                 />
 
                 {/* So'rov oynasi */}
-                <div className='my-20 space-y-6'>
-                    <h1 className="text-black text-3xl font-semibold">
-                        {t('form.title1')}
-                    </h1>
-                    <ContactForm />
-                </div>
+                <ContactForm />
             </section>
         </div>
     )

diff --git a/app/favicon.ico b/app/favicon.ico
diff --git a/app/globals.css b/app/globals.css
@@ -30,10 +30,9 @@ body {
 }
 
 .gradient {
-  background: linear-gradient(to bottom, #7db9e8 0%, #ff6d6d 0%, #ff4495 100%);
+  background: linear-gradient(to bottom, #7db9e8 0%, #00AD83A1 0%, #17B169A1 100%);
 }
 
-
 .main {
   width: 100vw;
   min-height: 100vh;
@@ -161,7 +160,7 @@ nav a {
 }
 
 nav a:hover {
-  @apply text-pink;
+  @apply text-green-600;
 }
 
 nav a::after {
@@ -170,15 +169,15 @@ nav a::after {
 }
 
 nav a:hover::after {
-  @apply w-full h-0.5 bg-pink;
+  @apply w-full h-0.5 bg-green-600;
 }
 
 nav a.active {
-  @apply text-pink;
+  @apply text-green-600;
 }
 
 nav a.active::after {
-  @apply w-full h-0.5 bg-pink;
+  @apply w-full h-0.5 bg-green-600;
 }
 
 .footer_social a {
@@ -190,7 +189,7 @@ nav a.active::after {
 }
 
 .product_card {
-  @apply relative w-[300px] bg-white rounded-lg py-5 px-4 space-y-8 overflow-hidden shadow-lg;
+  @apply relative w-[300px] laptop:w-[330px] bg-white rounded-lg px-4 py-5 laptop:px-5 laptop:py-6 space-y-8 laptop:space-y-10 overflow-hidden shadow-lg;
 }
 
 .card_decoration {
@@ -207,29 +206,33 @@ nav a.active::after {
 }
 
 .p {
-  @apply text-base uppercase text-pink;
+  @apply text-base laptop:text-lg uppercase text-red-400;
 }
 
 .h1 {
-  @apply md:text-4xl sm:text-3xl text-2xl font-bold tracking-wider w-full md:w-3/5 sm:w-full text-center text-black
+  @apply laptop:text-5xl md:text-4xl sm:text-3xl text-2xl font-bold tracking-wider w-full md:w-3/5 sm:w-full text-center text-black
 }
 
 .section {
   @apply relative z-10 px-8 space-y-32;
 }
 
+.section1 {
+  @apply relative overflow-hidden;
+}
+
 .shad_textArea {
-  @apply placeholder:text-gray-500 focus-visible:ring-0 focus-visible:ring-offset-0 rounded-none !important;
+  @apply placeholder:text-gray-500 focus-visible:ring-0 focus-visible:ring-offset-0 rounded-none laptop:text-xl !important;
 }
 
 .shad_input {
-  @apply placeholder:text-gray-500 h-11 focus-visible:ring-0 focus-visible:ring-offset-0 rounded-none !important;
+  @apply placeholder:text-gray-500 h-11 laptop:h-12 focus-visible:ring-0 focus-visible:ring-offset-0 rounded-none laptop:text-xl !important;
 }
 
 .main_animation {
-  @apply size-[910px] absolute -top-[250px] xl:-right-[210px] md:-right-[310px] -right-[410px] !important;
+  @apply size-[910px] laptop:size-[1010px] absolute -top-[250px] xl:-right-[210px] md:-right-[310px] -right-[410px] !important;
 }
 
 .main_video {
-  @apply w-[800px] h-[800px] absolute -top-[250px] xl:-right-[300px] md:-right-[400px] -right-[500px] rounded-full -skew-y-[15deg] rotate-[20deg] overflow-hidden !important;
+  @apply size-[800px] laptop:size-[900px] absolute -top-[250px] xl:-right-[300px] md:-right-[400px] -right-[500px] rounded-full -skew-y-[15deg] rotate-[20deg] overflow-hidden !important;
 }
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -4,6 +4,7 @@ import { getLocale, getMessages } from "next-intl/server";
 import { NextIntlClientProvider } from "next-intl";
 import "./globals.css";
 import Footer from "@/components/Footer";
+import { Toaster } from "@/components/ui/toaster";
 
 const nunito = Nunito({
   subsets: ["latin"],
@@ -12,8 +13,8 @@ const nunito = Nunito({
 });
 
 export const metadata: Metadata = {
-  title: "Company Name",
-  description: "Company Description",
+  title: "UYCHI NUTS",
+  description: "UYCHI NUTS - Tabiatning Eng Toza Ta'mi!",
 };
 
 export default async function LocaleLayout({
@@ -32,6 +33,7 @@ export default async function LocaleLayout({
             <div className="main_gradient" />
           </div>
           {children}
+          <Toaster />
           <Footer />
         </NextIntlClientProvider>
       </body>

diff --git a/app/page.tsx b/app/page.tsx
@@ -6,12 +6,15 @@ import Navbar from "@/components/Navbar";
 import Products from "@/components/Products";
 import WhyUs from "@/components/WhyUs";
 import Works from "@/components/Works";
+import { getVideoByType } from "@/lib/actions/video.actions";
+
+export default async function Home() {
+  const videoUrl = await getVideoByType('home');
 
-export default function Home() {
   return (
     <div>
       {/* Birinchi bo'lak */}
-      <section className="h-screen relative overflow-hidden">
+      <section className="section1">
         {/* Navbar Componenti */}
         <Navbar />
 
@@ -20,7 +23,7 @@ export default function Home() {
           <HomeLeftSide />
 
           {/* Bosh sahifaning o'ng qismi */}
-          <HomeRightSide src="videos/nuts.mp4" />
+          <HomeRightSide src={videoUrl} />
         </main>
       </section>
 
@@ -36,4 +39,4 @@ export default function Home() {
       <Contact />
     </div>
   );
-}
+}
diff --git a/app/products/page.tsx b/app/products/page.tsx
@@ -1,27 +1,20 @@
 import Contact from '@/components/Contact'
-import Navbar from '@/components/Navbar'
 import Products from '@/components/Products'
 import SectionHeader from '@/components/SectionHeader'
 import Works from '@/components/Works'
-import { useTranslations } from 'next-intl'
+import { getVideoByType } from '@/lib/actions/video.actions'
 
-export default function Page() {
-    const t = useTranslations('products');
+export default async function Page() {
+    const videoUrl = await getVideoByType('products');
 
     return (
         <div>
             {/* Birinchi bo'lak */}
-            <section className="h-screen relative overflow-hidden">
-                {/* Navbar Componenti */}
-                <Navbar />
-
-                {/* Sahifaning asosiy bosh bo'lagi */}
-                <SectionHeader
-                    title={t('text1')}
-                    description={t('header')}
-                    src="videos/nuts3.mp4"
-                />
-            </section>
+            <SectionHeader
+                title='products.text1'
+                description='products.header'
+                src={videoUrl}
+            />
 
             {/* Umumiy qism */}
             <section className="section">

diff --git a/components/About.tsx b/components/About.tsx
@@ -5,7 +5,7 @@ export default function About() {
     const t = useTranslations('about');
 
     return (
-        <div className='flex flex-wrap items-center justify-center lg:gap-[150px] md:gap-[100px] gap-[50px]'>
+        <div className='flex flex-wrap items-center justify-center laptop:gap-[200px] lg:gap-[150px] md:gap-[100px] gap-[50px]'>
             <Image
                 src="/images/about.png"
                 alt="Picture of the author"
@@ -16,8 +16,8 @@ export default function About() {
             <div className='lg:w-[45%] md:w-[85%] sm:w-full flex flex-col items-start md:gap-8 gap-6'>
                 <p className='p'>{t('text1')}</p>
                 <h1 className='h1 !text-left !w-full'>{t('text2')}</h1>
-                <p className='text-base text-gray-500'>{t('des1')}</p>
-                <p className='text-base text-gray-500'>{t('des2')}</p>
+                <p className='text-base laptop:text-xl text-gray-500'>{t('des1')}</p>
+                <p className='text-base laptop:text-xl text-gray-500'>{t('des2')}</p>
             </div>
         </div>
     )

diff --git a/components/Contact.tsx b/components/Contact.tsx
@@ -11,7 +11,7 @@ export default function Contact() {
                 alt="contact"
                 width={1920}
                 height={1800}
-                className='h-[550px] relative z-0 object-cover'
+                className='h-[550px] laptop:h-[600px] relative z-0 object-cover'
             />
 
             <div className='absolute top-5 md:right-[15%] right-0 flex items-center justify-center'>
@@ -20,12 +20,12 @@ export default function Contact() {
                     alt="shape"
                     width={500}
                     height={500}
-                    className='relative z-0'
+                    className='relative z-0 laptop:size-[550px]'
                 />
                 <div className='w-4/6 text-center flex flex-col items-center md:gap-10 gap-5 font-semibold text-white absolute z-10'>
-                    <h1 className='md:text-4xl sm:text-3xl text-2xl'>{t('text1')}</h1>
-                    <p className='md:text-base sm:text-sm text-xs font-normal'>{t('text2')}</p>
-                    <button className='md:text-lg md:py-4 sm:py-2 py-1 md:px-9 sm:px-6 px-4 rounded-full border border-white capitalize hover:bg-white transition-all duration-300 hover:text-pink'>
+                    <h1 className='laptop:text-5xl md:text-4xl sm:text-3xl text-2xl'>{t('text1')}</h1>
+                    <p className='laptop:text-xl md:text-base sm:text-sm text-xs font-normal'>{t('text2')}</p>
+                    <button className='laptop:text-2xl md:text-lg md:py-4 sm:py-2 py-1 md:px-9 sm:px-6 px-4 rounded-full border border-white capitalize hover:bg-white transition-all duration-300 hover:text-pink'>
                         {t('text3')}
                     </button>
                 </div>