astra/ntfy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor the db; move to *Manager classes

Browse source
This commit is contained in:
Philipp Heckel 2022-03-03 16:52:07 -05:00
parent f9219d2d96
commit 08846e4cc2
12 changed files with 162 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

10
web/src/components/SubscribeDialog.js
View file

@ -12,7 +12,9 @@ import theme from "./theme";
import api from "../app/Api";
import {topicUrl, validTopic, validUrl} from "../app/utils";
import Box from "@mui/material/Box";
import db from "../app/db";
import userManager from "../app/UserManager";
import subscriptionManager from "../app/SubscriptionManager";
import poller from "../app/Poller";
const defaultBaseUrl = "http://127.0.0.1"
//const defaultBaseUrl = "https://ntfy.sh"
@ -22,7 +24,7 @@ const SubscribeDialog = (props) => {
const [topic, setTopic] = useState("");
const [showLoginPage, setShowLoginPage] = useState(false);
const fullScreen = useMediaQuery(theme.breakpoints.down('sm'));
const handleSuccess = () => {
const handleSuccess = async () => {
const actualBaseUrl = (baseUrl) ? baseUrl : defaultBaseUrl; // FIXME
const subscription = {
id: topicUrl(actualBaseUrl, topic),
@ -30,6 +32,8 @@ const SubscribeDialog = (props) => {
topic: topic,
last: null
};
await subscriptionManager.save(subscription);
poller.pollInBackground(subscription); // Dangle!
props.onSuccess(subscription);
}
return (
@ -141,7 +145,7 @@ const LoginPage = (props) => {
return;
}
console.log(`[SubscribeDialog] Successful login to ${topicUrl(baseUrl, topic)} for user ${username}`);
db.users.put(user);
await userManager.save(user);
props.onSuccess();
};
return (