added new members + tournament; correcred unknown member's priperties…

… shown
M-Farmaha · Aug 16, 2024 · 685ff9b · 685ff9b
1 parent de2155e
commit 685ff9b
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 6 deletions.
diff --git a/src/Api/members.json b/src/Api/members.json
@@ -1519,5 +1519,31 @@
     "forhand": "Справа",
     "backhand": "Дворучний",
     "joinTennisYear": 1984
+  },
+  {
+    "id": "118",
+    "name": "Олійник Мар'ян",
+    "birthDate": "1983-12-28",
+    "avatar": "https://raw.githubusercontent.com/M-Farmaha/100-club/main/src/components/MembersList/avatars/118.jpg",
+    "sex": "male",
+    "hometown": "Золочів",
+    "type": "Тренер",
+    "category": null,
+    "forhand": "Справа",
+    "backhand": "Дворучний",
+    "joinTennisYear": 1997
+  },
+  {
+    "id": "119",
+    "name": "Паращак Юрій",
+    "birthDate": null,
+    "avatar": "https://raw.githubusercontent.com/M-Farmaha/100-club/main/src/components/MembersList/avatars/119.jpg",
+    "sex": "male",
+    "hometown": "Львів",
+    "type": "Аматор",
+    "category": null,
+    "forhand": "Справа",
+    "backhand": "Дворучний",
+    "joinTennisYear": null
   }
 ]
diff --git a/src/Api/tournaments.json b/src/Api/tournaments.json
@@ -192,6 +192,18 @@
           { "member_id": "57", "win": 6, "defeat": 4, "position": 3 },
           { "member_id": "1", "win": 7, "defeat": 3, "position": 1 }
         ]
+      },
+      {
+        "date": "2024-08-04",
+        "players": [
+          { "member_id": "39", "win": 7, "defeat": 0, "position": 1 },
+          { "member_id": "42", "win": 4, "defeat": 0, "position": 2 },
+          { "member_id": "76", "win": 2, "defeat": 4, "position": 4 },
+          { "member_id": "57", "win": 3, "defeat": 4, "position": 3 },
+          { "member_id": "1", "win": 2, "defeat": 4, "position": 4 },
+          { "member_id": "30", "win": 2, "defeat": 4, "position": 4 },
+          { "member_id": "119", "win": 1, "defeat": 5, "position": 7 }
+        ]
       }
     ]
   }

diff --git a/src/components/ContactsSection/ContactsSection.jsx b/src/components/ContactsSection/ContactsSection.jsx
@@ -127,7 +127,7 @@ export const ContactsSection = () => {
             </PhotoWrap>
             <InfoWrap>
               <Address>
-                <Text>Головний координатор клубу:</Text>
+                <Text>Координатор клубу:</Text>
 
                 <LinkA href="tel:+380997877316" aria-label="Подзвонити">
                   <IconSvg>

diff --git a/src/components/LastUpdateSection/LastUpdateSection.jsx b/src/components/LastUpdateSection/LastUpdateSection.jsx
@@ -11,7 +11,7 @@ export const LastUpdateSection = () => {
               <use href={sprite + "#icon-loop"}></use>
             </IconSvg>
           </IconWrap>
-          Останнє оновлення: 29.07.2024
+          Останнє оновлення: 17.08.2024
         </Text>
       </Section>
     </>

diff --git a/src/components/MembersList/MembersModal.jsx b/src/components/MembersList/MembersModal.jsx
@@ -41,7 +41,9 @@ export const MembersModal = () => {
   } = currentMember || {};
 
   const age = differenceInYears(new Date(), new Date(birthDate));
-  const experience = new Date().getFullYear() - joinTennisYear;
+  const experience = joinTennisYear
+    ? `${new Date().getFullYear() - joinTennisYear} р. тому`
+    : "Невідомо";
 
   const birth = new Date(birthDate);
   const today = new Date();
@@ -108,7 +110,8 @@ export const MembersModal = () => {
                     {getUkrLocaleDate(birthDate)}
                   </Text>
                   <Text>
-                    <span>Вік:</span> {age} {getAgeSuffix(age)}
+                    <span>Вік:</span>
+                    {birthDate ? ` ${age} ${getAgeSuffix(age)}` : " Heвідомо"}
                     {isTodayBirthDay && " (виповнилось сьогодні)"}
                   </Text>
                   <Text>
@@ -120,7 +123,7 @@ export const MembersModal = () => {
                         sex === "male" ? "спробував" : "спробувала"
                       } теніс: `}
                     </span>
-                    {experience} р. тому
+                    {experience}
                   </Text>
                   <Text>
                     <span>Форхенд:</span> {forhand}

diff --git a/src/components/MembersList/avatars/118.jpg b/src/components/MembersList/avatars/118.jpg
diff --git a/src/helpers/getUkrLocaleDate.js b/src/helpers/getUkrLocaleDate.js
@@ -2,6 +2,8 @@ import { format } from "date-fns";
 import ukLocale from "date-fns/locale/uk";
 
 export const getUkrLocaleDate = (date) => {
+  if (!date) return " Невідомо";
+
   const newDate = format(new Date(date), " d MMMM yyyy", {
     locale: ukLocale,
   });

diff --git a/src/helpers/isDateHidden.js b/src/helpers/isDateHidden.js
@@ -1,4 +1,4 @@
 export const isDateHidden = (date) => {
-  const hiddenDates = ["2024-04-07", "2024-04-21", "2024-04-28", "2024-05-19"];
+  const hiddenDates = ["2024-04-07", "2024-04-21", "2024-04-28", "2024-05-19", "2024-08-04"];
   return hiddenDates.includes(date);
 };