diff --git a/commafeed-client/src/App.tsx b/commafeed-client/src/App.tsx index 6d0a01f5..14531e8f 100644 --- a/commafeed-client/src/App.tsx +++ b/commafeed-client/src/App.tsx @@ -31,6 +31,7 @@ import ReactGA from "react-ga4" import { HashRouter, Navigate, Route, Routes, useLocation, useNavigate } from "react-router-dom" import Tinycon from "tinycon" import useLocalStorage from "use-local-storage" +import { WelcomePage } from "./pages/WelcomePage" function Providers(props: { children: React.ReactNode }) { const preferredColorScheme = useColorScheme() @@ -67,6 +68,7 @@ function AppRoutes() { return ( } /> + } /> } /> } /> } /> diff --git a/commafeed-client/src/app/client.ts b/commafeed-client/src/app/client.ts index 44ef62c5..6f0f94e6 100644 --- a/commafeed-client/src/app/client.ts +++ b/commafeed-client/src/app/client.ts @@ -30,7 +30,9 @@ const axiosInstance = axios.create({ baseURL: "./rest", withCredentials: true }) axiosInstance.interceptors.response.use( response => response, error => { - if (error.response.status === 401) window.location.hash = "/login" + if (error.response.status === 401 && error.response.data === "Credentials are required to access this resource.") { + window.location.hash = "/welcome" + } throw error } ) diff --git a/commafeed-client/src/assets/welcome_page_dark.png b/commafeed-client/src/assets/welcome_page_dark.png new file mode 100644 index 00000000..37d9f016 Binary files /dev/null and b/commafeed-client/src/assets/welcome_page_dark.png differ diff --git a/commafeed-client/src/assets/welcome_page_light.png b/commafeed-client/src/assets/welcome_page_light.png new file mode 100644 index 00000000..d12a0ddb Binary files /dev/null and b/commafeed-client/src/assets/welcome_page_light.png differ diff --git a/commafeed-client/src/components/ActionButtton.tsx b/commafeed-client/src/components/ActionButtton.tsx index 66fe33df..6430e337 100644 --- a/commafeed-client/src/components/ActionButtton.tsx +++ b/commafeed-client/src/components/ActionButtton.tsx @@ -1,12 +1,15 @@ -import { ActionIcon, Button, useMantineTheme } from "@mantine/core" +import { ActionIcon, Button, ButtonVariant, useMantineTheme } from "@mantine/core" +import { ActionIconVariant } from "@mantine/core/lib/ActionIcon/ActionIcon.styles" import { useMediaQuery } from "@mantine/hooks" -import { forwardRef } from "react" +import { forwardRef, MouseEventHandler, ReactNode } from "react" interface ActionButtonProps { className?: string - icon?: React.ReactNode + icon?: ReactNode label?: string - onClick?: React.MouseEventHandler + onClick?: MouseEventHandler + variant?: ActionIconVariant & ButtonVariant + showLabelOnMobile?: boolean } /** @@ -14,13 +17,15 @@ interface ActionButtonProps { */ export const ActionButton = forwardRef((props: ActionButtonProps, ref) => { const theme = useMantineTheme() + const variant = props.variant ?? "subtle" const mobile = !useMediaQuery(`(min-width: ${theme.breakpoints.lg}px)`) - return mobile ? ( - + const iconOnly = !props.showLabelOnMobile && (mobile || !props.label) + return iconOnly ? ( + {props.icon} ) : ( - ) diff --git a/commafeed-client/src/locales/ar/messages.po b/commafeed-client/src/locales/ar/messages.po index 5e10d380..dadd9856 100644 --- a/commafeed-client/src/locales/ar/messages.po +++ b/commafeed-client/src/locales/ar/messages.po @@ -414,6 +414,7 @@ msgstr "تحميل العلامات ..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "تسجيل الدخول" @@ -689,6 +690,7 @@ msgstr "إظهار تعليمات اختصار لوحة المفاتيح" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "قم بالتسجيل" @@ -761,6 +763,10 @@ msgstr "تبديل قراءة حالة الإدخال الحالي" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "جرب CommaFeed باستخدام الحساب التجريبي: تجريبي / تجريبي" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "غير مقروءة" diff --git a/commafeed-client/src/locales/ca/messages.po b/commafeed-client/src/locales/ca/messages.po index eabe7c45..f10b5c74 100644 --- a/commafeed-client/src/locales/ca/messages.po +++ b/commafeed-client/src/locales/ca/messages.po @@ -414,6 +414,7 @@ msgstr "Carregant les etiquetes..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Inicia sessió" @@ -689,6 +690,7 @@ msgstr "Mostra l'ajuda de la drecera del teclat" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Inscriu-te" @@ -761,6 +763,10 @@ msgstr "Canvia l'estat de lectura de l'entrada actual" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Proveu CommaFeed amb el compte de demostració: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Sense llegir" diff --git a/commafeed-client/src/locales/cs/messages.po b/commafeed-client/src/locales/cs/messages.po index 82e8ecc1..8664359c 100644 --- a/commafeed-client/src/locales/cs/messages.po +++ b/commafeed-client/src/locales/cs/messages.po @@ -414,6 +414,7 @@ msgstr "Načítání značek..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Přihlaste se" @@ -689,6 +690,7 @@ msgstr "Zobrazit nápovědu ke klávesovým zkratkám" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Zaregistrujte se" @@ -761,6 +763,10 @@ msgstr "Přepne stav čtení aktuálního záznamu" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Vyzkoušejte CommaFeed s demo účtem: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Nepřečteno" diff --git a/commafeed-client/src/locales/cy/messages.po b/commafeed-client/src/locales/cy/messages.po index 8523f9f8..87293fcc 100644 --- a/commafeed-client/src/locales/cy/messages.po +++ b/commafeed-client/src/locales/cy/messages.po @@ -414,6 +414,7 @@ msgstr "Wrthi'n llwytho tagiau..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Mewngofnodi" @@ -689,6 +690,7 @@ msgstr "Dangos cymorth llwybr byr bysellfwrdd" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Cofrestrwch" @@ -761,6 +763,10 @@ msgstr "Toglo statws darllen y cofnod cyfredol" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Rhowch gynnig ar CommaFeed gyda'r cyfrif demo: demo / demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Heb ei ddarllen" diff --git a/commafeed-client/src/locales/da/messages.po b/commafeed-client/src/locales/da/messages.po index 0099d52b..9cf12820 100644 --- a/commafeed-client/src/locales/da/messages.po +++ b/commafeed-client/src/locales/da/messages.po @@ -414,6 +414,7 @@ msgstr "Indlæser tags..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Log ind" @@ -689,6 +690,7 @@ msgstr "Vis hjælp til tastaturgenveje" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Tilmeld dig" @@ -761,6 +763,10 @@ msgstr "Skift læsestatus for den aktuelle post" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Prøv CommaFeed med demokontoen: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Ulæst" diff --git a/commafeed-client/src/locales/de/messages.po b/commafeed-client/src/locales/de/messages.po index 2c31adec..d0be6bdc 100644 --- a/commafeed-client/src/locales/de/messages.po +++ b/commafeed-client/src/locales/de/messages.po @@ -414,6 +414,7 @@ msgstr "Tags werden geladen..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Einloggen" @@ -689,6 +690,7 @@ msgstr "Tastenkürzel-Hilfe anzeigen" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Melden Sie sich an" @@ -761,6 +763,10 @@ msgstr "Lesestatus des aktuellen Eintrags umschalten" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Testen Sie CommaFeed mit dem Demokonto: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Ungelesen" diff --git a/commafeed-client/src/locales/en/messages.po b/commafeed-client/src/locales/en/messages.po index e87ff67d..db5321f1 100644 --- a/commafeed-client/src/locales/en/messages.po +++ b/commafeed-client/src/locales/en/messages.po @@ -414,6 +414,7 @@ msgstr "Loading tags..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Log in" @@ -689,6 +690,7 @@ msgstr "Show keyboard shortcut help" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Sign up" @@ -761,6 +763,10 @@ msgstr "Toggle read status of current entry" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Try out CommaFeed with the demo account: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "Try the demo!" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Unread" diff --git a/commafeed-client/src/locales/es/messages.po b/commafeed-client/src/locales/es/messages.po index 566010f7..3c719856 100644 --- a/commafeed-client/src/locales/es/messages.po +++ b/commafeed-client/src/locales/es/messages.po @@ -414,6 +414,7 @@ msgstr "Cargando etiquetas..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Iniciar sesión" @@ -689,6 +690,7 @@ msgstr "Mostrar ayuda de atajo de teclado" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Registrarse" @@ -761,6 +763,10 @@ msgstr "Alternar estado de lectura de la entrada actual" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Pruebe CommaFeed con la cuenta demo: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "No leído" diff --git a/commafeed-client/src/locales/fa/messages.po b/commafeed-client/src/locales/fa/messages.po index 02d817ad..c0875600 100644 --- a/commafeed-client/src/locales/fa/messages.po +++ b/commafeed-client/src/locales/fa/messages.po @@ -414,6 +414,7 @@ msgstr "بارگیری برچسب ها..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "وارد شوید" @@ -689,6 +690,7 @@ msgstr "نمایش راهنمایی میانبر صفحه کلید" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "ثبت نام کنید" @@ -761,6 +763,10 @@ msgstr "وضعیت خواندن ورودی فعلی را تغییر دهید" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "CommaFeed را با حساب آزمایشی امتحان کنید: دمو/دمو" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "خوانده نشده" diff --git a/commafeed-client/src/locales/fi/messages.po b/commafeed-client/src/locales/fi/messages.po index 9e0d41ff..04588c8f 100644 --- a/commafeed-client/src/locales/fi/messages.po +++ b/commafeed-client/src/locales/fi/messages.po @@ -414,6 +414,7 @@ msgstr "Ladataan tunnisteita..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Kirjaudu sisään" @@ -689,6 +690,7 @@ msgstr "Näytä pikanäppäimen ohje" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Rekisteröidy" @@ -761,6 +763,10 @@ msgstr "Vaihda nykyisen merkinnän lukutila" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Kokeile CommaFeediä demotilillä: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Lukematon" diff --git a/commafeed-client/src/locales/fr/messages.po b/commafeed-client/src/locales/fr/messages.po index fc421881..279c42f6 100644 --- a/commafeed-client/src/locales/fr/messages.po +++ b/commafeed-client/src/locales/fr/messages.po @@ -414,6 +414,7 @@ msgstr "Chargement des tags ..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Connexion" @@ -689,6 +690,7 @@ msgstr "Montrer les raccourcis clavier" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Créer un compte" @@ -761,6 +763,10 @@ msgstr "Marquer l'entrée actuelle comme lue/non lue" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Essayez CommaFeed avec le compte de démonstration : demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Non lu" diff --git a/commafeed-client/src/locales/gl/messages.po b/commafeed-client/src/locales/gl/messages.po index b22f8346..10e2e526 100644 --- a/commafeed-client/src/locales/gl/messages.po +++ b/commafeed-client/src/locales/gl/messages.po @@ -414,6 +414,7 @@ msgstr "Cargando etiquetas..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Iniciar sesión" @@ -689,6 +690,7 @@ msgstr "Mostrar axuda do atallo do teclado" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Rexístrese" @@ -761,6 +763,10 @@ msgstr "alternar o estado de lectura da entrada actual" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Proba CommaFeed coa conta de demostración: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Sen ler" diff --git a/commafeed-client/src/locales/hu/messages.po b/commafeed-client/src/locales/hu/messages.po index ca5a0d41..e02c32e6 100644 --- a/commafeed-client/src/locales/hu/messages.po +++ b/commafeed-client/src/locales/hu/messages.po @@ -414,6 +414,7 @@ msgstr "Címkék betöltése..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Jelentkezzen be" @@ -689,6 +690,7 @@ msgstr "A billentyűparancsok súgójának megjelenítése" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Regisztráljon" @@ -761,6 +763,10 @@ msgstr "Az aktuális bejegyzés olvasási állapotának váltása" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Próbálja ki a CommaFeed-et a demo fiókkal: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Olvasatlan" diff --git a/commafeed-client/src/locales/id/messages.po b/commafeed-client/src/locales/id/messages.po index 6d56f359..c3a6be20 100644 --- a/commafeed-client/src/locales/id/messages.po +++ b/commafeed-client/src/locales/id/messages.po @@ -414,6 +414,7 @@ msgstr "Memuat tag..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Masuk" @@ -689,6 +690,7 @@ msgstr "Tampilkan bantuan pintasan keyboard" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Daftar" @@ -761,6 +763,10 @@ msgstr "Beralih status baca entri saat ini" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Cobalah CommaFeed dengan akun demo: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Belum Dibaca" diff --git a/commafeed-client/src/locales/it/messages.po b/commafeed-client/src/locales/it/messages.po index 73068c5c..8fe66171 100644 --- a/commafeed-client/src/locales/it/messages.po +++ b/commafeed-client/src/locales/it/messages.po @@ -414,6 +414,7 @@ msgstr "Caricamento tag..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Accedi" @@ -689,6 +690,7 @@ msgstr "Mostra la guida alle scorciatoie da tastiera" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Iscriviti" @@ -761,6 +763,10 @@ msgstr "Commuta lo stato di lettura della voce corrente" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Prova CommaFeed con il conto demo: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Non letto" diff --git a/commafeed-client/src/locales/ja/messages.po b/commafeed-client/src/locales/ja/messages.po index d6c0e597..e187be6f 100644 --- a/commafeed-client/src/locales/ja/messages.po +++ b/commafeed-client/src/locales/ja/messages.po @@ -414,6 +414,7 @@ msgstr "タグを読み込んでいます..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "ログイン" @@ -689,6 +690,7 @@ msgstr "キーボード ショートカットのヘルプを表示" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "サインアップ" @@ -761,6 +763,10 @@ msgstr "現在のエントリの読み取りステータスを切り替えます msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "デモアカウントで CommaFeed を試す: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "未読" diff --git a/commafeed-client/src/locales/ko/messages.po b/commafeed-client/src/locales/ko/messages.po index 34418739..615df328 100644 --- a/commafeed-client/src/locales/ko/messages.po +++ b/commafeed-client/src/locales/ko/messages.po @@ -414,6 +414,7 @@ msgstr "태그 로드 중..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "로그인" @@ -689,6 +690,7 @@ msgstr "키보드 단축키 도움말 표시" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "가입" @@ -761,6 +763,10 @@ msgstr "현재 항목의 읽기 상태 전환" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "데모 계정으로 CommaFeed를 사용해 보세요: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "읽지 않음" diff --git a/commafeed-client/src/locales/ms/messages.po b/commafeed-client/src/locales/ms/messages.po index 7ca572af..99366f32 100644 --- a/commafeed-client/src/locales/ms/messages.po +++ b/commafeed-client/src/locales/ms/messages.po @@ -414,6 +414,7 @@ msgstr "Memuatkan tag..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Log masuk" @@ -689,6 +690,7 @@ msgstr "Tunjukkan bantuan pintasan papan kekunci" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Daftar" @@ -761,6 +763,10 @@ msgstr "Togol status bacaan entri semasa" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Cuba CommaFeed dengan akaun demo: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Belum dibaca" diff --git a/commafeed-client/src/locales/nb/messages.po b/commafeed-client/src/locales/nb/messages.po index 50141acc..2db0c481 100644 --- a/commafeed-client/src/locales/nb/messages.po +++ b/commafeed-client/src/locales/nb/messages.po @@ -414,6 +414,7 @@ msgstr "Laster tagger..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Logg inn" @@ -689,6 +690,7 @@ msgstr "Vis hurtigtasthjelp" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Meld deg på" @@ -761,6 +763,10 @@ msgstr "Veksle lesestatus for gjeldende oppføring" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Prøv CommaFeed med demokontoen: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Ulest" diff --git a/commafeed-client/src/locales/nl/messages.po b/commafeed-client/src/locales/nl/messages.po index 460e1e61..3204e142 100644 --- a/commafeed-client/src/locales/nl/messages.po +++ b/commafeed-client/src/locales/nl/messages.po @@ -414,6 +414,7 @@ msgstr "Tags laden..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Inloggen" @@ -689,6 +690,7 @@ msgstr "Toon hulp bij sneltoetsen" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Aanmelden" @@ -761,6 +763,10 @@ msgstr "Toggle leesstatus van huidige invoer" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Probeer CommaFeed uit met het demo-account: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Ongelezen" diff --git a/commafeed-client/src/locales/nn/messages.po b/commafeed-client/src/locales/nn/messages.po index 2ed55c63..268cbb6e 100644 --- a/commafeed-client/src/locales/nn/messages.po +++ b/commafeed-client/src/locales/nn/messages.po @@ -414,6 +414,7 @@ msgstr "Laster tagger..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Logg inn" @@ -689,6 +690,7 @@ msgstr "Vis hurtigtasthjelp" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Meld deg på" @@ -761,6 +763,10 @@ msgstr "Veksle lesestatus for gjeldende oppføring" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Prøv CommaFeed med demokontoen: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Ulest" diff --git a/commafeed-client/src/locales/pl/messages.po b/commafeed-client/src/locales/pl/messages.po index 785601d8..60013de8 100644 --- a/commafeed-client/src/locales/pl/messages.po +++ b/commafeed-client/src/locales/pl/messages.po @@ -414,6 +414,7 @@ msgstr "Ładowanie tagów..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Zaloguj się" @@ -689,6 +690,7 @@ msgstr "Pokaż pomoc dotyczącą skrótów klawiaturowych" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Zarejestruj się" @@ -761,6 +763,10 @@ msgstr "Przełącz stan odczytu bieżącego wpisu" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Wypróbuj CommaFeed z kontem demo: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Nieprzeczytane" diff --git a/commafeed-client/src/locales/pt/messages.po b/commafeed-client/src/locales/pt/messages.po index ef9a77da..7260ec07 100644 --- a/commafeed-client/src/locales/pt/messages.po +++ b/commafeed-client/src/locales/pt/messages.po @@ -414,6 +414,7 @@ msgstr "Carregando tags..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Entrar" @@ -689,6 +690,7 @@ msgstr "Mostrar ajuda de atalho de teclado" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Inscreva-se" @@ -761,6 +763,10 @@ msgstr "Alternar o status de leitura da entrada atual" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Experimente o CommaFeed com a conta demo: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Não lido" diff --git a/commafeed-client/src/locales/ru/messages.po b/commafeed-client/src/locales/ru/messages.po index c33118f8..f73cafaf 100644 --- a/commafeed-client/src/locales/ru/messages.po +++ b/commafeed-client/src/locales/ru/messages.po @@ -414,6 +414,7 @@ msgstr "Загрузка тегов..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Войти" @@ -689,6 +690,7 @@ msgstr "Показать справку по сочетаниям клавиш." #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Зарегистрироваться" @@ -761,6 +763,10 @@ msgstr "Переключить статус чтения текущей запи msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Попробуйте CommaFeed на демо-счете: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "непрочитано" diff --git a/commafeed-client/src/locales/sk/messages.po b/commafeed-client/src/locales/sk/messages.po index 7ed6760c..8b5b171d 100644 --- a/commafeed-client/src/locales/sk/messages.po +++ b/commafeed-client/src/locales/sk/messages.po @@ -414,6 +414,7 @@ msgstr "Načítavam značky..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Prihláste sa" @@ -689,6 +690,7 @@ msgstr "Zobraziť pomoc s klávesovými skratkami" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Zaregistrujte sa" @@ -761,6 +763,10 @@ msgstr "Prepne stav čítania aktuálneho záznamu" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Vyskúšajte CommaFeed s demo účtom: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Neprečítané" diff --git a/commafeed-client/src/locales/sv/messages.po b/commafeed-client/src/locales/sv/messages.po index 2797bb5d..ed575c64 100644 --- a/commafeed-client/src/locales/sv/messages.po +++ b/commafeed-client/src/locales/sv/messages.po @@ -414,6 +414,7 @@ msgstr "Laddar taggar..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Logga in" @@ -689,6 +690,7 @@ msgstr "Visa kortkommandohjälp" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Anmäl dig" @@ -761,6 +763,10 @@ msgstr "Växla lässtatus för aktuell post" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "Prova CommaFeed med demokontot: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Oläst" diff --git a/commafeed-client/src/locales/tr/messages.po b/commafeed-client/src/locales/tr/messages.po index c5d40a11..018cad4f 100644 --- a/commafeed-client/src/locales/tr/messages.po +++ b/commafeed-client/src/locales/tr/messages.po @@ -414,6 +414,7 @@ msgstr "Etiketler yükleniyor..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "Giriş" @@ -689,6 +690,7 @@ msgstr "Klavye kısayolu yardımını göster" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "Kaydolun" @@ -761,6 +763,10 @@ msgstr "Geçerli girişin okuma durumunu değiştir" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "CommaFeed'i demo hesabıyla deneyin: demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "Okunmadı" diff --git a/commafeed-client/src/locales/zh/messages.po b/commafeed-client/src/locales/zh/messages.po index 872b4537..003853f3 100644 --- a/commafeed-client/src/locales/zh/messages.po +++ b/commafeed-client/src/locales/zh/messages.po @@ -414,6 +414,7 @@ msgstr "正在加载标签..." #: src/pages/auth/LoginPage.tsx #: src/pages/auth/LoginPage.tsx +#: src/pages/WelcomePage.tsx msgid "Log in" msgstr "登录" @@ -689,6 +690,7 @@ msgstr "显示键盘快捷键帮助" #: src/pages/auth/RegistrationPage.tsx #: src/pages/auth/RegistrationPage.tsx +#: src/pages/WelcomePage.tsx msgid "Sign up" msgstr "注册" @@ -761,6 +763,10 @@ msgstr "切换当前条目的读取状态" msgid "Try out CommaFeed with the demo account: demo/demo" msgstr "使用演示帐户试用 CommaFeed：demo/demo" +#: src/pages/WelcomePage.tsx +msgid "Try the demo!" +msgstr "" + #: src/components/header/Header.tsx msgid "Unread" msgstr "未读" diff --git a/commafeed-client/src/pages/WelcomePage.tsx b/commafeed-client/src/pages/WelcomePage.tsx new file mode 100644 index 00000000..b35d7777 --- /dev/null +++ b/commafeed-client/src/pages/WelcomePage.tsx @@ -0,0 +1,126 @@ +import { t } from "@lingui/macro" +import { Anchor, Box, Center, Container, Divider, Group, Image, Title, useMantineColorScheme } from "@mantine/core" +import { useMediaQuery } from "@mantine/hooks" +import welcome_page_dark from "assets/welcome_page_dark.png" +import welcome_page_light from "assets/welcome_page_light.png" +import { useAsyncCallback } from "react-async-hook" +import { SiGithub, TbKey, TbUserPlus } from "react-icons/all" +import { SiTwitter } from "react-icons/si" +import { TbClock, TbMoon, TbSun } from "react-icons/tb" +import { client } from "../app/client" +import { Constants } from "../app/constants" +import { redirectToLogin, redirectToRegistration, redirectToRootCategory } from "../app/slices/redirect" +import { useAppDispatch, useAppSelector } from "../app/store" +import { ActionButton } from "../components/ActionButtton" +import { ButtonToolbar } from "../components/ButtonToolbar" +import { PageTitle } from "./PageTitle" + +export function WelcomePage() { + const { colorScheme } = useMantineColorScheme() + const image = colorScheme === "light" ? welcome_page_light : welcome_page_dark + return ( + +
+ +
+ Bloat-free feed reader +
+ + + + + + + +