From 67b935b47f1f68bad5624e29c8560ca8a8f531a4 Mon Sep 17 00:00:00 2001
From: Vladislav Khorev <mephi1984@gmail.com>
Date: Sat, 24 Feb 2024 12:07:50 +0000
Subject: [PATCH 1/2] 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 = () => {
         </ul>
         </p>
       </div>
+      <p>Photo By Mzximvs VdB from Brussels, belgium - Road to Issyk-Kul (south shore), CC BY-SA 2.0</p>;
     </div>
   );
 };
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 = <p className="text-white">Photo By ThomasG, CC BY-SA 3.0</p>;
-  } else if (isAboutPage) {
-    creditsInFooter = <p className="text-white">Photo By Mzximvs VdB from Brussels, belgium - Road to Issyk-Kul (south shore), CC BY-SA 2.0</p>;
-  } else {
-    creditsInFooter = <p></p>;
-  }
-
   return (
     <footer className="footer">
       <Link href="/">
@@ -55,7 +41,7 @@ const Footer = () => {
             ))}
           </li>
         </ul>
-        {creditsInFooter}
+        <p className="text-white">Photo By ThomasG, CC BY-SA 3.0</p>
       </div>
       {/*
       <div className="footer__apps">
diff --git a/src/widgets/MapSection/HomeMap/HomeMap.tsx b/src/widgets/MapSection/HomeMap/HomeMap.tsx
index d968e67..9a5512a 100644
--- a/src/widgets/MapSection/HomeMap/HomeMap.tsx
+++ b/src/widgets/MapSection/HomeMap/HomeMap.tsx
@@ -57,7 +57,8 @@ const HomeMap: React.FC<IHomeMapProps> = ({
   const createCustomIcon = (icon: StaticImageData) => {
     const customIcon = new Icon({
       iconUrl: icon.src,
-      iconSize: [64, 64],
+      iconSize: [32, 32],
+      iconAnchor: [16, 32]
     });
 
     return customIcon;
diff --git a/src/widgets/MapSection/HomeMap/icons/geo-green.svg b/src/widgets/MapSection/HomeMap/icons/geo-green.svg
index b96e1f7..83f9840 100644
--- a/src/widgets/MapSection/HomeMap/icons/geo-green.svg
+++ b/src/widgets/MapSection/HomeMap/icons/geo-green.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
    width="38"
-   height="100"
-   viewBox="0 0 38 100"
+   height="50"
+   viewBox="0 0 38 50"
    fill="none"
    version="1.1"
    id="svg1"
@@ -45,8 +45,8 @@
      fill="#ffffff"
      id="ellipse1" />
   <circle
-     cx="18.821751"
-     cy="18.950451"
+     cx="19"
+     cy="19"
      r="7.5"
      fill="#8fde6a"
      id="circle1" />
diff --git a/src/widgets/MapSection/HomeMap/icons/geo-orange.svg b/src/widgets/MapSection/HomeMap/icons/geo-orange.svg
index b9e5e28..b0aaa6c 100644
--- a/src/widgets/MapSection/HomeMap/icons/geo-orange.svg
+++ b/src/widgets/MapSection/HomeMap/icons/geo-orange.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
    width="38"
-   height="100"
-   viewBox="0 0 38 100"
+   height="50"
+   viewBox="0 0 38 50"
    fill="none"
    version="1.1"
    id="svg1"
@@ -25,7 +25,7 @@
      inkscape:deskcolor="#d1d1d1"
      inkscape:zoom="7.77"
      inkscape:cx="17.631918"
-     inkscape:cy="29.66538"
+     inkscape:cy="29.79408"
      inkscape:window-width="1920"
      inkscape:window-height="991"
      inkscape:window-x="-9"
@@ -45,8 +45,8 @@
      fill="#ffffff"
      id="ellipse1" />
   <circle
-     cx="18.727512"
-     cy="18.773014"
+     cx="19"
+     cy="19"
      r="7.5"
      fill="#ffac33"
      id="circle1" />
diff --git a/src/widgets/MapSection/HomeMap/icons/geo-pink.svg b/src/widgets/MapSection/HomeMap/icons/geo-pink.svg
index 6d93f43..3750013 100644
--- a/src/widgets/MapSection/HomeMap/icons/geo-pink.svg
+++ b/src/widgets/MapSection/HomeMap/icons/geo-pink.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
    width="38"
-   height="100"
-   viewBox="0 0 38 100"
+   height="50"
+   viewBox="0 0 38 50"
    fill="none"
    version="1.1"
    id="svg1"
@@ -25,7 +25,7 @@
      inkscape:deskcolor="#d1d1d1"
      inkscape:zoom="15.54"
      inkscape:cx="18.661519"
-     inkscape:cy="53.185328"
+     inkscape:cy="22.297297"
      inkscape:window-width="1920"
      inkscape:window-height="991"
      inkscape:window-x="-9"
@@ -45,8 +45,8 @@
      fill="#ffffff"
      id="ellipse1" />
   <circle
-     cx="18.773014"
-     cy="18.99272"
+     cx="19"
+     cy="19"
      r="7.5"
      fill="#c288e2"
      id="circle1" />
diff --git a/src/widgets/MapSection/HomeMap/icons/geo-purple.svg b/src/widgets/MapSection/HomeMap/icons/geo-purple.svg
index 4a2e972..ea0a55b 100644
--- a/src/widgets/MapSection/HomeMap/icons/geo-purple.svg
+++ b/src/widgets/MapSection/HomeMap/icons/geo-purple.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
    width="38"
-   height="100"
-   viewBox="0 0 38 100"
+   height="50"
+   viewBox="0 0 38 50"
    fill="none"
    version="1.1"
    id="svg1"
@@ -45,8 +45,8 @@
      fill="#ffffff"
      id="ellipse1" />
   <circle
-     cx="18.821751"
-     cy="18.950451"
+     cx="19"
+     cy="19"
      r="7.5"
      fill="#87289d"
      id="circle1" />
diff --git a/src/widgets/MapSection/HomeMap/icons/geo-red.svg b/src/widgets/MapSection/HomeMap/icons/geo-red.svg
index d3da255..7f8efb0 100644
--- a/src/widgets/MapSection/HomeMap/icons/geo-red.svg
+++ b/src/widgets/MapSection/HomeMap/icons/geo-red.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
    width="38"
-   height="100"
-   viewBox="0 0 38 100"
+   height="50"
+   viewBox="0 0 38 50"
    fill="none"
    version="1.1"
    id="svg1"
@@ -24,8 +24,8 @@
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
      inkscape:zoom="10.988439"
-     inkscape:cx="27.30142"
-     inkscape:cy="35.264334"
+     inkscape:cx="27.301421"
+     inkscape:cy="35.264336"
      inkscape:window-width="1920"
      inkscape:window-height="991"
      inkscape:window-x="-9"
@@ -45,8 +45,8 @@
      fill="#ffffff"
      id="ellipse1" />
   <circle
-     cx="18.762922"
-     cy="18.933889"
+     cx="19"
+     cy="19"
      r="7.5"
      fill="#e64452"
      id="circle1" />
diff --git a/src/widgets/MapSection/HomeMap/icons/geo-yellow.svg b/src/widgets/MapSection/HomeMap/icons/geo-yellow.svg
index c602915..3318a82 100644
--- a/src/widgets/MapSection/HomeMap/icons/geo-yellow.svg
+++ b/src/widgets/MapSection/HomeMap/icons/geo-yellow.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
    width="38"
-   height="100"
-   viewBox="0 0 38 100"
+   height="50"
+   viewBox="0 0 38 50"
    fill="none"
    version="1.1"
    id="svg1"
@@ -45,8 +45,8 @@
      fill="#ffffff"
      id="ellipse1" />
   <circle
-     cx="18.757401"
-     cy="18.886101"
+     cx="19"
+     cy="19"
      r="7.5"
      fill="#fed363"
      id="circle1" />

From 566c4d4473b0180e3957885f1684ab86e6320d7f Mon Sep 17 00:00:00 2001
From: Vladislav Khorev <mephi1984@gmail.com>
Date: Sat, 24 Feb 2024 13:00:24 +0000
Subject: [PATCH 2/2] Fixing bug with comments/reviews

---
 src/shared/types/review-type.ts             |  4 ----
 src/widgets/ReviewSection/ReviewSection.tsx | 11 +++++------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/shared/types/review-type.ts b/src/shared/types/review-type.ts
index 7b76ff7..18364f3 100644
--- a/src/shared/types/review-type.ts
+++ b/src/shared/types/review-type.ts
@@ -12,7 +12,3 @@ export interface IReview {
   review: string;
   created_at: string;
 }
-
-export interface IReviewList extends IList {
-  results: IReview[];
-}
diff --git a/src/widgets/ReviewSection/ReviewSection.tsx b/src/widgets/ReviewSection/ReviewSection.tsx
index 6cc18ca..f1e0cbd 100644
--- a/src/widgets/ReviewSection/ReviewSection.tsx
+++ b/src/widgets/ReviewSection/ReviewSection.tsx
@@ -2,7 +2,7 @@
 
 import "./ReviewSection.scss";
 import { apiInstance } from "@/shared/config/apiConfig";
-import { IReviewList } from "@/shared/types/review-type";
+import { IReview } from "@/shared/types/review-type";
 import { useSession } from "next-auth/react";
 import { useEffect, useState } from "react";
 import calendar from "./icons/calendar.svg";
@@ -17,7 +17,7 @@ const ReviewSection: React.FC<IReviewsSectionProps> = ({
   endpoint,
   id,
 }: IReviewsSectionProps) => {
-  const [reviews, setReviews] = useState<IReviewList>();
+  const [reviews, setReviews] = useState<IReview[]>();
   const session = useSession();
   const handleSubmit: React.MouseEventHandler<
     HTMLFormElement
@@ -52,11 +52,10 @@ const ReviewSection: React.FC<IReviewsSectionProps> = ({
   };
 
   const getReviews = async () => {
-    const response = await apiInstance.get<IReviewList>(
+    const response = await apiInstance.get<IReview[]>(
       `/${endpoint}/${id}/reviews/`
     );
-
-    setReviews(response.data);
+    setReviews(response?.data);
   };
 
   useEffect(() => {
@@ -94,7 +93,7 @@ const ReviewSection: React.FC<IReviewsSectionProps> = ({
         </h3>
 
         <ul>
-          {reviews?.results.map((review) => (
+          {reviews?.map((review) => (
             <li key={review.id} className="review">
               <div className="review__author">
                 <img