From d77846bbbb678e9f76344e4a9ac133c8d9c6e518 Mon Sep 17 00:00:00 2001 From: Alibek Date: Mon, 19 Feb 2024 17:20:52 +0600 Subject: [PATCH] changed --- src/app/about-us/page.tsx | 7 +++++++ src/app/create-report/page.tsx | 7 +++++++ src/app/favicon.ico | Bin 0 -> 15406 bytes src/app/layout.tsx | 5 ----- src/app/news/page.tsx | 7 +++++++ src/app/page.tsx | 8 +++++++- src/app/profile/layout.tsx | 7 +++++++ src/app/report/[id]/page.tsx | 7 +++++++ src/app/sign-in/page.tsx | 6 ++++++ src/app/sign-up/page.tsx | 7 +++++++ src/app/statistics/page.tsx | 7 +++++++ src/app/volunteers/page.tsx | 7 +++++++ src/widgets/MapSection/MapSection.tsx | 6 +++--- 13 files changed, 72 insertions(+), 9 deletions(-) create mode 100644 src/app/favicon.ico diff --git a/src/app/about-us/page.tsx b/src/app/about-us/page.tsx index 3f4925e..f5cf9f5 100644 --- a/src/app/about-us/page.tsx +++ b/src/app/about-us/page.tsx @@ -2,6 +2,13 @@ import Typography from "@/shared/ui/components/Typography/Typography"; import "./AboutUs.scss"; import Image from "next/image"; import header from "./assets/header.svg"; +import { Metadata } from "next"; + +export const metadata: Metadata = { + title: "KG ROAD | О нас", + description: + 'Страница "О Нас" Kyrgyzstan Transperency International', +}; const AboutUs = () => { return ( diff --git a/src/app/create-report/page.tsx b/src/app/create-report/page.tsx index ad5c67e..6dfba99 100644 --- a/src/app/create-report/page.tsx +++ b/src/app/create-report/page.tsx @@ -1,6 +1,13 @@ import Typography from "@/shared/ui/components/Typography/Typography"; import "./CreateReport.scss"; import dynamic from "next/dynamic"; +import { Metadata } from "next"; + +export const metadata: Metadata = { + title: "KG ROAD | Написать обращение", + description: + "Написать обращение Kyrgyzstan Transperency International", +}; const DynamicForm = dynamic( () => import("@/widgets/ReportForm/ReportForm"), diff --git a/src/app/favicon.ico b/src/app/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c886e2673f4f15d6085bc867abf8e8085b716697 GIT binary patch literal 15406 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 MH2x9B|6dOLA14IaXaE2J literal 0 HcmV?d00001 diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 42310dd..9bec346 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -6,11 +6,6 @@ import { Providers } from "./Providers"; import Navbar from "@/widgets/Navbar/Navbar"; import Footer from "@/widgets/Footer/Footer"; -export const metadata: Metadata = { - title: "Kg Road", - description: "Road in KR", -}; - export default function RootLayout({ children, }: Readonly<{ diff --git a/src/app/news/page.tsx b/src/app/news/page.tsx index 36d7d34..7bda94b 100644 --- a/src/app/news/page.tsx +++ b/src/app/news/page.tsx @@ -3,6 +3,13 @@ import Typography from "@/shared/ui/components/Typography/Typography"; import { apiInstance } from "@/shared/config/apiConfig"; import { INewsList } from "@/shared/types/news-type"; import NewsList from "@/widgets/NewsList/NewsList"; +import { Metadata } from "next"; + +export const metadata: Metadata = { + title: "KG ROAD | Новости", + description: + "Страница новостей Kyrgyzstan Transperency International", +}; const News = ({ searchParams, diff --git a/src/app/page.tsx b/src/app/page.tsx index 297f68f..19fa2ef 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,9 +1,15 @@ -import dynamic from "next/dynamic"; import Header from "@/widgets/Header/Header"; import StatisticsSection from "@/widgets/StatisticsSection/StatisticsSection"; import RatingSection from "@/widgets/RatingSection/RatingSection"; import NewsSection from "@/widgets/NewsSection/NewsSection"; import MapSection from "@/widgets/MapSection/MapSection"; +import { Metadata } from "next"; + +export const metadata: Metadata = { + title: "KG ROAD | Главная", + description: + "Главная страница Kyrgyzstan Transperency International", +}; const Home = async ({ searchParams, diff --git a/src/app/profile/layout.tsx b/src/app/profile/layout.tsx index e155759..0ff7938 100644 --- a/src/app/profile/layout.tsx +++ b/src/app/profile/layout.tsx @@ -7,6 +7,13 @@ import { apiInstance } from "@/shared/config/apiConfig"; import { getServerSession } from "next-auth"; import { authConfig } from "@/shared/config/authConfig"; import { IProfile } from "@/shared/types/profile-type"; +import { Metadata } from "next"; + +export const metadata: Metadata = { + title: "KG ROAD | Профиль", + description: + "Страница профиля Kyrgyzstan Transperency International", +}; const Profile = async ({ children, diff --git a/src/app/report/[id]/page.tsx b/src/app/report/[id]/page.tsx index 80cedd6..831d3da 100644 --- a/src/app/report/[id]/page.tsx +++ b/src/app/report/[id]/page.tsx @@ -12,6 +12,13 @@ import calendar from "./icons/calendar.svg"; import map_pin from "./icons/map-pin.svg"; import def_image from "./icons/def_image.svg"; import ReviewSection from "@/widgets/ReviewSection/ReviewSection"; +import { Metadata } from "next"; + +export const metadata: Metadata = { + title: "KG ROAD | Обращение", + description: + "Страница обращения Kyrgyzstan Transperency International", +}; const ReportDetails = async ({ params, diff --git a/src/app/sign-in/page.tsx b/src/app/sign-in/page.tsx index 837f527..f510e01 100644 --- a/src/app/sign-in/page.tsx +++ b/src/app/sign-in/page.tsx @@ -3,6 +3,12 @@ import Image from "next/image"; import sign_in_icon from "./icons/sign-in_icon.svg"; import SignInForm from "@/widgets/SignInForm/SignInForm"; import Link from "next/link"; +import { Metadata } from "next"; + +export const metadata: Metadata = { + title: "KG ROAD | Вход", + description: "Страница входа Kyrgyzstan Transperency International", +}; const SignIn = () => { return ( diff --git a/src/app/sign-up/page.tsx b/src/app/sign-up/page.tsx index 80b3e4d..121ad7c 100644 --- a/src/app/sign-up/page.tsx +++ b/src/app/sign-up/page.tsx @@ -3,6 +3,13 @@ import Image from "next/image"; import flag from "./icons/flag.svg"; import Link from "next/link"; import SignUpForm from "@/widgets/SignUpForm/SignUpForm"; +import { Metadata } from "next"; + +export const metadata: Metadata = { + title: "KG ROAD | Регистрация", + description: + "Страница регистрации Kyrgyzstan Transperency International", +}; const SignUp = () => { return ( diff --git a/src/app/statistics/page.tsx b/src/app/statistics/page.tsx index 105cd74..fc86ca7 100644 --- a/src/app/statistics/page.tsx +++ b/src/app/statistics/page.tsx @@ -4,6 +4,13 @@ import { apiInstance } from "@/shared/config/apiConfig"; import { IStatistics } from "@/shared/types/statistics-type"; import { AxiosError } from "axios"; import StatisticsTable from "@/widgets/StatisticsTable/StatisticsTable"; +import { Metadata } from "next"; + +export const metadata: Metadata = { + title: "KG ROAD | Статистика", + description: + "Страница статистики Kyrgyzstan Transperency International", +}; const Statistics = ({ searchParams, diff --git a/src/app/volunteers/page.tsx b/src/app/volunteers/page.tsx index 6fb084c..82fff0b 100644 --- a/src/app/volunteers/page.tsx +++ b/src/app/volunteers/page.tsx @@ -1,6 +1,13 @@ import Typography from "@/shared/ui/components/Typography/Typography"; import "./Volunteers.scss"; import VolunteersTable from "@/widgets/VolunteersTable/VolunteersTable"; +import { Metadata } from "next"; + +export const metadata: Metadata = { + title: "KG ROAD | Волонтеры", + description: + "Страница волонтеров Kyrgyzstan Transperency International", +}; const Volunteers = () => { return ( diff --git a/src/widgets/MapSection/MapSection.tsx b/src/widgets/MapSection/MapSection.tsx index 5131691..27cea8d 100644 --- a/src/widgets/MapSection/MapSection.tsx +++ b/src/widgets/MapSection/MapSection.tsx @@ -35,9 +35,9 @@ const MapSection: React.FC = async ({ return res.data; }; - const data = await getReports( - searchParams["тип-дороги"] || "1,2,3,4,5,6" - ); + const data = + (await getReports(searchParams["тип-дороги"] || "1,2,3,4,5,6")) || + []; const setCategories = (category: string) => { if (searchParams["тип-дороги"] === undefined) {