Merge remote-tracking branch 'fork/development' into development

Author: NEKOYASAN

package.json

@@ -46,7 +46,7 @@
     "js-cookie": "^2.2.1",
     "jwt-decode": "^2.2.0",
     "lodash.clonedeep": "^4.5.0",
-    "nuxt": "^2.13.1",
+    "nuxt": "^2.13.2",
     "nuxt-property-decorator": "^2.7.2",
     "nuxt-svg-loader": "^1.2.0",
     "nuxt-webfontloader": "^1.1.0",

src/components/ContentCard.vue

@@ -115,6 +115,7 @@ export default Vue.extend({
     font-size: 12px;
     color: $color-gray;
     margin: 0;
+    word-break: break-all;
   }
 }
 </style>

src/components/EditingScreen1.vue

@@ -110,7 +110,7 @@
       v-model="tempFormData.date"
       title="日付設定 *"
       label="date"
-      placeholder="2020/05/30"
+      placeholder="2020-05-30"
       :transparent="true"
       icon-name="mdi-calendar"
       :readonly="true"

src/pages/edit/index.vue

@@ -250,15 +250,9 @@ export default Vue.extend({
         isHidden: value.isHidden,
         lessonId: value.docId,
         firstPageData: {
-          date:
-            value.startTime.getFullYear() +
-            '-' +
-            (value.startTime.getMonth() + 1) +
-            '-' +
-            value.startTime.getDate(),
-          startTime:
-            value.startTime.getHours() + ':' + value.startTime.getMinutes(),
-          endTime: value.endTime.getHours() + ':' + value.endTime.getMinutes(),
+          date: dayjs(value.startTime).format('YYYY-MM-DD'),
+          startTime: dayjs(value.startTime).format('HH:mm'),
+          endTime: dayjs(value.endTime).format('HH:mm'),
           title: value.title,
           subjectName: value.subject.name,
           subjectColor: value.subject.color

src/pages/lesson/index.vue

@@ -51,8 +51,8 @@
         </div>
 
         <div class="item-label">学習の目的</div>
-        <div v-if="lesson.objectives" class="item-value">
-          {{ lesson.objectives }}
+        <div v-if="lesson.goal" class="item-value">
+          {{ lesson.goal }}
         </div>
 
         <div class="item-label">詳細</div>
@@ -63,17 +63,17 @@
         <div class="item-label">参考動画</div>
         <div v-if="lesson.videos.length > 0">
           <div v-for="(item, index) in lesson.videos" :key="index">
-            <v-img :src="item.thumbnailUrl" class="video-thumbnail-image" />
             <div class="item-label">
               <a
                 :href="item.url"
                 target="_blank"
                 rel="noopener"
                 class="external-link"
               >
-                {{ item.title }}
+                {{ item.url }}
               </a>
             </div>
+            <v-img :src="item.thumbnailUrl" class="video-thumbnail-image" />
           </div>
         </div>
 
@@ -314,6 +314,7 @@ export default Vue.extend({
   font-family: 'Noto Sans JP', sans-serif;
   font-size: 16px;
   color: $color-gray;
+  word-break: break-all;
 }
 
 .lesson-material {