Merge branch 'release/1.25.3'

app/[locale]/location/[id]/add/LocationAddPage.tsx

@@ -0,0 +1,6 @@
+import { LocationEditForm } from '@/app/ui/LocationEditForm';
+import { YearMonth } from '@/app/lib/db-types';
+
+export default async function LocationAddPage({ yearMonth }: { yearMonth:YearMonth }) {
+    return (<LocationEditForm yearMonth={yearMonth} />);
+}

app/[locale]/location/[id]/add/page.tsx

@@ -0,0 +1,11 @@
+import { parseYearMonth } from '@/app/lib/format';
+import LocationAddPage from './LocationAddPage';
+import { Main } from '@/app/ui/Main';
+
+export default async function Page({ params:{ id } }: { params: { id:string } }) {
+    return (
+        <Main>
+            <LocationAddPage yearMonth={ parseYearMonth(id) } />
+        </Main>
+    );
+}

app/[locale]/location/[id]/delete/LocationDeletePage.tsx

@@ -0,0 +1,14 @@
+import { notFound } from 'next/navigation';
+import { fetchLocationById } from '@/app/lib/actions/locationActions';
+import { LocationDeleteForm } from '@/app/ui/LocationDeleteForm';
+
+export const LocationDeletePage = async ({ locationId }: { locationId:string }) => {
+
+    const location = await fetchLocationById(locationId);
+
+    if (!location) {
+        return(notFound());
+    }
+
+    return (<LocationDeleteForm location={location} />);
+}

app/[locale]/location/[id]/delete/not-found.tsx

@@ -0,0 +1,6 @@
+import { NotFoundPage } from '@/app/ui/NotFoundPage';
+ 
+const BillingLocationNotFound = () =>
+<NotFoundPage title="404 Billing Location Not Found" description="Could not find the requested Billing Location." />;
+
+export default BillingLocationNotFound;

app/[locale]/location/[id]/delete/page.tsx

@@ -0,0 +1,19 @@
+import { notFound } from 'next/navigation';
+import { fetchLocationById } from '@/app/lib/actions/locationActions';
+import { LocationDeleteForm } from '@/app/ui/LocationDeleteForm';
+import { Main } from '@/app/ui/Main';
+
+export default async function Page({ params:{ id } }: { params: { id:string } }) {
+
+    const location = await fetchLocationById(id);
+
+    if (!location) {
+        return(notFound());
+    }
+
+    return (
+        <Main>
+            <LocationDeleteForm location={location} />
+        </Main>
+    );
+}

app/[locale]/location/[id]/edit/LocationEditPage.tsx

@@ -0,0 +1,16 @@
+import { notFound } from 'next/navigation';
+import { LocationEditForm } from '@/app/ui/LocationEditForm';
+import { fetchLocationById } from '@/app/lib/actions/locationActions';
+
+export default async function LocationEditPage({ locationId }: { locationId:string }) {
+
+    const location = await fetchLocationById(locationId);
+
+    if (!location) {
+        return(notFound());
+    }
+
+    const result = <LocationEditForm location={location} />;
+    
+    return (result);
+}

app/[locale]/location/[id]/edit/not-found.tsx

@@ -0,0 +1,6 @@
+import { NotFoundPage } from '@/app/ui/NotFoundPage';
+ 
+const BillingLocationNotFound = () =>
+<NotFoundPage title="404 Location Not Found" description="Could not find the requested Location." />;
+
+export default BillingLocationNotFound;

app/[locale]/location/[id]/edit/page.tsx

@@ -0,0 +1,15 @@
+import { Suspense } from 'react';
+import LocationEditPage from './LocationEditPage';
+import { Main } from '@/app/ui/Main';
+import { LocationEditFormSkeleton } from '@/app/ui/LocationEditForm';
+
+export default async function Page({ params:{ id } }: { params: { id:string } }) {
+
+    return (
+        <Main>
+            <Suspense fallback={<LocationEditFormSkeleton />}>
+                <LocationEditPage  locationId={id} />
+            </Suspense>
+        </Main>
+    );
+}

app/lib/actions/billActions.ts

@@ -26,7 +26,7 @@ export type State = {
 */
 const FormSchema = (t:IntlTemplateFn) => z.object({
     _id: z.string(),
-    billName: z.coerce.string().min(1, t("bill-name-required")),
+    billName: z.coerce.string().min(1, t("validation.bill-name-required")),
     billNotes: z.string(),
     payedAmount: z.string().nullable().transform((val, ctx) => {
 
@@ -39,7 +39,7 @@ const FormSchema = (t:IntlTemplateFn) => z.object({
         if (isNaN(parsed)) {
             ctx.addIssue({
                 code: z.ZodIssueCode.custom,
-                message: t("not-a-number"),
+                message: t("validation.not-a-number"),
             });
         
             // This is a special symbol you can use to
@@ -52,7 +52,7 @@ const FormSchema = (t:IntlTemplateFn) => z.object({
         if (parsed < 0) {
             ctx.addIssue({
                 code: z.ZodIssueCode.custom,
-                message: t("negative-number")
+                message: t("validation.negative-number")
             });
         
             // This is a special symbol you can use to
@@ -115,7 +115,7 @@ export const updateOrAddBill = withUser(async (user:AuthenticatedUser, locationI
 
     const { id: userId } = user;
 
-    const t = await getTranslations("bill-edit-form.validation");
+    const t = await getTranslations("bill-edit-form");
 
     // FormSchema
     const validatedFields = FormSchema(t)
@@ -131,7 +131,7 @@ export const updateOrAddBill = withUser(async (user:AuthenticatedUser, locationI
         console.log("updateBill.validation-error");
         return({
             errors: validatedFields.error.flatten().fieldErrors,
-            message: t("form-error-message"),
+            message: t("validation.form-error-message"),
         });
     }
 

app/lib/actions/locationActions.ts

@@ -25,7 +25,7 @@ export type State = {
 */
 const FormSchema = (t:IntlTemplateFn) => z.object({
     _id: z.string(),
-    locationName: z.coerce.string().min(1, t("location-name-required")),
+    locationName: z.coerce.string().min(1, t("validation.location-name-required")),
     locationNotes: z.string(),
   })
   // dont include the _id field in the response
@@ -42,7 +42,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat
 
     noStore();
 
-    const t = await getTranslations("location-edit-form.validation");
+    const t = await getTranslations("location-edit-form");
 
     const validatedFields = FormSchema(t).safeParse({
         locationName: formData.get('locationName'),

app/ui/AddLocationButton.tsx

@@ -11,11 +11,11 @@ export interface AddLocationButtonProps {
 
 export const AddLocationButton:React.FC<AddLocationButtonProps> = ({yearMonth}) => {
 
-    const t = useTranslations("home-page.add-location-button");
+    const t = useTranslations("home-page");
 
     return(
         <div className="card card-compact card-bordered bg-base-100 shadow-s my-1">
-            <Link href={`/location/${ formatYearMonth(yearMonth) }/add`} className="card-body tooltip self-center" data-tip={t("tooltip")}>
+            <Link href={`/location/${ formatYearMonth(yearMonth) }/add`} className="card-body tooltip self-center" data-tip={t("add-location-button.tooltip")}>
                 <span className='flex self-center mr-[-3em]'>
                     <HomeIcon className="h-[1em] w-[1em] cursor-pointer text-4xl" />
                     <PlusCircleIcon className="h-[1em] w-[1em] cursor-pointer text-xl text-green-500 ml-[-.6em] mt-[-.4em]"  />

app/ui/AddMonthButton.tsx

@@ -11,12 +11,12 @@ export interface AddMonthButtonProps {
 
 export const AddMonthButton:React.FC<AddMonthButtonProps> = ({ yearMonth }) => {
 
-    const t = useTranslations("home-page.add-month-button");
+    const t = useTranslations("home-page");
     const locale = useLocale();
 
     return(
         <div className="card card-compact shadow-s mb-4">
-            <Link href={`/${locale}/year-month/${formatYearMonth(yearMonth)}/add`} className='grid self-center tooltip' data-tip={t("tooltip")}>
+            <Link href={`/${locale}/year-month/${formatYearMonth(yearMonth)}/add`} className='grid self-center tooltip' data-tip={t("add-month-button.tooltip")}>
                 <span className='flex self-center mr-[-3em]'>
                     <CalendarDaysIcon className="h-[1em] w-[1em] cursor-pointer text-4xl"  />
                     <PlusCircleIcon className="h-[1em] w-[1em] cursor-pointer text-xl text-green-500 ml-[-.4em] mt-[-.4em]"  />

app/ui/BillDeleteForm.tsx

@@ -29,7 +29,7 @@ export const BillDeleteForm:FC<BillDeleteFormProps> = ({ bill, location }) => {
                         t.rich("text", {
                             bill_name:bill.name,
                             location_name:location.name,
-                            strong: (chunks:ReactNode) => `<strong>${chunks}</strong>`,
+                            strong: (chunks:ReactNode) => <strong>${chunks}</strong>,
                         })
                     }
                     </p>

app/ui/LocationCard.tsx

@@ -38,11 +38,7 @@ export const LocationCard:FC<LocationCardProps> = ({location: { _id, name, yearM
                 {
                     monthlyExpense > 0 ?
                     <p>
-                        {
+                        { t("payed-total") } <strong>${monthlyExpense}</strong>
-                            t.rich("payed-total", {
-                                amount: formatCurrency(monthlyExpense),
-                                strong: (chunks:ReactNode) => `<strong>${chunks}</strong>`
-                        })}
                     </p>
                     : null
                 }

app/ui/SelectLanguage.tsx

@@ -8,9 +8,9 @@ import { defaultLocale, localeNames, locales } from "../i18n";
 export const SelectLanguage: React.FC = () => {
     const currentPathname = usePathname();
 
-    const locale = useLocale();
+    const currentLocale = useLocale();
-    const secondLocale = locales.find((l) => l !== locale) as string;
+    const secondLocale = locales.find((l) => l !== currentLocale) as string;
-    const secondLocalePathname = defaultLocale === locale ? `/${secondLocale}${currentPathname}` : currentPathname.replace(`/${locale}/`, `/${secondLocale}/`);
+    const secondLocalePathname = defaultLocale === currentLocale ? `/${secondLocale}${currentPathname}` : currentPathname.replace(`/${currentLocale}`, `/${secondLocale}`);
 
     return (<Link className="btn btn-ghost text-xl self-end" href={secondLocalePathname}>{localeNames[secondLocale]}</Link>);
 }

docker-compose-deploy.yml

@@ -9,7 +9,7 @@ networks:
 
 services:
   web-app:
-    image: utility-bills-tracker:1.25.2
+    image: utility-bills-tracker:1.25.3
     networks:
       - traefik-network
       - mongo-network

messages/en.json

@@ -53,7 +53,7 @@
     "location-card": {
       "edit-card-tooltip": "Edit realestate",
       "add-bill-button-tooltip": "Add a new bill",
-      "payed-total": "Payed total: <strong>{amount}</strong>"
+      "payed-total": "Payed total:"
     },
     "month-card": {
       "payed-total-label": "Total monthly expenditure:"