[easy] Clean up util functions (#561)

* util cleanup * util cleanup
cornell-dti · Oct 29, 2021 · fa383c8 · fa383c8
1 parent 97d94cc
commit fa383c8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/src/components/Modals/Onboarding/OnboardingBasic.vue b/src/components/Modals/Onboarding/OnboardingBasic.vue
@@ -143,7 +143,7 @@
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
 import reqsData from '@/requirements/typed-requirement-json';
-import { clickOutside } from '@/utilities';
+import { clickOutside, getCurrentYear } from '@/utilities';
 import OnboardingBasicMultiDropdown from './OnboardingBasicMultiDropdown.vue';
 import OnboardingBasicSingleDropdown from './OnboardingBasicSingleDropdown.vue';
 
@@ -233,7 +233,7 @@ export default defineComponent({
     semesters(): Readonly<Record<string, string>> {
       const semsDict: Record<string, string> = {};
       const yearRange = 6;
-      const curYear = new Date().getFullYear();
+      const curYear = getCurrentYear();
       for (let i = -yearRange; i <= yearRange; i += 1) {
         const yr = String(curYear + i);
         semsDict[yr] = yr;

diff --git a/src/components/Modals/SelectSemester.vue b/src/components/Modals/SelectSemester.vue
@@ -97,7 +97,7 @@
 
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { getCurrentSeason, clickOutside } from '@/utilities';
+import { getCurrentSeason, getCurrentYear, clickOutside } from '@/utilities';
 import store from '@/store';
 
 import fall from '@/assets/images/fallEmoji.svg';
@@ -145,7 +145,7 @@ export default defineComponent({
   },
   data(): Data {
     // years
-    const currentYear = new Date().getFullYear();
+    const currentYear = getCurrentYear();
     const seasons: readonly (readonly [string, FirestoreSemesterSeason])[] = [
       [fall, 'Fall'],
       [spring, 'Spring'],
@@ -194,7 +194,7 @@ export default defineComponent({
       return this.seasonText || this.season || defaultSeason;
     },
     yearPlaceholder(): string {
-      let defaultYear = String(new Date().getFullYear());
+      let defaultYear = String(getCurrentYear());
       if (this.isCourseModelSelectingSemester) {
         defaultYear = 'Select';
       }

diff --git a/src/store.ts b/src/store.ts
@@ -6,11 +6,11 @@ import computeGroupedRequirementFulfillmentReports from './requirements/requirem
 import RequirementFulfillmentGraph from './requirements/requirement-graph';
 import { createAppOnboardingData } from './user-data-converter';
 import {
-  sortedSemesters,
-  getCurrentSeason,
+  allocateAllSubjectColor,
   checkNotNull,
+  getCurrentSeason,
   getCurrentYear,
-  allocateAllSubjectColor,
+  sortedSemesters,
 } from './utilities';
 
 type SimplifiedFirebaseUser = { readonly displayName: string; readonly email: string };

diff --git a/src/utilities.ts b/src/utilities.ts
@@ -43,12 +43,6 @@ export function getCurrentYear(): number {
   return new Date().getFullYear();
 }
 
-export function getCurrentYearSuffix(): string {
-  // If current year is 2020, get string '20'
-  const currentYear = new Date().getFullYear();
-  return currentYear.toString().substring(2);
-}
-
 export function getCollegeFullName(acronym: string | undefined): string {
   // Return empty string if college is not in requirementJSON
   const college = acronym ? requirementJSON.college[acronym] : null;