Minor app fixes and improvements.

This commit is contained in:
Patrick FIc
2025-04-01 17:23:41 -07:00
parent e4f204bf38
commit 20f2963330
8 changed files with 92 additions and 63 deletions

View File

@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8" />
<title>Electron</title>
<title>Shop Partner</title>
<!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
<!-- <meta
http-equiv="Content-Security-Policy"

View File

@@ -97,7 +97,7 @@ const SettingsWatcher: React.FC = () => {
>
<Card title={t("settings.labels.watcherstatus")}>
<Row>
<Col span={12}>
<Col md={12} xs={24}>
{isWatcherStarted ? (
<Button onClick={handleStop}>
{t("settings.actions.stopwatcher")}
@@ -108,7 +108,7 @@ const SettingsWatcher: React.FC = () => {
</Button>
)}
</Col>
<Col span={12}>
<Col md={12} xs={24}>
<Space direction="vertical" wrap>
<Switch
checked={!pollingState.enabled}

View File

@@ -3,7 +3,7 @@ import { Card, Typography } from "antd";
import { JSX, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import ipcTypes from "../../../../util/ipcTypes.json";
import _ from "lodash";
const Welcome = (): JSX.Element => {
const { t } = useTranslation();
const [shopName, setShopName] = useState<string | null>(null);
@@ -18,12 +18,14 @@ const Welcome = (): JSX.Element => {
return (
<>
<Card>
<Typography.Title level={3}>
{t("auth.labels.welcome", { name: auth.currentUser?.displayName })}
</Typography.Title>
<Typography.Paragraph>{shopName || ""}</Typography.Paragraph>
</Card>
<Typography.Title level={4}>
{t("auth.labels.welcome", {
name: _.isEmpty(auth.currentUser?.displayName)
? auth.currentUser?.email
: `${auth.currentUser?.displayName} (${auth.currentUser?.email})`.trim(),
})}
</Typography.Title>
<Typography.Paragraph>{shopName || ""}</Typography.Paragraph>
</>
);
};