= ({
+async function ProfileAnalytics({
clippingsCount,
booksCount,
createdAt,
-}) => {
- const { t } = useTranslation()
+}: ProfileAnalyticsProps) {
+ const { t } = await getTranslation()
- const memberDays = React.useMemo(() => {
- const created = new Date(createdAt)
- const now = new Date()
- const diffTime = Math.abs(now.getTime() - created.getTime())
- const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
- return diffDays
- }, [createdAt])
+ const created = new Date(createdAt)
+ const now = new Date()
+ const diffTime = Math.abs(now.getTime() - created.getTime())
+ const memberDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
- const avgClippingsPerDay = React.useMemo(() => {
- if (memberDays === 0) return 0
- return (clippingsCount / memberDays).toFixed(1)
- }, [clippingsCount, memberDays])
+ const avgClippingsPerDay =
+ memberDays === 0 ? 0 : (clippingsCount / memberDays).toFixed(1)
const stats = [
{
diff --git a/src/components/settings-sidebar/settings-sidebar.tsx b/src/components/settings-sidebar/settings-sidebar.tsx
index 6f67c637..5db4aea7 100644
--- a/src/components/settings-sidebar/settings-sidebar.tsx
+++ b/src/components/settings-sidebar/settings-sidebar.tsx
@@ -1,11 +1,5 @@
'use client'
-import {
- Cog8ToothIcon,
- DocumentArrowDownIcon,
- GlobeAltIcon,
- QueueListIcon,
- UserIcon,
-} from '@heroicons/react/24/outline'
+import { FileDown, Globe, List, Settings, User } from 'lucide-react'
import Link from 'next/link'
import { usePathname } from 'next/navigation'
@@ -30,27 +24,27 @@ function SettingsSidebar({ title }: SettingsSidebarProps) {
{
id: 'web',
label: t('app.settings.title'),
- icon:
,
+ icon:
,
},
{
id: 'orders',
label: t('app.settings.orders.title'),
- icon:
,
+ icon:
,
},
{
id: 'webhooks',
label: t('app.settings.webhook.title'),
- icon:
,
+ icon:
,
},
{
id: 'exports',
label: t('app.settings.export.title'),
- icon:
,
+ icon:
,
},
{
id: 'account',
label: t('app.settings.account'),
- icon:
,
+ icon:
,
className: 'ml-auto',
},
]
diff --git a/src/components/uploads/drop-overlay.tsx b/src/components/uploads/drop-overlay.tsx
index 9ce7def2..cd13a14a 100644
--- a/src/components/uploads/drop-overlay.tsx
+++ b/src/components/uploads/drop-overlay.tsx
@@ -1,4 +1,4 @@
-import { ArrowDownTrayIcon } from '@heroicons/react/24/solid'
+import { Download } from 'lucide-react'
import { useTranslation } from '@/i18n/client'
@@ -27,9 +27,9 @@ function DropOverlay(props: Props) {
{/* Icon with glow */}
{/* Text with gradient */}
diff --git a/src/hooks/book.ts b/src/hooks/book.ts
index f5bc8d59..826e8bb0 100644
--- a/src/hooks/book.ts
+++ b/src/hooks/book.ts
@@ -2,13 +2,15 @@ import { useQueries, useQuery, useSuspenseQuery } from '@tanstack/react-query'
import { useMemo } from 'react'
import {
+ duration3Days,
+ isValidDoubanId,
type WenquBook,
+ wenquBooksByIdsQueryOptions,
type WenquSearchResponse,
wenquRequest,
} from '../services/wenqu'
-// 3 days
-export const duration3Days = 1000 * 60 * 60 * 24 * 3
+export { duration3Days }
type bookRequestReturn = {
books: WenquBook[]
@@ -54,14 +56,12 @@ export function useMultipleBook(
skip?: boolean
): bookRequestReturn {
const validDoubanIdList = useMemo(() => {
- return doubanIds
- .filter((x) => x.length > 3)
- .reduce
((acc, x) => {
- if (!acc.includes(x)) {
- acc.push(x)
- }
- return acc
- }, [])
+ return doubanIds.filter(isValidDoubanId).reduce((acc, x) => {
+ if (!acc.includes(x)) {
+ acc.push(x)
+ }
+ return acc
+ }, [])
}, [doubanIds])
const chunkedDbIds = useMemo(() => {
const result: string[][] = []
@@ -74,15 +74,8 @@ export function useMultipleBook(
const bbs = useQueries({
queries: chunkedDbIds.map((dbIds) => ({
- queryKey: ['wenqu', 'books', 'dbIds', dbIds],
- queryFn: () =>
- wenquRequest(
- `/books/search?dbIds=${dbIds.join('&dbIds=')}`
- ),
+ ...wenquBooksByIdsQueryOptions(dbIds),
enabled: dbIds.length > 0 && !skip,
- staleTime: duration3Days,
- gcTime: duration3Days,
- cacheTime: duration3Days,
})),
})
diff --git a/src/hooks/hooks.ts b/src/hooks/hooks.ts
index fc882cc0..c1cafb7d 100644
--- a/src/hooks/hooks.ts
+++ b/src/hooks/hooks.ts
@@ -1,6 +1,7 @@
'use client'
import type { MutationResult } from '@apollo/client/react'
import * as sentry from '@sentry/react'
+import type { Route } from 'next'
import { useRouter } from 'next/navigation'
import { useEffect } from 'react'
import toast from 'react-hot-toast'
@@ -18,8 +19,12 @@ import type {
} from '../schema/generated'
import { updateToken } from '../services/ajax'
import profile from '../utils/profile'
+import { getUserSlug } from '../utils/profile.utils'
-type UserContent = Pick
+type UserContent = Pick<
+ User,
+ 'id' | 'name' | 'email' | 'avatar' | 'createdAt' | 'domain'
+>
async function onAuthEnd(data: { user: UserContent; token: string }) {
const { user, token } = data
@@ -48,42 +53,54 @@ async function onAuthEnd(data: { user: UserContent; token: string }) {
// Cookies.set('uid', profile.uid.toString(), { expires: 365 })
}
-export function useAuthBy3rdPartSuccessed(
- called: boolean,
- loading: boolean,
- error?: Error,
- // authResponse?: authByWeb3_loginByWeb3 | loginByApple_loginByApple | bindAppleUnique_bindAppleUnique | bindWeb3Address_bindWeb3Address
- authResponse?: Pick
+type AuthResultState = {
+ called: boolean
+ loading: boolean
+ error?: Error
+ authResponse?: T
+}
+
+function useAuthResultEffect(
+ state: AuthResultState,
+ getRedirectPath: (response: T) => string,
+ options: { skipZeroIdGuard?: boolean } = {}
) {
- // const navigate = useNavigate()
const { push: navigate } = useRouter()
+ const { called, loading, error, authResponse } = state
useEffect(() => {
- if (!called) {
- return
- }
- if (error) {
- return
- }
- if (loading) {
- return
- }
- if (!authResponse) {
+ if (!called || error || loading || !authResponse) {
return
}
-
- if (authResponse.user.id === 0) {
+ if (!options.skipZeroIdGuard && authResponse.user.id === 0) {
return
}
onAuthEnd(authResponse).then(() => {
- // redirect
setTimeout(() => {
- const me = authResponse.user
- const domain = me.domain.length > 2 ? me.domain : me.id
- navigate(`/dash/${domain}/home?from_auth=1`)
+ navigate(getRedirectPath(authResponse) as Route)
}, 100)
})
- }, [called, loading, error, authResponse, navigate])
+ }, [
+ called,
+ loading,
+ error,
+ authResponse,
+ navigate,
+ options.skipZeroIdGuard,
+ getRedirectPath,
+ ])
+}
+
+export function useAuthBy3rdPartSuccessed(
+ called: boolean,
+ loading: boolean,
+ error?: Error,
+ authResponse?: Pick
+) {
+ useAuthResultEffect(
+ { called, loading, error, authResponse },
+ (response) => `/dash/${getUserSlug(response.user)}/home?from_auth=1`
+ )
}
export function useLoginV3Successed(
@@ -92,36 +109,13 @@ export function useLoginV3Successed(
error?: Error,
authResponse?: DoLoginV3Mutation['loginV3']
) {
- const { push: navigate } = useRouter()
- useEffect(() => {
- if (!called) {
- return
- }
- if (error) {
- return
- }
- if (loading) {
- return
- }
- if (!authResponse) {
- return
- }
-
- if (authResponse.user.id === 0) {
- return
- }
-
- onAuthEnd(authResponse).then(() => {
- // redirect
- setTimeout(() => {
- const me = authResponse.user
- const domain = me.domain.length > 2 ? me.domain : me.id
- navigate(
- `/dash/${domain}/${authResponse.isNewUser ? 'newbie' : 'home'}?from_auth=1`
- )
- }, 100)
- })
- }, [called, loading, error, authResponse, navigate])
+ useAuthResultEffect(
+ { called, loading, error, authResponse },
+ (response) =>
+ `/dash/${getUserSlug(response.user)}/${
+ response.isNewUser ? 'newbie' : 'home'
+ }?from_auth=1`
+ )
}
export function useAuthByPhoneSuccessed(
@@ -130,31 +124,11 @@ export function useAuthByPhoneSuccessed(
error?: Error,
authResponse?: AuthByPhoneMutation['authByPhone']
) {
- // const navigate = useNavigate()
- const { push: navigate } = useRouter()
- useEffect(() => {
- if (!called) {
- return
- }
- if (error) {
- return
- }
- if (loading) {
- return
- }
- if (!authResponse) {
- return
- }
-
- onAuthEnd(authResponse).then(() => {
- // redirect
- setTimeout(() => {
- const me = authResponse.user
- const domain = me.domain.length > 2 ? me.domain : me.id
- navigate(`/dash/${domain}/home?from_auth=1`)
- }, 100)
- })
- }, [called, loading, error, authResponse, navigate])
+ useAuthResultEffect(
+ { called, loading, error, authResponse },
+ (response) => `/dash/${getUserSlug(response.user)}/home?from_auth=1`,
+ { skipZeroIdGuard: true }
+ )
}
export function useAuthSuccessed(
diff --git a/src/hooks/my-file.tsx b/src/hooks/my-file.tsx
index 607c7709..0ba8ae9b 100644
--- a/src/hooks/my-file.tsx
+++ b/src/hooks/my-file.tsx
@@ -1,5 +1,5 @@
import { useApolloClient, useMutation } from '@apollo/client/react'
-import { CheckCircleIcon } from '@heroicons/react/24/solid'
+import { CircleCheck } from 'lucide-react'
import { useMachine } from '@xstate/react'
import { useCallback, useEffect, useRef, useState } from 'react'
import { toast } from 'react-hot-toast'
@@ -158,7 +158,7 @@ export function useUploadData(_: boolean, willSyncServer: boolean) {
)
send({ type: 'Next' })
toast(t('app.upload.tips.parsedInfoTitle'), {
- icon: ,
+ icon: ,
// message: t('app.upload.tips.parsedInfoContent'),
})
return
diff --git a/src/hooks/profile.ts b/src/hooks/profile.ts
deleted file mode 100644
index 4bf2ee58..00000000
--- a/src/hooks/profile.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export function useIsPremium(premiumEndAt?: string) {
- if (!premiumEndAt) {
- return false
- }
- return new Date(premiumEndAt).getTime() > Date.now()
-}
diff --git a/src/services/books.ts b/src/services/books.ts
index 8bb16c4a..925d3713 100644
--- a/src/services/books.ts
+++ b/src/services/books.ts
@@ -1,4 +1,4 @@
-import { CDN_DEFAULT_DOMAIN } from '../constants/config'
+import { resolveMediaUrl } from '../utils/image'
import { request } from './ajax'
import type { IClippingItem, IHttpClippingItem } from './clippings'
@@ -24,8 +24,7 @@ export interface IBook extends Book {
}
export function covertHttpBook2Book(book: IHttpBook): IBook {
- const isCDNImage = book.image.indexOf('http') !== 0
- const image = isCDNImage ? `${CDN_DEFAULT_DOMAIN}/${book.image}` : book.image
+ const image = resolveMediaUrl(book.image)
return {
...book,
image:
diff --git a/src/services/wenqu.ts b/src/services/wenqu.ts
index caa19f9e..290ec8b1 100644
--- a/src/services/wenqu.ts
+++ b/src/services/wenqu.ts
@@ -2,6 +2,12 @@ import { WENQU_API_HOST, WENQU_SIMPLE_TOKEN } from '../constants/config'
// import * as Sentry from '@sentry/react'
+export const duration3Days = 1000 * 60 * 60 * 24 * 3
+
+export function isValidDoubanId(id: string): boolean {
+ return id.length > 3
+}
+
type WenquErrorResponse = {
code: number
error: string
@@ -81,3 +87,15 @@ export interface WenquSearchResponse {
count: number
books: WenquBook[]
}
+
+export function wenquBooksByIdsQueryOptions(dbIds: string[]) {
+ return {
+ queryKey: ['wenqu', 'books', 'dbIds', dbIds] as const,
+ queryFn: () =>
+ wenquRequest(
+ `/books/search?dbIds=${dbIds.join('&dbIds=')}`
+ ),
+ staleTime: duration3Days,
+ gcTime: duration3Days,
+ }
+}
diff --git a/src/utils/array.ts b/src/utils/array.ts
new file mode 100644
index 00000000..eb9e1815
--- /dev/null
+++ b/src/utils/array.ts
@@ -0,0 +1,10 @@
+export function uniqueById(arr: T[]): T[] {
+ const seen = new Set()
+ return arr.filter((item) => {
+ if (seen.has(item.id)) {
+ return false
+ }
+ seen.add(item.id)
+ return true
+ })
+}
diff --git a/src/utils/image.ts b/src/utils/image.ts
index c13b5d25..b4aeb00d 100644
--- a/src/utils/image.ts
+++ b/src/utils/image.ts
@@ -1,3 +1,5 @@
+import { CDN_DEFAULT_DOMAIN } from '../constants/config'
+
// import ColorThief from 'colorthief'
let support: boolean
@@ -6,6 +8,13 @@ export enum ImageTheme {
light,
}
+export function resolveMediaUrl(path?: string | null): string {
+ if (!path) {
+ return ''
+ }
+ return path.startsWith('http') ? path : `${CDN_DEFAULT_DOMAIN}/${path}`
+}
+
export function supportsWebp(): Promise {
if (support !== undefined) {
return Promise.resolve(support)
diff --git a/src/utils/profile.utils.ts b/src/utils/profile.utils.ts
index ba6720b6..1a236c23 100644
--- a/src/utils/profile.utils.ts
+++ b/src/utils/profile.utils.ts
@@ -1,9 +1,14 @@
import type { ProfileQuery } from '@/schema/generated'
+export function getUserSlug(
+ p: Pick
+): string | number {
+ return p.domain.length > 2 ? p.domain : p.id
+}
+
export function getMyHomeLink(p?: Pick) {
if (!p) {
return '/auth/auth-v4'
}
- const id = p.domain.length > 2 ? p.domain : p.id
- return `/dash/${id}/home`
+ return `/dash/${getUserSlug(p)}/home`
}