Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4254 from omnivore-app/fix/web-library-shortcuts-and-misc

Browse Source 
Web library improvements
This commit is contained in:
Jackson Harper
2024-08-13 17:27:48 +08:00
committed by GitHub
parent 3fe22e0f8e 602acbbe31
commit 6c86ee9f3c
7 changed files with 74 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/web/components/elements/images/OmnivoreLogoBase.tsx
View File

@ -10,24 +10,27 @@ export type OmnivoreLogoBaseProps = {
}
export function OmnivoreLogoBase(props: OmnivoreLogoBaseProps): JSX.Element {
const router = useRouter()
return (
<Box
style={{
textDecoration: 'none',
display: 'flex',
alignItems: 'center',
cursor: 'pointer',
}}
onClick={(event) => {
const navReturn = window.localStorage.getItem('nav-return')
if (navReturn) {
window.location.assign(navReturn)
router.push(navReturn)
return
}
const query = window.sessionStorage.getItem('q')
if (query) {
window.location.assign(`${DEFAULT_HOME_PATH}?${query}`)
router.push(`${DEFAULT_HOME_PATH}?${query}`)
} else {
window.location.replace(DEFAULT_HOME_PATH)
router.push(DEFAULT_HOME_PATH)
}
}}
tabIndex={-1}

13
packages/web/components/templates/article/PdfArticleContainer.tsx
View File

@ -27,6 +27,7 @@ import {
useMergeHighlight,
useUpdateHighlight,
} from '../../../lib/networking/highlights/useItemHighlights'
import { useRouter } from 'next/router'
export type PdfArticleContainerProps = {
viewer: UserBasicData
@ -38,12 +39,12 @@ export type PdfArticleContainerProps = {
export default function PdfArticleContainer(
props: PdfArticleContainerProps
): JSX.Element {
const router = useRouter()
const containerRef = useRef<HTMLDivElement | null>(null)
const [notebookKey, setNotebookKey] = useState<string>(uuidv4())
const [noteTarget, setNoteTarget] = useState<Highlight | undefined>(undefined)
const [noteTargetPageIndex, setNoteTargetPageIndex] = useState<
number | undefined
>(undefined)
const [noteTargetPageIndex, setNoteTargetPageIndex] =
useState<number | undefined>(undefined)
const highlightsRef = useRef<Highlight[]>([])
const createHighlight = useCreateHighlight()
const deleteHighlight = useDeleteHighlight()
@ -481,14 +482,14 @@ export default function PdfArticleContainer(
case 'u':
const navReturn = window.localStorage.getItem('nav-return')
if (navReturn) {
window.location.assign(navReturn)
router.push(navReturn)
return
}
const query = window.sessionStorage.getItem('q')
if (query) {
window.location.assign(`${DEFAULT_HOME_PATH}?${query}`)
router.push(`${DEFAULT_HOME_PATH}?${query}`)
} else {
window.location.replace(DEFAULT_HOME_PATH)
router.push(DEFAULT_HOME_PATH)
}
break
case 'e':

4
packages/web/lib/hooks/useHandleAddUrl.ts
View File

@ -2,8 +2,10 @@ import { useCallback } from 'react'
import { v4 as uuidv4 } from 'uuid'
import { useAddItem } from '../networking/library_items/useLibraryItems'
import { showErrorToast, showSuccessToastWithAction } from '../toastHelpers'
import { useRouter } from 'next/router'
export const useHandleAddUrl = () => {
const router = useRouter()
const addItem = useAddItem()
return useCallback(async (url: string, timezone: string, locale: string) => {
const itemId = uuidv4()
@ -16,7 +18,7 @@ export const useHandleAddUrl = () => {
console.log('result: ', result)
if (result) {
showSuccessToastWithAction('Item saving', 'Read now', async () => {
window.location.href = `/article?url=${encodeURIComponent(url)}`
router.push(`/article?url=${encodeURIComponent(url)}`)
return Promise.resolve()
})
} else {

12
packages/web/lib/networking/library_items/gql.tsx
View File

@ -69,18 +69,6 @@ export const GQL_SEARCH_QUERY = gql`
readAt
savedAt
wordsCount
recommendations {
id
name
note
user {
userId
name
username
profileImageURL
}
recommendedAt
}
highlights {
...HighlightFields
}

3
packages/web/package.json
View File

@ -30,9 +30,12 @@
"@radix-ui/react-separator": "^0.1.0",
"@radix-ui/react-slider": "^1.1.0",
"@radix-ui/react-switch": "^1.0.1",
"@react-native-async-storage/async-storage": "^1.24.0",
"@sentry/nextjs": "^7.42.0",
"@stitches/react": "^1.2.5",
"@tanstack/query-async-storage-persister": "^5.51.21",
"@tanstack/react-query": "^5.51.21",
"@tanstack/react-query-persist-client": "^5.51.23",
"allotment": "^1.20.2",
"antd": "4.24.3",
"axios": "^1.2.0",

32
packages/web/pages/_app.tsx
View File

@ -24,10 +24,23 @@ import { updateTheme } from '../lib/themeUpdater'
import { ThemeId } from '../components/tokens/stitches.config'
import { posthog } from 'posthog-js'
import { GoogleReCaptchaProvider } from '@google-recaptcha/react'
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import AsyncStorage from '@react-native-async-storage/async-storage'
import { QueryClient } from '@tanstack/react-query'
import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client'
import { createAsyncStoragePersister } from '@tanstack/query-async-storage-persister'
import React from 'react'
const queryClient = new QueryClient()
const queryClient = new QueryClient({
defaultOptions: {
queries: {
gcTime: 1000 * 60 * 60 * 48, // 48 hours
},
},
})
const asyncStoragePersister = createAsyncStoragePersister({
storage: AsyncStorage,
})
TopBarProgress.config({
barColors: {
@ -79,14 +92,6 @@ const ConditionalCaptchaProvider = (props: {
return <>{props.children}</>
}
// const queryClient = new QueryClient({
// defaultOptions: {
// queries: {
// gcTime: 1000 * 60 * 60 * 24,
// },
// },
// })
export function OmnivoreApp({ Component, pageProps }: AppProps): JSX.Element {
const router = useRouter()
@ -102,7 +107,10 @@ export function OmnivoreApp({ Component, pageProps }: AppProps): JSX.Element {
return (
<ConditionalCaptchaProvider>
<QueryClientProvider client={queryClient}>
<PersistQueryClientProvider
client={queryClient}
persistOptions={{ persister: asyncStoragePersister }}
>
<KBarProvider actions={generateActions(router)}>
<KBarPortal>
<KBarPositioner style={{ zIndex: 100 }}>
@ -116,7 +124,7 @@ export function OmnivoreApp({ Component, pageProps }: AppProps): JSX.Element {
<Component {...pageProps} />
</IdProvider>
</KBarProvider>
</QueryClientProvider>
</PersistQueryClientProvider>
</ConditionalCaptchaProvider>
)
}

35
yarn.lock
View File

@ -5664,6 +5664,13 @@
resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz#a3031eb54129f2c66b2753f8404266ec7bf67f0a"
integrity sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==
"@react-native-async-storage/async-storage@^1.24.0":
version "1.24.0"
resolved "https://registry.yarnpkg.com/@react-native-async-storage/async-storage/-/async-storage-1.24.0.tgz#888efbc62a26f7d9464b32f4d3027b7f2771999b"
integrity sha512-W4/vbwUOYOjco0x3toB8QCr7EjIP6nE9G7o8PMguvvjYT5Awg09lyV4enACRx4s++PPulBiBSjL0KTFx2u0Z/g==
dependencies:
merge-options "^3.0.4"
"@redis/bloom@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@redis/bloom/-/bloom-1.2.0.tgz#d3fd6d3c0af3ef92f26767b56414a370c7b63b71"
@ -7620,11 +7627,32 @@
dependencies:
defer-to-connect "^1.0.1"
"@tanstack/query-async-storage-persister@^5.51.21":
version "5.51.21"
resolved "https://registry.yarnpkg.com/@tanstack/query-async-storage-persister/-/query-async-storage-persister-5.51.21.tgz#27e6635d89e0814c65586b8047372349698c7841"
integrity sha512-T22f99fDKk+XrT0kCEwETNehn8gjGfdNaaYM0xRA7VvwFKUKNYETOwUQgXV6kZ+xg6LKbZeI22YsTcuYDFOx5w==
dependencies:
"@tanstack/query-persist-client-core" "5.51.21"
"@tanstack/query-core@5.51.21":
version "5.51.21"
resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.51.21.tgz#a510469c6c30d3de2a8b8798e340169a4b0fd08f"
integrity sha512-POQxm42IUp6n89kKWF4IZi18v3fxQWFRolvBA6phNVmA8psdfB1MvDnGacCJdS+EOX12w/CyHM62z//rHmYmvw==
"@tanstack/query-persist-client-core@5.51.21":
version "5.51.21"
resolved "https://registry.yarnpkg.com/@tanstack/query-persist-client-core/-/query-persist-client-core-5.51.21.tgz#5ee605f730c28ebdf3e2bf075257f65ceab80ccb"
integrity sha512-W/H3SFIMPjxgiwkrl511pG2JhvKnFWtLCgO+AlNqk9keyClMbm9tb3oLUHveLuzviCaROpmFShW+eSP5zYwk4g==
dependencies:
"@tanstack/query-core" "5.51.21"
"@tanstack/react-query-persist-client@^5.51.23":
version "5.51.23"
resolved "https://registry.yarnpkg.com/@tanstack/react-query-persist-client/-/react-query-persist-client-5.51.23.tgz#f4f4d7ba854907c43a864614eea94579a20f0651"
integrity sha512-SwTNwxhG4zgpji3B8oLZqZuaOXYtOjbuqVerMQkOX/vGroIU6dGh1SzOwy4glW3IVr+G3kUKMcS3JYibWPQZiQ==
dependencies:
"@tanstack/query-persist-client-core" "5.51.21"
"@tanstack/react-query@^5.51.21":
version "5.51.23"
resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.51.23.tgz#83c223f4cb6054b206de8856b73ca7e41a63ba1f"
@ -22194,6 +22222,13 @@ merge-descriptors@1.0.1:
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
merge-options@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-3.0.4.tgz#84709c2aa2a4b24c1981f66c179fe5565cc6dbb7"
integrity sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==
dependencies:
is-plain-obj "^2.1.0"
merge-stream@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"