Merge pull request #135 from Disfactory/master

2.4.0

.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.

.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.

src/App.vue

@@ -21,7 +21,7 @@
           常見問題
         </v-btn>
         <v-btn text href="https://about.disfactory.tw" target="_blank">
-          關於舉報系統
+          關於回報系統
         </v-btn>
         <v-btn text href="https://airtable.com/shrUraKakZRpH52DO" target="_blank">
           問題回報
@@ -54,7 +54,7 @@
           </v-list-item>
 
           <v-list-item href="https://about.disfactory.tw" target="_blank">
-            <v-list-item-title>關於舉報系統</v-list-item-title>
+            <v-list-item-title>關於回報系統</v-list-item-title>
           </v-list-item>
 
           <v-list-item href="https://airtable.com/shrUraKakZRpH52DO" target="_blank">

src/components/AboutModal.vue

@@ -2,7 +2,7 @@
   <div class="about-dialog-container">
     <app-modal :open="open" :dismiss="dismiss">
       <div class="page">
-        <h3>關於舉報系統</h3>
+        <h3>關於回報系統</h3>
         <p>
           農地違章工廠舉報系統為協助民眾回報揭露農地違章工廠資訊，並非實際完成舉報。
         </p>

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 = () => {

src/components/ContactModal.vue

@@ -5,7 +5,7 @@
         <img width="137" src="/images/cet-logo.png" alt="Citizen of the Earth Taiwan">
 
         <h3>
-          有任何舉報相關問題<br>
+          有任何回報相關問題<br>
           歡迎聯絡
         </h3>
 

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
       })
     }
 

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'
   }
 ]