From 2a8910b08e65f50fb33f7469990557489fb8558d Mon Sep 17 00:00:00 2001 From: croueAlec Date: Tue, 1 Oct 2024 13:21:35 +0200 Subject: [PATCH 01/10] most of login page done like register page --- django/src/ft_auth/templates/login.html | 80 ++++++++++++++++++------- 1 file changed, 60 insertions(+), 20 deletions(-) diff --git a/django/src/ft_auth/templates/login.html b/django/src/ft_auth/templates/login.html index c517b310..eec310bd 100644 --- a/django/src/ft_auth/templates/login.html +++ b/django/src/ft_auth/templates/login.html @@ -1,30 +1,44 @@ {% extends "./extends/base.html" %} {% block content %} -

Login

- -
-
- {% csrf_token %} -
- - -
-
- - -
- -
-

Or

+
+

Bottom text

+
+
+
+
+
+

Login

+
+
+ {% csrf_token %} +
+ + +
-
- Login with 42 +
+ + +
+ + + +
+ + +
+

Don't have an account yet ? Try registering

+
+
-{% endblock %} + + +{% endblock %} \ No newline at end of file From 8f7da2d9e51e5ad3178f53859e15eb3c4fd89eda Mon Sep 17 00:00:00 2001 From: croueAlec Date: Tue, 1 Oct 2024 13:25:22 +0200 Subject: [PATCH 02/10] moved register.css to register.html {% endblock %} \ No newline at end of file diff --git a/nginx/src/css/register.css b/nginx/src/css/register.css deleted file mode 100644 index 5ff80c75..00000000 --- a/nginx/src/css/register.css +++ /dev/null @@ -1,21 +0,0 @@ -#page-container-wrapper { - display: flex; - height: calc(100vh - 67.5px); -} - -#register-side, #login-side { - flex: 1; - display: flex; - justify-content: center; - align-items: center; -} - -#register-side { - background-color: #f5f5f5; - display: flex; - flex-direction: column; -} - -#login-side { - background-color: #e0e0e0; -} \ No newline at end of file From fb174df7c9d06a2351fe506401a06bcc903a524c Mon Sep 17 00:00:00 2001 From: croueAlec Date: Tue, 1 Oct 2024 15:19:08 +0200 Subject: [PATCH 03/10] added style for 42 auth button --- django/src/ft_auth/templates/login.html | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/django/src/ft_auth/templates/login.html b/django/src/ft_auth/templates/login.html index eec310bd..6670feca 100644 --- a/django/src/ft_auth/templates/login.html +++ b/django/src/ft_auth/templates/login.html @@ -28,11 +28,12 @@

Login


- Login with 42 +

Don't have an account yet ? Try registering

-

Don't have an account yet ? Try registering

+

or + Login with SVG Image

@@ -71,5 +72,18 @@

Login

flex-direction: column; padding: 0; } + + .image-text { + height: 1rem; + width: 1rem; + } + + #login-42-btn { + background-color: #dfbac8; + padding-top: 2px; + padding-bottom: 2px; + padding-left: 4px; + padding-right: 4px; + } {% endblock %} \ No newline at end of file From 3c6cf247be584a4d54b6f91e0c5cf10bea265052 Mon Sep 17 00:00:00 2001 From: croueAlec Date: Tue, 1 Oct 2024 15:20:00 +0200 Subject: [PATCH 04/10] added 42 logo for login with 42 button on register and login pages --- nginx/src/assets/42.svg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 nginx/src/assets/42.svg diff --git a/nginx/src/assets/42.svg b/nginx/src/assets/42.svg new file mode 100644 index 00000000..63c77a10 --- /dev/null +++ b/nginx/src/assets/42.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file From 4bb45ee07f7e891eb6f1f84663f5989b3c90b797 Mon Sep 17 00:00:00 2001 From: croueAlec Date: Tue, 1 Oct 2024 15:21:03 +0200 Subject: [PATCH 05/10] fixed padding issue in left and right div for register page --- django/src/ft_auth/templates/register.html | 1 + 1 file changed, 1 insertion(+) diff --git a/django/src/ft_auth/templates/register.html b/django/src/ft_auth/templates/register.html index eb2b9de1..4c63273b 100644 --- a/django/src/ft_auth/templates/register.html +++ b/django/src/ft_auth/templates/register.html @@ -81,6 +81,7 @@

Right Side

background-color: #f5f5f5; display: flex; flex-direction: column; + padding: 0; } #login-side { From 3c581e23f4ed6bab1cd5b93768aa2593e111c492 Mon Sep 17 00:00:00 2001 From: croueAlec Date: Tue, 1 Oct 2024 15:42:13 +0200 Subject: [PATCH 06/10] added login with 42 button on register page --- django/src/ft_auth/templates/register.html | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/django/src/ft_auth/templates/register.html b/django/src/ft_auth/templates/register.html index 4c63273b..36ad7550 100644 --- a/django/src/ft_auth/templates/register.html +++ b/django/src/ft_auth/templates/register.html @@ -31,9 +31,15 @@

Register


-

Already have an account ? Try Already have an account ? Try logging in

+
+

or + Login with SVG Image +

+
@@ -87,5 +93,18 @@

Right Side

#login-side { background-color: #e0e0e0; } + + .image-text { + height: 1rem; + width: 1rem; + } + + #login-42-btn { + background-color: #dfbac8; + padding-top: 2px; + padding-bottom: 2px; + padding-left: 4px; + padding-right: 4px; + } {% endblock %} \ No newline at end of file From 75627c549a18861009a27cbcb478f4a369988b4a Mon Sep 17 00:00:00 2001 From: croueAlec Date: Tue, 1 Oct 2024 15:43:24 +0200 Subject: [PATCH 07/10] formatting for login.html (changing indentation) --- django/src/ft_auth/templates/login.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/django/src/ft_auth/templates/login.html b/django/src/ft_auth/templates/login.html index 6670feca..8b28a56c 100644 --- a/django/src/ft_auth/templates/login.html +++ b/django/src/ft_auth/templates/login.html @@ -28,12 +28,14 @@

Login


-

Don't have an account yet ? Try registering

+

Don't have an account yet ? Try registering

-

or - Login with SVG Image

+

or + Login with SVG Image +

From 869b754f695290e0b9e1562b66c5e3216606012c Mon Sep 17 00:00:00 2001 From: croueAlec Date: Tue, 1 Oct 2024 16:14:14 +0200 Subject: [PATCH 08/10] removed register.css stylesheet link, i forgor to do it earlier and it raises an error --- nginx/src/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/nginx/src/index.html b/nginx/src/index.html index 0263dd7a..b9fc8398 100644 --- a/nginx/src/index.html +++ b/nginx/src/index.html @@ -11,7 +11,6 @@ - From 80d031eb540d70e0e3b9545d9e10105f5d03b778 Mon Sep 17 00:00:00 2001 From: croueAlec Date: Tue, 1 Oct 2024 17:16:27 +0200 Subject: [PATCH 09/10] basic slider implemented, I still need to see how to work out the referral part --- django/src/ft_auth/templates/register.html | 45 +++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/django/src/ft_auth/templates/register.html b/django/src/ft_auth/templates/register.html index 36ad7550..2a05f869 100644 --- a/django/src/ft_auth/templates/register.html +++ b/django/src/ft_auth/templates/register.html @@ -45,6 +45,10 @@

Register

Right Side

+
+

Right Side

+ +
{% endblock %} \ No newline at end of file From 6ad5dc1b9d1d3aa357634cec2742304f5aa298ed Mon Sep 17 00:00:00 2001 From: croueAlec Date: Wed, 2 Oct 2024 11:07:54 +0200 Subject: [PATCH 10/10] added alt description for 42 logo image (fixing the sonarcloud issue) --- django/src/ft_auth/templates/login.html | 2 +- django/src/ft_auth/templates/register.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/django/src/ft_auth/templates/login.html b/django/src/ft_auth/templates/login.html index 8b28a56c..9cf88d20 100644 --- a/django/src/ft_auth/templates/login.html +++ b/django/src/ft_auth/templates/login.html @@ -34,7 +34,7 @@

Login

or Login with SVG Image + href="{{ oauth_url }}">Login with 42 logo

diff --git a/django/src/ft_auth/templates/register.html b/django/src/ft_auth/templates/register.html index 2a05f869..7f29b71d 100644 --- a/django/src/ft_auth/templates/register.html +++ b/django/src/ft_auth/templates/register.html @@ -37,7 +37,7 @@

Register

or Login with SVG Image + href="{{ oauth_url }}">Login with 42 logo