Merge branch 'development' into dependabot/npm_and_yarn/websocket-extensions-0.1.4

Author: NEKOYASAN

src/layouts/classes.vue

@@ -1,6 +1,6 @@
 <template>
   <v-app>
-    <v-overlay v-if="loading" color="#0071C2" opacity="1" z-index="9999">
+    <v-overlay :value="loading" color="#0071C2" opacity="1" z-index="9999">
       <div class="loader">
         Loading
       </div>

src/layouts/default.vue

@@ -1,11 +1,6 @@
 <template>
   <v-app>
-    <v-overlay
-      v-if="loading"
-      color="$color-base-color-01"
-      opacity="1"
-      z-index="9999"
-    >
+    <v-overlay :value="loading" color="#0071C2" opacity="1" z-index="9999">
       <div class="loader">
         Loading
       </div>

src/layouts/protected.vue

@@ -1,6 +1,6 @@
 <template>
   <v-app>
-    <v-overlay v-if="loading" color="#0071C2" opacity="1" z-index="9999">
+    <v-overlay :value="loading" color="#0071C2" opacity="1" z-index="9999">
       <div class="loader">
         Loading
       </div>

src/store/modules/classData.ts

@@ -50,15 +50,15 @@ export class ClassDataStore extends VuexModule implements ClassData {
     const dateStart = new Date(
       this.displayDate.getFullYear(),
       this.displayDate.getMonth(),
-      this.displayDate.getDay(),
+      this.displayDate.getDate(),
       0,
       0,
       0
     )
     const dateEnd = new Date(
       this.displayDate.getFullYear(),
       this.displayDate.getMonth(),
-      this.displayDate.getDay(),
+      this.displayDate.getDate(),
       23,
       59,
       59
@@ -115,6 +115,7 @@ export class ClassDataStore extends VuexModule implements ClassData {
       .collection('classData')
       .doc(classId)
       .collection('Lessons')
+      .orderBy('startTime')
       .get()
       .then(QuerySnapshot => {
         QuerySnapshot.forEach(function(doc) {
@@ -131,9 +132,6 @@ export class ClassDataStore extends VuexModule implements ClassData {
       .catch(() => {
         return Promise.reject(new Error('クラスIDが間違っています'))
       })
-    lessons.sort((a, b) => {
-      return a.startTime > b.startTime ? 1 : -1
-    })
 
     await firebase
       .firestore()