From cfc340c4f1ce89b74d6a077566431887a5591887 Mon Sep 17 00:00:00 2001
From: Mateusz Tylka <mattyl@st.amu.edu.pl>
Date: Fri, 14 Apr 2023 15:55:05 +0200
Subject: [PATCH] prototype status filter

---
 src/pages/Challanges/Challenges.js   | 18 +++---------------
 src/pages/Challanges/statusFilter.js | 23 +++++++++++++++--------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/pages/Challanges/Challenges.js b/src/pages/Challanges/Challenges.js
index 38f8b35..fc97b3b 100644
--- a/src/pages/Challanges/Challenges.js
+++ b/src/pages/Challanges/Challenges.js
@@ -31,7 +31,7 @@ const Challenges = () => {
   }, []);
 
   React.useEffect(() => {
-    statusFilter(status, challengesFromAPI, setChallenges);
+    statusFilter(status, challengesFromAPI, challenges, setChallenges);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [status]);
 
@@ -82,21 +82,9 @@ const Challenges = () => {
       <>
         {filtersMenuRender(
           filtersMenu ? '0' : '100vw',
-          filtersMenu ? '1' : '0'
+          filtersMenu ? '1' : '0',
+          'flex'
         )}
-        <FiltersMenu
-          toggleFiltersMenu={toggleFiltersMenu}
-          sortByHandler={setSortBy}
-          statusHandler={setStatus}
-          challengeTypeHandler={setChallengeType}
-          commercialHandler={setCommercial}
-          sortBy={sortBy}
-          status={status}
-          challengeType={challengeType}
-          commercial={commercial}
-          translateX={filtersMenu ? '0' : '100vw'}
-          opacity={filtersMenu ? '1' : '0'}
-        />
         <ChallengesStyle as="main" id="start">
           <FlexColumn className="ChallengesStyle__page-container">
             <H1 as="h1">Challenges</H1>
diff --git a/src/pages/Challanges/statusFilter.js b/src/pages/Challanges/statusFilter.js
index e7058da..7d0a7b0 100644
--- a/src/pages/Challanges/statusFilter.js
+++ b/src/pages/Challanges/statusFilter.js
@@ -19,8 +19,13 @@ const getDeadlineTime = (deadline) => {
   }
 };
 
-const statusFilter = (status, challenges, setChallenges) => {
-  let result = challenges;
+const statusFilter = (
+  status,
+  challengesAll,
+  challengesToRender,
+  setChallenges
+) => {
+  let result = challengesAll;
   const date = new Date();
   const currentDate = {
     year: date.getFullYear(),
@@ -29,28 +34,30 @@ const statusFilter = (status, challenges, setChallenges) => {
   };
   switch (status) {
     case CHALLENGES_STATUS_FILTER.CLOSED:
-      result = challenges.filter((challenge) =>
+      result = challengesAll.filter((challenge) =>
         dateIsOlder(
           currentDate,
           challenge.deadline ? getDeadlineTime(challenge.deadline) : false
         )
       );
-      setChallenges(result);
       break;
     case CHALLENGES_STATUS_FILTER.ACTIVE:
-      result = challenges.filter(
+      result = challengesAll.filter(
         (challenge) =>
           !dateIsOlder(
             currentDate,
-            challenge.deadline ? getDeadlineTime(challenge.deadline) : true
+            challenge.deadline ? getDeadlineTime(challenge.deadline) : false
           )
       );
-      setChallenges(result);
       break;
     default:
-      setChallenges(challenges);
+      result = challengesAll;
       break;
   }
+  //   result = result.filter((elem) => {
+  //     return !challengesToRender.includes(elem);
+  //   });
+  setChallenges(result);
 };
 
 export default statusFilter;