[feat] status functionality with bugs

calblueprint · Dec 4, 2024 · 9873994 · 9873994
1 parent a8e15dc
commit 9873994
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/api/supabase/queries/query.ts b/api/supabase/queries/query.ts
@@ -29,7 +29,6 @@ export async function queryProjectbyId(id: number): Promise<Project> {
 }
 
 export async function queryDefaultImages(category: string) {
-  console.log('Fetching default image for category:', category);
   const { data: defaultImage, error } = await supabase
     .from('Renewable Energy Technology')
     .select('*')

diff --git a/components/Filter/index.tsx b/components/Filter/index.tsx
@@ -51,6 +51,8 @@ export default function Filter({
             icon={filter.icon}
             label={filter.label}
             currFilter={filter}
+            handleFilterButtonClick={handleFilterButtonClick}
+            clearFilters={clearFilters}
           />
         ) : // Add other filter dropdown components here
         null

diff --git a/components/MapViewScreen/index.tsx b/components/MapViewScreen/index.tsx
@@ -78,11 +78,21 @@ export default function MapViewScreen({
   const handleFilterButtonClick = () => {
     /* eslint-disable @typescript-eslint/no-unused-vars */
     const { status, technology, projectSize, location } = selectedFilters;
+    let filteredProjects = projects;
+
     // add all filtering logic here
-    const technologyProjects = projects?.filter(project =>
-      technology.includes(project.renewable_energy_technology),
-    );
-    setFilteredProjectsFromDropdowns(technologyProjects);
+    if (technology.length > 0) {
+      filteredProjects = filteredProjects.filter(project =>
+        technology.includes(project.renewable_energy_technology),
+      );
+    }
+
+    if (status.length > 0) {
+      filteredProjects = filteredProjects.filter(project =>
+        status.includes(project.project_status),
+      );
+    }
+    setFilteredProjectsFromDropdowns(filteredProjects);
   };
 
   // search within all projects or filtered projects from dropdowns

diff --git a/components/ProjectItem/index.tsx b/components/ProjectItem/index.tsx
@@ -97,7 +97,7 @@ export default function ProjectItem({
   // Sets status label to "Operational" or "In Progress"
   let projectStatus = project_status;
   if (project_status !== 'Operational') {
-    projectStatus = 'In Progress';
+    projectStatus = 'Proposed';
   }
 
   // Sets status icon to OperationalIcon or InProgressIcon

diff --git a/components/StatusDropdown/index.tsx b/components/StatusDropdown/index.tsx
@@ -27,6 +27,8 @@ interface StatusDropdownProps {
   icon: React.ReactNode;
   label: string;
   currFilter: FilterType;
+  handleFilterButtonClick: () => void;
+  clearFilters: () => void;
 }
 
 export default function StatusDropdown({
@@ -36,9 +38,11 @@ export default function StatusDropdown({
   icon,
   label,
   currFilter,
+  handleFilterButtonClick,
+  clearFilters,
 }: StatusDropdownProps) {
   const filterOptions = [
-    { title: 'In Progress', color: `${COLORS.ashGrey}` },
+    { title: 'Proposed', color: `${COLORS.ashGrey}` },
     { title: 'Operational', color: `${COLORS.chateauGreen}` },
   ];
 
@@ -58,7 +62,7 @@ export default function StatusDropdown({
           <ButtonStyles>
             <FilterNameText>{label}</FilterNameText>
           </ButtonStyles>
-          <ExitStyles>
+          <ExitStyles onClick={clearFilters}>
             <ExitIcon />
           </ExitStyles>
         </ButtonWithIconStyles>
@@ -79,7 +83,10 @@ export default function StatusDropdown({
             </CheckboxContainer>
           ))}
         </div>
-        <ApplyButtonStyles isActive={isApplyButtonActive}>
+        <ApplyButtonStyles
+          isActive={isApplyButtonActive}
+          onClick={handleFilterButtonClick}
+        >
           <ApplyFiltersText>APPLY</ApplyFiltersText>
         </ApplyButtonStyles>
       </FilterContentDiv>