cleanup frontend

pennlabs · Mar 23, 2024 · ad36cf0 · ad36cf0
1 parent d8e3b00
commit ad36cf0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 264 deletions.
diff --git a/frontend/degree-plan/components/Requirements/QObject.tsx b/frontend/degree-plan/components/Requirements/QObject.tsx
@@ -1,16 +1,8 @@
-import { useDrag, useDrop } from "react-dnd";
-import { ItemTypes } from "../dnd/constants";
 import type { Course, DnDCourse, Fulfillment, Rule } from "@/types";
 import styled from "@emotion/styled";
-import nearley from "nearley";
-import grammar from "@/util/q_object_grammar" 
 import { Icon } from "../common/bulma_derived_components";
 import CoursePlanned, { BaseCourseContainer, SkeletonCourse } from "../FourYearPlan/CourseInPlan";
 import assert from "assert";
-import { ReviewPanelTrigger } from "../Infobox/ReviewPanel";
-import { Draggable } from "../common/DnD";
-import { useSWRCrud } from "@/hooks/swrcrud";
-import useSWR from "swr";
 import { useContext } from "react";
 import { SearchPanelContext } from "../Search/SearchPanel";
 import CourseInReq from "./CourseInReq";
@@ -348,6 +340,8 @@ const RuleLeaf = ({ q_json, fulfillmentsForRule, rule, satisfied, activeDegreePl
     const t3 = transformSearchConditions(t2)
     q_json = t3 as TransformedQObject;
 
+    console.log(q_json)
+
     return (
         <RuleLeafWrapper $wrap>
             <QObject q={q_json} fulfillments={fulfillmentsForRule} rule={rule} satisfied={satisfied} activeDegreePlanId={activeDegreePlanId} />

diff --git a/frontend/degree-plan/components/Requirements/ReqPanel.tsx b/frontend/degree-plan/components/Requirements/ReqPanel.tsx
@@ -250,19 +250,7 @@ const ReqPanel = ({setModalKey, setModalObject, activeDegreeplan, isLoading, set
     console.log('rules to fulfillments', rulesToCourses)
     return rulesToCourses;
   }, [fulfillments, isLoadingFulfillments])
-
-  // const getProgress = (rule: any) => {
-  //   if (rule.q) {
-  //     return [rulesToFulfillments[rule.id].length, rule.num] // rule.num is not the most accurate rep of number of reqs
-  //   }
-  //   let satisfied = 0, total = 0;
-  //   for (let i = 0; i < rule.rules.length; i++) {
-  //     const [satisfiedByRule, totalByRule] = getProgress(rule.rules[i]);
-  //     satisfied += satisfiedByRule; total += totalByRule;
-  //   }
-  //   return [satisfied, total];
-  // } 
-
+
   return(
     <PanelContainer>
       <PanelHeader>

diff --git a/frontend/degree-plan/util/q_object_grammar.js b/frontend/degree-plan/util/q_object_grammar.js
diff --git a/frontend/degree-plan/util/q_object_grammar.ne b/frontend/degree-plan/util/q_object_grammar.ne