From 872247d80f9149b3cd5d2ff507d5037a1f04e1f2 Mon Sep 17 00:00:00 2001 From: Athou Date: Sat, 24 Jun 2023 12:14:44 +0200 Subject: [PATCH] add previous and next buttons (#1096) --- commafeed-client/src/app/constants.ts | 1 + .../src/components/ActionButtton.tsx | 2 +- .../src/components/ButtonToolbar.tsx | 5 -- .../components/content/FeedEntryFooter.tsx | 6 +- .../src/components/header/Header.tsx | 73 +++++++++++++++++-- commafeed-client/src/locales/ar/messages.po | 5 ++ commafeed-client/src/locales/ca/messages.po | 5 ++ commafeed-client/src/locales/cs/messages.po | 5 ++ commafeed-client/src/locales/cy/messages.po | 5 ++ commafeed-client/src/locales/da/messages.po | 5 ++ commafeed-client/src/locales/de/messages.po | 5 ++ commafeed-client/src/locales/en/messages.po | 5 ++ commafeed-client/src/locales/es/messages.po | 5 ++ commafeed-client/src/locales/fa/messages.po | 5 ++ commafeed-client/src/locales/fi/messages.po | 5 ++ commafeed-client/src/locales/fr/messages.po | 5 ++ commafeed-client/src/locales/gl/messages.po | 5 ++ commafeed-client/src/locales/hu/messages.po | 5 ++ commafeed-client/src/locales/id/messages.po | 5 ++ commafeed-client/src/locales/it/messages.po | 5 ++ commafeed-client/src/locales/ja/messages.po | 5 ++ commafeed-client/src/locales/ko/messages.po | 5 ++ commafeed-client/src/locales/ms/messages.po | 5 ++ commafeed-client/src/locales/nb/messages.po | 5 ++ commafeed-client/src/locales/nl/messages.po | 5 ++ commafeed-client/src/locales/nn/messages.po | 5 ++ commafeed-client/src/locales/pl/messages.po | 5 ++ commafeed-client/src/locales/pt/messages.po | 5 ++ commafeed-client/src/locales/ru/messages.po | 5 ++ commafeed-client/src/locales/sk/messages.po | 5 ++ commafeed-client/src/locales/sv/messages.po | 5 ++ commafeed-client/src/locales/tr/messages.po | 5 ++ commafeed-client/src/locales/zh/messages.po | 5 ++ commafeed-client/src/pages/WelcomePage.tsx | 6 +- commafeed-client/src/pages/app/Layout.tsx | 2 +- 35 files changed, 215 insertions(+), 20 deletions(-) delete mode 100644 commafeed-client/src/components/ButtonToolbar.tsx diff --git a/commafeed-client/src/app/constants.ts b/commafeed-client/src/app/constants.ts index 0d56234a..82853732 100644 --- a/commafeed-client/src/app/constants.ts +++ b/commafeed-client/src/app/constants.ts @@ -89,6 +89,7 @@ export const Constants = { mobileBreakpoint: DEFAULT_THEME.breakpoints.md, headerHeight: 60, entryMaxWidth: 650, + buttonSpacing: 14, isTopVisible: (div: HTMLElement) => div.getBoundingClientRect().top >= Constants.layout.headerHeight, isBottomVisible: (div: HTMLElement) => div.getBoundingClientRect().bottom <= window.innerHeight, }, diff --git a/commafeed-client/src/components/ActionButtton.tsx b/commafeed-client/src/components/ActionButtton.tsx index f3ae7c25..62ef4a66 100644 --- a/commafeed-client/src/components/ActionButtton.tsx +++ b/commafeed-client/src/components/ActionButtton.tsx @@ -20,7 +20,7 @@ interface ActionButtonProps { export const ActionButton = forwardRef((props: ActionButtonProps, ref) => { const theme = useMantineTheme() const variant = props.variant ?? "subtle" - const mobile = useMobile(theme.breakpoints.lg) + const mobile = useMobile(theme.breakpoints.xl) const iconOnly = (mobile && !props.showLabelOnMobile) || (!mobile && props.hideLabelOnDesktop) return iconOnly ? ( diff --git a/commafeed-client/src/components/ButtonToolbar.tsx b/commafeed-client/src/components/ButtonToolbar.tsx deleted file mode 100644 index 2301f8dd..00000000 --- a/commafeed-client/src/components/ButtonToolbar.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { Group } from "@mantine/core" - -export function ButtonToolbar(props: { children: React.ReactNode }) { - return {props.children} -} diff --git a/commafeed-client/src/components/content/FeedEntryFooter.tsx b/commafeed-client/src/components/content/FeedEntryFooter.tsx index bd4dd252..1ff895a2 100644 --- a/commafeed-client/src/components/content/FeedEntryFooter.tsx +++ b/commafeed-client/src/components/content/FeedEntryFooter.tsx @@ -1,10 +1,10 @@ import { t, Trans } from "@lingui/macro" import { Group, Indicator, MultiSelect, Popover } from "@mantine/core" +import { Constants } from "app/constants" import { markEntriesUpToEntry, markEntry, starEntry, tagEntry } from "app/slices/entries" import { useAppDispatch, useAppSelector } from "app/store" import { Entry } from "app/types" import { ActionButton } from "components/ActionButtton" -import { ButtonToolbar } from "components/ButtonToolbar" import { useMobile } from "hooks/useMobile" import { TbArrowBarToDown, TbExternalLink, TbEyeCheck, TbEyeOff, TbShare, TbStar, TbStarOff, TbTag } from "react-icons/tb" import { ShareButtons } from "./ShareButtons" @@ -32,7 +32,7 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) { return ( - + {props.entry.markable && ( : } @@ -82,7 +82,7 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) { } label={Open link} /> - + } diff --git a/commafeed-client/src/components/header/Header.tsx b/commafeed-client/src/components/header/Header.tsx index c3a04546..4430a198 100644 --- a/commafeed-client/src/components/header/Header.tsx +++ b/commafeed-client/src/components/header/Header.tsx @@ -1,15 +1,29 @@ import { t, Trans } from "@lingui/macro" -import { ActionIcon, Center, Divider, Indicator, Popover, TextInput } from "@mantine/core" +import { ActionIcon, Box, Center, Divider, Group, Indicator, Popover, TextInput } from "@mantine/core" import { useForm } from "@mantine/form" -import { reloadEntries, search } from "app/slices/entries" +import { Constants } from "app/constants" +import { reloadEntries, search, selectNextEntry, selectPreviousEntry } from "app/slices/entries" import { changeReadingMode, changeReadingOrder } from "app/slices/user" import { useAppDispatch, useAppSelector } from "app/store" import { ActionButton } from "components/ActionButtton" -import { ButtonToolbar } from "components/ButtonToolbar" import { Loader } from "components/Loader" import { useBrowserExtension } from "hooks/useBrowserExtension" +import { useMobile } from "hooks/useMobile" import { useEffect } from "react" -import { TbArrowDown, TbArrowUp, TbExternalLink, TbEye, TbEyeOff, TbRefresh, TbSearch, TbSettings, TbUser, TbX } from "react-icons/tb" +import { + TbArrowDown, + TbArrowUp, + TbExternalLink, + TbEye, + TbEyeOff, + TbRefresh, + TbSearch, + TbSettings, + TbSortAscending, + TbSortDescending, + TbUser, + TbX, +} from "react-icons/tb" import { MarkAllAsReadButton } from "./MarkAllAsReadButton" import { ProfileMenu } from "./ProfileMenu" @@ -17,6 +31,24 @@ function HeaderDivider() { return } +function HeaderToolbar(props: { children: React.ReactNode }) { + const mobile = useMobile("480px") + return mobile ? ( + // on mobile use all available width + + {props.children} + + ) : ( + {props.children} + ) +} + const iconSize = 18 export function Header() { @@ -42,7 +74,34 @@ export function Header() { if (!settings) return return (
- + + } + label={Next} + onClick={() => + dispatch( + selectNextEntry({ + expand: true, + markAsRead: true, + scrollToEntry: true, + }) + ) + } + /> + } + label={Previous} + onClick={() => + dispatch( + selectPreviousEntry({ + expand: true, + markAsRead: true, + scrollToEntry: true, + }) + ) + } + /> + } label={Refresh} @@ -58,7 +117,7 @@ export function Header() { onClick={() => dispatch(changeReadingMode(settings.readingMode === "all" ? "unread" : "all"))} /> : } + icon={settings.readingOrder === "asc" ? : } label={settings.readingOrder === "asc" ? Asc : Desc} onClick={() => dispatch(changeReadingOrder(settings.readingOrder === "asc" ? "desc" : "asc"))} /> @@ -106,7 +165,7 @@ export function Header() { /> )} - +
) } diff --git a/commafeed-client/src/locales/ar/messages.po b/commafeed-client/src/locales/ar/messages.po index c832ff72..7a3ab716 100644 --- a/commafeed-client/src/locales/ar/messages.po +++ b/commafeed-client/src/locales/ar/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "الأحدث أولاً" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "التالي" @@ -639,6 +640,10 @@ msgstr "كلمات المرور غير متطابقة" msgid "Position" msgstr "المنـصب" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "الملف الشخصي" diff --git a/commafeed-client/src/locales/ca/messages.po b/commafeed-client/src/locales/ca/messages.po index 7f8d2aa6..de59228f 100644 --- a/commafeed-client/src/locales/ca/messages.po +++ b/commafeed-client/src/locales/ca/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "El més nou primer" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Següent" @@ -639,6 +640,10 @@ msgstr "Les contrasenyes no coincideixen" msgid "Position" msgstr "Posició" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Perfil" diff --git a/commafeed-client/src/locales/cs/messages.po b/commafeed-client/src/locales/cs/messages.po index 5cff3298..ff8d396f 100644 --- a/commafeed-client/src/locales/cs/messages.po +++ b/commafeed-client/src/locales/cs/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Nejnovější jako první" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Další" @@ -639,6 +640,10 @@ msgstr "Hesla se neshodují" msgid "Position" msgstr "Pozice" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/cy/messages.po b/commafeed-client/src/locales/cy/messages.po index bf0ab344..edf6eb32 100644 --- a/commafeed-client/src/locales/cy/messages.po +++ b/commafeed-client/src/locales/cy/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Y diweddaraf yn gyntaf" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Nesaf" @@ -639,6 +640,10 @@ msgstr "Nid yw cyfrineiriau yn cyfateb" msgid "Position" msgstr "Swydd" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Proffil" diff --git a/commafeed-client/src/locales/da/messages.po b/commafeed-client/src/locales/da/messages.po index d25314bf..756775e8 100644 --- a/commafeed-client/src/locales/da/messages.po +++ b/commafeed-client/src/locales/da/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Nyeste først" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Næste" @@ -639,6 +640,10 @@ msgstr "Adgangskoder stemmer ikke overens" msgid "Position" msgstr "" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/de/messages.po b/commafeed-client/src/locales/de/messages.po index 020fa5f2..55c9b2a5 100644 --- a/commafeed-client/src/locales/de/messages.po +++ b/commafeed-client/src/locales/de/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Neueste zuerst" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Weiter" @@ -639,6 +640,10 @@ msgstr "Passwörter stimmen nicht überein" msgid "Position" msgstr "Stellung" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/en/messages.po b/commafeed-client/src/locales/en/messages.po index 6d926269..a8aa4d6a 100644 --- a/commafeed-client/src/locales/en/messages.po +++ b/commafeed-client/src/locales/en/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Newest first" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Next" @@ -639,6 +640,10 @@ msgstr "Passwords do not match" msgid "Position" msgstr "Position" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "Previous" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profile" diff --git a/commafeed-client/src/locales/es/messages.po b/commafeed-client/src/locales/es/messages.po index cf628ee5..6338797b 100644 --- a/commafeed-client/src/locales/es/messages.po +++ b/commafeed-client/src/locales/es/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "más reciente primero" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Siguiente" @@ -639,6 +640,10 @@ msgstr "Las contraseñas no coinciden" msgid "Position" msgstr "Posición" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Perfil" diff --git a/commafeed-client/src/locales/fa/messages.po b/commafeed-client/src/locales/fa/messages.po index c740bc70..fbbf43e1 100644 --- a/commafeed-client/src/locales/fa/messages.po +++ b/commafeed-client/src/locales/fa/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "ابتدا جدیدترین" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "بعد" @@ -639,6 +640,10 @@ msgstr "گذرواژه ها مطابقت ندارند" msgid "Position" msgstr "موقعیت" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "نمایه" diff --git a/commafeed-client/src/locales/fi/messages.po b/commafeed-client/src/locales/fi/messages.po index 95004745..626f6476 100644 --- a/commafeed-client/src/locales/fi/messages.po +++ b/commafeed-client/src/locales/fi/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Uusin ensin" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Seuraava" @@ -639,6 +640,10 @@ msgstr "Salasanat eivät täsmää" msgid "Position" msgstr "Sijainti" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profiili" diff --git a/commafeed-client/src/locales/fr/messages.po b/commafeed-client/src/locales/fr/messages.po index dc4bcb21..8b8d8e0f 100644 --- a/commafeed-client/src/locales/fr/messages.po +++ b/commafeed-client/src/locales/fr/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Plus récent en premier" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Suivant" @@ -639,6 +640,10 @@ msgstr "Les mots de passe ne correspondent pas" msgid "Position" msgstr "Position" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/gl/messages.po b/commafeed-client/src/locales/gl/messages.po index 54751c04..720ba41d 100644 --- a/commafeed-client/src/locales/gl/messages.po +++ b/commafeed-client/src/locales/gl/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "o máis novo primeiro" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Seguinte" @@ -639,6 +640,10 @@ msgstr "Os contrasinais non coinciden" msgid "Position" msgstr "Posición" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Perfil" diff --git a/commafeed-client/src/locales/hu/messages.po b/commafeed-client/src/locales/hu/messages.po index bcadb5eb..8ff5dc13 100644 --- a/commafeed-client/src/locales/hu/messages.po +++ b/commafeed-client/src/locales/hu/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "A legújabbak először" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Következő" @@ -639,6 +640,10 @@ msgstr "A jelszavak nem egyeznek" msgid "Position" msgstr "Pozíció" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/id/messages.po b/commafeed-client/src/locales/id/messages.po index f10556dc..e5664a95 100644 --- a/commafeed-client/src/locales/id/messages.po +++ b/commafeed-client/src/locales/id/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Terbaru dulu" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Selanjutnya" @@ -639,6 +640,10 @@ msgstr "Kata sandi tidak cocok" msgid "Position" msgstr "Posisi" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/it/messages.po b/commafeed-client/src/locales/it/messages.po index a00cb7c7..6c2c64e2 100644 --- a/commafeed-client/src/locales/it/messages.po +++ b/commafeed-client/src/locales/it/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Il più recente prima" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Avanti" @@ -639,6 +640,10 @@ msgstr "Le password non corrispondono" msgid "Position" msgstr "Posizione" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profilo" diff --git a/commafeed-client/src/locales/ja/messages.po b/commafeed-client/src/locales/ja/messages.po index 1116b80b..cc474880 100644 --- a/commafeed-client/src/locales/ja/messages.po +++ b/commafeed-client/src/locales/ja/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "最新順" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "次へ" @@ -639,6 +640,10 @@ msgstr "パスワードが一致しません" msgid "Position" msgstr "位置" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "プロフィール" diff --git a/commafeed-client/src/locales/ko/messages.po b/commafeed-client/src/locales/ko/messages.po index 1af49e36..35e03300 100644 --- a/commafeed-client/src/locales/ko/messages.po +++ b/commafeed-client/src/locales/ko/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "최신순" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "다음" @@ -639,6 +640,10 @@ msgstr "비밀번호가 일치하지 않습니다" msgid "Position" msgstr "위치" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "프로필" diff --git a/commafeed-client/src/locales/ms/messages.po b/commafeed-client/src/locales/ms/messages.po index 44d2b794..04b5cbe9 100644 --- a/commafeed-client/src/locales/ms/messages.po +++ b/commafeed-client/src/locales/ms/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Terbaharu dahulu" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Seterusnya" @@ -639,6 +640,10 @@ msgstr "Kata laluan tidak sepadan" msgid "Position" msgstr "Kedudukan" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/nb/messages.po b/commafeed-client/src/locales/nb/messages.po index 0e350b9c..028b978e 100644 --- a/commafeed-client/src/locales/nb/messages.po +++ b/commafeed-client/src/locales/nb/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Nyeste først" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Neste" @@ -639,6 +640,10 @@ msgstr "Passordene samsvarer ikke" msgid "Position" msgstr "Posisjon" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/nl/messages.po b/commafeed-client/src/locales/nl/messages.po index 39309f9b..b5fbc3cc 100644 --- a/commafeed-client/src/locales/nl/messages.po +++ b/commafeed-client/src/locales/nl/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Nieuwste eerst" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Volgende" @@ -639,6 +640,10 @@ msgstr "Wachtwoorden komen niet overeen" msgid "Position" msgstr "Positie" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profiel" diff --git a/commafeed-client/src/locales/nn/messages.po b/commafeed-client/src/locales/nn/messages.po index 4dbefe92..6cd4c73e 100644 --- a/commafeed-client/src/locales/nn/messages.po +++ b/commafeed-client/src/locales/nn/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Nyeste først" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Neste" @@ -639,6 +640,10 @@ msgstr "Passordene samsvarer ikke" msgid "Position" msgstr "Posisjon" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/pl/messages.po b/commafeed-client/src/locales/pl/messages.po index 3025c141..c33269fc 100644 --- a/commafeed-client/src/locales/pl/messages.po +++ b/commafeed-client/src/locales/pl/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Najnowsze jako pierwsze" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Dalej" @@ -639,6 +640,10 @@ msgstr "Hasła nie pasują" msgid "Position" msgstr "Pozycja" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/pt/messages.po b/commafeed-client/src/locales/pt/messages.po index 88791ed2..668316b6 100644 --- a/commafeed-client/src/locales/pt/messages.po +++ b/commafeed-client/src/locales/pt/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Mais novo primeiro" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Próximo" @@ -639,6 +640,10 @@ msgstr "Senhas não coincidem" msgid "Position" msgstr "Posição" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Perfil" diff --git a/commafeed-client/src/locales/ru/messages.po b/commafeed-client/src/locales/ru/messages.po index 4f5862c2..a0cd93ee 100644 --- a/commafeed-client/src/locales/ru/messages.po +++ b/commafeed-client/src/locales/ru/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Сначала новые" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Далее" @@ -639,6 +640,10 @@ msgstr "Пароли не совпадают" msgid "Position" msgstr "Позиция" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Профиль" diff --git a/commafeed-client/src/locales/sk/messages.po b/commafeed-client/src/locales/sk/messages.po index c28e4736..2ce5cc8c 100644 --- a/commafeed-client/src/locales/sk/messages.po +++ b/commafeed-client/src/locales/sk/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Najnovšie ako prvé" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Ďalej" @@ -639,6 +640,10 @@ msgstr "Heslá sa nezhodujú" msgid "Position" msgstr "Pozícia" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/sv/messages.po b/commafeed-client/src/locales/sv/messages.po index 3c8cd1fc..e0a067b6 100644 --- a/commafeed-client/src/locales/sv/messages.po +++ b/commafeed-client/src/locales/sv/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Nyast först" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Nästa" @@ -639,6 +640,10 @@ msgstr "Lösenorden matchar inte" msgid "Position" msgstr "" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/tr/messages.po b/commafeed-client/src/locales/tr/messages.po index 88f803c1..4c1fde6d 100644 --- a/commafeed-client/src/locales/tr/messages.po +++ b/commafeed-client/src/locales/tr/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "Önce en yenisi" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "Sonraki" @@ -639,6 +640,10 @@ msgstr "Parolalar eşleşmiyor" msgid "Position" msgstr "Konum" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "Profil" diff --git a/commafeed-client/src/locales/zh/messages.po b/commafeed-client/src/locales/zh/messages.po index a1146513..dfeafe39 100644 --- a/commafeed-client/src/locales/zh/messages.po +++ b/commafeed-client/src/locales/zh/messages.po @@ -530,6 +530,7 @@ msgid "Newest first" msgstr "最新优先" #: src/components/content/add/Subscribe.tsx +#: src/components/header/Header.tsx msgid "Next" msgstr "下一个" @@ -639,6 +640,10 @@ msgstr "密码不匹配" msgid "Position" msgstr "位置" +#: src/components/header/Header.tsx +msgid "Previous" +msgstr "" + #: src/pages/app/SettingsPage.tsx msgid "Profile" msgstr "配置文件" diff --git a/commafeed-client/src/pages/WelcomePage.tsx b/commafeed-client/src/pages/WelcomePage.tsx index f262077e..658022f4 100644 --- a/commafeed-client/src/pages/WelcomePage.tsx +++ b/commafeed-client/src/pages/WelcomePage.tsx @@ -1,12 +1,12 @@ import { Trans } from "@lingui/macro" import { Anchor, Box, Center, Container, Divider, Group, Image, Title, useMantineColorScheme } from "@mantine/core" import { client } from "app/client" +import { Constants } from "app/constants" import { redirectToApiDocumentation, redirectToLogin, redirectToRegistration, redirectToRootCategory } from "app/slices/redirect" import { useAppDispatch, useAppSelector } from "app/store" import welcome_page_dark from "assets/welcome_page_dark.png" import welcome_page_light from "assets/welcome_page_light.png" import { ActionButton } from "components/ActionButtton" -import { ButtonToolbar } from "components/ButtonToolbar" import { useBrowserExtension } from "hooks/useBrowserExtension" import { useMobile } from "hooks/useMobile" import { useAsyncCallback } from "react-async-hook" @@ -73,7 +73,7 @@ function Buttons() { }) return ( - + {serverInfos?.demoAccountEnabled && ( Try the demo!} @@ -115,7 +115,7 @@ function Buttons() { hideLabelOnDesktop /> )} - + ) } diff --git a/commafeed-client/src/pages/app/Layout.tsx b/commafeed-client/src/pages/app/Layout.tsx index c8167995..795f7e7b 100644 --- a/commafeed-client/src/pages/app/Layout.tsx +++ b/commafeed-client/src/pages/app/Layout.tsx @@ -178,7 +178,7 @@ export default function Layout(props: LayoutProps) { )} {!mobileMenuOpen && ( - {burger} + {burger} {props.header} )}