Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use react datepicker #38

Merged
merged 2 commits into from
Dec 31, 2023
Merged

feat: use react datepicker #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc062da
feat: swap input for datepicker
KevinWu098 Dec 31, 2023
ea9f4f1
test: update for new types
KevinWu098 Dec 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions __tests__/search-filters.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ const defaultFilterValues: FilterValues = {
format: [true, true],
enrollment: [false],
available: [false],
start: "2023-12-20",
end: "",
start: new Date(2023, 11, 20),
end: undefined,
institution: "Any Institution",
min: 0,
max: 20,
Expand Down Expand Up @@ -192,33 +192,28 @@ describe("Search Filters", () => {
});

describe("Filter Utils' Time Utilities", () => {
test("startsAfter none", async () => {
const result = startsAfter("", data.courses[0]);
expect(result).toBe(true);
});

test("startsAfter defined returns true", async () => {
const result = startsAfter("2023-12-25", data.courses[0]);
const result = startsAfter(new Date("2023-12-25"), data.courses[0]);
expect(result).toBe(true);
});

test("startsAfter defined returns false", async () => {
const result = startsAfter("2024-12-25", data.courses[0]);
const result = startsAfter(new Date("2024-12-25"), data.courses[0]);
expect(result).toBe(false);
});

test("endsBefore none", async () => {
const result = endsBefore("", data.courses[0]);
test("endsBefore undefined", async () => {
const result = endsBefore(undefined, data.courses[0]);
expect(result).toBe(true);
});

test("endsBefore defined returns true", async () => {
const result = endsBefore("2024-06-14", data.courses[0]);
const result = endsBefore(new Date("2024-06-14"), data.courses[0]);
expect(result).toBe(true);
});

test("endsBefore defined returns false", async () => {
const result = endsBefore("2024-05-14", data.courses[0]);
const result = endsBefore(new Date("2024-05-14"), data.courses[0]);
expect(result).toBe(false);
});

Expand Down
43 changes: 24 additions & 19 deletions components/search/FilterComponents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
import React, { ChangeEvent, Dispatch, SetStateAction, useState } from "react";
import { FaCheck, FaChevronDown } from "react-icons/fa";
import { CollegeObject } from "./Search";
import DatePicker from "react-datepicker";

import "react-datepicker/dist/react-datepicker.css";

interface FilterCheckboxProps {
title: string;
Expand Down Expand Up @@ -58,26 +61,28 @@ export const CustomFilterCheckbox = (props: FilterCheckboxProps) => {
};

interface CalendarFilterProps {
onStartChange: Dispatch<SetStateAction<string>>;
onEndChange: Dispatch<SetStateAction<string>>;
defaultStart: string | undefined;
defaultEnd: string | undefined;
onStartChange: Dispatch<React.SetStateAction<Date>>;
onEndChange: Dispatch<SetStateAction<Date | undefined>>;
defaultStart: Date;
defaultEnd: Date | undefined;
}

export const CalendarFilter = (props: CalendarFilterProps) => {
const { onStartChange, onEndChange, defaultStart, defaultEnd } = props;

const [start, setStart] = useState(defaultStart);
const [start, setStart] = useState(
defaultStart ? new Date(defaultStart) : new Date(),
);
const [end, setEnd] = useState(defaultEnd);

const handleStartChange = (e: ChangeEvent<HTMLInputElement>) => {
onStartChange(e.target.value);
setStart(e.target.value);
const handleStartChange = (date: Date) => {
onStartChange(date);
setStart(date);
};

const handleEndChange = (e: ChangeEvent<HTMLInputElement>) => {
onEndChange(e.target.value);
setEnd(e.target.value);
const handleEndChange = (date: Date) => {
onEndChange(date);
setEnd(date);
};

return (
Expand All @@ -89,11 +94,11 @@ export const CalendarFilter = (props: CalendarFilterProps) => {
Starts After
</label>
<div className="flex flex-row items-center gap-2">
<input
type="date"
className="appearance-none rounded-lg border-[1px] border-gray px-4 py-2"
value={start}
<DatePicker
selected={start}
onChange={handleStartChange}
onSelect={handleStartChange}
className="w-40 appearance-none rounded-lg border-[1px] border-gray px-4 py-2"
/>
</div>
</div>
Expand All @@ -102,11 +107,11 @@ export const CalendarFilter = (props: CalendarFilterProps) => {
Ends Before
</label>
<div className="flex flex-row items-center gap-2">
<input
type="date"
className="appearance-none rounded-lg border-[1px] border-gray px-4 py-2"
value={end}
<DatePicker
selected={end}
onChange={handleEndChange}
onSelect={handleEndChange}
className="w-40 appearance-none rounded-lg border-[1px] border-gray px-4 py-2"
/>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions components/search/Filters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ interface SearchFilterProps {
setFormat: Dispatch<SetStateAction<boolean[]>>;
setEnrollment: Dispatch<SetStateAction<boolean[]>>;
setAvailable: Dispatch<SetStateAction<boolean[]>>;
setStart: Dispatch<SetStateAction<string>>;
setEnd: Dispatch<SetStateAction<string>>;
setStart: Dispatch<React.SetStateAction<Date>>;
setEnd: Dispatch<SetStateAction<Date | undefined>>;
setInstitution: Dispatch<SetStateAction<string>>;
setMin: Dispatch<SetStateAction<number>>;
setMax: Dispatch<SetStateAction<number>>;
Expand Down
14 changes: 4 additions & 10 deletions components/search/Search.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ export type FilterValues = {
format: boolean[];
enrollment: boolean[];
available: boolean[];
start: string;
end: string;
start: Date;
end: Date | undefined;
institution: string;
min: number;
max: number;
Expand All @@ -70,14 +70,8 @@ const Search = () => {
const [format, setFormat] = useState([true, true]);
const [enrollment, setEnrollment] = useState([true]);
const [available, setAvailable] = useState([true]);
const [start, setStart] = useState(() => {
const today = new Date();
const year = today.getFullYear();
const month = (today.getMonth() + 1).toString().padStart(2, "0");
const day = today.getDate().toString().padStart(2, "0");
return `${year}-${month}-${day}`;
});
const [end, setEnd] = useState("");
const [start, setStart] = useState(new Date());
const [end, setEnd] = useState<Date>();
const [institution, setInstitution] = useState("Any Institution");
const [min, setMin] = useState(0);
const [max, setMax] = useState(20);
Expand Down
32 changes: 18 additions & 14 deletions components/search/filter-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
import { CollegeObject, FilterValues } from "./Search";

export const startsAfter = (start: string, result: CollegeObject) => {
if (start == undefined) return true;
export const startsAfter = (start: Date, result: CollegeObject) => {
const month = result.startMonth.toString().padStart(2, "0");
const day = result.startDay.toString().padStart(2, "0");
const courseDate = new Date(`2024-${month}-${day}`);
courseDate.setHours(0, 0, 0, 0);
courseDate.setDate(courseDate.getDate() + 1);

return (
`2024-${result.startMonth.toString().padStart(2, "0")}-${result.startDay
.toString()
.padStart(2, "0")}` >= start
);
return courseDate > start;
};

export const endsBefore = (end: string, result: CollegeObject) => {
if (end == "") return true;
export const endsBefore = (end: Date | undefined, result: CollegeObject) => {
if (end == undefined) {
return true;
}

const month = result.endMonth.toString().padStart(2, "0");
const day = result.endDay.toString().padStart(2, "0");
const courseDate = new Date(`2024-${month}-${day}`);
courseDate.setHours(0, 0, 0, 0);
courseDate.setDate(courseDate.getDate() + 1);

return (
`2024-${result.endMonth.toString().padStart(2, "0")}-${result.endDay
.toString()
.padStart(2, "0")}` <= end
);
return courseDate < end;
};

export function filterData(
Expand Down
Loading