more nits

pennlabs · Mar 8, 2024 · eec350b · eec350b
1 parent 01c0f86
commit eec350b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 51 deletions.
diff --git a/frontend/degree-plan/components/Requirements/Major.tsx b/frontend/degree-plan/components/Requirements/Major.tsx
diff --git a/frontend/degree-plan/components/Requirements/QObject.tsx b/frontend/degree-plan/components/Requirements/QObject.tsx
@@ -66,7 +66,7 @@ interface CourseOptionProps {
 }
 const CourseOption = ({ full_code, semester, isChosen = false, ruleIsSatisfied = false, ruleId }: CourseOptionProps) => {
  const [{ isDragging }, drag] = useDrag<DnDFulfillment, never, { isDragging: boolean }>(() => ({
- type: ItemTypes.COURSE,
+ type: ItemTypes.FULFILLMENT,
  item: {full_code: full_code, semester: null, rules: [ruleId], course: null },
 collect: (monitor) => ({ isDragging: !!monitor.isDragging() }),
  canDrag: !isChosen && !ruleIsSatisfied

diff --git a/frontend/degree-plan/components/Requirements/Rule.tsx b/frontend/degree-plan/components/Requirements/Rule.tsx
@@ -60,6 +60,7 @@ const Row = styled.div`
 
 const Indented = styled.div`
  margin-left: .75rem;
+ margin-bottom: 1rem;
 `
 
 
@@ -164,13 +165,15 @@ const RuleComponent = (ruleTree : RuleTree) => {
  }
  </RuleTitle>
  </RuleTitleWrapper>
- <Indented>
- {children.map((ruleTree) => (
- <div>
- <RuleComponent {...ruleTree} />
- </div>
- ))}
- </Indented>
+ {!collapsed &&
+ <Indented>
+ {children.map((ruleTree) => (
+ <div>
+ <RuleComponent {...ruleTree} />
+ </div>
+ ))}
+ </Indented>
+ }
  </>
  )
 }