diff --git a/app/Http/Controllers/FrontMediaController.php b/app/Http/Controllers/FrontMediaController.php index 031b6bd..3972ae5 100644 --- a/app/Http/Controllers/FrontMediaController.php +++ b/app/Http/Controllers/FrontMediaController.php @@ -14,7 +14,7 @@ public function init(Request $request) { $meme = Meme::with('meme_media', 'background_media')->where('status', MemeGenerator::STATUS_COMPLETED)->inRandomOrder()->first(); - $meme_media = MemeGenerator::getSuitableMemeMedia($meme, 2); + $meme_media = MemeGenerator::getSuitableMemeMedia($meme, 15); return response()->json([ 'success' => [ @@ -72,14 +72,14 @@ public function searchMemes(Request $request) // Search in name and description using ILIKE for partial matches $q->where('name', 'ILIKE', "%{$query}%") ->orWhere('description', 'ILIKE', "%{$query}%") - // Search in JSON arrays using PostgreSQL JSON operators + // Search in JSON arrays using PostgreSQL JSON operators ->orWhereRaw('keywords::text ILIKE ?', ["%{$query}%"]) ->orWhereRaw('action_keywords::text ILIKE ?', ["%{$query}%"]) ->orWhereRaw('emotion_keywords::text ILIKE ?', ["%{$query}%"]) ->orWhereRaw('misc_keywords::text ILIKE ?', ["%{$query}%"]); }) ->orderByRaw(' - CASE + CASE WHEN name ILIKE ? THEN 1 WHEN description ILIKE ? THEN 2 WHEN keywords::text ILIKE ? THEN 3 @@ -116,7 +116,7 @@ public function searchBackgrounds(Request $request) $backgrounds = BackgroundMedia::where('status', 'completed') ->where('prompt', 'ILIKE', "%{$query}%") ->orderByRaw(' - CASE + CASE WHEN prompt ILIKE ? THEN 1 ELSE 2 END, prompt ASC diff --git a/resources/js/components/ui/button.tsx b/resources/js/components/ui/button.tsx index 761d2fe..84a2469 100644 --- a/resources/js/components/ui/button.tsx +++ b/resources/js/components/ui/button.tsx @@ -8,7 +8,8 @@ const buttonVariants = cva( "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-[color,box-shadow] disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive", { variants: { - variant: { + variant: { + white: "bg-white text-black shadow-xs hover:bg-accent hover:text-accent-foreground", default: "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90", destructive: diff --git a/resources/js/modules/editor/partials/canvas/video-preview.jsx b/resources/js/modules/editor/partials/canvas/video-preview.jsx index 555ac82..6a4e88d 100644 --- a/resources/js/modules/editor/partials/canvas/video-preview.jsx +++ b/resources/js/modules/editor/partials/canvas/video-preview.jsx @@ -277,7 +277,7 @@ const VideoPreview = ({ }} >