From c615916be11613272999aec38dd6c214e94bb50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Thu, 15 Feb 2024 09:18:26 +0100 Subject: [PATCH 1/7] title page translated to english --- app/login/page.tsx | 22 +++++++++++----------- app/ui/PageFooter.tsx | 2 +- app/ui/PageHeader.tsx | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/login/page.tsx b/app/login/page.tsx index 175d48e..431beb5 100644 --- a/app/login/page.tsx +++ b/app/login/page.tsx @@ -39,12 +39,12 @@ const Page:FC = async () => { return (

- Što je pristiglo? - Što je plaćeno? - Koliki su mi troškovi? + Which bills are due? + Which are payed? + How much are my expenses?

-

To su pitanja na koje ova jednostavna i besplatna aplikacija daje odgovore ...

-

... isprobajte je i koristite potpuno besplatno!

+

These are the questions this simple and free app will help you with ...

+

... try it & use it completly free!

{ Object.values(providers).map((provider) => ( @@ -57,18 +57,18 @@ const Page:FC = async () => { -

Automatsko prenošenje stavaka u idući mjesec

-

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!

+

Easy copy of expenditures

+

All your realestate and utilitys are automatically copied to the next month, so you don't neeed to do it by hand.

-

Boja označava status računa

-

Jednim pogledom možete vidjeti na koji račun je zakačen PDF dokument i koji od računa je plaćen...

+

Color signals status

+

Each of trhe utility bills is color coded - at a glance you can see which bill was received and which one is payed.

Boje označavaju status računa -

Prikaz 2D koda za plaćanje

-

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...

+

Extraction of 2D bar code

+

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.

diff --git a/app/ui/PageFooter.tsx b/app/ui/PageFooter.tsx index 1ddbc3f..415cb2e 100644 --- a/app/ui/PageFooter.tsx +++ b/app/ui/PageFooter.tsx @@ -8,7 +8,7 @@ export const PageFooter: React.FC = () =>
logo -
Moje Režije
+
Režije

Web aplikacija za vođenje evidencije o pristiglim i plaćenim režijskim troškovima

Home diff --git a/app/ui/PageHeader.tsx b/app/ui/PageHeader.tsx index b304382..45867ce 100644 --- a/app/ui/PageHeader.tsx +++ b/app/ui/PageHeader.tsx @@ -3,5 +3,5 @@ import Link from "next/link"; export const PageHeader = () =>
- logo Moje Režije + logo Režije
\ No newline at end of file From 37e1c8df0ea52fc60b9d0bcd849e330b119feba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Thu, 15 Feb 2024 09:22:22 +0100 Subject: [PATCH 2/7] translation to english --- app/ui/AddMonthButton.tsx | 2 +- app/ui/PageFooter.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/ui/AddMonthButton.tsx b/app/ui/AddMonthButton.tsx index af8e0f9..d42ca99 100644 --- a/app/ui/AddMonthButton.tsx +++ b/app/ui/AddMonthButton.tsx @@ -10,7 +10,7 @@ export interface AddMonthButtonProps { export const AddMonthButton:React.FC = ({ yearMonth }) =>
- + diff --git a/app/ui/PageFooter.tsx b/app/ui/PageFooter.tsx index 415cb2e..62e47b5 100644 --- a/app/ui/PageFooter.tsx +++ b/app/ui/PageFooter.tsx @@ -10,7 +10,7 @@ export const PageFooter: React.FC = () => logo
Režije
-

Web aplikacija za vođenje evidencije o pristiglim i plaćenim režijskim troškovima

+

App for keeping track of your utility bills.

Home Privacy Policy Terms of Service From a55f90972c4fac185b61a620a528dd0fb58af4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Thu, 15 Feb 2024 09:34:06 +0100 Subject: [PATCH 3/7] added labels to buttons --- app/ui/AddLocationButton.tsx | 5 +++-- app/ui/AddMonthButton.tsx | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/ui/AddLocationButton.tsx b/app/ui/AddLocationButton.tsx index f0a7ff2..becd871 100644 --- a/app/ui/AddLocationButton.tsx +++ b/app/ui/AddLocationButton.tsx @@ -11,10 +11,11 @@ export interface AddLocationButtonProps { export const AddLocationButton:React.FC = ({yearMonth}) =>
- - + + + Add now
realestate
; \ No newline at end of file diff --git a/app/ui/AddMonthButton.tsx b/app/ui/AddMonthButton.tsx index d42ca99..204df8c 100644 --- a/app/ui/AddMonthButton.tsx +++ b/app/ui/AddMonthButton.tsx @@ -10,10 +10,11 @@ export interface AddMonthButtonProps { export const AddMonthButton:React.FC = ({ yearMonth }) =>
- - + + + Add next
month
; From eb82df387d420a9f4e79fcb9684b83078536dbb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Thu, 15 Feb 2024 09:34:13 +0100 Subject: [PATCH 4/7] translating to english --- app/ui/PageFooter.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/ui/PageFooter.tsx b/app/ui/PageFooter.tsx index 62e47b5..0e0cbf4 100644 --- a/app/ui/PageFooter.tsx +++ b/app/ui/PageFooter.tsx @@ -10,7 +10,7 @@ export const PageFooter: React.FC = () => logo
Režije
-

App for keeping track of your utility bills.

+

App for helping you keeping track of your utility bills.

Home Privacy Policy Terms of Service From 66037b7b7611596427317a6eecea626bd5b51aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Thu, 15 Feb 2024 09:38:29 +0100 Subject: [PATCH 5/7] added disclaimer under the 2d bar code --- app/ui/BillEditForm.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/app/ui/BillEditForm.tsx b/app/ui/BillEditForm.tsx index cf3253b..77fe2c4 100644 --- a/app/ui/BillEditForm.tsx +++ b/app/ui/BillEditForm.tsx @@ -134,6 +134,7 @@ export const BillEditForm:FC = ({ location, bill }) => { +

After scanning the code make sure the information is correct.
We are not liable in case of an incorrect payment.

: null } From 86fff7fa356f1c713a0f6599a86bda4b3b4c621f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Thu, 15 Feb 2024 09:50:51 +0100 Subject: [PATCH 6/7] modfied terms of service: added 2D bar code section --- app/terms/page.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/terms/page.tsx b/app/terms/page.tsx index 4c7eb8c..66f604b 100644 --- a/app/terms/page.tsx +++ b/app/terms/page.tsx @@ -28,14 +28,18 @@ const TermsPage = () =>

We reserve the right to modify or discontinue, temporarily or permanently, the App (or any part thereof) with or without notice.

6. Termination

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.

+

7. Disclaimers

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.

+

2D Barcode Information Disclaimer: 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.

+

8. Limitation of Liability

-

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

+

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:

  1. your access to or use of or inability to access or use the App;
    2. -
  2. any conduct or content of any third party on the App.
    3. -
+
  • any conduct or content of any third party on the App;
    • +
  • the information contained within the 2D barcodes generated or presented by the App.
    • +

    9. Governing Law

    These Terms shall be governed and construed in accordance with the laws of Croatia, without regard to its conflict of law provisions.

    10. Changes

    From c2e9eec350e3a0665fd3c6e195d5937450705f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Thu, 15 Feb 2024 09:51:22 +0100 Subject: [PATCH 7/7] updated version in compose file --- 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 87b18ae..1a9209f 100644 --- a/docker-compose-deploy.yml +++ b/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