Compare commits

..

No commits in common. "a839f37c27008ff8dc44d55d6ad55af1645d0d31" and "ff9ac551bfc292ac69b279c3d6d53b581ec838f8" have entirely different histories.

14 changed files with 877 additions and 940 deletions

View File

@ -37,7 +37,7 @@ export default async function RootLayout({
className='scroll-smooth'
style={{ scrollBehavior: 'smooth' }}
>
<body className={`${inter.className} antialiased min-w-2xs`}>
<body className={`${inter.className} antialiased`}>
<Providers textItems={response.data as TextItem[]}>
<Header />
{children}

View File

@ -97,7 +97,7 @@ export function CorporateDashboard() {
const { t } = useTextController();
return (
<div className='flex min-h-screen flex-col px-2.5'>
<div className='flex min-h-screen flex-col'>
<main className='flex-1 py-10'>
<div className='container mx-auto max-w-6xl'>
<div className='mb-8 flex items-center justify-between'>
@ -110,7 +110,7 @@ export function CorporateDashboard() {
<div className='mb-10 grid gap-3 md:grid-cols-3 md:gap-6'>
{/* Company Card */}
<Card data-aos='zoom-in' data-aos-mirror="true" className='md:col-span-2'>
<Card className='md:col-span-2'>
<CardHeader className='pb-2'>
<CardTitle className='flex items-center gap-2'>
<Building2 className='h-5 w-5 text-red-600' />
@ -166,7 +166,7 @@ export function CorporateDashboard() {
</Card>
{/* Fund Card */}
<Card data-aos='zoom-in' data-aos-mirror="true" className='bg-gradient-to-br from-red-600 to-red-800 text-white'>
<Card className='bg-gradient-to-br from-red-600 to-red-800 text-white'>
<CardHeader>
<CardTitle className='flex items-center gap-2'>
<Wallet className='h-5 w-5' />

View File

@ -22,7 +22,7 @@ export function CustomerDashboard() {
const { data, isLoading } = useFetchMyBonusInfoQuery({});
return (
<div className='flex min-h-screen flex-col px-2.5'>
<div className='flex min-h-screen flex-col'>
<main className='flex-1 py-10'>
<div className='container mx-auto max-w-6xl'>
<div className='mb-8 flex items-center justify-between'>
@ -34,7 +34,7 @@ export function CustomerDashboard() {
</div>
<div className='mb-10 grid gap-3 md:grid-cols-3 md:gap-6'>
<Card data-aos="zoom-in" data-aos-mirror="true" className='bg-gradient-to-br from-red-600 to-red-800 text-white'>
<Card className='bg-gradient-to-br from-red-600 to-red-800 text-white'>
{!data || isLoading ? (
// TODO: Bunyod please add loader here
<>Loader here</>
@ -73,7 +73,7 @@ export function CustomerDashboard() {
{/* Bonus Card */}
{/* Customer Card */}
<Card data-aos="zoom-in" data-aos-mirror="true" className='md:col-span-2'>
<Card className='md:col-span-2'>
<CardHeader className='pb-2'>
<CardTitle className='flex items-center gap-2'>
<User className='h-5 w-5 text-red-600' />

View File

@ -13,7 +13,6 @@ import { Card, CardContent } from '@/shared/shadcn-ui/card';
import { CompanyTimeline } from '@/widgets/about-page/company-timeline';
import { StationGallery } from '@/widgets/about-page/station-gallery';
import { CtaSection } from '@/widgets/cta-section';
import Container from '@/shared/shadcn-ui/conteiner';
export const metadata = {
title: 'about.metadata.title',
@ -37,8 +36,8 @@ export default function AboutPage() {
className='object-cover'
priority
/>
<div className='absolute inset-0 flex items-center bg-gradient-to-r from-black/70 to-black/30 px-2'>
<div data-aos='fade-down' data-aos-duration="1000" className='container mx-auto'>
<div className='absolute inset-0 flex items-center bg-gradient-to-r from-black/70 to-black/30'>
<div className='container mx-auto'>
<div className='max-w-2xl space-y-4 text-white'>
<h1 className='text-4xl font-bold tracking-tight sm:text-5xl md:text-6xl'>
{t('about.hero.title')}
@ -53,11 +52,10 @@ export default function AboutPage() {
</section>
{/* Company Overview */}
<Container>
<section className='py-16'>
<div className='container mx-auto'>
<div className='grid items-center gap-12 md:grid-cols-2'>
<div data-aos='fade-right'>
<div>
<div className='mb-4 inline-flex items-center justify-center rounded-full bg-red-100 p-2'>
<Fuel className='h-6 w-6 text-red-600' />
</div>
@ -74,7 +72,7 @@ export default function AboutPage() {
{t('about.overview.description3')}
</p>
<div className='mb-6 grid md:grid-cols-2 gap-4 grid-cols-1'>
<div className='mb-6 grid grid-cols-2 gap-4'>
{[0, 1, 2, 3].map((index) => (
<div key={index} className='flex items-start'>
<div className='mt-1 flex h-6 w-6 flex-shrink-0 items-center justify-center rounded-full bg-red-600'>
@ -92,7 +90,7 @@ export default function AboutPage() {
))}
</div>
</div>
<div data-aos="zoom-out-right" className='relative h-[500px] overflow-hidden rounded-xl shadow-xl'>
<div className='relative h-[500px] overflow-hidden rounded-xl shadow-xl'>
<Image
src='/placeholder.svg?height=500&width=600&text=Главный+офис'
alt={t('about.overview.imageAlt')}
@ -103,7 +101,6 @@ export default function AboutPage() {
</div>
</div>
</section>
</Container>
{/* Stats Section */}
<section className='bg-red-600 py-16 text-white'>
@ -116,7 +113,7 @@ export default function AboutPage() {
{t('about.stats.subtitle')}
</p>
</div>
<div className='grid grid-cols-1 sm:grid-cols-2 gap-8 text-center md:grid-cols-4'>
<div className='grid grid-cols-2 gap-8 text-center md:grid-cols-4'>
{[0, 1, 2, 3].map((index) => (
<div key={index} className='space-y-2'>
<h3 className='text-4xl font-bold'>
@ -142,7 +139,6 @@ export default function AboutPage() {
{/* Our History */}
<section className='py-16'>
<div className='container mx-auto'>
<Container>
<div className='mb-12 flex flex-col items-center justify-center text-center'>
<div className='mb-4 inline-flex items-center justify-center rounded-full bg-red-100 p-2'>
<History className='h-6 w-6 text-red-600' />
@ -154,17 +150,12 @@ export default function AboutPage() {
{t('about.history.subtitle')}
</p>
</div>
</Container>
<Container>
<CompanyTimeline />
</Container>
</div>
</section>
{/* Our Stations */}
<Container>
<section className='bg-gray-50 py-16'>
<div className='container mx-auto'>
<div className='mb-12 flex flex-col items-center justify-center text-center'>
@ -192,10 +183,8 @@ export default function AboutPage() {
</div>
</div>
</section>
</Container>
{/* Our Values */}
<Container>
<section className='py-16'>
<div className='container mx-auto'>
<div className='mb-12 flex flex-col items-center justify-center text-center'>
@ -210,7 +199,7 @@ export default function AboutPage() {
</p>
</div>
<div data-aos='flip-up' data-aos-duration='600' className='grid gap-8 md:grid-cols-3'>
<div className='grid gap-8 md:grid-cols-3'>
{[0, 1, 2].map((index) => (
<Card
key={index}
@ -232,10 +221,8 @@ export default function AboutPage() {
</div>
</div>
</section>
</Container>
{/* Our Team */}
<Container>
<section className='bg-gray-50 py-16'>
<div className='container mx-auto'>
<div className='mb-12 flex flex-col items-center justify-center text-center'>
@ -250,7 +237,7 @@ export default function AboutPage() {
</p>
</div>
<div data-aos='flip-down' data-aos-duration='600' className='grid grid-cols-1 gap-8 sm:grid-cols-2 lg:grid-cols-4'>
<div className='grid grid-cols-1 gap-8 sm:grid-cols-2 lg:grid-cols-4'>
{[0, 1, 2, 3].map((index) => (
<div
key={index}
@ -277,11 +264,8 @@ export default function AboutPage() {
</div>
</div>
</section>
</Container>
{/* Testimonials */}
<Container>
<section className='py-16'>
<div className='container mx-auto'>
<div className='mb-12 flex flex-col items-center justify-center text-center'>
@ -296,7 +280,7 @@ export default function AboutPage() {
</p>
</div>
<div data-aos="zoom-out-right" className='grid gap-8 md:grid-cols-3'>
<div className='grid gap-8 md:grid-cols-3'>
{[0, 1, 2].map((index) => (
<Card
key={index}
@ -325,7 +309,6 @@ export default function AboutPage() {
</div>
</div>
</section>
</Container>
<CtaSection />
</main>

View File

@ -21,7 +21,6 @@ import {
} from '@/shared/shadcn-ui/card';
import { CtaSection } from '@/widgets/cta-section';
import Container from '@/shared/shadcn-ui/conteiner';
export const metadata = {
title: 'Благотворительность | GasNetwork - Сеть заправок в Таджикистане',
@ -47,27 +46,24 @@ export function CharityPage() {
priority
/>
<div className='absolute inset-0 flex items-center bg-gradient-to-r from-black/70 to-black/30'>
<Container>
<div data-aos='fade-down' data-aos-duration='800' className='container mx-auto'>
<div className='container mx-auto'>
<div className='max-w-2xl space-y-6 text-white'>
<div className='inline-flex items-center justify-center rounded-full bg-red-600/20 p-2'>
<Heart className='size-6 text-red-500' />
</div>
<h1 className='text-3xl font-bold tracking-tight sm:text-5xl md:text-6xl'>
<h1 className='text-4xl font-bold tracking-tight sm:text-5xl md:text-6xl'>
{t('charity.hero.title')}
</h1>
<p className='text-lg sm:text-xl text-gray-200'>
<p className='text-xl text-gray-200'>
{t('charity.hero.subtitle')}
</p>
</div>
</div>
</Container>
</div>
</div>
</section>
{/* Mission Section */}
<Container>
<section className='py-16'>
<div className='container mx-auto'>
<div className='grid items-center gap-12 md:grid-cols-2'>
@ -112,7 +108,6 @@ export function CharityPage() {
</div>
</div>
</section>
</Container>
{/* Key Figures */}
<section className='bg-red-600 py-16 text-white'>
@ -141,7 +136,6 @@ export function CharityPage() {
</section>
{/* Upcoming Events */}
<Container>
<section className='bg-gray-50 py-16'>
<div className='container mx-auto'>
<div className='mb-12 text-center'>
@ -185,8 +179,7 @@ export function CharityPage() {
'/placeholder.svg?height=200&width=300&text=Школьные+принадлежности',
},
].map((event, index) => (
<Card key={index} className='overflow-hidden flex flex-col justify-between'>
<div>
<Card key={index} className='overflow-hidden'>
<div className='relative h-48 w-full'>
<Image
src={event.image || '/placeholder.svg'}
@ -196,7 +189,7 @@ export function CharityPage() {
/>
</div>
<CardHeader>
<CardTitle className='text-xl lg:text-2xl'>{event.title}</CardTitle>
<CardTitle>{event.title}</CardTitle>
</CardHeader>
<CardContent className='space-y-4'>
<p className='text-gray-600'>{event.description}</p>
@ -209,7 +202,6 @@ export function CharityPage() {
{event.location}
</div>
</CardContent>
</div>
<CardFooter>
<Button className='w-full bg-red-600 hover:bg-red-700'>
{t(`charity.events.button`)}
@ -220,10 +212,8 @@ export function CharityPage() {
</div>
</div>
</section>
</Container>
{/* How to Help */}
<Container>
<section className='py-16'>
<div className='container mx-auto'>
<div className='mb-12 text-center'>
@ -280,7 +270,6 @@ export function CharityPage() {
</div>
</div>
</section>
</Container>
<CtaSection />
</main>
</div>

View File

@ -6,7 +6,6 @@ import Image from 'next/image';
import { useTextController } from '@/shared/language/hooks/use-text-controller';
import { Button } from '@/shared/shadcn-ui/button';
import { Card, CardContent } from '@/shared/shadcn-ui/card';
import Container from '@/shared/shadcn-ui/conteiner';
export function CertificatesPage() {
const { t } = useTextController();
@ -65,7 +64,7 @@ export function CertificatesPage() {
];
return (
<Container>
<>
<main className='container mx-auto py-10'>
<div className='mb-10 text-center'>
<h1 className='mb-4 text-4xl font-bold'>{t('certificates.title')}</h1>
@ -77,7 +76,6 @@ export function CertificatesPage() {
<div className='grid gap-8 md:grid-cols-2 lg:grid-cols-3'>
{certificates.map((certificate) => (
<Card
data-aos='zoom-in'
key={certificate.id}
className='overflow-hidden transition-all duration-300 hover:shadow-lg'
>
@ -124,6 +122,6 @@ export function CertificatesPage() {
))}
</div>
</main>
</Container>
</>
);
}

View File

@ -7,7 +7,6 @@ import { useTextController } from '@/shared/language/hooks/use-text-controller';
import { BenefitsSection } from '@/widgets/clients/ui/benefits-section';
import { ServicesOverviewSection } from '@/widgets/clients/ui/services-overview-section';
import { CtaSection } from '@/widgets/cta-section';
import Container from '@/shared/shadcn-ui/conteiner';
export const metadata = {
title: 'Клиентам | GasNetwork - Сеть заправок в Таджикистане',
@ -33,8 +32,7 @@ export function ClientsPage() {
priority
/>
<div className='absolute inset-0 flex items-center bg-gradient-to-r from-black/70 to-black/30'>
<Container>
<div data-aos='fade-down' data-aos-duration="1000" className='container mx-auto'>
<div className='container mx-auto'>
<div className='max-w-2xl space-y-4 text-white'>
<h1 className='text-4xl font-bold tracking-tight sm:text-5xl md:text-6xl'>
{t('clients.title')}
@ -44,7 +42,6 @@ export function ClientsPage() {
</p>
</div>
</div>
</Container>
</div>
</div>
</section>

View File

@ -7,7 +7,6 @@ import { useTextController } from '@/shared/language/hooks/use-text-controller';
import { Card, CardContent } from '@/shared/shadcn-ui/card';
import { CtaSection } from '@/widgets/cta-section';
import Container from '@/shared/shadcn-ui/conteiner';
export const metadata = {
title: 'Программа лояльности | GasNetwork - Сеть заправок в Таджикистане',
@ -33,8 +32,7 @@ export function LoyaltyPage() {
priority
/>
<div className='absolute inset-0 flex items-center bg-gradient-to-r from-black/70 to-black/30'>
<Container>
<div data-aos='fade-down' data-aos-duration="800" className='container mx-auto'>
<div className='container mx-auto'>
<div className='max-w-2xl space-y-4 text-white'>
<h1 className='text-4xl font-bold tracking-tight sm:text-5xl md:text-6xl'>
{t('clients.loyalty.title')}
@ -44,17 +42,15 @@ export function LoyaltyPage() {
</p>
</div>
</div>
</Container>
</div>
</div>
</section>
<Container>
{/* Program Overview */}
<section className='py-16'>
<div className='container mx-auto'>
<div className='grid items-center gap-12 md:grid-cols-2'>
<div data-aos='fade-right'>
<div>
<div className='mb-4 inline-flex items-center justify-center rounded-full bg-red-100 p-2'>
<Percent className='h-6 w-6 text-red-600' />
</div>
@ -110,7 +106,7 @@ export function LoyaltyPage() {
</div>
</div>
</div>
<div data-aos='fade-up' className='relative h-[400px] overflow-hidden rounded-xl shadow-xl'>
<div className='relative h-[400px] overflow-hidden rounded-xl shadow-xl'>
<Image
src='/placeholder.svg?height=400&width=600&text=Программа+лояльности'
alt='Программа лояльности'
@ -134,7 +130,7 @@ export function LoyaltyPage() {
</p>
</div>
<div data-aos='zoom-in-right' className='grid gap-8 md:grid-cols-4'>
<div className='grid gap-8 md:grid-cols-4'>
<div className='text-center'>
<div className='mx-auto mb-4 flex h-16 w-16 items-center justify-center rounded-full bg-red-600 text-2xl font-bold text-white'>
1
@ -195,7 +191,7 @@ export function LoyaltyPage() {
</p>
</div>
<div data-aos='flip-down' className='grid gap-8 md:grid-cols-3'>
<div className='grid gap-8 md:grid-cols-3'>
<Card className='overflow-hidden border-t-4 border-t-gray-400 transition-all hover:shadow-lg'>
<CardContent className='p-6'>
<h3 className='mb-4 text-center text-2xl font-bold'>
@ -324,7 +320,6 @@ export function LoyaltyPage() {
</div>
</div>
</section>
</Container>
<CtaSection />
</main>

View File

@ -22,7 +22,6 @@ import {
TabsList,
TabsTrigger,
} from '@/shared/shadcn-ui/tabs';
import Container from '@/shared/shadcn-ui/conteiner';
const tabs = [
{
@ -52,7 +51,6 @@ export default function LoginPage() {
};
return (
<Container>
<div className='flex min-h-screen flex-col items-center justify-center'>
<main className='flex-1'>
<div className='container max-w-6xl py-16'>
@ -66,7 +64,7 @@ export default function LoginPage() {
<p className='max-w-2xl text-gray-600'>{t('auth.description')}</p>
</div>
<div data-aos='zoom-in' className='mx-auto max-w-lg'>
<div className='mx-auto max-w-lg'>
<Tabs
defaultValue={defaultTab}
value={defaultTab}
@ -155,6 +153,5 @@ export default function LoginPage() {
</div>
</main>
</div>
</Container>
);
}

View File

@ -1,10 +0,0 @@
"use client"
interface ContainerProps {
children: React.ReactNode
}
export default function Container({children}: ContainerProps) {
return (
<div className="container mx-auto px-2.5 py-1">{children}</div>
)
}

View File

@ -76,7 +76,7 @@ export function StationGallery() {
const { t } = useTextController();
return (
<div className='space-y-8 px-2'>
<div className='space-y-8'>
<div className='relative h-[400px] overflow-hidden rounded-xl shadow-xl md:h-[500px]'>
<Image
src={stations[currentImage].image || '/placeholder.svg'}

View File

@ -4,7 +4,6 @@ import { Percent } from 'lucide-react';
import Image from 'next/image';
import { useTextController } from '@/shared/language/hooks/use-text-controller';
import Container from '@/shared/shadcn-ui/conteiner';
interface Benefit {
title: string;
@ -34,11 +33,10 @@ export const BenefitsSection = () => {
const { t } = useTextController();
return (
<Container>
<section className='bg-gray-50 py-16'>
<div className='container mx-auto'>
<div className='grid items-center gap-12 md:grid-cols-2'>
<div data-aos='fade-right' data-aos-duration='4000' className='order-2 md:order-1'>
<div className='order-2 md:order-1'>
<div className='mb-4 inline-flex items-center justify-center rounded-full bg-red-100 p-2'>
<Percent className='h-6 w-6 text-red-600' />
</div>
@ -65,7 +63,7 @@ export const BenefitsSection = () => {
})}
</div>
</div>
<div data-aos='fade-up' className='relative order-1 h-[400px] overflow-hidden rounded-xl shadow-xl md:order-2'>
<div className='relative order-1 h-[400px] overflow-hidden rounded-xl shadow-xl md:order-2'>
<Image
src='/placeholder.svg?height=400&width=600&text=Преимущества+для+клиентов'
alt='Преимущества для клиентов'
@ -76,6 +74,5 @@ export const BenefitsSection = () => {
</div>
</div>
</section>
</Container>
);
};

View File

@ -11,7 +11,6 @@ import {
CardHeader,
CardTitle,
} from '@/shared/shadcn-ui/card';
import Container from '@/shared/shadcn-ui/conteiner';
interface ServiceOverview {
title: string;
@ -50,7 +49,6 @@ export const ServicesOverviewSection = () => {
const { t } = useTextController();
return (
<Container>
<section className='py-16'>
<div className='container mx-auto'>
<div className='mb-12 text-center'>
@ -62,7 +60,7 @@ export const ServicesOverviewSection = () => {
</p>
</div>
<div data-aos='flip-up' data-aos-duration='600' className='grid gap-3 md:grid-cols-2 md:gap-6 lg:grid-cols-3'>
<div className='grid gap-3 md:grid-cols-2 md:gap-6 lg:grid-cols-3'>
{servicesOverview.map(({ description, Icon, contentText, title }) => {
return (
<Card
@ -85,6 +83,5 @@ export const ServicesOverviewSection = () => {
</div>
</div>
</section>
</Container>
);
};

View File

@ -11,8 +11,7 @@ export const Footer = () => {
return (
<footer className='bg-gray-900 px-4 py-12 text-white'>
<div className='containe mx-autor'>
<div className='grid grid-cols-1 gap-8 md:gap-4 md:grid-cols-3'>
<div className='flex md:justify-center md:items-center'>
<div className='grid grid-cols-1 gap-8 md:grid-cols-3'>
<div>
<div className='mb-4 flex items-center gap-2'>
<Fuel className='h-6 w-6 text-red-500' />
@ -60,8 +59,6 @@ export const Footer = () => {
</a>
</div>
</div>
</div>
<div className='flex md:justify-center md:items-center'>
<div>
<h3 className='mb-4 text-lg font-semibold'>
{t('common.footer.contacts')}
@ -81,8 +78,6 @@ export const Footer = () => {
</div>
</div>
</div>
</div>
<div className='flex md:justify-center md:items-center'>
<div>
<h3 className='mb-4 text-lg font-semibold'>
{t('common.footer.navigation')}
@ -125,7 +120,6 @@ export const Footer = () => {
</ul>
</div>
</div>
</div>
<div className='mt-8 border-t border-gray-800 pt-8 text-center text-gray-400'>
<p>
&copy; {new Date().getFullYear()} {t('common.name')}.{' '}