Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.

Release 2020-05-26 18:17:56 +0900 #245

Merged
merged 14 commits into from
May 26, 2020
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .git-pr-release
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[pr-release "branch"]
staging = staging
production = master

1 change: 1 addition & 0 deletions assets/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
"サイドメニュー項目を開く": "Open side menu items",
"サイドメニュー項目を閉じる": "Close side menu items",
"お子様をお持ちの皆様へ": "To families with children",
"子供の皆様へ": "こどものみなさん",
"県民の皆様へ": "To the residents of Miyazaki",
"宮崎県新型コロナウイルス感染症関連情報": "Information on the new coronavirus infection in Miyazaki Prefecture",
"宮崎県主催イベント等の開催に関する基準": "Standards for Holding Events Organized by Miyazaki Prefecture",
Expand Down
1 change: 1 addition & 0 deletions assets/locales/ja-Hira.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
"print": "印刷(いんさつ)",
"サイドメニュー項目を開く": "なにか 知(し)りたいときに ひだりの サイドメニューボタンを おす",
"サイドメニュー項目を閉じる": "なにか 知(し)りたいときに ひだりの サイドメニューボタンを とじる",
"子供の皆様へ": "こどものみなさん",
"県民の皆様へ": "宮崎県(みやざきけん)に すんでいる 人(ひと)",
"宮崎県新型コロナウイルス感染症関連情報": "宮崎県(みやざきけん)からの おしらせ",
"宮崎県主催イベント等の開催に関する基準": "あつまりを やめる めやす",
Expand Down
1 change: 1 addition & 0 deletions assets/locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
"サイドメニュー項目を開く": "サイドメニュー項目を開く",
"サイドメニュー項目を閉じる": "サイドメニュー項目を閉じる",
"お子様をお持ちの皆様へ": "お子様をお持ちの皆様へ",
"子供の皆様へ": "こどものみなさん",
"県民の皆様へ": "県民の皆様へ",
"宮崎県新型コロナウイルス感染症対策本部報": "宮崎県新型コロナウイルス感染症対策本部報",
"宮崎県主催等 中止又は延期するイベント等": "宮崎県主催等 中止又は延期するイベント等",
Expand Down
12 changes: 6 additions & 6 deletions components/LanguageSelector.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<template>
<div class="LauguageSelector">
<div class="LauguageSelector-Background">
<div class="LanguageSelector">
<div class="LanguageSelector-Background">
<EarthIcon class="EarthIcon" aria-hidden="true" />
<SelectMenuIcon class="SelectMenuIcon" aria-hidden="true" />
</div>
<select
id="LanguageSelector"
v-model="currentLocaleCode"
class="LauguageSelector-Menu"
class="LanguageSelector-Menu"
@change="handleChangeLanguage"
>
<option
Expand Down Expand Up @@ -50,11 +50,11 @@ export default Vue.extend({
</script>

<style lang="scss" scoped>
.LauguageSelector {
.LanguageSelector {
position: relative;
}
.LauguageSelector-Background {
.LanguageSelector-Background {
display: flex;
align-items: center;
padding: 0 6px;
Expand All @@ -77,7 +77,7 @@ export default Vue.extend({
}
}
.LauguageSelector-Menu {
.LanguageSelector-Menu {
// select 要素のリセット
-webkit-appearance: none;
-moz-appearance: none;
Expand Down
7 changes: 4 additions & 3 deletions components/MenuList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,10 @@ export default Vue.extend({
padding: 12px 0;
border-bottom: 1px solid $gray-4;

@include largerThan($small) {
border-top: 1px solid $gray-4;
}
// Issue #225 のため除去
// @include largerThan($small) {
// border-top: 1px solid $gray-4;
// }
}

.MenuList-Item {
Expand Down
10 changes: 8 additions & 2 deletions components/SideNavigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
</v-icon>

<nav class="SideNavigation-Menu">
<MenuList :items="items" @click="$emit('closeNavi', $event)" />
<div
v-if="this.$i18n.locales.length > 1"
class="SideNavigation-Language"
Expand All @@ -42,6 +41,7 @@
</label>
<LanguageSelector />
</div>
<MenuList :items="items" @click="$emit('closeNavi', $event)" />
</nav>

<footer class="SideNavigation-Footer">
Expand Down Expand Up @@ -128,6 +128,12 @@ export default Vue.extend({
computed: {
items(): Item[] {
return [
{
icon: 'mdi-human-child',
title: this.$t('子供の皆様へ'),
link: this.switchLocalePath('ja-basic'),
divider: true
},
{
icon: 'mdi-chart-timeline-variant',
title: this.$t('県内の最新感染動向'),
Expand Down Expand Up @@ -381,7 +387,7 @@ export default Vue.extend({
}

.SideNavigation-Language {
padding-top: 20px;
padding-bottom: 5px;
}

.SideNavigation-LanguageLabel {
Expand Down
32 changes: 16 additions & 16 deletions data/data.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"lastUpdate": "2020/05/09",
"lastUpdate": "2020/05/26",
"patients": {
"date": "2020/05/09",
"date": "2020/05/26",
"data": [
{
"リリース日": "2020-03-04T08:00:00.000Z",
Expand Down Expand Up @@ -49,15 +49,15 @@
"年代": "10代",
"性別": "女性",
"退院": "退院",
"date": "2020-04-26"
"date": "2020-04-26"
},
{
"リリース日": "2020-04-05T08:00:00.000Z",
"居住地": "東京都",
"年代": "50代",
"性別": "男性",
"退院": "入院中",
"date": "2020-04-03"
"退院": "退院",
"date": "2020-05-26"
},
{
"リリース日": "2020-04-05T08:00:00.000Z",
Expand Down Expand Up @@ -96,8 +96,8 @@
"居住地": "日南市",
"年代": "50代",
"性別": "男性",
"退院": "入院中",
"date": "2020-04-07"
"退院": "退院",
"date": "2020-05-26"
},
{
"リリース日": "2020-04-08T08:00:00.000Z",
Expand All @@ -112,24 +112,24 @@
"居住地": "日南市",
"年代": "10代",
"性別": "女性",
"退院": "入院中",
"date": "2020-04-08"
"退院": "退院",
"date": "2020-05-26"
},
{
"リリース日": "2020-04-08T08:00:00.000Z",
"居住地": "日南市",
"年代": "10代",
"性別": "男性",
"退院": "入院中",
"date": "2020-04-08"
"退院": "退院",
"date": "2020-05-26"
},
{
"リリース日": "2020-04-08T08:00:00.000Z",
"居住地": "日南市",
"年代": "10代",
"性別": "男性",
"退院": "入院中",
"date": "2020-04-08"
"退院": "退院",
"date": "2020-05-26"
},
{
"リリース日": "2020-04-11T08:00:00.000Z",
Expand All @@ -151,11 +151,11 @@
"children": [
{
"attr": "入院中",
"value": 5,
"value": 0,
"children": [
{
"attr": "軽症・中等症",
"value": 5
"value": 0
},
{
"attr": "重症",
Expand All @@ -165,7 +165,7 @@
},
{
"attr": "退院",
"value": 12
"value": 17
},
{
"attr": "死亡",
Expand Down
11 changes: 11 additions & 0 deletions pages/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@
<t-i18n>{{ $t('注釈') }}</t-i18n>
</div>
</div>
<static-info
class="mb-4"
:url="
'https://www.pref.miyazaki.lg.jp/kansensho-taisaku/kenko/hoken/kinkyujitaisengen_covid19.html'
"
:text="
$t(
'「緊急事態宣言」が全国一律で5月末まで延長され、また国の基本的対処方針が改定されました'
TakaShinoda marked this conversation as resolved.
Show resolved Hide resolved
)
"
/>
<whats-new class="mb-4" :items="newsItems" />
<static-info
class="mb-4"
Expand Down