Roll out 1.4.1 (#177)

* Feature/config email testing on local environment (#138) * Remove (#92) Co-authored-by: Pjaijai <[email protected]> * [#137] Config email testing on local environment * Fix .env variable name --------- Co-authored-by: Pjaijai <[email protected]> Co-authored-by: Pjaijai <[email protected]> * Feature/revamp card (#135) * Feature/update backend setup on developer md (#104) * Ignore local IDE config * Update backend setup guidelines on developer.md * Add supabase config guidelines * Fix md syntax * add CORS to edge func depending on the staging env * add reply-to header to both contact email (#109) * Feature/refactor search hook (#96) * Refactor search hook in referral page * Refactor referee search hook * Remove useless import * Refactor referee post * Refactor referrer post search hook * Remmove uesless import * Change to error toast (#106) Co-authored-by: Pjaijai <[email protected]> --------- Co-authored-by: Pjaijai <[email protected]> * create new card component for referrer and referee; update card skeleton; add missing modules in tailwind * add referral post card; update referral post pages * update contact toUuid; minor ui fix * add items-center to info display * Show edit button on profile page if logged-in user is profile user * Fix build error * Fix typos * Import as module path * Module import * Using Link instead of onurlclick * Fix import * Remove id slug user page * Remove showEditButton props --------- Co-authored-by: Lulu <[email protected]> Co-authored-by: Thomas Yau <[email protected]> Co-authored-by: Thomas Yau <[email protected]> Co-authored-by: Pjaijai <[email protected]> Co-authored-by: Pjaijai <[email protected]> Co-authored-by: Lulu Tung <[email protected]> * Refactor/fix all formart problem (#142) * Fix doc * Fix format --------- Co-authored-by: Pjaijai <[email protected]> * Refactor/fixing site config and using common layout (#172) * Rename search page layout to common page layout * refactor common layout * Using common layout * Remove margin top in create post template --------- Co-authored-by: Pjaijai <[email protected]> * version bump (#175) Co-authored-by: Pjaijai <[email protected]> * Feature/contributors page (#174) * fix file name --------- Co-authored-by: Lulu <[email protected]> Co-authored-by: Pjaijai <[email protected]> Co-authored-by: marukosy124 <[email protected]> Co-authored-by: Thomas Yau <[email protected]> Co-authored-by: Thomas Yau <[email protected]> Co-authored-by: Lulu Tung <[email protected]>
Pjaijai · Oct 26, 2023 · 4d96dd5 · 4d96dd5
1 parent 50dc364
commit 4d96dd5
Show file tree

Hide file tree

Showing 24 changed files with 349 additions and 80 deletions.
diff --git a/DEVELOPER.md b/DEVELOPER.md
@@ -90,24 +90,25 @@ For accurate information, please check supabase local dev doc here[https://supab
 6. Every time you make changes to Supabase functions, run `supabase functions deploy --project-ref [your-supabase-project-id]`.
 
 ## Frontend Development
+
 - Environment
   - NodeJS 18.0.0 - 20.5.1
   - NPM 9.0.0 - 10.0.0
 
 ### To start a local development server
 
 1. Navigate to the 'client' directory\
-    ```bash
-    cd client
-    ```
+   ```bash
+   cd client
+   ```
 1. Install dependencies\
-    ```bash
-    npm install
-    ```
+   ```bash
+   npm install
+   ```
 1. Start the development server
-    ```bash
-    npm run preview
-    ```
+   ```bash
+   npm run preview
+   ```
 1. View the website at [http://localhost:3000](http://localhost:3000)
 
 ### Creating branch

diff --git a/client/app/auth/page.tsx b/client/app/auth/page.tsx
@@ -3,11 +3,14 @@
 import React from "react"
 import AuthPageTemplate from "@/modules/auth/template"
 
+import { siteConfig } from "@/config/site"
+import CommonPageLayout from "@/components/layouts/common"
+
 const AuthPage = () => {
   return (
-    <div className="mt-20 flex items-center justify-center">
+    <CommonPageLayout>
       <AuthPageTemplate />
-    </div>
+    </CommonPageLayout>
   )
 }
 

diff --git a/client/app/contributors/page.tsx b/client/app/contributors/page.tsx
@@ -0,0 +1,15 @@
+import React from "react"
+import ContributorsPageTemplate from "@/modules/contributors/template"
+
+import { siteConfig } from "@/config/site"
+import CommonPageLayout from "@/components/layouts/common"
+
+const ContributorsPage = () => {
+  return (
+    <CommonPageLayout title={siteConfig.page.contributors.name}>
+      <ContributorsPageTemplate />
+    </CommonPageLayout>
+  )
+}
+
+export default ContributorsPage
diff --git a/client/app/page.tsx b/client/app/page.tsx
@@ -28,12 +28,12 @@ export default function IndexPage() {
         </div>
         <div className={"flex flex-wrap gap-4"}>
           <Link
-            href={siteConfig.page.about.href}
+            href={siteConfig.page.contributors.href}
             className={buttonVariants({
               variant: isUserSignIn ? "default" : "outline",
             })}
           >
-            了解更多
+            {siteConfig.page.contributors.name}
           </Link>
 
           <Link

diff --git a/client/app/post/create/page.tsx b/client/app/post/create/page.tsx
@@ -3,8 +3,15 @@
 import React from "react"
 import CreatePostTemplate from "@/modules/post/create/template"
 
+import { siteConfig } from "@/config/site"
+import CommonPageLayout from "@/components/layouts/common"
+
 const CreatePostPage = () => {
-  return <CreatePostTemplate />
+  return (
+    <CommonPageLayout title={siteConfig.page.createPost.name}>
+      <CreatePostTemplate />
+    </CommonPageLayout>
+  )
 }
 
 export default CreatePostPage
diff --git a/client/app/post/referee/page.tsx b/client/app/post/referee/page.tsx
@@ -1,13 +1,14 @@
 import React from "react"
 import RefereePostPageTemplate from "@/modules/post/referee/template"
 
-import SearchPageLayout from "@/components/layouts/search-page"
+import { siteConfig } from "@/config/site"
+import CommonPageLayout from "@/components/layouts/common"
 
 const RefereePostPage = () => {
   return (
-    <SearchPageLayout title="人搵工">
+    <CommonPageLayout title={siteConfig.page.refereePost.name}>
       <RefereePostPageTemplate />
-    </SearchPageLayout>
+    </CommonPageLayout>
   )
 }
 

diff --git a/client/app/post/referer/page.tsx b/client/app/post/referer/page.tsx
@@ -1,13 +1,14 @@
 import React from "react"
 import RefererPostPageTemplate from "@/modules/post/referer/template"
 
-import SearchPageLayout from "@/components/layouts/search-page"
+import { siteConfig } from "@/config/site"
+import CommonPageLayout from "@/components/layouts/common"
 
 const RefererPostPage = () => {
   return (
-    <SearchPageLayout title="工搵人">
+    <CommonPageLayout title={siteConfig.page.referrerPost.name}>
       <RefererPostPageTemplate />
-    </SearchPageLayout>
+    </CommonPageLayout>
   )
 }
 

diff --git a/client/app/profile/[userUuid]/page.tsx b/client/app/profile/[userUuid]/page.tsx
@@ -9,6 +9,7 @@ import { siteConfig } from "@/config/site"
 import useGetUserprofile from "@/hooks/api/user/get-user-profile"
 import useUserStore from "@/hooks/state/user/store"
 import { Icons } from "@/components/icons"
+import CommonPageLayout from "@/components/layouts/common"
 
 const Page = ({ params }: { params: { userUuid: string } }) => {
   const { userUuid } = params
@@ -39,7 +40,7 @@ const Page = ({ params }: { params: { userUuid: string } }) => {
     )
   if (!isLoading && profile)
     return (
-      <div className="mt-8 h-full w-full ">
+      <CommonPageLayout title={siteConfig.page.profile.name}>
         {!isEditMode && (
           <ViewProfileTemplate
             photoUrl={profile.avatar_url || undefined}
@@ -79,7 +80,7 @@ const Page = ({ params }: { params: { userUuid: string } }) => {
             setIsEditMode={setIsEditMode}
           />
         )}
-      </div>
+      </CommonPageLayout>
     )
 }
 

diff --git a/client/app/referee/page.tsx b/client/app/referee/page.tsx
@@ -4,13 +4,14 @@ import React from "react"
 import { NextPage } from "next"
 import RefereePageTemplate from "@/modules/referral/referee/template"
 
-import SearchPageLayout from "@/components/layouts/search-page"
+import { siteConfig } from "@/config/site"
+import CommonPageLayout from "@/components/layouts/common"
 
 const RefereePage: NextPage = () => {
   return (
-    <SearchPageLayout title="受薦人">
+    <CommonPageLayout title={siteConfig.page.referee.name}>
       <RefereePageTemplate />
-    </SearchPageLayout>
+    </CommonPageLayout>
   )
 }
 

diff --git a/client/app/referer/page.tsx b/client/app/referer/page.tsx
@@ -4,13 +4,14 @@ import React from "react"
 import { NextPage } from "next"
 import RefererPageTemplate from "@/modules/referral/referer/template"
 
-import SearchPageLayout from "@/components/layouts/search-page"
+import { siteConfig } from "@/config/site"
+import CommonPageLayout from "@/components/layouts/common"
 
 const RefererPage: NextPage = () => {
   return (
-    <SearchPageLayout title="推薦人">
+    <CommonPageLayout title={siteConfig.page.referrer.name}>
       <RefererPageTemplate />
-    </SearchPageLayout>
+    </CommonPageLayout>
   )
 }
 

diff --git a/client/components/customized-ui/footer/nav.tsx b/client/components/customized-ui/footer/nav.tsx
@@ -1,3 +1,5 @@
+"use client"
+
 import React from "react"
 import Link from "next/link"
 
@@ -6,33 +8,52 @@ import { Icons } from "@/components/icons"
 
 const NavFooter = () => {
   return (
-    <footer className="mt-12 flex flex-col items-center justify-end gap-2 border-t-2 p-2 md:flex-row">
-      <div className="flex flex-row items-center gap-1 text-sm text-muted-foreground ">
-        <a href="mailto:[email protected]">
-          <Icons.mail />
-        </a>
-
-        <Link
-          className="text-sm text-muted-foreground"
-          href={siteConfig.links.github}
-          target="_blank"
-          rel="noreferrer"
-        >
-          <Icons.github />
-        </Link>
-
-        <Link
-          className="text-sm text-muted-foreground"
-          href={siteConfig.page.privacyPolicy.href}
-        >
-          Privacy Policy
-        </Link>
-        <Link
-          className="text-sm text-muted-foreground"
-          href={siteConfig.page.termsAndConditions.href}
-        >
-          Terms and Conditions
-        </Link>
+    <footer className="mt-12 flex flex-col items-center justify-center gap-2 border-t-2 p-2 md:flex-row ">
+      <div className="flex flex-col items-center gap-1 text-sm text-muted-foreground ">
+        <div className="flex flex-row gap-2">
+          <a href="mailto:[email protected]">
+            <Icons.mail />
+          </a>
+
+          <Link
+            className="text-sm text-muted-foreground"
+            href={siteConfig.links.github}
+            target="_blank"
+            rel="noreferrer"
+          >
+            <Icons.github />
+          </Link>
+        </div>
+
+        <div className="flex flex-col gap-2 md:flex-row">
+          <Link
+            className="text-center text-sm text-muted-foreground"
+            href={siteConfig.page.privacyPolicy.href}
+          >
+            Privacy Policy
+          </Link>
+
+          <Link
+            className="text-center text-sm text-muted-foreground"
+            href={siteConfig.page.termsAndConditions.href}
+          >
+            Terms and Conditions
+          </Link>
+
+          <Link
+            className="text-center text-sm text-muted-foreground"
+            href={siteConfig.page.about.href}
+          >
+            {siteConfig.page.about.name}
+          </Link>
+
+          <Link
+            className="text-center text-sm text-muted-foreground"
+            href={siteConfig.page.contributors.href}
+          >
+            {siteConfig.page.contributors.name}
+          </Link>
+        </div>
       </div>
     </footer>
   )

diff --git a/client/components/icons.tsx b/client/components/icons.tsx
@@ -7,7 +7,9 @@ import {
   ChevronDownIcon,
   Github,
   Instagram,
+  Laptop,
   Link,
+  Linkedin,
   Loader,
   LucideProps,
   Mail,
@@ -32,6 +34,7 @@ export const Icons = {
   twitter: Twitter,
   user: User,
   link: Link,
+  laptop: Laptop,
   mail: Mail,
   pencil: Pencil,
   loader: Loader,
@@ -41,6 +44,7 @@ export const Icons = {
   checkCircle: CheckCircle2,
   instagram: Instagram,
   github: Github,
+  linkedin: Linkedin,
   rotateRight: RotateCcw,
   slidersHorizontal: SlidersHorizontal,
   logo: (props: LucideProps) => (

diff --git a/client/components/layouts/common.tsx b/client/components/layouts/common.tsx
@@ -0,0 +1,18 @@
+import React, { PropsWithChildren } from "react"
+
+interface CommonPageLayout {
+  title?: string
+}
+const CommonPageLayout: React.FunctionComponent<
+  PropsWithChildren<CommonPageLayout>
+> = ({ title, children }) => {
+  return (
+    <div className="mt-4 h-full w-full">
+      {title && <h1 className=" text-center text-2xl font-bold">{title}</h1>}
+
+      {children}
+    </div>
+  )
+}
+
+export default CommonPageLayout
diff --git a/client/components/layouts/search-page.tsx b/client/components/layouts/search-page.tsx
diff --git a/client/config/site.ts b/client/config/site.ts
@@ -17,27 +17,27 @@ export const siteConfig = {
       href: "/auth",
     },
     referrer: {
-      name: "referrer",
+      name: "推薦人",
       href: "/referer",
     },
     referee: {
-      name: "referee",
+      name: "受薦人",
       href: "/referee",
     },
     createPost: {
-      name: "createPost",
+      name: "貼街招",
       href: "/post/create",
     },
     referrerPost: {
-      name: "createPost",
+      name: "工搵人",
       href: "/post/referer",
     },
     refereePost: {
-      name: "createPost",
+      name: "人搵工",
       href: "/post/referee",
     },
     about: {
-      name: "about",
+      name: "關於本平台",
       href: "/about",
     },
     privacyPolicy: {
@@ -48,6 +48,10 @@ export const siteConfig = {
       name: "termsAndConditions",
       href: "/terms-and-conditions",
     },
+    contributors: {
+      name: "貢獻者名單",
+      href: "/contributors",
+    },
   },
   links: {
     instagram: "https://instagram.com/referalah?igshid=NGVhN2U2NjQ0Yg==",