Merge pull request #123 from NelsonKCT/main

feat : shows events info from supabase on event index page
NCUAppTeam · Nov 28, 2024 · f00464a · f00464a
2 parents 94f5423 + 8970697
commit f00464a
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 23 deletions.
diff --git a/.env.example b/.env.example
diff --git a/src/components/icons/ClockIcon.tsx b/src/components/icons/ClockIcon.tsx
@@ -0,0 +1,12 @@
+
+import React from 'react';
+import IconProps from '../interface/IconProps';
+import { BasicIcon } from './BasicIcon';
+
+export const ClockIcon: React.FC<IconProps> = ({ fill, stroke, size }) => (
+    <BasicIcon fill={fill} stroke={stroke} size={size}>
+        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="M12 8v4l3 3m6-3a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>
+    </BasicIcon>
+);
+
+export default ClockIcon;
diff --git a/src/components/icons/PinIcon.tsx b/src/components/icons/PinIcon.tsx
@@ -0,0 +1,12 @@
+
+import React from 'react';
+import IconProps from '../interface/IconProps';
+import { BasicIcon } from './BasicIcon';
+
+export const PinIcon: React.FC<IconProps> = ({ fill, stroke, size }) => (
+    <BasicIcon fill={fill} stroke={stroke} size={size}>
+        <path fill-rule="evenodd" d="m7.539 14.841.003.003.002.002a.755.755 0 0 0 .912 0l.002-.002.003-.003.012-.009a5.57 5.57 0 0 0 .19-.153 15.588 15.588 0 0 0 2.046-2.082c1.101-1.362 2.291-3.342 2.291-5.597A5 5 0 0 0 3 7c0 2.255 1.19 4.235 2.292 5.597a15.591 15.591 0 0 0 2.046 2.082 8.916 8.916 0 0 0 .189.153l.012.01ZM8 8.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z" clip-rule="evenodd" />
+    </BasicIcon>
+);
+
+export default PinIcon;
diff --git a/src/components/index.ts b/src/components/index.ts
@@ -7,7 +7,9 @@ export { Header } from './Header';
 // Icons
 export { BellIcon } from './icons/BellIcon';
 export { CalendarIcon } from './icons/CalendarIcon';
+export { ClockIcon } from './icons/ClockIcon';
 export { LogoutIcon } from './icons/LogoutIcon';
+export { PinIcon } from './icons/PinIcon';
 export { PlusIcon } from './icons/PlusIcon';
 export { SidebarArrowDownIcon } from './icons/SidebarArrowDownIcon';
 export { SidebarArrowRightIcon } from './icons/SidebarArrowRightIcon';

diff --git a/src/routes/events/create.tsx b/src/routes/events/create.tsx
@@ -35,6 +35,11 @@ function CreateEventScreen() {
   const [preview, setPreview] = useState<string>()
   const [inputs, setInputs] = useState({
     name: '',
+    start_time: '',
+    end_time: '',
+    location: '',
+    fee: 0,
+    description: ''
   })
 
   // create a preview as a side effect, whenever selected file is changed
@@ -106,6 +111,8 @@ function CreateEventScreen() {
             type="datetime-local"
             id="start-time"
             name="start-time"
+            value={inputs.start_time}
+            onChange={(text) => { setInputs({ ...inputs, start_time: text.target.value }) }}
           />
         </div>
         <div className="flex gap-3 mt-3 ms-4">
@@ -114,25 +121,33 @@ function CreateEventScreen() {
             type="datetime-local"
             id="end-time"
             name="end-time"
+            value={inputs.end_time}
+            onChange={(text) => { setInputs({ ...inputs, end_time: text.target.value }) }}
           />
         </div>
         <p style={styles.text}>活動地點</p>
         <input
           style={styles.input}
           className="rounded"
           placeholder="請輸入活動地點"
+          value={inputs.location}
+          onChange={(text) => { setInputs({ ...inputs, location: text.target.value }) }}
         />
         <p style={styles.text}>參加費用</p>
         <input
           style={styles.input}
           className="rounded"
           placeholder="請輸入參加費用(請輸入數字，無則填0)"
+          value={inputs.fee}
+          onChange={(text) => { setInputs({ ...inputs, fee: Number(text.target.value) }) }}
         />
         <p style={styles.text}>活動介紹</p>
         <input
           style={styles.input}
           className="rounded"
           placeholder="請介紹你的活動"
+          value={inputs.description}
+          onChange={(text) => { setInputs({ ...inputs, description: text.target.value }) }}
         />
       </div>
       <div className='mt-3 ms-2'>

diff --git a/src/routes/events/index.tsx b/src/routes/events/index.tsx
@@ -1,14 +1,21 @@
-import { createFileRoute, Link } from '@tanstack/react-router';
-import { BellIcon, Header, PlusIcon } from '../../components';
+import { createFileRoute } from '@tanstack/react-router';
+import { Clock } from "flowbite-react-icons/solid";
+import { BellIcon, Header, PinIcon, PlusIcon } from '../../components';
 import { AuthGuard } from '../../utils/auth';
 import { supabase } from '../../utils/supabase';
+interface Event {
+    created_at: string;
+    description: string | null;
+    end_time: string | null;
+    fee: number | null;
+    id: number;
+    name: string | null;
+    start_time: string | null;
+    type: number | null;
+    user_id: string;
+    location: string | null;
+}
 
-const styles = {
-  container: {
-    flex: 1,
-    backgroundColor: '#333333',
-  },
-};
 export const Route = createFileRoute('/events/')({
   beforeLoad: AuthGuard,
   loader: async () => {
@@ -19,7 +26,6 @@ export const Route = createFileRoute('/events/')({
     if (error !== null) {
       throw error
     }
-
     return { events: data }
   },
   component: EventIndex
@@ -28,23 +34,41 @@ export const Route = createFileRoute('/events/')({
 function EventIndex() {
   const { events } = Route.useLoaderData()
   const navigate = Route.useNavigate();
+
+  // console.log(events[0].start_time)
+
   return (
     <>
       <div className="container mx-auto">
         <Header />
-        <div style={styles.container}>
-          <h1 style={{ marginLeft: 140 }} className='text-lg text-white'>活動列表</h1>
-          {
-            events.map((event) => (
-              <Link key={event.id} to='/events/$eventId' params={{ eventId: event.id.toString() }} >{event.name}</Link>
-            ))
-          }
+        <div className="flex-1 bg-gray-800 p-4">
+          <h1 className="ml-4 text-xl text-white">最新揪人</h1>
+          <div className="overflow-x-auto mt-2">
+            <div className="flex space-x-4">
+              {events.map((event) => (
+                <EventCard key={event.id} event={event} />
+              ))}
+            </div>
+          </div>
+
+          <h1 className="ml-4 text-xl text-white mt-8">最新活動</h1>
+          <div className="overflow-x-auto mt-2">
+            <div className="flex space-x-4">
+              {events.map((event) => (
+                <EventCard key={event.id} event={event} />
+              ))}
+            </div>
+          </div>
         </div>
-        <button className="btn btn-circle fixed right-4 bottom-4" onClick={()=>{
-          if(document){
-            (document.getElementById('my_modal_4') as HTMLFormElement).showModal();
+
+        <button
+          className="btn btn-circle fixed right-4 bottom-4"
+          onClick={() => {
+            if (document) {
+              (document.getElementById('my_modal_4') as HTMLFormElement).showModal();
             }
-          }}>
+          }}
+        >
           <PlusIcon />
           <dialog id="my_modal_4" className="modal">
             <div className="modal-box w-11/12 max-w-5xl">
@@ -54,7 +78,12 @@ function EventIndex() {
               </div>
               <p className="py-4 text-xl">確定要新增嗎？</p>
               <div className="modal-action flex justify-between">
-              <button className="btn w-1/2" onClick={() => navigate({ to: '/events/create' })}>好</button>
+                <button
+                  className="btn w-1/2"
+                  onClick={() => navigate({ to: '/events/create' })}
+                >
+                  好
+                </button>
                 <form method="dialog" className="w-1/2">
                   {/* This button will close the dialog */}
                   <button className="btn w-full">取消</button>
@@ -67,3 +96,28 @@ function EventIndex() {
     </>
   )
 }
+
+function EventCard({ event }: { event: Event }) {
+  const startTime = event.start_time ? new Date(event.start_time) : new Date();
+  return (
+    <div className="flex-shrink-0 w-40 bg-gray-700 rounded-lg overflow-hidden text-white">
+      <div className="h-32 bg-gray-500" />
+      <div className="p-2">
+        <h3 className="text-lg mb-1">{event.name}</h3>
+        <p className="text-sm flex items-center">
+          <Clock fill="currentColor" stroke="#ffffff" size={24} />
+          {startTime.toLocaleString('zh-TW', {
+            month: '2-digit',
+            day: '2-digit',
+            hour: '2-digit',
+            minute: '2-digit',
+          })}
+        </p>
+        <p className="text-sm flex items-center">
+          <PinIcon fill="currentColor" stroke="#ffffff" size={24} />
+          {event.location || '位置未提供'}
+        </p>
+      </div>
+    </div>
+  );
+}
diff --git a/src/utils/database.types.ts b/src/utils/database.types.ts
@@ -56,6 +56,7 @@ export type Database = {
           end_time: string | null
           fee: number | null
           id: number
+          location: string | null
           name: string | null
           start_time: string | null
           type: number | null
@@ -67,6 +68,7 @@ export type Database = {
           end_time?: string | null
           fee?: number | null
           id?: number
+          location?: string | null
           name?: string | null
           start_time?: string | null
           type?: number | null
@@ -78,6 +80,7 @@ export type Database = {
           end_time?: string | null
           fee?: number | null
           id?: number
+          location?: string | null
           name?: string | null
           start_time?: string | null
           type?: number | null

diff --git a/supabase/migrations/20241114141253_remote_schema.sql b/supabase/migrations/20241114141253_remote_schema.sql
@@ -0,0 +1,3 @@
+alter table "public"."events" add column "location" text;
+
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		alter table "public"."events" add column "location" text;