WIP: cohesion grid

.github/workflows/build.yml

@@ -1,6 +1,8 @@
 name: Build Nginx-based docker image
 on:
   push:
+    branches:
+      - main
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true
@@ -23,31 +25,12 @@ jobs:
           username: ${{ secrets.PRIVATE_REGISTRY_USERNAME }}
           password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
         
-      - name: Build and push intermediate stages (deps)
+      - name: Build and push
         uses: docker/build-push-action@v6
         with:
           context: .
-          target: deps
+          push: ${{ github.event_name != 'pull_request' }}
-          push: ${{ github.ref == 'refs/heads/main' }}
+          tags: |
-          tags: ${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:deps
+            ${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:latest
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:deps
+          cache-from: type=registry,ref=user/app:latest
-          cache-to: type=inline
-
-      - name: Build and push intermediate stages (builder)
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          target: builder
-          push: ${{ github.ref == 'refs/heads/main' }}
-          tags: ${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:builder
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:builder
-          cache-to: type=inline
-        
-      - name: Build and push (final)
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: ${{ github.ref == 'refs/heads/main' }}
-          tags: ${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:latest
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:latest
           cache-to: type=inline

.github/workflows/copyright_notice.yml

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

.nvmrc

@@ -1 +1 @@
-23.11.0
+23.4.0

app/[slug]/dashboard/expenses/page.tsx

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

app/[slug]/dashboard/guests/page.tsx

@@ -1,12 +1,9 @@
-/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/
+/* Copyright (C) 2024 Manuel Bustillo*/
 
 'use client';
 
 import { AbstractApi, } from '@/app/api/abstract-api';
-import { Group, GroupSerializer } from '@/app/lib/group';
 import { Guest, GuestSerializer } from '@/app/lib/guest';
-import { getCsrfToken, getSlug } from '@/app/lib/utils';
-import AffinitiesFormDialog from '@/app/ui/components/affinities-form-dialog';
 import { classNames } from '@/app/ui/components/button';
 import GroupFormDialog from '@/app/ui/components/group-form-dialog';
 import GuestFormDialog from '@/app/ui/components/guest-form-dialog';
@@ -15,6 +12,7 @@ import SkeletonTable from '@/app/ui/guests/skeleton-row';
 import GuestsTable from '@/app/ui/guests/table';
 import { TabPanel, TabView } from 'primereact/tabview';
 import { Suspense, useState } from 'react';
+import { Group, GroupSerializer } from '@/app/lib/group';
 
 
 export default function Page() {
@@ -32,22 +30,10 @@ export default function Page() {
     });
   }
 
-  function resetAffinities() {
-    fetch(`/api/${getSlug()}/groups/affinities/reset`, {
-      method: 'POST',
-      headers: {
-        'Accept': 'application/json',
-        'X-CSRF-TOKEN': getCsrfToken(),
-      }
-    })
-  }
-
   const [groupsLoaded, setGroupsLoaded] = useState(false);
   const [groups, setGroups] = useState<Array<Group>>([]);
   const [groupBeingEdited, setGroupBeingEdited] = useState<Group | undefined>(undefined);
 
-  const [groupAffinitiesBeingEditted, setGroupAffinitiesBeingEditted] = useState<Group | undefined>(undefined);
-
   const [guestsLoaded, setGuestsLoaded] = useState(false);
   const [guests, setGuests] = useState<Array<Guest>>([]);
   const [guestBeingEdited, setGuestBeingEdited] = useState<Guest | undefined>(undefined);
@@ -81,11 +67,7 @@ export default function Page() {
         <TabPanel header="Groups" leftIcon="pi pi-sitemap mx-2">
           <div className="flex flex-col w-full items-center justify-between">
 
-            <div>
             <button onClick={() => setGroupBeingEdited({})} className={classNames('primary')}>Add new</button>
-              <button onClick={resetAffinities} className={classNames('yellow')}>Reset affinities</button>
-            </div>
-
             <GroupFormDialog
               key={groupBeingEdited?.id}
               groups={groups}
@@ -95,23 +77,22 @@ export default function Page() {
               onHide={() => { setGroupBeingEdited(undefined) }}
             />
 
-            <AffinitiesFormDialog
-              groups={groups}
-              group={groupAffinitiesBeingEditted}
-              visible={groupAffinitiesBeingEditted !== undefined}
-              onHide={() => { setGroupAffinitiesBeingEditted(undefined) }}
-            />
-
             <Suspense fallback={<SkeletonTable />}>
               <GroupsTable
                 groups={groups}
                 onUpdate={refreshGroups}
                 onEdit={(group) => setGroupBeingEdited(group)}
-                onEditAffinities={(group) => setGroupAffinitiesBeingEditted(group)}
               />
             </Suspense>
           </div>
         </ TabPanel>
+        <TabPanel header="Affinities" leftIcon="pi pi-heart mx-2">
+          <div className="flex flex-col w-full items-center justify-between">
+          <Suspense fallback={<SkeletonTable />}>
+            <GroupsAffinityTable groups = {groups}/>
+          </Suspense>
+          </div>
+        </TabPanel>
       </ TabView>
     </div>
 

app/[slug]/dashboard/layout.tsx

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

app/[slug]/dashboard/page.tsx

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

app/[slug]/dashboard/tables/page.tsx

@@ -1,42 +1,16 @@
-/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/
+/* Copyright (C) 2024 Manuel Bustillo*/
 
 'use client';
 
-import { AbstractApi } from '@/app/api/abstract-api';
-import { TableSimulation, TableSimulationSerializer } from '@/app/lib/tableSimulation';
 import Arrangement from '@/app/ui/arrangements/arrangement';
+import React, { useState } from 'react';
 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() {
-  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);
 
-  function createSimulation() {
-    const api = new AbstractApi<TableSimulation>();
-    const serializer = new TableSimulationSerializer();
-    api.create(serializer, new TableSimulation(), show);
-  }
-
   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} />
       {currentArrangement && <Arrangement key={currentArrangement} id={currentArrangement} />}
     </>

app/[slug]/page.tsx

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

app/api/abstract-api.tsx

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

app/api/authentication.tsx

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

app/api/captcha.tsx

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

app/api/health/route.ts

@@ -1,7 +0,0 @@
-/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/
-
-import { NextResponse } from "next/server";
-
-export function GET() {
-  return NextResponse.json({});
-}

app/api/tableSimulations.tsx

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

app/layout.tsx

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

app/lib/affinities.tsx

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

app/lib/affinity.ts

@@ -0,0 +1,31 @@
+import { Entity } from "./definitions";
+
+export class Affinity implements Entity {
+  id?: string;
+  groupId: string;
+  affinities: { [key: string]: number };
+
+  constructor(id: string, groupId: string, affinities: { [key: string]: number }) {
+    this.id = id;
+    this.groupId = groupId;
+    this.affinities = affinities;
+  }
+}
+
+export class AffinitySerializer {
+  fromJson(json: any): Affinity {
+    return new Affinity(json.id, json.groupId, json.affinities);
+  }
+
+  toJson(affinity: Affinity): any {
+    return {
+      id: affinity.id,
+      groupId: affinity.groupId,
+      affinities: affinity.affinities
+    };
+  }
+
+  apiPath(): string {
+    return 'affinities';
+  }
+}

app/lib/definitions.ts

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

app/lib/expense.tsx

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

app/lib/group.tsx

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

app/lib/guest.tsx

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

app/lib/tableSimulation.tsx

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

app/lib/utils.ts

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

app/types.tsx

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

app/ui/arrangements/arrangement.tsx

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

app/ui/arrangements/arrangements-table.tsx

@@ -1,4 +1,4 @@
-/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/
+/* Copyright (C) 2024 Manuel Bustillo*/
 
 'use client'
 
@@ -7,11 +7,8 @@ import { TableArrangement } from '@/app/lib/definitions';
 import { classNames } from "../components/button";
 import TableOfContents from "../components/table-of-contents";
 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 [arrangementsLoaded, setArrangementsLoaded] = useState(false);
 
@@ -28,17 +25,14 @@ export default function ArrangementsTable({ onArrangementSelected }: { onArrange
   
     !arrangementsLoaded && refreshSimulations();
 
-  return (
+    return(
       <TableOfContents
-      headers={['Name', 'Discomfort', 'Actions', 'Status']}
+        headers={['Name', 'Discomfort', 'Actions']}
         caption='Simulations'
         elements={arrangements}
         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}
             </th>
             <td className="px-6 py-4">
@@ -47,15 +41,6 @@ export default function ArrangementsTable({ onArrangementSelected }: { onArrange
             <td>
                 <button data-arrangement-id={arrangement.id} onClick={arrangementClicked} className={classNames('primary')}>Load</button>
             </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>
         )}
       />

app/ui/button.tsx

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

app/ui/components/affinities-form-dialog.tsx

@@ -1,82 +0,0 @@
-/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/
-
-'use client';
-
-import { Affinities } from '@/app/lib/affinities';
-import { Group } from '@/app/lib/group';
-import { getCsrfToken, getSlug } from '@/app/lib/utils';
-import { classNames } from '@/app/ui/components/button';
-import { Dialog } from 'primereact/dialog';
-import { useEffect, useState } from 'react';
-import AffinitySlider from './form/affinitySlider';
-
-export default function AffinitiesFormDialog({ groups, group, visible, onHide }: {
-  groups: Group[],
-  group?: Group,
-  visible: boolean,
-  onHide: () => void,
-}) {
-  const [affinities, setAffinities] = useState<Affinities>({});
-  const [isLoadingAffinities, setIsLoadingAffinities] = useState(true);
-
-  useEffect(() => {
-    setIsLoadingAffinities(true);
-    if (group?.id === undefined) {
-      setAffinities({});
-      setIsLoadingAffinities(false)
-    } else {
-      fetch(`/api/${getSlug()}/groups/${group?.id}/affinities`)
-        .then((response) => response.json())
-        .then((data) => {
-          setAffinities(data);
-          setIsLoadingAffinities(false)
-        });
-    }
-  }, [group]);
-
-  function submitAffinities() {
-    const formattedAffinities = Object.entries(affinities).map(([groupId, affinity]) => ({ group_id: groupId, affinity: affinity }));
-    fetch(`/api/${getSlug()}/groups/${group?.id}/affinities/bulk_update`, {
-      method: 'PUT',
-      headers: {
-        'Content-Type': 'application/json',
-        'X-CSRF-TOKEN': getCsrfToken(),
-      },
-      body: JSON.stringify({ affinities: formattedAffinities })
-    }).then(() => {
-      onHide();
-    });
-  }
-
-  function resetAffinities() {
-    fetch(`/api/${getSlug()}/groups/${group?.id}/affinities/default`, {
-      method: 'GET',
-      headers: {
-        'Accept': 'application/json',
-      }
-    }).then((response) => response.json())
-      .then(setAffinities);
-  }
-
-  return (
-    <Dialog header="Update affinities" visible={visible} style={{ width: '60vw' }} onHide={onHide}>
-      {!isLoadingAffinities && <div className="card justify-evenly py-5 bg-gray-200 flex flex-col">
-        <span className="text-center p-4">Describe the affinity with the rest of the groups</span>
-
-        {
-          groups.filter((currentGroup) => currentGroup.id !== group?.id).map((group) =>
-            <div key={group.id} className="flex flex-row hover:bg-gray-300 px-3 py-2 items-center">
-              <span className="w-1/3 text-right px-4">{group.name}</span>
-              <AffinitySlider value={group.id && affinities[group.id] || 1} onChange={(value) => setAffinities({ ...affinities, [group.id || "default"]: value })} />
-            </div>)
-        }
-
-        <div className="flex justify-center">
-          <button className={classNames('gray')} onClick={resetAffinities} >Reset</button>
-          <button className={classNames('primary')} onClick={submitAffinities} >Update</button>
-        </div>
-      </div>
-      }
-    </Dialog>
-  );
-}

app/ui/components/button.tsx

@@ -1,15 +1,14 @@
-/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/
+/* Copyright (C) 2024 Manuel Bustillo*/
 
 import clsx from "clsx";
 
-type ButtonColor = 'primary' | 'blue' | 'green' | 'red' | 'yellow' | 'gray';
+type ButtonColor = 'primary' | 'blue' | 'green' | 'red' | 'yellow';
 
 export function classNames(type: ButtonColor) {
     return (clsx("text-white py-1 px-2 mx-1 rounded disabled:opacity-50 disabled:cursor-not-allowed", {
         'bg-blue-400 hover:bg-blue-600': type === 'primary' || type === 'blue',
         'bg-green-500 hover:bg-green-600': type === 'green',
         'bg-red-500 hover:bg-red-600': type === 'red',
-        'bg-yellow-500 hover:bg-yellow-700': type === 'yellow',
+        'bg-yellow-500 hover:bg-yellow-700': type === 'yellow'
-        'bg-gray-500 hover:bg-gray-700': type === 'gray'
     }))
 }

app/ui/components/dashboard-cards.tsx

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

app/ui/components/expense-form-dialog.tsx

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

app/ui/components/form/affinitySlider.tsx

@@ -1,40 +0,0 @@
-/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/
-
-import { Slider } from 'primereact/slider';
-
-export default function AffinitySlider({ value, onChange }: { value: number, onChange: (value: number) => void }) {
-
-  const toNumber = (value : number | [number, number])  => {
-    if(value instanceof Array) {
-      return value[0];
-    }
-    return value;
-  }
-
-  const label = (value: number) => {
-    if (value < 0.2) {
-      return 'Nemesis';
-    } else if (value < 0.5) {
-      return 'Enemies';
-    } else if (value < 0.9) {
-      return 'Bad vibes';
-    } else if (value < 1.1) {
-      return 'Neutral';
-    } else if (value < 1.5) {
-      return 'Good vibes';
-    } else if (value < 1.8) {
-      return 'Good friends';
-    } else {
-      return 'Besties';
-    }
-  }
-
-  return (
-    <>
-      <Slider value={value} min={0} max={2} step={.1} onChange={(e) => onChange(toNumber(e.value))} className='w-80 bg-gray-400' />
-      <span className="px-4 w-1/5">
-        {label(value)}
-      </span>
-    </>
-  )
-}

app/ui/components/form/inlineTextField.tsx

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

app/ui/components/group-form-dialog.tsx

@@ -1,18 +1,19 @@
-/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/
+/* Copyright (C) 2024 Manuel Bustillo*/
 
 'use client';
 
-import { AbstractApi } from '@/app/api/abstract-api';
-import { Group, GroupSerializer } from '@/app/lib/group';
 import { classNames } from '@/app/ui/components/button';
-import { ColorPicker } from 'primereact/colorpicker';
 import { Dialog } from 'primereact/dialog';
+import { ColorPicker } from 'primereact/colorpicker';
 import { Dropdown } from 'primereact/dropdown';
 import { FloatLabel } from 'primereact/floatlabel';
 import { InputText } from 'primereact/inputtext';
 import { useState } from 'react';
+import { Group, GroupSerializer } from '@/app/lib/group';
+import { ApiError } from 'next/dist/server/api-utils';
+import { AbstractApi } from '@/app/api/abstract-api';
 
-export default function GroupFormDialog({ groups, onCreate, onHide, group, visible }: {
+export default function GroupFormDialog({groups, onCreate, onHide, group, visible }: {
   groups: Group[],
   onCreate?: () => void,
   onHide: () => void,

app/ui/components/guest-form-dialog.tsx

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

app/ui/components/login-form.tsx

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

app/ui/components/registration-form.tsx

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

app/ui/components/table-of-contents.tsx

@@ -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 }) {
     return (

app/ui/components/table.tsx

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

app/ui/dashboard/global-summary.tsx

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

app/ui/dashboard/loading.tsx

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

app/ui/dashboard/nav-links.tsx

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

app/ui/dashboard/sidenav.tsx

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

app/ui/expenses/table.tsx

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

app/ui/fonts.ts

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

app/ui/groups/affinities.tsx

@@ -0,0 +1,11 @@
+'use client'
+
+import { Group } from "@/app/lib/group"
+
+
+export default function Affinities({groups, affinities}: {groups: Group[], affinities: {[key: string]: number}[]}) {
+  return (
+    <>
+    </>
+  )
+}

app/ui/groups/table.tsx

@@ -1,19 +1,18 @@
-/* Copyright (C) 2024-2025 LibreWeddingPlanner contributors*/
+/* Copyright (C) 2024 Manuel Bustillo*/
 
 'use client';
 
 import { AbstractApi } from '@/app/api/abstract-api';
 import { Group, GroupSerializer } from '@/app/lib/group';
-import { AdjustmentsHorizontalIcon, PencilIcon, TrashIcon } from '@heroicons/react/24/outline';
+import { PencilIcon, TrashIcon } from '@heroicons/react/24/outline';
 import { Column } from 'primereact/column';
 import { TreeNode } from 'primereact/treenode';
 import { TreeTable } from 'primereact/treetable';
 
-export default function GroupsTable({ groups, onUpdate, onEdit, onEditAffinities }: {
+export default function GroupsTable({ groups, onUpdate, onEdit }: {
   groups: Group[],
   onUpdate: () => void,
   onEdit: (group: Group) => void,
-  onEditAffinities: (group: Group) => void,
 }) {
 
   const api = new AbstractApi<Group>();
@@ -23,7 +22,6 @@ export default function GroupsTable({ groups, onUpdate, onEdit, onEditAffinities
     <div className="flex flex-row items-center">
       <TrashIcon className='size-6 cursor-pointer' onClick={() => { api.destroy(serializer, group, onUpdate) }} />
       <PencilIcon className='size-6 cursor-pointer' onClick={() => onEdit(group)} />
-      <AdjustmentsHorizontalIcon className='size-6 cursor-pointer' onClick={() => onEditAffinities(group)} />
     </div>
   );
 
@@ -35,7 +33,6 @@ export default function GroupsTable({ groups, onUpdate, onEdit, onEditAffinities
     return acc;
   }, new Map());
 
-  groups.forEach(group => group.children = []);
   groups.forEach(group => {
     if (group.parentId) {
       const parent = index.get(group.parentId);

app/ui/guests/skeleton-row.tsx

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

app/ui/guests/table.tsx

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

app/ui/search.tsx

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

app/ui/skeleton.tsx

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

package.json

@@ -8,31 +8,31 @@
   "dependencies": {
     "@heroicons/react": "^2.1.4",
     "@tailwindcss/forms": "^0.5.7",
-    "autoprefixer": "10.4.21",
+    "autoprefixer": "10.4.20",
     "bcrypt": "^5.1.1",
     "clsx": "^2.1.1",
-    "next": "15.3.1",
+    "next": "15.0.3",
     "next-auth": "5.0.0-beta.25",
-    "postcss": "8.5.3",
+    "postcss": "8.4.49",
     "primeicons": "^7.0.0",
     "primereact": "^10.8.2",
     "react": "19.0.0-rc-f38c22b244-20240704",
     "react-dom": "19.0.0-rc-f38c22b244-20240704",
-    "tailwindcss": "3.4.17",
+    "tailwindcss": "3.4.16",
-    "typescript": "5.8.3",
+    "typescript": "5.7.2",
     "use-debounce": "^10.0.1",
-    "uuid": "11.1.0",
+    "uuid": "11.0.3",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@playwright/test": "^1.46.0",
     "@types/bcrypt": "^5.0.2",
-    "@types/node": "22.14.1",
+    "@types/node": "22.10.2",
-    "@types/react": "18.3.20",
+    "@types/react": "18.3.12",
-    "@types/react-dom": "18.3.6"
+    "@types/react-dom": "18.3.5"
   },
   "engines": {
     "node": ">=23.0.0"
   },
-  "packageManager": "pnpm@9.15.9+sha512.68046141893c66fad01c079231128e9afb89ef87e2691d69e4d40eee228988295fd4682181bae55b58418c3a253bde65a505ec7c5f9403ece5cc3cd37dcf2531"
+  "packageManager": "pnpm@9.15.0+sha512.76e2379760a4328ec4415815bcd6628dee727af3779aaa4c914e3944156c4299921a89f976381ee107d41f12cfa4b66681ca9c718f0668fa0831ed4c6d8ba56c"
 }