From 0eb7d05bfc54f4a8b050db77060d452a4568b95d Mon Sep 17 00:00:00 2001
From: nelsonkct <nelsonkuo0430@gmail.com>
Date: Thu, 17 Oct 2024 20:23:34 +0800
Subject: [PATCH 1/2] feat : add "hold new events" button

---
 src/components/icons/BellIcon.tsx | 12 +++++++++
 src/components/icons/PlusIcon.tsx | 11 +++++++++
 src/components/index.ts           |  2 ++
 src/routes/events/index.tsx       | 41 +++++++++++++++++++++++--------
 4 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 src/components/icons/BellIcon.tsx
 create mode 100644 src/components/icons/PlusIcon.tsx

diff --git a/src/components/icons/BellIcon.tsx b/src/components/icons/BellIcon.tsx
new file mode 100644
index 0000000..f20930d
--- /dev/null
+++ b/src/components/icons/BellIcon.tsx
@@ -0,0 +1,12 @@
+
+import React from 'react';
+import IconProps from '../interface/IconProps';
+import { BasicIcon } from './BasicIcon';
+
+export const BellIcon: React.FC<IconProps> = ({ fill, stroke, size }) => (
+    <BasicIcon fill={fill} stroke={stroke} size={size}>
+        <path stroke-linecap="round" stroke-linejoin="round" d="M14.857 17.082a23.848 23.848 0 0 0 5.454-1.31A8.967 8.967 0 0 1 18 9.75V9A6 6 0 0 0 6 9v.75a8.967 8.967 0 0 1-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 0 1-5.714 0m5.714 0a3 3 0 1 1-5.714 0" />
+    </BasicIcon>
+);
+
+export default BellIcon;
\ No newline at end of file
diff --git a/src/components/icons/PlusIcon.tsx b/src/components/icons/PlusIcon.tsx
new file mode 100644
index 0000000..e5b8d4f
--- /dev/null
+++ b/src/components/icons/PlusIcon.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import IconProps from '../interface/IconProps';
+import { BasicIcon } from './BasicIcon';
+
+export const PlusIcon: React.FC<IconProps> = ({ fill, stroke, size }) => (
+    <BasicIcon fill={fill} stroke={stroke} size={size}>
+        <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
+    </BasicIcon>
+);
+
+export default PlusIcon;
\ No newline at end of file
diff --git a/src/components/index.ts b/src/components/index.ts
index 2ae526f..44eef03 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -5,8 +5,10 @@ export { Image } from './Common/Image';
 export { VStack } from './Common/VStack';
 export { Header } from './Header';
 // Icons
+export { BellIcon } from './icons/BellIcon';
 export { CalendarIcon } from './icons/CalendarIcon';
 export { LogoutIcon } from './icons/LogoutIcon';
+export { PlusIcon } from './icons/PlusIcon';
 export { SidebarArrowDownIcon } from './icons/SidebarArrowDownIcon';
 export { SidebarArrowRightIcon } from './icons/SidebarArrowRightIcon';
 
diff --git a/src/routes/events/index.tsx b/src/routes/events/index.tsx
index 3f70e4a..957099b 100644
--- a/src/routes/events/index.tsx
+++ b/src/routes/events/index.tsx
@@ -1,5 +1,5 @@
 import { createFileRoute, Link } from '@tanstack/react-router';
-import { Header } from '../../components';
+import { BellIcon, Header, PlusIcon } from '../../components';
 import { AuthGuard } from '../../utils/auth';
 import { supabase } from '../../utils/supabase';
 
@@ -9,7 +9,6 @@ const styles = {
     backgroundColor: '#333333',
   },
 };
-
 export const Route = createFileRoute('/events/')({
   beforeLoad: AuthGuard,
   loader: async () => {
@@ -28,16 +27,38 @@ export const Route = createFileRoute('/events/')({
 
 function EventIndex() {
   const { events } = Route.useLoaderData()
+  const navigate = Route.useNavigate();
   return (
     <>
-      <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="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>
+        <button className="btn btn-circle fixed right-4 bottom-4" onClick={()=>document.getElementById('my_modal_4').showModal()}>
+          <PlusIcon />
+          <dialog id="my_modal_4" className="modal">
+            <div className="modal-box w-11/12 max-w-5xl">
+              <div className="flex items-center justify-center">
+                <BellIcon />
+                <h3 className="font-bold text-2xl">通知</h3>
+              </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>
+                <form method="dialog" className="w-1/2">
+                  {/* This button will close the dialog */}
+                  <button className="btn w-full">取消</button>
+                </form>
+              </div>
+            </div>
+          </dialog>
+        </button>
       </div>
     </>
   )

From e26f4a74d24d90eb1d72391440d09cc12e13defd Mon Sep 17 00:00:00 2001
From: nelsonkct <nelsonkuo0430@gmail.com>
Date: Thu, 17 Oct 2024 20:36:52 +0800
Subject: [PATCH 2/2] fix : meet code style and type check

---
 src/routes/events/index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/routes/events/index.tsx b/src/routes/events/index.tsx
index 957099b..6909804 100644
--- a/src/routes/events/index.tsx
+++ b/src/routes/events/index.tsx
@@ -40,7 +40,11 @@ function EventIndex() {
             ))
           }
         </div>
-        <button className="btn btn-circle fixed right-4 bottom-4" onClick={()=>document.getElementById('my_modal_4').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">