From 2928a20da9427844ab83dc01bab0b02ccb8f932a Mon Sep 17 00:00:00 2001 From: Kevin Wu Date: Fri, 29 Dec 2023 10:22:52 -0800 Subject: [PATCH] fix: small bugs (#34) * fix: styling and warnings * style: h-full, w-full * fix: start and end default values * chore: update file names * fix: adjust type for start and end * fix: space in blurb * chore: update metadata * fix: git mv to rename files * fix: correct imports * chore: rename hero to Hero * chore: fix Search import * fix: undo w-full, h-full --- __tests__/search-filters.test.ts | 14 ++++----- app/layout.tsx | 5 ++-- app/page.tsx | 2 +- app/search/page.tsx | 2 +- components/{footer.tsx => Footer.tsx} | 0 components/{header.tsx => Header.tsx} | 0 components/hero/{hero.tsx => Hero.tsx} | 0 components/search/{blurb.tsx => Blurb.tsx} | 7 +++-- ...terComponents.tsx => FilterComponents.tsx} | 18 ++++++----- .../search/{filters.tsx => Filters.tsx} | 8 ++--- components/search/{search.tsx => Search.tsx} | 30 +++++++++++-------- .../{searchResults.tsx => SearchResults.tsx} | 4 +-- components/search/{tags.tsx => Tags.tsx} | 0 .../{filterUtils.ts => filter-utils.ts} | 20 ++++++++----- .../search/{queryDatabase.ts => query-db.ts} | 0 15 files changed, 62 insertions(+), 48 deletions(-) rename components/{footer.tsx => Footer.tsx} (100%) rename components/{header.tsx => Header.tsx} (100%) rename components/hero/{hero.tsx => Hero.tsx} (100%) rename components/search/{blurb.tsx => Blurb.tsx} (91%) rename components/search/{filterComponents.tsx => FilterComponents.tsx} (96%) rename components/search/{filters.tsx => Filters.tsx} (95%) rename components/search/{search.tsx => Search.tsx} (95%) rename components/search/{searchResults.tsx => SearchResults.tsx} (99%) rename components/search/{tags.tsx => Tags.tsx} (100%) rename components/search/{filterUtils.ts => filter-utils.ts} (88%) rename components/search/{queryDatabase.ts => query-db.ts} (100%) diff --git a/__tests__/search-filters.test.ts b/__tests__/search-filters.test.ts index 6c15277..58934fa 100644 --- a/__tests__/search-filters.test.ts +++ b/__tests__/search-filters.test.ts @@ -1,9 +1,9 @@ -import { FilterValues } from "@/components/search/search"; +import { FilterValues } from "@/components/search/Search"; import { endsBefore, filterData, startsAfter, -} from "@/components/search/filterUtils"; +} from "@/components/search/filter-utils"; import "@testing-library/jest-dom"; const data = { @@ -81,7 +81,7 @@ const defaultFilterValues: FilterValues = { enrollment: [false], available: [false], start: "2023-12-20", - end: undefined, + end: "", institution: "Any Institution", min: 0, max: 20, @@ -192,8 +192,8 @@ describe("Search Filters", () => { }); describe("Filter Utils' Time Utilities", () => { - test("startsAfter undefined", async () => { - const result = startsAfter(undefined, data.courses[0]); + test("startsAfter none", async () => { + const result = startsAfter("", data.courses[0]); expect(result).toBe(true); }); @@ -207,8 +207,8 @@ describe("Filter Utils' Time Utilities", () => { expect(result).toBe(false); }); - test("endsBefore undefined", async () => { - const result = endsBefore(undefined, data.courses[0]); + test("endsBefore none", async () => { + const result = endsBefore("", data.courses[0]); expect(result).toBe(true); }); diff --git a/app/layout.tsx b/app/layout.tsx index b1f8c00..115f7fb 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,8 +1,8 @@ import type { Metadata } from "next"; import { Inter } from "next/font/google"; import "./globals.css"; -import Header from "@/components/header"; -import Footer from "@/components/footer"; +import Header from "@/components/Header"; +import Footer from "@/components/Footer"; import GoogleAnalytics from "@/components/GoogleAnalytics"; import { Toaster } from "@/components/ui/toaster"; @@ -12,6 +12,7 @@ export const metadata: Metadata = { title: "GE-Z", description: "GE-Z sources data from Assist.org and CVC.edu to find the perfect community college courses for you to take.", + metadataBase: new URL("https://ge-z.vercel.app"), openGraph: { title: "GE-Z", description: diff --git a/app/page.tsx b/app/page.tsx index fcafec2..fcd7f03 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,4 +1,4 @@ -import Hero from "@/components/hero/hero"; +import Hero from "@/components/hero/Hero"; export default function Home() { return ( diff --git a/app/search/page.tsx b/app/search/page.tsx index ecf1944..75bde11 100644 --- a/app/search/page.tsx +++ b/app/search/page.tsx @@ -1,4 +1,4 @@ -import Search from "@/components/search/search"; +import Search from "@/components/search/Search"; import React from "react"; const SearchPage = () => { diff --git a/components/footer.tsx b/components/Footer.tsx similarity index 100% rename from components/footer.tsx rename to components/Footer.tsx diff --git a/components/header.tsx b/components/Header.tsx similarity index 100% rename from components/header.tsx rename to components/Header.tsx diff --git a/components/hero/hero.tsx b/components/hero/Hero.tsx similarity index 100% rename from components/hero/hero.tsx rename to components/hero/Hero.tsx diff --git a/components/search/blurb.tsx b/components/search/Blurb.tsx similarity index 91% rename from components/search/blurb.tsx rename to components/search/Blurb.tsx index b458de2..0c16f2b 100644 --- a/components/search/blurb.tsx +++ b/components/search/Blurb.tsx @@ -1,12 +1,12 @@ import React from "react"; -import { CollegeObject, FilterValues } from "./search"; +import { CollegeObject, FilterValues } from "./Search"; interface BlurbProps { filterData: ( data: CollegeObject[], filterValues: FilterValues, ) => CollegeObject[]; - data: CollegeObject[]; + data: CollegeObject[] | undefined; filterValues: FilterValues; searchUniversity: string; searchGE: string; @@ -26,7 +26,8 @@ const SearchBlurb = (props: BlurbProps) => {
We found{" "} - {filterData(data, filterValues).length} courses + {data ? filterData(data, filterValues).length : "x"}{" "} + courses {" "} that may articulate to{" "} {searchUniversity} for{" "} diff --git a/components/search/filterComponents.tsx b/components/search/FilterComponents.tsx similarity index 96% rename from components/search/filterComponents.tsx rename to components/search/FilterComponents.tsx index 5568b0f..d09126c 100644 --- a/components/search/filterComponents.tsx +++ b/components/search/FilterComponents.tsx @@ -2,7 +2,7 @@ import React, { ChangeEvent, Dispatch, SetStateAction, useState } from "react"; import { FaCheck, FaChevronDown } from "react-icons/fa"; -import { CollegeObject } from "./search"; +import { CollegeObject } from "./Search"; interface FilterCheckboxProps { title: string; @@ -59,7 +59,7 @@ export const CustomFilterCheckbox = (props: FilterCheckboxProps) => { interface CalendarFilterProps { onStartChange: Dispatch>; - onEndChange: Dispatch>; + onEndChange: Dispatch>; defaultStart: string | undefined; defaultEnd: string | undefined; } @@ -118,7 +118,7 @@ export const CalendarFilter = (props: CalendarFilterProps) => { interface InstitutionDropdownProps { defaultValue: string; - courses: CollegeObject[]; + courses: CollegeObject[] | undefined; onChange: Dispatch>; } @@ -139,13 +139,15 @@ export const InstitutionDropdown = (props: InstitutionDropdownProps) => { (course: CollegeObject) => course.sendingInstitution, ); - for (const college of sendingInstitutions) { - if (!uniqueColleges.includes(college)) { - uniqueColleges.push(college); + if (sendingInstitutions) { + for (const college of sendingInstitutions) { + if (!uniqueColleges.includes(college)) { + uniqueColleges.push(college); + } } - } - uniqueColleges.sort(); + uniqueColleges.sort(); + } return (
diff --git a/components/search/filters.tsx b/components/search/Filters.tsx similarity index 95% rename from components/search/filters.tsx rename to components/search/Filters.tsx index d12b246..4f0ec75 100644 --- a/components/search/filters.tsx +++ b/components/search/Filters.tsx @@ -4,9 +4,9 @@ import { CustomFilterCheckbox, InstitutionDropdown, UnitsFilter, -} from "./filterComponents"; +} from "./FilterComponents"; import { FaCircleXmark } from "react-icons/fa6"; -import { CollegeObject, FilterValues } from "./search"; +import { CollegeObject, FilterValues } from "./Search"; interface SearchFilterProps { handleClick: () => void; @@ -14,12 +14,12 @@ interface SearchFilterProps { setEnrollment: Dispatch>; setAvailable: Dispatch>; setStart: Dispatch>; - setEnd: Dispatch>; + setEnd: Dispatch>; setInstitution: Dispatch>; setMin: Dispatch>; setMax: Dispatch>; filterValues: FilterValues; - courses: CollegeObject[]; + courses: CollegeObject[] | undefined; } export const SearchFilters = (props: SearchFilterProps) => { diff --git a/components/search/search.tsx b/components/search/Search.tsx similarity index 95% rename from components/search/search.tsx rename to components/search/Search.tsx index c1db16f..bd0deb4 100644 --- a/components/search/search.tsx +++ b/components/search/Search.tsx @@ -2,14 +2,14 @@ import React, { useEffect, useState } from "react"; import { DropdownComponentSearch } from "../DropdownComponent"; -import { SortDropdown } from "./filterComponents"; +import { SortDropdown } from "./FilterComponents"; import { useRouter, useSearchParams } from "next/navigation"; -import { queryDatabase } from "./queryDatabase"; -import SearchResults from "./searchResults"; +import { queryDatabase } from "./query-db"; +import SearchResults from "./SearchResults"; import { FaFilter } from "react-icons/fa6"; -import { SearchFilterPage, SearchFilters } from "./filters"; -import SearchBlurb from "./blurb"; -import { filterData } from "./filterUtils"; +import { SearchFilterPage, SearchFilters } from "./Filters"; +import SearchBlurb from "./Blurb"; +import { filterData } from "./filter-utils"; import { UNIVERSITY_GE } from "@/lib/constants"; import { analyticsEnum, logAnalytics } from "@/lib/analytics"; @@ -43,8 +43,8 @@ export type FilterValues = { format: boolean[]; enrollment: boolean[]; available: boolean[]; - start: string | undefined; - end: string | undefined; + start: string; + end: string; institution: string; min: number; max: number; @@ -70,15 +70,21 @@ const Search = () => { const [format, setFormat] = useState([true, true]); const [enrollment, setEnrollment] = useState([true]); const [available, setAvailable] = useState([true]); - const [start, setStart] = useState(new Date().toLocaleDateString("en-CA")); - const [end, setEnd] = useState(); + 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 [institution, setInstitution] = useState("Any Institution"); const [min, setMin] = useState(0); const [max, setMax] = useState(20); const [sort, setSort] = useState("Default Sort"); - const [courses, setCourses] = useState([]); + const [courses, setCourses] = useState(); const [filterValues, setFilterValues] = useState({ format: format, @@ -236,7 +242,7 @@ const Search = () => { }); fetchData(); - }, [university, ge]); + }, [university, ge, toast]); return ( <> diff --git a/components/search/searchResults.tsx b/components/search/SearchResults.tsx similarity index 99% rename from components/search/searchResults.tsx rename to components/search/SearchResults.tsx index bcd55c1..ce1509b 100644 --- a/components/search/searchResults.tsx +++ b/components/search/SearchResults.tsx @@ -1,7 +1,7 @@ import LazyLoad from "react-lazy-load"; import { FaUpRightFromSquare } from "react-icons/fa6"; -import { CollegeObject } from "./search"; -import Tags from "./tags"; +import { CollegeObject } from "./Search"; +import Tags from "./Tags"; interface SearchResultsProps { results: CollegeObject[]; diff --git a/components/search/tags.tsx b/components/search/Tags.tsx similarity index 100% rename from components/search/tags.tsx rename to components/search/Tags.tsx diff --git a/components/search/filterUtils.ts b/components/search/filter-utils.ts similarity index 88% rename from components/search/filterUtils.ts rename to components/search/filter-utils.ts index 8eb8d46..c67dbbc 100644 --- a/components/search/filterUtils.ts +++ b/components/search/filter-utils.ts @@ -1,9 +1,6 @@ -import { CollegeObject, FilterValues } from "./search"; +import { CollegeObject, FilterValues } from "./Search"; -export const startsAfter = ( - start: string | undefined, - result: CollegeObject, -) => { +export const startsAfter = (start: string, result: CollegeObject) => { if (start == undefined) return true; return ( @@ -13,8 +10,8 @@ export const startsAfter = ( ); }; -export const endsBefore = (end: string | undefined, result: CollegeObject) => { - if (end == undefined) return true; +export const endsBefore = (end: string, result: CollegeObject) => { + if (end == "") return true; return ( `2024-${result.endMonth.toString().padStart(2, "0")}-${result.endDay @@ -23,7 +20,14 @@ export const endsBefore = (end: string | undefined, result: CollegeObject) => { ); }; -export function filterData(data: CollegeObject[], filterValues: FilterValues) { +export function filterData( + data: CollegeObject[] | undefined, + filterValues: FilterValues, +) { + if (!data) { + return []; + } + const filteredResults = data.filter((result) => { const onlineFormat = (filterValues.format[0] && filterValues.format[1]) || diff --git a/components/search/queryDatabase.ts b/components/search/query-db.ts similarity index 100% rename from components/search/queryDatabase.ts rename to components/search/query-db.ts