From 343ed5416bdafde50986ad54651f29435f4b14d0 Mon Sep 17 00:00:00 2001 From: chienhsiang-hung <77676044+chienhsiang-hung@users.noreply.github.com> Date: Fri, 19 Aug 2022 13:02:01 +0800 Subject: [PATCH 01/13] add floating btn --- index.html | 9 +++ src/floatingbtn.css | 191 ++++++++++++++++++++++++++++++++++++++++++++ src/main.css | 9 +++ 3 files changed, 209 insertions(+) create mode 100644 src/floatingbtn.css diff --git a/index.html b/index.html index 9abbb7f..6152a64 100644 --- a/index.html +++ b/index.html @@ -46,6 +46,7 @@ +
@@ -55,6 +56,14 @@ +
+
+
+

+

+ +
+
+
- - + + diff --git a/src/floatingbtn.css b/src/css/floatingbtn.css similarity index 100% rename from src/floatingbtn.css rename to src/css/floatingbtn.css diff --git a/src/main.css b/src/css/main.css similarity index 100% rename from src/main.css rename to src/css/main.css diff --git a/src/main.js b/src/js/main.js similarity index 100% rename from src/main.js rename to src/js/main.js diff --git a/src/map.js b/src/js/map.js similarity index 100% rename from src/map.js rename to src/js/map.js From f3cdacb588040f56d8b38b437f880de4e6765d6d Mon Sep 17 00:00:00 2001 From: chienhsiang-hung <77676044+chienhsiang-hung@users.noreply.github.com> Date: Fri, 19 Aug 2022 13:13:16 +0800 Subject: [PATCH 04/13] update floating btn --- index.html | 4 ++-- src/css/floatingbtn.css | 16 +++++++--------- src/icon/copied-icon.svg | 1 + src/icon/instruction-icon.svg | 1 + 4 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 src/icon/copied-icon.svg create mode 100644 src/icon/instruction-icon.svg diff --git a/index.html b/index.html index 1dc7258..60af306 100644 --- a/index.html +++ b/index.html @@ -61,8 +61,8 @@
-

+

- + +
diff --git a/src/css/floatingbtn.css b/src/css/floatingbtn.css index c102e98..6fb05d0 100644 --- a/src/css/floatingbtn.css +++ b/src/css/floatingbtn.css @@ -9,15 +9,18 @@ cursor: pointer; box-shadow: 0px 2px 10px rgba(0,0,0,0.2); } + + #floating-button img { + width: 40px; + height: 40px; + top: 7.5; + left: 7.5; + } .plus{ color: black; position: absolute; - top: 0; display: block; - bottom: 0; - left: 0; - right: 0; text-align: center; padding: 0; margin: 0; @@ -51,12 +54,7 @@ .edit{ position: absolute; - top: 0; - display: block; - bottom: 0; - left: 0; display: block; - right: 0; padding: 0; opacity: 0; margin: auto; diff --git a/src/icon/copied-icon.svg b/src/icon/copied-icon.svg new file mode 100644 index 0000000..7553945 --- /dev/null +++ b/src/icon/copied-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icon/instruction-icon.svg b/src/icon/instruction-icon.svg new file mode 100644 index 0000000..b107599 --- /dev/null +++ b/src/icon/instruction-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file From e1494c3d3507a3ebe3a9136f7ac604055e52590a Mon Sep 17 00:00:00 2001 From: chienhsiang-hung <77676044+chienhsiang-hung@users.noreply.github.com> Date: Fri, 19 Aug 2022 13:25:34 +0800 Subject: [PATCH 05/13] Update floatingbtn.css --- src/css/floatingbtn.css | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/css/floatingbtn.css b/src/css/floatingbtn.css index 6fb05d0..a0a2439 100644 --- a/src/css/floatingbtn.css +++ b/src/css/floatingbtn.css @@ -8,19 +8,22 @@ right: 30px; cursor: pointer; box-shadow: 0px 2px 10px rgba(0,0,0,0.2); + text-align: center; } #floating-button img { width: 40px; height: 40px; - top: 7.5; - left: 7.5; } .plus{ color: black; position: absolute; + top: 7.5px; display: block; + bottom: 0; + left: 7.5px; + right: 0; text-align: center; padding: 0; margin: 0; @@ -54,38 +57,43 @@ .edit{ position: absolute; + top: 0; + display: block; + bottom: 0; + left: 0; display: block; + right: 0; padding: 0; opacity: 0; margin: auto; line-height: 65px; - transform: rotateZ(-70deg); + transform: rotate(-70deg); transition: all 0.3s; animation: edit-out 0.3s; } #container-floating:hover .edit{ animation: edit-in 0.2s; - animation-delay: 0.1s; + animation-delay: 0.1s; animation-fill-mode: forwards; } @keyframes edit-in{ - from {opacity: 0; transform: rotateZ(-70deg);} - to {opacity: 1; transform: rotateZ(0deg);} + from {opacity: 0; transform: rotate(-70deg);} + to {opacity: 1; transform: rotate(0deg);} } @keyframes edit-out{ - from {opacity: 1; transform: rotateZ(0deg);} - to {opacity: 0; transform: rotateZ(-70deg);} + from {opacity: 1; transform: rotate(0deg);} + to {opacity: 0; transform: rotate(-70deg);} } @keyframes plus-in{ - from {opacity: 1; transform: rotateZ(0deg);} - to {opacity: 0; transform: rotateZ(180deg);} + from {opacity: 1; transform: rotate(0deg);} + to {opacity: 0; transform: rotate(180deg);} } @keyframes plus-out{ - from {opacity: 0; transform: rotateZ(180deg);} - to {opacity: 1; transform: rotateZ(0deg);} + from {opacity: 0; transform: rotate(180deg);} + to {opacity: 1; transform: rotate(0deg);} } \ No newline at end of file From 0da603de89af05224cb4cf9b92e1b40cdf34be51 Mon Sep 17 00:00:00 2001 From: chienhsiang-hung <77676044+chienhsiang-hung@users.noreply.github.com> Date: Fri, 19 Aug 2022 13:29:15 +0800 Subject: [PATCH 06/13] Update README.md --- README.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 58c4c8e..dfb681a 100644 --- a/README.md +++ b/README.md @@ -18,12 +18,8 @@ 利用國家中醫藥研究所與中醫師公會全國聯合會合作建置公費清冠一號醫療資訊平台 - **公費清冠一號 (供全台民眾查詢)**，供中醫視訊診療需求之COVID-19確診病患、家屬透過 [臺灣清冠一號地圖 Taiwan NRICM101 Map](https://chienhsiang-hung.github.io/NRICM101-map/) ，查詢提供公費清冠ㄧ號之中醫醫療院所名單及當日公費清冠ㄧ號庫存量，以利民眾獲得所需醫療資訊。 -[臺灣清冠一號地圖 Taiwan NRICM101 Map](https://chienhsiang-hung.github.io/NRICM101-map/) 搭配資料來源 [「清冠一號動態表」](https://docs.google.com/spreadsheets/d/e/2PACX-1vQjf_HNeEZKM-XJX-q5v4cfNrB3kcv4gOT8kFbV9rurfoX_H5Qv9112Pv0PgYNFSzbReyNlQkLrJib3/pubhtml) - 如有任何使用建議歡迎[到此提出](https://github.com/chienhsiang-hung/NRICM101-map/issues) -網站聲明請參閱[免責聲明| 臺灣清冠一號地圖 Taiwan NRICM101 Map](https://chienhsiang-hung.github.io/NRICM101-map/immunity.html) - ## 使用API獲取清冠地圖 [清冠地圖API](https://nricm101-map.chienhsiang-hung.eu.org/api/get) 開放給民眾免費使用 @@ -33,6 +29,19 @@ 因資料量大 [清冠地圖API](https://nricm101-map.chienhsiang-hung.eu.org/api/get) 平均讀取時間為數秒。已開放`'Access-Control-Allow-Origin'` to `'*'` ，歡迎其他前端接取免費測試。 +## #Resources + +[臺灣清冠一號地圖 Taiwan NRICM101 Map](https://chienhsiang-hung.github.io/NRICM101-map/) 搭配資料來源 [「清冠一號動態表」](https://docs.google.com/spreadsheets/d/e/2PACX-1vQjf_HNeEZKM-XJX-q5v4cfNrB3kcv4gOT8kFbV9rurfoX_H5Qv9112Pv0PgYNFSzbReyNlQkLrJib3/pubhtml) + +[Leaflet - a JavaScript library for interactive maps](https://leafletjs.com/) + +[Copied icon PNG and SVG Vector](https://uxwing.com/copied-icon/) + +[Instruction icon PNG and SVG Vector](https://uxwing.com/instruction-icon/) + +網站聲明請參閱[免責聲明| 臺灣清冠一號地圖 Taiwan NRICM101 Map](https://chienhsiang-hung.github.io/NRICM101-map/immunity.html) + + ## 一杯咖啡支持更新 感謝有您的支持讓地圖能夠穩定持續更新。 From 12a21e64d5a87330efaffdd6bf2dd576c1b12cbe Mon Sep 17 00:00:00 2001 From: chienhsiang-hung <77676044+chienhsiang-hung@users.noreply.github.com> Date: Fri, 19 Aug 2022 13:31:24 +0800 Subject: [PATCH 07/13] Update floatingbtn.css --- src/css/floatingbtn.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/css/floatingbtn.css b/src/css/floatingbtn.css index a0a2439..3fcb316 100644 --- a/src/css/floatingbtn.css +++ b/src/css/floatingbtn.css @@ -12,17 +12,17 @@ } #floating-button img { - width: 40px; - height: 40px; + width: 35px; + height: 35px; } .plus{ color: black; position: absolute; - top: 7.5px; + top: 10px; display: block; bottom: 0; - left: 7.5px; + left: 10px; right: 0; text-align: center; padding: 0; From 3f11715f6e7dd9840d9fdb722c0a324929423217 Mon Sep 17 00:00:00 2001 From: chienhsiang-hung <77676044+chienhsiang-hung@users.noreply.github.com> Date: Fri, 19 Aug 2022 13:36:24 +0800 Subject: [PATCH 08/13] Update index.html --- index.html | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 60af306..c5d5978 100644 --- a/index.html +++ b/index.html @@ -58,7 +58,7 @@ -
+
@@ -67,6 +67,27 @@
+ + +
From 539cdc2085b9ca64626b21a7043c3f0fa6f5baa3 Mon Sep 17 00:00:00 2001 From: chienhsiang-hung <77676044+chienhsiang-hung@users.noreply.github.com> Date: Fri, 19 Aug 2022 13:51:13 +0800 Subject: [PATCH 11/13] footer byebye --- index.html | 76 +++++++++++++++++++++++++++++------------------- src/css/main.css | 3 +- 2 files changed, 48 insertions(+), 31 deletions(-) diff --git a/index.html b/index.html index df62c63..7e9cda2 100644 --- a/index.html +++ b/index.html @@ -68,45 +68,61 @@
- - - - - + - diff --git a/src/css/main.css b/src/css/main.css index 18c1f42..3158309 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -29,4 +29,5 @@ margin-right: -50%; transform: translate(-50%, -50%); z-index: 10000; - } \ No newline at end of file + } + #exampleModalLong { z-index: 10001; } \ No newline at end of file From b9f1b8864341029a82d8c95a2c536a8d546425c2 Mon Sep 17 00:00:00 2001 From: chienhsiang-hung <77676044+chienhsiang-hung@users.noreply.github.com> Date: Fri, 19 Aug 2022 13:53:51 +0800 Subject: [PATCH 12/13] update bye footer --- src/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/css/main.css b/src/css/main.css index 3158309..2c4fb7f 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -24,7 +24,7 @@ .bottom-right-screen { position: absolute; - bottom: 2%; + bottom: 1%; left: 99%; margin-right: -50%; transform: translate(-50%, -50%); From 0f1534853dab7a0c3e4c7133c0b6da5254876b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=AA=E5=81=A5=E7=BF=94=20Hung=2C=20Chien-Hsiang?= Date: Fri, 19 Aug 2022 13:56:15 +0800 Subject: [PATCH 13/13] Update main.css --- src/css/main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/css/main.css b/src/css/main.css index 2c4fb7f..35209eb 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -3,7 +3,7 @@ height: 100%; } #map { - height: calc(100% - 42px); + height: 100%; } a, a:hover {color: inherit;} @@ -30,4 +30,4 @@ transform: translate(-50%, -50%); z-index: 10000; } - #exampleModalLong { z-index: 10001; } \ No newline at end of file + #exampleModalLong { z-index: 10001; }