Merge pull request stopcovid19-okayama#399 from tokyo-metropolitan-go…

…v/staging Release 1.0.5
fujiwaraizuho · Mar 4, 2020 · 479ed04 · 479ed04
2 parents f4f1244 + 5639892
commit 479ed04
Show file tree

Hide file tree

Showing 32 changed files with 470 additions and 253 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,20 @@
+- [ ] バグ / Bug
+- [ ] 改善提案 / Suggestions for improvement
+
+## 起こっている問題 / Occurred problem
+* xxxx(できるだけ簡潔に/as concise as possible)
+
+## スクリーンショット / Screenshot
+<!-- バグであればdeveloper toolからコンソールも合わせて添付 -->
+
+## 期待する見せ方・挙動 / Expected behavior
+* xxxx(できるだけ簡潔に/as concise as possible)
+
+
+## 起こっている問題の再現手段 / Steps to reproduce
+1. xxx
+2. xxx
+3. xxx
+
+## 動作環境・ブラウザ / Environment
+*
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -1,9 +1,9 @@
-name: staging deploy
+name: development deploy
 
 on:
   push:
     branches:
-      - staging
+      - development
 
 jobs:
   deploy:
@@ -34,3 +34,4 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./dist
+          publish_branch: dev-pages
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -0,0 +1,36 @@
+name: staging deploy
+
+on:
+  push:
+    branches:
+      - staging
+
+jobs:
+  deploy:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '10.x'
+
+      - name: Cache dependencies
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/yarn
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - run: yarn install --frozen-lockfile
+      - run: yarn run test
+      - run: yarn run generate --fail-on-page-error
+      - run: "echo \"User-agent: *\nDisallow *\" > ./dist/robots.txt"
+
+      - name: deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./dist
diff --git a/.gitignore b/.gitignore
@@ -90,3 +90,6 @@ sw.*
 
 # Vim swap files
 *.swp
+
+# Netlify
+.netlify
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # 東京都 新型コロナウイルス対策サイト
 
+![](https://github.com/tokyo-metropolitan-gov/covid19/workflows/production%20deploy/badge.svg)
+
 ![東京都 新型コロナウイルス対策サイト](https://user-images.githubusercontent.com/1301149/75629392-1d19d900-5c25-11ea-843d-2d4376e3a560.png)
 
 
@@ -29,15 +31,20 @@ $ yarn dev
 
 ### ステージング/本番環境への反映
 
-`master` ブランチがアップデートされると、自動的に `production` ブランチにHTML類がbuildされます。そして、本番サイト https://covid19-tokyo.netlify.com/ が更新されます。
+`master` ブランチがアップデートされると、自動的に `production` ブランチにHTML類がbuildされます。そして、本番サイト https://stopcovid19.metro.tokyo.lg.jp/ が更新されます。
 
 `staging` ブランチがアップデートされると、自動的に `gh-pages` ブランチにHTML類がbuildされます。そして、ステージングサイト https://stg-covid19-tokyo.netlify.com/ が更新されます。
 
+`development` ブランチがアップデートされると、自動的に `dev-pages` ブランチにHTML類がbuildされます。そして、開発用サイト https://dev-covid19-tokyo.netlify.com/ が更新されます。
+
 
 If `master` branch is updated, the script will build html files to `production` branch.
-`Netlify` will also update the production site https://covid19-tokyo.netlify.com/ .
+It will also update the production site https://stopcovid19.metro.tokyo.lg.jp/ .
 
 If `staging` branch is updated, the script will build html files to `gh-pages` branch.
-`Netlify` will also update the staging site https://stg-covid19-tokyo.netlify.com/ .
+It will also update the staging site https://stg-covid19-tokyo.netlify.com/ .
+
+If `development` branch is updated, the script will build html files to `dev-pages` branch.
+It will also update the development site https://dev-covid19-tokyo.netlify.com/ .
 
 
diff --git a/assets/variables.scss b/assets/variables.scss
@@ -65,7 +65,7 @@ $small: 450;
 // button
 @mixin text-link {
   @include font-size(14);
-  color: $link;
+  color: $link !important;
   text-decoration: none;
   &:hover {
     text-decoration: underline;

diff --git a/components/DataSelector.vue b/components/DataSelector.vue
@@ -6,10 +6,10 @@
     @change="$emit('input', $event)"
   >
     <v-btn v-ripple="false" value="transition" class="DataSelector-Button">
-      推移
+      日別
     </v-btn>
     <v-btn v-ripple="false" value="cummulative" class="DataSelector-Button">
-      累積
+      累計
     </v-btn>
   </v-btn-toggle>
 </template>

diff --git a/components/DataTable.vue b/components/DataTable.vue
@@ -10,6 +10,7 @@
       :hide-default-footer="true"
       :height="200"
       :fixed-header="true"
+      :mobile-breakpoint="0"
       class="cardTable"
     />
     <template v-slot:infoPanel>
@@ -77,9 +78,9 @@ export default {
       default: ''
     },
     info: {
-        type: Object,
-        required: false,
-        default: () => {}
+      type: Object,
+      required: false,
+      default: () => {}
     }
   }
 }

diff --git a/components/DataView.vue b/components/DataView.vue
@@ -1,6 +1,6 @@
 <template>
   <v-card class="DataView pa-1">
-    <v-toolbar flat>
+    <v-toolbar flat class="DataView-content">
       <div class="DataView-TitleContainer">
         <v-toolbar-title>
           {{ title }}
@@ -32,6 +32,7 @@ export default class DataView extends Vue {
 .DataView {
   &-DataInfo {
     &-summary {
+      color: $gray-2;
       font-family: Hiragino Sans;
       font-style: normal;
       font-size: 30px;
@@ -55,12 +56,19 @@ export default class DataView extends Vue {
 .DataView {
   @include card-container();
   height: 100%;
+  &-content {
+    height: auto !important;
+    .v-toolbar__content {
+      align-items: start;
+    }
+  }
   &-Header {
     background-color: transparent !important;
     height: auto !important;
   }
   &-TitleContainer {
     padding: 14px 0 8px;
+    color: $gray-2;
   }
   &-Title {
     @include card-h2();
@@ -79,7 +87,7 @@ export default class DataView extends Vue {
   }
 }
 .v-toolbar__content {
-  height: 80px !important;
+  height: auto !important;
 }
 .v-toolbar__title {
   white-space: inherit !important;

diff --git a/components/DataViewBasicInfoPanel.vue b/components/DataViewBasicInfoPanel.vue
@@ -2,10 +2,11 @@
   <div class="DataView-DataInfo">
     <span class="DataView-DataInfo-summary">
       {{ lText
-      }}<small class="DataView-DataInfo-summary-unit">{{ unit }}</small>
+      }}
+      <small class="DataView-DataInfo-summary-unit">{{ unit }}</small>
     </span>
     <br />
-    <small class="DataView-DataView-DataInfo-date">{{ sText }}</small>
+    <small class="DataView-DataInfo-date">{{ sText }}</small>
   </div>
 </template>
 
@@ -28,7 +29,7 @@
       display: inline-block;
       font-size: 12px;
       line-height: 12px;
-      color: #808080;
+      color: $gray-3;
     }
   }
 }
@@ -59,7 +60,7 @@
   }
 }
 .v-toolbar__content {
-  height: 80px !important;
+  height: auto !important;
 }
 </style>
 

diff --git a/components/ListItem.vue b/components/ListItem.vue
@@ -3,7 +3,7 @@
     v-ripple="false"
     :to="isInternalLink(link) ? link : ''"
     :href="!isInternalLink(link) ? link : ''"
-    :target="!isInternalLink(link) ? '_brank' : ''"
+    :target="!isInternalLink(link) ? '_blank' : ''"
     router
     exact
     class="ListItem-Container"
@@ -30,8 +30,7 @@
       <v-list-item-title
         :class="[
           'ListItem-Text',
-          isActive(link),
-          isMobile ? 'mobile' : 'desktop'
+          isActive(link)
         ]"
         v-text="title"
       />
@@ -73,12 +72,6 @@ export default class ListItem extends Vue {
   })
   title!: string
 
-  @Prop({
-    default: false,
-    required: true
-  })
-  isMobile!: boolean
-
   isInternalLink(path: string): boolean {
     return !/^https?:\/\//.test(path)
   }
@@ -118,6 +111,7 @@ export default class ListItem extends Vue {
     & .ListItem-Text {
       overflow: visible;
       white-space: normal;
+      font-size: 0.85rem;
     }
     &:hover {
       color: transparent !important;
@@ -181,10 +175,4 @@ svg.isActive {
     fill: $green-1;
   }
 }
-.desktop {
-  font-size: 0.85rem;
-}
-.mobile {
-  font-size: 0.85rem;
-}
 </style>
diff --git a/components/Logo.vue b/components/Logo.vue
diff --git a/components/PageHeader.vue b/components/PageHeader.vue
@@ -18,7 +18,7 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss">
 .header {
   display: flex;
   align-items: flex-end;
@@ -31,6 +31,9 @@ export default {
   line-height: 1;
   font-weight: normal;
   margin: 0 0.5em 0 0;
+  @include lessThan($small) {
+    font-size: 1.25rem;
+  }
 }
 .date {
   font-size: 0.875rem;