-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #89 from SJSUCSClub/88-improve-consolidate-merge-c…
…onflicts-across-prs [Improve] Consolidate merge conflicts across prs
- Loading branch information
Showing
35 changed files
with
1,220 additions
and
303 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,257 @@ | ||
| import { Btn, Card, LinkBtn } from '@/components/atoms'; | ||
| import { CompareItem, FilterGroup, SearchBar } from '@/components/molecules'; | ||
| import { BarChart } from '@/components/organisms'; | ||
| import { | ||
| CoursesSearchResponse, | ||
| ProfessorsIDReviewStatsResponse, | ||
| ProfessorsSearchResponse, | ||
| } from '@/types'; | ||
| import fetcher from '@/utils/fetcher'; | ||
| import roundToTenth from '@/utils/round-to-tenth'; | ||
| import { EllipsisVerticalIcon, XMarkIcon } from '@heroicons/react/24/solid'; | ||
|
|
||
| export default async function Page({ | ||
| searchParams, | ||
| }: { | ||
| searchParams: { | ||
| compareQuery: string; | ||
| courses: string | string[]; | ||
| professors: string | string[]; | ||
| }; | ||
| }) { | ||
| const requestParams = new URLSearchParams(); | ||
| searchParams.compareQuery && | ||
| requestParams.append('query', searchParams.compareQuery); | ||
| requestParams.append('limit', '5'); | ||
| const { items: professors } = (await fetcher( | ||
| process.env.BASE_API_URL + | ||
| `/core/professors/search?${requestParams.toString()}`, | ||
| )) as ProfessorsSearchResponse; | ||
| const { items: courses } = (await fetcher( | ||
| process.env.BASE_API_URL + | ||
| `/core/courses/search?${requestParams.toString()}`, | ||
| )) as CoursesSearchResponse; | ||
| const selectedProfessors = Array.isArray(searchParams.professors) | ||
| ? searchParams.professors | ||
| : searchParams.professors | ||
| ? [searchParams.professors] | ||
| : []; | ||
| const selectedCourses = Array.isArray(searchParams.courses) | ||
| ? searchParams.courses | ||
| : searchParams.courses | ||
| ? [searchParams.courses] | ||
| : []; | ||
| const professorsValues = Array.from( | ||
| new Set([ | ||
| ...selectedProfessors, | ||
| ...(professors.map((professor) => professor.id) ?? []), | ||
| ]), | ||
| ); | ||
| const coursesValues = Array.from( | ||
| new Set([ | ||
| ...selectedCourses, | ||
| ...(courses.map( | ||
| (course) => `${course.department}-${course.course_number}`, | ||
| ) ?? []), | ||
| ]), | ||
| ); | ||
| const professorStats = await Promise.all( | ||
| selectedProfessors.map(async (professor) => { | ||
| const { | ||
| total_reviews, | ||
| avg_rating, | ||
| avg_grade, | ||
| take_again_percent, | ||
| rating_distribution, | ||
| grade_distribution, | ||
| } = (await fetcher( | ||
| process.env.BASE_API_URL + | ||
| `/core/professors/${professor}/reviews-stats`, | ||
| )) as ProfessorsIDReviewStatsResponse; | ||
| const review = roundToTenth(avg_rating ?? 0); | ||
| const takeAgainPercent = roundToTenth(take_again_percent ?? 0); | ||
| return { | ||
| id: professor, | ||
| totalReviews: total_reviews, | ||
| review, | ||
| avgGrade: avg_grade, | ||
| takeAgainPercent, | ||
| ratingDistribution: rating_distribution, | ||
| gradeDistribution: grade_distribution, | ||
| }; | ||
| }), | ||
| ); | ||
| const courseStats = await Promise.all( | ||
| selectedCourses.map(async (course) => { | ||
| const { | ||
| total_reviews, | ||
| avg_rating, | ||
| avg_grade, | ||
| take_again_percent, | ||
| rating_distribution, | ||
| grade_distribution, | ||
| } = (await fetcher( | ||
| process.env.BASE_API_URL + `/core/courses/${course}/reviews-stats`, | ||
| )) as ProfessorsIDReviewStatsResponse; | ||
| const review = roundToTenth(avg_rating ?? 0); | ||
| const takeAgainPercent = roundToTenth(take_again_percent ?? 0); | ||
| return { | ||
| id: course, | ||
| totalReviews: total_reviews, | ||
| review, | ||
| avgGrade: avg_grade, | ||
| takeAgainPercent, | ||
| ratingDistribution: rating_distribution, | ||
| gradeDistribution: grade_distribution, | ||
| }; | ||
| }), | ||
| ); | ||
|
|
||
| return ( | ||
| <main> | ||
| <div className="mx-auto flex w-full max-w-content-width px-md py-lg"> | ||
| <p className="flex-1">Grade/Rating Analysis</p> | ||
| <Btn | ||
| popoverTarget="filters" | ||
| variant="tertiary" | ||
| className="rounded-sm p-0 lg:hidden" | ||
| > | ||
| <EllipsisVerticalIcon width={24} height={24} /> | ||
| </Btn> | ||
| </div> | ||
| <section className="mx-auto flex w-full max-w-content-width items-stretch px-md"> | ||
| <div className="lg:w-[250px] lg:pr-md"> | ||
| <div | ||
| id="filters" | ||
| popover="auto" | ||
| className="top-0 max-h-[100dvh] min-h-[50dvh] w-full overflow-y-auto bg-page pb-lg pt-lg max-lg:h-[100dvh] max-lg:px-md lg:sticky lg:flex lg:flex-col lg:gap-sm" | ||
| > | ||
| <div className="flex pb-md"> | ||
| <p className="flex-1">Filters</p> | ||
| <Btn | ||
| popoverTarget="filters" | ||
| variant="tertiary" | ||
| className="rounded-sm p-0 lg:hidden" | ||
| > | ||
| <XMarkIcon width={24} height={24} /> | ||
| </Btn> | ||
| </div> | ||
|
|
||
| <div className="pb-lg pr-md"> | ||
| <SearchBar param="compareQuery" shouldResetPageOnChange={false} /> | ||
| </div> | ||
| <p className="pb-sm text-small-lg">Professors</p> | ||
| {professorsValues.length ? ( | ||
| <FilterGroup | ||
| variant="checkbox" | ||
| param="professors" | ||
| values={professorsValues} | ||
| className="pb-lg" | ||
| /> | ||
| ) : ( | ||
| <p className="text-neutral">No professors found</p> | ||
| )} | ||
| <p className="pb-sm text-small-lg">Courses</p> | ||
| {coursesValues.length ? ( | ||
| <FilterGroup | ||
| variant="checkbox" | ||
| param="courses" | ||
| values={coursesValues} | ||
| className="pb-lg" | ||
| /> | ||
| ) : ( | ||
| <p className="text-neutral">No courses found</p> | ||
| )} | ||
| <LinkBtn | ||
| variant="primary" | ||
| className="flex justify-center bg-background text-primary" | ||
| href="/compare" | ||
| > | ||
| Reset | ||
| </LinkBtn> | ||
| </div> | ||
| </div> | ||
| <div className="flex min-w-0 flex-1 flex-col items-stretch gap-md pb-lg pt-lg"> | ||
| {professorStats.length + courseStats.length ? ( | ||
| <div className="flex gap-sm overflow-x-auto"> | ||
| {professorStats.map((professor) => ( | ||
| <CompareItem | ||
| key={professor.id} | ||
| link={`/professors/${professor.id}`} | ||
| review={professor.review} | ||
| takeAgainPercent={professor.takeAgainPercent} | ||
| avgGrade={professor.avgGrade} | ||
| totalReviews={professor.totalReviews} | ||
| id={professor.id} | ||
| /> | ||
| ))} | ||
| {courseStats.map((course) => ( | ||
| <CompareItem | ||
| key={course.id} | ||
| link={`/courses/${course.id}`} | ||
| review={course.review} | ||
| takeAgainPercent={course.takeAgainPercent} | ||
| avgGrade={course.avgGrade} | ||
| totalReviews={course.totalReviews} | ||
| id={course.id} | ||
| /> | ||
| ))} | ||
| </div> | ||
| ) : ( | ||
| <p className="w-full p-lg text-center italic text-neutral"> | ||
| No items selected. | ||
| <br /> | ||
| Search and select professors/courses to compare. | ||
| </p> | ||
| )} | ||
| <Card className="p-lg max-lg:w-full lg:flex-1"> | ||
| <p className="pb-sm font-bold">Rating Distribution</p> | ||
| <BarChart | ||
| series={[ | ||
| ...(professorStats.map((professor) => ({ | ||
| name: professor.id, | ||
| data: professor.ratingDistribution.reverse(), | ||
| })) ?? []), | ||
| ...(courseStats.map((course) => ({ | ||
| name: course.id, | ||
| data: course.ratingDistribution.reverse(), | ||
| })) ?? []), | ||
| ]} | ||
| categories={[5, 4, 3, 2, 1]} | ||
| /> | ||
| </Card> | ||
| <Card className="p-lg max-lg:w-full lg:flex-1"> | ||
| <p className="pb-sm font-bold">Grade Distribution</p> | ||
| <BarChart | ||
| series={[ | ||
| ...(professorStats.map((professor) => ({ | ||
| name: professor.id, | ||
| data: professor.gradeDistribution, | ||
| })) ?? []), | ||
| ...(courseStats.map((course) => ({ | ||
| name: course.id, | ||
| data: course.gradeDistribution, | ||
| })) ?? []), | ||
| ]} | ||
| categories={[ | ||
| 'A+', | ||
| 'A', | ||
| 'A-', | ||
| 'B+', | ||
| 'B', | ||
| 'B-', | ||
| 'C+', | ||
| 'C', | ||
| 'C-', | ||
| 'D+', | ||
| 'D', | ||
| 'D-', | ||
| 'F', | ||
| ]} | ||
| /> | ||
| </Card> | ||
| </div> | ||
| </section> | ||
| </main> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.