From 03153655dc68da68faf69b8f8ed2aeb19ac67fb2 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 4 Jan 2023 15:36:28 +0100 Subject: [PATCH 01/15] update login page design --- .../stylesheets/application.css.scss.erb | 2 + app/assets/stylesheets/bioportal.scss | 2 +- app/assets/stylesheets/login.scss | 83 +++++++++++++++++++ app/views/login/index.html.erb | 32 ++++--- 4 files changed, 100 insertions(+), 19 deletions(-) create mode 100644 app/assets/stylesheets/login.scss diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index b07f9c9173..5727552d17 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -42,6 +42,8 @@ @import "instances_table"; @import "file_uploader"; @import "browse"; +@import "login"; +@import "lostpassword"; /* Bootstrap and Font Awesome */ @import "bootstrap"; diff --git a/app/assets/stylesheets/bioportal.scss b/app/assets/stylesheets/bioportal.scss index c9075406a0..3ccb941b11 100644 --- a/app/assets/stylesheets/bioportal.scss +++ b/app/assets/stylesheets/bioportal.scss @@ -49,7 +49,7 @@ #bd { background: #fff; } -#bd hr { +#bd > hr { border:0; height:1px; color:#e9eaeb; diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss new file mode 100644 index 0000000000..7769617b1e --- /dev/null +++ b/app/assets/stylesheets/login.scss @@ -0,0 +1,83 @@ +*{ + font-family: poppins; + margin: 0; + padding: 0; +} +.login-page-container{ + display: flex; + justify-content: center; +} + +.login-form{ + margin-top: 30px; + padding-top: 37px; + padding-bottom: 37px; + padding-left: 41px; + padding-right: 41px; + box-shadow: rgba(0, 0, 0, 0.08) 0px 20px 50px; + border-radius: 14px; +} + +.login-input{ + box-sizing: border-box; + outline: none; + padding: 21px; + font-size: 16px; + border: 1px solid #BDBDBD; + border-radius: 9px; + width: 357px; + +} + +.login-input:focus{ + border: 1px solid #76A7CC; +} +.login-input::placeholder{ + font-weight: 300; + color: #C1C1C1; +} + +.login-input-title{ + font-size: 13px; + margin-bottom: 5px; + font-weight: 600; + color: #666666; +} +.email-input{ + margin-bottom: 20px; +} +.password-input{ + margin-bottom: 8px; +} +.login-forgot-password{ + font-weight: 500 ; + text-align: end; + text-decoration:none; + font-size: 13px; + +} +.login-button{ + margin-top: 10px; + width: 357px; + font-size: 16px; + color: white; + padding: 17px; + background-color: #76A7CC; + border: none; + border-radius: 9px; + margin-bottom: 20px; +} +.login-button:hover{ + background-color: #6B96B7; + cursor: pointer; +} + +.dont-have-account{ + font-size: 15px; + font-weight: 600; + text-align: center; +} +.login-register-button{ + text-decoration: none; + +} \ No newline at end of file diff --git a/app/views/login/index.html.erb b/app/views/login/index.html.erb index 08110c66a8..c435bab795 100644 --- a/app/views/login/index.html.erb +++ b/app/views/login/index.html.erb @@ -13,22 +13,18 @@ Errors On Form <%end%> -
- - - - - - - - - - - - -
Account Name:<%= text_field 'user', 'username', :size => 25 %>
Password:<%= password_field 'user','password', :size => 25, :autocomplete => "off" %>
<%= submit_tag "Login"%>
- Not Registered Yet? <%=link_to "Sign Up", new_user_path%>

- <%=link_to "Lost Password", '/lost_pass'%>

-
-<% end %> \ No newline at end of file +
+
+ + <%= text_field 'user', 'username', class: "login-input email-input", placeholder: "Enter your password" %> + + <%= password_field 'user','password', :autocomplete => "off", class: "login-input password-input", placeholder: "Enter your password" %> + + + +
+
+ + +<% end %> From fb49ac315d7f08f1161619aa157fa50f3e316c32 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 4 Jan 2023 16:19:54 +0100 Subject: [PATCH 02/15] update the design of lost password page --- app/assets/stylesheets/lostpassword.scss | 95 ++++++++++++++++++++++++ app/views/login/lost_password.html.erb | 39 ++++++---- 2 files changed, 118 insertions(+), 16 deletions(-) create mode 100644 app/assets/stylesheets/lostpassword.scss diff --git a/app/assets/stylesheets/lostpassword.scss b/app/assets/stylesheets/lostpassword.scss new file mode 100644 index 0000000000..297192c0dc --- /dev/null +++ b/app/assets/stylesheets/lostpassword.scss @@ -0,0 +1,95 @@ +*{ + font-family: poppins; + margin: 0; + padding: 0; +} +.lost-password-page-container{ + margin: 40px; + display: flex; + justify-content: center; +} + +.lost-password-form{ + margin-top: 30px; + padding-top: 37px; + padding-bottom: 37px; + padding-left: 41px; + padding-right: 41px; + box-shadow: rgba(0, 0, 0, 0.05) 0px 20px 50px; + border-radius: 14px; +} +.lost-password-title-bar{ + display: flex; + justify-content: space-between; +} +.lost-password-arrowback{ + all: none; +} +.lost-password-title{ + font-size: 18px; + text-align: center; + font-weight: 700; +} +#lost-password-title-line{ + width: 128px ; + margin: auto !important ; + margin-bottom: 14px !important ; + margin-top: 3px !important ; + border: 1px solid #76A7CC !important ; + border-radius: 5px ; +} + +.lost-password-description{ + color: #666666; + font-size: 12.5px; + margin-bottom: 14px; + width: 357px; +} + + + +.lost-password-input{ + box-sizing: border-box; + outline: none; + padding: 21px; + font-size: 16px; + border: 1px solid #BDBDBD; + border-radius: 9px; + width: 357px; + +} + +.lost-password-input:focus{ + border: 1px solid #76A7CC; +} +.lost-password-input::placeholder{ + font-weight: 300; + color: #C1C1C1; +} + +.lost-password-input-title{ + font-size: 13px; + margin-bottom: 5px; + font-weight: 600; + color: #666666; +} +.lost-password-button{ + margin-top: 20px; + width: 357px; + font-size: 16px; + color: white; + padding: 21px; + background-color: #76A7CC; + border: none; + border-radius: 9px; + margin-bottom: 20px; + display: block; +} +.lost-password-button:hover{ + background-color: #6B96B7; + cursor: pointer; +} + + + + diff --git a/app/views/login/lost_password.html.erb b/app/views/login/lost_password.html.erb index dbbf4338eb..83f3b16be1 100644 --- a/app/views/login/lost_password.html.erb +++ b/app/views/login/lost_password.html.erb @@ -1,22 +1,29 @@ <%= form_for(:user , :url=>{:controller=>'login',:action=>'send_pass'}) do%> -
+
+
+
+ + + + + + +
+

+ Recover password +

+
+
+
+
+

Enter the email associated with your account and we will send an email with instructions to reset your password

+

Email

+ <%=text_field 'user', :email,class: "lost-password-input", placeholder: "Enter the email" %> - - - - - - - - - - -
Email: *<%=text_field 'user', :email%>
Account Name: *<%=text_field 'user', :account_name%>
- <%=submit_tag "Email Password Reset Instructions"%> -
-
* required
-
+ + + <%end%> \ No newline at end of file From 3f2edeff6394cedc642113797829533b32373b69 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 4 Jan 2023 17:18:25 +0100 Subject: [PATCH 03/15] update sucess message for password reset --- app/assets/stylesheets/lostpassword.scss | 33 +++++++++++++++++++ app/controllers/login_controller.rb | 6 +++- .../login/lost_password_success.html.erb | 17 ++++++++++ config/routes.rb | 1 + 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 app/views/login/lost_password_success.html.erb diff --git a/app/assets/stylesheets/lostpassword.scss b/app/assets/stylesheets/lostpassword.scss index 297192c0dc..570166e272 100644 --- a/app/assets/stylesheets/lostpassword.scss +++ b/app/assets/stylesheets/lostpassword.scss @@ -8,6 +8,11 @@ display: flex; justify-content: center; } +.lost-password-sucess{ + margin: 70px; + display: flex; + justify-content: center; +} .lost-password-form{ margin-top: 30px; @@ -90,6 +95,34 @@ cursor: pointer; } +.lost-password-icon{ + display: flex; + justify-content: center; + margin-bottom: 21px; +} +.lost-password-feedback{ + text-align: center; + width: 310px; + font-size: 14px; + font-weight: 500; + margin-bottom: 21px; +} +.lost-password-back-home{ + color: #76A7CC; + padding: 16px; + border: 1px solid #76A7CC; + border-radius: 9px; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + text-decoration: none; + +} +.lost-password-back-home:hover{ + text-decoration: none; + +} diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb index 2a9587268a..bae1768519 100755 --- a/app/controllers/login_controller.rb +++ b/app/controllers/login_controller.rb @@ -75,6 +75,10 @@ def destroy def lost_password end + def lost_password_success + end + + # Sends a new password to the user def send_pass username = params[:user][:account_name] @@ -82,7 +86,7 @@ def send_pass resp = LinkedData::Client::HTTP.post("/users/create_reset_password_token", {username: username, email: email}) if resp.nil? - redirect_to login_index_path, notice: "Please check your email for a message with reset instructions" + redirect_to "/lost_pass_success" else flash[:notice] = resp.errors.first + ". Please try again." redirect_to "/lost_pass" diff --git a/app/views/login/lost_password_success.html.erb b/app/views/login/lost_password_success.html.erb new file mode 100644 index 0000000000..2634f58829 --- /dev/null +++ b/app/views/login/lost_password_success.html.erb @@ -0,0 +1,17 @@ +
+
+
+ + + +
+ +

+ A password reset email has been sent to your email, please follow the instructions in the email to reset your password. +

+ + back home + + +
+
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index b3662ca820..de6f0b8206 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -128,6 +128,7 @@ # User get '/logout' => 'login#destroy', :as => :logout get '/lost_pass' => 'login#lost_password' + get '/lost_pass_success' => 'login#lost_password_success' get '/reset_password' => 'login#reset_password' post '/accounts/:id/custom_ontologies' => 'users#custom_ontologies', :as => :custom_ontologies get '/login_as/:login_as' => 'login#login_as' , constraints: { login_as: /[\d\w\.\-\%\+ ]+/ } From 8d4c9607ee2fef6c558d72e59ccf1f4a091f5253 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 24 Jan 2023 20:07:17 +0100 Subject: [PATCH 04/15] Update index.html.erb --- app/views/login/index.html.erb | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/app/views/login/index.html.erb b/app/views/login/index.html.erb index c435bab795..92e4585423 100644 --- a/app/views/login/index.html.erb +++ b/app/views/login/index.html.erb @@ -13,18 +13,22 @@ Errors On Form <%end%> - -
-
- - <%= text_field 'user', 'username', class: "login-input email-input", placeholder: "Enter your password" %> - - <%= password_field 'user','password', :autocomplete => "off", class: "login-input password-input", placeholder: "Enter your password" %> - - - -
-
- +
+ + + + + + + + + + + + +
Account Name:<%= text_field 'user', 'username', :size => 25 %>
Password:<%= password_field 'user','password', :size => 25, :autocomplete => "off" %>
<%= submit_tag "Login"%>
+ Not Registered Yet? <%=link_to "Sign Up", new_user_path%>

+ <%=link_to "Lost Password", '/lost_pass'%>

+
<% end %> From 09a03c5e9fc3d539a93ff6a6ffd0a89d5182f2d7 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 24 Jan 2023 20:14:08 +0100 Subject: [PATCH 05/15] Delete login.scss --- app/assets/stylesheets/login.scss | 83 ------------------------------- 1 file changed, 83 deletions(-) delete mode 100644 app/assets/stylesheets/login.scss diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss deleted file mode 100644 index 7769617b1e..0000000000 --- a/app/assets/stylesheets/login.scss +++ /dev/null @@ -1,83 +0,0 @@ -*{ - font-family: poppins; - margin: 0; - padding: 0; -} -.login-page-container{ - display: flex; - justify-content: center; -} - -.login-form{ - margin-top: 30px; - padding-top: 37px; - padding-bottom: 37px; - padding-left: 41px; - padding-right: 41px; - box-shadow: rgba(0, 0, 0, 0.08) 0px 20px 50px; - border-radius: 14px; -} - -.login-input{ - box-sizing: border-box; - outline: none; - padding: 21px; - font-size: 16px; - border: 1px solid #BDBDBD; - border-radius: 9px; - width: 357px; - -} - -.login-input:focus{ - border: 1px solid #76A7CC; -} -.login-input::placeholder{ - font-weight: 300; - color: #C1C1C1; -} - -.login-input-title{ - font-size: 13px; - margin-bottom: 5px; - font-weight: 600; - color: #666666; -} -.email-input{ - margin-bottom: 20px; -} -.password-input{ - margin-bottom: 8px; -} -.login-forgot-password{ - font-weight: 500 ; - text-align: end; - text-decoration:none; - font-size: 13px; - -} -.login-button{ - margin-top: 10px; - width: 357px; - font-size: 16px; - color: white; - padding: 17px; - background-color: #76A7CC; - border: none; - border-radius: 9px; - margin-bottom: 20px; -} -.login-button:hover{ - background-color: #6B96B7; - cursor: pointer; -} - -.dont-have-account{ - font-size: 15px; - font-weight: 600; - text-align: center; -} -.login-register-button{ - text-decoration: none; - -} \ No newline at end of file From db7bf0dec1e0e298728fdc752224c5388b885cd1 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 24 Jan 2023 20:16:51 +0100 Subject: [PATCH 06/15] Update index.html.erb From a15e004ce8954173371cba04bf2f194fa62ec0fd Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:01:25 +0100 Subject: [PATCH 07/15] upload arrow-back.svg --- app/assets/images/arrow-back.svg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/assets/images/arrow-back.svg diff --git a/app/assets/images/arrow-back.svg b/app/assets/images/arrow-back.svg new file mode 100644 index 0000000000..a533edd24d --- /dev/null +++ b/app/assets/images/arrow-back.svg @@ -0,0 +1,3 @@ + + + From 424aaa564fa3cf7a109297836e5f59eb0944d5bc Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:16:11 +0100 Subject: [PATCH 08/15] Update lostpassword.scss --- app/assets/stylesheets/lostpassword.scss | 56 +----------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/app/assets/stylesheets/lostpassword.scss b/app/assets/stylesheets/lostpassword.scss index 570166e272..e30486b354 100644 --- a/app/assets/stylesheets/lostpassword.scss +++ b/app/assets/stylesheets/lostpassword.scss @@ -3,30 +3,12 @@ margin: 0; padding: 0; } -.lost-password-page-container{ - margin: 40px; - display: flex; - justify-content: center; -} -.lost-password-sucess{ - margin: 70px; - display: flex; - justify-content: center; -} - .lost-password-form{ margin-top: 30px; - padding-top: 37px; - padding-bottom: 37px; - padding-left: 41px; - padding-right: 41px; + padding: 37px 41px; box-shadow: rgba(0, 0, 0, 0.05) 0px 20px 50px; border-radius: 14px; } -.lost-password-title-bar{ - display: flex; - justify-content: space-between; -} .lost-password-arrowback{ all: none; } @@ -43,16 +25,12 @@ border: 1px solid #76A7CC !important ; border-radius: 5px ; } - .lost-password-description{ color: #666666; font-size: 12.5px; margin-bottom: 14px; width: 357px; } - - - .lost-password-input{ box-sizing: border-box; outline: none; @@ -63,7 +41,6 @@ width: 357px; } - .lost-password-input:focus{ border: 1px solid #76A7CC; } @@ -95,34 +72,3 @@ cursor: pointer; } -.lost-password-icon{ - display: flex; - justify-content: center; - margin-bottom: 21px; -} -.lost-password-feedback{ - text-align: center; - width: 310px; - font-size: 14px; - font-weight: 500; - margin-bottom: 21px; -} - -.lost-password-back-home{ - color: #76A7CC; - padding: 16px; - border: 1px solid #76A7CC; - border-radius: 9px; - display: flex; - justify-content: center; - align-items: center; - cursor: pointer; - text-decoration: none; - -} -.lost-password-back-home:hover{ - text-decoration: none; - -} - - From 0f5393775f49528c5fe31f63f67dde80f218fe72 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:18:06 +0100 Subject: [PATCH 09/15] Extract the svg to a file, and convert the file from .erb to .haml --- app/views/login/lost_password.html.erb | 29 ------------------------- app/views/login/lost_password.html.haml | 15 +++++++++++++ 2 files changed, 15 insertions(+), 29 deletions(-) delete mode 100644 app/views/login/lost_password.html.erb create mode 100644 app/views/login/lost_password.html.haml diff --git a/app/views/login/lost_password.html.erb b/app/views/login/lost_password.html.erb deleted file mode 100644 index 83f3b16be1..0000000000 --- a/app/views/login/lost_password.html.erb +++ /dev/null @@ -1,29 +0,0 @@ -<%= form_for(:user , :url=>{:controller=>'login',:action=>'send_pass'}) do%> - -
-
-
- - - - - - -
-

- Recover password -

-
-
-
-
-

Enter the email associated with your account and we will send an email with instructions to reset your password

-

Email

- <%=text_field 'user', :email,class: "lost-password-input", placeholder: "Enter the email" %> - - -
-
- - -<%end%> \ No newline at end of file diff --git a/app/views/login/lost_password.html.haml b/app/views/login/lost_password.html.haml new file mode 100644 index 0000000000..953fb9121e --- /dev/null +++ b/app/views/login/lost_password.html.haml @@ -0,0 +1,15 @@ += form_for(:user , :url=>{:controller=>'login',:action=>'send_pass'}) do + .d-flex.justify-content-center.m-4 + .lost-password-form + .d-flex.justify-content-between + %a{:href => "javascript:javascript:history.go(-1)"} + %img.lost-password-arrowback{:src => "#{asset_path("arrow-back.svg")}"}/ + .lost-password-title-container + %h2.lost-password-title + Recover password + %hr#lost-password-title-line/ + %div + %p.lost-password-description Enter the email associated with your account and we will send an email with instructions to reset your password + %p.lost-password-input-title Email + = text_field 'user', :email,class: "lost-password-input", placeholder: "Enter the email" + %input.lost-password-button{:type => "submit", :value => "Send instructions"}/ From 93c0dd9b5b8488f6d1f995765915676329236f97 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:19:45 +0100 Subject: [PATCH 10/15] Use the message card component --- app/views/login/lost_password_success.html.erb | 17 ----------------- app/views/login/lost_password_success.html.haml | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 app/views/login/lost_password_success.html.erb create mode 100644 app/views/login/lost_password_success.html.haml diff --git a/app/views/login/lost_password_success.html.erb b/app/views/login/lost_password_success.html.erb deleted file mode 100644 index 2634f58829..0000000000 --- a/app/views/login/lost_password_success.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -
-
-
- - - -
- -

- A password reset email has been sent to your email, please follow the instructions in the email to reset your password. -

- - back home - - -
-
\ No newline at end of file diff --git a/app/views/login/lost_password_success.html.haml b/app/views/login/lost_password_success.html.haml new file mode 100644 index 0000000000..a84978c27e --- /dev/null +++ b/app/views/login/lost_password_success.html.haml @@ -0,0 +1 @@ + = render(PopupMessageComponent.new(message: "A password reset email has been sent to your email, please follow the instructions in the email to reset your password.", button_text: "back home", icon:"green-check.svg")) From 984c514a160fe962093706b9d4907690e31596c9 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:44:22 +0100 Subject: [PATCH 11/15] replace fixed colors by variables --- app/assets/stylesheets/lostpassword.scss | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/lostpassword.scss b/app/assets/stylesheets/lostpassword.scss index e30486b354..b6dd118051 100644 --- a/app/assets/stylesheets/lostpassword.scss +++ b/app/assets/stylesheets/lostpassword.scss @@ -22,7 +22,7 @@ margin: auto !important ; margin-bottom: 14px !important ; margin-top: 3px !important ; - border: 1px solid #76A7CC !important ; + border: 1px solid var(--primary-color) !important ; border-radius: 5px ; } .lost-password-description{ @@ -42,7 +42,7 @@ } .lost-password-input:focus{ - border: 1px solid #76A7CC; + border: 1px solid var(--primary-color); } .lost-password-input::placeholder{ font-weight: 300; @@ -61,14 +61,13 @@ font-size: 16px; color: white; padding: 21px; - background-color: #76A7CC; + background-color: var(--primary-color); border: none; border-radius: 9px; margin-bottom: 20px; display: block; } .lost-password-button:hover{ - background-color: #6B96B7; + background-color: var(--hover-color); cursor: pointer; } - From 002fc9fd30b3dba9a5461e5b254d70a54ad24156 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 30 Jan 2023 05:00:20 +0100 Subject: [PATCH 12/15] Update lostpassword.scss --- app/assets/stylesheets/lostpassword.scss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/assets/stylesheets/lostpassword.scss b/app/assets/stylesheets/lostpassword.scss index b6dd118051..2769eb7b05 100644 --- a/app/assets/stylesheets/lostpassword.scss +++ b/app/assets/stylesheets/lostpassword.scss @@ -1,8 +1,3 @@ -*{ - font-family: poppins; - margin: 0; - padding: 0; -} .lost-password-form{ margin-top: 30px; padding: 37px 41px; @@ -71,3 +66,4 @@ background-color: var(--hover-color); cursor: pointer; } + From eb31cd24690ac9399d128fb5a8dd99f6f349a1c4 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 30 Jan 2023 06:07:06 +0100 Subject: [PATCH 13/15] Update lost_password_success.html.haml --- app/views/login/lost_password_success.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/login/lost_password_success.html.haml b/app/views/login/lost_password_success.html.haml index a84978c27e..d817a62c34 100644 --- a/app/views/login/lost_password_success.html.haml +++ b/app/views/login/lost_password_success.html.haml @@ -1 +1 @@ - = render(PopupMessageComponent.new(message: "A password reset email has been sent to your email, please follow the instructions in the email to reset your password.", button_text: "back home", icon:"green-check.svg")) += render(CardMessageComponent.new(message: "A password reset email has been sent to your email, please follow the instructions in the email to reset your password.", button_text: "back home", type:"success")) From f5a52d85caaf79ec32ce28dedf60912f05ac1cce Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 30 Jan 2023 06:07:42 +0100 Subject: [PATCH 14/15] Update lost_password_success.html.haml --- app/views/login/lost_password_success.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/login/lost_password_success.html.haml b/app/views/login/lost_password_success.html.haml index d817a62c34..92d3057ec9 100644 --- a/app/views/login/lost_password_success.html.haml +++ b/app/views/login/lost_password_success.html.haml @@ -1 +1 @@ -= render(CardMessageComponent.new(message: "A password reset email has been sent to your email, please follow the instructions in the email to reset your password.", button_text: "back home", type:"success")) += render(CardMessageComponent.new(message: "A password reset email has been sent to your email, please follow the instructions in the email to reset your password.", button_text: "Back home", type:"success")) From aaf0a3701a012864aabe4372f48785c789c5065d Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 30 Jan 2023 09:23:42 +0100 Subject: [PATCH 15/15] Update lost_password_success.html.haml --- app/views/login/lost_password_success.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/login/lost_password_success.html.haml b/app/views/login/lost_password_success.html.haml index 92d3057ec9..cfb66b3a97 100644 --- a/app/views/login/lost_password_success.html.haml +++ b/app/views/login/lost_password_success.html.haml @@ -1 +1 @@ -= render(CardMessageComponent.new(message: "A password reset email has been sent to your email, please follow the instructions in the email to reset your password.", button_text: "Back home", type:"success")) += render(CardMessageComponent.new(title:"no-title" ,message: "A password reset email has been sent to your email, please follow the instructions in the email to reset your password.", button_text: "Back home", type:"success"))