fixed comment

wevisdemo · Aug 15, 2023 · f7570b9 · f7570b9
1 parent 2d6b617
commit f7570b9
Show file tree

Hide file tree

Showing 14 changed files with 282 additions and 268 deletions.
diff --git a/assets/icons/next-survey.svg b/assets/icons/next-survey.svg
diff --git a/assets/icons/timeline-desktop.svg b/assets/icons/timeline-desktop.svg
diff --git a/assets/icons/timeline-mobile.svg b/assets/icons/timeline-mobile.svg
diff --git a/components/FormDialog.vue b/components/FormDialog.vue
@@ -111,10 +111,12 @@ export default {
     async senduser() {
       const cookieId = this.$cookies.get("uuid");
       try {
-        await this.postTableRow("User-data", [{
-          userId: cookieId,
-          district: `เขต${this.formData.district.th_name}`,
-        }]);
+        await this.postTableRow("User-data", [
+          {
+            userId: cookieId,
+            district: `เขต${this.formData.district.th_name}`,
+          },
+        ]);
       } catch (e) {
         // eslint-disable-next-line no-console
         console.error(e);
@@ -134,13 +136,12 @@ export default {
 
       try {
         await this.postTableRow("Survey", arrayForNoco).then(() => {
-          this.isVoted = true;
           setTimeout(() => {
             this.isShowLoading = false;
             this.setStepSurvey("next");
             // this.closeDialog();
           }, 2000);
-          this.$cookies.set("isVoted", "true");
+          this.$cookies.set("voted", "true");
         });
       } catch (e) {
         // eslint-disable-next-line no-console

diff --git a/components/PersistProblems.vue b/components/PersistProblems.vue
@@ -15,11 +15,12 @@
     <p class="text-center">เลือกได้ 1 ข้อ</p>
     <div class="flex flex-col gap-2 md:gap-5 max-w-[800px] mx-auto">
       <div class="flex flex-wrap gap-2 md:gap-3 lg:gap-5 justify-center">
-        <div
+        <a
           v-for="(item, index) in planData"
           :key="index"
           class="flex sm:flex-col bg-white rounded-md basis-full sm:basis-28 md:basis-40 flex-shrink-0 gap-2 sm:text-center items-center py-3 px-2 sm:py-5 sm:px-4 cursor-pointer hover:bg-gray-100"
           :class="index === currentHoveredImage ? 'border-inset' : ''"
+          href="#strategic-plan"
           @click="() => setCurrentImage(index)"
         >
           <img
@@ -28,7 +29,7 @@
             :alt="item.issue"
           />
           <p class="wv-b4 wv-bold">{{ item.issue }}</p>
-        </div>
+        </a>
       </div>
     </div>
   </BoxContainer>

diff --git a/components/ProjectDevelopment.vue b/components/ProjectDevelopment.vue
@@ -1,10 +1,5 @@
 <template>
   <BoxContainer>
-    <div id="projectsDevelopment" class="mb-2 scroll-mt-8">
-      <h5 class="wv-h5 wv-bold text-center wv-kondolar">
-        ก่อนอื่น.. เลือก 3 หมวดที่คุณสนใจที่สุด
-      </h5>
-    </div>
     <Topic :setStepSurvey="setStepSurvey" v-if="stepSurvey === 1" />
     <Projects :setStepSurvey="setStepSurvey" v-if="stepSurvey === 2" />
     <Review v-if="stepSurvey === 3" />
@@ -43,7 +38,7 @@ export default defineComponent({
   },
 
   mounted() {
-    const cookieVoted: string = this.$cookies.get("isVoted");
+    const cookieVoted: string = this.$cookies.get("voted");
 
     if (cookieVoted === "true") {
       this.stepSurvey = 3;

diff --git a/components/StrategicPlans.vue b/components/StrategicPlans.vue
@@ -1,6 +1,6 @@
 <template>
   <BoxContainer>
-    <div class="hidden sm:block h-full pb-6">
+    <div class="hidden sm:block h-full pb-6 pt-5" id="strategic-plan">
       <div class="text-center flex flex-col justify-center h-full z-0">
         <p class="wv-b3">
           เป็นเพียงส่วนหนึ่งของอีกหลายประเด็นที่กรุงเทพฯ วางแผนเพื่อแก้ไข ภายใต้

diff --git a/components/expore/SurveyByKeyword.vue b/components/expore/SurveyByKeyword.vue
@@ -245,7 +245,7 @@
                     :style="{
                       height: isMillion
                         ? calHeight(displayMaxAmout(key), item.amount)
-                        : '100%x',
+                        : '100%',
                     }"
                   ></div>
                 </div>

diff --git a/components/landing/NavLinks.vue b/components/landing/NavLinks.vue
@@ -2,10 +2,10 @@
   <div class="flex sm:flex-none flex-col gap-2 p-3">
     <p class="wv-b5 wv-bold">{{ title }}</p>
     <div class="divide-y divide-black divide-opacity-25">
-      <NuxtLink
+      <a
         v-for="(item, index) in links"
         :key="index"
-        :to="item.anchorLink || item.pageLink"
+        :href="item.anchorLink || item.pageLink"
         class="py-1 px-1 flex hover:bg-black hover:rounded-[5px] hover:fill-white hover:text-white items-center justify-between gap-2"
       >
         <p class="wv-b5">{{ item.title }}</p>
@@ -39,7 +39,7 @@
             />
           </svg>
         </div>
-      </NuxtLink>
+      </a>
     </div>
   </div>
 </template>

diff --git a/components/survey/Projects.vue b/components/survey/Projects.vue
@@ -1,5 +1,10 @@
 <template>
-  <div class="min-h-screen md:max-w-[600px] md:w-[600px] mx-auto flex flex-col font-bold">
+  <div
+    class="min-h-screen md:max-w-[600px] md:w-[600px] mx-auto flex flex-col font-bold"
+  >
+    <div id="projectsDevelopment" class="mb-2 scroll-mt-8">
+      <h5 class="wv-h5 wv-bold text-center wv-kondolar">เลือก 3 โครงการที่อยากพัฒนา</h5>
+    </div>
     <div v-for="item in projects" :key="projects.no">
       <button
         class="w-full wv-b4 text-left p-[20px] my-[4px] rounded-[5px] hover:bg-black hover:text-white"

diff --git a/components/survey/Review.vue b/components/survey/Review.vue
@@ -1,14 +1,23 @@
 <template>
-  <div
-    class="min-h-screen md:max-w-[600px] md:w-[600px] mx-auto flex flex-col font-bold"
-  >
+  <div class="min-h-[80vh] md:max-w-[600px] md:w-[600px] mx-auto flex flex-col">
+    <div id="projectsDevelopment" class="mb-2 scroll-mt-8">
+      <h5 class="wv-h5 wv-bold text-center wv-kondolar">3 โครงการที่คุณอยากพัฒนา</h5>
+    </div>
     <div
       v-for="(item, no) in reviewDate"
       :key="no"
-      class="w-full wv-b4 text-left p-[20px] my-[4px] rounded-[5px] bg-black text-white"
+      class="w-full wv-b4 font-bold wv-b4 text-left p-[20px] my-[4px] rounded-[5px] bg-black text-white"
     >
       {{ item.idea }}
     </div>
+    <a class="wv-b3 mx-auto mt-5 cursor-pointer" href="#vote-result">
+      ดูผลสำรวจ
+      <img
+        src="~/assets/icons/next-survey.svg"
+        alt="next-survey"
+        class="mx-auto mt-2"
+      />
+    </a>
   </div>
 </template>
 

diff --git a/components/survey/Topic.vue b/components/survey/Topic.vue
@@ -2,6 +2,11 @@
   <div
     class="min-h-screen md:max-w-[600px] md:w-[600px] mx-auto flex flex-col font-bold w-full"
   >
+    <div id="projectsDevelopment" class="mb-2 scroll-mt-8">
+      <h5 class="wv-h5 wv-bold text-center wv-kondolar">
+        ก่อนอื่น.. เลือก 3 หมวดที่คุณสนใจที่สุด
+      </h5>
+    </div>
     <div class="grid grid-cols-2 gap-2 md:gap-4">
       <button
         v-for="item in surveyData()"

diff --git a/components/vote/IdeaVote.vue b/components/vote/IdeaVote.vue
@@ -1,6 +1,6 @@
 <template>
   <BoxContainer>
-    <div id="vote-result">
+    <div id="vote-result" class="pt-5">
       <div class="text-center">
         <h5 class="wv-h5 wv-bold wv-kondolar">10 โครงการที่ถูกโหวตมากที่สุด</h5>
         <div class="flex justify-center items-center my-3">

diff --git a/pages/about/index.vue b/pages/about/index.vue
@@ -156,7 +156,12 @@
               stroke-linejoin="round"
             />
           </svg>
-          <span class="wv-h5 wv-bold">ดาวน์โหลดข้อมูล</span>
+          <a
+            class="wv-h5 wv-bold"
+            href="https://docs.google.com/spreadsheets/d/1MNFtkwO7b84JI1WCkgFYKwgTGhKx4SYEl9143bWNMBk/edit?usp=sharing "
+            target="_blank"
+            >ดาวน์โหลดข้อมูล</a
+          >
         </WvButton>
       </div>
       <div class="text-center mt-4">