From 74b15060a1373d38dce6c19d3b34afb8c8d96540 Mon Sep 17 00:00:00 2001 From: Alibek Date: Sun, 10 Mar 2024 04:38:46 +0600 Subject: [PATCH] fixed bugs with sort --- messages/en.json | 6 + messages/kg.json | 6 + messages/ru.json | 6 + package.json | 2 +- src/shared/types/report-type.ts | 14 +++ src/widgets/Footer/Footer.scss | 13 ++ src/widgets/Footer/Footer.tsx | 14 ++- src/widgets/Navbar/Navbar.scss | 24 +++- src/widgets/Navbar/Navbar.tsx | 26 +++- src/widgets/Navbar/assets/founded-en.png | Bin 0 -> 24857 bytes src/widgets/Navbar/assets/founded-kg.png | Bin 0 -> 75397 bytes src/widgets/Navbar/assets/founded-ru.png | Bin 0 -> 27727 bytes .../home/RatingSection/RatingSection.tsx | 40 ++---- .../home/RatingSection/ratingSectionStore.ts | 46 +------ .../tables/ProfileTable/ProfileTable.tsx | 53 ++------ .../ProfileTable/profile-reports.store.ts | 62 +++------- .../StatisticsTable/StatisticsTable.tsx | 115 +++--------------- .../StatisticsTable/statistics.store.ts | 26 +--- 18 files changed, 162 insertions(+), 291 deletions(-) create mode 100644 src/widgets/Navbar/assets/founded-en.png create mode 100644 src/widgets/Navbar/assets/founded-kg.png create mode 100644 src/widgets/Navbar/assets/founded-ru.png diff --git a/messages/en.json b/messages/en.json index 2dcb808..7a8e82b 100644 --- a/messages/en.json +++ b/messages/en.json @@ -182,5 +182,11 @@ "invalid_activation_code_reset": "Invalid activation code for reset.", "invalid_password_reset_code": "Invalid password reset code.", "invalid_code": "Invalid code." + }, + "disclaimer": { + "text": "This website is funded by the European Union. Its contents are the sole responsibility of Transparency International Kyrgyzstan and do not necessarily reflect the views of the European Union." + }, + "rights": { + "text": "All rights reserved" } } diff --git a/messages/kg.json b/messages/kg.json index 2f3fe5e..613a808 100644 --- a/messages/kg.json +++ b/messages/kg.json @@ -182,5 +182,11 @@ "invalid_activation_code_reset": "Сыр сөздү калыпта тапшыруу үчүн четке калган иштеш коду.", "invalid_password_reset_code": "Сыр сөздү өзгөртүү коду четке калган эмес.", "invalid_code": "Четке калган иштеш коду." + }, + "disclaimer": { + "text": "Бул веб-сайт Европа Биримдиги тарабынан каржыланат. Анын мазмуну үчүн Трансперенси Интернешнл Кыргызстан гана жоопкерчиликтүү жана ал Европа Биримдигинин көз карашын сөзсүз түрдө чагылдырбайт." + }, + "rights": { + "text": "Бардык укуктар корголгон" } } diff --git a/messages/ru.json b/messages/ru.json index d7f005a..c619727 100644 --- a/messages/ru.json +++ b/messages/ru.json @@ -182,5 +182,11 @@ "invalid_activation_code_reset": "Код активации не действителен.", "invalid_password_reset_code": "Код сброса пароля не действителен.", "invalid_code": "Неверный код." + }, + "disclaimer": { + "text": "Этот веб-сайт финансируется Европейским Союзом. Ответственность за его содержание лежит исключительно на Трансперенси Интернешнл Кыргызстан и не обязательно отражает точку зрения Европейского Союза." + }, + "rights": { + "text": "Все права защищены" } } diff --git a/package.json b/package.json index b60177a..3f800d0 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "next dev", "build": "next build", - "start": "next start -p 8004", + "start": "next start -p 3000", "lint": "next lint" }, "dependencies": { diff --git a/src/shared/types/report-type.ts b/src/shared/types/report-type.ts index e561382..11fa13e 100644 --- a/src/shared/types/report-type.ts +++ b/src/shared/types/report-type.ts @@ -15,3 +15,17 @@ export interface IReport { total_likes: number; count_reviews: number; } + +export interface IRatingReport { + created_at: string; + category: null; + author: { + id: number; + first_name: string; + last_name: string; + govern_status: null; + }; + total_likes: number; + count_reviews: number; + address: string; +} diff --git a/src/widgets/Footer/Footer.scss b/src/widgets/Footer/Footer.scss index a4305be..9999d8e 100644 --- a/src/widgets/Footer/Footer.scss +++ b/src/widgets/Footer/Footer.scss @@ -4,6 +4,19 @@ grid-template-columns: 1fr 1fr 1fr 1fr; gap: 30px; background-color: rgb(15, 23, 42); + + &__logo { + display: flex; + flex-direction: column; + gap: 24px; + + p { + color: white; + font-family: "Inter", sans-serif; + font-size: 16px; + } + } + a, li, h4 { diff --git a/src/widgets/Footer/Footer.tsx b/src/widgets/Footer/Footer.tsx index e4ffb8e..8633d77 100644 --- a/src/widgets/Footer/Footer.tsx +++ b/src/widgets/Footer/Footer.tsx @@ -13,11 +13,17 @@ import NetKgTracker from "@/widgets/NetKgTracker/NetKgTracker"; const Footer = () => { const t = useTranslations("general"); + const tDisclaimer = useTranslations("disclaimer"); + const tRights = useTranslations("rights"); return (