resolve merge conflict part 2

pennlabs · Apr 12, 2024 · 1801727 · 1801727
1 parent 2420e54
commit 1801727
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 21 deletions.
diff --git a/frontend/degree-plan/components/FourYearPlan/DegreeModal.tsx b/frontend/degree-plan/components/FourYearPlan/DegreeModal.tsx
@@ -124,9 +124,9 @@ const DegreeAddInterior = styled.div`
 export const createMajorLabel = (degree: DegreeListing) => {
   const concentration =
     degree.concentration && degree.concentration !== "NONE"
-      ? ` - ${degree.concentration_name}`
+      ? ` - ${degree.concentration}`
       : "";
-  return `${degree.major_name}${concentration} (${degree.year})`;
+  return `${degree.major}${concentration} (${degree.year})`;
 };
 
 interface RemoveDegreeProps {

diff --git a/frontend/degree-plan/components/FourYearPlanPage.tsx b/frontend/degree-plan/components/FourYearPlanPage.tsx
@@ -42,7 +42,11 @@ const PanelWrapper = styled(Pane)`
   height: 100%;
   display: flex;
   flex-direction: row;
+<<<<<<< HEAD
   gap: 0.8rem;
+=======
+  gap: 1rem;
+>>>>>>> 2744e72b (resolve merge conflict)
 `
 
 const PanelInteriorWrapper = styled.div<{ $maxWidth?: string; $minWidth?: string }>`
@@ -160,11 +164,10 @@ const FourYearPlanPage = ({
                 // @ts-ignore */}
                 <SplitPane
                   split="vertical"
-                  // maxSize={windowWidth ? windowWidth * 0.60 : 1000}
                   maxSize={searchPanelOpen ? 
-                            (windowWidth ? windowWidth : 1000) * 0.5 
-                          : (windowWidth ? windowWidth : 1000) * 0.6}
-                  defaultSize="50%"
+                    (windowWidth ? windowWidth : 1000) * 0.45 
+                  : (windowWidth ? windowWidth : 1000) * 0.6}
+                  defaultSize="60%"
                   style={{
                     padding: "1.5rem",
                     paddingBottom: "1rem" // less padding on bottom for penn labs footer
@@ -201,8 +204,10 @@ const FourYearPlanPage = ({
                       />
                     </PanelInteriorWrapper>
                     {searchPanelOpen && (
-                      <PanelInteriorWrapper $minWidth={"40%"} $maxWidth={"43%"}>
-                        <SearchPanel activeDegreeplanId={activeDegreeplan ? activeDegreeplan.id : null} setSearchedRuleId={setSearchRuleId}/>
+                      <PanelInteriorWrapper $minWidth={"40%"} $maxWidth={"45%"}>
+                        <SearchPanel 
+                        activeDegreeplanId={activeDegreeplan ? activeDegreeplan.id : null} 
+                        setSearchRuleId={setSearchRuleId}/>
                       </PanelInteriorWrapper>
                     )}
                   </PanelWrapper>

diff --git a/frontend/degree-plan/components/Requirements/QObject.tsx b/frontend/degree-plan/components/Requirements/QObject.tsx
@@ -189,7 +189,6 @@ const SearchCondition = ({ ruleId, ruleQuery, fulfillments, ruleIsSatisfied, q,
             $isDisabled={false}
             $isUsed={false}
             $isSearched={searchRuleId == ruleId}
-
         >
             <SearchConditionInner q={q} />
             <DarkGrayIcon onClick={() => {

diff --git a/frontend/degree-plan/components/Requirements/ReqPanel.tsx b/frontend/degree-plan/components/Requirements/ReqPanel.tsx
@@ -95,7 +95,8 @@ interface DegreeHeaderProps {
 }
 
 const DegreeHeader = ({ degree, remove, setCollapsed, collapsed, editMode, skeleton }: DegreeHeaderProps) => {
-  const degreeName = !skeleton ? `${degree.degree} in ${degree.major_name} ${degree.concentration ? `(${degree.concentration_name})` : ''}` : <DarkBlueBackgroundSkeleton width="10em" />;
+  console.log(degree)
+  const degreeName = !skeleton ? `${degree.degree} in ${degree.major} ${degree.concentration ? `(${degree.concentration})` : ''}` : <DarkBlueBackgroundSkeleton width="10em" />;
   return (
     <DegreeHeaderContainer onClick={() => setCollapsed(!collapsed)}>
       <DegreeTitleWrapper>

diff --git a/frontend/degree-plan/components/Search/CourseInSearch.tsx b/frontend/degree-plan/components/Search/CourseInSearch.tsx
@@ -149,13 +149,6 @@ export default function Course({
     isStar,
 }: CourseProps) {
     /** React dnd */
-    // const [{ isDragging }, drag, dragPreview] = useDrag<DnDCourse>(() => ({
-    //     type: ItemTypes.COURSE_IN_REQ,
-    //     item: {full_code: course.id, semester:-1, rule_id: ruleId},
-    //     collect: (monitor) => ({
-    //         isDragging: !!monitor.isDragging(),
-    //     })
-    // }))
     const [{ isDragging }, drag] = useDrag<DnDCourse, never, { isDragging: boolean }>(() => ({
         type: ItemTypes.COURSE_IN_PLAN,
         item: {full_code: course.id},
@@ -171,6 +164,8 @@ export default function Course({
             <ReviewPanelTrigger full_code={course.id} triggerType="click">
                 <CourseContainer onMouseEnter={() => setIsMouseOver(true)} onMouseLeave={() => setIsMouseOver(false)}>
                     <CourseInfoContainer
+                        ref={drag} 
+                        className="draggable"
                         role="button"
                     >   
                         <CourseIdentityContainer >

diff --git a/frontend/degree-plan/components/Search/ResultsList.tsx b/frontend/degree-plan/components/Search/ResultsList.tsx
@@ -93,7 +93,7 @@ const ResultsList = ({
                     // star means the course is a fulfillment
                     isStar={!!fulfillments.find((fulfillment) => fulfillment.full_code == course.id)}
                 />) :
-                Array.from(Array(5).keys()).map(() => <SkeletonCourse />)
+                Array.from(Array(6).keys()).map(() => <SkeletonCourse />)
                 }
             </CoursesContainer>
         </CourseListContainer>

diff --git a/frontend/degree-plan/components/Search/SearchPanel.tsx b/frontend/degree-plan/components/Search/SearchPanel.tsx
@@ -81,10 +81,10 @@ const SearchPanelHeader = styled(PanelHeader)`
 
 interface SearchPanelProp {
     activeDegreeplanId: DegreePlan["id"] | null;
-    setSearchedRuleId: (arg0: number) => void;
+    setSearchRuleId: (arg0: number | null) => void;
 }
 
-export const SearchPanel = ({ activeDegreeplanId, setSearchedRuleId }: SearchPanelProp) => {
+export const SearchPanel = ({ activeDegreeplanId, setSearchRuleId }: SearchPanelProp) => {
     const { 
         setSearchPanelOpen, 
         searchRuleId: ruleId, 
@@ -103,7 +103,7 @@ export const SearchPanel = ({ activeDegreeplanId, setSearchedRuleId }: SearchPan
     const handleCloseSearch = () => {
         setQueryString(""); 
         setSearchPanelOpen(false);
-        setSearchedRuleId(-1);
+        setSearchRuleId(null);
     }
 
     return (
@@ -127,6 +127,7 @@ export const SearchPanel = ({ activeDegreeplanId, setSearchedRuleId }: SearchPan
                         value={queryString}
                         onChange={(e) => {setQueryString(e.target.value)}}
                         autoComplete="off"
+                        // placeholder={!ruleId ? "Search for a course!" : `Filtering for ${ruleQuery ? ruleQuery : 'a requirement'}`}
                         placeholder={!ruleId ? "Search for a course!" : `Filtering for a requirement`}
                     />
                 </SearchContainer>