From 53dc60509776ac5eaeba69cbdbcd790b9a8c65f5 Mon Sep 17 00:00:00 2001 From: Attila Szaloki Date: Fri, 16 Oct 2020 13:12:34 +0000 Subject: [PATCH 1/4] in base script tags moved before --- main/urls.py | 2 +- profiles/templates/profiles/profile.html | 19 +++++++++++++++++++ templates/base.html | 4 ++-- templates/includes/navbar.html | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/main/urls.py b/main/urls.py index 9786d549..1cdc53fe 100644 --- a/main/urls.py +++ b/main/urls.py @@ -4,6 +4,6 @@ urlpatterns = [ path("", include("home.urls")), path("admin/", admin.site.urls), - path("accounts", include("allauth.urls")), + path("accounts/", include("allauth.urls")), path("profile/", include("profiles.urls")), ] diff --git a/profiles/templates/profiles/profile.html b/profiles/templates/profiles/profile.html index 09d5f403..4b1e707c 100644 --- a/profiles/templates/profiles/profile.html +++ b/profiles/templates/profiles/profile.html @@ -6,4 +6,23 @@ TEST PROFILE PAGE + +

Profile Page

+

You are logged in as

+ + +
+
+

Username :

{{ user.username }}

+

User e-mail address :

{{ user.email }}

+
+
+

First name :

{{ user.first_name }}

+

Last name :

{{ user.last_name }}

+
+
{% endblock %} + + + + diff --git a/templates/base.html b/templates/base.html index 1068841d..a49520a4 100644 --- a/templates/base.html +++ b/templates/base.html @@ -37,8 +37,6 @@ {% include "includes/footer.html" %} - - @@ -52,4 +50,6 @@ {% endblock %} + + diff --git a/templates/includes/navbar.html b/templates/includes/navbar.html index 21f6c94c..09c94c2c 100644 --- a/templates/includes/navbar.html +++ b/templates/includes/navbar.html @@ -31,7 +31,7 @@ Register Login
- My Profile + My Profile Logout From 28b67ddbe460dd944a2b7e501a3a0a9c3d02c1ef Mon Sep 17 00:00:00 2001 From: Attila Szaloki Date: Fri, 16 Oct 2020 23:55:08 +0000 Subject: [PATCH 2/4] changed html code formating and comments, deleted empty lines in profile.html --- profiles/templates/profiles/profile.html | 40 ++++++++++++++++-------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/profiles/templates/profiles/profile.html b/profiles/templates/profiles/profile.html index 4b1e707c..b94dd66c 100644 --- a/profiles/templates/profiles/profile.html +++ b/profiles/templates/profiles/profile.html @@ -3,26 +3,40 @@ {% block content %} - - TEST PROFILE PAGE -

Profile Page

-

You are logged in as

+

You are logged in as:

- + +
-
-

Username :

{{ user.username }}

-

User e-mail address :

{{ user.email }}

+
+ +
+

Username :

+

{{ user.username }}

+
+ +
+

User e-mail address :

+

{{ user.email }}

+
+
+
-

First name :

{{ user.first_name }}

-

Last name :

{{ user.last_name }}

-
-
-{% endblock %} +
+

First name :

+

{{ user.first_name }}

+
+
+

Last name :

+

{{ user.last_name }}

+
+
+ +{% endblock %} From d74c8e36a15607f51f39f017314faabb478dc9a6 Mon Sep 17 00:00:00 2001 From: Attila Szaloki Date: Sun, 18 Oct 2020 23:02:10 +0000 Subject: [PATCH 3/4] final changes fro PR --- profiles/templates/profiles/profile.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/profiles/templates/profiles/profile.html b/profiles/templates/profiles/profile.html index b94dd66c..0b2a66eb 100644 --- a/profiles/templates/profiles/profile.html +++ b/profiles/templates/profiles/profile.html @@ -13,13 +13,13 @@

You are logged in as:

-

Username :

-

{{ user.username }}

+

Username:

+

{{ user.username }}

-

User e-mail address :

-

{{ user.email }}

+

Email Address:

+

{{ user.email }}

@@ -27,13 +27,13 @@

User e-mail address :

-

First name :

-

{{ user.first_name }}

+

First name:

+

{{ user.first_name }}

-

Last name :

-

{{ user.last_name }}

+

Last name:

+

{{ user.last_name }}

From f46a5598fd0680fa50d5cd2c2b97cde59a9fa345 Mon Sep 17 00:00:00 2001 From: Attila Szaloki Date: Mon, 19 Oct 2020 11:02:48 +0000 Subject: [PATCH 4/4] remove Doctype tag --- profiles/templates/profiles/profile.html | 1 - 1 file changed, 1 deletion(-) diff --git a/profiles/templates/profiles/profile.html b/profiles/templates/profiles/profile.html index 0b2a66eb..4e6faf32 100644 --- a/profiles/templates/profiles/profile.html +++ b/profiles/templates/profiles/profile.html @@ -3,7 +3,6 @@ {% block content %} -

Profile Page

You are logged in as: