Merge pull request #20 from Xpirix/fix_email_and_profile_pages

Xpirix · web-flow · commit 923062fcb082 · 2025-04-30T13:56:34.000+03:00
Fix email and profile pages
diff --git a/deployment/.env.example b/deployment/.env.example
@@ -50,7 +50,7 @@ VALID_DOMAIN=["localhost", "changelog.qgis.org", "staging.changelog.qgis.org"]
 # Email
 EMAIL_BACKEND='django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST='smtp.resend.com'
-EMAIL_PORT=465
+EMAIL_PORT=587
 EMAIL_USE_TLS=True
 EMAIL_HOST_USER="resend"  # e.g., no-reply@yourdomain.com
 EMAIL_HOST_PASSWORD="your_resend_api_key"  # Your Resend API key
diff --git a/django_project/core/base_templates/account/email.html b/django_project/core/base_templates/account/email.html
@@ -1,4 +1,4 @@
-{% extends "base_with_sidebar.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load account socialaccount %}
diff --git a/django_project/core/base_templates/account/email_confirm.html b/django_project/core/base_templates/account/email_confirm.html
@@ -1,4 +1,4 @@
-{% extends "base_with_sidebar.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load account socialaccount %}
diff --git a/django_project/core/base_templates/account/login.html b/django_project/core/base_templates/account/login.html
@@ -1,4 +1,4 @@
-{% extends "base_with_sidebar.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load account socialaccount %}
diff --git a/django_project/core/base_templates/account/logout.html b/django_project/core/base_templates/account/logout.html
@@ -1,4 +1,4 @@
-{% extends "base_with_sidebar.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load account socialaccount %}
diff --git a/django_project/core/base_templates/account/password_reset.html b/django_project/core/base_templates/account/password_reset.html
@@ -1,4 +1,4 @@
-{% extends "base_with_sidebar.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load account socialaccount %}
diff --git a/django_project/core/base_templates/account/password_reset_done.html b/django_project/core/base_templates/account/password_reset_done.html
@@ -1,4 +1,4 @@
-{% extends "base_with_sidebar.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load static %}
diff --git a/django_project/core/base_templates/account/password_reset_from_key.html b/django_project/core/base_templates/account/password_reset_from_key.html
@@ -1,4 +1,4 @@
-{% extends "base_with_sidebar.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load account socialaccount %}
diff --git a/django_project/core/base_templates/account/password_reset_from_key_done.html b/django_project/core/base_templates/account/password_reset_from_key_done.html
@@ -1,4 +1,4 @@
-{% extends "base_with_sidebar.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load account socialaccount %}
diff --git a/django_project/core/base_templates/account/signup.html b/django_project/core/base_templates/account/signup.html
@@ -1,4 +1,4 @@
-{% extends "base_with_sidebar.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load account socialaccount crispy_forms_tags %}
diff --git a/django_project/core/base_templates/socialaccount/connections.html b/django_project/core/base_templates/socialaccount/connections.html
@@ -1,4 +1,4 @@
-{% extends "base_with_sidebar.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load account socialaccount %}
diff --git a/django_project/core/base_templates/socialaccount/signup.html b/django_project/core/base_templates/socialaccount/signup.html
@@ -1,4 +1,4 @@
-{% extends "base_with_sidebar.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load account socialaccount %}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends "base_with_sidebar.html" %}`
	`1`	`+{% extends "base.html" %}`
`2`	`2`
`3`	`3`	`{% load i18n %}`
`4`	`4`	`{% load account socialaccount %}`