Merge pull request #281 from covid19-miyazaki/staging

Release 2020-08-03 00:12:14 +0900

.github/workflows/news_scraping.yml

@@ -1,12 +1,7 @@
 name: scraping news
-# サイト構造がリニューアルしてスクレイピングに失敗しているので一時的に無効にする
 on:
-  push:
-    branches-ignore:
-      - '**'
-# on:
-#   schedule:
-#   - cron: '0 */6 * * *'
+   schedule:
+   - cron: '0 */6 * * *'
 jobs:
   scraping:
     runs-on: ubuntu-latest
@@ -21,10 +16,10 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-ruby@v1
       with:
-        ruby-version: '2.5'
+        ruby-version: '2.5.8'
     - name: Scraping News
       env:
-        URL: "https://www.pref.miyazaki.lg.jp/kenko/hoken/kansensho/covid19/hassei.html"
+        URL: "https://www.pref.miyazaki.lg.jp/covid-19/index.html"
         SELENIUM_HOST: localhost
         TZ: Asia/Tokyo
       run: |
@@ -49,7 +44,7 @@ jobs:
       if: steps.cpr.outputs.pr_number != 0
     - name: Scraping Data
       env:
-        URL: "https://www.pref.miyazaki.lg.jp/kenko/hoken/kansensho/covid19/hassei.html"
+        URL: "https://www.pref.miyazaki.lg.jp/kansensho-taisaku/covid-19/hassei_list.html"
         SELENIUM_HOST: localhost
         TZ: Asia/Tokyo
       run: |

.ruby-version

@@ -0,0 +1 @@
+2.5.8

Gemfile.lock

@@ -1,13 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    childprocess (2.0.0)
-      rake (< 13.0)
-    rake (12.3.3)
-    rubyzip (1.3.0)
-    selenium-webdriver (3.142.4)
-      childprocess (>= 0.5, < 3.0)
-      rubyzip (~> 1.2, >= 1.2.2)
+    childprocess (3.0.0)
+    rubyzip (2.3.0)
+    selenium-webdriver (3.142.7)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
 
 PLATFORMS
   ruby

components/ConfirmedCasesTable.vue

@@ -26,8 +26,8 @@
         </div>
       </div>
       <ul class="group">
-        <li class="item in-hospital">
-          <div class="gutter oneThird">
+        <li class="item deceased">
+          <div class="gutter">
             <div class="box">
               <t-i18n>{{ $t('入院中') }}</t-i18n>
               <span>
@@ -36,32 +36,17 @@
               </span>
             </div>
           </div>
-          <ul class="group">
-            <li class="item mild">
-              <div class="gutter">
-                <div class="box short">
-                  <!-- eslint-disable vue/no-v-html-->
-                  <span v-html="$t('軽症・<br />中等症')" />
-                  <!-- eslint-enable vue/no-v-html-->
-                  <span>
-                    <b>{{ 軽症中等症 }}</b>
-                    <t-i18n class="unit">{{ $t('人') }}</t-i18n>
-                  </span>
-                </div>
-              </div>
-            </li>
-            <li class="item serious">
-              <div class="gutter">
-                <div class="box short">
-                  <t-i18n>{{ $t('重症') }}</t-i18n>
-                  <span>
-                    <b>{{ 重症 }}</b>
-                    <t-i18n class="unit">{{ $t('人') }}</t-i18n>
-                  </span>
-                </div>
-              </div>
-            </li>
-          </ul>
+        </li>
+        <li class="item deceased">
+          <div class="gutter">
+            <div class="box">
+              <t-i18n>{{ $t('宿泊療養中') }}</t-i18n>
+              <span>
+                <b>{{ 宿泊療養中 }}</b>
+                <t-i18n class="unit">{{ $t('人') }}</t-i18n>
+              </span>
+            </div>
+          </div>
         </li>
         <li class="item deceased">
           <div class="gutter">
@@ -97,15 +82,7 @@ export default {
   components: {
     TI18n
   },
-  props: [
-    '検査実施人数',
-    '陽性者数',
-    '入院中',
-    '軽症中等症',
-    '重症',
-    '死亡',
-    '退院'
-  ],
+  props: ['検査実施人数', '陽性者数', '入院中', '宿泊療養中', '死亡', '退院'],
   methods: {
     /** 桁数に応じて位置の調整をする */
     getAdjustX(input) {
@@ -277,7 +254,7 @@ export default {
   width: 200%;
 }
 .item.recovered > .gutter > .box::before {
-  width: 520%;
+  width: 400%;
 }
 
 @function px2vw($px, $vw) {

components/WhatsNew.vue

@@ -16,12 +16,6 @@
           target="_blank"
           rel="noopener"
         >
-          <time
-            class="WhatsNew-list-item-anchor-time px-2"
-            :datetime="formattedDate(item.date)"
-          >
-            {{ item.date }}
-          </time>
           <span class="WhatsNew-list-item-anchor-link">
             <!-- @todo t-i18n化が必要 -->
             {{ item.text }}