diff --git a/.gitignore b/.gitignore index 60476be0..53a7010f 100644 --- a/.gitignore +++ b/.gitignore @@ -156,9 +156,9 @@ src/scripts/icons/temp/ apps/desktop/assets/emojis.db apps/desktop/assets/icons.db apps/desktop/assets/fonts/neotrax.otf -apps/desktop/assets/colanode-logo-black.png -apps/desktop/assets/colanode-logo-black.ico -apps/desktop/assets/colanode-logo-black.icns +apps/desktop/assets/colanode-logo.png +apps/desktop/assets/colanode-logo.ico +apps/desktop/assets/colanode-logo.icns # Ignore web assets apps/web/public/assets/emojis.db @@ -166,8 +166,8 @@ apps/web/public/assets/icons.db apps/web/public/assets/emojis.svg apps/web/public/assets/icons.svg apps/web/public/assets/fonts/neotrax.otf -apps/web/public/assets/colanode-logo-black-192.png -apps/web/public/assets/colanode-logo-black-512.png +apps/web/public/assets/colanode-logo-192.jpg +apps/web/public/assets/colanode-logo-512.jpg # Ignore mobile assets apps/mobile/assets/ui/index.html diff --git a/README.md b/README.md index bda8930f..2731425f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
-Colanode cover +Colanode cover

diff --git a/apps/desktop/forge.config.ts b/apps/desktop/forge.config.ts index 1ead69ee..98eac58e 100644 --- a/apps/desktop/forge.config.ts +++ b/apps/desktop/forge.config.ts @@ -12,7 +12,7 @@ const config: ForgeConfig = { packagerConfig: { name: 'Colanode', executableName: process.platform === 'linux' ? 'colanode' : 'Colanode', - icon: 'assets/colanode-logo-black', + icon: 'assets/colanode-logo', appBundleId: 'com.colanode.desktop', ...(process.platform === 'win32' && { certificateFile: process.env.CERTIFICATE_PATH, @@ -77,7 +77,7 @@ const config: ForgeConfig = { }), }), new MakerDMG({ - icon: 'assets/colanode-logo-black.png', + icon: 'assets/colanode-logo.png', title: 'Colanode', }), { diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts index 7fc89f3f..abc0e385 100644 --- a/apps/desktop/src/main.ts +++ b/apps/desktop/src/main.ts @@ -6,6 +6,7 @@ import { shell, globalShortcut, dialog, + nativeTheme, } from 'electron'; import path from 'path'; @@ -48,6 +49,11 @@ updateElectronApp({ const createWindow = async () => { await app.migrate(); + const themeMode = (await app.metadata.get('theme.mode'))?.value; + if (themeMode) { + nativeTheme.themeSource = themeMode; + } + // Create the browser window. let windowSize = (await app.metadata.get('window.size'))?.value; const mainWindow = new BrowserWindow({ @@ -57,7 +63,7 @@ const createWindow = async () => { fullscreenable: true, minWidth: 800, minHeight: 600, - icon: path.join(app.path.assets, 'colanode-logo-black.png'), + icon: path.join(app.path.assets, 'colanode-logo.png'), webPreferences: { preload: path.join(__dirname, 'preload.js'), }, @@ -112,6 +118,16 @@ const createWindow = async () => { const subscriptionId = eventBus.subscribe((event) => { if (event.type === 'query.result.updated') { mainWindow.webContents.send('event', event); + } else if ( + event.type === 'app.metadata.updated' && + event.metadata.key === 'theme.mode' + ) { + nativeTheme.themeSource = event.metadata.value; + } else if ( + event.type === 'app.metadata.deleted' && + event.metadata.key === 'theme.mode' + ) { + nativeTheme.themeSource = 'system'; } }); diff --git a/apps/web/public/favicon.ico b/apps/web/public/favicon.ico index f496dd62..275aa09a 100644 Binary files a/apps/web/public/favicon.ico and b/apps/web/public/favicon.ico differ diff --git a/apps/web/public/manifest.json b/apps/web/public/manifest.json index d66f8fec..8ae1fa9f 100644 --- a/apps/web/public/manifest.json +++ b/apps/web/public/manifest.json @@ -8,14 +8,14 @@ "type": "image/x-icon" }, { - "src": "assets/colanode-logo-black-192.png", - "type": "image/png", + "src": "assets/colanode-logo-192.jpg", + "type": "image/jpeg", "sizes": "192x192", "purpose": "any maskable" }, { - "src": "assets/colanode-logo-black-512.png", - "type": "image/png", + "src": "assets/colanode-logo-512.jpg", + "type": "image/jpeg", "sizes": "512x512", "purpose": "any maskable" } diff --git a/assets/images/colanode-cover-black.png b/assets/images/colanode-cover-black.png deleted file mode 100644 index b1fee35e..00000000 Binary files a/assets/images/colanode-cover-black.png and /dev/null differ diff --git a/assets/images/colanode-github-cover.jpg b/assets/images/colanode-github-cover.jpg new file mode 100644 index 00000000..ac341d9d Binary files /dev/null and b/assets/images/colanode-github-cover.jpg differ diff --git a/assets/images/colanode-logo-1024.jpg b/assets/images/colanode-logo-1024.jpg new file mode 100644 index 00000000..128456fd Binary files /dev/null and b/assets/images/colanode-logo-1024.jpg differ diff --git a/assets/images/colanode-logo-192.jpg b/assets/images/colanode-logo-192.jpg new file mode 100644 index 00000000..bfc51d8d Binary files /dev/null and b/assets/images/colanode-logo-192.jpg differ diff --git a/assets/images/colanode-logo-512.jpg b/assets/images/colanode-logo-512.jpg new file mode 100644 index 00000000..1dfee72a Binary files /dev/null and b/assets/images/colanode-logo-512.jpg differ diff --git a/assets/images/colanode-logo-black-192.png b/assets/images/colanode-logo-black-192.png deleted file mode 100644 index 36fceb59..00000000 Binary files a/assets/images/colanode-logo-black-192.png and /dev/null differ diff --git a/assets/images/colanode-logo-black-512.png b/assets/images/colanode-logo-black-512.png deleted file mode 100644 index bbd1971d..00000000 Binary files a/assets/images/colanode-logo-black-512.png and /dev/null differ diff --git a/assets/images/colanode-logo-black.icns b/assets/images/colanode-logo-black.icns deleted file mode 100644 index 6507eb9a..00000000 Binary files a/assets/images/colanode-logo-black.icns and /dev/null differ diff --git a/assets/images/colanode-logo-black.ico b/assets/images/colanode-logo-black.ico deleted file mode 100644 index f496dd62..00000000 Binary files a/assets/images/colanode-logo-black.ico and /dev/null differ diff --git a/assets/images/colanode-logo-black.png b/assets/images/colanode-logo-black.png deleted file mode 100644 index cf122fdf..00000000 Binary files a/assets/images/colanode-logo-black.png and /dev/null differ diff --git a/assets/images/colanode-logo-white.png b/assets/images/colanode-logo-white.png deleted file mode 100644 index 0ab319a1..00000000 Binary files a/assets/images/colanode-logo-white.png and /dev/null differ diff --git a/assets/images/colanode-logo.icns b/assets/images/colanode-logo.icns new file mode 100644 index 00000000..5bf6b71a Binary files /dev/null and b/assets/images/colanode-logo.icns differ diff --git a/assets/images/colanode-logo.ico b/assets/images/colanode-logo.ico new file mode 100644 index 00000000..275aa09a Binary files /dev/null and b/assets/images/colanode-logo.ico differ diff --git a/assets/images/colanode-logo.png b/assets/images/colanode-logo.png new file mode 100644 index 00000000..9cd13c44 Binary files /dev/null and b/assets/images/colanode-logo.png differ diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-menu.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-menu.tsx index c9acb6d3..4e7d89dd 100644 --- a/packages/ui/src/components/layouts/sidebars/sidebar-menu.tsx +++ b/packages/ui/src/components/layouts/sidebars/sidebar-menu.tsx @@ -7,6 +7,7 @@ import { SidebarMenuIcon } from '@colanode/ui/components/layouts/sidebars/sideba import { useRadar } from '@colanode/ui/contexts/radar'; import { useWorkspace } from '@colanode/ui/contexts/workspace'; import { useLiveQuery } from '@colanode/ui/hooks/use-live-query'; +import { cn } from '@colanode/ui/lib/utils'; import { useAppStore } from '@colanode/ui/stores/app'; interface SidebarMenuProps { @@ -41,15 +42,7 @@ export const SidebarMenu = ({ value, onChange }: SidebarMenuProps) => { return (
- {showMacOsPlaceholder ? ( -
-
-
-
-
- ) : ( -
- )} +
{ @@ -57,28 +58,33 @@ const execute = () => { ]); copyFile( - path.resolve(IMAGES_DIR, 'colanode-logo-black-192.png'), - path.resolve(WEB_ASSETS_DIR, 'colanode-logo-black-192.png') + path.resolve(IMAGES_DIR, 'colanode-logo.ico'), + path.resolve(WEB_PUBLIC_DIR, 'favicon.ico') ); copyFile( - path.resolve(IMAGES_DIR, 'colanode-logo-black-512.png'), - path.resolve(WEB_ASSETS_DIR, 'colanode-logo-black-512.png') + path.resolve(IMAGES_DIR, 'colanode-logo-192.jpg'), + path.resolve(WEB_ASSETS_DIR, 'colanode-logo-192.jpg') ); copyFile( - path.resolve(IMAGES_DIR, 'colanode-logo-black.png'), - path.resolve(DESKTOP_ASSETS_DIR, 'colanode-logo-black.png') + path.resolve(IMAGES_DIR, 'colanode-logo-512.jpg'), + path.resolve(WEB_ASSETS_DIR, 'colanode-logo-512.jpg') ); copyFile( - path.resolve(IMAGES_DIR, 'colanode-logo-black.ico'), - path.resolve(DESKTOP_ASSETS_DIR, 'colanode-logo-black.ico') + path.resolve(IMAGES_DIR, 'colanode-logo.png'), + path.resolve(DESKTOP_ASSETS_DIR, 'colanode-logo.png') ); copyFile( - path.resolve(IMAGES_DIR, 'colanode-logo-black.icns'), - path.resolve(DESKTOP_ASSETS_DIR, 'colanode-logo-black.icns') + path.resolve(IMAGES_DIR, 'colanode-logo.ico'), + path.resolve(DESKTOP_ASSETS_DIR, 'colanode-logo.ico') + ); + + copyFile( + path.resolve(IMAGES_DIR, 'colanode-logo.icns'), + path.resolve(DESKTOP_ASSETS_DIR, 'colanode-logo.icns') ); };