Skip to content

Commit

Permalink
fix-notification
Browse files Browse the repository at this point in the history
  • Loading branch information
lacymorrow committed Jul 24, 2024
1 parent f02a84a commit 922974d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 3.0.2 - 2024-07-24

- Fixed the tooltip not displaying with collapsed menu
- Fixed the double-layout issue
- Added notifications when resetting the app

## 3.0.1

- Fixes to the library context
Expand Down
4 changes: 1 addition & 3 deletions src/main/notifications.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,4 @@ export const notification = (options: NotificationOptions) => {
} else {
Logger.info(`Notification not sent: ${options.title} - ${options.body}`);
}
};

export default { renderer: rendererNotification, main: mainNotification };
};

Check failure on line 36 in src/main/notifications.ts

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest)

Insert `⏎`
5 changes: 5 additions & 0 deletions src/main/reset.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { app } from 'electron';
import Logger from 'electron-log';
import { $init } from '../config/strings';
import { notification } from './notifications';
import sounds from './sounds';
import { resetStore, resetStoreSettings } from './store-actions';

Expand All @@ -19,5 +20,9 @@ export const resetSettings = () => {
export const resetApp = () => {
// Sonic announcement
sounds.play('RESET');
notification({
title: 'Resetting...',
body: 'All app settings have been reset.',
});
resetStore();
};
5 changes: 2 additions & 3 deletions src/renderer/components/windows/main/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import {

import { Home } from '@/renderer/components/pages/Home';

import { Layout } from '@/renderer/components/layout/Layout';
import { MainLayout } from '@/renderer/components/layout/MainLayout';
import SettingsLayout from '@/renderer/components/layout/SettingsLayout';
import ErrorPage from '@/renderer/components/pages/ErrorPage';
Expand Down Expand Up @@ -123,8 +122,8 @@ export default function App() {
const router = createHashRouter(createRoutesFromElements(cinematicRoutes));

return (
<Layout>

<RouterProvider router={router} />
</Layout>

);
}

0 comments on commit 922974d

Please sign in to comment.