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

Gql courses pins #774

Draft
wants to merge 2 commits into
base: gql
Choose a base branch
from
Draft

Gql courses pins #774

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
769c85c
added design to courses, added design for pins, created ClassCard and…
Feb 2, 2025
edf8c3a
lint
Feb 2, 2025
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
7 changes: 5 additions & 2 deletions apps/frontend/src/app/Catalog/Dashboard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,11 @@ export default function Dashboard({
<DropdownMenu.Content sideOffset={5}>
{terms
.filter(
({ year, semester }) =>
year !== term.year || semester !== term.semester
({ year, semester }, index) =>
index ===
terms.findIndex(
(term) => term.semester === semester && term.year === year
)
)
.map(({ year, semester }) => {
return (
Expand Down
1 change: 1 addition & 0 deletions apps/frontend/src/components/Carousel/Carousel.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
gap: 16px;
scrollbar-width: none;
scroll-behavior: smooth;
position: relative;
}
}

Expand Down
58 changes: 2 additions & 56 deletions apps/frontend/src/components/Carousel/Class/Class.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,6 @@
.root {
border: 1px solid var(--border-color);
border-radius: 8px;
.cont {
flex-shrink: 0;
background-color: var(--foreground-color);
padding: 16px;
display: flex;
width: 320px;
gap: 16px;
cursor: pointer;

&:hover .column .icon {
color: var(--heading-color);
}

.column {
display: flex;
flex-direction: column;
gap: 8px;
flex-shrink: 0;

.icon {
color: var(--paragraph-color);
transition: all 100ms ease-in-out;
}
}

.text {
flex-grow: 1;
font-size: 14px;
display: flex;
flex-direction: column;

.heading {
color: var(--heading-color);
margin-bottom: 8px;
line-height: 1;
font-weight: 660;
font-feature-settings:
"cv05" on,
"cv13" on,
"ss07" on,
"cv12" on,
"cv06" on;
}

.description {
color: var(--paragraph-color);
line-height: 1.5;
flex-grow: 1;
}

.row {
display: flex;
gap: 12px;
margin-top: 12px;
align-items: center;
}
}
}
}
118 changes: 65 additions & 53 deletions apps/frontend/src/components/Carousel/Class/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
import { useMemo } from "react";

import { ArrowRight } from "iconoir-react";

import AverageGrade from "@/components/AverageGrade";
import Capacity from "@/components/Capacity";
import Units from "@/components/Units";
import { useReadClass } from "@/hooks/api";
import ClassCard from "@/components/ClassCard";
import { Semester } from "@/lib/api";

import ClassDrawer from "../../ClassDrawer";
import styles from "./Class.module.scss";

interface ClassProps {
Expand All @@ -26,51 +18,71 @@ export default function Class({
courseNumber,
number,
}: ClassProps) {
const { data, loading } = useReadClass(
year as number,
semester as Semester,
subject as string,
courseNumber as string,
number as string
return (
<div className={styles.cont}>
<ClassCard
year={year}
semester={semester}
subject={subject}
courseNumber={courseNumber}
number={number}
/>
</div>
);
// return <div className={styles.root}>
// <ClassCard
// year={year}
// semester={semester}
// subject={subject}
// courseNumber={courseNumber}
// number={number}
// />
// </div>
// const { data, loading } = useReadClass(
// year as number,
// semester as Semester,
// subject as string,
// courseNumber as string,
// number as string
// );

const _class = useMemo(() => data, [data]);
// const _class = useMemo(() => data, [data]);

return loading || !_class ? (
<></>
) : (
<ClassDrawer
year={year}
semester={semester}
subject={subject}
courseNumber={courseNumber}
number={number}
>
<div className={styles.root}>
<div className={styles.text}>
<p className={styles.heading}>
{_class.subject} {_class.courseNumber} #{_class.number}
</p>
<p className={styles.description}>
{_class.title ?? _class.course.title}
</p>
<div className={styles.row}>
<AverageGrade gradeDistribution={_class.gradeDistribution} />
<Capacity
enrollCount={_class.primarySection.enrollCount}
enrollMax={_class.primarySection.enrollMax}
waitlistCount={_class.primarySection.waitlistCount}
waitlistMax={_class.primarySection.waitlistMax}
/>
<Units unitsMin={_class.unitsMin} unitsMax={_class.unitsMax} />
</div>
</div>
<div className={styles.column}>
<div className={styles.icon}>
<ArrowRight />
</div>
</div>
</div>
</ClassDrawer>
);
// return loading || !_class ? (
// <></>
// ) : (
// <ClassDrawer
// year={year}
// semester={semester}
// subject={subject}
// courseNumber={courseNumber}
// number={number}
// >
// <div className={styles.root}>
// <div className={styles.text}>
// <p className={styles.heading}>
// {_class.subject} {_class.courseNumber} #{_class.number}
// </p>
// <p className={styles.description}>
// {_class.title ?? _class.course.title}
// </p>
// <div className={styles.row}>
// <AverageGrade gradeDistribution={_class.gradeDistribution} />
// <Capacity
// enrollCount={_class.primarySection.enrollCount}
// enrollMax={_class.primarySection.enrollMax}
// waitlistCount={_class.primarySection.waitlistCount}
// waitlistMax={_class.primarySection.waitlistMax}
// />
// <Units unitsMin={_class.unitsMin} unitsMax={_class.unitsMax} />
// </div>
// </div>
// <div className={styles.column}>
// <div className={styles.icon}>
// <ArrowRight />
// </div>
// </div>
// </div>
// </ClassDrawer>
// );
}
3 changes: 2 additions & 1 deletion apps/frontend/src/components/Class/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
Bookmark,
BookmarkSolid,
CalendarPlus,
Expand,
OpenBook,
OpenNewWindow,
Pin,
Expand Down Expand Up @@ -342,7 +343,7 @@ export default function Class({
as={Link}
to={`/catalog/${_class.year}/${_class.semester}/${_class.subject}/${_class.courseNumber}/${_class.number}`}
>
<Xmark />
<Expand />
</IconButton>
</DialogClose>
</Tooltip>
Expand Down
59 changes: 59 additions & 0 deletions apps/frontend/src/components/ClassCard/ClassCard.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
.root {
border: 1px solid var(--border-color);
border-radius: 8px;
flex-shrink: 0;
background-color: var(--foreground-color);
position: relative;
padding: 16px;
display: flex;
gap: 16px;
align-items: flex-start;
cursor: pointer;
height: 100%;

&:hover .column .icon {
color: var(--heading-color);
}

.column {
display: flex;
flex-direction: column;
gap: 8px;
flex-shrink: 0;

.icon {
color: var(--paragraph-color);
transition: all 100ms ease-in-out;
}
}

.text {
flex-grow: 1;
font-size: 14px;

.heading {
color: var(--heading-color);
margin-bottom: 8px;
line-height: 1;
font-weight: 660;
font-feature-settings:
"cv05" on,
"cv13" on,
"ss07" on,
"cv12" on,
"cv06" on;
}

.description {
color: var(--paragraph-color);
line-height: 1.5;
}

.row {
display: flex;
gap: 12px;
margin-top: 12px;
align-items: center;
}
}
}
76 changes: 76 additions & 0 deletions apps/frontend/src/components/ClassCard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
import { useMemo } from "react";

import { ArrowRight } from "iconoir-react";

import AverageGrade from "@/components/AverageGrade";
import Capacity from "@/components/Capacity";
import Units from "@/components/Units";
import { useReadClass } from "@/hooks/api";
import { Semester } from "@/lib/api";

import ClassDrawer from "../ClassDrawer";
import styles from "./ClassCard.module.scss";

interface ClassProps {
year: number;
semester: Semester;
subject: string;
courseNumber: string;
number: string;
}

export default function ClassCard({
year,
semester,
subject,
courseNumber,
number,
}: ClassProps) {
const { data, loading } = useReadClass(
year as number,
semester as Semester,
subject as string,
courseNumber as string,
number as string
);

const _class = useMemo(() => data, [data]);

return loading || !_class ? (
<></>
) : (
<ClassDrawer
year={year}
semester={semester}
subject={subject}
courseNumber={courseNumber}
number={number}
>
<div className={styles.root}>
<div className={styles.text}>
<p className={styles.heading}>
{_class.subject} {_class.courseNumber} #{_class.number}
</p>
<p className={styles.description}>
{_class.title ?? _class.course.title}
</p>
<div className={styles.row}>
<AverageGrade gradeDistribution={_class.gradeDistribution} />
<Capacity
enrollCount={_class.primarySection.enrollCount}
enrollMax={_class.primarySection.enrollMax}
waitlistCount={_class.primarySection.waitlistCount}
waitlistMax={_class.primarySection.waitlistMax}
/>
<Units unitsMin={_class.unitsMin} unitsMax={_class.unitsMax} />
</div>
</div>
<div className={styles.column}>
<div className={styles.icon}>
<ArrowRight />
</div>
</div>
</div>
</ClassDrawer>
);
}
14 changes: 14 additions & 0 deletions apps/frontend/src/components/Course/Classes/Classes.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.root {
width: 60%;
margin: auto;
.row {
margin-top: 30px;
display: flex;
}
.term {
flex: 30%;
color: var(--label-color);
text-align: center;
line-height: 121px;
}
}
Loading