Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d613a89e63
|
||
|
|
67a10ad7d8
|
||
|
|
82e98f4fce
|
||
|
|
70a4249e41
|
||
|
|
de7d41f4a1
|
||
|
|
2da1142866
|
||
|
|
4e8e441d98
|
||
|
|
0e83de70e3
|
||
|
|
8169ef719a
|
||
|
|
7637499a97
|
||
|
|
c03ad8c221
|
||
|
|
8483927823
|
||
|
|
e7b79013fd
|
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@memegoat/backend",
|
"name": "@memegoat/backend",
|
||||||
"version": "1.0.5",
|
"version": "1.1.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ describe("ApiKeysRepository", () => {
|
|||||||
// biome-ignore lint/suspicious/noThenProperty: Necessary to mock Drizzle's awaitable query builder
|
// biome-ignore lint/suspicious/noThenProperty: Necessary to mock Drizzle's awaitable query builder
|
||||||
Object.defineProperty(obj, "then", {
|
Object.defineProperty(obj, "then", {
|
||||||
value: function (onFulfilled: (arg0: unknown) => void) {
|
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);
|
return Promise.resolve(result).then(onFulfilled);
|
||||||
},
|
},
|
||||||
configurable: true,
|
configurable: true,
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ describe("CategoriesRepository", () => {
|
|||||||
// biome-ignore lint/suspicious/noThenProperty: Necessary to mock Drizzle's awaitable query builder
|
// biome-ignore lint/suspicious/noThenProperty: Necessary to mock Drizzle's awaitable query builder
|
||||||
Object.defineProperty(obj, "then", {
|
Object.defineProperty(obj, "then", {
|
||||||
value: function (onFulfilled: (arg0: unknown) => void) {
|
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);
|
return Promise.resolve(result).then(onFulfilled);
|
||||||
},
|
},
|
||||||
configurable: true,
|
configurable: true,
|
||||||
|
|||||||
@@ -21,10 +21,9 @@ describe("FavoritesRepository", () => {
|
|||||||
|
|
||||||
const wrapWithThen = (obj: unknown) => {
|
const wrapWithThen = (obj: unknown) => {
|
||||||
// biome-ignore lint/suspicious/noThenProperty: Necessary to mock Drizzle's awaitable query builder
|
// 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", {
|
Object.defineProperty(obj, "then", {
|
||||||
value: function (onFulfilled: (arg0: unknown) => void) {
|
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);
|
return Promise.resolve(result).then(onFulfilled);
|
||||||
},
|
},
|
||||||
configurable: true,
|
configurable: true,
|
||||||
|
|||||||
@@ -51,9 +51,7 @@ describe("MediaController", () => {
|
|||||||
|
|
||||||
it("should throw NotFoundException if path is missing", async () => {
|
it("should throw NotFoundException if path is missing", async () => {
|
||||||
const res = {} as unknown as Response;
|
const res = {} as unknown as Response;
|
||||||
await expect(controller.getFile("", res)).rejects.toThrow(
|
await expect(controller.getFile("", res)).rejects.toThrow(NotFoundException);
|
||||||
NotFoundException,
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should throw NotFoundException if file is not found", async () => {
|
it("should throw NotFoundException if file is not found", async () => {
|
||||||
|
|||||||
@@ -23,10 +23,9 @@ describe("ReportsRepository", () => {
|
|||||||
|
|
||||||
const wrapWithThen = (obj: unknown) => {
|
const wrapWithThen = (obj: unknown) => {
|
||||||
// biome-ignore lint/suspicious/noThenProperty: Necessary to mock Drizzle's awaitable query builder
|
// 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", {
|
Object.defineProperty(obj, "then", {
|
||||||
value: function (onFulfilled: (arg0: unknown) => void) {
|
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);
|
return Promise.resolve(result).then(onFulfilled);
|
||||||
},
|
},
|
||||||
configurable: true,
|
configurable: true,
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ services:
|
|||||||
POSTGRES_DB: ${POSTGRES_DB:-app}
|
POSTGRES_DB: ${POSTGRES_DB:-app}
|
||||||
networks:
|
networks:
|
||||||
- nw_memegoat
|
- nw_memegoat
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:5432:5432" # not exposed to WAN, LAN only for administration checkup
|
||||||
volumes:
|
volumes:
|
||||||
- postgres_data:/var/lib/postgresql/data
|
- postgres_data:/var/lib/postgresql/data
|
||||||
healthcheck:
|
healthcheck:
|
||||||
|
|||||||
@@ -3,6 +3,18 @@ import type { NextConfig } from "next";
|
|||||||
const nextConfig: NextConfig = {
|
const nextConfig: NextConfig = {
|
||||||
/* config options here */
|
/* config options here */
|
||||||
reactCompiler: true,
|
reactCompiler: true,
|
||||||
|
images: {
|
||||||
|
remotePatterns: [
|
||||||
|
{
|
||||||
|
protocol: "https",
|
||||||
|
hostname: "memegoat.fr",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
protocol: "https",
|
||||||
|
hostname: "api.memegoat.fr",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
output: "standalone",
|
output: "standalone",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@memegoat/frontend",
|
"name": "@memegoat/frontend",
|
||||||
"version": "1.0.5",
|
"version": "1.1.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ export default function AdminContentsPage() {
|
|||||||
<TableCell className="font-medium">
|
<TableCell className="font-medium">
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<div className="flex h-10 w-10 items-center justify-center rounded bg-muted">
|
<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" />
|
<ImageIcon className="h-5 w-5 text-muted-foreground" />
|
||||||
) : (
|
) : (
|
||||||
<Video className="h-5 w-5 text-muted-foreground" />
|
<Video className="h-5 w-5 text-muted-foreground" />
|
||||||
|
|||||||
@@ -49,6 +49,9 @@ export const metadata: Metadata = {
|
|||||||
images: ["/memegoat-og.png"],
|
images: ["/memegoat-og.png"],
|
||||||
},
|
},
|
||||||
icons: "/memegoat-color.svg",
|
icons: "/memegoat-color.svg",
|
||||||
|
metadataBase: new URL(
|
||||||
|
process.env.NEXT_PUBLIC_APP_URL || "https://memegoat.fr",
|
||||||
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function RootLayout({
|
export default function RootLayout({
|
||||||
|
|||||||
@@ -93,9 +93,9 @@ export function ContentCard({ content }: ContentCardProps) {
|
|||||||
<MoreHorizontal className="h-4 w-4" />
|
<MoreHorizontal className="h-4 w-4" />
|
||||||
</Button>
|
</Button>
|
||||||
</CardHeader>
|
</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">
|
<Link href={`/meme/${content.slug}`} className="w-full h-full relative">
|
||||||
{content.type === "image" ? (
|
{content.mimeType.startsWith("image/") ? (
|
||||||
<Image
|
<Image
|
||||||
src={content.url}
|
src={content.url}
|
||||||
alt={content.title}
|
alt={content.title}
|
||||||
|
|||||||
@@ -53,7 +53,10 @@ api.interceptors.response.use(
|
|||||||
} catch (refreshError) {
|
} catch (refreshError) {
|
||||||
// If refresh fails, we might want to redirect to login on the client
|
// If refresh fails, we might want to redirect to login on the client
|
||||||
if (typeof window !== "undefined") {
|
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);
|
return Promise.reject(refreshError);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
|||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
const refreshUser = React.useCallback(async () => {
|
const refreshUser = React.useCallback(async () => {
|
||||||
|
// Éviter de lancer plusieurs refresh en même temps
|
||||||
|
if (!isLoading) setIsLoading(true);
|
||||||
try {
|
try {
|
||||||
const userData = await UserService.getMe();
|
const userData = await UserService.getMe();
|
||||||
setUser(userData);
|
setUser(userData);
|
||||||
@@ -34,11 +36,26 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
|||||||
} finally {
|
} finally {
|
||||||
setIsLoading(false);
|
setIsLoading(false);
|
||||||
}
|
}
|
||||||
}, []);
|
}, [isLoading]);
|
||||||
|
|
||||||
React.useEffect(() => {
|
React.useEffect(() => {
|
||||||
refreshUser();
|
let isMounted = true;
|
||||||
}, [refreshUser]);
|
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) => {
|
const login = async (email: string, password: string) => {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ export interface Content {
|
|||||||
description?: string;
|
description?: string;
|
||||||
url: string;
|
url: string;
|
||||||
thumbnailUrl?: string;
|
thumbnailUrl?: string;
|
||||||
type: "image" | "video";
|
type: "meme" | "gif";
|
||||||
mimeType: string;
|
mimeType: string;
|
||||||
size: number;
|
size: number;
|
||||||
width?: number;
|
width?: number;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@memegoat/source",
|
"name": "@memegoat/source",
|
||||||
"version": "1.0.5",
|
"version": "1.1.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"version:get": "cmake -P version.cmake GET",
|
"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)
|
set(${OUT_VAR} "${MAJOR}.${MINOR}.${PATCH}" PARENT_SCOPE)
|
||||||
endfunction()
|
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
|
# Fonction pour créer un tag git
|
||||||
function(create_git_tag VERSION)
|
function(create_git_tag VERSION)
|
||||||
find_package(Git QUIET)
|
find_package(Git QUIET)
|
||||||
@@ -73,6 +109,9 @@ function(set_new_version NEW_VERSION)
|
|||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
# Commiter les changements
|
||||||
|
commit_version_changes(${NEW_VERSION})
|
||||||
|
|
||||||
# Créer le tag git
|
# Créer le tag git
|
||||||
create_git_tag(${NEW_VERSION})
|
create_git_tag(${NEW_VERSION})
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|||||||
Reference in New Issue
Block a user