Merge pull request #1493 from tokyo-metropolitan-gov/staging

Staging から Development への同期

.github/workflows/ogp_builder.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - staging
-      - fix-ogp-size
 
 jobs:
   build:
@@ -32,4 +31,35 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: ogp
-          path: ogp
+          path: ogp
+  upload:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+      with:
+        ref: staging
+    - name: Download ogp images
+      uses: actions/download-artifact@v1
+      with:
+        name: ogp
+    - name: Commit files
+      run: |
+        mv ogp/* static/
+        rm -rf ogp
+        git config --local user.email "action@github.com"
+        git config --local user.name "GitHub Action"
+        git add static
+        git commit -m "Add changes" 
+    - name: Push changes
+      uses: ad-m/github-push-action@master
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        branch: deploy/new_ogp
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v2
+      with:
+        title: '[DEPLOY] OGP refresh pull request'
+        token: ${{ secrets.GITHUB_TOKEN }}
+        branch: deploy/new_ogp
+        base: staging

layouts/default.vue

@@ -1,10 +1,12 @@
 <template>
   <v-app class="app">
-    <div v-if="loading" class="loader">
-      <img src="/logo.svg" alt="東京都" />
-      <scale-loader color="#00A040" />
-    </div>
-    <div v-else-if="hasNavigation" class="appContainer">
+    <v-overlay v-if="loading" color="#F8F9FA" opacity="1" z-index="9999">
+      <div class="loader">
+        <img src="/logo.svg" alt="東京都" />
+        <scale-loader color="#00A040" />
+      </div>
+    </v-overlay>
+    <div v-if="hasNavigation" class="appContainer">
       <div class="naviContainer">
         <SideNavigation
           :is-navi-open="isOpenNavigation"

pages/cards/_card.vue

@@ -167,7 +167,9 @@ export default {
   },
   head() {
     const url = 'https://stopcovid19.metro.tokyo.lg.jp'
-    const ogpImage = url + '/ogp-' + this.$route.params.card + '.png'
+    const timestamp = new Date().getTime()
+    const ogpImage =
+      url + '/ogp-' + this.$route.params.card + '.png?t=' + timestamp
     const description =
       this.updatedAt +
       ' 更新 | ' +