fix v-modals and fix audio assets

stevenson-space · Apr 16, 2022 · ddd7e65 · ddd7e65
1 parent b16ba15
commit ddd7e65
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 14 deletions.
diff --git a/src/assets/blank.mp3 → public/blank.mp3 b/src/assets/blank.mp3 → public/blank.mp3
diff --git a/src/assets/forms.html → public/forms.html b/src/assets/forms.html → public/forms.html
diff --git a/src/assets/timer.mp3 → public/timer.mp3 b/src/assets/timer.mp3 → public/timer.mp3
diff --git a/src/components/Checkbox.vue b/src/components/Checkbox.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="checkbox-container" @click="$emit('input', !value)">
-    <div class="checkbox" :class="{ checked: value }">
+  <div class="checkbox-container" @click="$emit('update:modelValue', !modelValue)">
+    <div class="checkbox" :class="{ checked: modelValue }">
       <font-awesome-icon class="check" :icon="faCheck" />
     </div>
 
@@ -15,7 +15,7 @@ import { faCheck } from '@fortawesome/free-solid-svg-icons';
 
 export default {
   props: {
-    value: { type: Boolean, required: true },
+    modelValue: { type: Boolean, required: true },
     labelSize: { type: String, default: '.85em' },
   },
   data() {

diff --git a/src/views/GpaCalculator/GpaCalculator.vue b/src/views/GpaCalculator/GpaCalculator.vue
@@ -77,7 +77,7 @@
               <div class="final-gpa">{{course.weightedGPA.toFixed(2)}}</div>
             </div>
           </div>
-          <checkbox :value="course.weight == 1.5" v-on:input="toggleExtraWeight(course, $event)">1.5 Weight Science Class</checkbox>
+          <checkbox :modelValue="course.weight == 1.5" v-on:update:modelValue="toggleExtraWeight(course, $event)">1.5 Weight Science Class</checkbox>
         <br>
       </card>
     </card-container>

diff --git a/src/views/Settings/Add Schedule/ScheduleColumn.vue b/src/views/Settings/Add Schedule/ScheduleColumn.vue
@@ -4,7 +4,7 @@
 
     <rounded-button class="add-period-button" :icon="icons.faPlus" text="Add Period" @click="$emit('add-period')" />
 
-    <checkbox :value="isEnabled" @input="$emit($event ? 'enable' : 'disable')">
+    <checkbox :modelValue="isEnabled" @update:modelValue="$emit($event ? 'enable' : 'disable')">
       <span class="enable-checkbox-text">This schedule applies on days of type "{{ name }}"</span>
     </checkbox>
 

diff --git a/src/views/Settings/Transfer.vue b/src/views/Settings/Transfer.vue
@@ -34,17 +34,18 @@
       </div>
     </confirm-popup>
 
+        <p>{{shouldSaveSetting}}</p>
     <confirm-popup :show="popupToShow == popups.save" ok-text="Save" @cancel="cancel" @ok="save">
       <div class="save-popup">
         <div class="title">Choose what to save:</div>
-
-        <!-- <checkbox // FIX
+      <!-- fix -->
+        <checkbox
           v-for="(_, setting) in shouldSaveSetting"
           :key="setting"
           v-model="shouldSaveSetting[setting]"
         >
           {{ settingToName(setting) }}
-        </checkbox> -->
+        </checkbox>
 
         <div class="warning">Warning: Any existing data will be lost</div>
       </div>
@@ -65,7 +66,7 @@
 
 <script>
 import { faUpload, faDownload, faSpinner } from '@fortawesome/free-solid-svg-icons';
-import Vue from 'vue';
+// import Vue from 'vue';
 
 import RoundedButton from '@/components/RoundedButton.vue';
 import Popup from '@/components/Popup.vue';
@@ -121,6 +122,7 @@ export default {
   created() {
     // Initialize each property of shouldSendSetting to true (meaning that all send checkboxes will be checked initially)
     tranferableSettings.forEach((str) => { // FIX
+      this.shouldSendSetting[str] = true;
       // Vue.set(this.shouldSendSetting, str, true); // need use Vue.set since we're adding dynamic properties to a tracked object
     });
   },

diff --git a/src/views/Tools/TimerCard.vue b/src/views/Tools/TimerCard.vue
@@ -86,9 +86,6 @@ import Checkbox from '@/components/Checkbox.vue';
 import ConfirmPopup from '@/components/ConfirmPopup.vue';
 import WhatIsThis from '@/components/WhatIsThis.vue';
 
-import { blankAudioFile } from '@/assets/blank.mp3';
-import { timerAudioFile } from '@/assets/timer.mp3';
-// FIX
 export default {
   components: {
     Card,
@@ -148,10 +145,10 @@ export default {
     shouldMakeSound() {
       if (this.shouldMakeSound && !this.audio) {
         // initially playing some blank audio while tab is in focus allows audio to be played later even when tab is in background
-        const blankAudio = new Audio(blankAudioFile);
+        const blankAudio = new Audio('blank.mp3');
         blankAudio.play();
 
-        this.audio = new Audio(timerAudioFile);
+        this.audio = new Audio('timer.mp3');
       }
     },
   },