Merge branch 'master' of github.com:pennlabs/penn-courses into pca_re…

…syncing
pennlabs · Aug 29, 2024 · 552fb2e · 552fb2e
2 parents c20e404 + cf28a29
commit 552fb2e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/frontend/alert/pages/index.tsx b/frontend/alert/pages/index.tsx
@@ -80,6 +80,7 @@ const Nav = ({ login, logout, user, page, setPage }: NavProps) => (
  nameLength={2}
  login={login}
  logout={logout}
+ pathname="/"
  />
  </NavElt>
  <NavElt

diff --git a/frontend/degree-plan/components/Dock/Dock.tsx b/frontend/degree-plan/components/Dock/Dock.tsx
@@ -15,6 +15,7 @@ import AccountIndicator from "pcx-shared-components/src/accounts/AccountIndicato
 import _ from 'lodash';
 import CoursePlanned from '../FourYearPlan/CourseInPlan';
 import CourseInDock from './CourseInDock';
+import { useRouter } from 'next/router';
 
 const DockWrapper = styled.div`
  z-index: 1;
@@ -143,6 +144,8 @@ const Dock = ({ user, login, logout, activeDegreeplanId }: DockProps) => {
  // }
  // }, [isMount, dockedCourses]);
 
+ const { asPath } = useRouter();
+
  return (
  <DockWrapper ref={drop} >
  <DockContainer $isDroppable={canDrop} $isOver={isOver}>
@@ -154,6 +157,7 @@ const Dock = ({ user, login, logout, activeDegreeplanId }: DockProps) => {
  login={login}
  logout={logout}
  dropdownTop={true}
+ pathname={asPath}
  />
  <SearchIconContainer onClick={() => {
  setSearchRuleQuery("");

diff --git a/frontend/plan/types.ts b/frontend/plan/types.ts
@@ -1,3 +1,7 @@
+import { type User } from "pcx-shared-components/src/types";
+
+export { type User } from "pcx-shared-components/src/types";
+
 export enum School {
  SEAS = "SEAS",
  WHARTON = "WH",
@@ -123,11 +127,6 @@ export interface MeetingBlock {
  id?: number;
 }
 
-export interface Profile {
- email: string | null;
- phone: string | null;
-}
-
 export interface Requirement {
  id: string;
  code: string;
@@ -168,13 +167,6 @@ export interface Schedule {
  updated_at: string;
 }
 
-export interface User {
- username: string;
- first_name: string;
- last_name: string;
- profile: Profile;
-}
-
 export interface Friendship {
  sender: User;
  recipient: User;

diff --git a/frontend/shared-components/src/accounts/AccountIndicator.tsx b/frontend/shared-components/src/accounts/AccountIndicator.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 import UserSelector from "./UserSelector";
 import LoginButton from "./LoginButton";
-import type { User } from "../../../plan/types";
+import type { User } from "../types";
 
 /**
  * An indicator of whether the user is logged in, and what account they are logged into.
@@ -11,7 +11,7 @@ import type { User } from "../../../plan/types";
  */
 
 const AccountIndicator: React.FC<{
- user: User;
+ user: User | null | undefined;
  login: (user: any) => void;
  logout: () => void;
  leftAligned?: boolean;

diff --git a/frontend/shared-components/src/types.ts b/frontend/shared-components/src/types.ts
@@ -0,0 +1,12 @@
+
+export interface Profile {
+ email: string | null;
+ phone: string | null;
+}
+
+export interface User {
+ username: string;
+ first_name: string;
+ last_name: string;
+ profile: Profile;
+}