From 37d21acf77fc2ada16116a977c0ecfbfef0237ac Mon Sep 17 00:00:00 2001 From: Manoj Vivek Date: Fri, 17 Jan 2025 18:51:47 +0530 Subject: [PATCH 1/5] accept language header handling improvements --- desktop-app/src/main/web-permissions/index.ts | 7 ++++++- .../Menu/Flyout/Settings/SettingsContentHeaders.tsx | 3 ++- desktop-app/src/store/index.ts | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/desktop-app/src/main/web-permissions/index.ts b/desktop-app/src/main/web-permissions/index.ts index 65d0b8a3..c145c411 100644 --- a/desktop-app/src/main/web-permissions/index.ts +++ b/desktop-app/src/main/web-permissions/index.ts @@ -32,9 +32,14 @@ export const WebPermissionHandlers = (mainWindow: BrowserWindow) => { urls: [''], }, (details, callback) => { - details.requestHeaders['Accept-Language'] = store.get( + const acceptLanguage = store.get( 'userPreferences.webRequestHeaderAcceptLanguage' ); + if (acceptLanguage != null && acceptLanguage !== '') { + details.requestHeaders['Accept-Language'] = store.get( + 'userPreferences.webRequestHeaderAcceptLanguage' + ); + } callback({ requestHeaders: details.requestHeaders }); } ); diff --git a/desktop-app/src/renderer/components/ToolBar/Menu/Flyout/Settings/SettingsContentHeaders.tsx b/desktop-app/src/renderer/components/ToolBar/Menu/Flyout/Settings/SettingsContentHeaders.tsx index 68fad3b8..0c3639c0 100644 --- a/desktop-app/src/renderer/components/ToolBar/Menu/Flyout/Settings/SettingsContentHeaders.tsx +++ b/desktop-app/src/renderer/components/ToolBar/Menu/Flyout/Settings/SettingsContentHeaders.tsx @@ -29,7 +29,8 @@ export const SettingsContentHeaders: FC = ({ />

- HTTP request Accept-Language parameter + HTTP request Accept-Language parameter (default: language from OS + locale settings)

diff --git a/desktop-app/src/store/index.ts b/desktop-app/src/store/index.ts index be93c9f0..ea416a60 100644 --- a/desktop-app/src/store/index.ts +++ b/desktop-app/src/store/index.ts @@ -136,7 +136,7 @@ const schema = { properties: { webRequestHeaderAcceptLanguage: { type: 'string', - default: 'us-US', + default: 'en-US', }, allowInsecureSSLConnections: { type: 'boolean', From 2fa720790669a2aecc032f0bd27d5ab8b61cc78c Mon Sep 17 00:00:00 2001 From: Manoj Vivek Date: Fri, 17 Jan 2025 18:52:19 +0530 Subject: [PATCH 2/5] accept language header handling improvements --- desktop-app/src/store/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-app/src/store/index.ts b/desktop-app/src/store/index.ts index ea416a60..30e55770 100644 --- a/desktop-app/src/store/index.ts +++ b/desktop-app/src/store/index.ts @@ -136,7 +136,7 @@ const schema = { properties: { webRequestHeaderAcceptLanguage: { type: 'string', - default: 'en-US', + default: '', }, allowInsecureSSLConnections: { type: 'boolean', From b252d74db905bad179eb1a351ab156b70f31d335 Mon Sep 17 00:00:00 2001 From: Manoj Vivek Date: Fri, 17 Jan 2025 19:35:16 +0530 Subject: [PATCH 3/5] Fresh LayoutSelector with a ButtonGroup --- .../renderer/components/ButtonGroup/index.tsx | 35 +++++++++++ .../src/renderer/components/Divider/index.tsx | 2 +- .../components/Masonry/MasonryLayout.tsx | 44 ------------- .../Menu/Flyout/PreviewLayout/index.tsx | 63 +++++++++++++------ 4 files changed, 79 insertions(+), 65 deletions(-) create mode 100644 desktop-app/src/renderer/components/ButtonGroup/index.tsx delete mode 100644 desktop-app/src/renderer/components/Masonry/MasonryLayout.tsx diff --git a/desktop-app/src/renderer/components/ButtonGroup/index.tsx b/desktop-app/src/renderer/components/ButtonGroup/index.tsx new file mode 100644 index 00000000..a9919352 --- /dev/null +++ b/desktop-app/src/renderer/components/ButtonGroup/index.tsx @@ -0,0 +1,35 @@ +import { ReactElement } from 'react'; +import cx from 'classnames'; + +interface Props { + buttons: { + content: ReactElement; + srContent: string; + onClick: () => void; + isActive: boolean; + }[]; +} + +export const ButtonGroup = ({ buttons }: Props) => { + return ( + + {buttons.map(({ content, srContent, onClick, isActive }, index) => ( + + ))} + + ); +}; diff --git a/desktop-app/src/renderer/components/Divider/index.tsx b/desktop-app/src/renderer/components/Divider/index.tsx index 4321ba10..06ecd694 100644 --- a/desktop-app/src/renderer/components/Divider/index.tsx +++ b/desktop-app/src/renderer/components/Divider/index.tsx @@ -1,3 +1,3 @@ export const Divider = () => ( -
+
); diff --git a/desktop-app/src/renderer/components/Masonry/MasonryLayout.tsx b/desktop-app/src/renderer/components/Masonry/MasonryLayout.tsx deleted file mode 100644 index 710c5220..00000000 --- a/desktop-app/src/renderer/components/Masonry/MasonryLayout.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import React from 'react'; -import { Icon } from '@iconify/react'; -import { PREVIEW_LAYOUTS } from 'common/constants'; -import { useDispatch, useSelector } from 'react-redux'; -import useKeyboardShortcut, { - SHORTCUT_CHANNEL, -} from 'renderer/components/KeyboardShortcutsManager/useKeyboardShortcut'; -import Toggle from 'renderer/components/Toggle'; -import { selectLayout, setLayout } from 'renderer/store/features/renderer'; - -const MasonryLayout = () => { - const layout = useSelector(selectLayout); - const dispatch = useDispatch(); - - const handleLayout = () => { - if (layout === PREVIEW_LAYOUTS.MASONRY) - dispatch(setLayout(PREVIEW_LAYOUTS.FLEX)); - else dispatch(setLayout(PREVIEW_LAYOUTS.MASONRY)); - }; - - useKeyboardShortcut(SHORTCUT_CHANNEL.PREVIEW_LAYOUT, handleLayout); - - return ( -
- Masonry Layout -
- - { - if (e.target.checked) { - dispatch(setLayout(PREVIEW_LAYOUTS.MASONRY)); - } else { - dispatch(setLayout(PREVIEW_LAYOUTS.COLUMN)); - } - }} - /> - -
-
- ); -}; - -export default MasonryLayout; diff --git a/desktop-app/src/renderer/components/ToolBar/Menu/Flyout/PreviewLayout/index.tsx b/desktop-app/src/renderer/components/ToolBar/Menu/Flyout/PreviewLayout/index.tsx index 921acd54..945d6798 100644 --- a/desktop-app/src/renderer/components/ToolBar/Menu/Flyout/PreviewLayout/index.tsx +++ b/desktop-app/src/renderer/components/ToolBar/Menu/Flyout/PreviewLayout/index.tsx @@ -1,20 +1,18 @@ import { Icon } from '@iconify/react'; -import { PREVIEW_LAYOUTS } from 'common/constants'; +import { PREVIEW_LAYOUTS, PreviewLayout } from 'common/constants'; import { useDispatch, useSelector } from 'react-redux'; +import { ButtonGroup } from 'renderer/components/ButtonGroup'; import useKeyboardShortcut, { SHORTCUT_CHANNEL, } from 'renderer/components/KeyboardShortcutsManager/useKeyboardShortcut'; -import Toggle from 'renderer/components/Toggle'; import { selectLayout, setLayout } from 'renderer/store/features/renderer'; -const PreviewLayout = () => { +const PreviewLayoutSelector = () => { const layout = useSelector(selectLayout); const dispatch = useDispatch(); - const handleLayout = () => { - if (layout === PREVIEW_LAYOUTS.FLEX) - dispatch(setLayout(PREVIEW_LAYOUTS.COLUMN)); - else dispatch(setLayout(PREVIEW_LAYOUTS.FLEX)); + const handleLayout = (newLayout: PreviewLayout) => { + dispatch(setLayout(newLayout)); }; useKeyboardShortcut(SHORTCUT_CHANNEL.PREVIEW_LAYOUT, handleLayout); @@ -22,22 +20,47 @@ const PreviewLayout = () => { return (
Preview Layout -
- - { - if (e.target.checked) { - dispatch(setLayout(PREVIEW_LAYOUTS.FLEX)); - } else { - dispatch(setLayout(PREVIEW_LAYOUTS.COLUMN)); - } - }} +
+ + {' '} + Column +
+ ), + srContent: 'Horizontal Layout', + onClick: () => handleLayout(PREVIEW_LAYOUTS.COLUMN), + isActive: layout === PREVIEW_LAYOUTS.COLUMN, + }, + { + content: ( +
+ {' '} + Flex +
+ ), + srContent: 'Flex Layout', + onClick: () => handleLayout(PREVIEW_LAYOUTS.FLEX), + isActive: layout === PREVIEW_LAYOUTS.FLEX, + }, + { + content: ( +
+ {' '} + Masonry +
+ ), + srContent: 'Masonry Layout', + onClick: () => handleLayout(PREVIEW_LAYOUTS.MASONRY), + isActive: layout === PREVIEW_LAYOUTS.MASONRY, + }, + ]} /> -
); }; -export default PreviewLayout; +export default PreviewLayoutSelector; From 00bfd2278f279bd226f5231fab8050399b94353a Mon Sep 17 00:00:00 2001 From: Manoj Vivek Date: Fri, 17 Jan 2025 19:37:21 +0530 Subject: [PATCH 4/5] Menu flyout layout tweaks --- .../Notifications/NotificationEmptyStatus.tsx | 2 +- .../Notifications/Notifications.tsx | 2 +- .../Bookmark/ViewAllBookmarks/index.tsx | 4 +- .../ToolBar/Menu/Flyout/Bookmark/index.tsx | 3 +- .../components/ToolBar/Menu/Flyout/index.tsx | 9 +- desktop-app/yarn.lock | 1156 ++++++----------- 6 files changed, 424 insertions(+), 752 deletions(-) diff --git a/desktop-app/src/renderer/components/Notifications/NotificationEmptyStatus.tsx b/desktop-app/src/renderer/components/Notifications/NotificationEmptyStatus.tsx index c6830dbb..86619aa9 100644 --- a/desktop-app/src/renderer/components/Notifications/NotificationEmptyStatus.tsx +++ b/desktop-app/src/renderer/components/Notifications/NotificationEmptyStatus.tsx @@ -1,6 +1,6 @@ const NotificationEmptyStatus = () => { return ( -
+

You are all caught up! No new notifications at the moment.

); diff --git a/desktop-app/src/renderer/components/Notifications/Notifications.tsx b/desktop-app/src/renderer/components/Notifications/Notifications.tsx index c998accc..d2426875 100644 --- a/desktop-app/src/renderer/components/Notifications/Notifications.tsx +++ b/desktop-app/src/renderer/components/Notifications/Notifications.tsx @@ -10,7 +10,7 @@ const Notifications = () => { return (
- Notifications + Notifications
{(!notificationsState || (notificationsState && notificationsState?.length === 0)) && ( diff --git a/desktop-app/src/renderer/components/ToolBar/Menu/Flyout/Bookmark/ViewAllBookmarks/index.tsx b/desktop-app/src/renderer/components/ToolBar/Menu/Flyout/Bookmark/ViewAllBookmarks/index.tsx index 86ca1fa3..1660401b 100644 --- a/desktop-app/src/renderer/components/ToolBar/Menu/Flyout/Bookmark/ViewAllBookmarks/index.tsx +++ b/desktop-app/src/renderer/components/ToolBar/Menu/Flyout/Bookmark/ViewAllBookmarks/index.tsx @@ -29,7 +29,7 @@ const ViewAllBookmarks = ({ bookmarks, handleBookmarkFlyout }: Props) => { return (
-
+
{bookmarks.map((bookmark) => { return (
@@ -48,7 +48,7 @@ const ViewAllBookmarks = ({ bookmarks, handleBookmarkFlyout }: Props) => { )}
-
+
{openFlyout && ( { return (
setIsOpen(true)} onMouseLeave={() => setIsOpen(false)} > -
+