diff --git a/public/index.css b/public/index.css index ad31af57d..66531357c 100644 --- a/public/index.css +++ b/public/index.css @@ -163,6 +163,7 @@ main { color: var(--gray); font-weight: normal; font-size: 1rem; + max-width: 30vw; } #intro img, #plan img { @@ -220,7 +221,11 @@ button { #intro h1 { font-size: 2.5rem; - max-width: 300px; + max-width: 400px; + } + + #intro h3 { + max-width: 400px; } #intro > div { @@ -376,6 +381,10 @@ section:nth-child(odd) { margin-top: 3vh; } +.team:not(.active) { + display: none; +} + .hidden { display: none; } diff --git a/public/index.html b/public/index.html index da172ed7e..2c6ede2f7 100644 --- a/public/index.html +++ b/public/index.html @@ -24,7 +24,7 @@

Navigate your degree with ease

Launch Your Degree Plan with Nebula Planner

-

Blast off your academic journey to the moon with Nebula
Labs Planner - the ultimate tool for customizing your
four-year degree.

+

Blast off your academic journey to the moon with Nebula Labs Planner - the ultimate tool for customizing your four-year degree.

@@ -69,35 +69,6 @@

Save Time

-

Meet the team

  • Design
  • @@ -236,5 +207,36 @@

    planner.


    Copyright © 2023. All rights reserved

    + diff --git a/src/components/home/Home.tsx b/src/components/home/Home.tsx index 267f6d6f2..a9fc0966b 100644 --- a/src/components/home/Home.tsx +++ b/src/components/home/Home.tsx @@ -15,13 +15,19 @@ import { useRouter } from 'next/router'; */ export default function PlansPage(): JSX.Element { const [openTemplateModal, setOpenTemplateModal] = useState(false); - const userPlanQuery = trpc.plan.getUserPlans.useQuery(); + const userPlanQuery = trpc.plan.getUserPlans.useQuery(undefined, { + staleTime: Infinity, + cacheTime: Infinity, + }); const updateSeenHomeOnboarding = trpc.user.seenHomeOnboarding.useMutation({ async onSuccess() { await utils.user.getUser.invalidate(); }, }); - const { data: userData, isLoading } = trpc.user.getUser.useQuery(undefined, { staleTime: 0 }); + const { data: userData, isLoading } = trpc.user.getUser.useQuery(undefined, { + staleTime: Infinity, + cacheTime: Infinity, + }); const { data } = userPlanQuery; const [planPage, setPlanPage] = useState<0 | 1>(1); diff --git a/src/components/planner/Sidebar/RecursiveRequirement.tsx b/src/components/planner/Sidebar/RecursiveRequirement.tsx index 9d07b3eef..5e6aad79f 100644 --- a/src/components/planner/Sidebar/RecursiveRequirement.tsx +++ b/src/components/planner/Sidebar/RecursiveRequirement.tsx @@ -3,6 +3,7 @@ import React, { useMemo } from 'react'; import DraggableSidebarCourseItem from './SidebarCourseItem'; import { CourseRequirement, RequirementTypes } from './types'; import Accordion from './Accordion'; +import { trpc } from '@/utils/trpc'; /** * Group of requirements that's recursive? @@ -166,6 +167,17 @@ function CourseRequirementComponent({ validCourses: { [key: string]: number }; }) { const id = useMemo(() => new ObjectID(), []); + const courseQuery = trpc.courses.publicGetAllCourses.useQuery(undefined, { + staleTime: Infinity, + cacheTime: Infinity, + }); + const { data, isLoading } = courseQuery; + + let title = ''; + if (data && !isLoading) { + const course = data.find((c) => `${c.subject_prefix} ${c.course_number}` === req.course); + title = course ? course.title : ''; + } return ( diff --git a/src/components/planner/Sidebar/SidebarCourseItem.tsx b/src/components/planner/Sidebar/SidebarCourseItem.tsx index ebc3a083e..c9dfcd07a 100644 --- a/src/components/planner/Sidebar/SidebarCourseItem.tsx +++ b/src/components/planner/Sidebar/SidebarCourseItem.tsx @@ -55,10 +55,12 @@ export const SidebarCourseItem = React.memo( side="left" title={title || ''} > -
    - +
    + - {course.code} +
    + {course.code} - {course.title} +
    {course.hours && course.hours < getSemesterHourFromCourseCode(course.code)! && ( diff --git a/src/components/planner/Tiles/SemesterCourseItemDropdown.tsx b/src/components/planner/Tiles/SemesterCourseItemDropdown.tsx index 7b7875f43..1ddab2858 100644 --- a/src/components/planner/Tiles/SemesterCourseItemDropdown.tsx +++ b/src/components/planner/Tiles/SemesterCourseItemDropdown.tsx @@ -66,9 +66,7 @@ const SemesterCourseItemDropdown: FC = ({ - - {prereqOverriden ? 'Remove Pre-reqs Override' : 'Override Pre-reqs Warning'} - + {prereqOverriden ? 'Show Pre-reqs Warning' : 'Dismiss Pre-reqs Warning'} 0) { coreqNotMet.push(...coreq); } else {