Compare commits

..

No commits in common. "main" and "reset-all-affinities" have entirely different histories.

52 changed files with 404 additions and 1311 deletions

View File

@ -16,7 +16,7 @@ jobs:
ref: ${{ github.head_ref }} ref: ${{ github.head_ref }}
- uses: VinnyBabuManjaly/copyright-action@v1.0.0 - uses: VinnyBabuManjaly/copyright-action@v1.0.0
with: with:
CopyrightString: '/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/\n\n' CopyrightString: '/* Copyright (C) 2024 Manuel Bustillo*/\n\n'
FileType: '.tsx, .jsx, .ts' FileType: '.tsx, .jsx, .ts'
Path: 'app/, config/, db/' Path: 'app/, config/, db/'
IgnorePath: 'testfolder1/a/, testfolder3' IgnorePath: 'testfolder1/a/, testfolder3'

2
.nvmrc
View File

@ -1 +1 @@
23.11.1 23.6.0

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client' 'use client'

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';
@ -14,15 +14,10 @@ import GroupsTable from '@/app/ui/groups/table';
import SkeletonTable from '@/app/ui/guests/skeleton-row'; import SkeletonTable from '@/app/ui/guests/skeleton-row';
import GuestsTable from '@/app/ui/guests/table'; import GuestsTable from '@/app/ui/guests/table';
import { TabPanel, TabView } from 'primereact/tabview'; import { TabPanel, TabView } from 'primereact/tabview';
import { Toast } from 'primereact/toast'; import { Suspense, useState } from 'react';
import { Suspense, useRef, useState } from 'react';
import InvitationsBoard from '@/app/ui/invitations/board';
import { Invitation, InvitationSerializer } from '@/app/lib/invitation';
export default function Page() { export default function Page() {
const toast = useRef<Toast>(null);
function refreshGuests() { function refreshGuests() {
new AbstractApi<Guest>().getAll(new GuestSerializer(), (objects: Guest[]) => { new AbstractApi<Guest>().getAll(new GuestSerializer(), (objects: Guest[]) => {
setGuests(objects); setGuests(objects);
@ -37,13 +32,6 @@ export default function Page() {
}); });
} }
function refreshInvitations() {
new AbstractApi<Invitation>().getAll(new InvitationSerializer(), (objects: Invitation[]) => {
setInvitations(objects);
setInvitationsLoaded(true);
});
}
function resetAffinities() { function resetAffinities() {
fetch(`/api/${getSlug()}/groups/affinities/reset`, { fetch(`/api/${getSlug()}/groups/affinities/reset`, {
method: 'POST', method: 'POST',
@ -52,24 +40,6 @@ export default function Page() {
'X-CSRF-TOKEN': getCsrfToken(), 'X-CSRF-TOKEN': getCsrfToken(),
} }
}) })
.then(response => {
if (response.ok) {
showAffinitiesResetSuccess();
} else {
console.error('Failed to reset affinities');
}
})
.catch(error => {
console.error('Error resetting affinities:', error);
});
}
function showAffinitiesResetSuccess() {
toast.current?.show({
severity: 'success',
summary: 'Affinities reset',
detail: 'All affinities have been reset to default values.'
});
} }
const [groupsLoaded, setGroupsLoaded] = useState(false); const [groupsLoaded, setGroupsLoaded] = useState(false);
@ -82,13 +52,8 @@ export default function Page() {
const [guests, setGuests] = useState<Array<Guest>>([]); const [guests, setGuests] = useState<Array<Guest>>([]);
const [guestBeingEdited, setGuestBeingEdited] = useState<Guest | undefined>(undefined); const [guestBeingEdited, setGuestBeingEdited] = useState<Guest | undefined>(undefined);
const [invitationsLoaded, setInvitationsLoaded] = useState(false);
const [invitations, setInvitations] = useState<Array<Invitation>>([]);
const [invitationBeingEdited, setInvitationBeingEdited] = useState<Invitation | undefined>(undefined);
!groupsLoaded && refreshGroups(); !groupsLoaded && refreshGroups();
!guestsLoaded && refreshGuests(); !guestsLoaded && refreshGuests();
!invitationsLoaded && refreshInvitations();
return ( return (
<div className="w-full"> <div className="w-full">
@ -117,7 +82,6 @@ export default function Page() {
<div className="flex flex-col w-full items-center justify-between"> <div className="flex flex-col w-full items-center justify-between">
<div> <div>
<Toast ref={toast} />
<button onClick={() => setGroupBeingEdited({})} className={classNames('primary')}>Add new</button> <button onClick={() => setGroupBeingEdited({})} className={classNames('primary')}>Add new</button>
<button onClick={resetAffinities} className={classNames('yellow')}>Reset affinities</button> <button onClick={resetAffinities} className={classNames('yellow')}>Reset affinities</button>
</div> </div>
@ -148,9 +112,6 @@ export default function Page() {
</Suspense> </Suspense>
</div> </div>
</ TabPanel> </ TabPanel>
<TabPanel header="Invitations" leftIcon="pi pi-envelope mx-2">
<InvitationsBoard guests={guests} invitations={invitations}/>
</TabPanel>
</ TabView> </ TabView>
</div> </div>

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import SideNav from '@/app/ui/dashboard/sidenav'; import SideNav from '@/app/ui/dashboard/sidenav';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client' 'use client'

View File

@ -1,42 +1,16 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';
import { AbstractApi } from '@/app/api/abstract-api';
import { TableSimulation, TableSimulationSerializer } from '@/app/lib/tableSimulation';
import Arrangement from '@/app/ui/arrangements/arrangement'; import Arrangement from '@/app/ui/arrangements/arrangement';
import React, { useState } from 'react';
import ArrangementsTable from '@/app/ui/arrangements/arrangements-table'; import ArrangementsTable from '@/app/ui/arrangements/arrangements-table';
import { classNames } from '@/app/ui/components/button';
import { Toast } from 'primereact/toast';
import React, { useRef, useState } from 'react';
export default function Page() { export default function Page() {
const toast = useRef<Toast>(null);
const show = () => {
toast.current?.show({
severity: 'success',
summary: 'Simulation created',
detail: 'Table distributions will be calculated shortly, please come back in some minutes'
});
};
const [currentArrangement, setCurrentArrangement] = useState<string | null>(null); const [currentArrangement, setCurrentArrangement] = useState<string | null>(null);
function createSimulation() {
const api = new AbstractApi<TableSimulation>();
const serializer = new TableSimulationSerializer();
api.create(serializer, new TableSimulation(), show);
}
return ( return (
<> <>
<div className="flex flex-col w-full items-center justify-between">
<Toast ref={toast} />
<button onClick={createSimulation} className={classNames('primary')}>Add new</button>
</div>
<ArrangementsTable onArrangementSelected={setCurrentArrangement} /> <ArrangementsTable onArrangementSelected={setCurrentArrangement} />
{currentArrangement && <Arrangement key={currentArrangement} id={currentArrangement} />} {currentArrangement && <Arrangement key={currentArrangement} id={currentArrangement} />}
</> </>

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';

View File

@ -1,10 +1,10 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { Entity } from '@/app/lib/definitions'; import { Entity } from '@/app/lib/definitions';
import { getCsrfToken, getSlug } from '@/app/lib/utils'; import { getCsrfToken, getSlug } from '@/app/lib/utils';
export interface Api<T extends Entity> { export interface Api<T extends Entity> {
getAll(serializable: Serializable<T>, callback: (objets: T[]) => void): void; getAll(serializable: Serializable<T> ,callback: (objets: T[]) => void): void;
get(serializable: Serializable<T>, id: string, callback: (object: T) => void): void; get(serializable: Serializable<T>, id: string, callback: (object: T) => void): void;
create(serializable: Serializable<T>, object: T, callback: () => void): void; create(serializable: Serializable<T>, object: T, callback: () => void): void;
update(serializable: Serializable<T>, object: T, callback: () => void): void; update(serializable: Serializable<T>, object: T, callback: () => void): void;
@ -52,7 +52,7 @@ export class AbstractApi<T extends Entity> implements Api<T> {
.catch((error) => console.error(error)); .catch((error) => console.error(error));
} }
create(serializable: Serializable<T>, object: T, callback: (createdObject: T) => void): void { create(serializable: Serializable<T>, object: T, callback: () => void): void {
fetch(`/api/${getSlug()}/${serializable.apiPath()}`, { fetch(`/api/${getSlug()}/${serializable.apiPath()}`, {
method: 'POST', method: 'POST',
body: serializable.toJson(object), body: serializable.toJson(object),
@ -60,11 +60,7 @@ export class AbstractApi<T extends Entity> implements Api<T> {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'X-CSRF-TOKEN': getCsrfToken(), 'X-CSRF-TOKEN': getCsrfToken(),
} }
}) }).then(callback)
.then((response) => response.json())
.then((data) => {
callback(serializable.fromJson(data));
})
.catch((error) => console.error(error)); .catch((error) => console.error(error));
} }

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { asArray, getCsrfToken, getSlug } from '@/app/lib/utils'; import { asArray, getCsrfToken, getSlug } from '@/app/lib/utils';
import { Captcha, StructuredErrors, User } from '@/app/lib/definitions'; import { Captcha, StructuredErrors, User } from '@/app/lib/definitions';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { data } from "autoprefixer"; import { data } from "autoprefixer";
import { getCsrfToken } from "../lib/utils"; import { getCsrfToken } from "../lib/utils";

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { NextResponse } from "next/server"; import { NextResponse } from "next/server";

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { TableArrangement } from '@/app/lib/definitions'; import { TableArrangement } from '@/app/lib/definitions';
import { getSlug } from '../lib/utils'; import { getSlug } from '../lib/utils';
@ -12,7 +12,6 @@ export function loadTableSimulations(onLoad?: (tableSimulations: TableArrangemen
id: record.id, id: record.id,
name: record.name, name: record.name,
discomfort: record.discomfort, discomfort: record.discomfort,
valid: record.valid,
}); });
})); }));
}, (error) => { }, (error) => {

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import '@/app/ui/global.css' import '@/app/ui/global.css'

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
export class Affinities { export class Affinities {
[key:string]: number; [key:string]: number;

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { AttendanceSummary } from "./group"; import { AttendanceSummary } from "./group";
import { Guest } from "./guest"; import { Guest } from "./guest";
@ -12,8 +12,7 @@ export type TableArrangement = {
number: number; number: number;
name: string; name: string;
guests?: Guest[]; guests?: Guest[];
discomfort?: number; discomfort?: number
valid?: boolean;
} }
export type User = { export type User = {

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { Serializable } from "../api/abstract-api"; import { Serializable } from "../api/abstract-api";
import { Entity } from "./definitions"; import { Entity } from "./definitions";

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { Entity } from "./definitions"; import { Entity } from "./definitions";

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { Serializable } from "../api/abstract-api"; import { Serializable } from "../api/abstract-api";
import { Entity } from "./definitions"; import { Entity } from "./definitions";

View File

@ -1,28 +0,0 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/
import { Entity } from "./definitions";
import { Guest } from "./guest";
export class Invitation implements Entity {
id?: string;
guests: Array<Guest>;
constructor(id?: string, guests: Array<Guest> = []) {
this.id = id;
this.guests = guests;
}
}
export class InvitationSerializer {
fromJson(data: any): Invitation {
return new Invitation(data.id, (data.guests || []).map((guest: any) => new Guest(guest.id, guest.name, guest.group_name, guest.groupId, guest.color, guest.status, guest.children)));
}
toJson(invitation: Invitation): string {
return JSON.stringify({ invitation: { guest_ids: invitation.guests.map(guest => guest.id) } });
}
apiPath(): string {
return 'invitations';
}
}

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { Serializable } from "../api/abstract-api"; import { Serializable } from "../api/abstract-api";
import { Entity } from "./definitions"; import { Entity } from "./definitions";
@ -19,12 +19,12 @@ export type Table = {
} }
export class TableSimulation implements Entity { export class TableSimulation implements Entity {
id?: string; id: string;
tables: Table[]; tables: Table[];
constructor(id?: string, tables?: Table[]) { constructor(id: string, tables: Table[]) {
this.id = id; this.id = id;
this.tables = tables || []; this.tables = tables;
} }
} }

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
export const getCsrfToken = () => { export const getCsrfToken = () => {
return document.cookie return document.cookie

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import * as HeroIcon from '@heroicons/react/24/outline' import * as HeroIcon from '@heroicons/react/24/outline'
import { ComponentProps } from 'react' import { ComponentProps } from 'react'

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client' 'use client'
@ -7,11 +7,8 @@ import { TableArrangement } from '@/app/lib/definitions';
import { classNames } from "../components/button"; import { classNames } from "../components/button";
import TableOfContents from "../components/table-of-contents"; import TableOfContents from "../components/table-of-contents";
import { loadTableSimulations } from "@/app/api/tableSimulations"; import { loadTableSimulations } from "@/app/api/tableSimulations";
import { ArchiveBoxXMarkIcon, CheckBadgeIcon } from "@heroicons/react/24/outline";
import { Tooltip } from "primereact/tooltip";
import clsx from "clsx";
export default function ArrangementsTable({ onArrangementSelected }: { onArrangementSelected: (arrangementId: string) => void }) { export default function ArrangementsTable ({onArrangementSelected}: {onArrangementSelected: (arrangementId: string) => void}) {
const [arrangements, setArrangements] = useState<Array<TableArrangement>>([]); const [arrangements, setArrangements] = useState<Array<TableArrangement>>([]);
const [arrangementsLoaded, setArrangementsLoaded] = useState(false); const [arrangementsLoaded, setArrangementsLoaded] = useState(false);
@ -28,17 +25,14 @@ export default function ArrangementsTable({ onArrangementSelected }: { onArrange
!arrangementsLoaded && refreshSimulations(); !arrangementsLoaded && refreshSimulations();
return ( return(
<TableOfContents <TableOfContents
headers={['Name', 'Discomfort', 'Actions', 'Status']} headers={['Name', 'Discomfort', 'Actions']}
caption='Simulations' caption='Simulations'
elements={arrangements} elements={arrangements}
rowRender={(arrangement) => ( rowRender={(arrangement) => (
<tr key={arrangement.id} className={clsx("border-b", { <tr key={arrangement.id} className="bg-white border-b odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800">
"bg-white odd:bg-white even:bg-gray-50": arrangement.valid, <th scope="row" className="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
"bg-red-50 odd:bg-red-50 even:bg-red-100": !arrangement.valid
})}>
<th scope="row" className="px-6 py-4 font-medium text-gray-900 whitespace-nowrap">
{arrangement.name} {arrangement.name}
</th> </th>
<td className="px-6 py-4"> <td className="px-6 py-4">
@ -47,15 +41,6 @@ export default function ArrangementsTable({ onArrangementSelected }: { onArrange
<td> <td>
<button data-arrangement-id={arrangement.id} onClick={arrangementClicked} className={classNames('primary')}>Load</button> <button data-arrangement-id={arrangement.id} onClick={arrangementClicked} className={classNames('primary')}>Load</button>
</td> </td>
<td>
<Tooltip target=".tooltip-status" />
{
arrangement.valid ?
<CheckBadgeIcon className='size-6 tooltip-status' data-pr-position="right" data-pr-tooltip="Simulation is valid" /> :
<ArchiveBoxXMarkIcon className='size-6 tooltip-status' data-pr-position="right" data-pr-tooltip="Simulation is expired due to attendance or affinity changes" />
}
</td>
</tr> </tr>
)} )}
/> />

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import clsx from 'clsx'; import clsx from 'clsx';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import clsx from "clsx"; import clsx from "clsx";

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import clsx from "clsx" import clsx from "clsx"
import { Icon } from "../../types"; import { Icon } from "../../types";

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { Slider } from 'primereact/slider'; import { Slider } from 'primereact/slider';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import React, { useState } from 'react'; import React, { useState } from 'react';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
export default function TableOfContents<Type>({ headers, caption, elements, rowRender }: { headers: string[], caption: string, elements: Type[], rowRender: (element: Type) => JSX.Element }) { export default function TableOfContents<Type>({ headers, caption, elements, rowRender }: { headers: string[], caption: string, elements: Type[], rowRender: (element: Type) => JSX.Element }) {
return ( return (

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { Guest } from "@/app/lib/guest"; import { Guest } from "@/app/lib/guest";
import { Table as TableType } from "@/app/lib/tableSimulation"; import { Table as TableType } from "@/app/lib/tableSimulation";

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { GlobalSummary as Summary} from '@/app/lib/definitions'; import { GlobalSummary as Summary} from '@/app/lib/definitions';
import { MainCard, SecondaryCard } from '../components/dashboard-cards'; import { MainCard, SecondaryCard } from '../components/dashboard-cards';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
export default function Loading() { export default function Loading() {
return <div>Loading...</div>; return <div>Loading...</div>;

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client' 'use client'

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client' 'use client'

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import { Inter, Lusitana, Gloria_Hallelujah} from 'next/font/google'; import { Inter, Lusitana, Gloria_Hallelujah} from 'next/font/google';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
import Skeleton from '@/app/ui/skeleton'; import Skeleton from '@/app/ui/skeleton';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';

View File

@ -1,187 +0,0 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/
'use client';
import { AbstractApi } from "@/app/api/abstract-api";
import { Guest } from "@/app/lib/guest";
import { Invitation, InvitationSerializer } from "@/app/lib/invitation";
import { draggable, dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
import { TrashIcon } from "@heroicons/react/24/outline";
import { useEffect, useRef } from "react";
import { useState } from "react";
function InvitationCard({ invitation, allGuests, onGuestAdded, onDestroy }: {
invitation: Invitation,
allGuests: Guest[],
onGuestAdded: (guest: Guest) => void,
onDestroy: (invitation: Invitation) => void
}
) {
const [guests, setGuests] = useState<Guest[]>(invitation.guests);
const ref = useRef<HTMLDivElement | null>(null);
const api = new AbstractApi<Invitation>();
const serializer = new InvitationSerializer();
useEffect(() => {
if (ref.current) {
return dropTargetForElements({
element: ref.current,
onDrop: (data) => {
const guestId = data.source.element.dataset.guestId;
if (guestId) {
const guestToAdd = allGuests.find((guest) => guest.id === guestId);
if (guestToAdd) {
setGuests((prevGuests) => [...prevGuests, guestToAdd]);
invitation.guests.push(guestToAdd);
api.update(serializer, invitation, () => {
onGuestAdded(guestToAdd);
});
}
}
},
});
}
}, []);
return (
<div
key={invitation.id}
ref={ref}
className="relative flex items-center justify-center w-full bg-green-800 border border-green-900 group"
style={{ aspectRatio: "1.618 / 1" }}
>
<TrashIcon
className="w-5 h-5 text-white absolute top-2 right-2 opacity-0 group-hover:opacity-100 cursor-pointer"
onClick={() => {
if (window.confirm("Are you sure you want to delete this invitation?")) {
api.destroy(serializer, invitation, () => {
onDestroy(invitation);
});
}
}}
/>
{guests.length === 0 ? (
<p className="text-center text-yellow-500 text-lg italic">
(empty invitation)
</p>
) : (
<ul className="text-center text-yellow-500 text-lg">
{guests.map((guest) => (
<li key={guest.id}>{guest.name}</li>
))}
</ul>
)}
</div>
)
}
function GuestCard(guest: Guest) {
const ref = useRef<HTMLDivElement | null>(null);
useEffect(() => {
if (ref.current) {
return draggable({
element: ref.current,
});
}
}, [guest.id]);
return (
<div
key={guest.id}
ref={ref}
className="mb-4 p-4 border border-gray-300 rounded-lg shadow-sm bg-white cursor-move"
draggable="true"
data-guest-id={guest.id}>
<h3 className="text-md font-medium">{guest.name}</h3>
</div>
)
}
export default function InvitationsBoard({ guests, invitations: originalInvitations }: {
guests: Array<Guest>,
invitations: Array<Invitation>
}) {
const api = new AbstractApi<Invitation>();
const serializer = new InvitationSerializer();
const [invitations, setInvitations] = useState<Invitation[]>(originalInvitations);
const [unassignedGuests, setUnassignedGuests] = useState<Guest[]>(
guests.filter(
(guest) =>
guest.status !== 'considered' &&
!invitations.some((invitation) =>
invitation.guests.some((invitedGuest) => invitedGuest.id === guest.id)
)
)
);
// Sort invitations to display those without guests at the top
const sortedInvitations = [...invitations].sort((a, b) => {
if (a.guests.length === 0 && b.guests.length > 0) return -1;
if (a.guests.length > 0 && b.guests.length === 0) return 1;
return 0;
});
function handleCreateInvitation() {
api.create(serializer, new Invitation(), (createdInvitation) => {
setInvitations((prevInvitations) => [createdInvitation, ...prevInvitations]);
});
}
return (
<div className="flex h-screen">
{/* Left Column: Guests */}
<div className="w-1/4 h-full overflow-auto border-r border-gray-300 p-4">
<h2 className="text-lg font-semibold mb-4">{unassignedGuests.length} guests without invitation</h2>
<div>
{unassignedGuests.map((guest) => (
<GuestCard key={guest.id} {...guest} />
))}
</div>
</div>
{/* Right Column: Invitations */}
<div className="w-3/4 h-full overflow-auto p-4">
<h2 className="text-lg font-semibold mb-4">
{invitations.length} invitations
</h2>
<button
onClick={handleCreateInvitation}
className="mb-4 px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600"
>
Create New Invitation
</button>
<div className="grid grid-cols-4 gap-6">
{sortedInvitations.map((invitation) => (
<InvitationCard
key={invitation.id}
invitation={invitation}
allGuests={guests}
onGuestAdded={(guestAdded: Guest) => {
setUnassignedGuests((prevUnassignedGuests) => prevUnassignedGuests.filter(g => g.id !== guestAdded.id));
}}
onDestroy={(invitationToDestroy: Invitation) => {
setInvitations((prevInvitations) => prevInvitations.filter(i => i.id !== invitationToDestroy.id));
setUnassignedGuests((prevUnassignedGuests) => [
...prevUnassignedGuests,
...invitationToDestroy.guests
]);
}}
/>
))}
</div>
</div>
</div>
);
}

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
'use client'; 'use client';

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/ /* Copyright (C) 2024 Manuel Bustillo*/
export default function Skeleton({ className }: { className: string }) { export default function Skeleton({ className }: { className: string }) {
return <div className={`bg-slate-200 motion-safe:animate-pulse rounded ${className}`} />; return <div className={`bg-slate-200 motion-safe:animate-pulse rounded ${className}`} />;

View File

@ -6,34 +6,33 @@
"start": "next start" "start": "next start"
}, },
"dependencies": { "dependencies": {
"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
"@heroicons/react": "^2.1.4", "@heroicons/react": "^2.1.4",
"@tailwindcss/forms": "^0.5.7", "@tailwindcss/forms": "^0.5.7",
"autoprefixer": "10.4.21", "autoprefixer": "10.4.20",
"bcrypt": "^5.1.1", "bcrypt": "^5.1.1",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"next": "15.3.3", "next": "15.1.4",
"next-auth": "5.0.0-beta.28", "next-auth": "5.0.0-beta.25",
"postcss": "8.5.4", "postcss": "8.4.49",
"primeicons": "^7.0.0", "primeicons": "^7.0.0",
"primereact": "^10.8.2", "primereact": "^10.8.2",
"react": "19.0.0-rc-f38c22b244-20240704", "react": "19.0.0-rc-f38c22b244-20240704",
"react-dom": "19.0.0-rc-f38c22b244-20240704", "react-dom": "19.0.0-rc-f38c22b244-20240704",
"tailwindcss": "3.4.17", "tailwindcss": "3.4.17",
"typescript": "5.8.3", "typescript": "5.7.3",
"use-debounce": "^10.0.1", "use-debounce": "^10.0.1",
"uuid": "11.1.0", "uuid": "11.0.5",
"zod": "^3.23.8" "zod": "^3.23.8"
}, },
"devDependencies": { "devDependencies": {
"@playwright/test": "^1.46.0", "@playwright/test": "^1.46.0",
"@types/bcrypt": "^5.0.2", "@types/bcrypt": "^5.0.2",
"@types/node": "22.15.29", "@types/node": "22.10.5",
"@types/react": "18.3.23", "@types/react": "18.3.18",
"@types/react-dom": "18.3.7" "@types/react-dom": "18.3.5"
}, },
"engines": { "engines": {
"node": ">=23.0.0" "node": ">=23.0.0"
}, },
"packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977" "packageManager": "pnpm@9.15.3+sha512.1f79bc245a66eb0b07c5d4d83131240774642caaa86ef7d0434ab47c0d16f66b04e21e0c086eb61e62c77efc4d7f7ec071afad3796af64892fae66509173893a"
} }

1207
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff