Merge pull request #189 from codeforjapan/development

v0リリースのmasterマージ

Author: NEKOYASAN

nuxt.config.js

@@ -16,33 +16,63 @@ export default {
     meta: [
       { charset: 'utf-8' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' },
+      {
+        hid: 'keyword',
+        name: 'keyword',
+        content: 'CodeforJapan, おうちで時間割, デジタル, 学び, 今後の学習'
+      },
+      {
+        hid: 'author',
+        name: 'author',
+        content: 'Code for Japan'
+      },
+      {
+        hid: 'og:site_name',
+        property: 'og:site_name',
+        content: 'おうちで時間割'
+      },
+      {
+        hid: 'og:url',
+        property: 'og:url',
+        content: `https://app.studyathome.jp/`
+      },
+      {
+        hid: 'og:title',
+        property: 'og:title',
+        content: 'おうちで時間割'
+      },
+      {
+        hid: 'og:description',
+        property: 'og:description',
+        content:
+          '子どもの学びにデジタルの活用を - 臨時休校期間と今後の学習に向けて 簡単に楽しく学べる環境を今だから、みんなでつくろう。'
+      },
+      {
+        hid: 'apple-mobile-web-app-title',
+        name: 'apple-mobile-web-app-title',
+        content: 'おうちで時間割'
+      },
       {
         hid: 'description',
         name: 'description',
         content:
-          'おうちにいても先生から課題が届きます！時間割に合わせて楽しく学んでコロナ休校を乗り切ろう！'
+          '子どもの学びにデジタルの活用を - 臨時休校期間と今後の学習に向けて 簡単に楽しく学べる環境を今だから、みんなでつくろう。'
       },
-      { hid: 'robots', name: 'robots', content: 'noindex' }
-    ],
-    link: [
-      { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
-      { rel: 'apple-touch-icon', href: '/apple-touch-icon-precomposed.png' },
       { hid: 'og:type', property: 'og:type', content: 'website' },
       {
         hid: 'og:image',
         property: 'og:image',
-        content: 'https://studyathome.web.app/ogp.png'
+        content: 'https://app.studyathome.jp/ogp.png'
       },
       {
         hid: 'twitter:image',
         name: 'twitter:image',
-        content: 'https://studyathome.web.app/ogp.png'
-      },
-      {
-        hid: 'og:title',
-        property: 'og:title',
-        content: 'おうちで時間割'
+        content: 'https://app.studyathome.jp/ogp.png'
       }
+    ],
+    link: [
+      { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
+      { rel: 'apple-touch-icon', href: '/apple-touch-icon-precomposed.png' }
     ]
   },
   /*
@@ -135,10 +165,20 @@ export default {
     APPID: process.env.APPID,
     MEASUREMENTID: process.env.MEASUREMENTID
   },
+  manifest: {
+    name: 'おうちで時間割',
+    short_name: 'おうちで時間割',
+    theme_color: '#0071C2',
+    background_color: '#ffffff',
+    display: 'standalone',
+    Scope: '/',
+    start_url: '/',
+    splash_pages: null
+  },
   workbox: {
     importScripts: [
-      'https://www.gstatic.com/firebasejs/7.14.6/firebase-app.js',
-      'https://www.gstatic.com/firebasejs/7.14.6/firebase-auth.js',
+      'https://www.gstatic.com/firebasejs/7.15.1/firebase-app.js',
+      'https://www.gstatic.com/firebasejs/7.15.1/firebase-auth.js',
       'swenv.js',
       'sw-firebase-auth.js'
     ],

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>