garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

restore custom css setting (#1024)

Browse Source
This commit is contained in:
Athou
2023-05-05 14:03:28 +02:00
parent b8e254dab6
commit d095e4b35a
35 changed files with 384 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
commafeed-client/index.html
View File

@@ -1,14 +1,15 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/x-icon" href="favicon.ico" />
<link rel="manifest" href="manifest.json" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>CommaFeed</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/x-icon" href="favicon.ico" />
<link rel="manifest" href="manifest.json" />
<link rel="stylesheet" href="custom_css.css" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>CommaFeed</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>

3
commafeed-client/src/components/content/FeedEntries.tsx
View File

@@ -20,8 +20,8 @@ import { useMousetrap } from "hooks/useMousetrap"
import throttle from "lodash/throttle"
import { useEffect } from "react"
import InfiniteScroll from "react-infinite-scroller"
import { FeedEntry } from "./FeedEntry"
import { useViewMode } from "../../hooks/useViewMode"
import { FeedEntry } from "./FeedEntry"
export function FeedEntries() {
const source = useAppSelector(state => state.entries.source)
@@ -239,6 +239,7 @@ export function FeedEntries() {
if (!entries) return <Loader />
return (
<InfiniteScroll
id="entries"
initialLoad={false}
loadMore={() => dispatch(loadMoreEntries())}
hasMore={hasMore}

72
commafeed-client/src/components/settings/CustomCss.tsx Normal file
View File

@@ -0,0 +1,72 @@
import { Trans } from "@lingui/macro"
import { Button, Group, Stack, Textarea } from "@mantine/core"
import { useForm } from "@mantine/form"
import { useEffect } from "react"
import { useAsyncCallback } from "react-async-hook"
import { TbDeviceFloppy } from "react-icons/tb"
import { client } from "../../app/client"
import { redirectToSelectedSource } from "../../app/slices/redirect"
import { useAppDispatch, useAppSelector } from "../../app/store"
interface FormData {
customCss: string
}
export function CustomCss() {
const settings = useAppSelector(state => state.user.settings)
const customCss = settings?.customCss
const dispatch = useAppDispatch()
const form = useForm<FormData>()
const { setValues } = form
const saveCustomCss = useAsyncCallback(client.user.saveSettings, {
onSuccess: () => {
window.location.reload()
},
})
useEffect(() => {
if (!customCss) return
setValues({
customCss,
})
}, [setValues, customCss])
return (
<form
onSubmit={form.onSubmit(data => {
if (!settings) return
saveCustomCss
.execute({
...settings,
customCss: data.customCss,
})
.then(() => window.location.reload())
})}
>
<Stack>
<Textarea
autosize
minRows={4}
{...form.getInputProps("customCss")}
description={<Trans>Custom CSS rules that will be applied</Trans>}
styles={{
input: {
fontFamily: "monospace",
},
}}
/>
<Group>
<Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
<Trans>Cancel</Trans>
</Button>
<Button type="submit" leftIcon={<TbDeviceFloppy size={16} />} loading={saveCustomCss.loading}>
<Trans>Save</Trans>
</Button>
</Group>
</Stack>
</form>
)
}

10
commafeed-client/src/locales/ar/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "ملحقات المستعرض"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr "السيطرة"
msgid "Current password"
msgstr "كلمة المرور الحالية"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "تاريخ الإنشاء"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/ca/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Extensions del navegador"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Contrasenya actual"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Data de creació"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/cs/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Rozšíření prohlížeče"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Aktuální heslo"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Datum vytvoření"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/cy/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Estyniadau porwr"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Cyfrinair presennol"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Dyddiad creu"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/da/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Browserudvidelser"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Nuværende adgangskode"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Dato oprettet"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/de/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Browsererweiterungen"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr "Strg"
msgid "Current password"
msgstr "Aktuelles Passwort"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Erstellungsdatum"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/en/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Browser extentions"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr "Ctrl"
msgid "Current password"
msgstr "Current password"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr "Custom CSS"
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr "Custom CSS rules that will be applied"
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Date created"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr "Right click"
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/es/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Extensiones del navegador"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Contraseña actual"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Fecha de creación"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/fa/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "گسترش مرورگر"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "رمز عبور فعلی"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "تاریخ ایجاد"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/fi/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Selaimen laajennukset"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Nykyinen salasana"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Luontipäivämäärä"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/fr/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Extensions pour navigateurs"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr "Ctrl"
msgid "Current password"
msgstr "Mot de passe actuel"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Date de création"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/gl/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Extensións do navegador"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Contrasinal actual"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Data de creación"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/hu/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Böngészőbővítések"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Jelenlegi jelszó"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Létrehozás dátuma"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/id/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Ekstensi peramban"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Kata sandi saat ini"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Tanggal dibuat"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/it/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Estensioni del browser"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr "ctrl"
msgid "Current password"
msgstr "Password attuale"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Data di creazione"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/ja/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "ブラウザ拡張機能"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr "コントロール"
msgid "Current password"
msgstr "現在のパスワード"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "作成日"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/ko/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "브라우저 확장"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr "컨트롤"
msgid "Current password"
msgstr "현재 비밀번호"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "생성 날짜"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/ms/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Peluasan penyemak imbas"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Kata laluan semasa"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Tarikh dibuat"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/nb/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Nettleserutvidelser"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Gjeldende passord"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Dato opprettet"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/nl/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Browserextensies"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Huidig ​​wachtwoord"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Datum gemaakt"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/nn/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Nettleserutvidelser"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Gjeldende passord"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Dato opprettet"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/pl/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Rozszerzenia przeglądarki"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "aktualne hasło"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Data utworzenia"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/pt/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Extensões do navegador"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Senha atual"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Data de criação"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/ru/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Расширения браузера"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Текущий пароль"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Дата создания"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/sk/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Rozšírenia prehliadača"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Aktuálne heslo"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Dátum vytvorenia"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/sv/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Webbläsartillägg"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Aktuellt lösenord"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Datum skapat"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/tr/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "Tarayıcı uzantıları"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr ""
msgid "Current password"
msgstr "Geçerli şifre"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "Oluşturulma tarihi"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

10
commafeed-client/src/locales/zh/messages.po
View File

@@ -123,6 +123,7 @@ msgstr "浏览器扩展"
#: src/components/content/add/AddCategory.tsx
#: src/components/content/add/ImportOpml.tsx
#: src/components/header/MarkAllAsReadButton.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/admin/AdminUsersPage.tsx
@@ -194,6 +195,14 @@ msgstr "控制"
msgid "Current password"
msgstr "当前密码"
#: src/pages/app/SettingsPage.tsx
msgid "Custom CSS"
msgstr ""
#: src/components/settings/CustomCss.tsx
msgid "Custom CSS rules that will be applied"
msgstr ""
#: src/pages/admin/AdminUsersPage.tsx
msgid "Date created"
msgstr "创建日期"
@@ -622,6 +631,7 @@ msgid "Right click"
msgstr ""
#: src/components/admin/UserEdit.tsx
#: src/components/settings/CustomCss.tsx
#: src/components/settings/ProfileSettings.tsx
#: src/pages/app/CategoryDetailsPage.tsx
#: src/pages/app/FeedDetailsPage.tsx

6
commafeed-client/src/pages/app/AddPage.tsx
View File

@@ -10,13 +10,13 @@ export function AddPage() {
<Container size="sm" px={0}>
<Tabs defaultValue="subscribe">
<Tabs.List>
<Tabs.Tab value="subscribe" icon={<TbRss />}>
<Tabs.Tab value="subscribe" icon={<TbRss size={16} />}>
<Trans>Subscribe</Trans>
</Tabs.Tab>
<Tabs.Tab value="category" icon={<TbFolderPlus />}>
<Tabs.Tab value="category" icon={<TbFolderPlus size={16} />}>
<Trans>Add category</Trans>
</Tabs.Tab>
<Tabs.Tab value="opml" icon={<TbFileImport />}>
<Tabs.Tab value="opml" icon={<TbFileImport size={16} />}>
<Trans>OPML</Trans>
</Tabs.Tab>
</Tabs.List>

5
commafeed-client/src/pages/app/Layout.tsx
View File

@@ -122,6 +122,7 @@ export default function Layout({ sidebar, header }: LayoutProps) {
classNames={{ main: classes.mainContentWrapper }}
navbar={
<Navbar
id="sidebar"
p={sidebarPadding}
hiddenBreakpoint={Constants.layout.mobileBreakpoint}
hidden={!mobileMenuOpen}
@@ -133,7 +134,7 @@ export default function Layout({ sidebar, header }: LayoutProps) {
</Navbar>
}
header={
<Header height={Constants.layout.headerHeight} p="md">
<Header id="header" height={Constants.layout.headerHeight} p="md">
<OnMobile>
{mobileMenuOpen && (
<Group position="apart">
@@ -171,7 +172,7 @@ export default function Layout({ sidebar, header }: LayoutProps) {
if (ref) ref.id = Constants.dom.mainScrollAreaId
}}
>
<Box className={classes.mainContent}>
<Box id="content" className={classes.mainContent}>
<Suspense fallback={<Loader />}>
<Outlet />
</Suspense>

14
commafeed-client/src/pages/app/SettingsPage.tsx
View File

@@ -2,17 +2,21 @@ import { Trans } from "@lingui/macro"
import { Container, Tabs } from "@mantine/core"
import { DisplaySettings } from "components/settings/DisplaySettings"
import { ProfileSettings } from "components/settings/ProfileSettings"
import { TbPhoto, TbUser } from "react-icons/tb"
import { TbBoxMargin, TbPhoto, TbUser } from "react-icons/tb"
import { CustomCss } from "../../components/settings/CustomCss"
export function SettingsPage() {
return (
<Container size="sm" px={0}>
<Tabs defaultValue="display">
<Tabs.List>
<Tabs.Tab value="display" icon={<TbPhoto />}>
<Tabs.Tab value="display" icon={<TbPhoto size={16} />}>
<Trans>Display</Trans>
</Tabs.Tab>
<Tabs.Tab value="profile" icon={<TbUser />}>
<Tabs.Tab value="customCss" icon={<TbBoxMargin size={16} />}>
<Trans>Custom CSS</Trans>
</Tabs.Tab>
<Tabs.Tab value="profile" icon={<TbUser size={16} />}>
<Trans>Profile</Trans>
</Tabs.Tab>
</Tabs.List>
@@ -21,6 +25,10 @@ export function SettingsPage() {
<DisplaySettings />
</Tabs.Panel>
<Tabs.Panel value="customCss" pt="xl">
<CustomCss />
</Tabs.Panel>
<Tabs.Panel value="profile" pt="xl">
<ProfileSettings />
</Tabs.Panel>

1
commafeed-client/vite.config.ts
View File

@@ -24,6 +24,7 @@ export default defineConfig({
"/rest": "http://localhost:8083",
"/ws": "ws://localhost:8083",
"/swagger": "http://localhost:8083",
"/custom_css.css": "http://localhost:8083",
},
},
build: {