refactor: asset paths (#189)

* refactor: asset usage Signed-off-by: Adam Setch <[email protected]> * refactor: asset usage Signed-off-by: Adam Setch <[email protected]> * refactor: asset usage Signed-off-by: Adam Setch <[email protected]> --------- Signed-off-by: Adam Setch <[email protected]>
setchy · Oct 1, 2024 · b96e0ff · b96e0ff
1 parent ba4f73b
commit b96e0ff
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 14 deletions.
diff --git a/config/webpack.config.renderer.base.ts b/config/webpack.config.renderer.base.ts
@@ -65,7 +65,7 @@ const configuration: webpack.Configuration = {
             'dist',
             'svg',
           ),
-          to: 'assets/twemoji',
+          to: 'images/twemoji',
         },
       ],
     }),

diff --git a/src/main/icons.ts b/src/main/icons.ts
@@ -6,5 +6,5 @@ export const idleAlternateIcon = getIconPath('tray-idle-white.png');
 export const activeIcon = getIconPath('tray-active.png');
 
 function getIconPath(iconName: string) {
-  return path.resolve(__dirname, '..', 'assets', 'images', iconName);
+  return path.join(__dirname, '..', 'assets', 'images', iconName);
 }
diff --git a/src/renderer/components/__snapshots__/AllRead.test.tsx.snap b/src/renderer/components/__snapshots__/AllRead.test.tsx.snap
diff --git a/src/renderer/components/__snapshots__/Oops.test.tsx.snap b/src/renderer/components/__snapshots__/Oops.test.tsx.snap
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
diff --git a/src/renderer/components/primitives/EmojiText.tsx b/src/renderer/components/primitives/EmojiText.tsx
@@ -23,7 +23,7 @@ export const EmojiText: FC<IEmojiText> = ({ text }) => {
           _options: TwemojiOptions,
           _variant: string,
         ) => {
-          return path.join('assets', 'twemoji', `${icon}.svg`);
+          return path.join('images', 'twemoji', `${icon}.svg`);
         },
       });
     }

diff --git a/src/renderer/components/primitives/__snapshots__/EmojiText.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/EmojiText.test.tsx.snap
diff --git a/src/renderer/utils/constants.ts b/src/renderer/utils/constants.ts
@@ -5,6 +5,8 @@ export const Constants = {
 
   STORAGE_KEY: 'atlassify-storage',
 
+  NOTIFICATION_SOUND: 'notification.wav',
+
   ALL_READ_EMOJIS: ['🎉', '🎊', '🥳', '👏', '🙌', '😎', '🏖️', '🚀', '✨', '🏆'],
 
   FETCH_NOTIFICATIONS_INTERVAL: 60000,

diff --git a/src/renderer/utils/notifications/native.ts b/src/renderer/utils/notifications/native.ts
@@ -5,6 +5,7 @@ import type {
   AtlassifyState,
 } from '../../types';
 import { hideWindow, showWindow } from '../comms';
+import { Constants } from '../constants';
 import { formatNotificationFooterText } from '../helpers';
 import { openNotification } from '../links';
 import { isWindows } from '../platform';
@@ -88,7 +89,13 @@ export const raiseNativeNotification = (
 
 export const raiseSoundNotification = () => {
   const audio = new Audio(
-    path.resolve(__dirname, '..', 'assets', 'sounds', 'notification.wav'),
+    path.join(
+      __dirname,
+      '..',
+      'assets',
+      'sounds',
+      Constants.NOTIFICATION_SOUND,
+    ),
   );
   audio.volume = 0.2;
   audio.play();