Merge commit '51c298f4a4c93bfffb0290214851a5846b9f3d4e'

NCUAppTeam · Dec 3, 2024 · b390dfe · b390dfe
2 parents 6b0f71a + 51c298f
commit b390dfe
Show file tree

Hide file tree

Showing 4 changed files with 124 additions and 62 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,13 +11,13 @@
     "test": "playwright test"
   },
   "dependencies": {
+    "@heroicons/react": "^2.1.5",
     "@supabase/supabase-js": "^2.45.3",
     "@tanstack/react-router": "^1.56.2",
     "flowbite-react-icons": "^1.1.0",
-    "heroicons": "^2.1.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "supabase": "^1.200.3"
+    "supabase": "^1.223.10"
   },
   "devDependencies": {
     "@playwright/test": "^1.47.0",

diff --git a/src/routes/events/index.tsx b/src/routes/events/index.tsx
@@ -115,7 +115,7 @@ function EventCard({ event }: { event: Event }) {
         </p>
         <p className="text-sm flex items-center">
           <PinIcon fill="currentColor" stroke="#ffffff" size={24} />
-          {event.location}
+          {event.location || '位置未提供'}
         </p>
       </div>
     </div>

diff --git a/src/routes/login.tsx b/src/routes/login.tsx
@@ -1,7 +1,6 @@
-import { createFileRoute } from '@tanstack/react-router'
-import { useState } from 'react'
-import { VStack } from '../components'
-import { supabase } from '../utils/supabase'
+import { createFileRoute } from '@tanstack/react-router';
+import { useState } from 'react';
+import { supabase } from '../utils/supabase';
 
 export const Route = createFileRoute('/login')({
   component: LoginPage,
@@ -15,16 +14,17 @@ export const Route = createFileRoute('/login')({
 function LoginPage() {
   const [email, setEmail] = useState('')
   const [password, setPassword] = useState('')
+  const [isRemember, setIsRemember] = useState(false);
+  const [isError, setIsError] = useState(false);
   const { redirect: redirectUrl } = Route.useSearch()
 
-  async function login() {
-    const { data: { session }, error } = await supabase.auth.signInWithPassword({
-      email,
-      password
-    })
+  async function login(event: React.FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+    const { data: { session }, error } = await supabase.auth.signInWithPassword({ email, password });
 
     if (error !== null) {
-      throw error
+      setPassword('');
+      setIsError(true);
     }
 
     if (session !== null) {
@@ -33,19 +33,68 @@ function LoginPage() {
   }
 
   return (
-    <div>
-      <VStack>
-        <div>
-          <label>Email: </label>
-          <input className='border' type="email" onChange={(e) => { setEmail(e.target.value) }} />
-        </div>
-        <div>
-          <label>Password:</label>
-          <input className='border' type="password" onChange={(e) => { setPassword(e.target.value) }} />
-        </div>
-      </VStack>
-      <button onClick={login}>Login</button>
-    </div>
+    <form
+      className='flex flex-col h-screen items-center justify-center px-5 gap-4 bg-gradient-to-b from-[#d9d9d9] to-[#6ccae8]'
+      onSubmit={login}
+    >
+      <input
+        type='text'
+        className='w-full h-14 rounded-full bg-white border border-black focus:border focus:border-black px-6 text-black font-bold text-xl placeholder:text-gray-300'
+        placeholder={Labels.account}
+        value={email}
+        onChange={(e) => setEmail(e.target.value)}
+      />
+      <input
+        type='password'
+        className='w-full h-14 rounded-full bg-white border border-black focus:border focus:border-black px-6 text-black font-bold text-xl placeholder:text-gray-300'
+        placeholder={Labels.password}
+        value={password}
+        onChange={(e) => setPassword(e.target.value)}
+      />
+      <div className='flex flex-row items-center gap-4'>
+        {/* The style of the checkbox is refered from https://www.material-tailwind.com/docs/html/checkbox */}
+        <label htmlFor='remember' className='flex items-center cursor-pointer relative'>
+          <input
+            type='checkbox'
+            className='peer size-5 cursor-pointer transition-all appearance-none rounded bg-white border-2 border-gray-600 checked:bg-cyan-500 checked:border-cyan-500' id='remember'
+            checked={isRemember}
+            onChange={(e) => setIsRemember(e.target.checked)}
+          />
+          <span className='absolute text-white opacity-0 peer-checked:opacity-100 top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2'>
+            <svg xmlns='http://www.w3.org/2000/svg' className='h-3.5 w-3.5' viewBox='0 0 20 20' fill='currentColor' stroke='currentColor' strokeWidth='1' aria-hidden="true">
+              <path fillRule='evenodd' d='M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z' clipRule='evenodd'></path>
+            </svg>
+          </span>
+        </label>
+        <label htmlFor='remember' className='text-white font-bold text-2xl'>
+          {Labels.remember}
+        </label>
+      </div>
+      {
+        isError
+          ? (
+            <span className='text-red-500 font-bold text-2xl'>
+              {isError ? Labels.wrongAccountOrPassword : ''}
+            </span>
+          )
+          : <></>
+      }
+      <button
+        type='submit'
+        className='w-full h-20 rounded-md bg-green-600 text-white font-extrabold text-5xl'
+      >
+        {Labels.login}
+      </button>
+    </form>
   )
+}
+
+class Labels {
+  private constructor() { }
 
+  static readonly account = '信箱或手機號碼';
+  static readonly password = '密碼';
+  static readonly remember = '保持我的登入狀態';
+  static readonly login = '登入';
+  static readonly wrongAccountOrPassword = '帳號或密碼錯誤';
 }