update stagging

wevisdemo · Nov 5, 2024 · 41324ea · 41324ea
1 parent c90e045
commit 41324ea
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 33 deletions.
diff --git a/components/budget/ShareLabel.vue b/components/budget/ShareLabel.vue
@@ -48,7 +48,7 @@ export default {
       icon_fb: require("~/assets/logo/facebook.svg"),
       icon_line: require("~/assets/logo/line.svg"),
       icon_twitter: require("~/assets/logo/twitter.svg"),
-      shareUrl: `https://wevisdemo.github.io/bkk-budgeting/images/og_default.jpg`,
+      shareUrl: `https://wevisdemo.github.io/bkk-budgeting`,
       GOOGLE_SHEETS_CSV:
         "https://docs.google.com/spreadsheets/d/e/2PACX-1vQ85mQgwOqSIwu-QOdD4nPgC9K8_UgXFgOW1p45p5HIedDihVCNTDIOAU2O-ibjyKMGNpj3jI_E65g1/pub?gid=1938129512&single=true&output=csv",
     };

diff --git a/components/landing/Landing.vue b/components/landing/Landing.vue
@@ -18,7 +18,7 @@
           <p>เปิดเผยอย่างโปร่งใสเพื่อใครๆ</p>
           <p>ก็มีส่วนร่วมกับงบกรุงเทพฯได้</p>
         </div>
-        <div class="flex items-center">
+        <div class="flex items-center justify-center md:justify-start">
           <p class="wv-b7">ร่วมพัฒนาโดย</p>
           <div class="w-[50px] ml-2">
             <img :src="require(`~/assets/images/partners/hand.png`)" alt="hand" />
@@ -91,10 +91,6 @@ export default Vue.extend({
           title: "ใช้ทำอะไรไปแล้ว",
           anchorLink: "#budgetplans",
         },
-        {
-          title: "อยากให้งบทำเรื่องอะไร",
-          anchorLink: "#projectsDevelopment",
-        },
       ],
       budgetExplore: [
         {

diff --git a/data/fetch-data-source.ts b/data/fetch-data-source.ts
@@ -25,6 +25,8 @@ export interface BudgetRow {
 const GOOGLE_SHEETS_CSV =
   "https://docs.google.com/spreadsheets/d/e/2PACX-1vQ85mQgwOqSIwu-QOdD4nPgC9K8_UgXFgOW1p45p5HIedDihVCNTDIOAU2O-ibjyKMGNpj3jI_E65g1/pub?gid=1938129512&single=true&output=csv";
 
+// "https://docs.google.com/spreadsheets/d/1L6rVuwhfpyhx2eK0reUx-hTJd4vMv8aelgJrGPoYS2s/edit?gid=830974957#gid=830974957&single=true&output=csv";
+
 interface CSV_ROW {
   budget_year: string;
   plan_proj_name: string;

diff --git a/layouts/default.vue b/layouts/default.vue
@@ -5,13 +5,47 @@
       :cookie-options="cookieOptions"
       :on-accept="onCookieAccept"
     />
+
     <WvNavbar class="z-20" :dark="true">
       <NuxtLink v-for="{ label, path } in routes" :key="path" :to="path">
         <WvNavButton :active="path === $route.path" :dark="true">{{
           label
         }}</WvNavButton>
       </NuxtLink>
     </WvNavbar>
+    <div
+      class="bg-wv-green py-5 flex items-center justify-center wv-b5 flex-col md:flex-row"
+    >
+      <div class="flex text-center">
+        <svg
+          class="mr-2 md:-mt-2"
+          width="20"
+          height="20"
+          viewBox="0 0 23 20"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M10.6771 1.47511C11.0428 0.841631 11.9572 0.841631 12.3229 1.47511L21.618 17.5747C21.9837 18.2082 21.5266 19 20.7951 19H2.2049C1.47342 19 1.01625 18.2082 1.38199 17.5747L10.6771 1.47511Z"
+            stroke="black"
+          />
+          <path
+            d="M11.0545 13.465L10.3575 9.25311V6.37598H12.6711V9.25311L11.9889 13.465H11.0545ZM11.4995 16.9057C11.0249 16.9057 10.6838 16.7969 10.4761 16.5794C10.2784 16.3619 10.1795 16.0949 10.1795 15.7786V15.4226C10.1795 15.1062 10.2784 14.8393 10.4761 14.6218C10.6838 14.4043 11.0249 14.2955 11.4995 14.2955C11.974 14.2955 12.3102 14.4043 12.5079 14.6218C12.7156 14.8393 12.8194 15.1062 12.8194 15.4226V15.7786C12.8194 16.0949 12.7156 16.3619 12.5079 16.5794C12.3102 16.7969 11.974 16.9057 11.4995 16.9057Z"
+            fill="black"
+          />
+        </svg>
+
+        เว็บไซต์นี้อัปเดตข้อมูลล่าสุดเมื่อ ตุลาคม 2566<br class="md:hidden" />
+        สามารถดูเวอร์ชันที่อัปเดตใหม่ได้ที่<br class="md:hidden" />
+      </div>
+      <a
+        class="underline ml-1"
+        href="https://bangkokbudgeting.wevis.info/"
+        target="_blank"
+      >
+        bangkokbudgeting.wevis.info/</a
+      >
+    </div>
     <Nuxt />
     <WvFooter v-if="!isAboutFooter()" :dark="true" />
     <AboutFooter v-if="isAboutFooter()" />

diff --git a/nuxt.config.js b/nuxt.config.js
@@ -32,24 +32,6 @@ const config = {
     "@nuxtjs/svg",
     "@nuxtjs/style-resources",
     "@nuxtjs/moment",
-    [
-      "@nuxtjs/firebase",
-      {
-        config: {
-          apiKey: "AIzaSyCwIBLPmMURCSdqe_rQqC4gFrUtteLwbfI",
-          authDomain: "participatory-budgeting-a5f34.firebaseapp.com",
-          databaseURL:
-            "https://participatory-budgeting-a5f34-default-rtdb.asia-southeast1.firebasedatabase.app",
-          projectId: "participatory-budgeting-a5f34",
-          storageBucket: "participatory-budgeting-a5f34.appspot.com",
-          messagingSenderId: "412280397430",
-          appId: "1:412280397430:web:d2fd56e866108d5c3c0957",
-        },
-        services: {
-          database: true,
-        },
-      },
-    ],
   ],
 
   moment: {
@@ -66,7 +48,6 @@ const config = {
   },
 
   modules: [
-    "vue-plausible",
     "@nuxtjs/tailwindcss",
     "@nuxtjs/axios",
     "@nuxtjs/pwa",
@@ -89,12 +70,6 @@ const config = {
       },
     ],
   ],
-
-  plausible: {
-    domain: "bangkokbudgeting.wevis.info",
-    apiHost: "https://analytics.punchup.world",
-  },
-
   extends: ["@nuxtjs/eslint-config-typescript"],
 
   publicRuntimeConfig: {

diff --git a/pages/index.vue b/pages/index.vue
@@ -7,11 +7,11 @@
       <StrategicPlans />
       <DevelopmentTimeline />
       <BudgetPlans />
-      <AllocationQuestion />
+      <!-- <AllocationQuestion />
       <ProjectDevelopment />
       <IdeaVote />
       <ProjectShare />
-      <ParticipatoryBudgeting />
+      <ParticipatoryBudgeting /> -->
     </div>
   </div>
 </template>