From ad55c1eeaca0afc3367153a2c9249f4888b5e119 Mon Sep 17 00:00:00 2001 From: Matheus Freitas Date: Thu, 27 May 2021 13:45:12 -0300 Subject: [PATCH] Feat/custom login page (#1365) * Custom login page: creating a standard layout * Custom login page: creating a standard layout * Custom login page: creating a standard layout * Custom login page: creating a standard layout * Custom login page: creating a standard layout --- .../templates/cutout_notification_error.html | 2 +- .../templates/cutout_notification_finish.html | 2 +- .../templates/cutout_notification_start.html | 2 +- api/templates/rest_framework/login.html | 353 ++++++++++++++++-- frontend/ext/build/index.html | 2 +- frontend/ext/index.html | 2 +- frontend/images/background.jpg | Bin 0 -> 21864 bytes frontend/images/google_logo.svg | 1 + frontend/images/linea-logo.png | Bin 0 -> 114354 bytes frontend/nginx-proxy-develop.conf | 9 +- frontend/nginx-proxy.conf | 15 +- 11 files changed, 333 insertions(+), 55 deletions(-) create mode 100644 frontend/images/background.jpg create mode 100644 frontend/images/google_logo.svg create mode 100644 frontend/images/linea-logo.png diff --git a/api/product/templates/cutout_notification_error.html b/api/product/templates/cutout_notification_error.html index 9f2dc3863..df7f1f2e3 100644 --- a/api/product/templates/cutout_notification_error.html +++ b/api/product/templates/cutout_notification_error.html @@ -27,7 +27,7 @@ style="font-family: Bitter, Georgia, serif; font-size: 16px; font-weight: bold"> LIneA Science Server - + diff --git a/api/product/templates/cutout_notification_finish.html b/api/product/templates/cutout_notification_finish.html index 6410a7faf..e8beeab66 100644 --- a/api/product/templates/cutout_notification_finish.html +++ b/api/product/templates/cutout_notification_finish.html @@ -26,7 +26,7 @@

LIneA Science Server

- + diff --git a/api/product/templates/cutout_notification_start.html b/api/product/templates/cutout_notification_start.html index 43c1191c3..b8ad27638 100644 --- a/api/product/templates/cutout_notification_start.html +++ b/api/product/templates/cutout_notification_start.html @@ -27,7 +27,7 @@ style="font-family: Bitter, Georgia, serif; font-size: 16px; font-weight: bold"> LIneA Science Server - + diff --git a/api/templates/rest_framework/login.html b/api/templates/rest_framework/login.html index 691e6defc..b865bb03f 100644 --- a/api/templates/rest_framework/login.html +++ b/api/templates/rest_framework/login.html @@ -1,54 +1,330 @@ + + {% extends "rest_framework/login_base.html" %} {% block title %}Science Server{% endblock %} + {% block body %} -
+
-
-
-
- {% block branding %} -

Science Server

- {% endblock %} - -
+
+
+ {% block branding %} + -
+

Science Server

+ {% endblock %} +
-
-
+
{% csrf_token %} -
-
- - +
+ +
+ + +
{% if form.username.errors %}

{{ form.username.errors|striptags }}

{% endif %}
-
-
-
- - +
+ +
+ + +
{% if form.password.errors %}

{{ form.password.errors|striptags }}

{% endif %}
-
{% if form.non_field_errors %} {% for error in form.non_field_errors %} @@ -56,26 +332,30 @@

Science Server

{% endfor %} {% endif %} -
- + - -
- - {% if settings.NCSA_SIGNUP_LINK %} - - {% endif %} {% if settings.AUTH_SHIB_ENABLED %} {% if settings.SHIB_LOGIN_GOOGLE_URL is not None and settings.SHIB_LOGIN_GOOGLE_URL is not False %} -
- Login with Google + {% endif %} {% endif %} + {% if settings.NCSA_SIGNUP_LINK %} +
+ +
+ {% endif %} + @@ -83,7 +363,6 @@

Science Server

-
diff --git a/frontend/ext/build/index.html b/frontend/ext/build/index.html index 308afdf9b..99a25210d 100644 --- a/frontend/ext/build/index.html +++ b/frontend/ext/build/index.html @@ -6,7 +6,7 @@ - +