Skip to content
This repository has been archived by the owner on Jun 1, 2023. It is now read-only.

Commit

Permalink
Merge pull request #515 from kawoka/fix-lint
Browse files Browse the repository at this point in the history
fix: lint errorでコミットできない問題修正
  • Loading branch information
yokinist authored Mar 6, 2020
2 parents 9a0cb65 + 659a762 commit 5f0ab05
Show file tree
Hide file tree
Showing 7 changed files with 540 additions and 180 deletions.
9 changes: 7 additions & 2 deletions components/DataView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,17 @@
<v-spacer />
<slot name="infoPanel" />
</v-toolbar>
<v-card-text :class="$vuetify.breakpoint.xs ? 'DataView-CardTextForXS' : 'DataView-CardText'">
<v-card-text
:class="
$vuetify.breakpoint.xs ? 'DataView-CardTextForXS' : 'DataView-CardText'
"
>
<slot />
</v-card-text>
<v-footer class="DataView-Footer">
<time :datetime="date">{{ date }} 更新</time>
<a v-if="url" class="OpenDataLink" :href="url" target="_blank" rel="noopener">オープンデータへのリンク
<a v-if="url" class="OpenDataLink" :href="url" target="_blank" rel="noopener">
オープンデータへのリンク
<v-icon class="ExternalLinkIcon" size="15">
mdi-open-in-new
</v-icon>
Expand Down
537 changes: 399 additions & 138 deletions components/DesktopFlowSvg.vue

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions components/ListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
</v-list-item-action>
<v-list-item-content class="ListItem-TextContainer">
<v-list-item-title
:class="[
'ListItem-Text',
isActive(link)
]"
:class="['ListItem-Text', isActive(link)]"
v-text="title"
/>
</v-list-item-content>
Expand Down
2 changes: 1 addition & 1 deletion components/PageHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<script>
export default {
props: ['title', 'icon', 'date'],
props: ['title', 'icon', 'date']
}
</script>

Expand Down
6 changes: 4 additions & 2 deletions components/WhatsNew.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<template>
<div class="WhatsNew">
<h2 class="WhatsNew-heading">
<v-icon size="24" class="WhatsNew-heading-icon">mdi-information</v-icon>
<v-icon size="24" class="WhatsNew-heading-icon">
mdi-information
</v-icon>
最新のお知らせ
</h2>
<div v-for="(item, i) in items" :key="i">
Expand All @@ -25,7 +27,7 @@ export default {
</script>

<style lang="scss">
.WhatsNew{
.WhatsNew {
@include card-container();
padding: 10px;
margin-bottom: 20px;
Expand Down
153 changes: 122 additions & 31 deletions pages/flow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<div class="Flow">
<div class="Flow-Heading">
<CovidIcon />
<h2 class="Flow-Heading-Title">新型コロナウイルス感染症が心配なときに</h2>
<h2 class="Flow-Heading-Title">
新型コロナウイルス感染症が心配なときに
</h2>
</div>
<div class="Flow-Card">
<h2>
Expand All @@ -14,53 +16,103 @@
<div class="only-sp">
<div class="Flow-Card-Parts">
<div class="mb-5">
<img src="/flow/sp/[email protected]" alt="発症前2週間以内の出来ごとと症状/「新型コロナウイルス感染者」と濃厚接触をした方/発熱または呼吸器症状" />
<img
src="/flow/sp/[email protected]"
alt="発症前2週間以内の出来ごとと症状/「新型コロナウイルス感染者」と濃厚接触をした方/発熱または呼吸器症状"
/>
</div>
<div class="mx-2 mb-5">
<img src="/flow/sp/[email protected]" alt="流行地域への渡航・居住歴がある方 ご本人か濃厚接触をした方/呼吸器症状かつ発熱37.5℃以上" />
<img
src="/flow/sp/[email protected]"
alt="流行地域への渡航・居住歴がある方 ご本人か濃厚接触をした方/呼吸器症状かつ発熱37.5℃以上"
/>
</div>
<div>
<a href="#consult"><img src="/flow/sp/[email protected]" alt="新型コロナ受診相談窓口へ" /></a>
<a href="#consult">
<img
src="/flow/sp/[email protected]"
alt="新型コロナ受診相談窓口へ"
/>
</a>
</div>
</div>
<div class="Flow-Card-Parts">
<div class="mx-2 mb-5">
<img src="/flow/sp/[email protected]" alt="一般の方/風邪のような症状・発熱37.5℃以上・強いだるさ・息苦しさ/4日以上続いている" />
<img
src="/flow/sp/[email protected]"
alt="一般の方/風邪のような症状・発熱37.5℃以上・強いだるさ・息苦しさ/4日以上続いている"
/>
</div>
<div>
<a href="#consult"><img src="/flow/sp/[email protected]" alt="新型コロナ受診相談窓口へ" /></a>
<a href="#consult">
<img
src="/flow/sp/[email protected]"
alt="新型コロナ受診相談窓口へ"
/>
</a>
</div>
</div>
<div class="Flow-Card-Parts">
<div class="mx-2 mb-5">
<img src="/flow/sp/[email protected]" alt="ご高齢な方・基礎疾患のある方・妊娠中の方/風邪のような症状・発熱37.5℃以上・強いだるさ・息苦しさ/2日以上続いている" />
<img
src="/flow/sp/[email protected]"
alt="ご高齢な方・基礎疾患のある方・妊娠中の方/風邪のような症状・発熱37.5℃以上・強いだるさ・息苦しさ/2日以上続いている"
/>
</div>
<div>
<a href="#consult"><img src="/flow/sp/[email protected]" alt="新型コロナ受診相談窓口へ" /></a>
<a href="#consult">
<img
src="/flow/sp/[email protected]"
alt="新型コロナ受診相談窓口へ"
/>
</a>
</div>
</div>
<div class="Flow-Card-Parts">
<div class="mx-2 mb-5">
<img src="/flow/sp/[email protected]" alt="不安に思う方/微熱・軽い咳・感染の不安/新型コロナコールセンター 午前9時から午後9時(土日祝含む)" />
<img
src="/flow/sp/[email protected]"
alt="不安に思う方/微熱・軽い咳・感染の不安/新型コロナコールセンター 午前9時から午後9時(土日祝含む)"
/>
</div>
<div class="TelLink">
<a href="tel:0570550571"><img src="/flow/sp/[email protected]" alt="0570-550571" /></a>
<a href="tel:0570550571"
><img src="/flow/sp/[email protected]" alt="0570-550571"
/></a>
</div>
<div class="mt-4">
<a href="#consult"><img src="/flow/sp/[email protected]" alt="専門的な助言が必要な場合"></a>
<a href="#consult">
<img
src="/flow/sp/[email protected]"
alt="専門的な助言が必要な場合"
/>
</a>
</div>
</div>
<div class="Flow-Card-Parts Flat" id="consult">
<h3 class="SodanHeader Title">新型コロナ受診相談窓口</h3>
<p class="SodanHeader">帰国者・接触者電話相談センター</p>
<div id="consult" class="Flow-Card-Parts Flat">
<h3 class="SodanHeader Title">
新型コロナ受診相談窓口
</h3>
<p class="SodanHeader">
帰国者・接触者電話相談センター
</p>
<div class="SodanHeader">
<div class="SodanChip">24時間対応</div>
<div class="SodanChip">
24時間対応
</div>
</div>
<dl>
<div class="SodanHeijitsu">
<dt class="Heijitsu">平日(日中)</dt>
<dt class="Heijitsu">
平日(日中)
</dt>
<dd>
<a class="Link" href="https://www.fukushihoken.metro.tokyo.lg.jp/iryo/kansen/coronasodan.html" target="_blank" rel="noopener">
<a
class="Link"
href="https://www.fukushihoken.metro.tokyo.lg.jp/iryo/kansen/coronasodan.html"
target="_blank"
rel="noopener"
>
各保健所の電話番号は福祉保健局HPへ
<v-icon size="16">
mdi-open-in-new
Expand All @@ -69,41 +121,80 @@
</dd>
</div>
<div class="SodanYakan">
<dt class="Yakan">平日(夜間)<br /><span class="SodanTime">午後5時から翌朝午前9時</span><br />土日祝 終日</dt>
<dd class="TelLink"><a href="tel:0353204592"><img src="/flow/sp/[email protected]" alt="03-5320-4592" /></a></dd>
<dt class="Yakan">
平日(夜間)
<br />
<span class="SodanTime">午後5時から翌朝午前9時</span>
<br />
土日祝 終日
</dt>
<dd class="TelLink">
<a href="tel:0353204592">
<img
src="/flow/sp/[email protected]"
alt="03-5320-4592"
/>
</a>
</dd>
</div>
</dl>
</div>
<div class="Flow-Card-Parts">
<div class="mx-2 mb-5">
<img src="/flow/sp/[email protected]" alt="新型コロナ受診相談窓口による相談結果/新型コロナ外来受診が必要と判断された場合/新型コロナ外来(帰国者・接触者外来)医師による判断" />
<img
src="/flow/sp/[email protected]"
alt="新型コロナ受診相談窓口による相談結果/新型コロナ外来受診が必要と判断された場合/新型コロナ外来(帰国者・接触者外来)医師による判断"
/>
</div>
<div class="Col2Btn">
<div class="mx-1 mb-5">
<a href="#not_required"><img src="/flow/sp/[email protected]" alt="検査の必要なし" /></a>
<a href="#not_required">
<img
src="/flow/sp/[email protected]"
alt="検査の必要なし"
/>
</a>
</div>
<div class="mx-1 mb-5">
<a href="#pcr"><img src="/flow/sp/[email protected]" alt="検査の必要あり" /></a>
<a href="#pcr">
<img
src="/flow/sp/[email protected]"
alt="検査の必要あり"
/>
</a>
</div>
</div>
<div class="mx-2 mb-5" id="pcr">
<img src="/flow/sp/[email protected]" alt="PCR検査 東京都健康安全研究センター等" />
<div id="pcr" class="mx-2 mb-5">
<img
src="/flow/sp/[email protected]"
alt="PCR検査 東京都健康安全研究センター等"
/>
</div>
<div class="Col2Btn">
<div class="mx-1 mb-5">
<a href="#not_required"><img src="/flow/sp/[email protected]" alt="陰性" /></a>
<a href="#not_required">
<img src="/flow/sp/[email protected]" alt="陰性" />
</a>
</div>
<div class="mx-1 mb-5">
<a href="#hospitalized"><img src="/flow/sp/[email protected]" alt="陽性" /></a>
<a href="#hospitalized">
<img src="/flow/sp/[email protected]" alt="陽性" />
</a>
</div>
</div>
<div class="mx-2" id="not_required">
<img src="/flow/sp/[email protected]" alt="新型コロナ外来受診が不要と判断された場合/自宅で安静に過ごす・一般の医療機関を受診/症状が良くならない場合は新型コロナ受診相談窓口に相談" />
<div id="not_required" class="mx-2">
<img
src="/flow/sp/[email protected]"
alt="新型コロナ外来受診が不要と判断された場合/自宅で安静に過ごす・一般の医療機関を受診/症状が良くならない場合は新型コロナ受診相談窓口に相談"
/>
</div>
</div>
<div class="Flow-Card-Parts" id="hospitalized">
<div id="hospitalized" class="Flow-Card-Parts">
<div class="Smaller">
<img src="/flow/sp/[email protected]" alt="入院となります/感染症指定医療機関等" />
<img
src="/flow/sp/[email protected]"
alt="入院となります/感染症指定医療機関等"
/>
</div>
</div>
</div>
Expand All @@ -126,7 +217,7 @@
import CovidIcon from '@/static/covid.svg'
import DesktopFlowSvg from '@/components/DesktopFlowSvg.vue'
export default {
components: { CovidIcon, DesktopFlowSvg},
components: { CovidIcon, DesktopFlowSvg },
head() {
return {
title: '新型コロナウイルス感染症が心配なときに'
Expand Down
8 changes: 6 additions & 2 deletions pages/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
:chart-data="patientsGraph"
:date="Data.patients.date"
:unit="'人'"
:url="'https://catalog.data.metro.tokyo.lg.jp/dataset/t000010d0000000068'"
:url="
'https://catalog.data.metro.tokyo.lg.jp/dataset/t000010d0000000068'
"
/>
</v-col>
<v-col cols="12" md="6" class="DataCard">
Expand All @@ -37,7 +39,9 @@
:chart-option="{}"
:date="Data.patients.date"
:info="sumInfoOfPatients"
:url="'https://catalog.data.metro.tokyo.lg.jp/dataset/t000010d0000000068'"
:url="
'https://catalog.data.metro.tokyo.lg.jp/dataset/t000010d0000000068'
"
/>
</v-col>
<v-col cols="12" md="6" class="DataCard">
Expand Down

0 comments on commit 5f0ab05

Please sign in to comment.