From dbf9e64573f3ec9b5221373f9b61d8b276dacc68 Mon Sep 17 00:00:00 2001 From: YamiHeike Date: Sat, 23 Nov 2024 12:37:56 +0100 Subject: [PATCH 01/10] removed hero margin from addDisaster view --- src/main/resources/templates/addDisaster.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/addDisaster.html b/src/main/resources/templates/addDisaster.html index a0d8f519..7cb11fd5 100644 --- a/src/main/resources/templates/addDisaster.html +++ b/src/main/resources/templates/addDisaster.html @@ -5,7 +5,7 @@ -
+

Dodaj Zdarzenie

Wprowadź informacje o nowym zdarzeniu. Pamiętaj, że fałszywe zgłoszenia zostaną wykryte.

From 70bcfceb5d05d30e126eecd7652f69ec0fa60a81 Mon Sep 17 00:00:00 2001 From: YamiHeike Date: Sat, 23 Nov 2024 13:53:43 +0100 Subject: [PATCH 02/10] added toasts instead of blank messages and editUser description --- src/main/resources/templates/fragments.html | 2 +- src/main/resources/templates/login.html | 12 ++++++++- src/main/resources/templates/updateUser.html | 27 +++++++++++++++----- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html index 324185d2..ee93cf96 100644 --- a/src/main/resources/templates/fragments.html +++ b/src/main/resources/templates/fragments.html @@ -47,7 +47,7 @@
-

+

diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index b5dd7da6..7d2a324e 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -18,7 +18,17 @@

Spokój zaczyna się od ostrzeżenia

-
+
Niepoprawny login lub hasło
Wylogowano
diff --git a/src/main/resources/templates/updateUser.html b/src/main/resources/templates/updateUser.html index f5b7cbad..6de33b67 100644 --- a/src/main/resources/templates/updateUser.html +++ b/src/main/resources/templates/updateUser.html @@ -9,11 +9,22 @@
-

Aktualizacja danych

-

Aktualizuj informacje

+

Edycja profilu

+

Zaktualizuj dane. Bądź na bieżąco z doniesieniami ze swojego regionu. Pamiętaj, że usunięcie lub niedodanie numeru telefonu skutkuje rezygnacją z alertów SMS

-
+ +
@@ -55,17 +66,19 @@

Aktualizacja danych Usuń numer telefonu +
+ Nieprawidłowy format numeru telefonu +

-
- Nieprawidłowy format numeru telefonu -
+
- + +
From f5a7b9290c8e0197d5e9707563d830d7d5d598eb Mon Sep 17 00:00:00 2001 From: YamiHeike Date: Sat, 23 Nov 2024 14:26:49 +0100 Subject: [PATCH 03/10] Altered views in editUser --- src/main/resources/templates/addDisaster.html | 2 +- src/main/resources/templates/updateUser.html | 24 +++++++------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/main/resources/templates/addDisaster.html b/src/main/resources/templates/addDisaster.html index 7cb11fd5..3eb87545 100644 --- a/src/main/resources/templates/addDisaster.html +++ b/src/main/resources/templates/addDisaster.html @@ -14,7 +14,7 @@

Dodaj
-
+
Nazwa użytkownika jest wymagana @@ -33,7 +33,7 @@

Edycja profilu

- +
Nazwa użytkownika jest wymagana From 506bef04db5d15a39364651474344a6f2e1cb759 Mon Sep 17 00:00:00 2001 From: YamiHeike Date: Sat, 23 Nov 2024 19:43:39 +0100 Subject: [PATCH 05/10] moved toasts to a fragment --- src/main/resources/templates/addDisaster.html | 12 +----------- src/main/resources/templates/fragments.html | 12 ++++++++++++ src/main/resources/templates/login.html | 13 +------------ src/main/resources/templates/signup.html | 2 +- src/main/resources/templates/updateUser.html | 2 +- 5 files changed, 16 insertions(+), 25 deletions(-) diff --git a/src/main/resources/templates/addDisaster.html b/src/main/resources/templates/addDisaster.html index 3eb87545..c179d029 100644 --- a/src/main/resources/templates/addDisaster.html +++ b/src/main/resources/templates/addDisaster.html @@ -38,17 +38,7 @@

Dodaj Dodaj Zdarzenie - +

diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html index ee93cf96..758bce0e 100644 --- a/src/main/resources/templates/fragments.html +++ b/src/main/resources/templates/fragments.html @@ -65,6 +65,18 @@

Wybierz miejscowość:

+ + - - + + + DisasterAlerts + + + + + - @@ -75,18 +61,21 @@
- -
-

-
+
+
+

Wybierz miejscowość:

+
+ -
-
-

Wybierz miejscowość:

-
- + +
@@ -95,32 +84,18 @@

Wybierz miejscowość:

let input = document.getElementById('cityInput').value.toLowerCase(); let dropdown = document.getElementById('location'); let options = dropdown.getElementsByTagName('option'); - -
- -
+ +
\ No newline at end of file From 4e80cce4d43f19a467fea8c1b14fe4499c605a95 Mon Sep 17 00:00:00 2001 From: Slawek84PL Date: Sun, 24 Nov 2024 12:11:16 +0100 Subject: [PATCH 09/10] Fixed navbar --- src/main/resources/templates/fragments.html | 153 +++++++++++--------- 1 file changed, 86 insertions(+), 67 deletions(-) diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html index 746d5551..ddeb85d1 100644 --- a/src/main/resources/templates/fragments.html +++ b/src/main/resources/templates/fragments.html @@ -1,101 +1,120 @@ - + - - - DisasterAlerts - - - - - + + + DisasterAlerts + + + + + + - - - - -