Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/error box enhancement #358

Merged
merged 7 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"@mantine/hooks": "^7.9.1",
"@mantine/modals": "^7.9.1",
"@mantine/notifications": "^7.9.1",
"@reduxjs/toolkit": "^2.2.4",
"@tabler/icons-react": "^3.3.0",
"@uiw/react-codemirror": "^4.22.0",
"axios": "^1.6.8",
Expand All @@ -27,13 +26,13 @@
"framer-motion": "^11.1.9",
"i18next": "^23.11.4",
"i18next-http-backend": "^2.5.1",
"jotai": "^2.9.0",
"lodash-es": "^4.17.21",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-dropzone": "^14.2.3",
"react-i18next": "^14.1.1",
"react-icons": "^5.2.1",
"react-redux": "^9.1.2",
"react-router": "^6.23.1",
"react-router-dom": "^6.23.1",
"react-scripts": "5.0.1",
Expand Down
89 changes: 21 additions & 68 deletions frontend/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion frontend/public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@
},
"ACCOUNT_FILTER_PLACEHOLDER": "filter by keyword...",
"ACCOUNT_FILTER_CLOSE_BUTTON_ARIA": "clean account filter keyword",
"ERROR_BOX_WHY": "Why is it a problem?"
"ERROR_BOX_WHY": "Why is it a problem?",
"LEDGER_IS_HEALTHY": "Ledger is healthy"
}
3 changes: 2 additions & 1 deletion frontend/public/locales/zh/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@
"DefineDuplicatedBudget": "尝试创建一个重复的预算",
"UnbalancedTransaction": "交易不平衡"
},
"ERROR_BOX_WHY": "为什么出错?"
"ERROR_BOX_WHY": "为什么出错?",
"LEDGER_IS_HEALTHY": "不可思议,账本一点错都没有"
}
68 changes: 37 additions & 31 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ import NewTransactionButton from './components/NewTransactionButton';
import { notifications } from '@mantine/notifications';
import { useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { serverBaseUrl } from './index';
import { useAppDispatch, useAppSelector } from './states';
import { accountsSlice, fetchAccounts } from './states/account';
import { basicInfoSlice, fetchBasicInfo, reloadLedger } from './states/basic';
import { fetchCommodities } from './states/commodity';
import { fetchError } from './states/errors';
import { journalsSlice } from './states/journals';
import { axiosInstance, serverBaseUrl } from './index';
import { basicInfoFetcher, onlineAtom, titleAtom, updatableVersionAtom } from './states/basic';
import { useSWRConfig } from 'swr';
import { createStyles } from '@mantine/emotion';
import { Router } from './router';
import { useAtom, useAtomValue, useSetAtom } from 'jotai';
import { errorCountAtom, errorsFetcher } from './states/errors';
import { accountFetcher } from './states/account';
import { commoditiesFetcher } from './states/commodity';
import { journalFetcher } from './states/journals';

const useStyles = createStyles((theme, _, u) => ({
onlineIcon: {
Expand Down Expand Up @@ -200,25 +200,32 @@ export default function App() {
const { mutate } = useSWRConfig();
const { classes } = useStyles();
const { t, i18n } = useTranslation();
const dispatch = useAppDispatch();
const basicInfo = useAppSelector((state) => state.basic);
const location = useLocation();
const [lang] = useLocalStorage({ key: 'lang', defaultValue: 'en' });
const [opened] = useDisclosure();
const isMobile = useMediaQuery('(max-width: 768px)');

const errorsCount = useAtomValue(errorCountAtom);
const ledgerTitle = useAtomValue(titleAtom);
const [ledgerOnline, setLedgerOnline] = useAtom(onlineAtom);
const [updatableVersion, setUpdatableVersion] = useAtom(updatableVersionAtom);

const refreshErrors = useSetAtom(errorsFetcher);
const refreshAccounts = useSetAtom(accountFetcher);
const refreshBasicInfo = useSetAtom(basicInfoFetcher);
const refreshCommodities = useSetAtom(commoditiesFetcher);
const refreshJournal = useSetAtom(journalFetcher);
const refreshLedger = async () => {
await axiosInstance.post('/api/reload');
};

useEffect(() => {
if (i18n.language !== lang) {
i18n.changeLanguage(lang);
}
}, [i18n, lang]);

useEffect(() => {
dispatch(fetchError(1));
dispatch(fetchCommodities());
dispatch(fetchBasicInfo());
dispatch(fetchAccounts());

let events = new EventSource(serverBaseUrl + '/api/sse');
events.onmessage = (event) => {
console.log(event);
Expand All @@ -235,29 +242,30 @@ export default function App() {
autoClose: 3000,
});
mutate('/api/for-new-transaction');
dispatch(fetchBasicInfo());
dispatch(fetchError(1));
dispatch(fetchCommodities());
dispatch(accountsSlice.actions.clear());
dispatch(journalsSlice.actions.clear());
refreshErrors();
refreshAccounts();
refreshBasicInfo();
refreshCommodities();
refreshJournal();
break;
case 'Connected':
notifications.show({
title: 'Connected to server',
icon: <IconBroadcast />,
message: '',
});
dispatch(fetchBasicInfo());
setLedgerOnline(true);
refreshBasicInfo();
break;
case 'NewVersionFound':
dispatch(basicInfoSlice.actions.setUpdatableVersion({ newVersion: data.version }));
setUpdatableVersion(data.version);
break;
default:
break;
}
};
events.onerror = () => {
dispatch(basicInfoSlice.actions.offline());
setLedgerOnline(false);
notifications.show({
id: 'offline',
title: 'Server Offline',
Expand All @@ -266,7 +274,7 @@ export default function App() {
message: 'Client can not connect to server',
});
};
}, [dispatch, mutate]);
}, [mutate]); // eslint-disable-line

const sendReloadEvent = () => {
notifications.show({
Expand All @@ -276,11 +284,9 @@ export default function App() {
loading: true,
autoClose: false,
});
dispatch(reloadLedger());
refreshLedger();
};

const { total_number } = useAppSelector((state) => state.errors);

const mainLinks = links.map((link) => (
<UnstyledButton
component={RouteLink}
Expand Down Expand Up @@ -328,8 +334,8 @@ export default function App() {
<Stack>
<Group justify="space-between">
<Group gap="xs" justify="left">
<IconBroadcast stroke={3} className={basicInfo.isOnline ? classes.onlineIcon : classes.offlineIcon} />
<Text lineClamp={1}>{basicInfo.title ?? 'Zhang Accounting'}</Text>
<IconBroadcast stroke={3} className={ledgerOnline ? classes.onlineIcon : classes.offlineIcon} />
<Text lineClamp={1}>{ledgerTitle}</Text>
</Group>
<ActionIcon variant="white" color="gray" size="sm" onClick={sendReloadEvent}>
<IconRefresh size="1.125rem" />
Expand All @@ -353,17 +359,17 @@ export default function App() {
<IconSmartHome size={20} className={classes.mainLinkIcon} stroke={1.5} />
<span>{t('NAV_HOME')}</span>
</div>
{(total_number ?? 0) > 0 && (
{errorsCount > 0 && (
<Badge size="sm" color="pink" variant="filled" className={classes.mainLinkBadge}>
{total_number ?? 0}
{errorsCount}
</Badge>
)}
</UnstyledButton>
{mainLinks}
</div>
</AppShell.Section>

{basicInfo.updatableVersion && (
{updatableVersion && (
<AppShell.Section className={classes.section}>
<Group justify="center" gap={'sm'}>
<Anchor href="https://zhang-accounting.kilerd.me/installation/4-upgrade/" target="_blank">
Expand Down
1 change: 1 addition & 0 deletions frontend/src/assets/joyride.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions frontend/src/assets/loading.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading