From c3669b1a48627dea59d12c00ed42fedb95164dcc Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Wed, 29 Sep 2021 20:50:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20change=20=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E8=BF=BD=E8=B9=A4=20to=20=E7=AD=89=E5=BE=85=E6=96=B0=E4=BA=8B?= =?UTF-8?q?=E8=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/types.ts b/src/types.ts index e04209f..f143869 100644 --- a/src/types.ts +++ b/src/types.ts @@ -21,7 +21,7 @@ export const defaultFactoryDisplayStatuses = [ 'default', 0, 1, 2, 3 ] as FactoryDisplayStatusType[] -type DocumentDisplayStatus = '已檢舉' | '已排程稽查' | '陳述意見期' | '已勒令停工' | '已發函斷電' | '已排程拆除' | '已拆除' | '不再追蹤' +type DocumentDisplayStatus = '已檢舉' | '已排程稽查' | '陳述意見期' | '已勒令停工' | '已發函斷電' | '已排程拆除' | '已拆除' | '等待新事證' type FactoryDisplayStatus = { type: FactoryDisplayStatusType, @@ -57,7 +57,7 @@ export const FactoryDisplayStatuses: FactoryDisplayStatus[] = [ { type: 3, name: '無法處理', - documentDisplayStatuses: ['不再追蹤'], + documentDisplayStatuses: ['等待新事證'], color: '#E0E0E0' } ] From 122d1cc2e853b18be58c4f1ecdb382b2ef32ae29 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Wed, 29 Sep 2021 21:33:24 +0800 Subject: [PATCH 2/5] Update issue templates fixes #119 --- .github/ISSUE_TEMPLATE/bug_report.md | 46 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++ 2 files changed, 66 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..c94b788 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,46 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: bug +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. +請清晰詳細的描述這個問題 + + +**To Reproduce** +Steps to reproduce the behavior: +列出可以重現問題的步驟： + +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. +截圖 + +**Desktop (please complete the following information):** + + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** + +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..bbcbbe7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From 7f2914c68468377c064e027ad51e0d15006bc90c Mon Sep 17 00:00:00 2001 From: Caleb Rogers Date: Thu, 28 Oct 2021 14:10:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Replace=20=E9=97=9C=E6=96=BC=E8=88=89?= =?UTF-8?q?=E5=A0=B1=E7=B3=BB=E7=B5=B1=20with=20=E9=97=9C=E6=96=BC?= =?UTF-8?q?=E5=9B=9E=E5=A0=B1=E7=B3=BB=E7=B5=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 124 --- src/App.vue | 4 ++-- src/components/AboutModal.vue | 2 +- src/components/AppSidebar.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/App.vue b/src/App.vue index a88e655..f4a6bdc 100644 --- a/src/App.vue +++ b/src/App.vue @@ -21,7 +21,7 @@ 常見問題 - 關於舉報系統 + 關於回報系統 問題回報 @@ -54,7 +54,7 @@ - 關於舉報系統 + 關於回報系統 diff --git a/src/components/AboutModal.vue b/src/components/AboutModal.vue index b3ab118..835634f 100644 --- a/src/components/AboutModal.vue +++ b/src/components/AboutModal.vue @@ -2,7 +2,7 @@
-

關於舉報系統

+

關於回報系統

農地違章工廠舉報系統為協助民眾回報揭露農地違章工廠資訊，並非實際完成舉報。

diff --git a/src/components/AppSidebar.vue b/src/components/AppSidebar.vue index 2246f3d..be08e26 100644 --- a/src/components/AppSidebar.vue +++ b/src/components/AppSidebar.vue @@ -32,7 +32,7 @@ export default createComponent({ { text: '安全須知', action: modalActions.openSafetyModal }, { text: '聯絡我們', action: modalActions.openContactModal }, { text: '常見問題', href: 'https://about.disfactory.tw/#section-f_c360c8de-447e-4c0a-a856-4af18b9a5240' }, - { text: '關於舉報系統', href: 'https://about.disfactory.tw' }, + { text: '關於回報系統', href: 'https://about.disfactory.tw' }, { text: '問題回報', href: 'https://airtable.com/shrUraKakZRpH52DO' } ] const close = () => { From 1bee3285331c8f8a1f94e24909ace34c3245915b Mon Sep 17 00:00:00 2001 From: Caleb Rogers Date: Thu, 28 Oct 2021 14:14:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Replace=20=E6=9C=89=E4=BB=BB=E4=BD=95?= =?UTF-8?q?=E8=88=89=E5=A0=B1=E7=9B=B8=E9=97=9C=E5=95=8F=E9=A1=8C=20with?= =?UTF-8?q?=20=E6=9C=89=E4=BB=BB=E4=BD=95=E5=9B=9E=E5=A0=B1=E7=9B=B8?= =?UTF-8?q?=E9=97=9C=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 124 --- src/components/ContactModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ContactModal.vue b/src/components/ContactModal.vue index c890fa7..2abad63 100644 --- a/src/components/ContactModal.vue +++ b/src/components/ContactModal.vue @@ -5,7 +5,7 @@ Citizen of the Earth Taiwan

- 有任何舉報相關問題
+ 有任何回報相關問題
歡迎聯絡

From df24ba632041d9f39bb5360a62e88c953b7ebaa9 Mon Sep 17 00:00:00 2001 From: Caleb Rogers Date: Thu, 28 Oct 2021 14:21:19 +0800 Subject: [PATCH 5/5] Update map default center location 122 --- src/lib/map.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/map.ts b/src/lib/map.ts index 7f3c12d..2f41306 100644 --- a/src/lib/map.ts +++ b/src/lib/map.ts @@ -532,8 +532,8 @@ export class OLMap { this.hasInitialLocation = true } else { view = new View({ - center: transform([120.1, 23.234], 'EPSG:4326', 'EPSG:3857'), - zoom: 16 + center: transform([120.48504632216294, 24.088258816482295], 'EPSG:4326', 'EPSG:3857'), + zoom: 14 }) }