created reusable button component, created course info header component, created utility type for Colors, removed typescript-css-modules plugin, and added a threshold to the infinite scroll hook

This commit is contained in:
Sriram Hariharan
2023-03-06 22:45:34 -06:00
parent 950c4a573a
commit ebeb7d692b
23 changed files with 351 additions and 687 deletions

View File

@@ -0,0 +1,23 @@
@import 'src/views/styles/base.module.scss';
.header {
height: auto;
color: white;
padding: 12px;
margin: 50px 20px;
align-items: center;
justify-content: center;
.title {
display: flex;
align-items: center;
justify-content: center;
.uniqueId {
margin-left: 8px;
}
}
.instructors {
margin-top: 8px;
}
}

View File

@@ -0,0 +1,75 @@
import React from 'react';
import { bMessenger } from 'src/shared/messages';
import { Course } from 'src/shared/types/Course';
import Card from 'src/views/components/common/Card/Card';
import Link from 'src/views/components/common/Link/Link';
import Text from 'src/views/components/common/Text/Text';
import styles from './CourseInfoHeader.module.scss';
type Props = {
course: Course;
};
/**
* This component displays the header of the course info popup.
* It displays the course name, unique id, instructors, and schedule, all formatted nicely.
*/
export default function CourseInfoHeader({ course }: Props) {
const getBuildingUrl = (building?: string): string | undefined => {
if (!building) return undefined;
return `https://utdirect.utexas.edu/apps/campus/buildings/nlogon/maps/UTM/${building}/`;
};
return (
<Card className={styles.header}>
<Text className={styles.title} size='large' weight='bold' color='black'>
{course.courseName} ({course.department} {course.number})
<Link
span
url={course.url}
className={styles.uniqueId}
size='medium'
weight='semi_bold'
color='burnt_orange'
>
#{course.uniqueId}
</Link>
</Text>
<Text size='medium' className={styles.instructors}>
{course.getInstructorString({
prefix: 'with ',
format: 'first_last',
})}
</Text>
{course.schedule.meetings.map(meeting => (
<Text size='medium'>
<Text span size='medium' weight='bold' color='black'>
{meeting.getDaysString({
format: 'long',
separator: 'short',
})}
</Text>
{' at '}
<Text span size='medium'>
{meeting.getTimeString({
separator: 'to',
capitalize: true,
})}
</Text>
{' in '}
<Link
span
size='medium'
weight='normal'
color='bluebonnet'
url={getBuildingUrl(meeting.location?.building)}
disabled={!meeting.location?.building}
>
{meeting.location?.building ?? 'TBA'}
</Link>
</Text>
))}
</Card>
);
}

View File

@@ -0,0 +1,11 @@
.popup {
border-radius: 12px;
position: relative;
.close {
position: absolute;
top: 12px;
right: 12px;
cursor: pointer;
}
}

View File

@@ -0,0 +1,27 @@
import React from 'react';
import { Course } from 'src/shared/types/Course';
import Card from '../../common/Card/Card';
import Icon from '../../common/Icon/Icon';
import Link from '../../common/Link/Link';
import Popup from '../../common/Popup/Popup';
import Text from '../../common/Text/Text';
import CourseInfoHeader from './CourseInfoHeader/CourseInfoHeader';
import styles from './CourseInfoPopup.module.scss';
interface Props {
course: Course;
onClose: () => void;
}
/**
* The popup that appears when the user clicks on a course for more details.
*/
export default function CourseInfoPopup({ course, onClose }: Props) {
console.log(course);
return (
<Popup className={styles.popup} overlay onClose={onClose}>
<Icon className={styles.close} size='large' name='close' onClick={onClose} />
<CourseInfoHeader course={course} />
</Popup>
);
}

View File

@@ -1,34 +0,0 @@
.popup {
border-radius: 12px;
position: relative;
.close {
position: absolute;
top: 12px;
right: 12px;
cursor: pointer;
}
.body {
height: auto;
color: white;
padding: 12px;
margin: 50px 20px;
align-items: center;
justify-content: center;
.title {
display: flex;
align-items: center;
justify-content: center;
.uniqueId {
margin-left: 8px;
}
}
.instructors {
margin-top: 8px;
}
}
}

View File

@@ -1,68 +0,0 @@
import React from 'react';
import { Course } from 'src/shared/types/Course';
import Card from '../../common/Card/Card';
import Icon from '../../common/Icon/Icon';
import Link from '../../common/Link/Link';
import Popup from '../../common/Popup/Popup';
import Text from '../../common/Text/Text';
import styles from './CoursePopup.module.scss';
interface Props {
course: Course;
onClose: () => void;
}
/**
* The popup that appears when the user clicks on a course for more details.
*/
export default function CoursePopup({ course, onClose }: Props) {
console.log(course);
return (
<Popup className={styles.popup} overlay onClose={onClose}>
<Icon className={styles.close} size='large' name='close' onClick={onClose} />
<Card className={styles.body}>
<Text className={styles.title} size='large' weight='bold' color='black'>
{course.courseName} ({course.department} {course.number})
<Link
span
url={course.url}
className={styles.uniqueId}
size='medium'
weight='semi_bold'
color='burnt_orange'
>
#{course.uniqueId}
</Link>
</Text>
<Text size='medium' className={styles.instructors}>
{course.getInstructorString({
prefix: 'with ',
format: 'first_last',
})}
</Text>
{course.schedule.meetings.map(meeting => (
<Text size='medium'>
<Text span size='medium' weight='bold' color='black'>
{meeting.getDaysString({
format: 'long',
separator: 'short',
})}
</Text>
{' at '}
<Text span size='medium'>
{meeting.getTimeString({
separator: 'to',
capitalize: true,
})}
</Text>
{' in '}
<Link span size='medium' weight='bold' color='bluebonnet'>
{meeting.location?.building}
</Link>
</Text>
))}
</Card>
</Popup>
);
}

View File

@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom';
import { Course, ScrapedRow } from 'src/shared/types/Course';
import { SiteSupport } from 'src/views/lib/getSiteSupport';
import { Button } from '../../common/Button/Button';
import Icon from '../../common/Icon/Icon';
import styles from './TableRow.module.scss';
interface Props {
@@ -29,11 +30,16 @@ export default function TableRow({ support, course, element, isSelected, onClick
useEffect(() => {
element.classList[isSelected ? 'add' : 'remove'](styles.selectedRow);
}, [course, isSelected]);
}, [course, isSelected, element.classList]);
if (!container) {
return null;
}
return ReactDOM.createPortal(<Button onClick={onClick}>Plus</Button>, container);
return ReactDOM.createPortal(
<Button onClick={onClick} type='secondary'>
<Icon name='bar_chart' color='white' size='medium' />
</Button>,
container
);
}