diff --git a/packages/api-v2/src/emailConfirmation/emailConfirmation.controller.ts b/packages/api-v2/src/emailConfirmation/emailConfirmation.controller.ts index 38012a3cb..6486c7c2a 100644 --- a/packages/api-v2/src/emailConfirmation/emailConfirmation.controller.ts +++ b/packages/api-v2/src/emailConfirmation/emailConfirmation.controller.ts @@ -34,8 +34,9 @@ export class EmailConfirmationController { if (email instanceof Error) { throw new BadRequestException(); } - const updateResult = - await this.emailConfirmationService.confirmEmail(email); + const updateResult = await this.emailConfirmationService.confirmEmail( + email + ); if (updateResult instanceof EmailAlreadyConfirmed) { throw new BadRequestException("Email is already confirmed"); } diff --git a/packages/frontend-v2/components/AddCourseModal/AddCourseButton.tsx b/packages/frontend-v2/components/AddCourseModal/AddCourseButton.tsx index 918e121f9..61af22169 100644 --- a/packages/frontend-v2/components/AddCourseModal/AddCourseButton.tsx +++ b/packages/frontend-v2/components/AddCourseModal/AddCourseButton.tsx @@ -10,14 +10,12 @@ export const AddCourseButton: React.FC = ({ ...buttonProps }) => { const hoverStyle = { - backgroundColor: "neutral.700", - borderColor: "primary.blue.dark.300", + borderColor: "neutral.300", }; const activeStyle = { - backgroundColor: "neutral.900", - borderColor: "primary.blue.dark.300", - transform: "scale(0.96)", + backgroundColor: "neutral.200", + borderColor: "neutral.200", }; return ( @@ -27,8 +25,10 @@ export const AddCourseButton: React.FC = ({ size="md" margin="0" borderRadius="10px" - borderColor="neutral.main" - backgroundColor="neutral.main" + border="1px" + borderColor="neutral.50" + backgroundColor="neutral.50" + boxShadow="sm" _hover={hoverStyle} _active={activeStyle} color="primary.blue.light.main" diff --git a/packages/frontend-v2/components/AddCourseModal/SearchCoursesInput.tsx b/packages/frontend-v2/components/AddCourseModal/SearchCoursesInput.tsx index cc2bb528c..8a4b211b6 100644 --- a/packages/frontend-v2/components/AddCourseModal/SearchCoursesInput.tsx +++ b/packages/frontend-v2/components/AddCourseModal/SearchCoursesInput.tsx @@ -36,7 +36,7 @@ export const SearchCoursesInput: React.FC = ({ borderRadius={10} fontSize="sm" color="primary.blue.light.main" - backgroundColor="neutral.main" + backgroundColor="neutral.100" placeholder="SEARCH BY NAME, CRN, ETC." /> diff --git a/packages/frontend-v2/components/AddCourseModal/SearchResult.tsx b/packages/frontend-v2/components/AddCourseModal/SearchResult.tsx index ae49a62f4..476e0d3c7 100644 --- a/packages/frontend-v2/components/AddCourseModal/SearchResult.tsx +++ b/packages/frontend-v2/components/AddCourseModal/SearchResult.tsx @@ -33,7 +33,7 @@ export const SearchResult: React.FC = ({ {searchResult.name} - + {getCourseDisplayString(searchResult)} diff --git a/packages/frontend-v2/components/AddCourseModal/SelectedCourse.tsx b/packages/frontend-v2/components/AddCourseModal/SelectedCourse.tsx index f95f6e8e7..dae03ab5f 100644 --- a/packages/frontend-v2/components/AddCourseModal/SelectedCourse.tsx +++ b/packages/frontend-v2/components/AddCourseModal/SelectedCourse.tsx @@ -16,7 +16,7 @@ export const SelectedCourse: React.FC = ({ diff --git a/packages/frontend-v2/components/Authentication/AuthPageLayout.tsx b/packages/frontend-v2/components/Authentication/AuthPageLayout.tsx index f5c36d9e1..fe9af5b2a 100644 --- a/packages/frontend-v2/components/Authentication/AuthPageLayout.tsx +++ b/packages/frontend-v2/components/Authentication/AuthPageLayout.tsx @@ -13,11 +13,7 @@ export const AuthenticationPageLayout: React.FC< {form} - + GraduateNU app snippet = ({ }) => { return ( - ); -}; diff --git a/packages/frontend-v2/components/Button/index.ts b/packages/frontend-v2/components/Button/index.ts index fcfe0671e..bd82ab49e 100644 --- a/packages/frontend-v2/components/Button/index.ts +++ b/packages/frontend-v2/components/Button/index.ts @@ -1,2 +1 @@ export * from "./BlueButton"; -export * from "./GrayButton"; diff --git a/packages/frontend-v2/components/Form/Input.tsx b/packages/frontend-v2/components/Form/Input.tsx index 011e8e031..8ee19e614 100644 --- a/packages/frontend-v2/components/Form/Input.tsx +++ b/packages/frontend-v2/components/Form/Input.tsx @@ -23,16 +23,16 @@ export const GraduateInput = forwardRef( ({ error, helpMessage, formLabel, ...rest }, ref) => ( {formLabel && ( - + {formLabel} )} ( color="primary.blue.dark.main" size="md" fontWeight="medium" - mb="2xs" + mb="1px" > {label} diff --git a/packages/frontend-v2/components/Form/Select.tsx b/packages/frontend-v2/components/Form/Select.tsx index c14d507a8..d255feb0c 100644 --- a/packages/frontend-v2/components/Form/Select.tsx +++ b/packages/frontend-v2/components/Form/Select.tsx @@ -80,7 +80,7 @@ export const PlanSelect: React.FC = ({ color="primary.blue.dark.main" size="md" fontWeight="medium" - mb="2xs" + mb="4xs" > {label} diff --git a/packages/frontend-v2/components/Header/AccountOverview.tsx b/packages/frontend-v2/components/Header/AccountOverview.tsx index 64b227d92..a4f6c7787 100644 --- a/packages/frontend-v2/components/Header/AccountOverview.tsx +++ b/packages/frontend-v2/components/Header/AccountOverview.tsx @@ -130,7 +130,7 @@ export const AccountOverview: React.FC = ({ /> - + Email = ({ type="email" size="md" variant="outline" - borderColor="neutral.main" + borderColor="neutral.100" borderWidth="2px" borderRadius="md" /> diff --git a/packages/frontend-v2/components/Plan/AddPlanModal.tsx b/packages/frontend-v2/components/Plan/AddPlanModal.tsx index 0bf94a8c2..881973378 100644 --- a/packages/frontend-v2/components/Plan/AddPlanModal.tsx +++ b/packages/frontend-v2/components/Plan/AddPlanModal.tsx @@ -144,6 +144,13 @@ export const AddPlanModal: React.FC = ({ })} /> + setIsNoMajorSelected(!isNoMajorSelected)} + /> = ({ > No Major - setIsNoMajorSelected(!isNoMajorSelected)} - /> {!isNoMajorSelected && ( diff --git a/packages/frontend-v2/components/Plan/AddYearButton.tsx b/packages/frontend-v2/components/Plan/AddYearButton.tsx index 8afde92ac..b8ec65274 100644 --- a/packages/frontend-v2/components/Plan/AddYearButton.tsx +++ b/packages/frontend-v2/components/Plan/AddYearButton.tsx @@ -1,6 +1,7 @@ import { PlanModel } from "@graduate/common"; import { addEmptyDndYearToPlan } from "../../utils"; import { BlueButton } from "../Button"; +import { AddIcon } from "@chakra-ui/icons"; interface AddYearButton { plan: PlanModel; @@ -15,5 +16,9 @@ export const AddYearButton: React.FC = ({ const updatedPlan = addEmptyDndYearToPlan(plan); mutateStudentWithUpdatedPlan(updatedPlan); }; - return Add Year; + return ( + }> + Add Year + + ); }; diff --git a/packages/frontend-v2/components/Plan/DeletePlanModal.tsx b/packages/frontend-v2/components/Plan/DeletePlanModal.tsx index c731503d7..5467d941d 100644 --- a/packages/frontend-v2/components/Plan/DeletePlanModal.tsx +++ b/packages/frontend-v2/components/Plan/DeletePlanModal.tsx @@ -54,6 +54,7 @@ export const DeletePlanModal: React.FC = ({ icon={} aria-label="Delete plan" variant="outline" + border="1px" borderColor="primary.red.main" colorScheme="primary.red" color="primary.red.main" diff --git a/packages/frontend-v2/components/Plan/EditPlanModal.tsx b/packages/frontend-v2/components/Plan/EditPlanModal.tsx index 6ad732175..a15dd5104 100644 --- a/packages/frontend-v2/components/Plan/EditPlanModal.tsx +++ b/packages/frontend-v2/components/Plan/EditPlanModal.tsx @@ -178,6 +178,13 @@ export const EditPlanModal: React.FC = ({ plan }) => { })} /> + setIsNoMajorSelected(!isNoMajorSelected)} + /> = ({ plan }) => { > No Major - setIsNoMajorSelected(!isNoMajorSelected)} - /> {!isNoMajorSelected && ( diff --git a/packages/frontend-v2/components/Plan/ReqErrorModal.tsx b/packages/frontend-v2/components/Plan/ReqErrorModal.tsx index 81aec83fa..96ed299ba 100644 --- a/packages/frontend-v2/components/Plan/ReqErrorModal.tsx +++ b/packages/frontend-v2/components/Plan/ReqErrorModal.tsx @@ -52,7 +52,7 @@ export const ReqErrorModal: React.FC = ({ }} _active={{ background: "primary.red.900" }} onClick={() => { - setHovered(false) + setHovered(false); onOpen(); }} > @@ -70,7 +70,7 @@ export const ReqErrorModal: React.FC = ({ = ({ diff --git a/packages/frontend-v2/components/Plan/ScheduleTerm.tsx b/packages/frontend-v2/components/Plan/ScheduleTerm.tsx index 119e5b35e..8e11ab213 100644 --- a/packages/frontend-v2/components/Plan/ScheduleTerm.tsx +++ b/packages/frontend-v2/components/Plan/ScheduleTerm.tsx @@ -60,7 +60,7 @@ export const ScheduleTerm: React.FC = ({ = ({ const backgroundColor = isExpanded ? "primary.blue.dark" : "primary.blue.light"; - return ( = ({ _hover={{ backgroundColor: "primary.blue.light.600", }} + _active={{ + bg: "primary.blue.dark.700", + }} transition="background-color 0.15s ease" paddingTop="sm" paddingBottom="sm" @@ -180,8 +182,8 @@ const YearHeader: React.FC = ({ variant="ghost" color="primary.red.main" icon={} - _hover={{ bg: 'none', cursor: 'auto' }} - _active={{ bg: `${backgroundColor}.900` }} + _hover={{ bg: "none", cursor: "auto" }} + _active={{ bg: "none" }} onClick={(e) => { if (isExpanded) { e.stopPropagation(); @@ -199,7 +201,7 @@ const YearHeader: React.FC = ({ marginLeft="auto" marginRight="sm" _hover={{ bg: "white", color: "primary.red.main" }} - _active={{ bg: `${backgroundColor}.900` }} + _active={{ bg: "primary.blue.light.900" }} onClick={(e) => { // important to prevent the click from propogating upwards and triggering the toggle e.stopPropagation(); diff --git a/packages/frontend-v2/components/Plan/TransferCourses.tsx b/packages/frontend-v2/components/Plan/TransferCourses.tsx index c75b2ea92..edf293fe2 100644 --- a/packages/frontend-v2/components/Plan/TransferCourses.tsx +++ b/packages/frontend-v2/components/Plan/TransferCourses.tsx @@ -71,7 +71,7 @@ export const TransferCourses: React.FC = ({ }; return ( - + = ({ removeCourse={() => removeTransferCourse(course)} /> ))} - + = ({ = ({ cursor="pointer" userSelect="none" borderBottomWidth={isExpanded ? "2px" : "0px"} - borderBottomColor="neutral.900" + borderBottomColor="neutral.200" paddingX="md" > diff --git a/packages/frontend-v2/components/Sidebar/SectionRequirement.tsx b/packages/frontend-v2/components/Sidebar/SectionRequirement.tsx index e546477ed..75693f490 100644 --- a/packages/frontend-v2/components/Sidebar/SectionRequirement.tsx +++ b/packages/frontend-v2/components/Sidebar/SectionRequirement.tsx @@ -50,8 +50,8 @@ const SectionRequirement: React.FC = ({ const renderXOM = (requirement: IXofManyCourse) => { return (
- - Complete {requirement.numCreditsMin} credits from the following + + Complete {requirement.numCreditsMin} credits from the following: {requirement.courses.map((course, index) => ( = ({ const renderAND = (requirement: IAndCourse2) => { return (
- Complete all of the following + + Complete all of the following: + {requirement.courses.map((course, index) => ( = ({ const renderOR = (requirement: IOrCourse2) => { return (
- Complete one of the following + + Complete one of the following: + {requirement.courses.map((course, index) => ( = ({ const renderRange = (requirement: ICourseRange2) => { return ( - + Complete any course in range {requirement.subject} {requirement.idRangeStart} to {requirement.subject} {requirement.idRangeEnd}{" "} diff --git a/packages/frontend-v2/components/Sidebar/Sidebar.tsx b/packages/frontend-v2/components/Sidebar/Sidebar.tsx index 62f00113b..42048154f 100644 --- a/packages/frontend-v2/components/Sidebar/Sidebar.tsx +++ b/packages/frontend-v2/components/Sidebar/Sidebar.tsx @@ -325,7 +325,12 @@ const SidebarContainer: React.FC> = ({ children, }) => { return ( - + diff --git a/packages/frontend-v2/components/Sidebar/SidebarSection.tsx b/packages/frontend-v2/components/Sidebar/SidebarSection.tsx index 2eafef705..33b63ffd7 100644 --- a/packages/frontend-v2/components/Sidebar/SidebarSection.tsx +++ b/packages/frontend-v2/components/Sidebar/SidebarSection.tsx @@ -49,7 +49,7 @@ const SidebarSection: React.FC = ({ return ( @@ -65,10 +65,10 @@ const SidebarSection: React.FC = ({ py="md" px="md" margin="0" - backgroundColor="neutral.main" + backgroundColor="neutral.50" transition="background-color 0.25s ease" _hover={{ - backgroundColor: "neutral.900", + backgroundColor: "neutral.100", }} _active={{ backgroundColor: "neutral.200", @@ -160,7 +160,9 @@ const SidebarSection: React.FC = ({ @@ -173,8 +175,8 @@ const SidebarSection: React.FC = ({ {opened && !loading && ( <> {section.minRequirementCount < section.requirements.length && ( - - Complete {section.minRequirementCount} of the following + + Complete {section.minRequirementCount} of the following: )} {section.requirements.map((requirement, index) => ( diff --git a/packages/frontend-v2/pages/home.tsx b/packages/frontend-v2/pages/home.tsx index edfe71ec0..9b66fa0a9 100644 --- a/packages/frontend-v2/pages/home.tsx +++ b/packages/frontend-v2/pages/home.tsx @@ -101,7 +101,9 @@ const HomePage: NextPage = () => { if (student) { const plan = student.plans.find((plan) => plan.id === selectedPlanId); if (plan) { - setPreReqWarnings(getPreReqWarnings(plan.schedule, student.coursesTransfered)); + setPreReqWarnings( + getPreReqWarnings(plan.schedule, student.coursesTransfered) + ); setCoReqWarnings(getCoReqWarnings(plan.schedule)); } } @@ -170,7 +172,9 @@ const HomePage: NextPage = () => { return; } - setPreReqWarnings(getPreReqWarnings(updatedPlan.schedule, student.coursesTransfered)); + setPreReqWarnings( + getPreReqWarnings(updatedPlan.schedule, student.coursesTransfered) + ); setCoReqWarnings(getCoReqWarnings(updatedPlan.schedule)); mutateStudentWithUpdatedPlan(updatedPlan); }; @@ -222,7 +226,7 @@ const HomePage: NextPage = () => { > { mutateStudentWithUpdatedPlan={mutateStudentWithUpdatedPlan} setIsRemove={setIsRemove} /> - + )} { color="primary.red.main" fontWeight="normal" lineHeight="1" - mb="0" + mb="-12px" > Graduate diff --git a/packages/frontend-v2/utils/plan/preAndCoReqCheck.ts b/packages/frontend-v2/utils/plan/preAndCoReqCheck.ts index bcbb7a0bf..c1695d30c 100644 --- a/packages/frontend-v2/utils/plan/preAndCoReqCheck.ts +++ b/packages/frontend-v2/utils/plan/preAndCoReqCheck.ts @@ -14,7 +14,7 @@ import { } from "@graduate/common"; export const getCoReqWarnings = ( - schedule: Schedule2, + schedule: Schedule2 ): CoReqWarnings => { const errors: CoReqWarnings = { type: "coreq", @@ -30,7 +30,7 @@ export const getCoReqWarnings = ( }; export const getCoReqWarningsSem = ( - term: ScheduleTerm2, + term: ScheduleTerm2 ): TermError => { const seen: Set = new Set(); const coReqErrors: TermError = {}; @@ -62,8 +62,8 @@ export const getPreReqWarnings = ( spring: getPreReqWarningSem(year.spring, seen), summer1: getPreReqWarningSem(year.summer1, seen), summer2: getPreReqWarningSem(year.summer2, seen), - })) - } + })), + }; return preReqErrors; }; @@ -135,8 +135,6 @@ const isOrCourse = (course: INEUReq): course is INEUOrReq => { return (course as INEUOrReq).type === "or"; }; -const isError = ( - error: INEUReqError | undefined -): error is INEUReqError => { +const isError = (error: INEUReqError | undefined): error is INEUReqError => { return !!error; }; diff --git a/packages/frontend-v2/utils/theme/index.ts b/packages/frontend-v2/utils/theme/index.ts index eabe0159c..892027c04 100644 --- a/packages/frontend-v2/utils/theme/index.ts +++ b/packages/frontend-v2/utils/theme/index.ts @@ -48,17 +48,11 @@ const colors = { }, }, neutral: { - main: "#e7ebf1", - 50: "#eff2f6", - 100: "#d2d7de", - 200: "#b3bcc8", - 300: "#f1f5fa", + 50: "#f4f6f9", + 100: "#e7ebf1", + 200: "#d2d8e3", + 300: "#b4bbc8", 400: "#7586a0", - 500: "#e7ebf1", - 600: "#485569", - 700: "#e2e6ec", - 800: "#1f242c", - 900: "#d2d8e2", }, states: { success: {