Skip to content

Commit 932dcfa

Browse files
Merge pull request #187 from equestrian2296/filterTest
fix: filter logic and homepage text
2 parents e8b41a0 + f389565 commit 932dcfa

File tree

2 files changed

+14
-23
lines changed

2 files changed

+14
-23
lines changed

src/components/FilterDialog.tsx

+13-22
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,11 @@ export const FilterDialog = ({
3333
onReset: () => void;
3434
onApplyFilters: (exams: string[], slots: string[], years: string[]) => void;
3535
}) => {
36-
const [selectedExams, setSelectedExams] = useState<string[]>(
37-
initialExams ?? [],
38-
);
39-
const [selectedSlots, setSelectedSlots] = useState<string[]>(
40-
initialSlots ?? [],
41-
);
42-
const [selectedYears, setSelectedYears] = useState<string[]>(
43-
initialYears ?? [],
44-
);
45-
const [, setSelectedCampuses] = useState<string[]>(
46-
initialYears ?? [],
47-
);
48-
const [selectedSemesters, setSelectedSemesters] = useState<string[]>(
49-
initialYears ?? [],
50-
);
36+
const [selectedExams, setSelectedExams] = useState<string[]>(initialExams ?? []);
37+
const [selectedSlots, setSelectedSlots] = useState<string[]>(initialSlots ?? []);
38+
const [selectedYears, setSelectedYears] = useState<string[]>(initialYears ?? []);
39+
const [selectedCampuses, setSelectedCampuses] = useState<string[]>(initialCampuses ?? []);
40+
const [selectedSemesters, setSelectedSemesters] = useState<string[]>(initialSemesters ?? []);
5141
const [open, setOpen] = useState(false);
5242

5343
useEffect(() => {
@@ -56,7 +46,7 @@ export const FilterDialog = ({
5646
setSelectedYears(initialYears ?? []);
5747
setSelectedCampuses(initialCampuses ?? []);
5848
setSelectedSemesters(initialSemesters ?? []);
59-
}, [initialCampuses, initialExams, initialSemesters, initialSlots, initialYears]);
49+
}, [initialExams, initialSlots, initialYears, initialCampuses, initialSemesters]);
6050

6151
const exams = filterOptions.uniqueExams.map((exam) => ({
6252
label: exam,
@@ -74,10 +64,12 @@ export const FilterDialog = ({
7464
label: semester,
7565
value: semester,
7666
}));
67+
7768
// const campuses = filterOptions.uniqueCampuses.map((campus) => ({
7869
// label: campus,
7970
// value: campus,
8071
// }));
72+
8173
const handleFilterClick = () => {
8274
onApplyFilters(selectedExams, selectedSlots, selectedYears);
8375
setOpen(false);
@@ -88,7 +80,6 @@ export const FilterDialog = ({
8880
setSelectedSlots([]);
8981
setSelectedYears([]);
9082
setSelectedSemesters([]);
91-
9283
setSelectedCampuses([]);
9384
setOpen(false);
9485
onReset();
@@ -112,31 +103,31 @@ export const FilterDialog = ({
112103
options={exams}
113104
onValueChange={setSelectedExams}
114105
placeholder="Exams"
115-
defaultValue={selectedExams}
106+
value={selectedExams}
116107
/>
117108
<MultiSelect
118109
options={slots}
119110
onValueChange={setSelectedSlots}
120111
placeholder="Slots"
121-
defaultValue={selectedSlots}
112+
value={selectedSlots}
122113
/>
123114
<MultiSelect
124115
options={years}
125116
onValueChange={setSelectedYears}
126117
placeholder="Years"
127-
defaultValue={selectedYears}
118+
value={selectedYears}
128119
/>
129120
<MultiSelect
130121
options={semesters}
131122
onValueChange={setSelectedSemesters}
132123
placeholder="Semesters"
133-
defaultValue={selectedSemesters}
124+
value={selectedSemesters}
134125
/>
135126
{/* <MultiSelect
136127
options={campuses}
137128
onValueChange={setSelectedCampuses}
138129
placeholder="Campuses"
139-
defaultValue={selectedCampuses}
130+
value={selectedCampuses}
140131
/> */}
141132
</div>
142133
<div className="flex justify-between">

src/components/screens/Info.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function Info() {
1515
<span>your CATs and FATs </span>
1616
<span>with CodeChef-</span>
1717
<span>VIT’s dedicated </span>
18-
<span>repository of past</span>
18+
<span>repository of past </span>
1919
<span>exam papers</span>
2020
</div>
2121
<div className="grid play gap-4 text-[12px] text-black dark:text-white md:grid-cols-3 xl:text-[16px]">

0 commit comments

Comments
 (0)