7 Commits

Author SHA1 Message Date
Mathis HERRIOT
60643f6aa8 chore: bump version to 1.6.0
All checks were successful
CI/CD Pipeline / Valider backend (push) Successful in 1m39s
CI/CD Pipeline / Valider frontend (push) Successful in 1m43s
CI/CD Pipeline / Valider documentation (push) Successful in 1m47s
CI/CD Pipeline / Déploiement en Production (push) Successful in 1m32s
2026-01-28 16:30:34 +01:00
Mathis HERRIOT
929dd74ec1 feat: add AudioProvider for global audio state management
- Introduced `AudioProvider` with context for managing global mute state and active video.
- Added `useAudio` hook to access AudioContext conveniently.
2026-01-28 16:30:28 +01:00
Mathis HERRIOT
87534c0596 refactor: enhance content card and layout with video handling and audio controls
- Added mute toggle for video content in content card.
- Integrated `AudioProvider` for global audio state management.
- Improved content card layout with dynamic aspect ratio support.
- Updated content list to use a masonry-style layout for better visual presentation.
2026-01-28 16:29:56 +01:00
Mathis HERRIOT
fa673d0f80 chore: bump version to 1.5.6
All checks were successful
CI/CD Pipeline / Valider backend (push) Successful in 1m39s
CI/CD Pipeline / Valider frontend (push) Successful in 1m45s
CI/CD Pipeline / Valider documentation (push) Successful in 1m48s
CI/CD Pipeline / Déploiement en Production (push) Successful in 1m32s
2026-01-28 15:39:56 +01:00
Mathis HERRIOT
8df6d15b19 refactor: update content card and list layout for better responsiveness
- Removed unused aspect-video class from content card layout.
- Improved content list layout by switching to a responsive grid system.
2026-01-28 15:39:44 +01:00
Mathis HERRIOT
0144421f03 chore: bump version to 1.5.5
All checks were successful
CI/CD Pipeline / Valider backend (push) Successful in 1m38s
CI/CD Pipeline / Valider frontend (push) Successful in 1m43s
CI/CD Pipeline / Valider documentation (push) Successful in 1m47s
CI/CD Pipeline / Déploiement en Production (push) Successful in 1m36s
2026-01-28 15:00:02 +01:00
Mathis HERRIOT
df9a6c6f36 refactor: update test mocks to use addOutputOptions for consistency
- Replaced `outputOptions` with `addOutputOptions` in media service spec test to align with updated FFmpeg strategy.
2026-01-28 14:59:40 +01:00
8 changed files with 166 additions and 97 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "@memegoat/backend", "name": "@memegoat/backend",
"version": "1.5.4", "version": "1.6.0",
"description": "", "description": "",
"author": "", "author": "",
"private": true, "private": true,

View File

@@ -75,7 +75,7 @@ describe("MediaService", () => {
toFormat: jest.fn().mockReturnThis(), toFormat: jest.fn().mockReturnThis(),
videoCodec: jest.fn().mockReturnThis(), videoCodec: jest.fn().mockReturnThis(),
audioCodec: jest.fn().mockReturnThis(), audioCodec: jest.fn().mockReturnThis(),
outputOptions: jest.fn().mockReturnThis(), addOutputOptions: jest.fn().mockReturnThis(),
on: jest.fn().mockImplementation(function (event, cb) { on: jest.fn().mockImplementation(function (event, cb) {
if (event === "end") setTimeout(cb, 0); if (event === "end") setTimeout(cb, 0);
return this; return this;

View File

@@ -1,6 +1,6 @@
{ {
"name": "@memegoat/frontend", "name": "@memegoat/frontend",
"version": "1.5.4", "version": "1.6.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",

View File

@@ -1,6 +1,7 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Ubuntu_Mono, Ubuntu_Sans } from "next/font/google"; import { Ubuntu_Mono, Ubuntu_Sans } from "next/font/google";
import { Toaster } from "@/components/ui/sonner"; import { Toaster } from "@/components/ui/sonner";
import { AudioProvider } from "@/providers/audio-provider";
import { AuthProvider } from "@/providers/auth-provider"; import { AuthProvider } from "@/providers/auth-provider";
import { ThemeProvider } from "@/providers/theme-provider"; import { ThemeProvider } from "@/providers/theme-provider";
import "./globals.css"; import "./globals.css";
@@ -71,8 +72,10 @@ export default function RootLayout({
disableTransitionOnChange disableTransitionOnChange
> >
<AuthProvider> <AuthProvider>
{children} <AudioProvider>
<Toaster /> {children}
<Toaster />
</AudioProvider>
</AuthProvider> </AuthProvider>
</ThemeProvider> </ThemeProvider>
</body> </body>

View File

@@ -1,13 +1,21 @@
"use client"; "use client";
import { Edit, Eye, Heart, MoreHorizontal, Share2, Trash2 } from "lucide-react"; import {
Edit,
Eye,
Heart,
MoreHorizontal,
Share2,
Trash2,
Volume2,
VolumeX,
} from "lucide-react";
import Image from "next/image"; import Image from "next/image";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/navigation"; import { useRouter } from "next/navigation";
import * as React from "react"; import * as React from "react";
import { toast } from "sonner"; import { toast } from "sonner";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"; import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { import {
Card, Card,
@@ -21,12 +29,7 @@ import {
DropdownMenuItem, DropdownMenuItem,
DropdownMenuTrigger, DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"; } from "@/components/ui/dropdown-menu";
import { import { useAudio } from "@/providers/audio-provider";
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from "@/components/ui/tooltip";
import { useAuth } from "@/providers/auth-provider"; import { useAuth } from "@/providers/auth-provider";
import { ContentService } from "@/services/content.service"; import { ContentService } from "@/services/content.service";
import { FavoriteService } from "@/services/favorite.service"; import { FavoriteService } from "@/services/favorite.service";
@@ -40,12 +43,20 @@ interface ContentCardProps {
export function ContentCard({ content, onUpdate }: ContentCardProps) { export function ContentCard({ content, onUpdate }: ContentCardProps) {
const { isAuthenticated, user } = useAuth(); const { isAuthenticated, user } = useAuth();
const { isGlobalMuted, activeVideoId, toggleGlobalMute, setActiveVideo } =
useAudio();
const router = useRouter(); const router = useRouter();
const [isLiked, setIsLiked] = React.useState(content.isLiked || false); const [isLiked, setIsLiked] = React.useState(content.isLiked || false);
const [likesCount, setLikesCount] = React.useState(content.favoritesCount); const [likesCount, setLikesCount] = React.useState(content.favoritesCount);
const [editDialogOpen, setEditDialogOpen] = React.useState(false); const [editDialogOpen, setEditDialogOpen] = React.useState(false);
const isAuthor = user?.uuid === content.authorId; const isAuthor = user?.uuid === content.authorId;
const isVideo = !content.mimeType.startsWith("image/");
const isThisVideoActive = activeVideoId === content.id;
const isMuted = isGlobalMuted || (isVideo && !isThisVideoActive);
const aspectRatio =
content.width && content.height ? content.width / content.height : 1;
React.useEffect(() => { React.useEffect(() => {
setIsLiked(content.isLiked || false); setIsLiked(content.isLiked || false);
@@ -77,6 +88,18 @@ export function ContentCard({ content, onUpdate }: ContentCardProps) {
} }
}; };
const handleToggleMute = (e: React.MouseEvent) => {
e.preventDefault();
e.stopPropagation();
if (isGlobalMuted) {
setActiveVideo(content.id);
} else if (isThisVideoActive) {
toggleGlobalMute();
} else {
setActiveVideo(content.id);
}
};
const handleUse = async (e: React.MouseEvent) => { const handleUse = async (e: React.MouseEvent) => {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@@ -107,9 +130,9 @@ export function ContentCard({ content, onUpdate }: ContentCardProps) {
return ( return (
<> <>
<Card className="overflow-hidden border-none shadow-sm hover:shadow-md transition-shadow"> <Card className="overflow-hidden border-none gap-0 shadow-none bg-transparent">
<CardHeader className="p-4 flex flex-row items-center space-y-0 gap-3"> <CardHeader className="p-3 flex flex-row items-center space-y-0 gap-3">
<Avatar className="h-8 w-8"> <Avatar className="h-8 w-8 border">
<AvatarImage src={content.author.avatarUrl} /> <AvatarImage src={content.author.avatarUrl} />
<AvatarFallback> <AvatarFallback>
{content.author.username[0].toUpperCase()} {content.author.username[0].toUpperCase()}
@@ -118,13 +141,10 @@ export function ContentCard({ content, onUpdate }: ContentCardProps) {
<div className="flex flex-col"> <div className="flex flex-col">
<Link <Link
href={`/user/${content.author.username}`} href={`/user/${content.author.username}`}
className="text-sm font-semibold hover:underline" className="text-sm font-bold hover:underline"
> >
{content.author.displayName || content.author.username} {content.author.username}
</Link> </Link>
<span className="text-xs text-muted-foreground">
{new Date(content.createdAt).toLocaleDateString("fr-FR")}
</span>
</div> </div>
<div className="ml-auto flex items-center gap-1"> <div className="ml-auto flex items-center gap-1">
@@ -158,14 +178,17 @@ export function ContentCard({ content, onUpdate }: ContentCardProps) {
</DropdownMenu> </DropdownMenu>
</div> </div>
</CardHeader> </CardHeader>
<CardContent className="p-0 relative bg-zinc-200 dark:bg-zinc-900 aspect-square sm:aspect-video md:aspect-square flex items-center justify-center"> <CardContent
className="p-0 relative bg-zinc-200 dark:bg-zinc-900 flex items-center justify-center overflow-hidden"
style={{ aspectRatio: `${aspectRatio}` }}
>
<Link href={`/meme/${content.slug}`} className="w-full h-full relative"> <Link href={`/meme/${content.slug}`} className="w-full h-full relative">
{content.mimeType.startsWith("image/") ? ( {content.mimeType.startsWith("image/") ? (
<Image <Image
src={content.url} src={content.url}
alt={content.title} alt={content.title}
fill fill
className="object-contain" className="object-cover"
sizes="(max-width: 768px) 100vw, (max-width: 1200px) 50vw, 33vw" sizes="(max-width: 768px) 100vw, (max-width: 1200px) 50vw, 33vw"
priority={false} priority={false}
/> />
@@ -174,99 +197,95 @@ export function ContentCard({ content, onUpdate }: ContentCardProps) {
src={content.url} src={content.url}
controls={false} controls={false}
autoPlay autoPlay
muted muted={isMuted}
loop loop
playsInline playsInline
className="w-full h-full object-contain" className="w-full h-full object-cover"
/> />
)} )}
</Link> </Link>
{isVideo && (
<Button
variant="ghost"
size="icon"
className="absolute bottom-2 right-2 h-8 w-8 rounded-full bg-black/50 text-white hover:bg-black/70 hover:text-white"
onClick={handleToggleMute}
>
{isMuted ? (
<VolumeX className="h-4 w-4" />
) : (
<Volume2 className="h-4 w-4" />
)}
</Button>
)}
</CardContent> </CardContent>
<CardFooter className="p-4 flex flex-col gap-4"> <CardFooter className="p-3 flex flex-col items-start gap-2">
<div className="w-full flex items-center justify-between"> <div className="w-full flex items-center justify-between">
<div className="flex items-center gap-2"> <div className="flex items-center gap-4">
<TooltipProvider> <button
<Tooltip> type="button"
<TooltipTrigger asChild> onClick={handleLike}
<Button className={`transition-transform active:scale-125 ${isLiked ? "text-red-500" : "hover:text-muted-foreground"}`}
variant="ghost" >
size="sm" <Heart className={`h-6 w-6 ${isLiked ? "fill-current" : ""}`} />
className={`gap-1.5 h-8 px-2 ${isLiked ? "text-red-500 hover:text-red-600 hover:bg-red-50 dark:hover:bg-red-950/20" : ""}`} </button>
onClick={handleLike} <div className="flex items-center gap-1.5 text-muted-foreground">
> <Eye className="h-6 w-6" />
<Heart className={`h-4 w-4 ${isLiked ? "fill-current" : ""}`} /> <span className="text-sm font-medium">{content.views}</span>
<span className="text-xs font-medium">{likesCount}</span> </div>
</Button> <button
</TooltipTrigger> type="button"
<TooltipContent>Liker</TooltipContent> onClick={() => {
</Tooltip> navigator.clipboard.writeText(
`${window.location.origin}/meme/${content.slug}`,
<Tooltip> );
<TooltipTrigger asChild> toast.success("Lien copié !");
<Button }}
variant="ghost" className="hover:text-muted-foreground"
size="sm" >
className="gap-1.5 h-8 px-2 cursor-default" <Share2 className="h-6 w-6" />
> </button>
<Eye className="h-4 w-4 text-muted-foreground" />
<span className="text-xs font-medium">{content.views}</span>
</Button>
</TooltipTrigger>
<TooltipContent>Vues</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
size="sm"
className="h-8 w-8 p-0"
onClick={() => {
navigator.clipboard.writeText(
`${window.location.origin}/meme/${content.slug}`,
);
toast.success("Lien copié !");
}}
>
<Share2 className="h-4 w-4" />
</Button>
</TooltipTrigger>
<TooltipContent>Partager</TooltipContent>
</Tooltip>
</TooltipProvider>
</div> </div>
<Button <Button
size="sm" size="sm"
variant="secondary" variant="secondary"
className="text-xs h-8 font-semibold" className="text-xs h-8 font-semibold rounded-full px-4"
onClick={handleUse} onClick={handleUse}
> >
Utiliser Utiliser
</Button> </Button>
</div> </div>
<div className="w-full space-y-2"> <div className="space-y-1">
<Link href={`/meme/${content.slug}`}> <p className="text-sm font-bold">{likesCount} J'aime</p>
<h3 className="font-semibold text-base line-clamp-2 hover:text-primary transition-colors"> <div className="text-sm leading-snug">
<Link
href={`/user/${content.author.username}`}
className="font-bold mr-2 hover:underline"
>
{content.author.username}
</Link>
<Link href={`/meme/${content.slug}`} className="break-words">
{content.title} {content.title}
</h3> </Link>
</Link> </div>
<div className="flex flex-wrap gap-1.5"> <div className="flex flex-wrap gap-1 mt-1">
{content.category && ( {content.tags.slice(0, 5).map((tag, _i) => (
<Badge variant="outline" className="text-[10px] py-0 px-2 bg-muted/50"> <Link
{content.category.name}
</Badge>
)}
{content.tags.slice(0, 3).map((tag, _i) => (
<Badge
key={typeof tag === "string" ? tag : tag.id} key={typeof tag === "string" ? tag : tag.id}
variant="secondary" href={`/?tag=${typeof tag === "string" ? tag : tag.slug}`}
className="text-[10px] py-0 px-2" className="text-xs text-blue-600 dark:text-blue-400 hover:underline"
> >
#{typeof tag === "string" ? tag : tag.name} #{typeof tag === "string" ? tag : tag.name}
</Badge> </Link>
))} ))}
</div> </div>
<p className="text-[10px] text-muted-foreground uppercase mt-1">
{new Date(content.createdAt).toLocaleDateString("fr-FR", {
day: "numeric",
month: "long",
})}
</p>
</div> </div>
</CardFooter> </CardFooter>
</Card> </Card>

View File

@@ -68,11 +68,13 @@ export function ContentList({ fetchFn, title }: ContentListProps) {
}); });
return ( return (
<div className="max-w-2xl mx-auto py-8 px-4 space-y-8"> <div className="max-w-7xl mx-auto py-8 px-4 space-y-8">
{title && <h1 className="text-2xl font-bold">{title}</h1>} {title && <h1 className="text-2xl font-bold">{title}</h1>}
<div className="flex flex-col gap-6"> <div className="columns-1 sm:columns-2 lg:columns-3 xl:columns-4 gap-6">
{contents.map((content) => ( {contents.map((content) => (
<ContentCard key={content.id} content={content} onUpdate={fetchInitial} /> <div key={content.id} className="break-inside-avoid mb-6">
<ContentCard content={content} onUpdate={fetchInitial} />
</div>
))} ))}
</div> </div>

View File

@@ -0,0 +1,45 @@
"use client";
import type React from "react";
import { createContext, useCallback, useContext, useState } from "react";
interface AudioContextType {
isGlobalMuted: boolean;
activeVideoId: string | null;
toggleGlobalMute: () => void;
setActiveVideo: (id: string | null) => void;
}
const AudioContext = createContext<AudioContextType | undefined>(undefined);
export function AudioProvider({ children }: { children: React.ReactNode }) {
const [isGlobalMuted, setIsGlobalMuted] = useState(true);
const [activeVideoId, setActiveVideoId] = useState<string | null>(null);
const toggleGlobalMute = useCallback(() => {
setIsGlobalMuted((prev) => !prev);
}, []);
const setActiveVideo = useCallback((id: string | null) => {
setActiveVideoId(id);
if (id !== null) {
setIsGlobalMuted(false);
}
}, []);
return (
<AudioContext.Provider
value={{ isGlobalMuted, activeVideoId, toggleGlobalMute, setActiveVideo }}
>
{children}
</AudioContext.Provider>
);
}
export function useAudio() {
const context = useContext(AudioContext);
if (context === undefined) {
throw new Error("useAudio must be used within an AudioProvider");
}
return context;
}

View File

@@ -1,6 +1,6 @@
{ {
"name": "@memegoat/source", "name": "@memegoat/source",
"version": "1.5.4", "version": "1.6.0",
"description": "", "description": "",
"scripts": { "scripts": {
"version:get": "cmake -P version.cmake GET", "version:get": "cmake -P version.cmake GET",