Merge branch 'pwcSchedule1' of https://github.com/yashjagtap23/shs23 …

…into pr/197
stevenson-space · Aug 7, 2023 · 71b2328 · 71b2328
2 parents 27f1e67 + f7ac0cc
commit 71b2328
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -31,7 +31,7 @@ export default {
   methods: {
     ...mapActions(useScheduleStore, ['initializeSchedule', 'pageLoaded']),
     ...mapActions(useThemeStore, ['initializeTheme']),
-    ...mapActions(useUserSettingsStore, ['initializeGrade']),
+    ...mapActions(useUserSettingsStore, ['initializeGrade', 'initializeShowPWCSchedule']),
   },
   watch: {
     theme() {
@@ -48,6 +48,7 @@ export default {
     this.initializeSchedule(this.$route);
     this.initializeTheme();
     this.initializeGrade();
+    this.initializeShowPWCSchedule();
     this.pageLoaded(this.$route);
     document.querySelector('body').style.background = this.theme.background;
   },

diff --git a/src/stores/user-settings.ts b/src/stores/user-settings.ts
@@ -17,9 +17,8 @@ export default defineStore('grades', {
       }
     },
     initializeShowPWCSchedule(): void {
-      if (localStorage.showPWCSchedule) {
-        this.setShowPWCSchedule(localStorage.showPWCSchedule === 'true');
-      }
+      console.log(localStorage.showPWCSchedule);
+      this.setShowPWCSchedule(localStorage.showPWCSchedule === 'true');
     },
     setGrade(grade: string): void {
       this.grade = grade;

diff --git a/src/views/Settings/General.vue b/src/views/Settings/General.vue
@@ -2,7 +2,7 @@
   <settings-section title="General">
     <div class="dropdown-row">
       <span class="title">Show PWC Schedule:</span>
-      <dropdown class="dropdown-select" :options="['Yes', 'No']" :modelValue="selectedPWCState" @update:modelValue="updatePWCState" />
+      <dropdown class="dropdown-select" :options="['Yes', 'No']" :modelValue="this.showPWCSchedule ? 0 : 1" @update:modelValue="updatePWCState" />
     </div>
     <div class="dropdown-row">
       <span class="title">Default Schedule Mode:</span>
@@ -70,9 +70,6 @@ export default defineComponent({
       const grade = this.grades.indexOf(this.grade);
       return grade === -1 ? 0 : grade;
     },
-    selectedPWCState(): number {
-      return this.showPWCSchedule ? 0 : 1;
-    },
   },
   methods: {
     ...mapActions(useScheduleStore, ['setDefaultScheduleMode']),