From 3b365d7742b72b607f11773645350c82d2b1bd02 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Sat, 24 Feb 2024 10:42:58 +0000 Subject: [PATCH 01/12] Make release 003 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2aae33..f79d667 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "next dev", "build": "next build", - "start": "next start", + "start": "next start -p 8003", "lint": "next lint" }, "dependencies": { From e3a5ed72e06adbf6272940ae75b113a93a056850 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Sat, 24 Feb 2024 11:38:42 +0000 Subject: [PATCH 02/12] Make release version prep --- src/app/about-us/page.tsx | 55 ++++-------------- src/app/create-report/page.tsx | 2 +- src/app/news/page.tsx | 2 +- src/app/page.tsx | 2 +- src/app/profile/layout.tsx | 2 +- src/app/report/[id]/page.tsx | 2 +- src/app/sign-in/page.tsx | 2 +- src/app/sign-up/page.tsx | 2 +- src/app/statistics/page.tsx | 2 +- src/app/volunteers/page.tsx | 2 +- src/widgets/Footer/Footer.tsx | 22 +++++++- src/widgets/Header/Header.tsx | 4 +- src/widgets/MapSection/HomeMap/HomeMap.tsx | 2 +- .../MapSection/HomeMap/icons/geo-green.svg | 56 +++++++++++++++++-- .../MapSection/HomeMap/icons/geo-orange.svg | 56 +++++++++++++++++-- .../MapSection/HomeMap/icons/geo-pink.svg | 56 +++++++++++++++++-- .../MapSection/HomeMap/icons/geo-purple.svg | 56 +++++++++++++++++-- .../MapSection/HomeMap/icons/geo-red.svg | 56 +++++++++++++++++-- .../MapSection/HomeMap/icons/geo-yellow.svg | 56 +++++++++++++++++-- src/widgets/SignInForm/SignInForm.tsx | 3 + src/widgets/SignUpForm/SignUpForm.tsx | 3 + 21 files changed, 360 insertions(+), 83 deletions(-) diff --git a/src/app/about-us/page.tsx b/src/app/about-us/page.tsx index f5cf9f5..62bca54 100644 --- a/src/app/about-us/page.tsx +++ b/src/app/about-us/page.tsx @@ -7,7 +7,7 @@ import { Metadata } from "next"; export const metadata: Metadata = { title: "KG ROAD | О нас", description: - 'Страница "О Нас" Kyrgyzstan Transperency International', + 'Страница "О Нас" KG ROAD', }; const AboutUs = () => { @@ -16,51 +16,18 @@ const AboutUs = () => { О нас Header Image - -

Don’t wait. The purpose of our lives is to be happy!

-
+

Transparency International-Кыргызстан - филиал международной организации Transparency International в Кыргызской Республике.

+

Миссия ТИ-Кыргызстан

+

Продвижение эффективной общественной политики и надлежащего управления в целях предотвращения коррупции и усиления демократии в стране.

+

Цели и приоритеты ТИ-Кыргызстан:

- arrival, your senses will be rewarded with the pleasant - scent of lemongrass oil used to clean the natural wood found - throughout the room, creating a relaxing atmosphere within - the space. A wonderful serenity has taken possession of my - entire soul, like these sweet mornings of spring which I - enjoy with my whole heart. I am alone, and feel the charm of - existence in this spot, which was created for the bliss of - souls like mine. I am so happy, my dear friend, so absorbed - in the exquisite. -

-

- When you are ready to indulge your sense of excitement, - check out the range of water- sports opportunities at the - resort’s on-site water-sports center. Want to leave your - stress on the water? The resort has kayaks, paddleboards, or - the low-key pedal boats. Snorkeling equipment is available - as well, so you can experience the ever-changing undersea - environment. Not only do visitors to a bed and breakfast get - a unique perspective on the place they are visiting, they - have options for special packages not available in other - hotel settings.{" "} -

-

- Bed and breakfasts can partner easily with local businesses - for a smoothly organized and highly personalized vacation - experience. The Fife and Drum Inn offers options such as the - Historic Triangle Package that includes three nights at the - Inn, breakfasts, and admissions to historic Williamsburg, - Jamestown, and Yorktown. Bed and breakfasts also lend - themselves to romance. -

-

- Part of the charm of a bed and breakfast is the uniqueness; - art, décor, and food are integrated to create a complete - experience. For example, the Fife and Drum retains the - colonial feel of the area in all its guest rooms. Special - features include antique furnishings, elegant four poster - beds in some guest rooms, as well folk art and artifacts - from the restoration period of the historic area available - for guests to enjoy. +

    +
  • - антикоррупционное просвещение населения, повышение общественного осознания значимости и важности борьбы с коррупцией в Кыргызстане;
    • +
  • - организация изучения практики и теории борьбы с коррупцией и участия в ней структур гражданского общества в Кыргызстане и других странах;
    • +
  • - содействие гражданам и организациям в реализации их конституционных прав и свобод;
    • +
  • - преимущественная ориентация на международный опыт уменьшения коррупции, освоение его технологий, ресурсов, а также включение структур гражданского общества в международный диалог борьбы с коррупцией.
    • +

diff --git a/src/app/create-report/page.tsx b/src/app/create-report/page.tsx index 6dfba99..47bd3d6 100644 --- a/src/app/create-report/page.tsx +++ b/src/app/create-report/page.tsx @@ -6,7 +6,7 @@ import { Metadata } from "next"; export const metadata: Metadata = { title: "KG ROAD | Написать обращение", description: - "Написать обращение Kyrgyzstan Transperency International", + "Написать обращение KG ROAD", }; const DynamicForm = dynamic( diff --git a/src/app/news/page.tsx b/src/app/news/page.tsx index 7bda94b..57b561f 100644 --- a/src/app/news/page.tsx +++ b/src/app/news/page.tsx @@ -8,7 +8,7 @@ import { Metadata } from "next"; export const metadata: Metadata = { title: "KG ROAD | Новости", description: - "Страница новостей Kyrgyzstan Transperency International", + "Страница новостей KG ROAD", }; const News = ({ diff --git a/src/app/page.tsx b/src/app/page.tsx index 19fa2ef..7f5f8ff 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -8,7 +8,7 @@ import { Metadata } from "next"; export const metadata: Metadata = { title: "KG ROAD | Главная", description: - "Главная страница Kyrgyzstan Transperency International", + "Главная страница KG ROAD", }; const Home = async ({ diff --git a/src/app/profile/layout.tsx b/src/app/profile/layout.tsx index 0ff7938..9eecf89 100644 --- a/src/app/profile/layout.tsx +++ b/src/app/profile/layout.tsx @@ -12,7 +12,7 @@ import { Metadata } from "next"; export const metadata: Metadata = { title: "KG ROAD | Профиль", description: - "Страница профиля Kyrgyzstan Transperency International", + "Страница профиля KG ROAD", }; const Profile = async ({ diff --git a/src/app/report/[id]/page.tsx b/src/app/report/[id]/page.tsx index 831d3da..eb61e3d 100644 --- a/src/app/report/[id]/page.tsx +++ b/src/app/report/[id]/page.tsx @@ -17,7 +17,7 @@ import { Metadata } from "next"; export const metadata: Metadata = { title: "KG ROAD | Обращение", description: - "Страница обращения Kyrgyzstan Transperency International", + "Страница обращения KG ROAD", }; const ReportDetails = async ({ diff --git a/src/app/sign-in/page.tsx b/src/app/sign-in/page.tsx index f510e01..64f76fc 100644 --- a/src/app/sign-in/page.tsx +++ b/src/app/sign-in/page.tsx @@ -7,7 +7,7 @@ import { Metadata } from "next"; export const metadata: Metadata = { title: "KG ROAD | Вход", - description: "Страница входа Kyrgyzstan Transperency International", + description: "Страница входа KG ROAD", }; const SignIn = () => { diff --git a/src/app/sign-up/page.tsx b/src/app/sign-up/page.tsx index 121ad7c..10f1193 100644 --- a/src/app/sign-up/page.tsx +++ b/src/app/sign-up/page.tsx @@ -8,7 +8,7 @@ import { Metadata } from "next"; export const metadata: Metadata = { title: "KG ROAD | Регистрация", description: - "Страница регистрации Kyrgyzstan Transperency International", + "Страница регистрации KG ROAD", }; const SignUp = () => { diff --git a/src/app/statistics/page.tsx b/src/app/statistics/page.tsx index fc86ca7..b63771b 100644 --- a/src/app/statistics/page.tsx +++ b/src/app/statistics/page.tsx @@ -9,7 +9,7 @@ import { Metadata } from "next"; export const metadata: Metadata = { title: "KG ROAD | Статистика", description: - "Страница статистики Kyrgyzstan Transperency International", + "Страница статистики KG ROAD", }; const Statistics = ({ diff --git a/src/app/volunteers/page.tsx b/src/app/volunteers/page.tsx index 82fff0b..583ed24 100644 --- a/src/app/volunteers/page.tsx +++ b/src/app/volunteers/page.tsx @@ -6,7 +6,7 @@ import { Metadata } from "next"; export const metadata: Metadata = { title: "KG ROAD | Волонтеры", description: - "Страница волонтеров Kyrgyzstan Transperency International", + "Страница волонтеров KG ROAD", }; const Volunteers = () => { diff --git a/src/widgets/Footer/Footer.tsx b/src/widgets/Footer/Footer.tsx index 765e70b..314c75e 100644 --- a/src/widgets/Footer/Footer.tsx +++ b/src/widgets/Footer/Footer.tsx @@ -8,8 +8,22 @@ import facebook from "./icons/facebook.svg"; import instagram from "./icons/instagram.svg"; import app_store_btn from "./icons/app-store-btn.svg"; import play_market_btn from "./icons/play-market-btn.svg"; +import { usePathname } from 'next/navigation'; const Footer = () => { + + const pathname = usePathname(); + const isHomePage = pathname === '/'; + const isAboutPage = pathname === '/about'; + let creditsInFooter; + if (isHomePage) { + creditsInFooter =

Photo By ThomasG, CC BY-SA 3.0

; + } else if (isAboutPage) { + creditsInFooter =

Photo By Mzximvs VdB from Brussels, belgium - Road to Issyk-Kul (south shore), CC BY-SA 2.0

; + } else { + creditsInFooter =

; + } + return (
@@ -31,8 +45,8 @@ const Footer = () => {

Контакты

    -
  • namename@gmail.com
    • -
  • +09646895467
    • +
  • admin@kgroad.org
    • +
  • +9960312394038
  • {[youtube, facebook, instagram].map((net, i) => ( @@ -41,8 +55,9 @@ const Footer = () => { ))}
+ {creditsInFooter}
- + {/*

Скачивай наше приложение

@@ -53,6 +68,7 @@ const Footer = () => { ))}
+ */}
); }; diff --git a/src/widgets/Header/Header.tsx b/src/widgets/Header/Header.tsx index ced6c99..22a633f 100644 --- a/src/widgets/Header/Header.tsx +++ b/src/widgets/Header/Header.tsx @@ -13,10 +13,10 @@ const Header = () => { />

- Borem ipsum dolor sit amet, consectetur adipiscing elit. + Дороги Кыргызстана

- Borem ipsum dolor sit amet, consectetur adipiscing elit. + Сделаем дороги безопасными! Актуальная информация о состоянии дорог.

diff --git a/src/widgets/MapSection/HomeMap/HomeMap.tsx b/src/widgets/MapSection/HomeMap/HomeMap.tsx index 6499e58..d968e67 100644 --- a/src/widgets/MapSection/HomeMap/HomeMap.tsx +++ b/src/widgets/MapSection/HomeMap/HomeMap.tsx @@ -57,7 +57,7 @@ const HomeMap: React.FC = ({ const createCustomIcon = (icon: StaticImageData) => { const customIcon = new Icon({ iconUrl: icon.src, - iconSize: [32, 32], + iconSize: [64, 64], }); return customIcon; diff --git a/src/widgets/MapSection/HomeMap/icons/geo-green.svg b/src/widgets/MapSection/HomeMap/icons/geo-green.svg index b0f11f5..b96e1f7 100644 --- a/src/widgets/MapSection/HomeMap/icons/geo-green.svg +++ b/src/widgets/MapSection/HomeMap/icons/geo-green.svg @@ -1,5 +1,53 @@ - - - - + + + + + + + diff --git a/src/widgets/MapSection/HomeMap/icons/geo-orange.svg b/src/widgets/MapSection/HomeMap/icons/geo-orange.svg index 0741465..b9e5e28 100644 --- a/src/widgets/MapSection/HomeMap/icons/geo-orange.svg +++ b/src/widgets/MapSection/HomeMap/icons/geo-orange.svg @@ -1,5 +1,53 @@ - - - - + + + + + + + diff --git a/src/widgets/MapSection/HomeMap/icons/geo-pink.svg b/src/widgets/MapSection/HomeMap/icons/geo-pink.svg index d5c346d..6d93f43 100644 --- a/src/widgets/MapSection/HomeMap/icons/geo-pink.svg +++ b/src/widgets/MapSection/HomeMap/icons/geo-pink.svg @@ -1,5 +1,53 @@ - - - - + + + + + + + diff --git a/src/widgets/MapSection/HomeMap/icons/geo-purple.svg b/src/widgets/MapSection/HomeMap/icons/geo-purple.svg index 66557d0..4a2e972 100644 --- a/src/widgets/MapSection/HomeMap/icons/geo-purple.svg +++ b/src/widgets/MapSection/HomeMap/icons/geo-purple.svg @@ -1,5 +1,53 @@ - - - - + + + + + + + diff --git a/src/widgets/MapSection/HomeMap/icons/geo-red.svg b/src/widgets/MapSection/HomeMap/icons/geo-red.svg index 433c8c6..d3da255 100644 --- a/src/widgets/MapSection/HomeMap/icons/geo-red.svg +++ b/src/widgets/MapSection/HomeMap/icons/geo-red.svg @@ -1,5 +1,53 @@ - - - - + + + + + + + diff --git a/src/widgets/MapSection/HomeMap/icons/geo-yellow.svg b/src/widgets/MapSection/HomeMap/icons/geo-yellow.svg index 58a6753..c602915 100644 --- a/src/widgets/MapSection/HomeMap/icons/geo-yellow.svg +++ b/src/widgets/MapSection/HomeMap/icons/geo-yellow.svg @@ -1,5 +1,53 @@ - - - - + + + + + + + diff --git a/src/widgets/SignInForm/SignInForm.tsx b/src/widgets/SignInForm/SignInForm.tsx index 3e6bced..e496a7a 100644 --- a/src/widgets/SignInForm/SignInForm.tsx +++ b/src/widgets/SignInForm/SignInForm.tsx @@ -88,7 +88,10 @@ const SignInForm = () => { + + {/* + */} ); diff --git a/src/widgets/SignUpForm/SignUpForm.tsx b/src/widgets/SignUpForm/SignUpForm.tsx index 0d45f31..62bc0cc 100644 --- a/src/widgets/SignUpForm/SignUpForm.tsx +++ b/src/widgets/SignUpForm/SignUpForm.tsx @@ -119,7 +119,10 @@ const SignUpForm = () => { + + {/* + */} ); From deb08e290e9ead367d1c46a1aa1fb3331320023b Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Sat, 24 Feb 2024 11:44:35 +0000 Subject: [PATCH 03/12] Some changes for uat --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f79d667..12bc134 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "next dev", "build": "next build", - "start": "next start -p 8003", + "start": "next start -p 8004", "lint": "next lint" }, "dependencies": { From 67b935b47f1f68bad5624e29c8560ca8a8f531a4 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Sat, 24 Feb 2024 12:07:50 +0000 Subject: [PATCH 04/12] Fixing things --- src/app/about-us/page.tsx | 1 + src/widgets/Footer/Footer.tsx | 16 +--------------- src/widgets/MapSection/HomeMap/HomeMap.tsx | 3 ++- .../MapSection/HomeMap/icons/geo-green.svg | 8 ++++---- .../MapSection/HomeMap/icons/geo-orange.svg | 10 +++++----- .../MapSection/HomeMap/icons/geo-pink.svg | 10 +++++----- .../MapSection/HomeMap/icons/geo-purple.svg | 8 ++++---- src/widgets/MapSection/HomeMap/icons/geo-red.svg | 12 ++++++------ .../MapSection/HomeMap/icons/geo-yellow.svg | 8 ++++---- 9 files changed, 32 insertions(+), 44 deletions(-) diff --git a/src/app/about-us/page.tsx b/src/app/about-us/page.tsx index 62bca54..2055d7f 100644 --- a/src/app/about-us/page.tsx +++ b/src/app/about-us/page.tsx @@ -30,6 +30,7 @@ const AboutUs = () => {

+

Photo By Mzximvs VdB from Brussels, belgium - Road to Issyk-Kul (south shore), CC BY-SA 2.0

; ); }; diff --git a/src/widgets/Footer/Footer.tsx b/src/widgets/Footer/Footer.tsx index 314c75e..469f680 100644 --- a/src/widgets/Footer/Footer.tsx +++ b/src/widgets/Footer/Footer.tsx @@ -8,22 +8,8 @@ import facebook from "./icons/facebook.svg"; import instagram from "./icons/instagram.svg"; import app_store_btn from "./icons/app-store-btn.svg"; import play_market_btn from "./icons/play-market-btn.svg"; -import { usePathname } from 'next/navigation'; const Footer = () => { - - const pathname = usePathname(); - const isHomePage = pathname === '/'; - const isAboutPage = pathname === '/about'; - let creditsInFooter; - if (isHomePage) { - creditsInFooter =

Photo By ThomasG, CC BY-SA 3.0

; - } else if (isAboutPage) { - creditsInFooter =

Photo By Mzximvs VdB from Brussels, belgium - Road to Issyk-Kul (south shore), CC BY-SA 2.0

; - } else { - creditsInFooter =

; - } - return (