refactor

commafeed-client/src/pages/app/FeedDetailsPage.tsx

@@ -3,7 +3,6 @@ import {
     Anchor,
     Box,
     Button,
-    Checkbox,
     Code,
     Container,
     Divider,
@@ -31,6 +30,7 @@ import { Alert } from "@/components/Alert"
 import { CategorySelect } from "@/components/content/add/CategorySelect"
 import { FilteringExpressionEditor } from "@/components/content/edit/FilteringExpressionEditor"
 import { Loader } from "@/components/Loader"
+import { ReceivePushNotificationsChechbox } from "@/components/ReceivePushNotificationsChechbox"
 import { RelativeDate } from "@/components/RelativeDate"
 
 export function FeedDetailsPage() {
@@ -143,6 +143,7 @@ export function FeedDetailsPage() {
                     <TextInput label={<Trans>Name</Trans>} {...form.getInputProps("name")} required />
                     <CategorySelect label={<Trans>Category</Trans>} {...form.getInputProps("categoryId")} clearable />
                     <NumberInput label={<Trans>Position</Trans>} {...form.getInputProps("position")} required min={0} />
+                    <ReceivePushNotificationsChechbox {...form.getInputProps("pushNotificationsEnabled", { type: "checkbox" })} />
                     <Input.Wrapper
                         label={<Trans>Filtering expression</Trans>}
                         description={
@@ -164,10 +165,6 @@ export function FeedDetailsPage() {
                             <FilteringExpressionEditor initialValue={feed.filter} onChange={value => form.setFieldValue("filter", value)} />
                         </Box>
                     </Input.Wrapper>
-                    <Checkbox
-                        label={<Trans>Receive notifications</Trans>}
-                        {...form.getInputProps("notifyOnNewEntries", { type: "checkbox" })}
-                    />
 
                     <Group>
                         <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>

commafeed-client/src/pages/app/SettingsPage.tsx

@@ -3,8 +3,8 @@ import { Container, Tabs } from "@mantine/core"
 import { TbBell, TbCode, TbPhoto, TbUser } from "react-icons/tb"
 import { CustomCodeSettings } from "@/components/settings/CustomCodeSettings"
 import { DisplaySettings } from "@/components/settings/DisplaySettings"
-import { NotificationSettings } from "@/components/settings/NotificationSettings"
 import { ProfileSettings } from "@/components/settings/ProfileSettings"
+import { PushNotificationSettings } from "@/components/settings/PushNotificationSettings"
 
 export function SettingsPage() {
     return (
@@ -14,8 +14,8 @@ export function SettingsPage() {
                     <Tabs.Tab value="display" leftSection={<TbPhoto size={16} />}>
                         <Trans>Display</Trans>
                     </Tabs.Tab>
-                    <Tabs.Tab value="notifications" leftSection={<TbBell size={16} />}>
-                        <Trans>Notifications</Trans>
+                    <Tabs.Tab value="push-notifications" leftSection={<TbBell size={16} />}>
+                        <Trans>Push notifications</Trans>
                     </Tabs.Tab>
                     <Tabs.Tab value="customCode" leftSection={<TbCode size={16} />}>
                         <Trans>Custom code</Trans>
@@ -29,8 +29,8 @@ export function SettingsPage() {
                     <DisplaySettings />
                 </Tabs.Panel>
 
-                <Tabs.Panel value="notifications" pt="xl">
-                    <NotificationSettings />
+                <Tabs.Panel value="push-notifications" pt="xl">
+                    <PushNotificationSettings />
                 </Tabs.Panel>
 
                 <Tabs.Panel value="customCode" pt="xl">