Fix website (#768)

* revert * Revert "revert" This reverts commit 0fbd166. * Revert "beep boop Github Action Master Branch CI Prettier hard at work" This reverts commit a43c612. * Revert "718 finals schedule days don't line up (#737)" This reverts commit cde1586. * Revert "beep boop Github Action Master Branch CI Prettier hard at work" This reverts commit 946354a. * Revert "723 more detailed explore page with sorting options (#753)" This reverts commit 10bca13.
YACS-RCOS · Aug 9, 2023 · f7ea6aa · f7ea6aa
1 parent a43c612
commit f7ea6aa
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 117 deletions.
diff --git a/rpi_data/school-department-mapping.yaml b/rpi_data/school-department-mapping.yaml
@@ -16,7 +16,7 @@ schools:
       - shortname: GSAS
         longname: Games and Simulations Arts and Sciences
       - shortname: IHSS
-        longname: Interdisciplinary HASS
+        longname: Interdisciplinary H&SS
       - shortname: LANG
         longname: Languages
       - shortname: LITR

diff --git a/src/web/src/pages/Calendar.vue b/src/web/src/pages/Calendar.vue
@@ -320,7 +320,7 @@ $hourFontSize: 0.5em;
   margin: 0 auto;
   margin-bottom: 3px;
   text-align: center;
-  font-size: 0.85vw;
+  font-size: 0.8em;
   font-variant: small-caps;
 }
 

diff --git a/src/web/src/pages/CourseExplorer.vue b/src/web/src/pages/CourseExplorer.vue
@@ -1,44 +1,13 @@
 <template>
   <b-container fluid>
     <b-breadcrumb :items="breadcrumbNav"></b-breadcrumb>
-
-    <!-- button to switch between alphabet order and department order -->
-    <div style="float: left;" class="w-10">
-      <b-button
-        class="button"
-        @click="listAlphabet()"
-        style="
-          margin-top: 10px;
-          color: #007bff;
-          border: solid #007bff;
-          background-color: transparent;
-        "
-      >
-        List by Alphabet
-      </b-button>
-      <br />
-      <b-button
-        class="button"
-        @click="listDept()"
-        style="
-          margin-top: 10px;
-          color: #007bff;
-          border: solid #007bff;
-          background-color: transparent;
-        "
-      >
-        List by Department
-      </b-button>
-    </div>
-
     <div v-if="!isLoadingCourses && courses.length > 0" class="mx-auto w-75">
       <b-row>
         <!-- 2 arrays in schoolDepartmentObjects, so 2 columns -->
         <b-col
           v-for="(deptCol, index) in schoolDepartmentObjects"
           :key="`deptCol-${index}`"
           md="6"
-          v-show="cateShow"
         >
           <b-row
             v-for="deptObj in deptCol"
@@ -63,37 +32,6 @@
             </b-col>
           </b-row>
         </b-col>
-
-        <!-- splitted Departments in alphabet order -->
-        <b-col
-          v-for="(deptCol, index) in alphDepartmentObjects"
-          :key="`deptCol-${index}`"
-          md="6"
-          v-show="alphShow"
-        >
-          <b-row
-            v-for="deptObj in deptCol"
-            :key="deptObj.letter"
-            class="departmentBox border m-2 mb-4"
-          >
-            <b-col>
-              <!-- Alphabet Title  -->
-              <b-row class="school-name">
-                <h3 class="m-1 ml-2">
-                  {{ deptObj.letter }}
-                </h3>
-              </b-row>
-              <!-- Subject Title  -->
-              <b-row>
-                <DepartmentList
-                  :majors="deptObj.departments"
-                  :deptClassDict="deptClassDict"
-                  v-on:showCourseInfo="showCourseInfo($event)"
-                ></DepartmentList>
-              </b-row>
-            </b-col>
-          </b-row>
-        </b-col>
       </b-row>
     </div>
     <CenterSpinner
@@ -130,19 +68,9 @@ export default {
           text: "Explore",
         },
       ],
-      cateShow: true,
-      alphShow: false,
     };
   },
   methods: {
-    listAlphabet() {
-      this.cateShow = false;
-      this.alphShow = true;
-    },
-    listDept() {
-      this.cateShow = true;
-      this.alphShow = false;
-    },
     generateRequirementsText,
   },
   computed: {
@@ -166,28 +94,6 @@ export default {
       }
       return columnArr;
     },
-
-    // similar to schoolDepartmentObjects() but creating two columns
-    // of departments separated by alphabetical letters
-    alphDepartmentObjects() {
-      let keyArr = Object.entries(this.alphDeptDict).map(
-        (alphDepartmentMapping) => ({
-          letter: alphDepartmentMapping[0],
-          departments: alphDepartmentMapping[1],
-        })
-      );
-      let columnArr = [[], []];
-      // separates into two columns based on number of letters
-      for (let i = 0; i < keyArr.length; i++) {
-        if (i < keyArr.length / 2) {
-          columnArr[0].push(keyArr[i]);
-        } else {
-          columnArr[1].push(keyArr[i]);
-        }
-      }
-      return columnArr;
-    },
-
     schoolsMajorDict() {
       let schoolsMajorDict = {};
       for (const c of this.courses) {
@@ -198,7 +104,6 @@ export default {
       }
       return schoolsMajorDict;
     },
-
     deptClassDict() {
       let deptClassDict = {};
       for (const c of this.courses) {
@@ -210,19 +115,6 @@ export default {
       }
       return deptClassDict;
     },
-
-    // similar to schoolsMajorDict() and deptClassDict()
-    // map/set with a set of departments for each alphabetical letter
-    alphDeptDict() {
-      let alphDeptDict = {};
-      for (const c of this.courses) {
-        if (!alphDeptDict[c.department[0]]) {
-          alphDeptDict[c.department[0]] = new Set();
-        }
-        alphDeptDict[c.department[0]].add(c.department);
-      }
-      return alphDeptDict;
-    },
   },
   metaInfo() {
     return {
@@ -265,8 +157,4 @@ export default {
   background: rgba(108, 90, 90, 0.15);
   border-bottom: rgba(108, 90, 90, 0.1), solid, 1px;
 }
-
-.button:hover {
-  background: rgba(108, 90, 90, 0.15) !important;
-}
 </style>
diff --git a/src/web/src/utils.js b/src/web/src/utils.js
@@ -387,12 +387,10 @@ export const getLongName = (department) => {
     COGS: "Cognitive Science",
     STSH: "Science and Technology Studies - Humanities",
     STSS: "Science and Technology Studies - Social Sciences",
-    STSO: "Science, Technology, and Society",
     COMM: "Communication",
     ECON: "Economics",
     GSAS: "Games and Simulations Arts and Sciences",
-    IHSS: "Interdisciplinary HASS",
-    INQR: "HASS Inquiry",
+    IHSS: "Interdisciplinary H&SS",
     LANG: "Languages",
     LITR: "Literature",
     PHIL: "Philosophy",