Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d613a89e63
|
||
|
|
67a10ad7d8
|
||
|
|
82e98f4fce
|
||
|
|
70a4249e41
|
||
|
|
de7d41f4a1
|
||
|
|
2da1142866
|
||
|
|
4e8e441d98
|
||
|
|
0e83de70e3
|
||
|
|
8169ef719a
|
||
|
|
7637499a97
|
||
|
|
c03ad8c221
|
||
|
|
8483927823
|
||
|
|
e7b79013fd
|
||
|
|
b6b37ebc6b
|
||
|
|
d647a585c8
|
||
|
|
6a2abf115f
|
||
|
|
ded2d3220d
|
||
|
|
162d53630d
|
||
|
|
0e8a2e3986
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@memegoat/backend",
|
||||
"version": "1.0.3",
|
||||
"version": "1.1.0",
|
||||
"description": "",
|
||||
"author": "",
|
||||
"private": true,
|
||||
|
||||
@@ -23,7 +23,7 @@ describe("ApiKeysRepository", () => {
|
||||
// biome-ignore lint/suspicious/noThenProperty: Necessary to mock Drizzle's awaitable query builder
|
||||
Object.defineProperty(obj, "then", {
|
||||
value: function (onFulfilled: (arg0: unknown) => void) {
|
||||
const result = (this as any).execute();
|
||||
const result = (this as Record<string, unknown>).execute();
|
||||
return Promise.resolve(result).then(onFulfilled);
|
||||
},
|
||||
configurable: true,
|
||||
|
||||
@@ -24,7 +24,7 @@ describe("CategoriesRepository", () => {
|
||||
// biome-ignore lint/suspicious/noThenProperty: Necessary to mock Drizzle's awaitable query builder
|
||||
Object.defineProperty(obj, "then", {
|
||||
value: function (onFulfilled: (arg0: unknown) => void) {
|
||||
const result = (this as any).execute();
|
||||
const result = (this as Record<string, unknown>).execute();
|
||||
return Promise.resolve(result).then(onFulfilled);
|
||||
},
|
||||
configurable: true,
|
||||
|
||||
@@ -21,10 +21,9 @@ describe("FavoritesRepository", () => {
|
||||
|
||||
const wrapWithThen = (obj: unknown) => {
|
||||
// biome-ignore lint/suspicious/noThenProperty: Necessary to mock Drizzle's awaitable query builder
|
||||
// biome-ignore lint/suspicious/noExplicitAny: Necessary to mock Drizzle's awaitable query builder
|
||||
Object.defineProperty(obj, "then", {
|
||||
value: function (onFulfilled: (arg0: unknown) => void) {
|
||||
const result = (this as any).execute();
|
||||
const result = (this as Record<string, unknown>).execute();
|
||||
return Promise.resolve(result).then(onFulfilled);
|
||||
},
|
||||
configurable: true,
|
||||
|
||||
@@ -49,6 +49,11 @@ describe("MediaController", () => {
|
||||
expect(stream.pipe).toHaveBeenCalledWith(res);
|
||||
});
|
||||
|
||||
it("should throw NotFoundException if path is missing", async () => {
|
||||
const res = {} as unknown as Response;
|
||||
await expect(controller.getFile("", res)).rejects.toThrow(NotFoundException);
|
||||
});
|
||||
|
||||
it("should throw NotFoundException if file is not found", async () => {
|
||||
mockS3Service.getFileInfo.mockRejectedValue(new Error("Not found"));
|
||||
const res = {} as unknown as Response;
|
||||
|
||||
@@ -1,27 +1,47 @@
|
||||
import { Controller, Get, NotFoundException, Param, Res } from "@nestjs/common";
|
||||
import {
|
||||
Controller,
|
||||
Get,
|
||||
Logger,
|
||||
NotFoundException,
|
||||
Query,
|
||||
Res,
|
||||
} from "@nestjs/common";
|
||||
import type { Response } from "express";
|
||||
import type { BucketItemStat } from "minio";
|
||||
import { S3Service } from "../s3/s3.service";
|
||||
|
||||
@Controller("media")
|
||||
export class MediaController {
|
||||
private readonly logger = new Logger(MediaController.name);
|
||||
|
||||
constructor(private readonly s3Service: S3Service) {}
|
||||
|
||||
@Get("*key")
|
||||
async getFile(@Param("key") key: string, @Res() res: Response) {
|
||||
try {
|
||||
const stats = (await this.s3Service.getFileInfo(key)) as BucketItemStat;
|
||||
const stream = await this.s3Service.getFile(key);
|
||||
@Get()
|
||||
async getFile(@Query("path") path: string, @Res() res: Response) {
|
||||
if (!path) {
|
||||
this.logger.warn("Tentative d'accès à un média sans paramètre 'path'");
|
||||
throw new NotFoundException("Paramètre 'path' manquant");
|
||||
}
|
||||
|
||||
const contentType =
|
||||
stats.metaData?.["content-type"] || "application/octet-stream";
|
||||
try {
|
||||
this.logger.log(`Récupération du fichier : ${path}`);
|
||||
const stats = (await this.s3Service.getFileInfo(path)) as BucketItemStat;
|
||||
const stream = await this.s3Service.getFile(path);
|
||||
|
||||
const contentType: string =
|
||||
stats.metaData?.["content-type"] ||
|
||||
stats.metaData?.["Content-Type"] ||
|
||||
"application/octet-stream";
|
||||
|
||||
res.setHeader("Content-Type", contentType);
|
||||
res.setHeader("Content-Length", stats.size);
|
||||
res.setHeader("Cache-Control", "public, max-age=31536000, immutable");
|
||||
|
||||
stream.pipe(res);
|
||||
} catch (_error) {
|
||||
} catch (error) {
|
||||
this.logger.error(
|
||||
`Erreur lors de la récupération du fichier ${path} : ${error.message}`,
|
||||
);
|
||||
throw new NotFoundException("Fichier non trouvé");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,10 +23,9 @@ describe("ReportsRepository", () => {
|
||||
|
||||
const wrapWithThen = (obj: unknown) => {
|
||||
// biome-ignore lint/suspicious/noThenProperty: Necessary to mock Drizzle's awaitable query builder
|
||||
// biome-ignore lint/suspicious/noExplicitAny: Necessary to mock Drizzle's awaitable query builder
|
||||
Object.defineProperty(obj, "then", {
|
||||
value: function (onFulfilled: (arg0: unknown) => void) {
|
||||
const result = (this as any).execute();
|
||||
const result = (this as Record<string, unknown>).execute();
|
||||
return Promise.resolve(result).then(onFulfilled);
|
||||
},
|
||||
configurable: true,
|
||||
|
||||
@@ -192,7 +192,7 @@ describe("S3Service", () => {
|
||||
return null;
|
||||
});
|
||||
const url = service.getPublicUrl("test.webp");
|
||||
expect(url).toBe("https://api.test.com/media/test.webp");
|
||||
expect(url).toBe("https://api.test.com/media?path=test.webp");
|
||||
});
|
||||
|
||||
it("should use DOMAIN_NAME and PORT for localhost", () => {
|
||||
@@ -205,7 +205,7 @@ describe("S3Service", () => {
|
||||
},
|
||||
);
|
||||
const url = service.getPublicUrl("test.webp");
|
||||
expect(url).toBe("http://localhost:3000/media/test.webp");
|
||||
expect(url).toBe("http://localhost:3000/media?path=test.webp");
|
||||
});
|
||||
|
||||
it("should use api.DOMAIN_NAME for production", () => {
|
||||
@@ -217,7 +217,7 @@ describe("S3Service", () => {
|
||||
},
|
||||
);
|
||||
const url = service.getPublicUrl("test.webp");
|
||||
expect(url).toBe("https://api.memegoat.fr/media/test.webp");
|
||||
expect(url).toBe("https://api.memegoat.fr/media?path=test.webp");
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -173,6 +173,6 @@ export class S3Service implements OnModuleInit, IStorageService {
|
||||
baseUrl = `https://api.${domain}`;
|
||||
}
|
||||
|
||||
return `${baseUrl}/media/${storageKey}`;
|
||||
return `${baseUrl}/media?path=${storageKey}`;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@ services:
|
||||
POSTGRES_DB: ${POSTGRES_DB:-app}
|
||||
networks:
|
||||
- nw_memegoat
|
||||
ports:
|
||||
- "127.0.0.1:5432:5432" # not exposed to WAN, LAN only for administration checkup
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
healthcheck:
|
||||
|
||||
@@ -239,7 +239,7 @@ Cette page documente tous les points de terminaison disponibles sur l'API Memego
|
||||
</Accordion>
|
||||
|
||||
<Accordion title="Médias (/media)">
|
||||
- `GET /media/*key` : Accès direct aux fichiers stockés sur S3. Supporte la mise en cache agressive.
|
||||
- `GET /media?path=key` : Accès direct aux fichiers stockés sur S3 via le paramètre `path`. Supporte la mise en cache agressive.
|
||||
</Accordion>
|
||||
|
||||
<Accordion title="Administration (/admin)">
|
||||
|
||||
@@ -24,7 +24,7 @@ Le système utilise plusieurs méthodes d'authentification sécurisées pour ré
|
||||
|
||||
Memegoat utilise une architecture de stockage d'objets compatible S3 (MinIO). Les interactions se font de deux manières :
|
||||
|
||||
1. **Proxification Backend** : Pour l'accès public via `/media/*`.
|
||||
1. **Proxification Backend** : Pour l'accès public via `/media?path=...`.
|
||||
2. **URLs Présignées** : Pour l'upload sécurisé direct depuis le client (via `/contents/upload-url`).
|
||||
|
||||
### Notifications (Mail)
|
||||
|
||||
@@ -3,6 +3,18 @@ import type { NextConfig } from "next";
|
||||
const nextConfig: NextConfig = {
|
||||
/* config options here */
|
||||
reactCompiler: true,
|
||||
images: {
|
||||
remotePatterns: [
|
||||
{
|
||||
protocol: "https",
|
||||
hostname: "memegoat.fr",
|
||||
},
|
||||
{
|
||||
protocol: "https",
|
||||
hostname: "api.memegoat.fr",
|
||||
},
|
||||
],
|
||||
},
|
||||
output: "standalone",
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@memegoat/frontend",
|
||||
"version": "1.0.3",
|
||||
"version": "1.1.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "next dev",
|
||||
|
||||
@@ -98,7 +98,7 @@ export default function AdminContentsPage() {
|
||||
<TableCell className="font-medium">
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="flex h-10 w-10 items-center justify-center rounded bg-muted">
|
||||
{content.type === "image" ? (
|
||||
{content.mimeType.startsWith("image/") ? (
|
||||
<ImageIcon className="h-5 w-5 text-muted-foreground" />
|
||||
) : (
|
||||
<Video className="h-5 w-5 text-muted-foreground" />
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import * as React from "react";
|
||||
import { AppSidebar } from "@/components/app-sidebar";
|
||||
import { MobileFilters } from "@/components/mobile-filters";
|
||||
import { ModeToggle } from "@/components/mode-toggle";
|
||||
import { SearchSidebar } from "@/components/search-sidebar";
|
||||
import {
|
||||
SidebarInset,
|
||||
@@ -8,7 +9,6 @@ import {
|
||||
SidebarTrigger,
|
||||
} from "@/components/ui/sidebar";
|
||||
import { UserNavMobile } from "@/components/user-nav-mobile";
|
||||
import { ModeToggle } from "@/components/mode-toggle";
|
||||
|
||||
export default function DashboardLayout({
|
||||
children,
|
||||
|
||||
@@ -1,7 +1,15 @@
|
||||
"use client";
|
||||
|
||||
import { zodResolver } from "@hookform/resolvers/zod";
|
||||
import { Loader2, Moon, Laptop, Palette, Save, Sun, User as UserIcon } from "lucide-react";
|
||||
import {
|
||||
Laptop,
|
||||
Loader2,
|
||||
Moon,
|
||||
Palette,
|
||||
Save,
|
||||
Sun,
|
||||
User as UserIcon,
|
||||
} from "lucide-react";
|
||||
import { useTheme } from "next-themes";
|
||||
import * as React from "react";
|
||||
import { useForm } from "react-hook-form";
|
||||
@@ -194,7 +202,7 @@ export default function SettingsPage() {
|
||||
</Form>
|
||||
</CardContent>
|
||||
</Card>
|
||||
<Card className="mt-8">
|
||||
<Card className="mt-8">
|
||||
<CardHeader>
|
||||
<div className="flex items-center gap-2">
|
||||
<Palette className="h-5 w-5 text-primary" />
|
||||
|
||||
@@ -49,6 +49,9 @@ export const metadata: Metadata = {
|
||||
images: ["/memegoat-og.png"],
|
||||
},
|
||||
icons: "/memegoat-color.svg",
|
||||
metadataBase: new URL(
|
||||
process.env.NEXT_PUBLIC_APP_URL || "https://memegoat.fr",
|
||||
),
|
||||
};
|
||||
|
||||
export default function RootLayout({
|
||||
|
||||
@@ -19,8 +19,8 @@ import {
|
||||
import Link from "next/link";
|
||||
import { usePathname, useSearchParams } from "next/navigation";
|
||||
import * as React from "react";
|
||||
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
|
||||
import { ModeToggle } from "@/components/mode-toggle";
|
||||
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
|
||||
import {
|
||||
Collapsible,
|
||||
CollapsibleContent,
|
||||
|
||||
@@ -93,9 +93,9 @@ export function ContentCard({ content }: ContentCardProps) {
|
||||
<MoreHorizontal className="h-4 w-4" />
|
||||
</Button>
|
||||
</CardHeader>
|
||||
<CardContent className="p-0 relative bg-zinc-100 dark:bg-zinc-900 aspect-square flex items-center justify-center">
|
||||
<CardContent className="p-0 relative bg-zinc-200 dark:bg-zinc-900 aspect-square flex items-center justify-center">
|
||||
<Link href={`/meme/${content.slug}`} className="w-full h-full relative">
|
||||
{content.type === "image" ? (
|
||||
{content.mimeType.startsWith("image/") ? (
|
||||
<Image
|
||||
src={content.url}
|
||||
alt={content.title}
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
import { Moon, Sun } from "lucide-react";
|
||||
import { useTheme } from "next-themes";
|
||||
import * as React from "react";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import {
|
||||
DropdownMenu,
|
||||
@@ -24,12 +23,8 @@ export function ModeToggle() {
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="end">
|
||||
<DropdownMenuItem onClick={() => setTheme("light")}>
|
||||
Clair
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem onClick={() => setTheme("dark")}>
|
||||
Sombre
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem onClick={() => setTheme("light")}>Clair</DropdownMenuItem>
|
||||
<DropdownMenuItem onClick={() => setTheme("dark")}>Sombre</DropdownMenuItem>
|
||||
<DropdownMenuItem onClick={() => setTheme("system")}>
|
||||
Système
|
||||
</DropdownMenuItem>
|
||||
|
||||
@@ -53,7 +53,10 @@ api.interceptors.response.use(
|
||||
} catch (refreshError) {
|
||||
// If refresh fails, we might want to redirect to login on the client
|
||||
if (typeof window !== "undefined") {
|
||||
window.location.href = "/login";
|
||||
// On évite de rediriger vers login si on y est déjà pour éviter les boucles
|
||||
if (!window.location.pathname.includes("/login")) {
|
||||
window.location.href = "/login";
|
||||
}
|
||||
}
|
||||
return Promise.reject(refreshError);
|
||||
}
|
||||
|
||||
@@ -26,6 +26,8 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
const router = useRouter();
|
||||
|
||||
const refreshUser = React.useCallback(async () => {
|
||||
// Éviter de lancer plusieurs refresh en même temps
|
||||
if (!isLoading) setIsLoading(true);
|
||||
try {
|
||||
const userData = await UserService.getMe();
|
||||
setUser(userData);
|
||||
@@ -34,11 +36,26 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
}, []);
|
||||
}, [isLoading]);
|
||||
|
||||
React.useEffect(() => {
|
||||
refreshUser();
|
||||
}, [refreshUser]);
|
||||
let isMounted = true;
|
||||
const initAuth = async () => {
|
||||
try {
|
||||
const userData = await UserService.getMe();
|
||||
if (isMounted) setUser(userData);
|
||||
} catch (_error) {
|
||||
if (isMounted) setUser(null);
|
||||
} finally {
|
||||
if (isMounted) setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
initAuth();
|
||||
return () => {
|
||||
isMounted = false;
|
||||
};
|
||||
}, []);
|
||||
|
||||
const login = async (email: string, password: string) => {
|
||||
try {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
"use client";
|
||||
|
||||
import type * as React from "react";
|
||||
import { ThemeProvider as NextThemesProvider } from "next-themes";
|
||||
import type * as React from "react";
|
||||
|
||||
export function ThemeProvider({
|
||||
children,
|
||||
|
||||
@@ -7,7 +7,7 @@ export interface Content {
|
||||
description?: string;
|
||||
url: string;
|
||||
thumbnailUrl?: string;
|
||||
type: "image" | "video";
|
||||
type: "meme" | "gif";
|
||||
mimeType: string;
|
||||
size: number;
|
||||
width?: number;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@memegoat/source",
|
||||
"version": "1.0.3",
|
||||
"version": "1.1.0",
|
||||
"description": "",
|
||||
"scripts": {
|
||||
"version:get": "cmake -P version.cmake GET",
|
||||
|
||||
@@ -39,6 +39,42 @@ function(increment_version CURRENT_VERSION TYPE OUT_VAR)
|
||||
set(${OUT_VAR} "${MAJOR}.${MINOR}.${PATCH}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
# Fonction pour créer un commit git pour les changements de version
|
||||
function(commit_version_changes VERSION)
|
||||
find_package(Git QUIET)
|
||||
if(GIT_FOUND)
|
||||
# On n'ajoute que les fichiers package.json modifiés
|
||||
set(ADDED_ANY FALSE)
|
||||
foreach(JSON_FILE ${PACKAGE_JSON_FILES})
|
||||
if(EXISTS "${JSON_FILE}")
|
||||
execute_process(
|
||||
COMMAND ${GIT_EXECUTABLE} add "${JSON_FILE}"
|
||||
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
|
||||
)
|
||||
set(ADDED_ANY TRUE)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
if(ADDED_ANY)
|
||||
# On commit uniquement les fichiers qui ont été ajoutés (staged)
|
||||
# L'utilisation de --only ou spécifier les fichiers à nouveau assure qu'on ne prend pas d'autres changements
|
||||
execute_process(
|
||||
COMMAND ${GIT_EXECUTABLE} commit -m "chore: bump version to ${VERSION}" -- ${PACKAGE_JSON_FILES}
|
||||
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
|
||||
RESULT_VARIABLE COMMIT_RESULT
|
||||
)
|
||||
|
||||
if(COMMIT_RESULT EQUAL 0)
|
||||
message(STATUS "Changements commités avec succès pour la version ${VERSION}")
|
||||
else()
|
||||
message(WARNING "Échec du commit des changements. Il n'y a peut-être rien à commiter ou aucun changement sur les fichiers JSON.")
|
||||
endif()
|
||||
endif()
|
||||
else()
|
||||
message(WARNING "Git non trouvé, impossible de commiter les changements.")
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
# Fonction pour créer un tag git
|
||||
function(create_git_tag VERSION)
|
||||
find_package(Git QUIET)
|
||||
@@ -73,6 +109,9 @@ function(set_new_version NEW_VERSION)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
# Commiter les changements
|
||||
commit_version_changes(${NEW_VERSION})
|
||||
|
||||
# Créer le tag git
|
||||
create_git_tag(${NEW_VERSION})
|
||||
endfunction()
|
||||
|
||||
Reference in New Issue
Block a user