From 60236af762b75708072ce3d92fcdaf08ce650dbf Mon Sep 17 00:00:00 2001 From: ct Date: Wed, 18 Jun 2025 13:43:42 +0800 Subject: [PATCH] Update --- app/Models/MemeMedia.php | 1 + ..._media_dimensions_to_meme_medias_table.php | 30 +++++++++++++++++++ ..._dimensions_to_background_medias_table.php | 30 +++++++++++++++++++ .../editor/partials/editor-controls.jsx | 6 ++-- .../single_caption_meme_background.json | 4 +++ 5 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 database/migrations/2025_06_18_043427_add_media_dimensions_to_meme_medias_table.php create mode 100644 database/migrations/2025_06_18_043437_add_media_dimensions_to_background_medias_table.php diff --git a/app/Models/MemeMedia.php b/app/Models/MemeMedia.php index aa4933b..e46a1cf 100644 --- a/app/Models/MemeMedia.php +++ b/app/Models/MemeMedia.php @@ -39,6 +39,7 @@ class MemeMedia extends Model protected $casts = [ 'embedding' => Vector::class, + 'duration' => 'double', ]; protected $fillable = [ diff --git a/database/migrations/2025_06_18_043427_add_media_dimensions_to_meme_medias_table.php b/database/migrations/2025_06_18_043427_add_media_dimensions_to_meme_medias_table.php new file mode 100644 index 0000000..1b38d1a --- /dev/null +++ b/database/migrations/2025_06_18_043427_add_media_dimensions_to_meme_medias_table.php @@ -0,0 +1,30 @@ +integer('media_width')->default(720); + $table->integer('media_height')->default(1280); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('meme_medias', function (Blueprint $table) { + $table->dropColumn('media_width'); + $table->dropColumn('media_height'); + }); + } +}; diff --git a/database/migrations/2025_06_18_043437_add_media_dimensions_to_background_medias_table.php b/database/migrations/2025_06_18_043437_add_media_dimensions_to_background_medias_table.php new file mode 100644 index 0000000..b5d6917 --- /dev/null +++ b/database/migrations/2025_06_18_043437_add_media_dimensions_to_background_medias_table.php @@ -0,0 +1,30 @@ +integer('media_width')->default(720); + $table->integer('media_height')->default(720); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('background_medias', function (Blueprint $table) { + $table->dropColumn('media_width'); + $table->dropColumn('media_height'); + }); + } +}; diff --git a/resources/js/modules/editor/partials/editor-controls.jsx b/resources/js/modules/editor/partials/editor-controls.jsx index d26ca3b..88e22bf 100644 --- a/resources/js/modules/editor/partials/editor-controls.jsx +++ b/resources/js/modules/editor/partials/editor-controls.jsx @@ -28,7 +28,7 @@ const EditorControls = ({ className = '', onEditClick = () => {}, isEditActive = return (
- @@ -46,7 +46,7 @@ const EditorControls = ({ className = '', onEditClick = () => {}, isEditActive = -
diff --git a/resources/js/modules/editor/templates/single_caption_meme_background.json b/resources/js/modules/editor/templates/single_caption_meme_background.json index 0b614fe..3b66d24 100644 --- a/resources/js/modules/editor/templates/single_caption_meme_background.json +++ b/resources/js/modules/editor/templates/single_caption_meme_background.json @@ -19,6 +19,8 @@ "duration": 6, "x": 0, "y": 0, + "asset_width": 720, + "asset_height": 720, "width": 720, "height": 1280, "rotation": 0 @@ -36,6 +38,8 @@ "duration": 6, "x": 0, "y": 0, + "asset_width": 720, + "asset_height": 1280, "width": 720, "height": 1280, "rotation": 0