Merge branch 'release/1.21.0'

app/login/page.tsx

@@ -39,12 +39,12 @@ const Page:FC = async () => {
  return (
     <Main>
       <h1 className="text-3xl font-bold text-center">
-        <span className="text-neutral-50 mr-3">Što je pristiglo?</span>
+        <span className="text-neutral-50 mr-3">Which bills are due?</span>
-        <span className="text-indigo-400">Što je plaćeno?</span>
+        <span className="text-indigo-400">Which are payed?</span>
-        <span className="text-neutral-50 ml-3">Koliki su mi troškovi?</span>
+        <span className="text-neutral-50 ml-3">How much are my expenses?</span>
       </h1>
-      <p className="p mt-[1em] text-center">To su pitanja na koje ova jednostavna i besplatna aplikacija daje odgovore ...</p>
+      <p className="p mt-[1em] text-center">These are the questions this simple and free app will help you with ...</p>
-      <p className="p mb-[1em] text-center">... isprobajte je i koristite potpuno besplatno!</p>
+      <p className="p mb-[1em] text-center">... try it & use it completly free!</p>
       <span className="text-center">
       {
         Object.values(providers).map((provider) => (
@@ -57,18 +57,18 @@ const Page:FC = async () => {
       <video className="m-auto mt-4" title="Demo osnovnih koraka u aplikaciji" role="img" data-js-id="hero" loop muted playsInline autoPlay poster="hero.png">
         <source src="/welcome-demo-vp9-25fps-1500bps.webm" type="video/webm" />
       </video>
-      <h1 className="text-2xl font-bold text-neutral-50 my-5">Automatsko prenošenje stavaka u idući mjesec</h1>
+      <h1 className="text-2xl font-bold text-neutral-50 my-5">Easy copy of expenditures</h1>
-      <p className="p mt-[1em]">Sve vaše nekretnine i popis računa se automatski prenosi u novi mjesec ... što znači da ne morate svaki puta sve kreirati iz početka!</p>
+      <p className="p mt-[1em]">All your realestate and utilitys are automatically copied to the next month, so you don't neeed to do it by hand.</p>
       <video className="m-auto mt-4" title="Demo kopiranja mjeseca" role="img" data-js-id="hero" loop muted playsInline autoPlay poster="bar-code-demo.png">
         <source src="/kopiranje-mjeseca-demo.webm" type="video/webm" />
       </video>
 
-      <h1 className="text-2xl font-bold text-neutral-50 my-5">Boja označava status računa</h1>
+      <h1 className="text-2xl font-bold text-neutral-50 my-5">Color signals status</h1>
-      <p className="p mt-[1em]">Jednim pogledom možete vidjeti na koji račun je zakačen PDF dokument i koji od računa je plaćen...</p>
+      <p className="p mt-[1em]">Each of trhe utility bills is color coded - at a glance you can see which bill was received and which one is payed.</p>
       <Image src="/status-color-demo.png" alt="Boje označavaju status računa" className="m-auto mt-4" width={423} height={145} />
 
-      <h1 className="text-2xl font-bold text-neutral-50 my-5">Prikaz 2D koda za plaćanje</h1>
+      <h1 className="text-2xl font-bold text-neutral-50 my-5">Extraction of 2D bar code</h1>
-      <p className="p mt-[1em]">Ako PDF dokument sadrži 2D kod uz plaćanje, on će automatski biti prikazan na stranici računa. Tako ga možete skenirati bez da otvarate PDF dokument...</p>
+      <p className="p mt-[1em]">If the attached dokument contains a 2D bar code, it is automatically extracted and shown on the page, so you can scan it without opening the PDF document.</p>
       <video className="m-auto mt-4" title="Demo generiranja 2D bar koda" role="img" data-js-id="hero" loop muted playsInline autoPlay poster="bar-code-demo.png">
         <source src="/bar-code-demo.webm" type="video/webm" />
       </video>

app/terms/page.tsx

@@ -28,14 +28,18 @@ const TermsPage = () =>
             <p>We reserve the right to modify or discontinue, temporarily or permanently, the App (or any part thereof) with or without notice.</p>
             <h2>6. Termination</h2>
             <p>We may terminate or suspend your access to the App immediately, without prior notice or liability, for any reason whatsoever, including without limitation if you breach the Terms.</p>
+
             <h2>7. Disclaimers</h2>
             <p>The App is provided on an “AS IS” and “AS AVAILABLE” basis. We disclaim all warranties of any kind, whether express or implied, including, but not limited to, the implied warranties of merchantability, fitness for a particular purpose, and non-infringement.</p>
+            <p><strong>2D Barcode Information Disclaimer:</strong> We do not assume responsibility for the information contained within the 2D barcodes presented by the App. The content encoded in 2D barcodes is generated based on the information provided by the users or derived from the documents uploaded by the user, and we do not verify or guarantee its accuracy or completeness. Users are advised to review and confirm the correctness of such content before using it. We are not liable for any losses or damages resulting from the use of the 2D barcodes, including but not limited to transactions or payments initiated based on the information contained in these barcodes that may be detrimental to the user.</p>
+
             <h2>8. Limitation of Liability</h2>
-            <p>In no event shall we be liable for any indirect, incidental, special, consequential or punitive damages, or any loss of profits or revenues, whether incurred directly or indirectly, or any loss of data, use, goodwill, or other intangible losses, resulting from</p>
+            <p>In no event shall we be liable for any indirect, incidental, special, consequential or punitive damages, or any loss of profits or revenues, whether incurred directly or indirectly, or any loss of data, use, goodwill, or other intangible losses, resulting from:</p>
             <ol>
                 <li>your access to or use of or inability to access or use the App;</li>
-                <li>any conduct or content of any third party on the App.</li>
+                <li>any conduct or content of any third party on the App;</li>
-            </ol>                
+                <li>the information contained within the 2D barcodes generated or presented by the App.</li>
+            </ol>
             <h2>9. Governing Law</h2>
             <p>These Terms shall be governed and construed in accordance with the laws of Croatia, without regard to its conflict of law provisions.</p>
             <h2>10. Changes</h2>

app/ui/AddLocationButton.tsx

@@ -11,10 +11,11 @@ export interface AddLocationButtonProps {
 
 export const AddLocationButton:React.FC<AddLocationButtonProps> = ({yearMonth}) =>
 <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="Add a new billing location">
+    <Link href={`/location/${ formatYearMonth(yearMonth) }/add`} className="card-body tooltip self-center" data-tip="Add a new realestate">
-        <span className='flex self-center' data-tip="Add a new billing location">
+        <span className='flex self-center mr-[-3em]' data-tip="Add a new realestate">
             <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]"  />
+            <span className="ml-1 mt-[.4em] text-xs text-left leading-[1.2em]">Add now<br/>realestate</span>
         </span>
     </Link>
 </div>;

app/ui/AddMonthButton.tsx

@@ -10,10 +10,11 @@ export interface AddMonthButtonProps {
 
 export const AddMonthButton:React.FC<AddMonthButtonProps> = ({ yearMonth }) =>
 <div className="card card-compact shadow-s mb-4">
-    <Link href={`/year-month/${formatYearMonth(yearMonth)}/add`} className='grid self-center tooltip' data-tip="Dodaj novi mjesec">
+    <Link href={`/year-month/${formatYearMonth(yearMonth)}/add`} className='grid self-center tooltip' data-tip="Add next month">
-        <span className='flex self-center'>
+        <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]"  />
+            <span className="ml-1 mt-1 text-xs text-left leading-[1.2em]">Add next<br/>month</span>
         </span>
     </Link>
 </div>;

app/ui/BillEditForm.tsx

@@ -134,6 +134,7 @@ export const BillEditForm:FC<BillEditFormProps> = ({ location, bill }) => {
                         <label className="cursor-pointer label p-2 grow bg-white">
                             <img src={barcodeImage} className="grow sm:max-w-[350px]" />
                         </label>
+                        <p className="text-xs my-1">After scanning the code make sure the information is correct.<br/>We are not liable in case of an incorrect payment.</p>
                     </div> : null
                 }
 

app/ui/PageFooter.tsx

@@ -8,9 +8,9 @@ export const PageFooter: React.FC = () =>
             <div>
                 <div className="flex items-center gap-2">
                     <Image src="/icon4.png" alt="logo" width={64} height={64}></Image>
-                    <div className="font-title inline-flex text-3xl font-black ml-2">Moje Režije</div>
+                    <div className="font-title inline-flex text-3xl font-black ml-2">Režije</div>
                 </div>
-                <p className="text-base-content/70 mb-5">Web aplikacija za vođenje evidencije o pristiglim i plaćenim režijskim troškovima</p>
+                <p className="text-base-content/70 mb-5">App for helping you keeping track of your utility bills.</p>
                 <Link href="/" className="link link-hover">Home</Link>
                 <Link href="/policy/" className="link link-hover">Privacy Policy</Link>
                 <Link href="/terms/" className="link link-hover">Terms of Service</Link>

app/ui/PageHeader.tsx

@@ -3,5 +3,5 @@ import Link from "next/link";
 
 export const PageHeader = () =>
 <div className="navbar bg-base-100 mb-6">
-    <Link className="btn btn-ghost text-xl" href="/"><Image src="/icon3.png" alt="logo" width={48} height={48} /> Moje Režije</Link>
+    <Link className="btn btn-ghost text-xl" href="/"><Image src="/icon3.png" alt="logo" width={48} height={48} /> Režije</Link>
 </div>

docker-compose-deploy.yml

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