diff --git a/backend/.dockerignore b/backend/.dockerignore
index 4c49bd7..e69de29 100644
--- a/backend/.dockerignore
+++ b/backend/.dockerignore
@@ -1 +0,0 @@
-.env
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 3fc3480..bdd94ff 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,12 +1,19 @@
-FROM golang:alpine
+FROM golang:alpine AS build
 
 WORKDIR /app
 
 COPY . .
 
 RUN go mod download
-RUN go mod tidy
 
-RUN go build main.go
+RUN go build -o /app/main .
+RUN go build -o /app/migrator ./cmd/migrate
 
-CMD ["./main"]
+FROM alpine AS final
+
+WORKDIR /app
+
+COPY .env /app/
+COPY --from=build /app/main /app/migrator /app/cmd /app/
+
+CMD ["/app/main"]
diff --git a/backend/api/media/media.go b/backend/api/media/media.go
index ab9a842..69caf0e 100644
--- a/backend/api/media/media.go
+++ b/backend/api/media/media.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"math"
 	"net/http"
+	"os"
 	"strconv"
 
 	"fr.latosa-escrima/core"
@@ -36,7 +37,8 @@ func HandleMedia(w http.ResponseWriter, r *http.Request) {
 		Model((*models.Media)(nil)).
 		Count(context.Background())
 
-	totalPages := int(math.Max(1, float64(total/limit)))
+	upperBound := float64(total) / float64(limit)
+	totalPages := int(math.Max(1, math.Ceil(upperBound)))
 
 	var media []models.Media
 	err = core.DB.NewSelect().
@@ -51,10 +53,20 @@ func HandleMedia(w http.ResponseWriter, r *http.Request) {
 		}.Respond(w, http.StatusInternalServerError)
 		return
 	}
-	baseURL := utils.GetURL(r)
+	scheme := "http"
+	if r.TLS != nil || os.Getenv("ENVIRONMENT") != "DEV" { // Check if the request is over HTTPS
+		scheme = "https"
+	}
+
+	// Extract the host
+	host := r.Host
+	baseURL := fmt.Sprintf("%s://%s", scheme, host)
+	if os.Getenv("ENVIRONMENT") != "DEV" {
+		baseURL += "/api"
+	}
 	media = utils.Map(media, func(m models.Media) models.Media {
 		m.Author = nil
-		m.URL = fmt.Sprintf("%s%s/file", baseURL, m.ID)
+		m.URL = fmt.Sprintf("%s/media/%s/file", baseURL, m.ID)
 		return m
 	})
 
diff --git a/backend/api/media/update.go b/backend/api/media/update.go
index 83e39a0..7a52895 100644
--- a/backend/api/media/update.go
+++ b/backend/api/media/update.go
@@ -1,3 +1,52 @@
 package media
 
-// TODO
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"fr.latosa-escrima/core"
+	"fr.latosa-escrima/core/models"
+	"github.com/google/uuid"
+)
+
+func HandleUpdate(w http.ResponseWriter, r *http.Request) {
+	var media models.Media
+	err := json.NewDecoder(r.Body).Decode(&media)
+	if err != nil {
+		core.JSONError{
+			Status:  core.Error,
+			Message: err.Error(),
+		}.Respond(w, http.StatusBadRequest)
+		return
+	}
+	media_uuid := r.PathValue("media_uuid")
+	media.ID, err = uuid.Parse(media_uuid)
+	if err != nil {
+		core.JSONError{
+			Status:  core.Error,
+			Message: err.Error(),
+		}.Respond(w, http.StatusBadRequest)
+		return
+	}
+
+	_, err = core.DB.NewUpdate().
+		Model(&media).
+		OmitZero().
+		WherePK().
+		Exec(context.Background())
+	if err != nil {
+		core.JSONError{
+			Status:  core.Error,
+			Message: err.Error(),
+		}.Respond(w, http.StatusInternalServerError)
+		return
+	}
+
+	core.JSONSuccess{
+		Status:  core.Success,
+		Message: "Media updated",
+		Data:    media,
+	}.Respond(w, http.StatusOK)
+
+}
diff --git a/backend/api/media_routes.go b/backend/api/media_routes.go
index 87db6f6..db5179b 100644
--- a/backend/api/media_routes.go
+++ b/backend/api/media_routes.go
@@ -14,7 +14,7 @@ var MediaRoutes = map[string]core.Handler{
 		Middlewares: []core.Middleware{Methods("POST"), AuthJWT},
 	},
 	// Paginated media response
-	"/media/": {
+	"/media": {
 		Handler:     media.HandleMedia,
 		Middlewares: []core.Middleware{Methods("GET")},
 	},
@@ -28,10 +28,10 @@ var MediaRoutes = map[string]core.Handler{
 		Handler:     media.HandleMediaFile,
 		Middlewares: []core.Middleware{Methods("GET")},
 	},
-	// "/media/{media_uuid}/update": {
-	// 	Handler:     HandleGetMediaFile,
-	// 	Middlewares: []core.Middleware{Methods("PATCH"), AuthJWT},
-	// },
+	"/media/{media_uuid}/update": {
+		Handler:     media.HandleUpdate,
+		Middlewares: []core.Middleware{Methods("PATCH"), AuthJWT},
+	},
 	"/media/{media_uuid}/delete": {
 		Handler:     media.HandleDelete,
 		Middlewares: []core.Middleware{Methods("DELETE"), AuthJWT},
diff --git a/backend/api/roles_routes.go b/backend/api/roles_routes.go
index 9fc844f..bcc9ae9 100644
--- a/backend/api/roles_routes.go
+++ b/backend/api/roles_routes.go
@@ -6,7 +6,7 @@ import (
 )
 
 var RolesRoutes = map[string]core.Handler{
-	"/roles/": {
+	"/roles": {
 		Handler:     roles.HandleRoles,
 		Middlewares: []core.Middleware{Methods("GET"), AuthJWT},
 	},
diff --git a/backend/api/shortcodes/shortcode.go b/backend/api/shortcodes/shortcode.go
index 893a020..3ca69d3 100644
--- a/backend/api/shortcodes/shortcode.go
+++ b/backend/api/shortcodes/shortcode.go
@@ -2,7 +2,9 @@ package shortcodes
 
 import (
 	"context"
+	"fmt"
 	"net/http"
+	"os"
 
 	"fr.latosa-escrima/core"
 	"fr.latosa-escrima/core/models"
@@ -11,11 +13,21 @@ import (
 func HandleShortcode(w http.ResponseWriter, r *http.Request) {
 	code := r.PathValue("shortcode")
 	var shortcode models.Shortcode
-	err := core.DB.NewSelect().
+	count, err := core.DB.NewSelect().
 		Model(&shortcode).
 		Where("code = ?", code).
+		Relation("Media").
 		Limit(1).
-		Scan(context.Background())
+		ScanAndCount(context.Background())
+
+	if count == 0 {
+		core.JSONSuccess{
+			Status:  core.Success,
+			Message: "Shortcode has not been found",
+		}.Respond(w, http.StatusNotFound)
+		return
+	}
+
 	if err != nil {
 		core.JSONError{
 			Status:  core.Error,
@@ -24,6 +36,20 @@ func HandleShortcode(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	scheme := "http"
+	if r.TLS != nil { // Check if the request is over HTTPS
+		scheme = "https"
+	}
+
+	// Extract the host
+	host := r.Host
+	baseURL := fmt.Sprintf("%s://%s", scheme, host)
+	if os.Getenv("ENVIRONMENT") != "DEV" {
+		baseURL += "/api"
+	}
+	if shortcode.Media != nil {
+		shortcode.Media.URL = fmt.Sprintf("%s/media/%s/file", baseURL, shortcode.Media.ID)
+	}
 	core.JSONSuccess{
 		Status:  core.Success,
 		Message: "Shortcode found",
diff --git a/backend/api/shortcodes_routes.go b/backend/api/shortcodes_routes.go
index 2d5cbfd..08cb2ee 100644
--- a/backend/api/shortcodes_routes.go
+++ b/backend/api/shortcodes_routes.go
@@ -10,7 +10,7 @@ var ShortcodesRoutes = map[string]core.Handler{
 		Handler:     shortcodes.HandleNew,
 		Middlewares: []core.Middleware{Methods("POST"), AuthJWT},
 	},
-	"/shortcodes/": {
+	"/shortcodes": {
 		Handler:     shortcodes.HandleShortcodes,
 		Middlewares: []core.Middleware{Methods("GET"), AuthJWT},
 	},
diff --git a/backend/cmd/migrate/migrations/20250205081449_add_events_title.down.sql b/backend/cmd/migrate/migrations/20250205081449_add_events_title.down.sql
new file mode 100644
index 0000000..08f950c
--- /dev/null
+++ b/backend/cmd/migrate/migrations/20250205081449_add_events_title.down.sql
@@ -0,0 +1 @@
+ALTER TABLE events DROP COLUMN title;
diff --git a/backend/cmd/migrate/migrations/20250205081449_add_events_title.up.sql b/backend/cmd/migrate/migrations/20250205081449_add_events_title.up.sql
new file mode 100644
index 0000000..d1da967
--- /dev/null
+++ b/backend/cmd/migrate/migrations/20250205081449_add_events_title.up.sql
@@ -0,0 +1 @@
+ALTER TABLE events ADD COLUMN title text not null default '';
diff --git a/backend/cmd/migrate/migrations/20250210084555_add_events_columns.go b/backend/cmd/migrate/migrations/20250210084555_add_events_columns.go
new file mode 100644
index 0000000..35ea0c7
--- /dev/null
+++ b/backend/cmd/migrate/migrations/20250210084555_add_events_columns.go
@@ -0,0 +1,61 @@
+package migrations
+
+import (
+	"context"
+	"fmt"
+
+	"fr.latosa-escrima/core/models"
+	"github.com/uptrace/bun"
+)
+
+func init() {
+	Migrations.MustRegister(func(ctx context.Context, db *bun.DB) error {
+		fmt.Print(" [up migration] ")
+		_, err := db.NewAddColumn().
+			Model((*models.Event)(nil)).
+			ColumnExpr("full_day BOOLEAN NOT NULL DEFAULT FALSE").
+			Exec(ctx)
+		if err != nil {
+			return err
+		}
+
+		// Add "is_visible" column
+		_, err = db.NewAddColumn().
+			Model((*models.Event)(nil)).
+			ColumnExpr("is_visible BOOLEAN NOT NULL DEFAULT TRUE").
+			Exec(ctx)
+		if err != nil {
+			return err
+		}
+
+		// Add "rrule" column
+		_, err = db.NewAddColumn().
+			Model((*models.Event)(nil)).
+			ColumnExpr("rrule TEXT").
+			Exec(ctx)
+		return err
+	}, func(ctx context.Context, db *bun.DB) error {
+		fmt.Print(" [down migration] ")
+		_, err := db.NewDropColumn().
+			Model((*models.Event)(nil)).
+			Column("full_day").
+			Exec(ctx)
+		if err != nil {
+			return err
+		}
+
+		_, err = db.NewDropColumn().
+			Model((*models.Event)(nil)).
+			Column("is_visible").
+			Exec(ctx)
+		if err != nil {
+			return err
+		}
+
+		_, err = db.NewDropColumn().
+			Model((*models.Event)(nil)).
+			Column("rrule").
+			Exec(ctx)
+		return err
+	})
+}
diff --git a/backend/cmd/migrate/migrations/20250213101006_remove_status_events.go b/backend/cmd/migrate/migrations/20250213101006_remove_status_events.go
new file mode 100644
index 0000000..31b4343
--- /dev/null
+++ b/backend/cmd/migrate/migrations/20250213101006_remove_status_events.go
@@ -0,0 +1,23 @@
+package migrations
+
+import (
+	"context"
+	"fmt"
+
+	"fr.latosa-escrima/core/models"
+	"github.com/uptrace/bun"
+)
+
+func init() {
+	Migrations.MustRegister(func(ctx context.Context, db *bun.DB) error {
+		fmt.Print(" [up migration] ")
+		_, err := db.NewDropColumn().
+			Model((*models.Event)(nil)).
+			ColumnExpr("status").
+			Exec(ctx)
+		return err
+	}, func(ctx context.Context, db *bun.DB) error {
+		fmt.Print(" [down migration] ")
+		return nil
+	})
+}
diff --git a/backend/core/models/events.go b/backend/core/models/events.go
index fc5c9b4..ad3054b 100644
--- a/backend/core/models/events.go
+++ b/backend/core/models/events.go
@@ -11,11 +11,11 @@ type Event struct {
 	bun.BaseModel `bun:"table:events"`
 
 	EventID       uuid.UUID `bun:"event_id,type:uuid,pk,default:gen_random_uuid()" json:"id"`
-	Title		  string    `bun:"title,notnull" json:"title"`
+	Title         string    `bun:"title,notnull" json:"title"`
 	CreationDate  time.Time `bun:"creation_date,notnull,default:current_timestamp" json:"creationDate"`
 	ScheduleStart time.Time `bun:"schedule_start,notnull" json:"start"`
 	ScheduleEnd   time.Time `bun:"schedule_end,notnull" json:"end"`
-	FullDay		  bool      `bun:"full_day,notnull,default:false" json:"fullDay"`
-	IsVisible	  bool      `bun:"is_visible,notnull,default:true" json:"isVisible"`
-	Rrule		  string    `bun:"rrule" json:"rrule"` 
+	FullDay       bool      `bun:"full_day,notnull,default:false" json:"fullDay"`
+	IsVisible     bool      `bun:"is_visible,notnull,default:true" json:"isVisible"`
+	Rrule         string    `bun:"rrule" json:"rrule"`
 }
diff --git a/backend/utils/get_url.go b/backend/utils/get_url.go
index d6bf868..b01948d 100644
--- a/backend/utils/get_url.go
+++ b/backend/utils/get_url.go
@@ -3,6 +3,7 @@ package utils
 import (
 	"fmt"
 	"net/http"
+	"os"
 )
 
 func GetURL(r *http.Request) string {
@@ -17,7 +18,10 @@ func GetURL(r *http.Request) string {
 	// Get the full request URI (path + query string)
 	fullPath := r.URL.Path
 
+	if os.Getenv("ENVIRONMENT") != "DEVELOPMENT" {
+		fullPath += "/api/"
+	}
+
 	// Build the full request URL
 	return fmt.Sprintf("%s://%s%s", scheme, host, fullPath)
 }
-
diff --git a/docker-compose.yaml b/docker-compose.yaml
index f8839af..f5b80bc 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,10 +1,11 @@
 services:
   latosa-escrima.fr-frontend:
     container_name: latosa-frontend
-    # image: cems.dev:5000/latosa-escrima.fr:latest
-    build:
-      context: ./frontend/
-      dockerfile: Dockerfile
+    image: cems.dev:5000/latosa-escrima.fr:latest
+    #build:
+    #  context: ./frontend/
+    #  dockerfile: Dockerfile
+    #  target: final
     depends_on:
       - latosa-escrima.fr-backend
     env_file: .env
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 33b45ca..1f1bce1 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -11,11 +11,11 @@ WORKDIR /app
 # Install dependencies based on the preferred package manager
 COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* .npmrc* ./
 RUN \
-  if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
-  elif [ -f package-lock.json ]; then npm ci; \
-  elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i --frozen-lockfile; \
-  else echo "Lockfile not found." && exit 1; \
-  fi
+	if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
+	elif [ -f package-lock.json ]; then npm ci --force; \
+	elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i --frozen-lockfile; \
+	else echo "Lockfile not found." && exit 1; \
+	fi
 
 
 # Rebuild the source code only when needed
@@ -30,11 +30,11 @@ COPY . .
 # ENV NEXT_TELEMETRY_DISABLED=1
 
 RUN \
-  if [ -f yarn.lock ]; then yarn run build; \
-  elif [ -f package-lock.json ]; then npm run build; \
-  elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm run build; \
-  else echo "Lockfile not found." && exit 1; \
-  fi
+	if [ -f yarn.lock ]; then yarn run build; \
+	elif [ -f package-lock.json ]; then npm run build; \
+	elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm run build; \
+	else echo "Lockfile not found." && exit 1; \
+	fi
 
 # Production image, copy all the files and run next
 FROM base AS runner
diff --git a/frontend/app/(auth)/dashboard/blogs/new/page.tsx b/frontend/app/(auth)/dashboard/blogs/new/page.tsx
new file mode 100644
index 0000000..a1aa279
--- /dev/null
+++ b/frontend/app/(auth)/dashboard/blogs/new/page.tsx
@@ -0,0 +1,144 @@
+"use client";
+
+import { Textarea } from "@/components/ui/textarea";
+import { useEffect, useRef, useState } from "react";
+import { marked } from "marked";
+import DOMPurify from "isomorphic-dompurify";
+import { Button } from "@/components/ui/button";
+import { Bold, Italic, Strikethrough, Underline } from "lucide-react";
+
+enum Command {
+	Italic = "*",
+	Bold = "**",
+	Strikethrough = "~~",
+	Underline = "__",
+}
+
+export default function NewBlog() {
+	const ref = useRef<HTMLTextAreaElement>(null);
+	const [text, setText] = useState("");
+	const [cursor, setCursor] = useState<{ line: number; column: number }>({
+		line: 0,
+		column: 0,
+	});
+	const [selection, setSelection] = useState<{
+		start: number;
+		end: number;
+	} | null>(null);
+
+	const getCursorPosition = (
+		event: React.ChangeEvent<HTMLTextAreaElement>,
+	) => {
+		const textarea = event.target;
+		const text = textarea.value;
+		const cursorPos = textarea.selectionStart;
+
+		const lines = text.substring(0, cursorPos).split("\n");
+		const line = lines.length; // Current line number (1-based)
+		const column = lines[lines.length - 1].length + 1; // Current column (1-based)
+
+		setCursor({ line, column });
+	};
+
+	const onSelect = (event: React.ChangeEvent<HTMLTextAreaElement>) => {
+		const { selectionStart, selectionEnd } = event.currentTarget;
+		if (selectionStart === selectionEnd) return;
+
+		setSelection({ start: selectionStart, end: selectionEnd });
+	};
+
+	useEffect(() => {
+		setSelection(null);
+	}, [text]);
+
+	const moveCursor = (newPos: number) => {
+		if (!ref.current) return;
+		ref.current.selectionEnd = newPos;
+		ref.current.focus();
+	};
+
+	const execCommand = (command: Command, symetry: boolean = true) => {
+		if (selection) {
+			const selectedText = text.substring(selection.start, selection.end);
+			const pre = text.slice(0, selection.start);
+			const post = text.slice(selection.end);
+			const newSelectedText = `${command}${selectedText}${symetry ? command : ""}`;
+			setText(pre + newSelectedText + post);
+			return;
+		}
+
+		const pre = text.slice(0, cursor.column);
+		const post = text.slice(cursor.column);
+
+		if (!symetry) setText(pre + command + post);
+		else {
+			const t = pre + command + command + post;
+			setText(t);
+		}
+		console.log(pre.length + command.length);
+		moveCursor(cursor.column + 2);
+	};
+
+	const sanitized = DOMPurify.sanitize(marked(text, { async: false }));
+
+	return (
+		<section className="flex">
+			<div>
+				<div className="flex gap-2 mb-2 border-b pb-2">
+					<Button
+						variant="outline"
+						size="icon"
+						onClick={() => execCommand(Command.Bold)}
+					>
+						<Bold size={16} />
+					</Button>
+					<Button
+						variant="outline"
+						size="icon"
+						onClick={() => execCommand(Command.Italic)}
+					>
+						<Italic size={16} />
+					</Button>
+					<Button
+						variant="outline"
+						size="icon"
+						onClick={() => execCommand(Command.Underline)}
+					>
+						<Underline size={16} />
+					</Button>
+					<Button
+						variant="outline"
+						size="icon"
+						onClick={() => execCommand(Command.Strikethrough)}
+					>
+						<Strikethrough size={16} />
+					</Button>
+					{/*<Button variant="outline" size="icon" onClick={handleLink}>
+						<Link size={16} />
+					</Button> */}
+				</div>
+				<Textarea
+					ref={ref}
+					value={text}
+					onSelect={(e: React.ChangeEvent<HTMLTextAreaElement>) => {
+						getCursorPosition(e);
+						onSelect(e);
+					}}
+					onChange={(e) => setText(e.currentTarget.value)}
+				/>
+				<div>
+					Line: {cursor.line}; Column: {cursor.column}
+					<br />
+					Selection: Start {selection?.start} End {selection?.end}
+				</div>
+			</div>
+			<div
+				className="mt-4 p-2 bg-gray-100 border rounded-md text-sm text-black"
+				dangerouslySetInnerHTML={{
+					// @ts-ignore
+					__html: sanitized,
+				}}
+			></div>
+		</section>
+	);
+}
diff --git a/frontend/app/(auth)/dashboard/members/[uuid]/page.tsx b/frontend/app/(auth)/dashboard/members/[uuid]/page.tsx
new file mode 100644
index 0000000..5c6b08c
--- /dev/null
+++ b/frontend/app/(auth)/dashboard/members/[uuid]/page.tsx
@@ -0,0 +1,221 @@
+"use client";
+
+import { UserIcon, Building, X } from "lucide-react";
+
+import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
+import { Badge } from "@/components/ui/badge";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import { Role, User } from "@/types/types";
+import { useParams } from "next/navigation";
+import { useApi } from "@/hooks/use-api";
+import { useState } from "react";
+import request from "@/lib/request";
+
+export default function UserDetailsPage() {
+	const { uuid } = useParams<{ uuid: string }>();
+	const user = useApi<User>(`/users/${uuid}`, {}, true);
+
+	const availableRoles = useApi<Role[]>("/roles", {}, true);
+	availableRoles.data ??= [];
+	const [selectedRole, setSelectedRole] = useState<Role | null>(null);
+	// const [selectedOrg, setSelectedOrg] = useState("");
+
+	const addRole = async (role: Role) => {
+		const res = await request(
+			`/users/${user.data?.userId}/roles/${role.id}/add`,
+			{ method: "PATCH", requiresAuth: true },
+		);
+		if (res.status === "Success") {
+			setSelectedRole(null);
+			user.mutate();
+		}
+	};
+
+	const removeRole = async (role: Role) => {
+		const res = await request(
+			`/users/${user.data?.userId}/roles/${role.id}/remove`,
+			{ method: "PATCH", requiresAuth: true },
+		);
+		if (res.status === "Success") user.mutate();
+	};
+
+	const addOrganization = () => {
+		// if (selectedOrg && !user.organizations.includes(selectedOrg)) {
+		// 	setUser((prevUser) => ({
+		// 		...prevUser,
+		// 		organizations: [...prevUser.organizations, selectedOrg],
+		// 	}));
+		// 	setSelectedOrg("");
+		// }
+	};
+
+	const removeOrganization = (orgToRemove: string) => {
+		// setUser((prevUser) => ({
+		// 	...prevUser,
+		// 	organizations: prevUser.organizations.filter(
+		// 		(org) => org !== orgToRemove,
+		// 	),
+		// }));
+	};
+
+	if (!user.data || !user.success) return <p>Error</p>;
+
+	return (
+		<div className="container mx-auto py-10">
+			<Card>
+				<CardContent className="pt-6">
+					<div className="grid gap-6">
+						<div className="flex items-center space-x-4">
+							<UserIcon className="h-12 w-12 text-gray-400" />
+							<div>
+								<h2 className="text-xl font-semibold">
+									{user.data.firstname} {user.data.lastname}
+								</h2>
+								<p className="text-sm text-gray-500">
+									{user.data.email}
+								</p>
+							</div>
+						</div>
+
+						<div className="grid gap-6 md:grid-cols-2">
+							<div>
+								<h3 className="text-lg font-semibold mb-2">
+									Rôles
+								</h3>
+								<div className="flex flex-wrap gap-2">
+									{user.data.roles?.map((role) => (
+										<Badge
+											key={role.id}
+											variant="secondary"
+											className="text-sm py-1 px-2"
+										>
+											{role.name}
+											<button
+												onClick={() => removeRole(role)}
+												className="ml-2 text-gray-500 hover:text-gray-700"
+											>
+												<X className="h-3 w-3" />
+											</button>
+										</Badge>
+									))}
+								</div>
+
+								<div className="mt-2 flex space-x-2">
+									<Select
+										value={
+											selectedRole
+												? selectedRole.name
+												: ""
+										}
+										onValueChange={(s) => {
+											const r = availableRoles.data?.find(
+												(r) => r.name === s,
+											);
+											console.log(r);
+											if (r) setSelectedRole(r);
+										}}
+									>
+										<SelectTrigger className="w-[180px]">
+											<SelectValue placeholder="Sélectionner un rôle" />
+										</SelectTrigger>
+										<SelectContent>
+											{availableRoles.data
+												.filter(
+													(org) =>
+														!user.data?.roles?.includes(
+															org,
+														),
+												)
+												.map((role) => (
+													<SelectItem
+														key={role.id}
+														value={role.name}
+													>
+														{role.name}
+													</SelectItem>
+												))}
+										</SelectContent>
+									</Select>
+									<Button
+										disabled={!user.data || !selectedRole}
+										onClick={() => addRole(selectedRole!)}
+										className="flex items-center"
+									>
+										<Building className="mr-2 h-4 w-4" />
+										Ajouter le rôle
+									</Button>
+								</div>
+							</div>
+
+							{/*<div>
+								<h3 className="text-lg font-semibold mb-2">
+									Organizations
+								</h3>
+								<div className="flex flex-wrap gap-2">
+									{user.data.organizations.map((org) => (
+										<Badge
+											key={org}
+											variant="outline"
+											className="text-sm py-1 px-2"
+										>
+											{org}
+											<button
+												onClick={() =>
+													removeOrganization(org)
+												}
+												className="ml-2 text-gray-500 hover:text-gray-700"
+											>
+												<X className="h-3 w-3" />
+											</button>
+										</Badge>
+									))}
+								</div>
+								<div className="mt-2 flex space-x-2">
+									<Select
+										value={selectedOrg}
+										onValueChange={setSelectedOrg}
+									>
+										<SelectTrigger className="w-[180px]">
+											<SelectValue placeholder="Select an organization" />
+										</SelectTrigger>
+										<SelectContent>
+											{availableOrganizations
+												.filter(
+													(org) =>
+														!user.organizations.includes(
+															org,
+														),
+												)
+												.map((org) => (
+													<SelectItem
+														key={org}
+														value={org}
+													>
+														{org}
+													</SelectItem>
+												))}
+										</SelectContent>
+									</Select>
+									<Button
+										onClick={addOrganization}
+										className="flex items-center"
+									>
+										<Building className="mr-2 h-4 w-4" />
+										Add Org
+									</Button>
+								</div>
+							</div> */}
+						</div>
+					</div>
+				</CardContent>
+			</Card>
+		</div>
+	);
+}
diff --git a/frontend/app/(auth)/dashboard/planning/page.tsx b/frontend/app/(auth)/dashboard/planning/page.tsx
new file mode 100644
index 0000000..4079b32
--- /dev/null
+++ b/frontend/app/(auth)/dashboard/planning/page.tsx
@@ -0,0 +1,25 @@
+"use client";
+
+import Planning from "@/components/planning";
+import { useApi } from "@/hooks/use-api";
+import ICalendarEvent from "@/interfaces/ICalendarEvent";
+import { Loader2 } from "lucide-react";
+
+export default function Page() {
+	const {
+		data: requestedEvents,
+		isLoading,
+		success,
+		mutate,
+	} = useApi<ICalendarEvent[]>("/events", undefined, false, false);
+
+	if (isLoading) return <Loader2 className="animate-spin" />;
+	if (success)
+		return (
+			<Planning
+				modifiable
+				events={requestedEvents ?? []}
+				mutate={mutate}
+			/>
+		);
+}
diff --git a/frontend/app/(auth)/dashboard/settings/media/old.tsx b/frontend/app/(auth)/dashboard/settings/media/old.tsx
deleted file mode 100644
index 8d4a453..0000000
--- a/frontend/app/(auth)/dashboard/settings/media/old.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-"use client";
-import useFileUpload from "@/hooks/use-file-upload";
-import { ChangeEvent } from "react";
-
-const MyComponent = () => {
-	const { progress, isUploading, error, uploadFile, cancelUpload } =
-		useFileUpload();
-
-	const handleFileUpload = (event: ChangeEvent<HTMLInputElement>) => {
-		const file = event.target.files?.[0];
-		if (file) {
-			uploadFile(file, "/media/upload", (response) => {
-				console.log("Upload success:", response);
-			});
-		}
-	};
-
-	return (
-		<div>
-			<input type="file" onChange={handleFileUpload} />
-			{isUploading && <p>Uploading... {progress}%</p>}
-			{error && <p>Error: {error}</p>}
-			<button onClick={cancelUpload} disabled={!isUploading}>
-				Cancel Upload
-			</button>
-		</div>
-	);
-};
-
-export default MyComponent;
diff --git a/frontend/app/(auth)/dashboard/settings/media/page.tsx b/frontend/app/(auth)/dashboard/settings/media/page.tsx
index e332e63..0775abd 100644
--- a/frontend/app/(auth)/dashboard/settings/media/page.tsx
+++ b/frontend/app/(auth)/dashboard/settings/media/page.tsx
@@ -16,7 +16,7 @@ import { PhotoDialog } from "@/components/photo-dialog";
 import useFileUpload from "@/hooks/use-file-upload";
 import useMedia from "@/hooks/use-media";
 import Media from "@/interfaces/Media";
-import useApiMutation, { request } from "@/hooks/use-api";
+import request from "@/lib/request";
 
 export default function PhotoGallery() {
 	const {
@@ -40,8 +40,22 @@ export default function PhotoGallery() {
 		});
 	};
 
-	const handleUpdatePhoto = (updatedPhoto: Omit<Media, "id">) => {
+	const handleUpdatePhoto = async (
+		body: Media | Omit<Media, "id">,
+		file: File,
+	) => {
 		if (selectedPhoto) {
+			const res = await request<Media>(
+				`/media/${selectedPhoto.id}/update`,
+				{
+					method: "PATCH",
+					requiresAuth: true,
+					body,
+				},
+			);
+			if (res.status === "Success") {
+				mutate();
+			}
 		}
 		setSelectedPhoto(null);
 	};
diff --git a/frontend/app/(auth)/dashboard/settings/roles/page.tsx b/frontend/app/(auth)/dashboard/settings/roles/page.tsx
index 6e3702f..e31e8b4 100644
--- a/frontend/app/(auth)/dashboard/settings/roles/page.tsx
+++ b/frontend/app/(auth)/dashboard/settings/roles/page.tsx
@@ -15,7 +15,8 @@ import {
 } from "@/components/ui/dialog";
 import { ChevronDown, ChevronRight, Plus, Trash2 } from "lucide-react";
 import { toTitleCase } from "@/lib/utils";
-import { request, useApi } from "@/hooks/use-api";
+import { useApi } from "@/hooks/use-api";
+import request from "@/lib/request";
 
 type Action = string;
 
diff --git a/frontend/app/(auth)/dashboard/settings/shortcodes/page.tsx b/frontend/app/(auth)/dashboard/settings/shortcodes/page.tsx
index cd508f9..c585d19 100644
--- a/frontend/app/(auth)/dashboard/settings/shortcodes/page.tsx
+++ b/frontend/app/(auth)/dashboard/settings/shortcodes/page.tsx
@@ -3,7 +3,8 @@
 import { useState } from "react";
 import { ShortcodeTable } from "@/components/shortcodes-table";
 import type IShortcode from "@/interfaces/IShortcode";
-import { request, useApi } from "@/hooks/use-api";
+import { useApi } from "@/hooks/use-api";
+import request from "@/lib/request";
 import { Loader2 } from "lucide-react";
 
 export default function ShortcodesPage() {
@@ -15,6 +16,8 @@ export default function ShortcodesPage() {
 		success,
 	} = useApi<IShortcode[]>("/shortcodes", undefined, true);
 
+	console.log(shortcodes);
+
 	const handleUpdate = async (updatedShortcode: IShortcode) => {
 		const res = await request<IShortcode>(
 			`/shortcodes/${updatedShortcode.code}/update`,
diff --git a/frontend/app/(main)/about/page.tsx b/frontend/app/(main)/about/page.tsx
index 4bf4064..2d2e9e0 100644
--- a/frontend/app/(main)/about/page.tsx
+++ b/frontend/app/(main)/about/page.tsx
@@ -1,4 +1,4 @@
-"use server";
+export const dynamic = "force-dynamic"; // Prevents static rendering
 
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -10,7 +10,7 @@ import {
 	CardHeader,
 	CardTitle,
 } from "@/components/ui/card";
-import { Avatar, AvatarFallback, AvatarImage } from "@radix-ui/react-avatar";
+import getShortcode from "@/lib/getShortcode";
 import { CheckIcon } from "lucide-react";
 
 export default async function About() {
@@ -21,13 +21,17 @@ export default async function About() {
 			</Button>
 		</a>
 	);
+
+	const profileImage = await getShortcode("profile_image");
+
 	return (
 		<>
 			<div className="">
-				<div className="flex flex-col lg:flex-row gap-4 justify-between w-full p-12">
-					<div className="flex flex-col lg:w-1/2 xl:w-full gap-4 w-full justify-center">
-						<Card className="py-5 max-h-fit">
-							<CardHeader className="text-center p-2">
+				<div className="grid grid-cols-1 lg:grid-cols-3 gap-4 w-full p-12 items-stretch">
+					{/* Text Section - Takes 2/3 on large screens */}
+					<div className="lg:col-span-2 flex flex-col justify-center">
+						<Card className="h-full">
+							<CardHeader className="text-center p-4">
 								<CardTitle className="text-5xl">
 									Nicolas GORUK
 								</CardTitle>
@@ -38,10 +42,10 @@ export default async function About() {
 							</CardHeader>
 							<CardContent className="px-8 sm:px-10 py-14">
 								<div className="flex flex-col gap-4 justify-center">
-									<h2 className="text-pretty text-center text-xl font-semibold md:mb-0.5 lg:mb-1 lg:max-w-3xl sm:text-3xl">
+									<h2 className="text-center text-xl font-semibold sm:text-3xl">
 										Lorem ipsum, dolor sit amet
 									</h2>
-									<p className="blog-paragraph text-muted-foreground">
+									<p className="text-muted-foreground">
 										Lorem ipsum dolor sit amet consectetur
 										adipisicing elit. Debitis accusamus
 										illum, nam nemo quod delectus velit
@@ -49,10 +53,10 @@ export default async function About() {
 										aliquam atque praesentium ea placeat ad,
 										neque eveniet adipisci?
 									</p>
-									<h2 className="text-pretty text-center text-xl font-semibold md:mb-0.5 lg:mb-1 lg:max-w-3xl sm:text-3xl">
+									<h2 className="text-center text-xl font-semibold sm:text-3xl">
 										Lorem ipsum, dolor sit amet
 									</h2>
-									<p className="blog-paragraph text-muted-foreground">
+									<p className="text-muted-foreground">
 										Lorem ipsum dolor sit amet consectetur
 										adipisicing elit. Debitis accusamus
 										illum, nam nemo quod delectus velit
@@ -64,10 +68,15 @@ export default async function About() {
 							</CardContent>
 						</Card>
 					</div>
-					<div className="w-full lg:w-1/2 border rounded">
+
+					{/* Image Section - Takes 1/3 on large screens */}
+					<div className="lg:col-span-1 flex items-center">
 						<img
-							className="w-full aspect-square"
-							src="https://shadcnblocks.com/images/block/placeholder-dark-1.svg"
+							className="w-full h-full object-cover rounded"
+							src={
+								profileImage?.media?.url ??
+								"https://shadcnblocks.com/images/block/placeholder-dark-1.svg"
+							}
 							alt="president profile image"
 						/>
 					</div>
diff --git a/frontend/app/(main)/gallery/page.tsx b/frontend/app/(main)/gallery/page.tsx
new file mode 100644
index 0000000..83206c4
--- /dev/null
+++ b/frontend/app/(main)/gallery/page.tsx
@@ -0,0 +1,118 @@
+"use client";
+
+import Image from "next/image";
+import {
+	Pagination,
+	PaginationContent,
+	PaginationItem,
+	PaginationLink,
+	PaginationNext,
+	PaginationPrevious,
+} from "@/components/ui/pagination";
+import useMedia from "@/hooks/use-media";
+import { Loader2 } from "lucide-react";
+import Lightbox from "yet-another-react-lightbox";
+import "yet-another-react-lightbox/styles.css";
+import Zoom from "yet-another-react-lightbox/plugins/zoom";
+import { useState } from "react";
+
+export default function PhotoGallery() {
+	const {
+		data,
+		error: mediaError,
+		isLoading,
+		success,
+		setPage,
+		setLimit,
+		mutate,
+	} = useMedia();
+
+	const [index, setIndex] = useState<number | null>(null);
+
+	return (
+		<div className="container mx-auto px-4 py-8">
+			<div className="flex justify-between items-center mb-8">
+				<h1 className="text-3xl font-bold">Gallerie Photo</h1>
+			</div>
+			{isLoading ? (
+				<div className="flex w-full h-full justify-center">
+					<Loader2 className="animate-spin" />
+				</div>
+			) : (
+				<div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
+					{data?.items.map((photo, idx) => (
+						<div
+							key={photo.id}
+							className="aspect-square overflow-hidden rounded-lg shadow-md cursor-pointer"
+							onClick={() => setIndex(idx)}
+						>
+							<Image
+								src={photo.url || "/placeholder.svg"}
+								alt={photo.alt}
+								width={300}
+								height={300}
+								unoptimized
+								className="w-full h-full object-cover"
+							/>
+						</div>
+					))}
+					<Lightbox
+						open={index !== null}
+						close={() => setIndex(null)}
+						slides={data?.items.map((i) => ({ src: i.url }))}
+						index={index ?? 0}
+						plugins={[Zoom]}
+					/>
+				</div>
+			)}
+			<Pagination className="mt-8">
+				<PaginationContent>
+					<PaginationItem>
+						<PaginationPrevious
+							href="#"
+							onClick={(e) => {
+								e.preventDefault();
+								setPage((prev) => Math.max(prev - 1, 1));
+							}}
+							className={
+								data?.page === 1
+									? "pointer-events-none opacity-50"
+									: ""
+							}
+						/>
+					</PaginationItem>
+					{[...Array(data?.totalPages)].map((_, i) => (
+						<PaginationItem key={i + 1}>
+							<PaginationLink
+								href="#"
+								onClick={(e) => {
+									e.preventDefault();
+									setPage(i + 1);
+								}}
+								isActive={data?.page === i + 1}
+							>
+								{i + 1}
+							</PaginationLink>
+						</PaginationItem>
+					))}
+					<PaginationItem>
+						<PaginationNext
+							href="#"
+							onClick={(e) => {
+								e.preventDefault();
+								setPage((prev) =>
+									Math.min(prev + 1, data?.totalPages ?? 1),
+								);
+							}}
+							className={
+								data?.page === data?.totalPages
+									? "pointer-events-none opacity-50"
+									: ""
+							}
+						/>
+					</PaginationItem>
+				</PaginationContent>
+			</Pagination>
+		</div>
+	);
+}
diff --git a/frontend/app/(main)/page.tsx b/frontend/app/(main)/page.tsx
index d584290..4f9e88c 100644
--- a/frontend/app/(main)/page.tsx
+++ b/frontend/app/(main)/page.tsx
@@ -1,23 +1,36 @@
-"use server";
-
+export const dynamic = "force-dynamic"; // Prevents static rendering
 import Features, { FeatureItem } from "@/components/features";
 import Gallery from "@/components/gallery";
 import Hero from "@/components/hero";
+import HomepageGalleryItems from "@/components/homepage-gallery";
 import Testimonial from "@/components/testimonial";
 import { CarouselItem } from "@/components/ui/carousel";
 import YouTubeEmbed from "@/components/youtube-embed";
 import { IYoutube } from "@/interfaces/youtube";
+import getShortcode from "@/lib/getShortcode";
+
+const PLAYLIST_ID = "PLh8PxbpRguvNlmarfGkCTAd-UVAG4QpE9";
 
 export default async function Home() {
 	let videos: IYoutube | null = null;
 	if (process.env.YOUTUBE_API_KEY) {
-		const query = `https://www.googleapis.com/youtube/v3/search?key=${process.env.YOUTUBE_API_KEY}&channelId=UCzuFLl5I0WxSMqbeMaiq_FQ&part=snippet,id&order=date&maxResults=50`;
+		const query = `https://www.googleapis.com/youtube/v3/playlistItems?key=${process.env.YOUTUBE_API_KEY}&playlistId=${PLAYLIST_ID}&part=snippet,id&maxResults=50`;
 		const res = await fetch(query);
 		videos = await res.json();
 	}
+	console.log(videos);
+	const hero = await getShortcode("hero_image");
+	const systemEvolution = await getShortcode("evolution_systeme");
+	const fondations = await getShortcode("fondements");
+	const todaysPrinciples = await getShortcode("aujourdhui");
 	return (
 		<main>
-			<Hero />
+			<Hero
+				background={
+					hero?.media?.url ??
+					"https://shadcnblocks.com/images/block/placeholder-2.svg"
+				}
+			/>
 			<div className="p-12">
 				<YouTubeEmbed
 					loadIframe
@@ -36,7 +49,10 @@ export default async function Home() {
 					<FeatureItem
 						title="Les Fondements de Latosa Escrima Concepts"
 						position="left"
-						image="https://shadcnblocks.com/images/block/placeholder-2.svg"
+						image={
+							fondations?.media?.url ??
+							"https://shadcnblocks.com/images/block/placeholder-2.svg"
+						}
 					>
 						<ol className="flex list-decimal flex-col gap-4 text-justify">
 							<li>
@@ -72,7 +88,10 @@ export default async function Home() {
 					<FeatureItem
 						title="L’Évolution du Système"
 						position="right"
-						image="https://shadcnblocks.com/images/block/placeholder-2.svg"
+						image={
+							systemEvolution?.media?.url ??
+							"https://shadcnblocks.com/images/block/placeholder-2.svg"
+						}
 					>
 						<ol className="flex list-none flex-col gap-4 text-justify">
 							<li>
@@ -117,7 +136,10 @@ export default async function Home() {
 					<FeatureItem
 						title="Les Principes du Système Aujourd’hui"
 						position="left"
-						image="https://shadcnblocks.com/images/block/placeholder-2.svg"
+						image={
+							todaysPrinciples?.media?.url ??
+							"https://shadcnblocks.com/images/block/placeholder-2.svg"
+						}
 					>
 						Latosa Escrima Concepts repose sur cinq concepts
 						fondamentaux :
@@ -131,11 +153,13 @@ export default async function Home() {
 					</FeatureItem>
 				</Features>
 				<Gallery
-					tagLine="Tag Line"
-					cta="Book a demo"
-					ctaHref="#"
-					title="Gallery"
-				/>
+					tagLine=""
+					cta="Voir toutes les photos"
+					ctaHref="/gallery"
+					title="Gallerie"
+				>
+					<HomepageGalleryItems />
+				</Gallery>
 				{videos && (
 					<Gallery
 						tagLine=""
@@ -144,9 +168,13 @@ export default async function Home() {
 						title="Vidéos YouTube"
 					>
 						{videos.items.map((video) => {
+							const id =
+								typeof video.id !== "string"
+									? video.id.videoId
+									: video.snippet.resourceId.videoId;
 							return (
 								<CarouselItem
-									key={video.id.videoId}
+									key={id}
 									className="pl-[20px] md:max-w-[452px]"
 								>
 									<YouTubeEmbed video={video} />
diff --git a/frontend/app/(main)/planning/page.tsx b/frontend/app/(main)/planning/page.tsx
index a4a5cc6..be4f6b7 100644
--- a/frontend/app/(main)/planning/page.tsx
+++ b/frontend/app/(main)/planning/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 import Planning from "@/components/planning";
 import { useApi } from "@/hooks/use-api";
-import { type CalendarEventExternal } from "@schedule-x/calendar";
+import ICalendarEvent from "@/interfaces/ICalendarEvent";
 import { Loader2 } from "lucide-react";
 
 const Page = () => {
@@ -10,7 +10,7 @@ const Page = () => {
 		isLoading,
 		success,
 		mutate,
-	} = useApi<CalendarEventExternal[]>("/events", undefined, false, false);
+	} = useApi<ICalendarEvent[]>("/events", undefined, false, false);
 
 	if (isLoading) return <Loader2 className="animate-spin" />;
 	if (success)
diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx
index d7c8acf..097be39 100644
--- a/frontend/app/layout.tsx
+++ b/frontend/app/layout.tsx
@@ -3,6 +3,7 @@ import { Geist, Geist_Mono } from "next/font/google";
 import "@/app/globals.css";
 import SWRLayout from "@/components/layouts/swr-layout";
 import { ThemeProvider } from "@/components/ThemeProvider";
+import { Toaster } from "@/components/ui/toaster";
 
 const geistSans = Geist({
 	variable: "--font-geist-sans",
@@ -47,6 +48,7 @@ export default function RootLayout({
 					disableTransitionOnChange
 				>
 					<SWRLayout>{children}</SWRLayout>
+					<Toaster />
 				</ThemeProvider>
 			</body>
 		</html>
diff --git a/frontend/components/app-sidebar.tsx b/frontend/components/app-sidebar.tsx
index 15bbbf2..f73ad33 100644
--- a/frontend/components/app-sidebar.tsx
+++ b/frontend/components/app-sidebar.tsx
@@ -63,8 +63,14 @@ const data = {
 		},
 		{
 			title: "Planning",
-			url: "/dashboard/planning",
 			icon: Calendar,
+			url: "/dashboard/planning",
+			items: [
+				{
+					title: "Planning",
+					url: "/dashboard/planning",
+				},
+			],
 		},
 		{
 			title: "Blogs",
diff --git a/frontend/components/contact.tsx b/frontend/components/contact.tsx
index dfb9526..7465cb9 100644
--- a/frontend/components/contact.tsx
+++ b/frontend/components/contact.tsx
@@ -3,8 +3,8 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Textarea } from "@/components/ui/textarea";
-import { ApiResponse } from "@/hooks/use-api";
 import { API_URL } from "@/lib/constants";
+import { ApiResponse } from "@/types/types";
 import { useEffect, useState } from "react";
 
 interface FormData {
diff --git a/frontend/components/event-dialog.tsx b/frontend/components/event-dialog.tsx
index 5072a4a..ff7fbbe 100644
--- a/frontend/components/event-dialog.tsx
+++ b/frontend/components/event-dialog.tsx
@@ -1,23 +1,44 @@
-"use client"
+"use client";
 
-import * as React from "react"
-import { CalendarIcon } from "lucide-react"
-import { format } from "date-fns"
-import { zodResolver } from "@hookform/resolvers/zod"
-import * as z from "zod"
-import { cn } from "@/lib/utils"
-import { Button } from "@/components/ui/button"
-import { Calendar } from "@/components/ui/calendar"
-import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form"
-import { Input } from "@/components/ui/input"
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"
-import { Checkbox } from "@/components/ui/checkbox"
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
-import { useForm } from "react-hook-form"
+import * as React from "react";
+import { CalendarIcon } from "lucide-react";
+import { format } from "date-fns";
+import { zodResolver } from "@hookform/resolvers/zod";
+import * as z from "zod";
+import { cn } from "@/lib/utils";
+import { Button } from "@/components/ui/button";
+import { Calendar } from "@/components/ui/calendar";
 import {
-	CalendarEventExternal,
-} from "@schedule-x/calendar";
-import ICalendarEvent from "@/interfaces/ICalendarEvent"
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import {
+	Popover,
+	PopoverContent,
+	PopoverTrigger,
+} from "@/components/ui/popover";
+import { Checkbox } from "@/components/ui/checkbox";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import {
+	SubmitErrorHandler,
+	SubmitHandler,
+	useForm,
+	UseFormReturn,
+} from "react-hook-form";
+import { CalendarEventExternal } from "@schedule-x/calendar";
+import ICalendarEvent from "@/interfaces/ICalendarEvent";
+import { useEffect } from "react";
 
 export const eventFormSchema = z.object({
 	title: z.string().min(1, "Titre requis"),
@@ -33,254 +54,325 @@ export const eventFormSchema = z.object({
 	frequency: z.enum(["unique", "quotidien", "hebdomadaire", "mensuel"]),
 	frequencyEndDate: z.date().optional(),
 	isVisible: z.boolean().default(true),
-})
+});
 
-export type EventFormValues = z.infer<typeof eventFormSchema>
+export type EventFormValues = z.infer<typeof eventFormSchema>;
 
 const frequencies = [
 	{ label: "Unique", value: "unique" },
 	{ label: "Quotidien", value: "quotidien" },
 	{ label: "Hebdomadaire", value: "hebdomadaire" },
 	{ label: "Mensuel", value: "mensuel" },
-]
+];
 
-const isCalendarEventExternal = (event: CalendarEventExternal | Omit<CalendarEventExternal, "id">): event is CalendarEventExternal => {
-  return (event as CalendarEventExternal).id !== undefined;
+const isCalendarEventExternal = (
+	event: CalendarEventExternal | Omit<CalendarEventExternal, "id">,
+): event is CalendarEventExternal => {
+	return (event as CalendarEventExternal).id !== undefined;
 };
 
-export const EventForm: React.FC<
-	{
-		event: ICalendarEvent | Omit<ICalendarEvent, "id">;
-		onSubmitEvent: (eventFormValues: EventFormValues) => void;
-	}
-> = ({
-	event,
-	onSubmitEvent,
-}) => {
-		
-		const form =  useForm<EventFormValues>({
-			resolver: zodResolver(eventFormSchema),
-			defaultValues: {
-				title:		event.title ? event.title : "",
-				startDate:	new Date(), // event.start),
-				startTime:	`${new Date(event.start).getHours()}:${new Date(event.start).getMinutes()}`,
-				endDate:    new Date(), // event.end),
-				endTime:	`${new Date(event.end).getHours()}:${new Date(event.end).getMinutes()}`,
-				fullDay:	event.fullday,
-				frequency:	"unique",
-				isVisible:  event.isVisible,
-			},
-		}) 	
+export const EventForm: React.FC<{
+	event: ICalendarEvent | Omit<ICalendarEvent, "id">;
+	setForm: React.Dispatch<
+		React.SetStateAction<UseFormReturn<EventFormValues> | undefined>
+	>;
+}> = ({ event, setForm }) => {
+	const _start = new Date(event.start ?? Date.now());
+	const _end = new Date(event.end ?? Date.now());
+	const form = useForm<EventFormValues>({
+		resolver: zodResolver(eventFormSchema),
+		defaultValues: {
+			title: event.title ? event.title : "",
+			startDate: _start, // event.start),
+			startTime: format(_start, "HH:mm"),
+			endDate: _end, // event.end),
+			endTime: format(_end, "HH:mm"),
+			fullDay: event.fullday,
+			frequency: "unique",
+			isVisible: event.isVisible,
+		},
+	});
 
-		const frequency = form.watch("frequency")
+	useEffect(() => {
+		setForm(form);
+	}, []);
 
-		async function onSubmit(data: EventFormValues) {
-			try {
-				const validatedData = eventFormSchema.parse(data)
-				onSubmitEvent(validatedData)
-			} catch (error) {
-				console.error("On submit error : ", error)
-			}
-		}
+	const frequency = form.watch("frequency");
 
-		return (
-			<Form {...form}>
-				<form onSubmit={form.handleSubmit(onSubmit)} className="w-full max-w-md space-y-4">
+	return (
+		<Form {...form}>
+			<form className="w-full max-w-md space-y-4">
+				<FormField
+					control={form.control}
+					name="title"
+					render={({ field }) => (
+						<FormItem>
+							<FormLabel>Titre</FormLabel>
+							<FormControl>
+								<Input
+									placeholder="Ajouter un titre"
+									{...field}
+								/>
+							</FormControl>
+							<FormMessage />
+						</FormItem>
+					)}
+				/>
+
+				<div className="grid grid-cols-[1fr,auto,1fr] items-end gap-2">
 					<FormField
 						control={form.control}
-						name="title"
+						name="startDate"
+						render={({ field }) => (
+							<FormItem className="flex flex-col">
+								<FormLabel>Début</FormLabel>
+								<Popover>
+									<PopoverTrigger asChild>
+										<FormControl>
+											<Button
+												variant="outline"
+												className={cn(
+													"w-full pl-3 text-left font-normal",
+													!field.value &&
+														"text-muted-foreground",
+												)}
+											>
+												{field.value ? (
+													format(
+														field.value,
+														"dd/MM/yyyy",
+													)
+												) : (
+													<span>
+														Choisis une date
+													</span>
+												)}
+												<CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
+											</Button>
+										</FormControl>
+									</PopoverTrigger>
+									<PopoverContent
+										className="w-auto p-0"
+										align="start"
+									>
+										<Calendar
+											mode="single"
+											selected={field.value}
+											onSelect={field.onChange}
+											initialFocus
+										/>
+									</PopoverContent>
+								</Popover>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+
+					<FormField
+						control={form.control}
+						name="startTime"
 						render={({ field }) => (
 							<FormItem>
-								<FormLabel>Titre</FormLabel>
 								<FormControl>
-									<Input placeholder="Ajouter un titre" {...field} />
-								</FormControl>
-								<FormMessage />
-							</FormItem>
-						)}
-					/>
-
-					<div className="grid grid-cols-[1fr,auto,1fr] items-end gap-2">
-						<FormField
-							control={form.control}
-							name="startDate"
-							render={({ field }) => (
-								<FormItem className="flex flex-col">
-									<FormLabel>Début</FormLabel>
-									<Popover>
-										<PopoverTrigger asChild>
-											<FormControl>
-												<Button
-													variant="outline"
-													className={cn("w-full pl-3 text-left font-normal", !field.value && "text-muted-foreground")}
-												>
-													{field.value ? format(field.value, "yyyy-mm-dd hh:mm") : <span>Choisis une date</span>}
-													<CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
-												</Button>
-											</FormControl>
-										</PopoverTrigger>
-										<PopoverContent className="w-auto p-0" align="start">
-											<Calendar mode="single" selected={field.value} onSelect={field.onChange} initialFocus />
-										</PopoverContent>
-									</Popover>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<FormField
-							control={form.control}
-							name="startTime"
-							render={({ field }) => (
-								<FormItem>
-									<FormControl>
-										<Input type="time" {...field} className="w-[120px]" />
-									</FormControl>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<span className="invisible">Until</span>
-
-						<FormField
-							control={form.control}
-							name="endDate"
-							render={({ field }) => (
-								<FormItem className="flex flex-col">
-									<FormLabel>Fin</FormLabel>
-									<Popover>
-										<PopoverTrigger asChild>
-											<FormControl>
-												<Button
-													variant="outline"
-													className={cn("w-full pl-3 text-left font-normal", !field.value && "text-muted-foreground")}
-												>
-													{field.value ? format(field.value,  "yyyy-mm-dd hh:mm") : <span>Choisis une date</span>}
-													<CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
-												</Button>
-											</FormControl>
-										</PopoverTrigger>
-										<PopoverContent className="w-auto p-0" align="start">
-											<Calendar mode="single" selected={field.value} onSelect={field.onChange} initialFocus />
-										</PopoverContent>
-									</Popover>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<FormField
-							control={form.control}
-							name="endTime"
-							render={({ field }) => (
-								<FormItem>
-									<FormControl>
-										<Input type="time" {...field} className="w-[120px]" />
-									</FormControl>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-					</div>
-
-					<FormField
-						control={form.control}
-						name="fullDay"
-						render={({ field }) => (
-							<FormItem className="flex flex-row items-start space-x-3 space-y-0">
-								<FormControl>
-									<Checkbox checked={field.value} onCheckedChange={field.onChange} />
-								</FormControl>
-								<FormLabel>Journée complète</FormLabel>
-								<FormMessage />
-							</FormItem>
-						)}
-					/>
-
-					<div className="flex gap-4 items-end">
-						<FormField
-							control={form.control}
-							name="frequency"
-							render={({ field }) => (
-								<FormItem className="flex-1">
-									<FormLabel>Fréquence</FormLabel>
-									<Select onValueChange={field.onChange} defaultValue={field.value}>
-										<FormControl>
-											<SelectTrigger>
-												<SelectValue placeholder="Selectionner Fréquence" />
-											</SelectTrigger>
-										</FormControl>
-										<SelectContent>
-											{frequencies.map((frequency) => (
-												<SelectItem key={frequency.value} value={frequency.value}>
-													{frequency.label}
-												</SelectItem>
-											))}
-										</SelectContent>
-									</Select>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						{frequency !== "unique" && (
-							<FormField
-								control={form.control}
-								name="frequencyEndDate"
-								render={({ field }) => (
-									<FormItem className="flex-1">
-										<FormLabel>Jusqu'au</FormLabel>
-										<Popover>
-											<PopoverTrigger asChild>
-												<FormControl>
-													<Button
-														variant="outline"
-														className={cn("w-full pl-3 text-left font-normal", !field.value && "text-muted-foreground")}
-													>
-														{field.value ? format(field.value, "MM/dd/yyyy") : <span>Choisis une date</span>}
-														<CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
-													</Button>
-												</FormControl>
-											</PopoverTrigger>
-											<PopoverContent className="w-auto p-0" align="start">
-												<Calendar mode="single" selected={field.value} onSelect={field.onChange} initialFocus />
-											</PopoverContent>
-										</Popover>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						)}
-					</div>
-
-					<FormField
-						control={form.control}
-						name="isVisible"
-						render={({ field }) => (
-							<FormItem className="flex-1">
-								<FormLabel className="align-sub">Evènement visible ?</FormLabel>
-								<FormControl>
-									<Checkbox className="m-3 align-top justify-center"
-										checked={field.value}
-										onCheckedChange={field.onChange}
+									<Input
+										type="time"
+										{...field}
+										className="w-[120px]"
 									/>
 								</FormControl>
 								<FormMessage />
 							</FormItem>
 						)}
 					/>
-					<div className="flex justify-end space-x-2">
-						<Button variant="outline" type="button">
-							Abandonner
-						</Button>
-						<Button type="submit" className="bg-[#6B4EFF] hover:bg-[#5B3FEF]">
-							Sauvegarder
-						</Button>
-					</div>
-				</form>
-			</Form>
-		)
-	}
 
+					<span className="invisible">Until</span>
 
+					<FormField
+						control={form.control}
+						name="endDate"
+						render={({ field }) => (
+							<FormItem className="flex flex-col">
+								<FormLabel>Fin</FormLabel>
+								<Popover>
+									<PopoverTrigger asChild>
+										<FormControl>
+											<Button
+												variant="outline"
+												className={cn(
+													"w-full pl-3 text-left font-normal",
+													!field.value &&
+														"text-muted-foreground",
+												)}
+											>
+												{field.value ? (
+													format(
+														field.value,
+														"dd/MM/yyyy",
+													)
+												) : (
+													<span>
+														Choisis une date
+													</span>
+												)}
+												<CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
+											</Button>
+										</FormControl>
+									</PopoverTrigger>
+									<PopoverContent
+										className="w-auto p-0"
+										align="start"
+									>
+										<Calendar
+											mode="single"
+											selected={field.value}
+											onSelect={field.onChange}
+											initialFocus
+										/>
+									</PopoverContent>
+								</Popover>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+
+					<FormField
+						control={form.control}
+						name="endTime"
+						render={({ field }) => (
+							<FormItem>
+								<FormControl>
+									<Input
+										type="time"
+										{...field}
+										className="w-[120px]"
+									/>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+				</div>
+
+				<FormField
+					control={form.control}
+					name="fullDay"
+					render={({ field }) => (
+						<FormItem className="flex flex-row items-start space-x-3 space-y-0">
+							<FormControl>
+								<Checkbox
+									checked={field.value}
+									onCheckedChange={field.onChange}
+								/>
+							</FormControl>
+							<FormLabel>Journée complète</FormLabel>
+							<FormMessage />
+						</FormItem>
+					)}
+				/>
+
+				<div className="flex gap-4 items-end">
+					<FormField
+						control={form.control}
+						name="frequency"
+						render={({ field }) => (
+							<FormItem className="flex-1">
+								<FormLabel>Fréquence</FormLabel>
+								<Select
+									onValueChange={field.onChange}
+									defaultValue={field.value}
+								>
+									<FormControl>
+										<SelectTrigger>
+											<SelectValue placeholder="Selectionner Fréquence" />
+										</SelectTrigger>
+									</FormControl>
+									<SelectContent>
+										{frequencies.map((frequency) => (
+											<SelectItem
+												key={frequency.value}
+												value={frequency.value}
+											>
+												{frequency.label}
+											</SelectItem>
+										))}
+									</SelectContent>
+								</Select>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+
+					{frequency !== "unique" && (
+						<FormField
+							control={form.control}
+							name="frequencyEndDate"
+							render={({ field }) => (
+								<FormItem className="flex-1">
+									<FormLabel>Jusqu'au</FormLabel>
+									<Popover>
+										<PopoverTrigger asChild>
+											<FormControl>
+												<Button
+													variant="outline"
+													className={cn(
+														"w-full pl-3 text-left font-normal",
+														!field.value &&
+															"text-muted-foreground",
+													)}
+												>
+													{field.value ? (
+														format(
+															field.value,
+															"dd/MM/yyyy",
+														)
+													) : (
+														<span>
+															Choisis une date
+														</span>
+													)}
+													<CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
+												</Button>
+											</FormControl>
+										</PopoverTrigger>
+										<PopoverContent
+											className="w-auto p-0"
+											align="start"
+										>
+											<Calendar
+												mode="single"
+												selected={field.value}
+												onSelect={field.onChange}
+												initialFocus
+											/>
+										</PopoverContent>
+									</Popover>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+					)}
+				</div>
+
+				<FormField
+					control={form.control}
+					name="isVisible"
+					render={({ field }) => (
+						<FormItem className="flex-1">
+							<FormLabel className="align-sub">
+								Evènement visible ?
+							</FormLabel>
+							<FormControl>
+								<Checkbox
+									className="m-3 align-top justify-center"
+									checked={field.value}
+									onCheckedChange={field.onChange}
+								/>
+							</FormControl>
+							<FormMessage />
+						</FormItem>
+					)}
+				/>
+			</form>
+		</Form>
+	);
+};
diff --git a/frontend/components/hero.tsx b/frontend/components/hero.tsx
index f9e3cb4..629799a 100644
--- a/frontend/components/hero.tsx
+++ b/frontend/components/hero.tsx
@@ -2,12 +2,24 @@ import { ExternalLink } from "lucide-react";
 
 import { Button } from "@/components/ui/button";
 import Link from "next/link";
+import { API_URL } from "@/lib/constants";
+import Image from "next/image";
 
-const Hero = () => {
+const Hero: React.FC<{ background: string }> = ({ background }) => {
 	return (
 		<section className="relative flex h-[calc(100vh-68px)] items-center justify-center overflow-hidden py-32">
 			<div className="">
-				<div className="magicpattern absolute inset-x-0 top-0 -z-10 flex h-full w-full items-center justify-center bg-blue-50 opacity-100" />
+				<Image
+					src={background}
+					layout="fill"
+					// objectFit="cover"
+					priority
+					alt="Hero image"
+					unoptimized
+					className="grayscale object-cover "
+				/>
+				{/* Gradient and Blur Overlay */}
+				<div className="absolute inset-0 bg-gradient-to-r from-transparent via-transparent to-transparent bg-opacity-30 backdrop-blur-sm"></div>
 				<div className="mx-auto flex max-w-5xl flex-col items-center">
 					<div className="z-10 flex flex-col items-center gap-6 text-center">
 						<img
@@ -16,10 +28,12 @@ const Hero = () => {
 							className="h-16"
 						/>
 						<div>
-							<h1 className="mb-6 text-pretty text-2xl font-bold text-primary lg:text-5xl">
-								Trouvez votre équilibre
+							<h1 className="mb-6 text-pretty text-2xl font-bold text-primary lg:text-5xl font-times">
+								Trouvez votre <em>équilibre</em> avec
 								<br />
-								avec Latosa-Escrima
+								<span className="font-extrabold text-3xl lg:text-6xl">
+									Latosa Escrima
+								</span>
 							</h1>
 							<p className="text-muted-foreground lg:text-xl">
 								Une évolution des arts martiaux Philippins
diff --git a/frontend/components/homepage-gallery.tsx b/frontend/components/homepage-gallery.tsx
new file mode 100644
index 0000000..2b199e0
--- /dev/null
+++ b/frontend/components/homepage-gallery.tsx
@@ -0,0 +1,59 @@
+"use client";
+
+import useMedia from "@/hooks/use-media";
+import { CarouselItem } from "./ui/carousel";
+import { Loader2 } from "lucide-react";
+import { useState } from "react";
+import Lightbox, { SlideImage } from "yet-another-react-lightbox";
+import "yet-another-react-lightbox/styles.css";
+import Zoom from "yet-another-react-lightbox/plugins/zoom";
+
+export default function HomepageGalleryItems() {
+	const {
+		data,
+		error,
+		mutate,
+		setPage,
+		success,
+		setLimit,
+		isLoading,
+		isValidating,
+	} = useMedia(20);
+
+	const [index, setIndex] = useState<number | null>(null);
+
+	if (isLoading) {
+		return (
+			<div className="flex justify-center w-full h-full">
+				<Loader2 className="animate-spin" />
+			</div>
+		);
+	}
+
+	return (
+		<>
+			{data?.items.map((i, idx) => (
+				<CarouselItem
+					key={i.id}
+					onClick={() => setIndex(idx)}
+					className="pl-[20px] md:max-w-[452px] cursor-pointer"
+				>
+					<div className="w-full aspect-square">
+						<img
+							src={i.url}
+							alt={i.alt}
+							className="inset-0 border rounded-sm w-full h-full object-cover"
+						/>
+					</div>
+				</CarouselItem>
+			))}
+			<Lightbox
+				open={index !== null}
+				close={() => setIndex(null)}
+				slides={data?.items.map((i) => ({ src: i.url }))}
+				index={index ?? 0}
+				plugins={[Zoom]}
+			/>
+		</>
+	);
+}
diff --git a/frontend/components/login-form.tsx b/frontend/components/login-form.tsx
index 8876f73..427d62a 100644
--- a/frontend/components/login-form.tsx
+++ b/frontend/components/login-form.tsx
@@ -3,12 +3,10 @@ import { cn } from "@/lib/utils";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { useRouter } from "next/navigation";
 import useLogin from "@/hooks/use-login";
 import { Loader2 } from "lucide-react";
-import { API_URL } from "@/lib/constants";
-import { ApiResponse } from "@/hooks/use-api";
 
 export function LoginForm({
 	className,
diff --git a/frontend/components/members-table.tsx b/frontend/components/members-table.tsx
index dacb454..898d619 100644
--- a/frontend/components/members-table.tsx
+++ b/frontend/components/members-table.tsx
@@ -13,8 +13,8 @@ import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import MemberDialog, { Member } from "./member-dialog";
-import * as z from "zod";
-import { request, useApi } from "@/hooks/use-api";
+import { useApi } from "@/hooks/use-api";
+import request from "@/lib/request";
 import {
 	CircleX,
 	Loader2,
@@ -22,6 +22,7 @@ import {
 	UserRoundPen,
 	UserRoundPlus,
 } from "lucide-react";
+import Link from "next/link";
 
 export default function MembersTable() {
 	const {
@@ -107,7 +108,7 @@ export default function MembersTable() {
 							<TableRow>
 								{selectMode && (
 									<TableHead className="w-[50px]">
-										Selectionner
+										Sélectionner
 									</TableHead>
 								)}
 								<TableHead>Prénom</TableHead>
@@ -140,9 +141,23 @@ export default function MembersTable() {
 											</TableCell>
 										)}
 										<TableCell>
-											{member.firstname}
+											<Link
+												href={`/dashboard/members/${member.userId}`}
+											>
+												<span className="underline">
+													{member.firstname}
+												</span>
+											</Link>
+										</TableCell>
+										<TableCell>
+											<Link
+												href={`/dashboard/members/${member.userId}`}
+											>
+												<span className="underline">
+													{member.lastname}
+												</span>
+											</Link>
 										</TableCell>
-										<TableCell>{member.lastname}</TableCell>
 										<TableCell>{member.email}</TableCell>
 										<TableCell>{member.phone}</TableCell>
 										<TableCell>{member.role}</TableCell>
diff --git a/frontend/components/nav-bar.css b/frontend/components/nav-bar.css
new file mode 100644
index 0000000..4883708
--- /dev/null
+++ b/frontend/components/nav-bar.css
@@ -0,0 +1,15 @@
+.animate-header-slide-down-fade {
+	animation: header-slide-down-fade 1s ease-in-out;
+}
+
+@keyframes header-slide-down-fade {
+	0% {
+		opacity: 0;
+		transform: translateY(-16px);
+	}
+
+	to {
+		opacity: 1;
+		transform: translateY(0);
+	}
+}
diff --git a/frontend/components/nav-bar.tsx b/frontend/components/nav-bar.tsx
index d3fab0b..db463c3 100644
--- a/frontend/components/nav-bar.tsx
+++ b/frontend/components/nav-bar.tsx
@@ -1,14 +1,8 @@
 "use client";
-import { Book, Menu, Sunset, Trees, Zap } from "lucide-react";
+import { Menu } from "lucide-react";
 
 import { cn } from "@/lib/utils";
 
-import {
-	Accordion,
-	AccordionContent,
-	AccordionItem,
-	AccordionTrigger,
-} from "@/components/ui/accordion";
 import { Button, buttonVariants } from "@/components/ui/button";
 import { navigationMenuTriggerStyle } from "@/components/ui/navigation-menu";
 import {
@@ -22,53 +16,27 @@ import Link from "next/link";
 import { deleteCookie, getCookie } from "cookies-next";
 import { useEffect, useState } from "react";
 import { ThemeSwitcher } from "./theme-switcher";
+import "./nav-bar.css";
 
-const subMenuItemsOne = [
-	{
-		title: "Blog",
-		description: "The latest industry news, updates, and info",
-		icon: <Book className="size-5 shrink-0" />,
-	},
-	{
-		title: "Compnay",
-		description: "Our mission is to innovate and empower the world",
-		icon: <Trees className="size-5 shrink-0" />,
-	},
-	{
-		title: "Careers",
-		description: "Browse job listing and discover our workspace",
-		icon: <Sunset className="size-5 shrink-0" />,
-	},
-	{
-		title: "Support",
-		description:
-			"Get in touch with our support team or visit our community forums",
-		icon: <Zap className="size-5 shrink-0" />,
-	},
-];
-
-const subMenuItemsTwo = [
-	{
-		title: "Help Center",
-		description: "Get all the answers you need right here",
-		icon: <Zap className="size-5 shrink-0" />,
-	},
-	{
-		title: "Contact Us",
-		description: "We are here to help you with any questions you have",
-		icon: <Sunset className="size-5 shrink-0" />,
-	},
-	{
-		title: "Status",
-		description: "Check the current status of our services and APIs",
-		icon: <Trees className="size-5 shrink-0" />,
-	},
-	{
-		title: "Terms of Service",
-		description: "Our terms and conditions for using our services",
-		icon: <Book className="size-5 shrink-0" />,
-	},
-];
+const Href: React.FC<React.PropsWithChildren<{ href: string }>> = ({
+	href,
+	children,
+}) => {
+	return (
+		<Link
+			className={cn(
+				"text-foreground font-bold",
+				navigationMenuTriggerStyle,
+				buttonVariants({
+					variant: "ghost",
+				}),
+			)}
+			href={href}
+		>
+			{children}
+		</Link>
+	);
+};
 
 const Navbar = () => {
 	const [cookie, setCookie] = useState<string | null>(null);
@@ -77,7 +45,7 @@ const Navbar = () => {
 		setCookie(_cookie?.toString() ?? null);
 	}, []);
 	return (
-		<section className="sticky top-0 z-50 bg-background p-4">
+		<section className="sticky top-0 z-50 bg-background/50 border-b border-b-white/10 backdrop-blur-md p-4 transition duration-200 ease-in-out animate-header-slide-down-fade">
 			<div>
 				<nav className="hidden justify-between lg:flex">
 					<div className="flex items-center gap-6">
@@ -92,65 +60,42 @@ const Navbar = () => {
 							</span>
 						</div>
 						<div className="flex items-center">
+							<Href href="/">Accueil</Href>
+							<Href href="/planning">Planning</Href>
+							<Href href="/about">À propos</Href>
+							<Href href="/gallery">Gallerie</Href>
+							<Href href="/blogs">Blog</Href>
+						</div>
+					</div>
+					<div className="flex gap-2 animate-in ease-in-out">
+						<ThemeSwitcher />
+						{cookie ? (
 							<Link
 								className={cn(
 									"text-muted-foreground",
 									navigationMenuTriggerStyle,
 									buttonVariants({
-										variant: "ghost",
+										variant: "outline",
 									}),
 								)}
-								href="/"
+								href="/dashboard"
 							>
-								Accueil
+								Compte
 							</Link>
-							<a
+						) : (
+							<Link
 								className={cn(
 									"text-muted-foreground",
 									navigationMenuTriggerStyle,
 									buttonVariants({
-										variant: "ghost",
+										variant: "outline",
 									}),
 								)}
-								href="/planning"
+								href="/login"
 							>
-								Planning
-							</a>
-							<a
-								className={cn(
-									"text-muted-foreground",
-									navigationMenuTriggerStyle,
-									buttonVariants({
-										variant: "ghost",
-									}),
-								)}
-								href="/about"
-							>
-								A propos
-							</a>
-							<a
-								className={cn(
-									"text-muted-foreground",
-									navigationMenuTriggerStyle,
-									buttonVariants({
-										variant: "ghost",
-									}),
-								)}
-								href="/blogs"
-							>
-								Blog
-							</a>
-						</div>
-					</div>
-					<div className="flex gap-2 animate-in ease-in-out">
-						<ThemeSwitcher />
-						<Button variant="outline">
-							{cookie ? (
-								<Link href="/dashboard">Compte</Link>
-							) : (
-								<Link href="/login">Se connecter</Link>
-							)}
-						</Button>
+								Se connecter
+							</Link>
+						)}
 						{cookie ? (
 							<Button
 								onClick={() => {
@@ -219,6 +164,12 @@ const Navbar = () => {
 										>
 											À propos
 										</Link>
+										<Link
+											href="/gallery"
+											className="font-semibold"
+										>
+											Gallerie
+										</Link>
 										<Link
 											href="/blog"
 											className="font-semibold"
diff --git a/frontend/components/photo-dialog.tsx b/frontend/components/photo-dialog.tsx
index 7015f2a..0fdf3ec 100644
--- a/frontend/components/photo-dialog.tsx
+++ b/frontend/components/photo-dialog.tsx
@@ -23,7 +23,7 @@ interface PhotoDialogProps {
 	isOpen: boolean;
 	onClose: () => void;
 	onDelete?: (id: Media["id"]) => void;
-	onSave: (photo: Omit<Media, "id">, file: File) => void;
+	onSave: (photo: Omit<Media, "id"> | Media, file: File) => void;
 }
 
 export function PhotoDialog({
@@ -34,7 +34,7 @@ export function PhotoDialog({
 	onSave,
 }: PhotoDialogProps) {
 	const [file, setFile] = useState<File | null>(null);
-	const [newPhoto, setNewPhoto] = useState<Omit<Media, "id">>({
+	const [newPhoto, setNewPhoto] = useState<Omit<Media, "id"> | Media>({
 		url: "",
 		alt: "",
 		path: "",
diff --git a/frontend/components/photo-viewer.tsx b/frontend/components/photo-viewer.tsx
new file mode 100644
index 0000000..a56f45a
--- /dev/null
+++ b/frontend/components/photo-viewer.tsx
@@ -0,0 +1,27 @@
+"use client";
+
+import {
+	Dialog,
+	DialogContent,
+	DialogTitle,
+	DialogTrigger,
+} from "@radix-ui/react-dialog";
+import Image, { ImageProps } from "next/image";
+import React, { useState } from "react";
+
+const PhotoViewer: React.FC<ImageProps> = ({ ...props }) => {
+	const [selected, setSelected] = useState(false);
+	return (
+		<Dialog open={selected} onOpenChange={setSelected}>
+			<DialogTitle>{props.alt}</DialogTitle>
+			<DialogTrigger asChild>
+				<Image onClick={() => setSelected(true)} {...props} />
+			</DialogTrigger>
+			<DialogContent>
+				<Image {...props} unoptimized />
+			</DialogContent>
+		</Dialog>
+	);
+};
+
+export default PhotoViewer;
diff --git a/frontend/components/planning.tsx b/frontend/components/planning.tsx
index 047320c..a24bc75 100644
--- a/frontend/components/planning.tsx
+++ b/frontend/components/planning.tsx
@@ -1,16 +1,14 @@
 "use client";
 
-import { ApiResponse, request } from "@/hooks/use-api";
+import { ApiResponse } from "@/types/types";
+import request from "@/lib/request";
 import "@schedule-x/theme-shadcn/dist/index.css";
 import { useNextCalendarApp, ScheduleXCalendar } from "@schedule-x/react";
 import { createEventsServicePlugin } from "@schedule-x/events-service";
 import { createDragAndDropPlugin } from "@schedule-x/drag-and-drop";
 import { createResizePlugin } from "@schedule-x/resize";
 import { createEventRecurrencePlugin } from "@schedule-x/event-recurrence";
-import {
-	createViewDay,
-	createViewWeek,
-} from "@schedule-x/calendar";
+import { createViewDay, createViewWeek } from "@schedule-x/calendar";
 import { useEffect, useState } from "react";
 import { format } from "date-fns";
 import { Dialog, DialogProps } from "@radix-ui/react-dialog";
@@ -27,62 +25,43 @@ import { getCookie } from "cookies-next";
 import { useTheme } from "next-themes";
 import { EventForm, EventFormValues } from "./event-dialog";
 import ICalendarEvent from "@/interfaces/ICalendarEvent";
-
-const mapFrequencyToRrule = (frequency: "unique" | "quotidien" | "hebdomadaire" | "mensuel", frequencyEndDate?: Date): string => {
-  let rrule = "";
-
-  switch (frequency) {
-    case "quotidien":
-      rrule = "FREQ=DAILY";
-      break;
-    case "hebdomadaire":
-      rrule = "FREQ=WEEKLY";
-      break;
-    case "mensuel":
-      rrule = "FREQ=MONTHLY";
-      break;
-    default:
-      return "";
-  }
-
-  if (frequencyEndDate) {
-    const until = frequencyEndDate.getTime();
-    const untilDate = new Date(until);
-    const epochDateString = untilDate.toISOString().replace(/[-:]/g, "").split(".")[0]; // Format as YYYYMMDDTHHmmss
-    rrule += `;UNTIL=${epochDateString}`;
-  }
-
-  return rrule;
-};
+import { UseFormReturn } from "react-hook-form";
+import mapFrequencyToRrule from "@/lib/mapFrequencyToRrule";
+import { useToast } from "@/hooks/use-toast";
 
 const Planning: React.FC<{
 	events: ICalendarEvent[];
 	mutate?: KeyedMutator<ApiResponse<ICalendarEvent[]>>;
-}> = ({ events, mutate }) => {
+	modifiable?: boolean;
+}> = ({ events, mutate, modifiable = false }) => {
+	const { toast } = useToast();
 	const { resolvedTheme } = useTheme();
-	console.log(resolvedTheme);
 	const isConnected = getCookie("auth_token");
-	const plugins = isConnected
-		? [
-			createEventsServicePlugin(),
-			createDragAndDropPlugin(),
-			createResizePlugin(),
-			createEventRecurrencePlugin(),
-		]
-		: [];
-	const [eventSelected, setEventSelected] =
-		useState<ICalendarEvent | null>(null);
-	const [newEvent, setNewEvent] = useState<Omit<
-		ICalendarEvent,
-		"id"
-	> | null>(null);
+	const plugins =
+		isConnected && modifiable
+			? [
+					createEventsServicePlugin(),
+					createDragAndDropPlugin(),
+					createResizePlugin(),
+					createEventRecurrencePlugin(),
+				]
+			: [];
+	const [eventSelected, setEventSelected] = useState<ICalendarEvent | null>(
+		null,
+	);
+	const [newEvent, setNewEvent] = useState<Omit<ICalendarEvent, "id"> | null>(
+		null,
+	);
 
-	const handleEventUpdate = async (eventSelected: ICalendarEvent) => {
-		const event: ICalendarEvent = {
+	const handleEventUpdate = async (
+		eventSelected: ICalendarEvent | Omit<ICalendarEvent, "id">,
+	) => {
+		if (!isConnected || !modifiable) return;
+		const event = {
 			...eventSelected,
 			start: `${new Date(eventSelected.start).toISOString()}`,
 			end: `${new Date(eventSelected.end).toISOString()}`,
-		};
+		} as ICalendarEvent;
 		try {
 			const res = await request<undefined>(`/events/${event.id}/update`, {
 				method: "PATCH",
@@ -91,10 +70,19 @@ const Planning: React.FC<{
 				csrfToken: false,
 			});
 			if (res.status === "Error") {
-				// calendar?.events?.update(oldEvent);
+				toast({
+					title: "Une erreur est survenue.",
+					description: res.message,
+				});
+			} else {
+				mutate?.();
 			}
 		} catch (e) {
-			console.log(e);
+			if (e instanceof Error)
+				toast({
+					title: "Une erreur est survenue.",
+					description: e.message,
+				});
 		}
 	};
 
@@ -116,11 +104,10 @@ const Planning: React.FC<{
 				end: format(new Date(event.end), "yyyy-MM-dd HH:mm"),
 			})),
 			callbacks: {
-				onEventClick(event, e) {	
+				onEventClick(event, e) {
 					setEventSelected(event as ICalendarEvent);
-				},	
+				},
 				async onEventUpdate(newEvent) {
-	
 					await handleEventUpdate(newEvent as ICalendarEvent);
 				},
 			},
@@ -136,11 +123,14 @@ const Planning: React.FC<{
 		calendar?.setTheme(resolvedTheme === "dark" ? "dark" : "light");
 	}, [resolvedTheme]);
 
-	const AddButton: React.FC = () => (
-		<Button onClick={() => setNewEvent({})} variant="outline">
-			Nouveau
-		</Button>
-	);
+	const AddButton: React.FC = () => {
+		if (!isConnected || !modifiable) return <></>;
+		return (
+			<Button onClick={() => setNewEvent({})} variant="outline">
+				Nouveau
+			</Button>
+		);
+	};
 
 	return (
 		<div>
@@ -148,85 +138,125 @@ const Planning: React.FC<{
 				<AddButton />
 				<ScheduleXCalendar calendarApp={calendar} />
 			</div>
-			{newEvent && (
+			{newEvent && isConnected && modifiable && (
 				<EventDialog
 					open={newEvent !== null || false}
 					onOpenChange={(open) => {
 						setNewEvent((e) => (open ? e : null));
 					}}
-					event={newEvent}
-					onSubmitEvent={async (eventFormValues) => {
+					onAdd={async (formValues) => {
+						if (!isConnected || !modifiable) return;
 						const rrule = mapFrequencyToRrule(
-							eventFormValues.frequency,
-							eventFormValues.frequencyEndDate
-						)
-						try {
-							const event: Omit<ICalendarEvent, "id"> = {
-								...newEvent,
-								start: `${eventFormValues.startDate} ${eventFormValues.startTime}`,
-								end: `${eventFormValues.endDate} ${eventFormValues.endTime}`,
-								title: `${eventFormValues.title}`,
-								fullDay: eventFormValues.fullDay,
-								rrule: rrule,
-								isVisible: eventFormValues.isVisible
-							}
-							const res = await request<undefined>(
-								`/events/new`,
-								{
-									method: "POST",
-									body: event,
-									requiresAuth: true,
-									csrfToken: false,
-								},
-							);
-							if (res.status === "Error") {
-								console.log("Error");
-							}
-							if (res.status === "Success") {
-								mutate?.();
-								console.log("Success");
-							}
-						} catch (e) {
-							console.log(e);
+							formValues.frequency,
+							formValues.frequencyEndDate,
+						);
+						const [sHours, sMinutes] =
+							formValues.startTime.split(":");
+						formValues.startDate.setHours(
+							parseInt(sHours),
+							parseInt(sMinutes),
+						);
+						const [eHours, eMinutes] =
+							formValues.endTime.split(":");
+						formValues.endDate.setHours(
+							parseInt(eHours),
+							parseInt(eMinutes),
+						);
+						console.log(formValues.endDate);
+						const event: Omit<ICalendarEvent, "id"> = {
+							...newEvent,
+							start: formValues.startDate.toISOString(),
+							end: formValues.endDate.toISOString(),
+							title: `${formValues.title}`,
+							fullday: formValues.fullDay,
+							rrule: rrule,
+							isVisible: formValues.isVisible,
+						};
+						const res = await request<undefined>(`/events/new`, {
+							method: "POST",
+							body: event,
+							requiresAuth: true,
+							csrfToken: false,
+						});
+						if (res.status === "Error") {
+							toast({
+								title: "Une erreur est survenue.",
+								description: res.message,
+							});
+						}
+						if (res.status === "Success") {
+							mutate?.();
+							console.log("Success");
 						}
 					}}
+					event={newEvent}
 				/>
 			)}
-			{eventSelected && (
+			{eventSelected && modifiable && isConnected && (
 				<EventDialog
 					open={eventSelected !== null || false}
 					onOpenChange={(open) => {
 						setEventSelected((e) => (open ? e : null));
 					}}
 					event={eventSelected}
-					onSubmitEvent={ (eventForm) => {
-						console.log("Event form: " + eventForm)
-					}}
-					onDelete={async () => {
-						calendar?.events?.remove(eventSelected.id);
+					onDelete={async (id) => {
+						if (!isConnected || !modifiable) return;
+						calendar?.events?.remove(id);
 						try {
 							const res = await request<undefined>(
-								`/events/${eventSelected.id}/delete`,
+								`/events/${id}/delete`,
 								{
 									method: "DELETE",
-									body: eventSelected,
-									requiresAuth: false,
+									requiresAuth: true,
 									csrfToken: false,
 								},
 							);
 							if (res.status === "Error") {
-								console.log("Error");
+								toast({
+									title: "Une erreur est survenue.",
+									description: res.message,
+								});
 							}
 							if (res.status === "Success") {
 								console.log("Success");
 							}
-						} catch (e) {
-							console.log(e);
+						} catch (e: unknown) {
+							if (e instanceof Error)
+								toast({
+									title: "Une erreur est survenue.",
+									description: e.message,
+								});
 						}
 						setEventSelected(null);
 					}}
-					onUpdate={async () => {
-						await handleEventUpdate(eventSelected);
+					onUpdate={async (formValues) => {
+						if (!isConnected || !modifiable) return;
+						const rrule = mapFrequencyToRrule(
+							formValues.frequency,
+							formValues.frequencyEndDate,
+						);
+						const [sHours, sMinutes] =
+							formValues.startTime.split(":");
+						formValues.startDate.setHours(
+							parseInt(sHours),
+							parseInt(sMinutes),
+						);
+						const [eHours, eMinutes] =
+							formValues.endTime.split(":");
+						formValues.endDate.setHours(
+							parseInt(eHours),
+							parseInt(eMinutes),
+						);
+						const event: ICalendarEvent = {
+							...eventSelected,
+							start: formValues.startDate.toISOString(),
+							end: formValues.endDate.toISOString(),
+							title: `${formValues.title}`,
+							fullday: formValues.fullDay,
+							rrule: rrule,
+							isVisible: formValues.isVisible,
+						};
+						await handleEventUpdate(event);
 						setEventSelected(null);
 					}}
 				/>
@@ -237,59 +267,55 @@ const Planning: React.FC<{
 
 const EventDialog: React.FC<
 	{
-		onSubmitEvent: (eventFormValues: EventFormValues) => void;
-		onDelete?: () => void;
-		onUpdate?: () => void;
-		onAdd?: () => void;
+		onDelete?: (id: string) => void;
+		onUpdate?: (formValues: EventFormValues) => void;
+		onAdd?: (formValues: EventFormValues) => void;
 		event: ICalendarEvent | Omit<ICalendarEvent, "id">;
 	} & DialogProps
-> = ({
-	open,
-	onOpenChange,
-	onSubmitEvent,
-	onDelete,
-	onUpdate,
-	onAdd,
-	event,
-}) => {
-		return (
-			<Dialog open={open} onOpenChange={onOpenChange}>
-				<DialogContent className="sm:max-w-md">
-					<DialogHeader>
-						<DialogTitle>{event.title}</DialogTitle>
-						<DialogDescription>{event.description}</DialogDescription>
-					</DialogHeader>
-					<EventForm 
-						event={event} 
-						onSubmitEvent={onSubmitEvent}/>
-					<DialogFooter className="flex flex-row justify-end">
-						{onUpdate && (
-							<Button
-								variant="outline"
-								onClick={() => onUpdate()}
-								type="submit"
-							>
-								Actualiser
-							</Button>
-						)}
-						{onDelete && (
-							<Button
-								variant="destructive"
-								onClick={() => onDelete()}
-								type="submit"
-							>
-								Supprimer
-							</Button>
-						)}
-						{onAdd && !onUpdate && !onDelete && (
-							<Button onClick={() => onAdd()} type="submit">
-								Créer
-							</Button>
-						)}
-					</DialogFooter>
-				</DialogContent >
-			</Dialog >
-		);
+> = ({ open, onOpenChange, onDelete, onUpdate, onAdd, event }) => {
+	const [form, setForm] = useState<UseFormReturn<EventFormValues>>();
+
+	const submitForm = (event: "add" | "update") => {
+		const callback = event === "add" ? onAdd : onUpdate;
+		if (callback) form?.handleSubmit(callback)();
 	};
 
+	return (
+		<Dialog open={open} onOpenChange={onOpenChange}>
+			<DialogContent className="sm:max-w-md">
+				<DialogHeader>
+					<DialogTitle>{event.title}</DialogTitle>
+					<DialogDescription>{event.description}</DialogDescription>
+				</DialogHeader>
+				<EventForm event={event} setForm={setForm} />
+				<DialogFooter className="flex flex-row justify-end">
+					{onUpdate && (
+						<Button
+							variant="outline"
+							onClick={() => submitForm("update")}
+							type="submit"
+						>
+							Actualiser
+						</Button>
+					)}
+					{onDelete && (
+						<Button
+							variant="destructive"
+							onClick={() => onDelete(event.id)}
+							type="submit"
+						>
+							Supprimer
+						</Button>
+					)}
+					{onAdd && !onUpdate && !onDelete && (
+						<Button onClick={() => submitForm("add")} type="submit">
+							Créer
+						</Button>
+					)}
+				</DialogFooter>
+			</DialogContent>
+		</Dialog>
+	);
+};
+
 export default Planning;
diff --git a/frontend/components/shortcode-dialogue.tsx b/frontend/components/shortcode-dialogue.tsx
index d0c4564..8ee0768 100644
--- a/frontend/components/shortcode-dialogue.tsx
+++ b/frontend/components/shortcode-dialogue.tsx
@@ -14,6 +14,18 @@ import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import type IShortcode from "@/interfaces/IShortcode";
+import Image from "next/image";
+import Media from "@/interfaces/Media";
+import {
+	Pagination,
+	PaginationContent,
+	PaginationItem,
+	PaginationLink,
+	PaginationNext,
+	PaginationPrevious,
+} from "./ui/pagination";
+import useMedia from "@/hooks/use-media";
+import { Loader2 } from "lucide-react";
 
 interface ShortcodeDialogProps {
 	onSave: (shortcode: IShortcode) => void;
@@ -33,6 +45,8 @@ export default function ShortcodeDialog({
 	);
 
 	const handleSave = () => {
+		if (!(_shortcode?.code && (_shortcode.media_id || _shortcode.value)))
+			return;
 		onSave(_shortcode);
 		setOpen();
 		resetForm();
@@ -92,6 +106,7 @@ export default function ShortcodeDialog({
 										setShortcode((p) => ({
 											...p,
 											value: e.target.value,
+											media_id: undefined,
 										}))
 									}
 									className="col-span-3"
@@ -99,27 +114,29 @@ export default function ShortcodeDialog({
 							</div>
 						</TabsContent>
 						<TabsContent value="media">
-							<div className="grid grid-cols-4 items-center gap-4">
-								<Label htmlFor="mediaId" className="text-right">
-									Media ID
-								</Label>
-								<Input
-									id="mediaId"
-									value={_shortcode.media_id}
-									onChange={(e) =>
-										setShortcode((p) => ({
-											...p,
-											media_id: e.target.value,
-										}))
-									}
-									className="col-span-3"
-								/>
-							</div>
+							<PhotoGrid
+								onSelect={(photo) => {
+									setShortcode((p) => ({
+										...p,
+										media_id: photo.id,
+										value: undefined,
+									}));
+								}}
+							/>
 						</TabsContent>
 					</Tabs>
 				</div>
 				<DialogFooter>
-					<Button type="submit" onClick={handleSave}>
+					<Button
+						disabled={
+							!(
+								_shortcode?.code &&
+								(_shortcode.media_id || _shortcode.value)
+							)
+						}
+						type="submit"
+						onClick={handleSave}
+					>
 						Enregistrer
 					</Button>
 				</DialogFooter>
@@ -127,3 +144,144 @@ export default function ShortcodeDialog({
 		</Dialog>
 	);
 }
+
+const LazyImage = ({
+	photo,
+	onClick,
+	isSelected,
+}: {
+	photo: Media;
+	onClick: () => void;
+	isSelected: boolean;
+}) => {
+	return (
+		<div
+			className={`aspect-square ${isSelected ? "ring-4 ring-primary" : ""}`}
+		>
+			<Image
+				src={photo.url || "/placeholder.svg"}
+				alt={photo.alt}
+				width={300}
+				height={300}
+				className="object-cover w-full h-full cursor-pointer transition-transform hover:scale-105"
+				onClick={onClick}
+			/>
+		</div>
+	);
+};
+
+const PhotoGrid: React.FC<{ onSelect: (photo: Media) => void }> = ({
+	onSelect,
+}) => {
+	const { data, error, isLoading, success, setPage, setLimit, mutate } =
+		useMedia(5);
+	const [selectedPhoto, setSelectedPhoto] = useState<Media | null>(null);
+
+	const handlePhotoClick = (photo: Media) => {
+		setSelectedPhoto(photo);
+		onSelect(photo);
+	};
+
+	const handleChangeSelection = () => {
+		setSelectedPhoto(null);
+		// if (!photos) return;
+		// const currentIndex = photos.findIndex(
+		// 	(photo) => photo.id === selectedPhoto?.id,
+		// );
+		// const nextIndex = (currentIndex + 1) % photos.length;
+		// setSelectedPhoto(photos[nextIndex]);
+	};
+
+	if (isLoading) return <Loader2 className="animate-spin" />;
+
+	return (
+		<div className="container mx-auto p-4">
+			<h1 className="text-2xl font-bold mb-4">Gallerie Photo</h1>
+			{selectedPhoto ? (
+				<div className="flex flex-col items-center">
+					<Image
+						src={selectedPhoto.url || "/placeholder.svg"}
+						alt={selectedPhoto.alt}
+						width={600}
+						height={600}
+						className="w-full max-w-2xl h-auto mb-4 rounded-lg"
+					/>
+					<div className="flex gap-4 mt-4">
+						<Button onClick={handleChangeSelection}>
+							Changer de sélection
+						</Button>
+					</div>
+				</div>
+			) : (
+				<>
+					<div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4">
+						{data?.items?.map((photo) => {
+							return (
+								<LazyImage
+									photo={photo}
+									key={photo.id}
+									onClick={() => handlePhotoClick(photo)}
+									isSelected={false}
+								/>
+							);
+						})}
+					</div>
+
+					<Pagination className="mt-8">
+						<PaginationContent>
+							<PaginationItem>
+								<PaginationPrevious
+									href="#"
+									onClick={(e) => {
+										e.preventDefault();
+										setPage((prev) =>
+											Math.max(prev - 1, 1),
+										);
+									}}
+									className={
+										data?.page === 1
+											? "pointer-events-none opacity-50"
+											: ""
+									}
+								/>
+							</PaginationItem>
+							{[...Array(data?.totalPages)].map((_, i) => (
+								<PaginationItem key={i + 1}>
+									<PaginationLink
+										href="#"
+										onClick={(e) => {
+											e.preventDefault();
+											setPage(i + 1);
+										}}
+										isActive={data?.page === i + 1}
+									>
+										{i + 1}
+									</PaginationLink>
+								</PaginationItem>
+							))}
+							<PaginationItem>
+								<PaginationNext
+									href="#"
+									onClick={(e) => {
+										e.preventDefault();
+										setPage((prev) =>
+											Math.min(
+												prev + 1,
+												data?.totalPages ?? 1,
+											),
+										);
+									}}
+									className={
+										data?.page === data?.totalPages
+											? "pointer-events-none opacity-50"
+											: ""
+									}
+								/>
+							</PaginationItem>
+						</PaginationContent>
+					</Pagination>
+				</>
+			)}
+		</div>
+	);
+};
diff --git a/frontend/components/ui/checkbox.tsx b/frontend/components/ui/checkbox.tsx
index c6fdd07..614d2b8 100644
--- a/frontend/components/ui/checkbox.tsx
+++ b/frontend/components/ui/checkbox.tsx
@@ -1,30 +1,30 @@
-"use client"
+"use client";
 
-import * as React from "react"
-import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
-import { Check } from "lucide-react"
+import * as React from "react";
+import * as CheckboxPrimitive from "@radix-ui/react-checkbox";
+import { Check } from "lucide-react";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
 const Checkbox = React.forwardRef<
-  React.ElementRef<typeof CheckboxPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
+	React.ComponentRef<typeof CheckboxPrimitive.Root>,
+	React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
 >(({ className, ...props }, ref) => (
-  <CheckboxPrimitive.Root
-    ref={ref}
-    className={cn(
-      "peer h-4 w-4 shrink-0 rounded-sm border border-primary shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground",
-      className
-    )}
-    {...props}
-  >
-    <CheckboxPrimitive.Indicator
-      className={cn("flex items-center justify-center text-current")}
-    >
-      <Check className="h-4 w-4" />
-    </CheckboxPrimitive.Indicator>
-  </CheckboxPrimitive.Root>
-))
-Checkbox.displayName = CheckboxPrimitive.Root.displayName
+	<CheckboxPrimitive.Root
+		ref={ref}
+		className={cn(
+			"peer h-4 w-4 shrink-0 rounded-sm border border-primary shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground",
+			className,
+		)}
+		{...props}
+	>
+		<CheckboxPrimitive.Indicator
+			className={cn("flex items-center justify-center text-current")}
+		>
+			<Check className="h-4 w-4" />
+		</CheckboxPrimitive.Indicator>
+	</CheckboxPrimitive.Root>
+));
+Checkbox.displayName = CheckboxPrimitive.Root.displayName;
 
-export { Checkbox }
+export { Checkbox };
diff --git a/frontend/components/ui/form.tsx b/frontend/components/ui/form.tsx
index 48a0b5a..f7632e5 100644
--- a/frontend/components/ui/form.tsx
+++ b/frontend/components/ui/form.tsx
@@ -104,7 +104,7 @@ const FormLabel = React.forwardRef<
 FormLabel.displayName = "FormLabel";
 
 const FormControl = React.forwardRef<
-	React.ElementRef<typeof Slot>,
+	React.ComponentRef<typeof Slot>,
 	React.ComponentPropsWithoutRef<typeof Slot>
 >(({ ...props }, ref) => {
 	const { error, formItemId, formDescriptionId, formMessageId } =
diff --git a/frontend/components/ui/scroll-area.tsx b/frontend/components/ui/scroll-area.tsx
index 98234fc..6275cf1 100644
--- a/frontend/components/ui/scroll-area.tsx
+++ b/frontend/components/ui/scroll-area.tsx
@@ -6,7 +6,7 @@ import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area";
 import { cn } from "@/lib/utils";
 
 const ScrollArea = React.forwardRef<
-	React.ElementRef<typeof ScrollAreaPrimitive.Root>,
+	React.ComponentRef<typeof ScrollAreaPrimitive.Root>,
 	React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>
 >(({ className, children, ...props }, ref) => (
 	<ScrollAreaPrimitive.Root
diff --git a/frontend/components/ui/toast.tsx b/frontend/components/ui/toast.tsx
new file mode 100644
index 0000000..033ed9a
--- /dev/null
+++ b/frontend/components/ui/toast.tsx
@@ -0,0 +1,129 @@
+"use client";
+
+import * as React from "react";
+import * as ToastPrimitives from "@radix-ui/react-toast";
+import { cva, type VariantProps } from "class-variance-authority";
+import { X } from "lucide-react";
+
+import { cn } from "@/lib/utils";
+
+const ToastProvider = ToastPrimitives.Provider;
+
+const ToastViewport = React.forwardRef<
+	React.ComponentRef<typeof ToastPrimitives.Viewport>,
+	React.ComponentPropsWithoutRef<typeof ToastPrimitives.Viewport>
+>(({ className, ...props }, ref) => (
+	<ToastPrimitives.Viewport
+		ref={ref}
+		className={cn(
+			"fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]",
+			className,
+		)}
+		{...props}
+	/>
+));
+ToastViewport.displayName = ToastPrimitives.Viewport.displayName;
+
+const toastVariants = cva(
+	"group pointer-events-auto relative flex w-full items-center justify-between space-x-2 overflow-hidden rounded-md border p-4 pr-6 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full",
+	{
+		variants: {
+			variant: {
+				default: "border bg-background text-foreground",
+				destructive:
+					"destructive group border-destructive bg-destructive text-destructive-foreground",
+			},
+		},
+		defaultVariants: {
+			variant: "default",
+		},
+	},
+);
+
+const Toast = React.forwardRef<
+	React.ElementRef<typeof ToastPrimitives.Root>,
+	React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> &
+		VariantProps<typeof toastVariants>
+>(({ className, variant, ...props }, ref) => {
+	return (
+		<ToastPrimitives.Root
+			ref={ref}
+			className={cn(toastVariants({ variant }), className)}
+			{...props}
+		/>
+	);
+});
+Toast.displayName = ToastPrimitives.Root.displayName;
+
+const ToastAction = React.forwardRef<
+	React.ElementRef<typeof ToastPrimitives.Action>,
+	React.ComponentPropsWithoutRef<typeof ToastPrimitives.Action>
+>(({ className, ...props }, ref) => (
+	<ToastPrimitives.Action
+		ref={ref}
+		className={cn(
+			"inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium transition-colors hover:bg-secondary focus:outline-none focus:ring-1 focus:ring-ring disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive",
+			className,
+		)}
+		{...props}
+	/>
+));
+ToastAction.displayName = ToastPrimitives.Action.displayName;
+
+const ToastClose = React.forwardRef<
+	React.ElementRef<typeof ToastPrimitives.Close>,
+	React.ComponentPropsWithoutRef<typeof ToastPrimitives.Close>
+>(({ className, ...props }, ref) => (
+	<ToastPrimitives.Close
+		ref={ref}
+		className={cn(
+			"absolute right-1 top-1 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-1 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600",
+			className,
+		)}
+		toast-close=""
+		{...props}
+	>
+		<X className="h-4 w-4" />
+	</ToastPrimitives.Close>
+));
+ToastClose.displayName = ToastPrimitives.Close.displayName;
+
+const ToastTitle = React.forwardRef<
+	React.ElementRef<typeof ToastPrimitives.Title>,
+	React.ComponentPropsWithoutRef<typeof ToastPrimitives.Title>
+>(({ className, ...props }, ref) => (
+	<ToastPrimitives.Title
+		ref={ref}
+		className={cn("text-sm font-semibold [&+div]:text-xs", className)}
+		{...props}
+	/>
+));
+ToastTitle.displayName = ToastPrimitives.Title.displayName;
+
+const ToastDescription = React.forwardRef<
+	React.ElementRef<typeof ToastPrimitives.Description>,
+	React.ComponentPropsWithoutRef<typeof ToastPrimitives.Description>
+>(({ className, ...props }, ref) => (
+	<ToastPrimitives.Description
+		ref={ref}
+		className={cn("text-sm opacity-90", className)}
+		{...props}
+	/>
+));
+ToastDescription.displayName = ToastPrimitives.Description.displayName;
+
+type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>;
+
+type ToastActionElement = React.ReactElement<typeof ToastAction>;
+
+export {
+	type ToastProps,
+	type ToastActionElement,
+	ToastProvider,
+	ToastViewport,
+	Toast,
+	ToastTitle,
+	ToastDescription,
+	ToastClose,
+	ToastAction,
+};
diff --git a/frontend/components/ui/toaster.tsx b/frontend/components/ui/toaster.tsx
new file mode 100644
index 0000000..2321136
--- /dev/null
+++ b/frontend/components/ui/toaster.tsx
@@ -0,0 +1,43 @@
+"use client";
+
+import { useToast } from "@/hooks/use-toast";
+import {
+	Toast,
+	ToastClose,
+	ToastDescription,
+	ToastProvider,
+	ToastTitle,
+	ToastViewport,
+} from "@/components/ui/toast";
+
+export function Toaster() {
+	const { toasts } = useToast();
+
+	return (
+		<ToastProvider>
+			{toasts.map(function ({
+				id,
+				title,
+				description,
+				action,
+				...props
+			}) {
+				return (
+					<Toast key={id} {...props}>
+						<div className="grid gap-1">
+							{title && <ToastTitle>{title}</ToastTitle>}
+							{description && (
+								<ToastDescription>
+									{description}
+								</ToastDescription>
+							)}
+						</div>
+						{action}
+						<ToastClose />
+					</Toast>
+				);
+			})}
+			<ToastViewport />
+		</ToastProvider>
+	);
+}
diff --git a/frontend/components/youtube-embed.tsx b/frontend/components/youtube-embed.tsx
index 5ad0121..b1fc463 100644
--- a/frontend/components/youtube-embed.tsx
+++ b/frontend/components/youtube-embed.tsx
@@ -18,6 +18,13 @@ export default function YouTubeEmbed({
 }) {
 	const [isIframeLoaded, setIframeLoaded] = useState(loadIframe);
 
+	const id =
+		typeof video === "string"
+			? video
+			: typeof video.id === "string"
+				? video.snippet.resourceId.videoId
+				: video.id.videoId;
+
 	const isString = typeof video === "string";
 
 	const _loadIframe = () => setIframeLoaded(true);
@@ -36,7 +43,7 @@ export default function YouTubeEmbed({
 					className="rounded-md shadow-current aspect-video"
 					width={width === "full" ? "100%" : width}
 					height={height === "full" ? "100%" : height}
-					src={`https://www.youtube-nocookie.com/embed/${isString ? video : video.id.videoId}?rel=0&modestbranding=1&autoplay=${autoPlay ? 1 : 0}`}
+					src={`https://www.youtube-nocookie.com/embed/${id}?rel=0&modestbranding=1&autoplay=${autoPlay ? 1 : 0}`}
 					title={
 						isString ? "YouTube video player" : video.snippet.title
 					}
@@ -50,7 +57,7 @@ export default function YouTubeEmbed({
 							width="100%"
 							height="100%"
 							className="w-full h-full object-cover rounded-md shadow-current"
-							src={`https://img.youtube.com/vi/${isString ? video : video.id.videoId}/hqdefault.jpg`}
+							src={`https://img.youtube.com/vi/${id}/hqdefault.jpg`}
 							alt={
 								isString
 									? "YouTube video player"
@@ -62,7 +69,7 @@ export default function YouTubeEmbed({
 							width={width}
 							height={height}
 							className="w-full h-full object-cover rounded-md shadow-current"
-							src={`https://img.youtube.com/vi/${isString ? video : video.id.videoId}/hqdefault.jpg`}
+							src={`https://img.youtube.com/vi/${id}/hqdefault.jpg`}
 							alt={
 								isString
 									? "YouTube video player"
diff --git a/frontend/hooks/use-api.tsx b/frontend/hooks/use-api.tsx
index e531136..2097f8b 100644
--- a/frontend/hooks/use-api.tsx
+++ b/frontend/hooks/use-api.tsx
@@ -1,60 +1,9 @@
 "use client";
-import { API_URL } from "@/lib/constants";
-import { getCookie } from "cookies-next";
+import request from "@/lib/request";
+import { ApiResponse } from "@/types/types";
 import useSWR, { SWRConfiguration } from "swr";
 import useSWRMutation, { type SWRMutationConfiguration } from "swr/mutation";
 
-export interface ApiResponse<T> {
-	status: "Error" | "Success";
-	message: string;
-	data?: T;
-}
-
-export async function request<T>(
-	endpoint: string,
-	options: {
-		method?: "GET" | "POST" | "PATCH" | "DELETE";
-		body?: any;
-		requiresAuth?: boolean;
-		csrfToken?: boolean;
-	} = {},
-): Promise<ApiResponse<T>> {
-	const { method = "GET", body, requiresAuth = true } = options;
-	const headers: Record<string, string> = {
-		"Content-Type": "application/json",
-	};
-
-	if (options.csrfToken) {
-		const res: ApiResponse<{ csrf: string }> = await (
-			await fetch(`${API_URL}/csrf-token`)
-		).json();
-		if (res.data) headers["X-CSRF-Token"] = res.data.csrf;
-	}
-
-	if (requiresAuth) {
-		const authToken = getCookie("auth_token");
-		if (!authToken) {
-			throw new Error("User is not authenticated");
-		}
-		headers.Authorization = `Bearer ${authToken}`;
-	}
-
-	const response = await fetch(`${API_URL}${endpoint}`, {
-		method,
-		headers,
-		body: body ? JSON.stringify(body) : undefined,
-		credentials: options.csrfToken ? "include" : "omit",
-	});
-
-	const apiResponse: ApiResponse<T> = await response.json();
-
-	if (apiResponse.status === "Error") {
-		throw new Error(apiResponse.message || "An unexpected error occurred");
-	}
-
-	return apiResponse;
-}
-
 async function fetcher<T>(
 	url: string,
 	requiresAuth: boolean = true,
diff --git a/frontend/hooks/use-file-upload.tsx b/frontend/hooks/use-file-upload.tsx
index 806619f..90860d3 100644
--- a/frontend/hooks/use-file-upload.tsx
+++ b/frontend/hooks/use-file-upload.tsx
@@ -1,8 +1,8 @@
 "use client";
 import { API_URL } from "@/lib/constants";
+import { ApiResponse } from "@/types/types";
 import { getCookie } from "cookies-next";
 import { useState, useRef, useCallback } from "react";
-import { ApiResponse, useApi } from "./use-api";
 
 interface UseFileUploadReturn {
 	progress: number;
diff --git a/frontend/hooks/use-login.tsx b/frontend/hooks/use-login.tsx
index 519fd12..d7a0c69 100644
--- a/frontend/hooks/use-login.tsx
+++ b/frontend/hooks/use-login.tsx
@@ -1,9 +1,7 @@
 "use client";
 
 import { setCookie } from "cookies-next";
-import useApiMutation, { ApiResponse } from "./use-api";
-import { useEffect, useState } from "react";
-import { API_URL } from "@/lib/constants";
+import useApiMutation from "./use-api";
 
 export interface LoginArgs {
 	email: string;
diff --git a/frontend/hooks/use-media.tsx b/frontend/hooks/use-media.tsx
index bd08f88..33cecc1 100644
--- a/frontend/hooks/use-media.tsx
+++ b/frontend/hooks/use-media.tsx
@@ -17,6 +17,9 @@ export default function useMedia(_limit: number = 20) {
 	const [limit, setLimit] = useState(_limit);
 	const res = useApi<IPaginatedResponse<Media>>(
 		`/media?page=${page}&limit=${limit}`,
+		{},
+		false,
+		false,
 	);
 	return {
 		...res,
diff --git a/frontend/hooks/use-toast.ts b/frontend/hooks/use-toast.ts
new file mode 100644
index 0000000..006387c
--- /dev/null
+++ b/frontend/hooks/use-toast.ts
@@ -0,0 +1,192 @@
+"use client";
+
+// Inspired by react-hot-toast library
+import * as React from "react";
+
+import type { ToastActionElement, ToastProps } from "@/components/ui/toast";
+
+const TOAST_LIMIT = 1;
+const TOAST_REMOVE_DELAY = 1000000;
+
+type ToasterToast = ToastProps & {
+	id: string;
+	title?: React.ReactNode;
+	description?: React.ReactNode;
+	action?: ToastActionElement;
+};
+
+const actionTypes = {
+	ADD_TOAST: "ADD_TOAST",
+	UPDATE_TOAST: "UPDATE_TOAST",
+	DISMISS_TOAST: "DISMISS_TOAST",
+	REMOVE_TOAST: "REMOVE_TOAST",
+} as const;
+
+let count = 0;
+
+function genId() {
+	count = (count + 1) % Number.MAX_SAFE_INTEGER;
+	return count.toString();
+}
+
+type ActionType = typeof actionTypes;
+
+type Action =
+	| {
+			type: ActionType["ADD_TOAST"];
+			toast: ToasterToast;
+	  }
+	| {
+			type: ActionType["UPDATE_TOAST"];
+			toast: Partial<ToasterToast>;
+	  }
+	| {
+			type: ActionType["DISMISS_TOAST"];
+			toastId?: ToasterToast["id"];
+	  }
+	| {
+			type: ActionType["REMOVE_TOAST"];
+			toastId?: ToasterToast["id"];
+	  };
+
+interface State {
+	toasts: ToasterToast[];
+}
+
+const toastTimeouts = new Map<string, ReturnType<typeof setTimeout>>();
+
+const addToRemoveQueue = (toastId: string) => {
+	if (toastTimeouts.has(toastId)) {
+		return;
+	}
+
+	const timeout = setTimeout(() => {
+		toastTimeouts.delete(toastId);
+		dispatch({
+			type: "REMOVE_TOAST",
+			toastId: toastId,
+		});
+	}, TOAST_REMOVE_DELAY);
+
+	toastTimeouts.set(toastId, timeout);
+};
+
+export const reducer = (state: State, action: Action): State => {
+	switch (action.type) {
+		case "ADD_TOAST":
+			return {
+				...state,
+				toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT),
+			};
+
+		case "UPDATE_TOAST":
+			return {
+				...state,
+				toasts: state.toasts.map((t) =>
+					t.id === action.toast.id ? { ...t, ...action.toast } : t,
+				),
+			};
+
+		case "DISMISS_TOAST": {
+			const { toastId } = action;
+
+			// ! Side effects ! - This could be extracted into a dismissToast() action,
+			// but I'll keep it here for simplicity
+			if (toastId) {
+				addToRemoveQueue(toastId);
+			} else {
+				state.toasts.forEach((toast) => {
+					addToRemoveQueue(toast.id);
+				});
+			}
+
+			return {
+				...state,
+				toasts: state.toasts.map((t) =>
+					t.id === toastId || toastId === undefined
+						? {
+								...t,
+								open: false,
+							}
+						: t,
+				),
+			};
+		}
+		case "REMOVE_TOAST":
+			if (action.toastId === undefined) {
+				return {
+					...state,
+					toasts: [],
+				};
+			}
+			return {
+				...state,
+				toasts: state.toasts.filter((t) => t.id !== action.toastId),
+			};
+	}
+};
+
+const listeners: Array<(state: State) => void> = [];
+
+let memoryState: State = { toasts: [] };
+
+function dispatch(action: Action) {
+	memoryState = reducer(memoryState, action);
+	listeners.forEach((listener) => {
+		listener(memoryState);
+	});
+}
+
+type Toast = Omit<ToasterToast, "id">;
+
+function toast({ ...props }: Toast) {
+	const id = genId();
+
+	const update = (props: ToasterToast) =>
+		dispatch({
+			type: "UPDATE_TOAST",
+			toast: { ...props, id },
+		});
+	const dismiss = () => dispatch({ type: "DISMISS_TOAST", toastId: id });
+
+	dispatch({
+		type: "ADD_TOAST",
+		toast: {
+			...props,
+			id,
+			open: true,
+			onOpenChange: (open) => {
+				if (!open) dismiss();
+			},
+		},
+	});
+
+	return {
+		id: id,
+		dismiss,
+		update,
+	};
+}
+
+function useToast() {
+	const [state, setState] = React.useState<State>(memoryState);
+
+	React.useEffect(() => {
+		listeners.push(setState);
+		return () => {
+			const index = listeners.indexOf(setState);
+			if (index > -1) {
+				listeners.splice(index, 1);
+			}
+		};
+	}, [state]);
+
+	return {
+		...state,
+		toast,
+		dismiss: (toastId?: string) =>
+			dispatch({ type: "DISMISS_TOAST", toastId }),
+	};
+}
+
+export { useToast, toast };
diff --git a/frontend/interfaces/youtube.ts b/frontend/interfaces/youtube.ts
index 410e001..d8e6b22 100644
--- a/frontend/interfaces/youtube.ts
+++ b/frontend/interfaces/youtube.ts
@@ -10,7 +10,7 @@ export interface IYoutube {
 export interface IYoutubeItem {
 	kind: string;
 	etag: string;
-	id: IYoutubeID;
+	id: IYoutubeID | string;
 	snippet: IYoutubeSnippet;
 }
 
@@ -28,6 +28,7 @@ export interface IYoutubeSnippet {
 	channelTitle: string;
 	liveBroadcastContent: string;
 	publishTime: Date;
+	resourceId: IYoutubeID;
 }
 
 export interface IYoutubeThumbnails {
diff --git a/frontend/lib/getShortcode.ts b/frontend/lib/getShortcode.ts
new file mode 100644
index 0000000..59d6ab1
--- /dev/null
+++ b/frontend/lib/getShortcode.ts
@@ -0,0 +1,14 @@
+import IShortcode from "@/interfaces/IShortcode";
+import request from "./request";
+
+export default async function getShortcode(
+	code: string,
+): Promise<IShortcode | null> {
+	const res = await request<IShortcode>(`/shortcodes/${code}`, {
+		method: "GET",
+		requiresAuth: false,
+	});
+	if (res.status === "Error") throw new Error("Shortcode doesn't exist.");
+
+	return res.data ?? null;
+}
diff --git a/frontend/lib/mapFrequencyToRrule.ts b/frontend/lib/mapFrequencyToRrule.ts
new file mode 100644
index 0000000..d1ac795
--- /dev/null
+++ b/frontend/lib/mapFrequencyToRrule.ts
@@ -0,0 +1,51 @@
+// const mapRruleToFrequency = (rrule: string) => {
+//
+// 	switch (frequency) {
+// 		case "quotidien":
+// 			rrule = "FREQ=DAILY";
+// 			break;
+// 		case "hebdomadaire":
+// 			rrule = "FREQ=WEEKLY";
+// 			break;
+// 		case "mensuel":
+// 			rrule = "FREQ=MONTHLY";
+// 			break;
+// 		default:
+// 			return "";
+// 	}
+// }
+
+const mapFrequencyToRrule = (
+	frequency: "unique" | "quotidien" | "hebdomadaire" | "mensuel",
+	frequencyEndDate?: Date,
+): string => {
+	let rrule = "";
+
+	switch (frequency) {
+		case "quotidien":
+			rrule = "FREQ=DAILY";
+			break;
+		case "hebdomadaire":
+			rrule = "FREQ=WEEKLY";
+			break;
+		case "mensuel":
+			rrule = "FREQ=MONTHLY";
+			break;
+		default:
+			return "";
+	}
+
+	if (frequencyEndDate) {
+		const until = frequencyEndDate.getTime();
+		const untilDate = new Date(until);
+		const epochDateString = untilDate
+			.toISOString()
+			.replace(/[-:]/g, "")
+			.split(".")[0]; // Format as YYYYMMDDTHHmmss
+		rrule += `;UNTIL=${epochDateString}`;
+	}
+
+	return rrule;
+};
+
+export default mapFrequencyToRrule;
diff --git a/frontend/lib/request.ts b/frontend/lib/request.ts
new file mode 100644
index 0000000..7f931af
--- /dev/null
+++ b/frontend/lib/request.ts
@@ -0,0 +1,56 @@
+import { API_URL } from "@/lib/constants";
+import { ApiResponse } from "@/types/types";
+import { getCookie } from "cookies-next";
+import { ReadonlyRequestCookies } from "next/dist/server/web/spec-extension/adapters/request-cookies";
+export default async function request<T>(
+	endpoint: string,
+	options: {
+		method?: "GET" | "POST" | "PATCH" | "DELETE";
+		body?: any;
+		requiresAuth?: boolean;
+		csrfToken?: boolean;
+		cookies?: () => Promise<ReadonlyRequestCookies>;
+	} = {},
+): Promise<ApiResponse<T>> {
+	console.log(API_URL, endpoint);
+	const { method = "GET", body, requiresAuth = true } = options;
+	const headers: Record<string, string> = {
+		"Content-Type": "application/json",
+	};
+
+	if (options.csrfToken) {
+		const res: ApiResponse<{ csrf: string }> = await (
+			await fetch(`${API_URL}/csrf-token`)
+		).json();
+		if (res.data) headers["X-CSRF-Token"] = res.data.csrf;
+	}
+
+	if (requiresAuth) {
+		let authToken;
+		if (!options.cookies) {
+			authToken = getCookie("auth_token");
+		} else {
+			authToken = (await options.cookies()).get("auth_token")?.value;
+		}
+
+		if (!authToken) {
+			throw new Error("User is not authenticated");
+		}
+		headers.Authorization = `Bearer ${authToken}`;
+	}
+
+	const response = await fetch(`${API_URL}${endpoint}`, {
+		method,
+		headers,
+		body: body ? JSON.stringify(body) : undefined,
+		credentials: options.csrfToken ? "include" : "omit",
+	});
+
+	const apiResponse: ApiResponse<T> = await response.json();
+
+	if (apiResponse.status === "Error") {
+		throw new Error(apiResponse.message || "An unexpected error occurred");
+	}
+
+	return apiResponse;
+}
diff --git a/frontend/middleware.ts b/frontend/middleware.ts
index 404163b..436f0a0 100644
--- a/frontend/middleware.ts
+++ b/frontend/middleware.ts
@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { ApiResponse } from "./hooks/use-api";
+import { ApiResponse } from "./types/types";
 import { API_URL } from "./lib/constants";
 import IUser from "./interfaces/IUser";
 
diff --git a/frontend/next.config.ts b/frontend/next.config.ts
index 90e8ba5..120939b 100644
--- a/frontend/next.config.ts
+++ b/frontend/next.config.ts
@@ -25,6 +25,10 @@ const nextConfig: NextConfig = {
 				protocol: "http",
 				hostname: "localhost",
 			},
+			{
+				protocol: "https",
+				hostname: "latosa.cems.dev",
+			},
 		],
 	},
 	env: {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e6fe6b4..e702846 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -24,6 +24,7 @@
 				"@radix-ui/react-slot": "^1.1.2",
 				"@radix-ui/react-switch": "^1.1.2",
 				"@radix-ui/react-tabs": "^1.1.2",
+				"@radix-ui/react-toast": "^1.2.6",
 				"@radix-ui/react-tooltip": "^1.1.6",
 				"@schedule-x/drag-and-drop": "^2.15.1",
 				"@schedule-x/event-modal": "^2.15.1",
@@ -38,7 +39,9 @@
 				"cookies-next": "^5.1.0",
 				"date-fns": "^3.6.0",
 				"embla-carousel-react": "^8.5.2",
+				"isomorphic-dompurify": "^2.21.0",
 				"lucide-react": "^0.471.1",
+				"marked": "^15.0.6",
 				"next": "15.1.4",
 				"next-themes": "^0.4.4",
 				"react": "^19.0.0",
@@ -50,6 +53,7 @@
 				"swr": "^2.3.0",
 				"tailwind-merge": "^2.6.0",
 				"tailwindcss-animate": "^1.0.7",
+				"yet-another-react-lightbox": "^3.21.7",
 				"zod": "^3.24.1"
 			},
 			"devDependencies": {
@@ -78,14 +82,127 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@emnapi/runtime": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.1.tgz",
-			"integrity": "sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==",
+		"node_modules/@asamuzakjp/css-color": {
+			"version": "2.8.3",
+			"resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-2.8.3.tgz",
+			"integrity": "sha512-GIc76d9UI1hCvOATjZPyHFmE5qhRccp3/zGfMPapK3jBi+yocEzp6BBB0UnfRYP9NP4FANqUZYb0hnfs3TM3hw==",
 			"license": "MIT",
-			"optional": true,
 			"dependencies": {
-				"tslib": "^2.4.0"
+				"@csstools/css-calc": "^2.1.1",
+				"@csstools/css-color-parser": "^3.0.7",
+				"@csstools/css-parser-algorithms": "^3.0.4",
+				"@csstools/css-tokenizer": "^3.0.3",
+				"lru-cache": "^10.4.3"
+			}
+		},
+		"node_modules/@csstools/color-helpers": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.1.tgz",
+			"integrity": "sha512-MKtmkA0BX87PKaO1NFRTFH+UnkgnmySQOvNxJubsadusqPEC2aJ9MOQiMceZJJ6oitUl/i0L6u0M1IrmAOmgBA==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"license": "MIT-0",
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@csstools/css-calc": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.1.tgz",
+			"integrity": "sha512-rL7kaUnTkL9K+Cvo2pnCieqNpTKgQzy5f+N+5Iuko9HAoasP+xgprVh7KN/MaJVvVL1l0EzQq2MoqBHKSrDrag==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"@csstools/css-parser-algorithms": "^3.0.4",
+				"@csstools/css-tokenizer": "^3.0.3"
+			}
+		},
+		"node_modules/@csstools/css-color-parser": {
+			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.7.tgz",
+			"integrity": "sha512-nkMp2mTICw32uE5NN+EsJ4f5N+IGFeCFu4bGpiKgb2Pq/7J/MpyLBeQ5ry4KKtRFZaYs6sTmcMYrSRIyj5DFKA==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"@csstools/color-helpers": "^5.0.1",
+				"@csstools/css-calc": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"@csstools/css-parser-algorithms": "^3.0.4",
+				"@csstools/css-tokenizer": "^3.0.3"
+			}
+		},
+		"node_modules/@csstools/css-parser-algorithms": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz",
+			"integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"@csstools/css-tokenizer": "^3.0.3"
+			}
+		},
+		"node_modules/@csstools/css-tokenizer": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz",
+			"integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/@eslint-community/eslint-utils": {
@@ -329,130 +446,6 @@
 				"url": "https://github.com/sponsors/nzakas"
 			}
 		},
-		"node_modules/@img/sharp-darwin-arm64": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz",
-			"integrity": "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==",
-			"cpu": [
-				"arm64"
-			],
-			"license": "Apache-2.0",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			},
-			"optionalDependencies": {
-				"@img/sharp-libvips-darwin-arm64": "1.0.4"
-			}
-		},
-		"node_modules/@img/sharp-darwin-x64": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz",
-			"integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==",
-			"cpu": [
-				"x64"
-			],
-			"license": "Apache-2.0",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			},
-			"optionalDependencies": {
-				"@img/sharp-libvips-darwin-x64": "1.0.4"
-			}
-		},
-		"node_modules/@img/sharp-libvips-darwin-arm64": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz",
-			"integrity": "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==",
-			"cpu": [
-				"arm64"
-			],
-			"license": "LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
-		"node_modules/@img/sharp-libvips-darwin-x64": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz",
-			"integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==",
-			"cpu": [
-				"x64"
-			],
-			"license": "LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
-		"node_modules/@img/sharp-libvips-linux-arm": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz",
-			"integrity": "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==",
-			"cpu": [
-				"arm"
-			],
-			"license": "LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
-		"node_modules/@img/sharp-libvips-linux-arm64": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz",
-			"integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==",
-			"cpu": [
-				"arm64"
-			],
-			"license": "LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
-		"node_modules/@img/sharp-libvips-linux-s390x": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz",
-			"integrity": "sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==",
-			"cpu": [
-				"s390x"
-			],
-			"license": "LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
 		"node_modules/@img/sharp-libvips-linux-x64": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz",
@@ -469,22 +462,6 @@
 				"url": "https://opencollective.com/libvips"
 			}
 		},
-		"node_modules/@img/sharp-libvips-linuxmusl-arm64": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz",
-			"integrity": "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==",
-			"cpu": [
-				"arm64"
-			],
-			"license": "LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
 		"node_modules/@img/sharp-libvips-linuxmusl-x64": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz",
@@ -501,72 +478,6 @@
 				"url": "https://opencollective.com/libvips"
 			}
 		},
-		"node_modules/@img/sharp-linux-arm": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz",
-			"integrity": "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==",
-			"cpu": [
-				"arm"
-			],
-			"license": "Apache-2.0",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			},
-			"optionalDependencies": {
-				"@img/sharp-libvips-linux-arm": "1.0.5"
-			}
-		},
-		"node_modules/@img/sharp-linux-arm64": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz",
-			"integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==",
-			"cpu": [
-				"arm64"
-			],
-			"license": "Apache-2.0",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			},
-			"optionalDependencies": {
-				"@img/sharp-libvips-linux-arm64": "1.0.4"
-			}
-		},
-		"node_modules/@img/sharp-linux-s390x": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz",
-			"integrity": "sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==",
-			"cpu": [
-				"s390x"
-			],
-			"license": "Apache-2.0",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			},
-			"optionalDependencies": {
-				"@img/sharp-libvips-linux-s390x": "1.0.4"
-			}
-		},
 		"node_modules/@img/sharp-linux-x64": {
 			"version": "0.33.5",
 			"resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz",
@@ -589,28 +500,6 @@
 				"@img/sharp-libvips-linux-x64": "1.0.4"
 			}
 		},
-		"node_modules/@img/sharp-linuxmusl-arm64": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz",
-			"integrity": "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==",
-			"cpu": [
-				"arm64"
-			],
-			"license": "Apache-2.0",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			},
-			"optionalDependencies": {
-				"@img/sharp-libvips-linuxmusl-arm64": "1.0.4"
-			}
-		},
 		"node_modules/@img/sharp-linuxmusl-x64": {
 			"version": "0.33.5",
 			"resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz",
@@ -633,63 +522,6 @@
 				"@img/sharp-libvips-linuxmusl-x64": "1.0.4"
 			}
 		},
-		"node_modules/@img/sharp-wasm32": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz",
-			"integrity": "sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==",
-			"cpu": [
-				"wasm32"
-			],
-			"license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
-			"optional": true,
-			"dependencies": {
-				"@emnapi/runtime": "^1.2.0"
-			},
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
-		"node_modules/@img/sharp-win32-ia32": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz",
-			"integrity": "sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==",
-			"cpu": [
-				"ia32"
-			],
-			"license": "Apache-2.0 AND LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
-		"node_modules/@img/sharp-win32-x64": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz",
-			"integrity": "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==",
-			"cpu": [
-				"x64"
-			],
-			"license": "Apache-2.0 AND LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
 		"node_modules/@isaacs/cliui": {
 			"version": "8.0.2",
 			"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -778,7 +610,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"license": "MIT",
 			"optional": true,
 			"os": [
 				"darwin"
@@ -794,7 +625,6 @@
 			"cpu": [
 				"x64"
 			],
-			"license": "MIT",
 			"optional": true,
 			"os": [
 				"darwin"
@@ -810,7 +640,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"license": "MIT",
 			"optional": true,
 			"os": [
 				"linux"
@@ -826,7 +655,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"license": "MIT",
 			"optional": true,
 			"os": [
 				"linux"
@@ -874,7 +702,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"license": "MIT",
 			"optional": true,
 			"os": [
 				"win32"
@@ -890,7 +717,6 @@
 			"cpu": [
 				"x64"
 			],
-			"license": "MIT",
 			"optional": true,
 			"os": [
 				"win32"
@@ -1907,6 +1733,163 @@
 				}
 			}
 		},
+		"node_modules/@radix-ui/react-toast": {
+			"version": "1.2.6",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.2.6.tgz",
+			"integrity": "sha512-gN4dpuIVKEgpLn1z5FhzT9mYRUitbfZq9XqN/7kkBMUgFTzTG8x/KszWJugJXHcwxckY8xcKDZPz7kG3o6DsUA==",
+			"license": "MIT",
+			"dependencies": {
+				"@radix-ui/primitive": "1.1.1",
+				"@radix-ui/react-collection": "1.1.2",
+				"@radix-ui/react-compose-refs": "1.1.1",
+				"@radix-ui/react-context": "1.1.1",
+				"@radix-ui/react-dismissable-layer": "1.1.5",
+				"@radix-ui/react-portal": "1.1.4",
+				"@radix-ui/react-presence": "1.1.2",
+				"@radix-ui/react-primitive": "2.0.2",
+				"@radix-ui/react-use-callback-ref": "1.1.0",
+				"@radix-ui/react-use-controllable-state": "1.1.0",
+				"@radix-ui/react-use-layout-effect": "1.1.0",
+				"@radix-ui/react-visually-hidden": "1.1.2"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-toast/node_modules/@radix-ui/react-collection": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.2.tgz",
+			"integrity": "sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==",
+			"license": "MIT",
+			"dependencies": {
+				"@radix-ui/react-compose-refs": "1.1.1",
+				"@radix-ui/react-context": "1.1.1",
+				"@radix-ui/react-primitive": "2.0.2",
+				"@radix-ui/react-slot": "1.1.2"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-toast/node_modules/@radix-ui/react-dismissable-layer": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz",
+			"integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==",
+			"license": "MIT",
+			"dependencies": {
+				"@radix-ui/primitive": "1.1.1",
+				"@radix-ui/react-compose-refs": "1.1.1",
+				"@radix-ui/react-primitive": "2.0.2",
+				"@radix-ui/react-use-callback-ref": "1.1.0",
+				"@radix-ui/react-use-escape-keydown": "1.1.0"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-toast/node_modules/@radix-ui/react-portal": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz",
+			"integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==",
+			"license": "MIT",
+			"dependencies": {
+				"@radix-ui/react-primitive": "2.0.2",
+				"@radix-ui/react-use-layout-effect": "1.1.0"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-toast/node_modules/@radix-ui/react-primitive": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz",
+			"integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==",
+			"license": "MIT",
+			"dependencies": {
+				"@radix-ui/react-slot": "1.1.2"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-toast/node_modules/@radix-ui/react-visually-hidden": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz",
+			"integrity": "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==",
+			"license": "MIT",
+			"dependencies": {
+				"@radix-ui/react-primitive": "2.0.2"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/@radix-ui/react-tooltip": {
 			"version": "1.1.6",
 			"resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.1.6.tgz",
@@ -2120,15 +2103,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@schedule-x/calendar": {
-<<<<<<< Updated upstream
 			"version": "2.17.0",
 			"resolved": "https://registry.npmjs.org/@schedule-x/calendar/-/calendar-2.17.0.tgz",
 			"integrity": "sha512-a/Rpf+yOKjTpiMXNmZzhzlsF1/NvbUL4CRglHlY4Dn/oK/d3bOA1Q++y/Qzsv77y+cM7Ly1zLVl2aFvJNqT7Zg==",
-=======
-			"version": "2.18.0",
-			"resolved": "https://registry.npmjs.org/@schedule-x/calendar/-/calendar-2.18.0.tgz",
-			"integrity": "sha512-ZnlYFD8P9dXxCsDpEMviOK8xVK4b871s+m4mWhLsIutyFUNwxFw/kVFtrMHCZhin2SRoh+pyXBfQqsHxQDMpmA==",
->>>>>>> Stashed changes
 			"license": "MIT",
 			"peer": true,
 			"peerDependencies": {
@@ -2258,6 +2235,13 @@
 				"@types/react": "^19.0.0"
 			}
 		},
+		"node_modules/@types/trusted-types": {
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+			"integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+			"license": "MIT",
+			"optional": true
+		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
 			"version": "8.19.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.19.1.tgz",
@@ -2517,6 +2501,15 @@
 				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
+		"node_modules/agent-base": {
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+			"integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 14"
+			}
+		},
 		"node_modules/ajv": {
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -2779,6 +2772,12 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+			"license": "MIT"
+		},
 		"node_modules/attr-accept": {
 			"version": "2.2.5",
 			"resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.5.tgz",
@@ -3088,6 +3087,18 @@
 				"simple-swizzle": "^0.2.2"
 			}
 		},
+		"node_modules/combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"license": "MIT",
+			"dependencies": {
+				"delayed-stream": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
 		"node_modules/commander": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
@@ -3152,6 +3163,19 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/cssstyle": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.2.1.tgz",
+			"integrity": "sha512-9+vem03dMXG7gDmZ62uqmRiMRNtinIZ9ZyuF6BdxzfOD+FdN5hretzynkn0ReS2DO2GSw76RWHs0UmJPI2zUjw==",
+			"license": "MIT",
+			"dependencies": {
+				"@asamuzakjp/css-color": "^2.8.2",
+				"rrweb-cssom": "^0.8.0"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/csstype": {
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
@@ -3166,6 +3190,19 @@
 			"dev": true,
 			"license": "BSD-2-Clause"
 		},
+		"node_modules/data-urls": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
+			"integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
+			"license": "MIT",
+			"dependencies": {
+				"whatwg-mimetype": "^4.0.0",
+				"whatwg-url": "^14.0.0"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/data-view-buffer": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
@@ -3234,7 +3271,6 @@
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
 			"integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"ms": "^2.1.3"
@@ -3248,6 +3284,12 @@
 				}
 			}
 		},
+		"node_modules/decimal.js": {
+			"version": "10.5.0",
+			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
+			"integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==",
+			"license": "MIT"
+		},
 		"node_modules/deep-is": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -3291,6 +3333,15 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
 		"node_modules/dequal": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
@@ -3341,6 +3392,15 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/dompurify": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz",
+			"integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
+			"license": "(MPL-2.0 OR Apache-2.0)",
+			"optionalDependencies": {
+				"@types/trusted-types": "^2.0.7"
+			}
+		},
 		"node_modules/dunder-proto": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -3410,6 +3470,18 @@
 				"node": ">=10.13.0"
 			}
 		},
+		"node_modules/entities": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=0.12"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
 		"node_modules/es-abstract": {
 			"version": "1.23.9",
 			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
@@ -4211,18 +4283,18 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/fsevents": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-			"hasInstallScript": true,
+		"node_modules/form-data": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+			"integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
 			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
+			},
 			"engines": {
-				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+				"node": ">= 6"
 			}
 		},
 		"node_modules/function-bind": {
@@ -4550,6 +4622,56 @@
 				"node": ">= 0.4"
 			}
 		},
+		"node_modules/html-encoding-sniffer": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
+			"integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
+			"license": "MIT",
+			"dependencies": {
+				"whatwg-encoding": "^3.1.1"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/http-proxy-agent": {
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+			"integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+			"license": "MIT",
+			"dependencies": {
+				"agent-base": "^7.1.0",
+				"debug": "^4.3.4"
+			},
+			"engines": {
+				"node": ">= 14"
+			}
+		},
+		"node_modules/https-proxy-agent": {
+			"version": "7.0.6",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+			"integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+			"license": "MIT",
+			"dependencies": {
+				"agent-base": "^7.1.2",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 14"
+			}
+		},
+		"node_modules/iconv-lite": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+			"license": "MIT",
+			"dependencies": {
+				"safer-buffer": ">= 2.1.2 < 3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/ignore": {
 			"version": "5.3.2",
 			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -4868,6 +4990,12 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/is-potential-custom-element-name": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+			"license": "MIT"
+		},
 		"node_modules/is-regex": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
@@ -5026,6 +5154,19 @@
 			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
 			"license": "ISC"
 		},
+		"node_modules/isomorphic-dompurify": {
+			"version": "2.21.0",
+			"resolved": "https://registry.npmjs.org/isomorphic-dompurify/-/isomorphic-dompurify-2.21.0.tgz",
+			"integrity": "sha512-IjBG/D6ApEiO6ciXvrzPqbE4xOLbjRTshSWRSeeycQVhvsxf1O9PhA7LoqwMYS0/2PKLNFJRugwsNV5UihtLxQ==",
+			"license": "MIT",
+			"dependencies": {
+				"dompurify": "^3.2.3",
+				"jsdom": "^26.0.0"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/iterator.prototype": {
 			"version": "1.1.5",
 			"resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
@@ -5087,6 +5228,46 @@
 				"js-yaml": "bin/js-yaml.js"
 			}
 		},
+		"node_modules/jsdom": {
+			"version": "26.0.0",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz",
+			"integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==",
+			"license": "MIT",
+			"dependencies": {
+				"cssstyle": "^4.2.1",
+				"data-urls": "^5.0.0",
+				"decimal.js": "^10.4.3",
+				"form-data": "^4.0.1",
+				"html-encoding-sniffer": "^4.0.0",
+				"http-proxy-agent": "^7.0.2",
+				"https-proxy-agent": "^7.0.6",
+				"is-potential-custom-element-name": "^1.0.1",
+				"nwsapi": "^2.2.16",
+				"parse5": "^7.2.1",
+				"rrweb-cssom": "^0.8.0",
+				"saxes": "^6.0.0",
+				"symbol-tree": "^3.2.4",
+				"tough-cookie": "^5.0.0",
+				"w3c-xmlserializer": "^5.0.0",
+				"webidl-conversions": "^7.0.0",
+				"whatwg-encoding": "^3.1.1",
+				"whatwg-mimetype": "^4.0.0",
+				"whatwg-url": "^14.1.0",
+				"ws": "^8.18.0",
+				"xml-name-validator": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"canvas": "^3.0.0"
+			},
+			"peerDependenciesMeta": {
+				"canvas": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/json-buffer": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -5249,6 +5430,18 @@
 				"react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
 			}
 		},
+		"node_modules/marked": {
+			"version": "15.0.6",
+			"resolved": "https://registry.npmjs.org/marked/-/marked-15.0.6.tgz",
+			"integrity": "sha512-Y07CUOE+HQXbVDCGl3LXggqJDbXDP2pArc2C1N1RRMN0ONiShoSsIInMd5Gsxupe7fKLpgimTV+HOJ9r7bA+pg==",
+			"license": "MIT",
+			"bin": {
+				"marked": "bin/marked.js"
+			},
+			"engines": {
+				"node": ">= 18"
+			}
+		},
 		"node_modules/math-intrinsics": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -5281,6 +5474,27 @@
 				"node": ">=8.6"
 			}
 		},
+		"node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"license": "MIT",
+			"dependencies": {
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
 		"node_modules/minimatch": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -5317,7 +5531,6 @@
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
 			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/mz": {
@@ -5457,6 +5670,12 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/nwsapi": {
+			"version": "2.2.16",
+			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz",
+			"integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==",
+			"license": "MIT"
+		},
 		"node_modules/object-assign": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -5674,6 +5893,18 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/parse5": {
+			"version": "7.2.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
+			"integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
+			"license": "MIT",
+			"dependencies": {
+				"entities": "^4.5.0"
+			},
+			"funding": {
+				"url": "https://github.com/inikulin/parse5?sponsor=1"
+			}
+		},
 		"node_modules/path-exists": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -6035,7 +6266,6 @@
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
 			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=6"
@@ -6328,6 +6558,12 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/rrweb-cssom": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
+			"integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==",
+			"license": "MIT"
+		},
 		"node_modules/run-parallel": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -6406,6 +6642,24 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"license": "MIT"
+		},
+		"node_modules/saxes": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+			"integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
+			"license": "ISC",
+			"dependencies": {
+				"xmlchars": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=v12.22.7"
+			}
+		},
 		"node_modules/scheduler": {
 			"version": "0.25.0",
 			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz",
@@ -6972,6 +7226,12 @@
 				"react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
 			}
 		},
+		"node_modules/symbol-tree": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+			"license": "MIT"
+		},
 		"node_modules/tailwind-merge": {
 			"version": "2.6.0",
 			"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
@@ -7087,6 +7347,24 @@
 				"node": ">=0.8"
 			}
 		},
+		"node_modules/tldts": {
+			"version": "6.1.77",
+			"resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.77.tgz",
+			"integrity": "sha512-lBpoWgy+kYmuXWQ83+R7LlJCnsd9YW8DGpZSHhrMl4b8Ly/1vzOie3OdtmUJDkKxcgRGOehDu5btKkty+JEe+g==",
+			"license": "MIT",
+			"dependencies": {
+				"tldts-core": "^6.1.77"
+			},
+			"bin": {
+				"tldts": "bin/cli.js"
+			}
+		},
+		"node_modules/tldts-core": {
+			"version": "6.1.77",
+			"resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.77.tgz",
+			"integrity": "sha512-bCaqm24FPk8OgBkM0u/SrEWJgHnhBWYqeBo6yUmcZJDCHt/IfyWBb+14CXdGi4RInMv4v7eUAin15W0DoA+Ytg==",
+			"license": "MIT"
+		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -7099,6 +7377,30 @@
 				"node": ">=8.0"
 			}
 		},
+		"node_modules/tough-cookie": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.1.tgz",
+			"integrity": "sha512-Ek7HndSVkp10hmHP9V4qZO1u+pn1RU5sI0Fw+jCU3lyvuMZcgqsNgc6CmJJZyByK4Vm/qotGRJlfgAX8q+4JiA==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"tldts": "^6.1.32"
+			},
+			"engines": {
+				"node": ">=16"
+			}
+		},
+		"node_modules/tr46": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
+			"integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
+			"license": "MIT",
+			"dependencies": {
+				"punycode": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/ts-api-utils": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz",
@@ -7336,6 +7638,61 @@
 			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
 			"license": "MIT"
 		},
+		"node_modules/w3c-xmlserializer": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+			"integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
+			"license": "MIT",
+			"dependencies": {
+				"xml-name-validator": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/webidl-conversions": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+			"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/whatwg-encoding": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+			"integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
+			"license": "MIT",
+			"dependencies": {
+				"iconv-lite": "0.6.3"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/whatwg-mimetype": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+			"integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/whatwg-url": {
+			"version": "14.1.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.0.tgz",
+			"integrity": "sha512-jlf/foYIKywAt3x/XWKZ/3rz8OSJPiWktjmk891alJUEjiVxKX9LEO92qH3hv4aJ0mN3MWPvGMCy8jQi95xK4w==",
+			"license": "MIT",
+			"dependencies": {
+				"tr46": "^5.0.0",
+				"webidl-conversions": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -7537,6 +7894,42 @@
 				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
+		"node_modules/ws": {
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+			"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": ">=5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
+				},
+				"utf-8-validate": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/xml-name-validator": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
+			"integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/xmlchars": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+			"license": "MIT"
+		},
 		"node_modules/yaml": {
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz",
@@ -7549,6 +7942,19 @@
 				"node": ">= 14"
 			}
 		},
+		"node_modules/yet-another-react-lightbox": {
+			"version": "3.21.7",
+			"resolved": "https://registry.npmjs.org/yet-another-react-lightbox/-/yet-another-react-lightbox-3.21.7.tgz",
+			"integrity": "sha512-dcdokNuCIl92f0Vl+uzeKULnQhztIGpoZFUMvtVNUPmtwsQWpqWufeieDPeg9JtFyVCcbj4vYw3V00DS0QNoWA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"react": ">=16.8.0",
+				"react-dom": ">=16.8.0"
+			}
+		},
 		"node_modules/yocto-queue": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 3bb6b0b..a75c49e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -25,6 +25,7 @@
 		"@radix-ui/react-slot": "^1.1.2",
 		"@radix-ui/react-switch": "^1.1.2",
 		"@radix-ui/react-tabs": "^1.1.2",
+		"@radix-ui/react-toast": "^1.2.6",
 		"@radix-ui/react-tooltip": "^1.1.6",
 		"@schedule-x/drag-and-drop": "^2.15.1",
 		"@schedule-x/event-modal": "^2.15.1",
@@ -39,7 +40,9 @@
 		"cookies-next": "^5.1.0",
 		"date-fns": "^3.6.0",
 		"embla-carousel-react": "^8.5.2",
+		"isomorphic-dompurify": "^2.21.0",
 		"lucide-react": "^0.471.1",
+		"marked": "^15.0.6",
 		"next": "15.1.4",
 		"next-themes": "^0.4.4",
 		"react": "^19.0.0",
@@ -51,6 +54,7 @@
 		"swr": "^2.3.0",
 		"tailwind-merge": "^2.6.0",
 		"tailwindcss-animate": "^1.0.7",
+		"yet-another-react-lightbox": "^3.21.7",
 		"zod": "^3.24.1"
 	},
 	"devDependencies": {
diff --git a/frontend/tailwind.config.ts b/frontend/tailwind.config.ts
index f256b7d..f7890c6 100644
--- a/frontend/tailwind.config.ts
+++ b/frontend/tailwind.config.ts
@@ -9,6 +9,9 @@ export default {
 	],
 	theme: {
 		extend: {
+			fontFamily: {
+				times: ["Times New Roman", "Times", "serif"],
+			},
 			colors: {
 				background: "hsl(var(--background))",
 				foreground: "hsl(var(--foreground))",
diff --git a/frontend/types/types.tsx b/frontend/types/types.tsx
index f880fbb..6a630db 100644
--- a/frontend/types/types.tsx
+++ b/frontend/types/types.tsx
@@ -1,43 +1,58 @@
+export interface Permission {
+	resource: string;
+	action: string;
+}
 // Role type as a string literal
-export type Role = 'admin' | 'user';
+export interface Role {
+	id: string;
+	name: string;
+	permissions: Permission[];
+}
 
 // Status type as a string literal
-export type Status = 'Active' | 'Inactive';
+export type Status = "Active" | "Inactive";
 
 // Event type (you can expand this type as needed based on your schema)
 export interface Event {
-  eventID: string;
-  title: string;
-  date: string; // Assuming ISO date string
+	eventID: string;
+	title: string;
+	date: string; // Assuming ISO date string
 }
 
 // Blog type (you may already have this defined as shown in your previous example)
 export interface Blog {
-  blogID: string;
-  slug: string;
-  content: string;
-  label?: string;
-  authorID: string;
-  published: string;
-  summary?: string;
-  image?: string;
-  href?: string;
+	blogID: string;
+	slug: string;
+	content: string;
+	label?: string;
+	authorID: string;
+	published: string;
+	summary?: string;
+	image?: string;
+	href?: string;
 
-  author: User; // Relation to User
+	author: User; // Relation to User
 }
 
 // User type definition
 export interface User {
-  userID: string; // UUID represented as a string
-  firstName: string;
-  lastName: string;
-  email: string;
-  password?: string; // Optional field, since it's omitted in the JSON
-  phone: string;
-  role: Role; // 'admin' or 'user'
-  createdAt: string; // ISO date string
-  updatedAt: string; // ISO date string
+	userId: string; // UUID represented as a string
+	firstname: string;
+	lastname: string;
+	email: string;
+	password?: string; // Optional field, since it's omitted in the JSON
+	phone: string;
+	role: Role; // 'admin' or 'user'
+	createdAt: string; // ISO date string
+	updatedAt: string; // ISO date string
 
-  events?: Event[]; // Many-to-many relation with Event (optional)
-  articles?: Blog[]; // One-to-many relation with Blog (optional)
+	events?: Event[]; // Many-to-many relation with Event (optional)
+	articles?: Blog[]; // One-to-many relation with Blog (optional)
+	roles?: Role[];
+}
+
+export interface ApiResponse<T> {
+	status: "Error" | "Success";
+	message: string;
+	data?: T;
 }
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..4f25f43
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+	"name": "latosa-escrima.fr",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {}
+}