adilovcode/oriyo_next
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: adilovcode:64d2c124945105704f94e8879c886f07800029a4
Branches Tags
adilovcode:dev
adilovcode:feat-get-media
adilovcode:fix-bugs
adilovcode:change-partners-section
adilovcode:add-pages
adilovcode:render-main-page-data
adilovcode:feat/auth
..
compare: adilovcode:042186323b1a4e62a6d27a7960edf7ed4d7eed5e
Branches Tags
adilovcode:dev
adilovcode:feat-get-media
adilovcode:fix-bugs
adilovcode:change-partners-section
adilovcode:add-pages
adilovcode:render-main-page-data
adilovcode:feat/auth

No commits in common. "64d2c124945105704f94e8879c886f07800029a4" and "042186323b1a4e62a6d27a7960edf7ed4d7eed5e" have entirely different histories.
64d2c12494 ... 042186323b

18 changed files with 30 additions and 213 deletions
Show Stats Expand all files Collapse all files

6
src/app/api-utlities/@types/index.ts
View File

@ -67,12 +67,6 @@ export type TextResponse = Root<{
znachenie: string | null; znachenie: string | null;
}>; }>;
export type MediaResponse = Root<{
mestopolozheniya: string;
foto: Image[];
klyuchneizmenyat: string;
}>;
export type Team = Root<{ export type Team = Root<{
foto: Image[]; foto: Image[];
zvanie: string; zvanie: string;

9
src/app/api-utlities/presenters/index.ts
View File

@ -7,7 +7,6 @@ import {
History, History,
Image, Image,
Job, Job,
MediaResponse,
Partner, Partner,
Review, Review,
Select, Select,
@ -89,14 +88,6 @@ export const presentTexts = (texts: TextResponse) =>
value: item.znachenie, value: item.znachenie,
})); }));
export const presentMedia = (media: MediaResponse) => {
return media.records.map((record) => ({
key: record.klyuchneizmenyat,
name: record.mestopolozheniya,
photo: presentImage(record.foto),
}));
};
export const presentReviews = (reviews: Review) => export const presentReviews = (reviews: Review) =>
reviews.records.map((review) => ({ reviews.records.map((review) => ({
id: review.id, id: review.id,

13
src/app/api-utlities/requests/common.ts
View File

@ -123,19 +123,6 @@ export const textsRequest = {
}, },
}; };
export const mediaRequest = {
mediakontentsajta: {
records: {
mestopolozheniya: true,
foto: {
id: true,
url: true,
},
klyuchneizmenyat: true,
},
},
};
export const teamRequest = { export const teamRequest = {
komanda: { komanda: {
records: { records: {

14
src/app/layout.tsx
View File

@ -2,10 +2,8 @@ import type { Metadata } from 'next';
import { Inter } from 'next/font/google'; import { Inter } from 'next/font/google';
import { textControlApi } from '@/shared/language/api/text-control.api'; import { textControlApi } from '@/shared/language/api/text-control.api';
import { mediaControlApi } from '@/shared/media/api/media-control.api';
import { Providers } from '@/shared/providers/providers'; import { Providers } from '@/shared/providers/providers';
import { makeStore } from '@/shared/store'; import { makeStore } from '@/shared/store';
import { MediaItem } from '@/shared/types/media.type';
import { TextItem } from '@/shared/types/text.types'; import { TextItem } from '@/shared/types/text.types';
import { Footer } from '@/widgets/footer'; import { Footer } from '@/widgets/footer';
@ -31,15 +29,10 @@ export default async function RootLayout({
}>) { }>) {
const store = makeStore(); const store = makeStore();
// Запрос текстов const response = await store.dispatch(
const textResponse = await store.dispatch(
textControlApi.endpoints.fetchText.initiate(), textControlApi.endpoints.fetchText.initiate(),
); );
// Запрос медиа
const mediaResponse = await store.dispatch(
mediaControlApi.endpoints.fetchMedia.initiate(),
);
return ( return (
<html <html
lang='ru' lang='ru'
@ -48,10 +41,7 @@ export default async function RootLayout({
style={{ scrollBehavior: 'smooth' }} style={{ scrollBehavior: 'smooth' }}
> >
<body className={`${inter.className} min-w-2xs antialiased`}> <body className={`${inter.className} min-w-2xs antialiased`}>
<Providers <Providers textItems={response.data as TextItem[]}>
textItems={textResponse.data as TextItem[]}
mediaItems={mediaResponse.data as MediaItem[]}
>
<Header /> <Header />
{children} {children}
<Footer /> <Footer />

12
src/pages-templates/about/index.tsx
View File

@ -12,7 +12,6 @@ import AnimatedCounter from '@/shared/components/animated-counter';
import { Container } from '@/shared/components/container'; import { Container } from '@/shared/components/container';
import { Review } from '@/shared/components/review'; import { Review } from '@/shared/components/review';
import { useTextController } from '@/shared/language/hooks/use-text-controller'; import { useTextController } from '@/shared/language/hooks/use-text-controller';
import { useMediaController } from '@/shared/media/hooks/use-media-controller';
import { Button } from '@/shared/shadcn-ui/button'; import { Button } from '@/shared/shadcn-ui/button';
import { Card, CardContent } from '@/shared/shadcn-ui/card'; import { Card, CardContent } from '@/shared/shadcn-ui/card';
@ -26,7 +25,6 @@ export interface AboutPageProps {
export default function AboutPage({ content }: AboutPageProps) { export default function AboutPage({ content }: AboutPageProps) {
const { t } = useTextController(); const { t } = useTextController();
const { m } = useMediaController();
return ( return (
<div className='flex min-h-screen flex-col'> <div className='flex min-h-screen flex-col'>
@ -35,10 +33,7 @@ export default function AboutPage({ content }: AboutPageProps) {
<section className='relative'> <section className='relative'>
<div className='relative h-[400px] w-full overflow-hidden'> <div className='relative h-[400px] w-full overflow-hidden'>
<Image <Image
src={ src='/placeholder.svg?height=400&width=1920&text=Наша+История'
m('about.hero-section.banner') ||
'/placeholder.svg?height=400&width=1920&text=Наша+История'
}
alt={t('about.hero.imageAlt')} alt={t('about.hero.imageAlt')}
width={1920} width={1920}
height={400} height={400}
@ -107,10 +102,7 @@ export default function AboutPage({ content }: AboutPageProps) {
className='relative h-[500px] overflow-hidden rounded-xl shadow-xl' className='relative h-[500px] overflow-hidden rounded-xl shadow-xl'
> >
<Image <Image
src={ src='/placeholder.svg?height=500&width=600&text=Главный+офис'
m('about.second-section.banner') ||
'/placeholder.svg?height=500&width=600&text=Главный+офис'
}
alt={t('about.overview.imageAlt')} alt={t('about.overview.imageAlt')}
fill fill
className='object-cover' className='object-cover'

7
src/pages-templates/clients/index.tsx
View File

@ -4,7 +4,6 @@ import Image from 'next/image';
import { Container } from '@/shared/components/container'; import { Container } from '@/shared/components/container';
import { useTextController } from '@/shared/language/hooks/use-text-controller'; import { useTextController } from '@/shared/language/hooks/use-text-controller';
import { useMediaController } from '@/shared/media/hooks/use-media-controller';
import { BenefitsSection } from '@/widgets/clients/ui/benefits-section'; import { BenefitsSection } from '@/widgets/clients/ui/benefits-section';
import { ServicesOverviewSection } from '@/widgets/clients/ui/services-overview-section'; import { ServicesOverviewSection } from '@/widgets/clients/ui/services-overview-section';
@ -12,7 +11,6 @@ import { CtaSection } from '@/widgets/cta-section';
export function ClientsPage() { export function ClientsPage() {
const { t } = useTextController(); const { t } = useTextController();
const { m } = useMediaController();
return ( return (
<div className='flex min-h-screen flex-col'> <div className='flex min-h-screen flex-col'>
@ -21,10 +19,7 @@ export function ClientsPage() {
<section className='relative'> <section className='relative'>
<div className='relative h-[400px] w-full overflow-hidden'> <div className='relative h-[400px] w-full overflow-hidden'>
<Image <Image
src={ src='/placeholder.svg?height=400&width=1920&text=Для+наших+клиентов'
m('clients.hero-section.banner') ||
'/placeholder.svg?height=400&width=1920&text=Для+наших+клиентов'
}
alt='Для наших клиентов' alt='Для наших клиентов'
width={1920} width={1920}
height={400} height={400}

9
src/pages-templates/clients/loyalty/index.tsx
View File

@ -5,7 +5,6 @@ import Image from 'next/image';
import { Container } from '@/shared/components/container'; import { Container } from '@/shared/components/container';
import { useTextController } from '@/shared/language/hooks/use-text-controller'; import { useTextController } from '@/shared/language/hooks/use-text-controller';
import { useMediaController } from '@/shared/media/hooks/use-media-controller';
// import LoyaltyLevels from '@/widgets/clients/loyalty/ui/loyalty-levels'; // import LoyaltyLevels from '@/widgets/clients/loyalty/ui/loyalty-levels';
import { CtaSection } from '@/widgets/cta-section'; import { CtaSection } from '@/widgets/cta-section';
@ -14,7 +13,6 @@ import ProgrammImg from '../../../../public/clients/loyatly/03a771e7-5d76-4111-a
export function LoyaltyPage() { export function LoyaltyPage() {
const { t } = useTextController(); const { t } = useTextController();
const { m } = useMediaController();
return ( return (
<div className='flex min-h-screen flex-col'> <div className='flex min-h-screen flex-col'>
@ -23,10 +21,7 @@ export function LoyaltyPage() {
<section className='relative'> <section className='relative'>
<div className='relative h-[400px] w-full overflow-hidden'> <div className='relative h-[400px] w-full overflow-hidden'>
<Image <Image
src={ src='/placeholder.svg?height=400&width=1920&text=Программа+лояльности'
m('loyalty.hero-section.banner') ||
'/placeholder.svg?height=400&width=1920&text=Программа+лояльности'
}
alt='Программа лояльности' alt='Программа лояльности'
width={1920} width={1920}
height={400} height={400}
@ -112,7 +107,7 @@ export function LoyaltyPage() {
className='relative h-[400px] overflow-hidden rounded-xl shadow-xl' className='relative h-[400px] overflow-hidden rounded-xl shadow-xl'
> >
<Image <Image
src={m('loyalty.second-section.banner') || ProgrammImg} src={ProgrammImg}
alt='Программа лояльности' alt='Программа лояльности'
fill fill
className='w-full object-contain p-2.5' className='w-full object-contain p-2.5'

14
src/shared/assets/logo.tsx
View File

@ -1,21 +1,11 @@
'use client';
import Image from 'next/image'; import Image from 'next/image';
import Link from 'next/link'; import Link from 'next/link';
import { useMediaController } from '../media/hooks/use-media-controller';
export const Logo = () => { export const Logo = () => {
const { m } = useMediaController();
return ( return (
<Link className='flex items-center gap-2' href={'/'}> <Link className='flex items-center gap-2' href={'/'}>
<Image <Image src='/logo-new.png' alt='oriyo-logo' width={110} height={40} />
src={m('logo') || '/logo-new.png'} {/* <span className='text-xl font-bold'>Ориё</span> */}
alt='oriyo-logo'
width={110}
height={40}
/>
</Link> </Link>
); );
}; };

4
src/shared/language/hooks/use-text-controller.ts
View File

@ -7,9 +7,7 @@ import { TextControlContext } from '../context/text-control-provider';
export function useTextController() { export function useTextController() {
const context = useContext(TextControlContext); const context = useContext(TextControlContext);
if (context === undefined) { if (context === undefined) {
throw new Error( throw new Error('useLanguage must be used within a LanguageProvider');
'useTextController must be used within a TextControlProvider',
);
} }
if (typeof context.t !== 'function') { if (typeof context.t !== 'function') {

24
src/shared/media/api/media-control.api.ts
View File

@ -1,24 +0,0 @@
import { jsonToGraphQLQuery } from 'json-to-graphql-query';
import { presentMedia } from '@/app/api-utlities/presenters';
import { mediaRequest } from '@/app/api-utlities/requests/common';
import { taylorAPI } from '@/shared/api/taylor-api';
import { MediaItem } from '@/shared/types/media.type';
export const mediaControlApi = taylorAPI.injectEndpoints({
endpoints: (builder) => ({
fetchMedia: builder.query<MediaItem[], void>({
query: () => ({
url: '',
method: 'POST',
body: {
query: jsonToGraphQLQuery({ query: mediaRequest }),
},
}),
transformResponse: (response: any) => {
return presentMedia(response.data.mediakontentsajta);
},
}),
}),
});

42
src/shared/media/context/media-control.provider.tsx
View File

@ -1,42 +0,0 @@
'use client';
import { createContext, type ReactNode } from 'react';
import { MediaItem } from '@/shared/types/media.type';
export type MediaMap = Record<string, MediaItem>;
type MediaControlContextType = {
m: (key: string) => string | null;
};
export const MediaControlContext = createContext<
MediaControlContextType | undefined
>(undefined);
export function MediaControlProvider({
children,
mediaItems,
}: {
children: ReactNode;
mediaItems?: MediaItem[];
}) {
const mediaMap = mediaItems?.reduce((pr, cr) => {
pr[cr.key] = cr;
return pr;
}, {} as MediaMap);
const getMedia = (key: string): string | null => {
if (mediaMap?.[key]) {
return mediaMap[key].photo;
}
console.warn(`Media key not found: ${key}`);
return null;
};
return (
<MediaControlContext.Provider value={{ m: getMedia }}>
{children}
</MediaControlContext.Provider>
);
}

20
src/shared/media/hooks/use-media-controller.ts
View File

@ -1,20 +0,0 @@
'use client';
import { useContext } from 'react';
import { MediaControlContext } from '../context/media-control.provider';
export function useMediaController() {
const context = useContext(MediaControlContext);
if (context === undefined) {
throw new Error(
'useMediaController must be used within a MediaControlProvider',
);
}
if (typeof context.m !== 'function') {
throw new Error('Media function (m) is not available');
}
return context;
}

37
src/shared/providers/providers.tsx
View File

@ -4,10 +4,8 @@ import { TooltipProvider } from '@radix-ui/react-tooltip';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import { TextControlProvider } from '../language'; import { TextControlProvider } from '../language';
import { MediaControlProvider } from '../media/context/media-control.provider';
import { store } from '../store'; import { store } from '../store';
import { ThemeProvider } from '../theme/theme-provider'; import { ThemeProvider } from '../theme/theme-provider';
import { MediaItem } from '../types/media.type';
import { TextItem } from '../types/text.types'; import { TextItem } from '../types/text.types';
import { AosProvider } from './aos-provider'; import { AosProvider } from './aos-provider';
import { Toaster } from './toaster'; import { Toaster } from './toaster';
@ -15,32 +13,25 @@ import { Toaster } from './toaster';
type ProvidersProps = { type ProvidersProps = {
children: React.ReactNode; children: React.ReactNode;
textItems: TextItem[]; textItems: TextItem[];
mediaItems: MediaItem[];
}; };
export const Providers = ({ export const Providers = ({ children, textItems }: ProvidersProps) => {
children,
textItems,
mediaItems,
}: ProvidersProps) => {
return ( return (
<Provider store={store}> <Provider store={store}>
<TextControlProvider textItems={textItems}> <TextControlProvider textItems={textItems}>
<MediaControlProvider mediaItems={mediaItems}> <ThemeProvider
<ThemeProvider attribute='class'
attribute='class' defaultTheme='light'
defaultTheme='light' enableSystem
enableSystem disableTransitionOnChange
disableTransitionOnChange >
> <TooltipProvider>
<TooltipProvider> <AosProvider>
<AosProvider> {children}
{children} <Toaster />
<Toaster /> </AosProvider>
</AosProvider> </TooltipProvider>
</TooltipProvider> </ThemeProvider>
</ThemeProvider>
</MediaControlProvider>
</TextControlProvider> </TextControlProvider>
</Provider> </Provider>
); );

5
src/shared/types/media.type.ts
View File

@ -1,5 +0,0 @@
export interface MediaItem {
key: string; // _klyuchNeIzmenya
name: string; // _name
photo: string | null;
}

4
src/widgets/about-section.tsx
View File

@ -6,11 +6,9 @@ import Image from 'next/image';
import AboutCounter from '@/shared/components/about-counter'; import AboutCounter from '@/shared/components/about-counter';
import { Container } from '@/shared/components/container'; import { Container } from '@/shared/components/container';
import { useTextController } from '@/shared/language/hooks/use-text-controller'; import { useTextController } from '@/shared/language/hooks/use-text-controller';
import { useMediaController } from '@/shared/media/hooks/use-media-controller';
export const AboutSection = () => { export const AboutSection = () => {
const { t } = useTextController(); const { t } = useTextController();
const { m } = useMediaController();
return ( return (
<section id='about'> <section id='about'>
@ -39,7 +37,7 @@ export const AboutSection = () => {
data-aos='zoom-in-down' data-aos='zoom-in-down'
> >
<Image <Image
src={m('main.price-board') || ''} src='/clients/loyatly/oriyo-price-board.png'
alt='About our company' alt='About our company'
fill fill
className='w-full object-contain p-2.5' className='w-full object-contain p-2.5'

8
src/widgets/charity-section.tsx
View File

@ -6,12 +6,10 @@ import Link from 'next/link';
import { Container } from '@/shared/components/container'; import { Container } from '@/shared/components/container';
import { useTextController } from '@/shared/language/hooks/use-text-controller'; import { useTextController } from '@/shared/language/hooks/use-text-controller';
import { useMediaController } from '@/shared/media/hooks/use-media-controller';
import { Button } from '@/shared/shadcn-ui/button'; import { Button } from '@/shared/shadcn-ui/button';
export const CharitySection = () => { export const CharitySection = () => {
const { t } = useTextController(); const { t } = useTextController();
const { m } = useMediaController();
return ( return (
<section id='charity'> <section id='charity'>
@ -22,14 +20,10 @@ export const CharitySection = () => {
data-aos='zoom-in' data-aos='zoom-in'
> >
<Image <Image
src={ src='/placeholder.svg?height=400&width=600'
m('home.charity.banner') ||
'/placeholder.svg?height=400&width=600'
}
alt='Charity Foundation' alt='Charity Foundation'
fill fill
className='object-cover' className='object-cover'
loader={({ src }) => src}
/> />
</div> </div>
<div className='order-1 md:order-2'> <div className='order-1 md:order-2'>

7
src/widgets/clients/ui/benefits-section.tsx
View File

@ -5,7 +5,6 @@ import Image from 'next/image';
import { Container } from '@/shared/components/container'; import { Container } from '@/shared/components/container';
import { useTextController } from '@/shared/language/hooks/use-text-controller'; import { useTextController } from '@/shared/language/hooks/use-text-controller';
import { useMediaController } from '@/shared/media/hooks/use-media-controller';
interface Benefit { interface Benefit {
title: string; title: string;
@ -33,7 +32,6 @@ const benefits: Array<Benefit> = [
export const BenefitsSection = () => { export const BenefitsSection = () => {
const { t } = useTextController(); const { t } = useTextController();
const { m } = useMediaController();
return ( return (
<section className='bg-gray-50'> <section className='bg-gray-50'>
@ -74,10 +72,7 @@ export const BenefitsSection = () => {
className='relative order-1 h-[400px] overflow-hidden rounded-xl shadow-xl md:order-2' className='relative order-1 h-[400px] overflow-hidden rounded-xl shadow-xl md:order-2'
> >
<Image <Image
src={ src='/placeholder.svg?height=400&width=600&text=Преимущества+для+клиентов'
m('clients.third-section.banner') ||
'/placeholder.svg?height=400&width=600&text=Преимущества+для+клиентов'
}
alt='Преимущества для клиентов' alt='Преимущества для клиентов'
fill fill
className='object-cover' className='object-cover'

8
src/widgets/hero-section.tsx
View File

@ -5,12 +5,10 @@ import Image from 'next/image';
import Link from 'next/link'; import Link from 'next/link';
import { useTextController } from '@/shared/language/hooks/use-text-controller'; import { useTextController } from '@/shared/language/hooks/use-text-controller';
import { useMediaController } from '@/shared/media/hooks/use-media-controller';
import { Button } from '@/shared/shadcn-ui/button'; import { Button } from '@/shared/shadcn-ui/button';
export const HeroSection = () => { export const HeroSection = () => {
const { t } = useTextController(); const { t } = useTextController();
const { m } = useMediaController();
return ( return (
<section className='relative'> <section className='relative'>
@ -23,13 +21,13 @@ export const HeroSection = () => {
// top: -60, // top: -60,
// right: 20, // right: 20,
}} }}
className='sm:!-top-16 sm:-right-40 sm:!h-[70vh] sm:!w-[100vh] md:!-top-10 md:!-right-30 xl:!top-0 xl:!right-0' className='sm:!top-0 sm:!right-20 sm:!h-[70vh] sm:!w-[100vh]'
> >
<Image <Image
src={m('home.hero-section.banner') || '/oriyo_bg.jpeg'} src='/oriyo_bg.jpeg'
alt='Oriyo Station' alt='Oriyo Station'
fill fill
className='object-cover sm:scale-110 md:scale-120 xl:scale-140' className='object-cover'
priority priority
/> />
</div> </div>