Skip to content

Commit

Permalink
【本番反映】最新のお知らせから奈良県対処方針(6.05)を削除 (#285)
Browse files Browse the repository at this point in the history
* Dev naracity (#50)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Add Naracity Page, 感染動向表、検査数グラフ、相談数グラフの追加

* Modify Naracity Page 感染動向表

* Add 感染動向表に外枠等を追加

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Dev naracity (#81)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Update data.json/news.json (#45)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* Delete 退院には、死亡退院を含む

* Add Naracity Page, 感染動向表、検査数グラフ、相談数グラフの追加

* Modify Naracity Page 感染動向表

* Add 感染動向表に外枠等を追加

* Updata data.json on 3/27

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* update data.json, 陽性者グラフの初期表示を類型に (#52)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* update data.json and news.json by News Relsese on 3/28

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

* 【本番反映】感染者データ更新(3/28)と「 貢献の仕方」の修正 (#58)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* 県内の感染動向に「入院患者数の状況」を追加 (#62)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update data.json (#63)

* Update news.json (#64)

* Updete last_update in main_summary.json

* Add CircleChart 入院患者数と残り病床数

* Updade 4/1 and Add 入院患者数表 (#65)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

* 県内の感染動向に「入院患者数の状況」を追加 (#62)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update data.json (#63)

* Update news.json (#64)

* Updete last_update in main_summary.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* 入院患者数と病床数の円グラフを追加 (#66)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "入院患者数と病床数の円グラフを追加 (#66)"

This reverts commit 6ea7260.

* WIP add chart.d.ts

* Update data.json (#69)

* Update main_summary.json (#68)

* Update news.json (#67)

* Update data on 2nd Apr. (#70)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

* 県内の感染動向に「入院患者数の状況」を追加 (#62)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update data.json (#63)

* Update news.json (#64)

* Updete last_update in main_summary.json

* 入院患者数と病床数の円グラフを追加 (#66)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "入院患者数と病床数の円グラフを追加 (#66)"

This reverts commit 6ea7260.

* Update data.json (#69)

* Update main_summary.json (#68)

* Update news.json (#67)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* Add nuxt-i18n.config.ts

* Add nuxt-i18n to tsconfig.json

* Update ogp.png, resized

* 入院患者数と病床数の円グラフの追加 (#71)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

* WIP add chart.d.ts

* Add nuxt-i18n.config.ts

* Add nuxt-i18n to tsconfig.json

* Update ogp.png, resized

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #72 (#73)

4/3  update data.json +2

* Update news release on 4/3 

Issue #73

* 4/3のデータ更新と病床数円グラフの追加 (#74)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

* 県内の感染動向に「入院患者数の状況」を追加 (#62)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update data.json (#63)

* Update news.json (#64)

* Updete last_update in main_summary.json

* 入院患者数と病床数の円グラフを追加 (#66)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "入院患者数と病床数の円グラフを追加 (#66)"

This reverts commit 6ea7260.

* Update data.json (#69)

* Update main_summary.json (#68)

* Update news.json (#67)

* 入院患者数と病床数の円グラフの追加 (#71)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

* WIP add chart.d.ts

* Add nuxt-i18n.config.ts

* Add nuxt-i18n to tsconfig.json

* Update ogp.png, resized

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #72 (#73)

4/3  update data.json +2

* Update news release on 4/3 

Issue #73

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* 4/4の感染確認分の追加 (#76)

* Update data.json

* Update main_summary.json

* Update news.json

* Update sickbeds_summary.json

* Update sickbeds_summary.json

* 4/4の感染確認分の追加(更新日の更新漏れ) (#78)

* Update data.json

* Update main_summary.json

* Update news.json

* Update sickbeds_summary.json

* Update sickbeds_summary.json

* Update data.json

* Update sickbeds_summary.json

Co-authored-by: Yasushi IS <[email protected]>

* Fix PC検査グラフ, Update data_naracity.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* 奈良市感染動向ページに奈良市提供のデータを追加。 (#101)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Add Naracity Page, 感染動向表、検査数グラフ、相談数グラフの追加

* Modify Naracity Page 感染動向表

* Add 感染動向表に外枠等を追加

* update data_naracity.json/奈良市のデータ

* Delete News-Section from 奈良市感染動向 and Update data_naracity.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* FIX サイドバーのリンク順。奈良市の感染動向を心配な時の上に

* Modify 更新 to 時点, Add note to 陽性者数 in 奈良市

* 陽性者の属性カードの右上の合計数に main_summary の陽性者数を表示

* Issue #192 fix link

* Issue #195 入院者数の状況の「入院者数」を「感染者数」に修正

* Use data.json only for Nara pref / 奈良県データをdata.json一つに統合

* update data.json

* update data.json made from GoogleSpreadSheet

* WIP fix 奈良市の検査陽性者の状況

* FIX naracity using anather svgCard for naracity

* Change Link in naracity.vue

* Modify design of 状況表

* WIP: mod workflow/develop.yml

* WIP: mod workflow/development.yml

* Delete 重症 from ConfirmedCasesTable

* Update workflow to use stopcovid19.code4nara.org/api/

* update data/data_naracity.json

* Fix delete naracity.json

* update workflow daily.yml

* FIX #217 「陽性者の属性」の居住地がすべて「不明」

* FIX #217 「陽性者の属性」の居住地がすべて「不明」

* update json

* Updete workflow, set rsync deploy

* Updete workflow, set rsync deploy test

* Updete workflow, set rsync deploy test add Set Key

* Updete workflow, set rsync deploy test delete tab

* Updete workflow, set rsync deploy test fix run rsync

* Updete workflow, set rsync deploy test fix run rsync

* Updete workflow, set rsync deploy test fix run rsync2

* Updete workflow, set rsync deploy test fix run rsync3

* Updete workflow, set rsync deploy test fix run rsync4

* Updete workflow, set rsync deploy test fix run rsync5

* Add COMMENTED rsync deploy function

* FIX word in PCR-Graph, 奈良市 to 奈良県

* Update deployment.yml

* WIP update 市町村関連ページ data/municipalities-data.json

* Update municipalitues, Totukawa and Kamikitayama

* Update municipalities-data.json, 平群町、川西町、宇陀市、桜井市、下市町、川上村

* Delete 奈良市内の最新感染動向 from SideBar

* add PCR検査陽性率グラフ

* data/data.json

* 陽性率の値の取り方を修正

* delete weeklizer.ts

* Delete package-lock.json

* update yarn.lock, add linq

* mod comment/陽性率グラフのコメント修正とデータの更新

* Update Workflow: Add staging branch, finx municipalities.json

* "PCR検査実施数"を"PCR等検査実施数"に変更 (#276)

* Update Workflow: Add staging branch, finx municipalities.json

* Update index.vue

グラフタイトル「PCR検査実施数」を、2020年9月1日以降は、PCR検査以外に抗原検査の検査数も含まれるという意味で「PCR等検査実施数」と変更
#271

* Update JSON (#275)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* Readme.mdの更新&github/workflowの更新 (#279)

* Update Workflow: Add staging branch, finx municipalities.json

* Update index.vue

グラフタイトル「PCR検査実施数」を、2020年9月1日以降は、PCR検査以外に抗原検査の検査数も含まれるという意味で「PCR等検査実施数」と変更
#271

* Update JSON (#275)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update README.md

Add Staging URL and branches

* FIX type FIX type in README.md

* Recover .github/workflow/deployment.yml and build.yml

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* deployment.ymlの追加 (#280)

* Update Workflow: Add staging branch, finx municipalities.json

* Update index.vue

グラフタイトル「PCR検査実施数」を、2020年9月1日以降は、PCR検査以外に抗原検査の検査数も含まれるという意味で「PCR等検査実施数」と変更
#271

* Update JSON (#275)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update README.md

Add Staging URL and branches

* FIX type FIX type in README.md

* Recover .github/workflow/deployment.yml and build.yml

* Enable cron schddule Update daily.yml

cronにより毎日20時に実行

* Add deployment.yml for recover

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* 最新のお知らせから奈良県対処方針(6.05)を削除 (#284)

* Update Workflow: Add staging branch, finx municipalities.json

* Update index.vue

グラフタイトル「PCR検査実施数」を、2020年9月1日以降は、PCR検査以外に抗原検査の検査数も含まれるという意味で「PCR等検査実施数」と変更
#271

* Update JSON (#275)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update README.md

Add Staging URL and branches

* FIX type FIX type in README.md

* Recover .github/workflow/deployment.yml and build.yml

* Enable cron schddule Update daily.yml

cronにより毎日20時に実行

* Add deployment.yml for recover

* 最新のお知らせに記載していた対処方針(6.05方針)が古くなったため、表記ごと削除する。 (#283)

* Add Workflow daployment2

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>
Co-authored-by: heimax222 <[email protected]>
  • Loading branch information
5 people authored Dec 9, 2020
1 parent ac28cac commit 1a398e8
Show file tree
Hide file tree
Showing 4 changed files with 176 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/daily.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Daily Deployment

on:
# schedule:
# - cron: 0 12 * * * # 日本時間20:00に実行
schedule:
- cron: 0 12 * * * # 日本時間20:00に実行

jobs:
build:
Expand Down
87 changes: 87 additions & 0 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
# deploymentイベントをトリガーに実行されるGitHub Actionsジョブ
name: deployment

on:
deployment:

jobs:
deploy:
runs-on: ubuntu-18.04
steps:
- name: Dump GitHub context
run: |
echo "$GITHUB_CONTEXT"
env:
GITHUB_CONTEXT: ${{ toJson(github) }}

- name: Update deploy status to in_progress
uses: rsotnychenko/[email protected]
with:
status: "in_progress"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- 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

- name: Fetch & build data
run: |
# 奈良市データを所定のサーバーから取得 (TODO: newsが上記処理と重複しているのを直す)
rm data/data.json
rm data/news.json
rm data/data_naracity.json
curl -L https://stopcovid19.code4nara.org/api/data.json -o data/data.json
curl -L https://stopcovid19.code4nara.org/api/news.json -o data/news.json
curl -L https://stopcovid19.code4nara.org/api/data_naracity.json -o data/data_naracity.json
- run: yarn run generate:deploy --fail-on-page-error

- name: set robots.txt
if: github.event.deployment.ref == 'development'
run: "echo \"User-agent: *\nDisallow *\" > ./dist/robots.txt"

- name: deploy for development
if: github.event.deployment.ref == 'development'
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./dist
publish_branch: dev-pages

#- name: rsync deploy for development
# if: github.event.deployment.ref == 'development'
# uses: peaceiris/actions-gh-pages@v3
# with:
# rsync -auzrv -e "ssh -i ~/.ssh/id_25519_github -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 65522" ./data/* [email protected]:/home/ishizuka/test/

- name: deploy for production
if: github.event.deployment.ref == 'master'
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./dist
publish_branch: production

- name: Update deploy status to success|failure|cancelled
if: always()
uses: rsotnychenko/[email protected]
with:
status: ${{ job.status }}
auto_inactive: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
87 changes: 87 additions & 0 deletions .github/workflows/deployment2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
# deploymentイベントをトリガーに実行されるGitHub Actionsジョブ
name: deployment

on:
deployment:

jobs:
deploy:
runs-on: ubuntu-18.04
steps:
- name: Dump GitHub context
run: |
echo "$GITHUB_CONTEXT"
env:
GITHUB_CONTEXT: ${{ toJson(github) }}

- name: Update deploy status to in_progress
uses: rsotnychenko/[email protected]
with:
status: "in_progress"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- 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

- name: Fetch & build data
run: |
# 奈良市データを所定のサーバーから取得 (TODO: newsが上記処理と重複しているのを直す)
rm data/data.json
rm data/news.json
rm data/data_naracity.json
curl -L https://stopcovid19.code4nara.org/api/data.json -o data/data.json
curl -L https://stopcovid19.code4nara.org/api/news.json -o data/news.json
curl -L https://stopcovid19.code4nara.org/api/data_naracity.json -o data/data_naracity.json
- run: yarn run generate:deploy --fail-on-page-error

- name: set robots.txt
if: github.event.deployment.ref == 'development'
run: "echo \"User-agent: *\nDisallow *\" > ./dist/robots.txt"

- name: deploy for development
if: github.event.deployment.ref == 'development'
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./dist
publish_branch: dev-pages

#- name: rsync deploy for development
# if: github.event.deployment.ref == 'development'
# uses: peaceiris/actions-gh-pages@v3
# with:
# rsync -auzrv -e "ssh -i ~/.ssh/id_25519_github -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 65522" ./data/* [email protected]:/home/ishizuka/test/

- name: deploy for production
if: github.event.deployment.ref == 'master'
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./dist
publish_branch: production

- name: Update deploy status to success|failure|cancelled
if: always()
uses: rsotnychenko/[email protected]
with:
status: ${{ job.status }}
auto_inactive: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8 changes: 0 additions & 8 deletions components/WhatsNew.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@
</v-icon>
{{ $t('最新のお知らせ') }}
</h3>
<span class="WhatsNew-link-to-emergency-page">
<v-icon size="20" class="WhatsNew-link-to-emergency-page-icon">
mdi-bullhorn
</v-icon>
<external-link url="http://www.pref.nara.jp/55540.htm">
{{ $t('奈良県対処方針(6.05方針)') }}
</external-link>
</span>
</div>
<ul class="WhatsNew-list">
<li v-for="(item, i) in limitCount" :key="i" class="WhatsNew-list-item">
Expand Down

0 comments on commit 1a398e8

Please sign in to comment.