feature: add join community page (#64)

* feature: add join community page * style: format coding style
daodaoedu · Jul 21, 2024 · 8536169 · 8536169
1 parent 2ee4506
commit 8536169
Show file tree

Hide file tree

Showing 8 changed files with 307 additions and 57 deletions.
diff --git a/components/Home/Group/index.jsx b/components/Home/Group/index.jsx
@@ -95,12 +95,7 @@ const Group = () => {
           >
             <Button
               variant="outlined"
-              onClick={() =>
-                window.open(
-                  'https://www.facebook.com/groups/2237666046370459',
-                  '_blank',
-                )
-              }
+              onClick={() => router.push('/join')}
               sx={{ margin: '0 10px' }}
             >
               <FacebookRounded sx={{ margin: '5px 0' }} />

diff --git a/constants/category.js b/constants/category.js
@@ -226,25 +226,25 @@ export const NAV_LINK = [
     link: '/group',
     target: '_self',
   },
-  {
-    name: '找活動',
-    link: '/activities',
-    target: '_self',
-  },
+  // {
+  //   name: '找活動',
+  //   link: '/activities',
+  //   target: '_self',
+  // },
   {
     name: '找故事',
     link: 'https://blog.daoedu.tw',
     target: '_blank',
   },
-  {
-    name: '找場域',
-    link: '/locations',
-    target: '_self',
-  },
+  // {
+  //   name: '找場域',
+  //   link: '/locations',
+  //   target: '_self',
+  // },
   {
     name: '加入社群',
-    link: 'https://www.facebook.com/groups/2237666046370459',
-    target: '_blank',
+    link: '/join',
+    target: '_self',
   },
   // {
   //   name: '找學習空間',
@@ -268,21 +268,21 @@ export const NAV_LINK_MOBILE = [
     link: '/group',
     target: '_self',
   },
-  {
-    name: '找活動',
-    link: '/activities',
-    target: '_self',
-  },
+  // {
+  //   name: '找活動',
+  //   link: '/activities',
+  //   target: '_self',
+  // },
   {
     name: '找故事',
     link: 'https://blog.daoedu.tw',
     target: '_blank',
   },
-  {
-    name: '找場域',
-    link: '/locations',
-    target: '_self',
-  },
+  // {
+  //   name: '找場域',
+  //   link: '/locations',
+  //   target: '_self',
+  // },
   {
     name: '新增資源',
     link: '/contribute/resource',
@@ -295,8 +295,8 @@ export const NAV_LINK_MOBILE = [
   },
   {
     name: '加入社群',
-    link: 'https://www.facebook.com/groups/2237666046370459',
-    target: '_blank',
+    link: '/join',
+    target: '_self',
   },
   // {
   //   name: '找學習空間',
@@ -316,19 +316,24 @@ export const FOOTER_LINK = [
     target: '_self',
   },
   {
-    name: '找活動',
-    link: '/activities',
-    target: '_self',
-  },
-  {
-    name: '找場域',
-    link: '/locations',
+    name: '找揪團',
+    link: '/group',
     target: '_self',
   },
+  // {
+  //   name: '找活動',
+  //   link: '/activities',
+  //   target: '_self',
+  // },
+  // {
+  //   name: '找場域',
+  //   link: '/locations',
+  //   target: '_self',
+  // },
   {
     name: '加入社群',
-    link: 'https://www.facebook.com/groups/2237666046370459',
-    target: '_blank',
+    link: '/join',
+    target: '_self',
   },
   {
     name: '隱私權政策',

diff --git a/next.config.js b/next.config.js
@@ -12,16 +12,18 @@ module.exports = withPWA({
   env: {
     HOSTNAME: 'https://www.daoedu.tw',
   },
-  ...(isDev ? {
-    async rewrites() {
-      return [
-        {
-          source: '/dev-proxy-api/:path*',
-          destination: `${process.env.NEXT_PUBLIC_API_URL}/:path*`,
+  ...(isDev
+    ? {
+        async rewrites() {
+          return [
+            {
+              source: '/dev-proxy-api/:path*',
+              destination: `${process.env.NEXT_PUBLIC_API_URL}/:path*`,
+            },
+          ];
         },
-      ];
-    },
-  } : {})
+      }
+    : {}),
   // async redirects() {
   //   return [
   //     {

diff --git a/pages/404.jsx b/pages/404.jsx
@@ -145,15 +145,7 @@ const NotExistPage = () => {
               margin: '20px 0',
             }}
           >
-            <Button
-              variant="outlined"
-              onClick={() =>
-                open(
-                  'https://www.facebook.com/groups/2237666046370459',
-                  '_blank',
-                )
-              }
-            >
+            <Button variant="outlined" onClick={() => router.push('/join')}>
               <FacebookRounded sx={{ margin: '5px 0' }} />
               <Typography variant="p">加入社群</Typography>
             </Button>