Compare commits

..

No commits in common. "8a64bc6ec29af49646128a0639f7603455c59eb4" and "10a55fb6851e3d9a5c54eaf7b6add715269f8fc4" have entirely different histories.

8 changed files with 26 additions and 31 deletions

View File

@ -13,8 +13,6 @@ import { Card, CardContent } from '@/shared/shadcn-ui/card';
import { CompanyTimeline } from '@/widgets/about-page/company-timeline'; import { CompanyTimeline } from '@/widgets/about-page/company-timeline';
import { StationGallery } from '@/widgets/about-page/station-gallery'; import { StationGallery } from '@/widgets/about-page/station-gallery';
import { CtaSection } from '@/widgets/cta-section'; import { CtaSection } from '@/widgets/cta-section';
import { Button } from '@/shared/shadcn-ui/button';
import Link from 'next/link';
export const metadata = { export const metadata = {
title: 'about.metadata.title', title: 'about.metadata.title',
@ -185,12 +183,10 @@ export default function AboutPage({ content }: AboutPageProps) {
<p className='mx-auto mb-6 max-w-2xl text-gray-600'> <p className='mx-auto mb-6 max-w-2xl text-gray-600'>
{t('about.stations.description')} {t('about.stations.description')}
</p> </p>
<Link href='/#stations'> {/* <Button className='bg-red-600 hover:bg-red-700'>
<Button className='bg-red-600 hover:bg-red-700'> {t('about.stations.buttonText')}{' '}
{t('about.stations.buttonText')}{' '} <MapPin className='ml-2 h-4 w-4' />
<MapPin className='ml-2 h-4 w-4' /> </Button> */}
</Button>
</Link>
</div> </div>
</Container> </Container>
</section> </section>

View File

@ -44,10 +44,11 @@ const events = [
image: '/placeholder.svg?height=200&width=300&text=Экологическая+акция', image: '/placeholder.svg?height=200&width=300&text=Экологическая+акция',
}, },
{ {
title: 'Сбор школьных принадлежностей', title: 'Сбор школьных принадлежностей',
description: 'Сбор школьных принадлежностей для детей из малообеспеченных семей к новому учебному году.', description:
'Сбор школьных принадлежностей для детей из малообеспеченных семей к новому учебному году.',
date: '1-20 августа 2023', date: '1-20 августа 2023',
location: 'Все заправки GasNetwork', location: 'Все заправки GasNetwork',
image: '/placeholder.svg?height=200&width=300&text=Школьные+принадлежности', image: '/placeholder.svg?height=200&width=300&text=Школьные+принадлежности',
}, },
]; ];
@ -256,7 +257,7 @@ export function CharityPage() {
{ {
title: 'Распространять информацию', title: 'Распространять информацию',
description: description:
'Расскажите о нашем фонде и его деятельности своим друзьям и знакомым.', 'Расскажите о нашем фонде и его деятельности своим друзьям и знакомым.',
icon: <Heart className='h-10 w-10 text-red-600' />, icon: <Heart className='h-10 w-10 text-red-600' />,
}, },
].map((item, index) => ( ].map((item, index) => (

View File

@ -155,7 +155,7 @@ export default function LoginPage() {
<div className='mt-8 text-center text-sm text-gray-500'> <div className='mt-8 text-center text-sm text-gray-500'>
<p> <p>
{t('auth.loginIssues')}{' '} {t('auth.loginIssues')}{' '}
<Link href='mailto:info@oriyo.tj' className='text-red-600 hover:underline'> <Link href='/contact' className='text-red-600 hover:underline'>
{t('auth.contactLink')} {t('auth.contactLink')}
</Link> </Link>
</p> </p>

View File

@ -122,7 +122,7 @@ export default function PromotionSlider({ discounts }: PromotionSliderProps) {
? `Действует до: ${promo.expiresAt}` ? `Действует до: ${promo.expiresAt}`
: null} : null}
</span> </span>
{/* <Link href='#'> <Link href='#'>
<Button <Button
variant='outline' variant='outline'
size='sm' size='sm'
@ -130,7 +130,7 @@ export default function PromotionSlider({ discounts }: PromotionSliderProps) {
> >
{t('common.buttons.readMore')} {t('common.buttons.readMore')}
</Button> </Button>
</Link> */} </Link>
</div> </div>
</CardContent> </CardContent>
</Card> </Card>

View File

@ -17,9 +17,13 @@ export const CtaSection = () => {
{t('home.cta.title')} {t('home.cta.title')}
</h2> </h2>
<p className='mb-8 max-w-2xl'>{t('home.cta.description')}</p> <p className='mb-8 max-w-2xl'>{t('home.cta.description')}</p>
<h4 className='text-xl font-bold'> <div className='flex flex-col gap-4 sm:flex-row'>
{t('common.buttons.purchaseCardAtGasStations')} <Link href='#'>
</h4> <Button variant='secondary'>
{t('common.buttons.purchaseCardAtGasStations')}
</Button>
</Link>
</div>
</div> </div>
</Container> </Container>
</section> </section>

View File

@ -100,7 +100,7 @@ export const Footer = () => {
</li> </li>
<li> <li>
<Link <Link
href='/clients' href='/clients/loyalty'
className='text-gray-400 hover:text-white' className='text-gray-400 hover:text-white'
> >
{t('common.navigation.clients')} {t('common.navigation.clients')}

View File

@ -9,7 +9,6 @@ import { useTextController } from '@/shared/language/hooks/use-text-controller';
import { Button } from '@/shared/shadcn-ui/button'; import { Button } from '@/shared/shadcn-ui/button';
import { PartnersSlider } from './partners-slider'; import { PartnersSlider } from './partners-slider';
import Link from 'next/link';
interface PartnersSectionProps { interface PartnersSectionProps {
partners: Partners; partners: Partners;
@ -62,11 +61,9 @@ export const PartnersSection = ({ partners }: PartnersSectionProps) => {
<p className='mx-auto mb-6 max-w-2xl text-gray-600'> <p className='mx-auto mb-6 max-w-2xl text-gray-600'>
{t('home.partners.becomePartnerText')} {t('home.partners.becomePartnerText')}
</p> </p>
<Link href='mailto:info@oriyo.tj'> <Button className='bg-red-600 hover:bg-red-700'>
<Button className='bg-red-600 hover:bg-red-700'> {t('common.buttons.contactUs')}
{t('common.buttons.contactUs')} </Button>
</Button>
</Link>
</div> </div>
</div> </div>
</section> </section>

View File

@ -16,7 +16,6 @@ import {
TabsList, TabsList,
TabsTrigger, TabsTrigger,
} from '@/shared/shadcn-ui/tabs'; } from '@/shared/shadcn-ui/tabs';
import Link from 'next/link';
interface VacanciesSectionProps { interface VacanciesSectionProps {
jobs: Jobs; jobs: Jobs;
@ -131,11 +130,9 @@ const Vacancy = ({ jobTitle, location, tags }: VacancyProps) => {
})} })}
</div> </div>
</div> </div>
<Link href='mailto:info@oriyo.tj'> <Button variant='outline' size='sm'>
<Button variant='outline' size='sm'> {t('common.buttons.apply')}
{t('common.buttons.apply')} </Button>
</Button>
</Link>
</div> </div>
</div> </div>
</CardContent> </CardContent>