Merge branch 'main' into minor-frontend

sandboxnu · Dec 14, 2024 · a613709 · a613709
2 parents c56ab56 + 5884459
commit a613709
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/packages/api/src/minor/minor.service.ts b/packages/api/src/minor/minor.service.ts
@@ -26,20 +26,6 @@ export class MinorService {
   }
 
   getSupportedMinors(): SupportedMinors {
-    //const supportedMinors: SupportedMinors = MINORS;
-    //MINOR_YEARS.forEach((year) => {
-    //const supportedMinorNames = Object.keys(MINORS[year]);
-
-    //const supportedMinorForYear: SupportedMinorsForYear = {};
-    //supportedMinorNames.forEach((name) => {
-    ////no concentration for minors???
-    ////supportedMinorForYear[minorName] = this.getConcentrationsInfoForMinor(
-    ////minorName,
-    ////parseInt(year)
-    ////);
-    //});
-    //supportedMinors[year] = supportedMinorForYear;
-    //});
     return MINORS;
   }
 

diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts
@@ -501,11 +501,11 @@ export type SupportedConcentrations = {
 
 // { majorName => { concentration, minRequiredConcentrations, verified} }
 export type SupportedMajorsForYear = Record<string, SupportedConcentrations>;
+export type SupportedMinorsForYear = Record<string, Minor>;
 
 // { year => supported majors }
 export type SupportedMajors = Record<string, SupportedMajorsForYear>;
-
-export type SupportedMinors = Record<string, Record<string, Minor>>;
+export type SupportedMinors = Record<string, SupportedMinorsForYear>;
 
 /**
  * Types for a some result from an algorithim. Currently used for the result of