Merge remote-tracking branch 'origin/feature/177-tos' into feature/177-tos

Author: NEKOYASAN

src/components/PeriodCard.vue

@@ -13,7 +13,11 @@
     </div>
     <v-row>
       <v-col v-for="(item, i) in classData" :key="i" cols="12" md="6">
-        <content-card :lesson="item" />
+        <content-card
+          :lesson="item"
+          :editable="editable"
+          @clickEditButton="$emit('clickEditButton', item)"
+        />
       </v-col>
     </v-row>
   </div>
@@ -41,6 +45,10 @@ export default Vue.extend({
     classData: {
       type: Array as () => classData.LessonWithId[],
       default: () => []
+    },
+    editable: {
+      type: Boolean,
+      default: false
     }
   },
   computed: {

src/components/PeriodCardEditable.vue

@@ -8,7 +8,7 @@
     <v-app-bar fixed app class="bar" elevation="0">
       <HeaderLogo />
       <v-spacer />
-      <v-btn outlined rounded color="#0071C2">
+      <v-btn outlined rounded color="#0071C2" @click="$router.back()">
         <v-icon left>mdi-arrow-left</v-icon>
         もどる
       </v-btn>

src/layouts/simple.vue

@@ -1,7 +1,15 @@
 <template>
   <div class="MainPage">
     <div v-if="classData.lessonsOnCurrentDate.length">
-      <period-card-editable :class-data="classData" @clickEditButton="doEdit" />
+      <period-card
+        v-for="(lessons, time, index) in lessonsGroupByPeriod"
+        :key="index"
+        :period="index"
+        :time="time"
+        :class-data="lessons"
+        :editable="true"
+        @clickEditButton="doEdit"
+      />
       <ul class="Classes-List">
         <li>おうちで時間割について</li>
         <li>お問い合わせ</li>
@@ -44,20 +52,31 @@ import Vue from 'vue'
 import dayjs from 'dayjs'
 import isToday from 'date-fns/isToday'
 import { vxm } from '@/store'
-import PeriodCardEditable from '@/components/PeriodCardEditable.vue'
+import PeriodCard from '@/components/PeriodCard.vue'
 import SimpleBottomSheet from '@/components/SimpleBottomSheet.vue'
 import EditingScreen from '@/components/EditingScreen.vue'
-import { classData } from '~/types/store/classData'
+import { classData } from '@/types/store/classData'
+import LessonWithId = classData.LessonWithId
+
+type LessonsGroupedBy = {
+  [key: string]: LessonWithId[]
+}
 
 type DataType = {
   classData: typeof vxm.classData
   editingMode: boolean
   editPageValue: object
 }
 
+type Computed = {
+  today: boolean
+  dateTitle: string
+  lessonsGroupByPeriod: LessonsGroupedBy
+}
+
 export default Vue.extend({
   components: {
-    PeriodCardEditable,
+    PeriodCard,
     SimpleBottomSheet,
     EditingScreen
   },
@@ -100,6 +119,16 @@ export default Vue.extend({
     },
     dateTitle() {
       return dayjs(vxm.app.currentDate).format('M/D')
+    },
+    lessonsGroupByPeriod() {
+      const groupBy = (targets: LessonWithId[], key: keyof LessonWithId) =>
+        targets.reduce((acc: LessonsGroupedBy, currentLesson: LessonWithId) => {
+          const valueToGroup = currentLesson[key].toString()
+          acc[valueToGroup] = acc[valueToGroup] || []
+          acc[valueToGroup].push(currentLesson)
+          return acc
+        }, {})
+      return groupBy(vxm.classData.lessonsOnCurrentDate, 'startTime')
     }
   },
   methods: {

src/pages/edit/index.vue

@@ -46,7 +46,7 @@
             text
             to="/"
           >
-            <span>パスワードを忘れた方へ</span>
+            <span>戻る</span>
           </v-btn>
         </div>
       </template>

src/pages/user/login.vue

@@ -1,8 +1,9 @@
 import Vue from 'vue'
-import Vuex, { ActionContext } from 'vuex'
-import { Context } from '@nuxt/types/app'
+import Vuex from 'vuex'
+// import Vuex, { ActionContext } from 'vuex'
+// import { Context } from '@nuxt/types/app'
 import { createProxy, extractVuexModule } from 'vuex-class-component'
-import jwtDecode from 'jwt-decode'
+// import jwtDecode from 'jwt-decode'
 import { AppStore } from '@/store/modules/app'
 import { ClassDataStore } from '@/store/modules/classData'
 import { UserStore } from '@/store/modules/user'
@@ -16,7 +17,7 @@ export const store = new Vuex.Store({
     ...extractVuexModule(UserStore)
   }
 })
-
+/*
 export const actions = {
   async nuxtServerInit(_ctx: ActionContext<any, any>, { req }: Context) {
     const authorizationHeader = req.headers.authorization || ''
@@ -29,6 +30,7 @@ export const actions = {
     }
   }
 }
+*/
 
 export const vxm = {
   app: createProxy(store, AppStore),