From dc824a0f7006100abe1f8250bfdb88925cdc2fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sat, 6 May 2023 21:40:35 +0200 Subject: [PATCH 1/8] RVRNEXT-38 install font-awesome --- public/static/package-lock.json | 5 +++++ public/static/package.json | 1 + 2 files changed, 6 insertions(+) diff --git a/public/static/package-lock.json b/public/static/package-lock.json index 2612c22..38d1404 100644 --- a/public/static/package-lock.json +++ b/public/static/package-lock.json @@ -2,6 +2,11 @@ "requires": true, "lockfileVersion": 1, "dependencies": { + "@fortawesome/fontawesome-free": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz", + "integrity": "sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ==" + }, "@orchidjs/sifter": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@orchidjs/sifter/-/sifter-1.0.3.tgz", diff --git a/public/static/package.json b/public/static/package.json index d2b0d01..98b146b 100644 --- a/public/static/package.json +++ b/public/static/package.json @@ -1,5 +1,6 @@ { "dependencies": { + "@fortawesome/fontawesome-free": "^6.4.0", "leaflet": "^1.6.0", "leaflet.markercluster": "^1.4.1", "tom-select": "^2.2.2" From b531589c52dd4ec6db65eef004bd082d7bcdb2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sat, 6 May 2023 21:40:56 +0200 Subject: [PATCH 2/8] RVRNEXT-38 load font-awesome css --- views/templates/rvr.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/views/templates/rvr.php b/views/templates/rvr.php index 8dc595d..5488461 100644 --- a/views/templates/rvr.php +++ b/views/templates/rvr.php @@ -18,6 +18,10 @@ + + + + @yields('externalCss') @yields('inlineCss') From 0f7c9aa02f8dfcfbacbb132cb301fa915d655d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sat, 6 May 2023 21:41:27 +0200 Subject: [PATCH 3/8] RVRNEXT-38 replace svgs to fa-icons in normal layous --- public/static/css/rvr.css | 4 ++++ views/templates/layout_normal.php | 14 ++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/public/static/css/rvr.css b/public/static/css/rvr.css index 0da7136..59ecdb4 100644 --- a/public/static/css/rvr.css +++ b/public/static/css/rvr.css @@ -404,6 +404,10 @@ header>p>span>a:link, header>p>span>a:visited { color: inherit; } +header>p>span>a:hover, header>p>span>a:focus { + text-decoration: none; +} + header>p>span:not(:last-child) { border-right: solid white 1px; padding-right: 6px; diff --git a/views/templates/layout_normal.php b/views/templates/layout_normal.php index cb3a248..a931218 100644 --- a/views/templates/layout_normal.php +++ b/views/templates/layout_normal.php @@ -10,14 +10,12 @@

user()) : ?> - - - - - user()->getDisplayName() ?>Logout + user()->getDisplayName() ?> Logout

From e3992d9d55f1a59f6c7c0c52065353e8f6cf1d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sat, 6 May 2023 21:42:43 +0200 Subject: [PATCH 4/8] RVRNEXT-38 add fa-icons to buttons --- views/account/account.php | 10 +++++----- views/account/google_connect.php | 2 +- views/account/google_disconnect.php | 2 +- views/communities/community_currencies.php | 6 +++--- views/communities/community_edit.php | 2 +- views/communities/community_members.php | 6 +++--- views/communities/currency_exchange_rates.php | 6 +++--- views/communities/transaction_edit.php | 4 ++-- views/login/login.php | 4 ++-- views/login/password_reset_request.php | 2 +- views/login/reset_password.php | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/views/account/account.php b/views/account/account.php index 6c95542..8add21d 100644 --- a/views/account/account.php +++ b/views/account/account.php @@ -10,7 +10,7 @@

Please confirm your identity with your password or with Google to modify your account.

+ -->

Please confirm your identity with your password to modify your account.

@@ -19,7 +19,7 @@

Please confirm your identity with Google to modify your account.

+ -->
@@ -42,15 +42,15 @@

- +
- Connect with Google + Connect with Google - Disconnect from Google + Disconnect from Google

Your account does not have a password. Please set a password if you want to disconnect your account from Google.

diff --git a/views/account/google_connect.php b/views/account/google_connect.php index df72e9a..1779e20 100644 --- a/views/account/google_connect.php +++ b/views/account/google_connect.php @@ -13,7 +13,7 @@

- Cancel
diff --git a/views/account/google_disconnect.php b/views/account/google_disconnect.php index 4f65776..8e383e9 100644 --- a/views/account/google_disconnect.php +++ b/views/account/google_disconnect.php @@ -10,7 +10,7 @@

- Cancel
diff --git a/views/communities/community_currencies.php b/views/communities/community_currencies.php index dadb4d1..2dc9dfa 100644 --- a/views/communities/community_currencies.php +++ b/views/communities/community_currencies.php @@ -26,9 +26,9 @@ - + getId() !== $community->getMainCurrencyId()): ?> - + @@ -42,7 +42,7 @@ - + diff --git a/views/communities/community_edit.php b/views/communities/community_edit.php index 25f09be..9655d66 100644 --- a/views/communities/community_edit.php +++ b/views/communities/community_edit.php @@ -26,7 +26,7 @@

- +
diff --git a/views/communities/community_members.php b/views/communities/community_members.php index e9c886a..1bdbccc 100644 --- a/views/communities/community_members.php +++ b/views/communities/community_members.php @@ -32,8 +32,8 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/views/communities/currency_exchange_rates.php b/views/communities/currency_exchange_rates.php index 4ae943c..0fc62b9 100644 --- a/views/communities/currency_exchange_rates.php +++ b/views/communities/currency_exchange_rates.php @@ -32,8 +32,8 @@ - + getExchangeRate() ?> @@ -51,7 +51,7 @@ - + diff --git a/views/communities/transaction_edit.php b/views/communities/transaction_edit.php index 3af5c66..1bbbb6e 100644 --- a/views/communities/transaction_edit.php +++ b/views/communities/transaction_edit.php @@ -46,9 +46,9 @@

- + - +
diff --git a/views/login/login.php b/views/login/login.php index 1a63227..f509b1e 100644 --- a/views/login/login.php +++ b/views/login/login.php @@ -10,12 +10,12 @@

- +

Forgot your password?

- Login with Google + Login with Google
diff --git a/views/login/password_reset_request.php b/views/login/password_reset_request.php index 449dcec..68bfb41 100644 --- a/views/login/password_reset_request.php +++ b/views/login/password_reset_request.php @@ -15,7 +15,7 @@

- +
diff --git a/views/login/reset_password.php b/views/login/reset_password.php index a1a19cb..0d76eff 100644 --- a/views/login/reset_password.php +++ b/views/login/reset_password.php @@ -13,7 +13,7 @@

- +
From f397354c1e56733f8c935fdf0d30ddd5ad0c4259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sat, 6 May 2023 21:43:01 +0200 Subject: [PATCH 5/8] RVRNEXT-38 replace raw character to fa-icon in transactions --- views/communities/transactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/communities/transactions.php b/views/communities/transactions.php index 216c52d..e9b44df 100644 --- a/views/communities/transactions.php +++ b/views/communities/transactions.php @@ -30,7 +30,7 @@

getDescription() ?>

-

getPayerUser()->getDisplayName() ?> ► getPayeeUser() ? $transaction->getPayeeUser()->getDisplayName() : '[common]' ?>

+

getPayerUser()->getDisplayName() ?> getPayeeUser() ? $transaction->getPayeeUser()->getDisplayName() : '[common]' ?>

getTimeDate()->format('Y-m-d H:i') ?>

From c664b0a4bf3f5ac1f17c0196f40a53327f8f82db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sat, 6 May 2023 21:43:23 +0200 Subject: [PATCH 6/8] RVRNEXT-38 make it possible to show fa-icons in confirmation modals --- public/static/js/rvr.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/public/static/js/rvr.js b/public/static/js/rvr.js index b895c0e..7a1a5c8 100644 --- a/public/static/js/rvr.js +++ b/public/static/js/rvr.js @@ -97,7 +97,7 @@ var RVR = { RVR.showModalWithContent('Confirmation', this.dataset.confirmation, [ { type: 'button', - text: self.textContent, + html: this.dataset.confirmationButton ? this.dataset.confirmationButton : this.innerHTML, classNames: ['red'], onclick: function() { var event = new Event('submit', {'bubbles': true, 'cancelable': true}); @@ -147,7 +147,11 @@ var RVR = { button.classList.add('marginTop'); button.classList.add('marginRight'); - button.textContent = extraButton.text; + if (typeof extraButton.html !== 'undefined') { + button.innerHTML = extraButton.html; + } else { + button.textContent = extraButton.text; + } if (extraButton.type === 'a') { button.href = extraButton.href; From 3034217ff8ba7cf7ee5137a4d7194f6176621b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sat, 6 May 2023 21:43:37 +0200 Subject: [PATCH 7/8] RVRNEXT-38 fix template for password reset --- src/Controller/LoginController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/LoginController.php b/src/Controller/LoginController.php index 4eaa2be..05d61fd 100644 --- a/src/Controller/LoginController.php +++ b/src/Controller/LoginController.php @@ -281,7 +281,7 @@ class LoginController $mail = new Mail(); $mail->addRecipient($email); $mail->setSubject($_ENV['APP_NAME'] . ' - Password reset'); - $mail->setBodyFromTemplate('password.reset', [ + $mail->setBodyFromTemplate('password-reset', [ 'EMAIL' => $email, 'RESET_LINK' => \Container::$request->getBase() . \Container::$routeCollection->getRoute('password.reset')->generateLink(['token' => $token]), From 32733668ff7a4a94501af616e2fdecf45e29acde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sat, 6 May 2023 21:50:46 +0200 Subject: [PATCH 8/8] RVRNEXT-38 do not reference authenticateWithGoogleButton whet it does not exist --- public/static/js/account/account.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/public/static/js/account/account.js b/public/static/js/account/account.js index f78622a..81eda87 100644 --- a/public/static/js/account/account.js +++ b/public/static/js/account/account.js @@ -59,11 +59,10 @@ var Account = { }; (function () { - document.getElementById('authenticateWithGoogleButton').onclick = function () { - Account.openGoogleAuthenticate(); - }; - - document.getElementsByTagName('form')[0].onreset = function () { - Account.resetGoogleAuthentication(); - }; + var authenticateWithGoogleButton = document.getElementById('authenticateWithGoogleButton'); + if (authenticateWithGoogleButton) { + authenticateWithGoogleButton.onclick = function () { + Account.openGoogleAuthenticate(); + }; + } })();