From 7adafdf56e594144972f96b96e9a645f2760dbaa Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 24 Apr 2025 23:27:01 +0300 Subject: [PATCH] fix(monorepo/electron): tray icon --- .../images}/tray/bookmarksTemplate-inverted.png | Bin .../tray/bookmarksTemplate-inverted@1.25x.png | Bin .../tray/bookmarksTemplate-inverted@1.5x.png | Bin .../images}/tray/bookmarksTemplate-inverted@2x.png | Bin .../src/assets/images}/tray/bookmarksTemplate.png | Bin .../assets/images}/tray/bookmarksTemplate@1.25x.png | Bin .../assets/images}/tray/bookmarksTemplate@1.5x.png | Bin .../assets/images}/tray/bookmarksTemplate@2x.png | Bin .../assets/images}/tray/closeTemplate-inverted.png | Bin .../images}/tray/closeTemplate-inverted@1.25x.png | Bin .../images}/tray/closeTemplate-inverted@1.5x.png | Bin .../images}/tray/closeTemplate-inverted@2x.png | Bin .../src/assets/images}/tray/closeTemplate.png | Bin .../src/assets/images}/tray/closeTemplate@1.25x.png | Bin .../src/assets/images}/tray/closeTemplate@1.5x.png | Bin .../src/assets/images}/tray/closeTemplate@2x.png | Bin .../src/assets/images}/tray/icon-blackTemplate.png | Bin .../images}/tray/icon-blackTemplate@1.25x.png | Bin .../assets/images}/tray/icon-blackTemplate@1.5x.png | Bin .../assets/images}/tray/icon-blackTemplate@2x.png | Bin .../desktop/src/assets/images}/tray/icon-color.png | Bin .../src/assets/images}/tray/icon-color@1.25x.png | Bin .../src/assets/images}/tray/icon-color@1.5x.png | Bin .../src/assets/images}/tray/icon-color@2x.png | Bin .../desktop/src/assets/images}/tray/icon-purple.png | Bin .../src/assets/images}/tray/icon-purple@1.25x.png | Bin .../src/assets/images}/tray/icon-purple@1.5x.png | Bin .../src/assets/images}/tray/icon-purple@2x.png | Bin .../images}/tray/new-noteTemplate-inverted.png | Bin .../tray/new-noteTemplate-inverted@1.25x.png | Bin .../images}/tray/new-noteTemplate-inverted@1.5x.png | Bin .../images}/tray/new-noteTemplate-inverted@2x.png | Bin .../src/assets/images}/tray/new-noteTemplate.png | Bin .../assets/images}/tray/new-noteTemplate@1.25x.png | Bin .../assets/images}/tray/new-noteTemplate@1.5x.png | Bin .../src/assets/images}/tray/new-noteTemplate@2x.png | Bin .../images}/tray/new-windowTemplate-inverted.png | Bin .../tray/new-windowTemplate-inverted@1.25x.png | Bin .../tray/new-windowTemplate-inverted@1.5x.png | Bin .../images}/tray/new-windowTemplate-inverted@2x.png | Bin .../src/assets/images}/tray/new-windowTemplate.png | Bin .../images}/tray/new-windowTemplate@1.25x.png | Bin .../assets/images}/tray/new-windowTemplate@1.5x.png | Bin .../assets/images}/tray/new-windowTemplate@2x.png | Bin .../images}/tray/recentsTemplate-inverted.png | Bin .../images}/tray/recentsTemplate-inverted@1.25x.png | Bin .../images}/tray/recentsTemplate-inverted@1.5x.png | Bin .../images}/tray/recentsTemplate-inverted@2x.png | Bin .../src/assets/images}/tray/recentsTemplate.png | Bin .../assets/images}/tray/recentsTemplate@1.25x.png | Bin .../assets/images}/tray/recentsTemplate@1.5x.png | Bin .../src/assets/images}/tray/recentsTemplate@2x.png | Bin .../assets/images}/tray/todayTemplate-inverted.png | Bin .../images}/tray/todayTemplate-inverted@1.25x.png | Bin .../images}/tray/todayTemplate-inverted@1.5x.png | Bin .../images}/tray/todayTemplate-inverted@2x.png | Bin .../src/assets/images}/tray/todayTemplate.png | Bin .../src/assets/images}/tray/todayTemplate@1.25x.png | Bin .../src/assets/images}/tray/todayTemplate@1.5x.png | Bin .../src/assets/images}/tray/todayTemplate@2x.png | Bin apps/desktop/webpack.config.cjs | 3 +-- apps/server/src/services/tray.ts | 6 +++--- 62 files changed, 4 insertions(+), 5 deletions(-) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/bookmarksTemplate-inverted.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/bookmarksTemplate-inverted@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/bookmarksTemplate-inverted@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/bookmarksTemplate-inverted@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/bookmarksTemplate.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/bookmarksTemplate@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/bookmarksTemplate@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/bookmarksTemplate@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/closeTemplate-inverted.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/closeTemplate-inverted@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/closeTemplate-inverted@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/closeTemplate-inverted@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/closeTemplate.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/closeTemplate@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/closeTemplate@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/closeTemplate@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/icon-blackTemplate.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/icon-blackTemplate@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/icon-blackTemplate@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/icon-blackTemplate@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/icon-color.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/icon-color@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/icon-color@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/icon-color@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/icon-purple.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/icon-purple@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/icon-purple@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/icon-purple@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-noteTemplate-inverted.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-noteTemplate-inverted@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-noteTemplate-inverted@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-noteTemplate-inverted@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-noteTemplate.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-noteTemplate@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-noteTemplate@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-noteTemplate@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-windowTemplate-inverted.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-windowTemplate-inverted@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-windowTemplate-inverted@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-windowTemplate-inverted@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-windowTemplate.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-windowTemplate@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-windowTemplate@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/new-windowTemplate@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/recentsTemplate-inverted.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/recentsTemplate-inverted@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/recentsTemplate-inverted@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/recentsTemplate-inverted@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/recentsTemplate.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/recentsTemplate@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/recentsTemplate@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/recentsTemplate@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/todayTemplate-inverted.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/todayTemplate-inverted@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/todayTemplate-inverted@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/todayTemplate-inverted@2x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/todayTemplate.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/todayTemplate@1.25x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/todayTemplate@1.5x.png (100%) rename {_regroup_monorepo/apps/desktop/assets => apps/desktop/src/assets/images}/tray/todayTemplate@2x.png (100%) diff --git a/_regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate-inverted.png b/apps/desktop/src/assets/images/tray/bookmarksTemplate-inverted.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate-inverted.png rename to apps/desktop/src/assets/images/tray/bookmarksTemplate-inverted.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate-inverted@1.25x.png b/apps/desktop/src/assets/images/tray/bookmarksTemplate-inverted@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate-inverted@1.25x.png rename to apps/desktop/src/assets/images/tray/bookmarksTemplate-inverted@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate-inverted@1.5x.png b/apps/desktop/src/assets/images/tray/bookmarksTemplate-inverted@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate-inverted@1.5x.png rename to apps/desktop/src/assets/images/tray/bookmarksTemplate-inverted@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate-inverted@2x.png b/apps/desktop/src/assets/images/tray/bookmarksTemplate-inverted@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate-inverted@2x.png rename to apps/desktop/src/assets/images/tray/bookmarksTemplate-inverted@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate.png b/apps/desktop/src/assets/images/tray/bookmarksTemplate.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate.png rename to apps/desktop/src/assets/images/tray/bookmarksTemplate.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate@1.25x.png b/apps/desktop/src/assets/images/tray/bookmarksTemplate@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate@1.25x.png rename to apps/desktop/src/assets/images/tray/bookmarksTemplate@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate@1.5x.png b/apps/desktop/src/assets/images/tray/bookmarksTemplate@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate@1.5x.png rename to apps/desktop/src/assets/images/tray/bookmarksTemplate@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate@2x.png b/apps/desktop/src/assets/images/tray/bookmarksTemplate@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/bookmarksTemplate@2x.png rename to apps/desktop/src/assets/images/tray/bookmarksTemplate@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/closeTemplate-inverted.png b/apps/desktop/src/assets/images/tray/closeTemplate-inverted.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/closeTemplate-inverted.png rename to apps/desktop/src/assets/images/tray/closeTemplate-inverted.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/closeTemplate-inverted@1.25x.png b/apps/desktop/src/assets/images/tray/closeTemplate-inverted@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/closeTemplate-inverted@1.25x.png rename to apps/desktop/src/assets/images/tray/closeTemplate-inverted@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/closeTemplate-inverted@1.5x.png b/apps/desktop/src/assets/images/tray/closeTemplate-inverted@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/closeTemplate-inverted@1.5x.png rename to apps/desktop/src/assets/images/tray/closeTemplate-inverted@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/closeTemplate-inverted@2x.png b/apps/desktop/src/assets/images/tray/closeTemplate-inverted@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/closeTemplate-inverted@2x.png rename to apps/desktop/src/assets/images/tray/closeTemplate-inverted@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/closeTemplate.png b/apps/desktop/src/assets/images/tray/closeTemplate.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/closeTemplate.png rename to apps/desktop/src/assets/images/tray/closeTemplate.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/closeTemplate@1.25x.png b/apps/desktop/src/assets/images/tray/closeTemplate@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/closeTemplate@1.25x.png rename to apps/desktop/src/assets/images/tray/closeTemplate@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/closeTemplate@1.5x.png b/apps/desktop/src/assets/images/tray/closeTemplate@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/closeTemplate@1.5x.png rename to apps/desktop/src/assets/images/tray/closeTemplate@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/closeTemplate@2x.png b/apps/desktop/src/assets/images/tray/closeTemplate@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/closeTemplate@2x.png rename to apps/desktop/src/assets/images/tray/closeTemplate@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/icon-blackTemplate.png b/apps/desktop/src/assets/images/tray/icon-blackTemplate.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/icon-blackTemplate.png rename to apps/desktop/src/assets/images/tray/icon-blackTemplate.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/icon-blackTemplate@1.25x.png b/apps/desktop/src/assets/images/tray/icon-blackTemplate@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/icon-blackTemplate@1.25x.png rename to apps/desktop/src/assets/images/tray/icon-blackTemplate@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/icon-blackTemplate@1.5x.png b/apps/desktop/src/assets/images/tray/icon-blackTemplate@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/icon-blackTemplate@1.5x.png rename to apps/desktop/src/assets/images/tray/icon-blackTemplate@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/icon-blackTemplate@2x.png b/apps/desktop/src/assets/images/tray/icon-blackTemplate@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/icon-blackTemplate@2x.png rename to apps/desktop/src/assets/images/tray/icon-blackTemplate@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/icon-color.png b/apps/desktop/src/assets/images/tray/icon-color.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/icon-color.png rename to apps/desktop/src/assets/images/tray/icon-color.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/icon-color@1.25x.png b/apps/desktop/src/assets/images/tray/icon-color@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/icon-color@1.25x.png rename to apps/desktop/src/assets/images/tray/icon-color@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/icon-color@1.5x.png b/apps/desktop/src/assets/images/tray/icon-color@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/icon-color@1.5x.png rename to apps/desktop/src/assets/images/tray/icon-color@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/icon-color@2x.png b/apps/desktop/src/assets/images/tray/icon-color@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/icon-color@2x.png rename to apps/desktop/src/assets/images/tray/icon-color@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/icon-purple.png b/apps/desktop/src/assets/images/tray/icon-purple.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/icon-purple.png rename to apps/desktop/src/assets/images/tray/icon-purple.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/icon-purple@1.25x.png b/apps/desktop/src/assets/images/tray/icon-purple@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/icon-purple@1.25x.png rename to apps/desktop/src/assets/images/tray/icon-purple@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/icon-purple@1.5x.png b/apps/desktop/src/assets/images/tray/icon-purple@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/icon-purple@1.5x.png rename to apps/desktop/src/assets/images/tray/icon-purple@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/icon-purple@2x.png b/apps/desktop/src/assets/images/tray/icon-purple@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/icon-purple@2x.png rename to apps/desktop/src/assets/images/tray/icon-purple@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate-inverted.png b/apps/desktop/src/assets/images/tray/new-noteTemplate-inverted.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate-inverted.png rename to apps/desktop/src/assets/images/tray/new-noteTemplate-inverted.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate-inverted@1.25x.png b/apps/desktop/src/assets/images/tray/new-noteTemplate-inverted@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate-inverted@1.25x.png rename to apps/desktop/src/assets/images/tray/new-noteTemplate-inverted@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate-inverted@1.5x.png b/apps/desktop/src/assets/images/tray/new-noteTemplate-inverted@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate-inverted@1.5x.png rename to apps/desktop/src/assets/images/tray/new-noteTemplate-inverted@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate-inverted@2x.png b/apps/desktop/src/assets/images/tray/new-noteTemplate-inverted@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate-inverted@2x.png rename to apps/desktop/src/assets/images/tray/new-noteTemplate-inverted@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate.png b/apps/desktop/src/assets/images/tray/new-noteTemplate.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate.png rename to apps/desktop/src/assets/images/tray/new-noteTemplate.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate@1.25x.png b/apps/desktop/src/assets/images/tray/new-noteTemplate@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate@1.25x.png rename to apps/desktop/src/assets/images/tray/new-noteTemplate@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate@1.5x.png b/apps/desktop/src/assets/images/tray/new-noteTemplate@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate@1.5x.png rename to apps/desktop/src/assets/images/tray/new-noteTemplate@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate@2x.png b/apps/desktop/src/assets/images/tray/new-noteTemplate@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-noteTemplate@2x.png rename to apps/desktop/src/assets/images/tray/new-noteTemplate@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate-inverted.png b/apps/desktop/src/assets/images/tray/new-windowTemplate-inverted.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate-inverted.png rename to apps/desktop/src/assets/images/tray/new-windowTemplate-inverted.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate-inverted@1.25x.png b/apps/desktop/src/assets/images/tray/new-windowTemplate-inverted@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate-inverted@1.25x.png rename to apps/desktop/src/assets/images/tray/new-windowTemplate-inverted@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate-inverted@1.5x.png b/apps/desktop/src/assets/images/tray/new-windowTemplate-inverted@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate-inverted@1.5x.png rename to apps/desktop/src/assets/images/tray/new-windowTemplate-inverted@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate-inverted@2x.png b/apps/desktop/src/assets/images/tray/new-windowTemplate-inverted@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate-inverted@2x.png rename to apps/desktop/src/assets/images/tray/new-windowTemplate-inverted@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate.png b/apps/desktop/src/assets/images/tray/new-windowTemplate.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate.png rename to apps/desktop/src/assets/images/tray/new-windowTemplate.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate@1.25x.png b/apps/desktop/src/assets/images/tray/new-windowTemplate@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate@1.25x.png rename to apps/desktop/src/assets/images/tray/new-windowTemplate@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate@1.5x.png b/apps/desktop/src/assets/images/tray/new-windowTemplate@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate@1.5x.png rename to apps/desktop/src/assets/images/tray/new-windowTemplate@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate@2x.png b/apps/desktop/src/assets/images/tray/new-windowTemplate@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/new-windowTemplate@2x.png rename to apps/desktop/src/assets/images/tray/new-windowTemplate@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/recentsTemplate-inverted.png b/apps/desktop/src/assets/images/tray/recentsTemplate-inverted.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/recentsTemplate-inverted.png rename to apps/desktop/src/assets/images/tray/recentsTemplate-inverted.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/recentsTemplate-inverted@1.25x.png b/apps/desktop/src/assets/images/tray/recentsTemplate-inverted@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/recentsTemplate-inverted@1.25x.png rename to apps/desktop/src/assets/images/tray/recentsTemplate-inverted@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/recentsTemplate-inverted@1.5x.png b/apps/desktop/src/assets/images/tray/recentsTemplate-inverted@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/recentsTemplate-inverted@1.5x.png rename to apps/desktop/src/assets/images/tray/recentsTemplate-inverted@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/recentsTemplate-inverted@2x.png b/apps/desktop/src/assets/images/tray/recentsTemplate-inverted@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/recentsTemplate-inverted@2x.png rename to apps/desktop/src/assets/images/tray/recentsTemplate-inverted@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/recentsTemplate.png b/apps/desktop/src/assets/images/tray/recentsTemplate.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/recentsTemplate.png rename to apps/desktop/src/assets/images/tray/recentsTemplate.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/recentsTemplate@1.25x.png b/apps/desktop/src/assets/images/tray/recentsTemplate@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/recentsTemplate@1.25x.png rename to apps/desktop/src/assets/images/tray/recentsTemplate@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/recentsTemplate@1.5x.png b/apps/desktop/src/assets/images/tray/recentsTemplate@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/recentsTemplate@1.5x.png rename to apps/desktop/src/assets/images/tray/recentsTemplate@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/recentsTemplate@2x.png b/apps/desktop/src/assets/images/tray/recentsTemplate@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/recentsTemplate@2x.png rename to apps/desktop/src/assets/images/tray/recentsTemplate@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/todayTemplate-inverted.png b/apps/desktop/src/assets/images/tray/todayTemplate-inverted.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/todayTemplate-inverted.png rename to apps/desktop/src/assets/images/tray/todayTemplate-inverted.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/todayTemplate-inverted@1.25x.png b/apps/desktop/src/assets/images/tray/todayTemplate-inverted@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/todayTemplate-inverted@1.25x.png rename to apps/desktop/src/assets/images/tray/todayTemplate-inverted@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/todayTemplate-inverted@1.5x.png b/apps/desktop/src/assets/images/tray/todayTemplate-inverted@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/todayTemplate-inverted@1.5x.png rename to apps/desktop/src/assets/images/tray/todayTemplate-inverted@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/todayTemplate-inverted@2x.png b/apps/desktop/src/assets/images/tray/todayTemplate-inverted@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/todayTemplate-inverted@2x.png rename to apps/desktop/src/assets/images/tray/todayTemplate-inverted@2x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/todayTemplate.png b/apps/desktop/src/assets/images/tray/todayTemplate.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/todayTemplate.png rename to apps/desktop/src/assets/images/tray/todayTemplate.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/todayTemplate@1.25x.png b/apps/desktop/src/assets/images/tray/todayTemplate@1.25x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/todayTemplate@1.25x.png rename to apps/desktop/src/assets/images/tray/todayTemplate@1.25x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/todayTemplate@1.5x.png b/apps/desktop/src/assets/images/tray/todayTemplate@1.5x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/todayTemplate@1.5x.png rename to apps/desktop/src/assets/images/tray/todayTemplate@1.5x.png diff --git a/_regroup_monorepo/apps/desktop/assets/tray/todayTemplate@2x.png b/apps/desktop/src/assets/images/tray/todayTemplate@2x.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/tray/todayTemplate@2x.png rename to apps/desktop/src/assets/images/tray/todayTemplate@2x.png diff --git a/apps/desktop/webpack.config.cjs b/apps/desktop/webpack.config.cjs index 3b61bbc73..605d5f63a 100644 --- a/apps/desktop/webpack.config.cjs +++ b/apps/desktop/webpack.config.cjs @@ -25,8 +25,7 @@ module.exports = { "electron", "@electron/remote", "better-sqlite3" - ], - assets: [] + ] }), new CopyPlugin({ patterns: [ diff --git a/apps/server/src/services/tray.ts b/apps/server/src/services/tray.ts index 05451b9ca..0d054d9ec 100644 --- a/apps/server/src/services/tray.ts +++ b/apps/server/src/services/tray.ts @@ -11,7 +11,7 @@ import cls from "./cls.js"; import date_notes from "./date_notes.js"; import type { KeyboardActionNames } from "@triliumnext/commons"; import optionService from "./options.js"; -import { isDev, isMac } from "./utils.js"; +import { getResourceDir, isDev, isMac } from "./utils.js"; import windowService from "./window.js"; let tray: Tray; @@ -29,12 +29,12 @@ function getTrayIconPath() { name = "icon-color"; } - return path.join(path.dirname(fileURLToPath(import.meta.url)), "../..", "images", "app-icons", "tray", `${name}.png`); + return path.resolve(path.join(getResourceDir(), "assets", "images", "tray", `${name}.png`)); } function getIconPath(name: string) { const suffix = !isMac && nativeTheme.shouldUseDarkColors ? "-inverted" : ""; - return path.join(path.dirname(fileURLToPath(import.meta.url)), "../..", "images", "app-icons", "tray", `${name}Template${suffix}.png`); + return path.resolve(path.join(getResourceDir(), "assets", "images", "tray", `${name}Template${suffix}.png`)); } function registerVisibilityListener(window: BrowserWindow) {