diff --git a/apps/server/src/assets/.gitkeep b/apps/server/src/assets/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/_regroup_monorepo/apps/server/db/TODO.txt b/apps/server/src/assets/db/TODO.txt similarity index 100% rename from _regroup_monorepo/apps/server/db/TODO.txt rename to apps/server/src/assets/db/TODO.txt diff --git a/_regroup_monorepo/apps/server/db/demo.zip b/apps/server/src/assets/db/demo.zip similarity index 100% rename from _regroup_monorepo/apps/server/db/demo.zip rename to apps/server/src/assets/db/demo.zip diff --git a/_regroup_monorepo/apps/server/db/image-deleted.png b/apps/server/src/assets/db/image-deleted.png similarity index 100% rename from _regroup_monorepo/apps/server/db/image-deleted.png rename to apps/server/src/assets/db/image-deleted.png diff --git a/_regroup_monorepo/apps/server/db/migrations/0215__content_structure.sql b/apps/server/src/assets/db/migrations/0215__content_structure.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0215__content_structure.sql rename to apps/server/src/assets/db/migrations/0215__content_structure.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0216__move_content_into_blobs.ts b/apps/server/src/assets/db/migrations/0216__move_content_into_blobs.ts similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0216__move_content_into_blobs.ts rename to apps/server/src/assets/db/migrations/0216__move_content_into_blobs.ts diff --git a/_regroup_monorepo/apps/server/db/migrations/0217__drop_content_tables.sql b/apps/server/src/assets/db/migrations/0217__drop_content_tables.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0217__drop_content_tables.sql rename to apps/server/src/assets/db/migrations/0217__drop_content_tables.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0218__rename_note_revision_to_revision.sql b/apps/server/src/assets/db/migrations/0218__rename_note_revision_to_revision.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0218__rename_note_revision_to_revision.sql rename to apps/server/src/assets/db/migrations/0218__rename_note_revision_to_revision.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0219__attachments.sql b/apps/server/src/assets/db/migrations/0219__attachments.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0219__attachments.sql rename to apps/server/src/assets/db/migrations/0219__attachments.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0220__migrate_images_to_attachments.ts b/apps/server/src/assets/db/migrations/0220__migrate_images_to_attachments.ts similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0220__migrate_images_to_attachments.ts rename to apps/server/src/assets/db/migrations/0220__migrate_images_to_attachments.ts diff --git a/_regroup_monorepo/apps/server/db/migrations/0221__remove_hideIncludedImages_main_option.sql b/apps/server/src/assets/db/migrations/0221__remove_hideIncludedImages_main_option.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0221__remove_hideIncludedImages_main_option.sql rename to apps/server/src/assets/db/migrations/0221__remove_hideIncludedImages_main_option.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0222__rename_openTabs_to_openNoteContexts.sql b/apps/server/src/assets/db/migrations/0222__rename_openTabs_to_openNoteContexts.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0222__rename_openTabs_to_openNoteContexts.sql rename to apps/server/src/assets/db/migrations/0222__rename_openTabs_to_openNoteContexts.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0223__NOOP.sql b/apps/server/src/assets/db/migrations/0223__NOOP.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0223__NOOP.sql rename to apps/server/src/assets/db/migrations/0223__NOOP.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0224__fix_blobIds.sql b/apps/server/src/assets/db/migrations/0224__fix_blobIds.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0224__fix_blobIds.sql rename to apps/server/src/assets/db/migrations/0224__fix_blobIds.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0225__create_blobId_indices.sql b/apps/server/src/assets/db/migrations/0225__create_blobId_indices.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0225__create_blobId_indices.sql rename to apps/server/src/assets/db/migrations/0225__create_blobId_indices.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0226__rename_noteSize_label.sql b/apps/server/src/assets/db/migrations/0226__rename_noteSize_label.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0226__rename_noteSize_label.sql rename to apps/server/src/assets/db/migrations/0226__rename_noteSize_label.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0227__disable_image_compression.sql b/apps/server/src/assets/db/migrations/0227__disable_image_compression.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0227__disable_image_compression.sql rename to apps/server/src/assets/db/migrations/0227__disable_image_compression.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0228__fix_blobIds.sql b/apps/server/src/assets/db/migrations/0228__fix_blobIds.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0228__fix_blobIds.sql rename to apps/server/src/assets/db/migrations/0228__fix_blobIds.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0229__add_oauth_user_data_table.sql b/apps/server/src/assets/db/migrations/0229__add_oauth_user_data_table.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0229__add_oauth_user_data_table.sql rename to apps/server/src/assets/db/migrations/0229__add_oauth_user_data_table.sql diff --git a/_regroup_monorepo/apps/server/db/migrations/0230__vector_embeddings.sql b/apps/server/src/assets/db/migrations/0230__vector_embeddings.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/migrations/0230__vector_embeddings.sql rename to apps/server/src/assets/db/migrations/0230__vector_embeddings.sql diff --git a/_regroup_monorepo/apps/server/db/schema.sql b/apps/server/src/assets/db/schema.sql similarity index 100% rename from _regroup_monorepo/apps/server/db/schema.sql rename to apps/server/src/assets/db/schema.sql diff --git a/apps/server/src/services/resource_dir.ts b/apps/server/src/services/resource_dir.ts index 923f277cf..3a1de62d2 100644 --- a/apps/server/src/services/resource_dir.ts +++ b/apps/server/src/services/resource_dir.ts @@ -3,7 +3,7 @@ import path from "path"; import fs from "fs"; import { fileURLToPath } from "url"; -export const RESOURCE_DIR = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../.."); +export const RESOURCE_DIR = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../assets"); // where the "trilium" executable is const ELECTRON_APP_ROOT_DIR = path.resolve(RESOURCE_DIR, "../..");