Merge pull request #27 from besscroft/dev

v0.7.1
besscroft · May 18, 2024 · d60289c · d60289c
2 parents a27eb6c + db701dd
commit d60289c
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 7 deletions.
diff --git a/app/admin/tag/page.tsx b/app/admin/tag/page.tsx
@@ -7,6 +7,8 @@ import React from 'react'
 import TagAddSheet from '~/components/admin/tag/TagAddSheet'
 import TagAddButton from '~/components/admin/tag/TagAddButton'
 import TagEditSheet from '~/components/admin/tag/TagEditSheet'
+import TagHelpSheet from '~/components/admin/tag/TagHelpSheet'
+import TagHelp from '~/components/admin/tag/TagHelp'
 
 export default async function List() {
 
@@ -30,6 +32,7 @@ export default async function List() {
             </div>
           </div>
           <div className="flex items-center space-x-2">
+            <TagHelp />
             <TagAddButton />
             <RefreshButton {...props} />
           </div>
@@ -38,6 +41,7 @@ export default async function List() {
       <TagList {...props} />
       <TagAddSheet {...props} />
       <TagEditSheet {...props} />
+      <TagHelpSheet />
     </div>
   )
 }
diff --git a/components/admin/tag/TagHelp.tsx b/components/admin/tag/TagHelp.tsx
@@ -0,0 +1,23 @@
+'use client'
+
+import { Button } from '@nextui-org/react'
+import React from 'react'
+import { CircleHelp } from 'lucide-react'
+import { useButtonStore } from '~/app/providers/button-store-Providers'
+
+export default function TagHelp() {
+  const { setTagHelp } = useButtonStore(
+    (state) => state,
+  )
+  return (
+    <Button
+      isIconOnly
+      size="sm"
+      color="warning"
+      aria-label="帮助"
+      onClick={() => setTagHelp(true)}
+    >
+      <CircleHelp />
+    </Button>
+  )
+}
diff --git a/components/admin/tag/TagHelpSheet.tsx b/components/admin/tag/TagHelpSheet.tsx
@@ -0,0 +1,37 @@
+'use client'
+
+import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle } from '~/components/ui/Sheet'
+import { useButtonStore } from '~/app/providers/button-store-Providers'
+
+export default function TagHelpSheet() {
+  const { tagHelp, setTagHelp } = useButtonStore(
+    (state) => state,
+  )
+
+  return (
+    <Sheet
+      defaultOpen={false}
+      open={tagHelp}
+      onOpenChange={(open: boolean) => {
+        if (!open) {
+          setTagHelp(false)
+        }
+      }}
+      modal={false}
+    >
+      <SheetContent side="left">
+        <SheetHeader>
+          <SheetTitle>帮助</SheetTitle>
+          <SheetDescription className="space-y-2">
+            <p>
+              您要展示除⌈首页⌋外的其它相册，需要添加新的⌈标签⌋，并标记为可显示状态。
+            </p>
+            <p>
+              ⌈标签⌋的⌈路由⌋需要带 / 前缀。
+            </p>
+          </SheetDescription>
+        </SheetHeader>
+      </SheetContent>
+    </Sheet>
+  )
+}
diff --git a/components/admin/upload/FileUpload.tsx b/components/admin/upload/FileUpload.tsx
@@ -33,6 +33,7 @@ export default function FileUpload() {
   async function loadExif(file: any) {
     try {
       const tags = await ExifReader.load(file)
+      console.log(tags)
       const exifObj = {
         make: '',
         model: '',

diff --git a/components/layout/DropMenu.tsx b/components/layout/DropMenu.tsx
@@ -62,7 +62,14 @@ export const DropMenu = () => {
                 showDivider
               >
                 <div onClick={async () => {
-                  await loginOut()
+                  try {
+                    await loginOut()
+                    setTimeout(() => {
+                      location.replace('/login')
+                    }, 1000);
+                  } catch (e) {
+                    console.log(e)
+                  }
                 }}>
                   退出登录
                 </div>

diff --git a/components/layout/VaulDrawer.tsx b/components/layout/VaulDrawer.tsx
@@ -114,7 +114,14 @@ export default function VaulDrawer() {
                         startContent={<LogOut size={20} className={iconClasses} />}
                       >
                         <div onClick={async () => {
-                          await loginOut()
+                          try {
+                            await loginOut()
+                            setTimeout(() => {
+                              location.replace('/login')
+                            }, 1000);
+                          } catch (e) {
+                            console.log(e)
+                          }
                         }}>
                           退出登录
                         </div>

diff --git a/components/login/UserFrom.tsx b/components/login/UserFrom.tsx
@@ -97,13 +97,17 @@ export const UserFrom = () => {
                 const { email, password } = parsedCredentials.data;
                 await authenticate(email, password)
                 toast.success('登录成功！')
+                setTimeout(() => {
+                  location.replace('/admin')
+                }, 1000);
               } else {
                 toast.error('请检查您的账号密码！')
               }
             } catch (e) {
               toast.error('登录失败！')
+            } finally {
+              setIsLoading(false)
             }
-            setIsLoading(false)
           }}
           aria-label="登录"
         >

diff --git a/server/lib/actions.ts b/server/lib/actions.ts
@@ -9,8 +9,7 @@ export async function authenticate(
     await signIn('Credentials', {
       email: email,
       password: password,
-      redirect: true,
-      redirectTo: '/admin'
+      redirect: false,
     });
   } catch (error) {
     throw error;
@@ -20,8 +19,7 @@ export async function authenticate(
 export async function loginOut() {
   try {
     await signOut({
-      redirect: true,
-      redirectTo: '/login'
+      redirect: false,
     });
   } catch (error) {
     throw error;

diff --git a/stores/buttonStores.ts b/stores/buttonStores.ts
@@ -18,6 +18,7 @@ export type ButtonState = {
   aListData: Config[]
   MasonryView: boolean
   MasonryViewData: ImageType
+  tagHelp: boolean
 }
 
 export type ButtonActions = {
@@ -36,6 +37,7 @@ export type ButtonActions = {
   setAListEditData: (aListData: Config[]) => void
   setMasonryView: (masonryView: boolean) => void
   setMasonryViewData: (masonryViewData: ImageType) => void
+  setTagHelp: (tagHelp: boolean) => void
 }
 
 export type ButtonStore = ButtonState & ButtonActions
@@ -57,6 +59,7 @@ export const initButtonStore = (): ButtonState => {
     aListData: [] as Config[],
     MasonryView: false,
     MasonryViewData: {} as ImageType,
+    tagHelp: false,
   }
 }
 
@@ -76,6 +79,7 @@ export const defaultInitState: ButtonState = {
   aListData: [] as Config[],
   MasonryView: false,
   MasonryViewData: {} as ImageType,
+  tagHelp: false,
 }
 
 export const createButtonStore = (
@@ -130,6 +134,9 @@ export const createButtonStore = (
         setMasonryViewData: (masonryViewDataValue) => set(() => ({
           MasonryViewData: masonryViewDataValue,
         })),
+        setTagHelp: (tagHelpValue) => set(() => ({
+          tagHelp: tagHelpValue,
+        })),
       }),
       {
         name: 'pic-impact-button-storage', // name of the item in the storage (must be unique)