From cebe5a7239ec1a71dda531dbb2530c5528c6fbe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= <nikola.derezic@gmail.com>
Date: Thu, 15 Feb 2024 15:52:27 +0100
Subject: [PATCH 1/2] delete forms were not wrapped in <Main>

---
 app/bill/[id]/delete/page.tsx     |  7 ++++++-
 app/location/[id]/delete/page.tsx |  7 ++++++-
 app/ui/BillDeleteForm.tsx         | 26 ++++++++++++--------------
 app/ui/LocationEditForm.tsx       |  4 ++--
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/app/bill/[id]/delete/page.tsx b/app/bill/[id]/delete/page.tsx
index 6b9d211..82edc3d 100644
--- a/app/bill/[id]/delete/page.tsx
+++ b/app/bill/[id]/delete/page.tsx
@@ -3,6 +3,7 @@ import { fetchLocationById } from '@/app/lib/actions/locationActions';
 import { LocationDeleteForm } from '@/app/ui/LocationDeleteForm';
 import { BillDeleteForm } from '@/app/ui/BillDeleteForm';
 import { fetchBillById } from '@/app/lib/actions/billActions';
+import { Main } from '@/app/ui/Main';
 
 export default async function Page({ params:{ id } }: { params: { id:string } }) {
     const [locationID, billID] = id.split('-');
@@ -13,5 +14,9 @@ export default async function Page({ params:{ id } }: { params: { id:string } })
         return(notFound());
     }
 
-    return (<BillDeleteForm location={location} bill={bill} />);
+    return (
+        <Main>
+            <BillDeleteForm location={location} bill={bill} />
+        </Main>
+    );
 }
\ No newline at end of file
diff --git a/app/location/[id]/delete/page.tsx b/app/location/[id]/delete/page.tsx
index f4d8d44..40c7b8e 100644
--- a/app/location/[id]/delete/page.tsx
+++ b/app/location/[id]/delete/page.tsx
@@ -1,6 +1,7 @@
 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 } }) {
 
@@ -10,5 +11,9 @@ export default async function Page({ params:{ id } }: { params: { id:string } })
         return(notFound());
     }
 
-    return (<LocationDeleteForm location={location} />);
+    return (
+        <Main>
+            <LocationDeleteForm location={location} />
+        </Main>
+    );
 }
\ No newline at end of file
diff --git a/app/ui/BillDeleteForm.tsx b/app/ui/BillDeleteForm.tsx
index f12fc50..7317d8f 100644
--- a/app/ui/BillDeleteForm.tsx
+++ b/app/ui/BillDeleteForm.tsx
@@ -20,20 +20,18 @@ export const BillDeleteForm:FC<BillDeleteFormProps> = ({ bill, location }) => {
 
 
     return(
-        <Main>
-            <div className="card card-compact card-bordered min-w-[20em] max-w-[90em] bg-base-100 shadow-s my-1">
-                <div className="card-body">
-                    <form action={dispatch}>
-                        <p className="py-6 px-6">
-                            Please confirm deletion of bill “<strong>{bill.name}</strong>” at “<strong>{location.name}</strong>”.
-                        </p>
-                        <div className="pt-4 text-center">
-                          <button className="btn btn-primary">Confim</button>
-                          <Link className="btn btn-neutral ml-3" href={`/bill/${location._id}-${bill._id}/edit/`}>Cancel</Link>
-                        </div>
-                    </form>
-                </div>
+        <div className="card card-compact card-bordered min-w-[20em] max-w-[90em] bg-base-100 shadow-s my-1">
+            <div className="card-body">
+                <form action={dispatch}>
+                    <p className="py-6 px-6">
+                        Please confirm deletion of bill “<strong>{bill.name}</strong>” at “<strong>{location.name}</strong>”.
+                    </p>
+                    <div className="pt-4 text-center">
+                        <button className="btn btn-primary">Confim</button>
+                        <Link className="btn btn-neutral ml-3" href={`/bill/${location._id}-${bill._id}/edit/`}>Cancel</Link>
+                    </div>
+                </form>
             </div>
-        </Main>
+        </div>
     )
 }
diff --git a/app/ui/LocationEditForm.tsx b/app/ui/LocationEditForm.tsx
index b1fdc29..78a5af5 100644
--- a/app/ui/LocationEditForm.tsx
+++ b/app/ui/LocationEditForm.tsx
@@ -37,7 +37,7 @@ export const LocationEditForm:FC<LocationEditFormProps> = ({ location, yearMonth
                                 <TrashIcon className="h-[1em] w-[1em] text-error text-2xl" />
                             </Link>
                     }
-                    <input id="locationName" name="locationName" type="text" placeholder="Naziv lokacije" className="input input-bordered w-full" defaultValue={location?.name ?? ""} />
+                    <input id="locationName" name="locationName" type="text" placeholder="Realestate name" className="input input-bordered w-full" defaultValue={location?.name ?? ""} />
                     <div id="status-error" aria-live="polite" aria-atomic="true">
                         {state.errors?.locationName &&
                         state.errors.locationName.map((error: string) => (
@@ -47,7 +47,7 @@ export const LocationEditForm:FC<LocationEditFormProps> = ({ location, yearMonth
                         ))}
                     </div>
 
-                    <textarea id="locationNotes" name="locationNotes" className="textarea textarea-bordered my-1 w-full block h-[8em]" placeholder="Opis" defaultValue={location?.notes ?? ""}></textarea>
+                    <textarea id="locationNotes" name="locationNotes" className="textarea textarea-bordered my-1 w-full block h-[8em]" placeholder="Description" defaultValue={location?.notes ?? ""}></textarea>
                     <div id="status-error" aria-live="polite" aria-atomic="true">
                         {state.errors?.locationNotes &&
                         state.errors.locationNotes.map((error: string) => (

From fb81e816e3b03a42c4306b81ddfd6fddcd10ba73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= <nikola.derezic@gmail.com>
Date: Thu, 15 Feb 2024 15:53:32 +0100
Subject: [PATCH 2/2] updated version in docker-compose

---
 docker-compose-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml
index 7733eb3..f013786 100644
--- a/docker-compose-deploy.yml
+++ b/docker-compose-deploy.yml
@@ -9,7 +9,7 @@ networks:
 
 services:
   web-app:
-    image: utility-bills-tracker:1.21.1
+    image: utility-bills-tracker:1.22.0
     networks:
       - traefik-network
       - mongo-network