From eed2bd7c0ce47978b5c6a9ac7855005d2cc5fd86 Mon Sep 17 00:00:00 2001 From: rohit2701singh <156118970+rohit2701singh@users.noreply.github.com> Date: Mon, 26 Feb 2024 12:03:38 +0530 Subject: [PATCH 1/5] crispy-bootstrap5 Update settings.py crispy-bootstrap5 update in settings.py project level --- .../django_project/django_project/settings.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Django_Blog/06-User-Registration-Form/django_project/django_project/settings.py b/Django_Blog/06-User-Registration-Form/django_project/django_project/settings.py index 8df8664b7..e0d0e735f 100644 --- a/Django_Blog/06-User-Registration-Form/django_project/django_project/settings.py +++ b/Django_Blog/06-User-Registration-Form/django_project/django_project/settings.py @@ -34,6 +34,7 @@ 'blog.apps.BlogConfig', 'users.apps.UsersConfig', 'crispy_forms', + 'crispy_bootstrap5', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -122,4 +123,5 @@ STATIC_URL = '/static/' -CRISPY_TEMPLATE_PACK = 'bootstrap4' +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" +CRISPY_TEMPLATE_PACK = "bootstrap5" From 3968cb937edc002422ecee9a7e7297e3eef5e223 Mon Sep 17 00:00:00 2001 From: rohit singh Date: Mon, 26 Feb 2024 15:07:45 +0530 Subject: [PATCH 2/5] crispy-form update settings.py project level --- .../django_project/django_project/settings.py | 4 +++- .../django_project/django_project/settings.py | 4 +++- .../django_project/django_project/settings.py | 4 +++- .../django_project/django_project/settings.py | 5 ++++- .../11-Pagination/django_project/django_project/settings.py | 5 ++++- .../django_project/django_project/settings.py | 5 ++++- .../django_project/django_project/settings.py | 5 ++++- .../django_project/django_project/settings.py | 5 ++++- .../django_project/django_project/settings.py | 5 ++++- 9 files changed, 33 insertions(+), 9 deletions(-) diff --git a/Django_Blog/07-Login-Logout-Authentication/django_project/django_project/settings.py b/Django_Blog/07-Login-Logout-Authentication/django_project/django_project/settings.py index 218f2cb32..40c7fe31c 100644 --- a/Django_Blog/07-Login-Logout-Authentication/django_project/django_project/settings.py +++ b/Django_Blog/07-Login-Logout-Authentication/django_project/django_project/settings.py @@ -34,6 +34,7 @@ 'blog.apps.BlogConfig', 'users.apps.UsersConfig', 'crispy_forms', + 'crispy_bootstrap5', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -125,7 +126,8 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' -CRISPY_TEMPLATE_PACK = 'bootstrap4' +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" +CRISPY_TEMPLATE_PACK = "bootstrap5" LOGIN_REDIRECT_URL = 'blog-home' LOGIN_URL = 'login' diff --git a/Django_Blog/08-Profile-And-Images/django_project/django_project/settings.py b/Django_Blog/08-Profile-And-Images/django_project/django_project/settings.py index 218f2cb32..40c7fe31c 100644 --- a/Django_Blog/08-Profile-And-Images/django_project/django_project/settings.py +++ b/Django_Blog/08-Profile-And-Images/django_project/django_project/settings.py @@ -34,6 +34,7 @@ 'blog.apps.BlogConfig', 'users.apps.UsersConfig', 'crispy_forms', + 'crispy_bootstrap5', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -125,7 +126,8 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' -CRISPY_TEMPLATE_PACK = 'bootstrap4' +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" +CRISPY_TEMPLATE_PACK = "bootstrap5" LOGIN_REDIRECT_URL = 'blog-home' LOGIN_URL = 'login' diff --git a/Django_Blog/09-Update-User-Profile/django_project/django_project/settings.py b/Django_Blog/09-Update-User-Profile/django_project/django_project/settings.py index 218f2cb32..40c7fe31c 100644 --- a/Django_Blog/09-Update-User-Profile/django_project/django_project/settings.py +++ b/Django_Blog/09-Update-User-Profile/django_project/django_project/settings.py @@ -34,6 +34,7 @@ 'blog.apps.BlogConfig', 'users.apps.UsersConfig', 'crispy_forms', + 'crispy_bootstrap5', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -125,7 +126,8 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' -CRISPY_TEMPLATE_PACK = 'bootstrap4' +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" +CRISPY_TEMPLATE_PACK = "bootstrap5" LOGIN_REDIRECT_URL = 'blog-home' LOGIN_URL = 'login' diff --git a/Django_Blog/10-Posts-Create-Update-Delete/django_project/django_project/settings.py b/Django_Blog/10-Posts-Create-Update-Delete/django_project/django_project/settings.py index 218f2cb32..fef9b3c37 100644 --- a/Django_Blog/10-Posts-Create-Update-Delete/django_project/django_project/settings.py +++ b/Django_Blog/10-Posts-Create-Update-Delete/django_project/django_project/settings.py @@ -34,6 +34,7 @@ 'blog.apps.BlogConfig', 'users.apps.UsersConfig', 'crispy_forms', + 'crispy_bootstrap5', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -125,7 +126,9 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' -CRISPY_TEMPLATE_PACK = 'bootstrap4' +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" +CRISPY_TEMPLATE_PACK = "bootstrap5" + LOGIN_REDIRECT_URL = 'blog-home' LOGIN_URL = 'login' diff --git a/Django_Blog/11-Pagination/django_project/django_project/settings.py b/Django_Blog/11-Pagination/django_project/django_project/settings.py index 218f2cb32..fef9b3c37 100644 --- a/Django_Blog/11-Pagination/django_project/django_project/settings.py +++ b/Django_Blog/11-Pagination/django_project/django_project/settings.py @@ -34,6 +34,7 @@ 'blog.apps.BlogConfig', 'users.apps.UsersConfig', 'crispy_forms', + 'crispy_bootstrap5', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -125,7 +126,9 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' -CRISPY_TEMPLATE_PACK = 'bootstrap4' +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" +CRISPY_TEMPLATE_PACK = "bootstrap5" + LOGIN_REDIRECT_URL = 'blog-home' LOGIN_URL = 'login' diff --git a/Django_Blog/12-Password-Reset/django_project/django_project/settings.py b/Django_Blog/12-Password-Reset/django_project/django_project/settings.py index f18cc755b..495d75cc4 100644 --- a/Django_Blog/12-Password-Reset/django_project/django_project/settings.py +++ b/Django_Blog/12-Password-Reset/django_project/django_project/settings.py @@ -34,6 +34,7 @@ 'blog.apps.BlogConfig', 'users.apps.UsersConfig', 'crispy_forms', + 'crispy_bootstrap5', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -125,7 +126,9 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' -CRISPY_TEMPLATE_PACK = 'bootstrap4' +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" +CRISPY_TEMPLATE_PACK = "bootstrap5" + LOGIN_REDIRECT_URL = 'blog-home' LOGIN_URL = 'login' diff --git a/Django_Blog/13-AWS-S3-Uploads/django_project/django_project/settings.py b/Django_Blog/13-AWS-S3-Uploads/django_project/django_project/settings.py index 72a052a7c..7a3ae0f50 100644 --- a/Django_Blog/13-AWS-S3-Uploads/django_project/django_project/settings.py +++ b/Django_Blog/13-AWS-S3-Uploads/django_project/django_project/settings.py @@ -34,6 +34,7 @@ 'blog.apps.BlogConfig', 'users.apps.UsersConfig', 'crispy_forms', + 'crispy_bootstrap5', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -126,7 +127,9 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' -CRISPY_TEMPLATE_PACK = 'bootstrap4' +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" +CRISPY_TEMPLATE_PACK = "bootstrap5" + LOGIN_REDIRECT_URL = 'blog-home' LOGIN_URL = 'login' diff --git a/Django_Blog/13-Deployment-Heroku/django_project/django_project/settings.py b/Django_Blog/13-Deployment-Heroku/django_project/django_project/settings.py index 8aa821180..14d61f36b 100644 --- a/Django_Blog/13-Deployment-Heroku/django_project/django_project/settings.py +++ b/Django_Blog/13-Deployment-Heroku/django_project/django_project/settings.py @@ -36,6 +36,7 @@ 'blog.apps.BlogConfig', 'users.apps.UsersConfig', 'crispy_forms', + 'crispy_bootstrap5', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -129,7 +130,9 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' -CRISPY_TEMPLATE_PACK = 'bootstrap4' +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" +CRISPY_TEMPLATE_PACK = "bootstrap5" + LOGIN_REDIRECT_URL = 'blog-home' LOGIN_URL = 'login' diff --git a/Django_Blog/13-Deployment-Linode/django_project/django_project/settings.py b/Django_Blog/13-Deployment-Linode/django_project/django_project/settings.py index f18cc755b..495d75cc4 100644 --- a/Django_Blog/13-Deployment-Linode/django_project/django_project/settings.py +++ b/Django_Blog/13-Deployment-Linode/django_project/django_project/settings.py @@ -34,6 +34,7 @@ 'blog.apps.BlogConfig', 'users.apps.UsersConfig', 'crispy_forms', + 'crispy_bootstrap5', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -125,7 +126,9 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' -CRISPY_TEMPLATE_PACK = 'bootstrap4' +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" +CRISPY_TEMPLATE_PACK = "bootstrap5" + LOGIN_REDIRECT_URL = 'blog-home' LOGIN_URL = 'login' From eff33340cb734bbe18543eb57a31f8f68279a52f Mon Sep 17 00:00:00 2001 From: rohit singh Date: Mon, 26 Feb 2024 16:32:47 +0530 Subject: [PATCH 3/5] logout user update --- .../django_project/django_project/urls.py | 2 +- .../django_project/users/views.py | 6 ++++++ .../django_project/django_project/urls.py | 2 +- .../08-Profile-And-Images/django_project/users/views.py | 7 ++++++- .../django_project/django_project/urls.py | 2 +- .../09-Update-User-Profile/django_project/users/views.py | 6 +++++- .../django_project/django_project/urls.py | 2 +- .../django_project/users/views.py | 6 ++++++ .../11-Pagination/django_project/django_project/urls.py | 2 +- Django_Blog/11-Pagination/django_project/users/views.py | 7 ++++++- .../django_project/django_project/urls.py | 2 +- .../12-Password-Reset/django_project/users/views.py | 6 ++++++ .../django_project/django_project/urls.py | 2 +- .../13-AWS-S3-Uploads/django_project/users/views.py | 6 ++++++ .../django_project/django_project/urls.py | 2 +- .../13-Deployment-Heroku/django_project/users/views.py | 6 ++++++ .../django_project/django_project/urls.py | 2 +- .../13-Deployment-Linode/django_project/users/views.py | 5 +++++ 18 files changed, 61 insertions(+), 12 deletions(-) diff --git a/Django_Blog/07-Login-Logout-Authentication/django_project/django_project/urls.py b/Django_Blog/07-Login-Logout-Authentication/django_project/django_project/urls.py index 37b6e5456..aa772893f 100644 --- a/Django_Blog/07-Login-Logout-Authentication/django_project/django_project/urls.py +++ b/Django_Blog/07-Login-Logout-Authentication/django_project/django_project/urls.py @@ -25,7 +25,7 @@ path('register/', user_views.register, name='register'), path('profile/', user_views.profile, name='profile'), path('login/', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'), - path('logout/', auth_views.LogoutView.as_view(template_name='users/logout.html'), name='logout'), + path('logout/', user_views.logout_view, name="logout"), path('', include('blog.urls')), ] diff --git a/Django_Blog/07-Login-Logout-Authentication/django_project/users/views.py b/Django_Blog/07-Login-Logout-Authentication/django_project/users/views.py index 5e7696b89..da3979fb9 100644 --- a/Django_Blog/07-Login-Logout-Authentication/django_project/users/views.py +++ b/Django_Blog/07-Login-Logout-Authentication/django_project/users/views.py @@ -2,6 +2,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from .forms import UserRegisterForm +from django.contrib.auth import logout def register(request): @@ -17,6 +18,11 @@ def register(request): return render(request, 'users/register.html', {'form': form}) +def logout_view(request): + logout(request) + return render(request, 'users/logout.html') + + @login_required def profile(request): return render(request, 'users/profile.html') diff --git a/Django_Blog/08-Profile-And-Images/django_project/django_project/urls.py b/Django_Blog/08-Profile-And-Images/django_project/django_project/urls.py index 37b6e5456..aa772893f 100644 --- a/Django_Blog/08-Profile-And-Images/django_project/django_project/urls.py +++ b/Django_Blog/08-Profile-And-Images/django_project/django_project/urls.py @@ -25,7 +25,7 @@ path('register/', user_views.register, name='register'), path('profile/', user_views.profile, name='profile'), path('login/', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'), - path('logout/', auth_views.LogoutView.as_view(template_name='users/logout.html'), name='logout'), + path('logout/', user_views.logout_view, name="logout"), path('', include('blog.urls')), ] diff --git a/Django_Blog/08-Profile-And-Images/django_project/users/views.py b/Django_Blog/08-Profile-And-Images/django_project/users/views.py index 5e7696b89..6880a3a18 100644 --- a/Django_Blog/08-Profile-And-Images/django_project/users/views.py +++ b/Django_Blog/08-Profile-And-Images/django_project/users/views.py @@ -2,7 +2,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from .forms import UserRegisterForm - +from django.contrib.auth import logout def register(request): if request.method == 'POST': @@ -17,6 +17,11 @@ def register(request): return render(request, 'users/register.html', {'form': form}) +def logout_view(request): + logout(request) + return render(request, 'users/logout.html') + + @login_required def profile(request): return render(request, 'users/profile.html') diff --git a/Django_Blog/09-Update-User-Profile/django_project/django_project/urls.py b/Django_Blog/09-Update-User-Profile/django_project/django_project/urls.py index 37b6e5456..aa772893f 100644 --- a/Django_Blog/09-Update-User-Profile/django_project/django_project/urls.py +++ b/Django_Blog/09-Update-User-Profile/django_project/django_project/urls.py @@ -25,7 +25,7 @@ path('register/', user_views.register, name='register'), path('profile/', user_views.profile, name='profile'), path('login/', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'), - path('logout/', auth_views.LogoutView.as_view(template_name='users/logout.html'), name='logout'), + path('logout/', user_views.logout_view, name="logout"), path('', include('blog.urls')), ] diff --git a/Django_Blog/09-Update-User-Profile/django_project/users/views.py b/Django_Blog/09-Update-User-Profile/django_project/users/views.py index c9de3bb90..2355e5d3a 100644 --- a/Django_Blog/09-Update-User-Profile/django_project/users/views.py +++ b/Django_Blog/09-Update-User-Profile/django_project/users/views.py @@ -2,7 +2,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from .forms import UserRegisterForm, UserUpdateForm, ProfileUpdateForm - +from django.contrib.auth import logout def register(request): if request.method == 'POST': @@ -16,6 +16,10 @@ def register(request): form = UserRegisterForm() return render(request, 'users/register.html', {'form': form}) +def logout_view(request): + logout(request) + return render(request, 'users/logout.html') + @login_required def profile(request): diff --git a/Django_Blog/10-Posts-Create-Update-Delete/django_project/django_project/urls.py b/Django_Blog/10-Posts-Create-Update-Delete/django_project/django_project/urls.py index 37b6e5456..aa772893f 100644 --- a/Django_Blog/10-Posts-Create-Update-Delete/django_project/django_project/urls.py +++ b/Django_Blog/10-Posts-Create-Update-Delete/django_project/django_project/urls.py @@ -25,7 +25,7 @@ path('register/', user_views.register, name='register'), path('profile/', user_views.profile, name='profile'), path('login/', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'), - path('logout/', auth_views.LogoutView.as_view(template_name='users/logout.html'), name='logout'), + path('logout/', user_views.logout_view, name="logout"), path('', include('blog.urls')), ] diff --git a/Django_Blog/10-Posts-Create-Update-Delete/django_project/users/views.py b/Django_Blog/10-Posts-Create-Update-Delete/django_project/users/views.py index c9de3bb90..854d06ede 100644 --- a/Django_Blog/10-Posts-Create-Update-Delete/django_project/users/views.py +++ b/Django_Blog/10-Posts-Create-Update-Delete/django_project/users/views.py @@ -2,6 +2,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from .forms import UserRegisterForm, UserUpdateForm, ProfileUpdateForm +from django.contrib.auth import logout def register(request): @@ -17,6 +18,11 @@ def register(request): return render(request, 'users/register.html', {'form': form}) +def logout_view(request): + logout(request) + return render(request, 'users/logout.html') + + @login_required def profile(request): if request.method == 'POST': diff --git a/Django_Blog/11-Pagination/django_project/django_project/urls.py b/Django_Blog/11-Pagination/django_project/django_project/urls.py index 37b6e5456..aa772893f 100644 --- a/Django_Blog/11-Pagination/django_project/django_project/urls.py +++ b/Django_Blog/11-Pagination/django_project/django_project/urls.py @@ -25,7 +25,7 @@ path('register/', user_views.register, name='register'), path('profile/', user_views.profile, name='profile'), path('login/', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'), - path('logout/', auth_views.LogoutView.as_view(template_name='users/logout.html'), name='logout'), + path('logout/', user_views.logout_view, name="logout"), path('', include('blog.urls')), ] diff --git a/Django_Blog/11-Pagination/django_project/users/views.py b/Django_Blog/11-Pagination/django_project/users/views.py index c9de3bb90..fb1272df4 100644 --- a/Django_Blog/11-Pagination/django_project/users/views.py +++ b/Django_Blog/11-Pagination/django_project/users/views.py @@ -2,7 +2,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from .forms import UserRegisterForm, UserUpdateForm, ProfileUpdateForm - +from django.contrib.auth import logout def register(request): if request.method == 'POST': @@ -17,6 +17,11 @@ def register(request): return render(request, 'users/register.html', {'form': form}) +def logout_view(request): + logout(request) + return render(request, 'users/logout.html') + + @login_required def profile(request): if request.method == 'POST': diff --git a/Django_Blog/12-Password-Reset/django_project/django_project/urls.py b/Django_Blog/12-Password-Reset/django_project/django_project/urls.py index 51dbb4b31..12afd7b4f 100644 --- a/Django_Blog/12-Password-Reset/django_project/django_project/urls.py +++ b/Django_Blog/12-Password-Reset/django_project/django_project/urls.py @@ -25,7 +25,7 @@ path('register/', user_views.register, name='register'), path('profile/', user_views.profile, name='profile'), path('login/', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'), - path('logout/', auth_views.LogoutView.as_view(template_name='users/logout.html'), name='logout'), + path('logout/', user_views.logout_view, name="logout"), path('password-reset/', auth_views.PasswordResetView.as_view( template_name='users/password_reset.html' diff --git a/Django_Blog/12-Password-Reset/django_project/users/views.py b/Django_Blog/12-Password-Reset/django_project/users/views.py index c9de3bb90..854d06ede 100644 --- a/Django_Blog/12-Password-Reset/django_project/users/views.py +++ b/Django_Blog/12-Password-Reset/django_project/users/views.py @@ -2,6 +2,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from .forms import UserRegisterForm, UserUpdateForm, ProfileUpdateForm +from django.contrib.auth import logout def register(request): @@ -17,6 +18,11 @@ def register(request): return render(request, 'users/register.html', {'form': form}) +def logout_view(request): + logout(request) + return render(request, 'users/logout.html') + + @login_required def profile(request): if request.method == 'POST': diff --git a/Django_Blog/13-AWS-S3-Uploads/django_project/django_project/urls.py b/Django_Blog/13-AWS-S3-Uploads/django_project/django_project/urls.py index 51dbb4b31..12afd7b4f 100644 --- a/Django_Blog/13-AWS-S3-Uploads/django_project/django_project/urls.py +++ b/Django_Blog/13-AWS-S3-Uploads/django_project/django_project/urls.py @@ -25,7 +25,7 @@ path('register/', user_views.register, name='register'), path('profile/', user_views.profile, name='profile'), path('login/', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'), - path('logout/', auth_views.LogoutView.as_view(template_name='users/logout.html'), name='logout'), + path('logout/', user_views.logout_view, name="logout"), path('password-reset/', auth_views.PasswordResetView.as_view( template_name='users/password_reset.html' diff --git a/Django_Blog/13-AWS-S3-Uploads/django_project/users/views.py b/Django_Blog/13-AWS-S3-Uploads/django_project/users/views.py index c9de3bb90..854d06ede 100644 --- a/Django_Blog/13-AWS-S3-Uploads/django_project/users/views.py +++ b/Django_Blog/13-AWS-S3-Uploads/django_project/users/views.py @@ -2,6 +2,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from .forms import UserRegisterForm, UserUpdateForm, ProfileUpdateForm +from django.contrib.auth import logout def register(request): @@ -17,6 +18,11 @@ def register(request): return render(request, 'users/register.html', {'form': form}) +def logout_view(request): + logout(request) + return render(request, 'users/logout.html') + + @login_required def profile(request): if request.method == 'POST': diff --git a/Django_Blog/13-Deployment-Heroku/django_project/django_project/urls.py b/Django_Blog/13-Deployment-Heroku/django_project/django_project/urls.py index 51dbb4b31..12afd7b4f 100644 --- a/Django_Blog/13-Deployment-Heroku/django_project/django_project/urls.py +++ b/Django_Blog/13-Deployment-Heroku/django_project/django_project/urls.py @@ -25,7 +25,7 @@ path('register/', user_views.register, name='register'), path('profile/', user_views.profile, name='profile'), path('login/', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'), - path('logout/', auth_views.LogoutView.as_view(template_name='users/logout.html'), name='logout'), + path('logout/', user_views.logout_view, name="logout"), path('password-reset/', auth_views.PasswordResetView.as_view( template_name='users/password_reset.html' diff --git a/Django_Blog/13-Deployment-Heroku/django_project/users/views.py b/Django_Blog/13-Deployment-Heroku/django_project/users/views.py index c9de3bb90..854d06ede 100644 --- a/Django_Blog/13-Deployment-Heroku/django_project/users/views.py +++ b/Django_Blog/13-Deployment-Heroku/django_project/users/views.py @@ -2,6 +2,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from .forms import UserRegisterForm, UserUpdateForm, ProfileUpdateForm +from django.contrib.auth import logout def register(request): @@ -17,6 +18,11 @@ def register(request): return render(request, 'users/register.html', {'form': form}) +def logout_view(request): + logout(request) + return render(request, 'users/logout.html') + + @login_required def profile(request): if request.method == 'POST': diff --git a/Django_Blog/13-Deployment-Linode/django_project/django_project/urls.py b/Django_Blog/13-Deployment-Linode/django_project/django_project/urls.py index 51dbb4b31..12afd7b4f 100644 --- a/Django_Blog/13-Deployment-Linode/django_project/django_project/urls.py +++ b/Django_Blog/13-Deployment-Linode/django_project/django_project/urls.py @@ -25,7 +25,7 @@ path('register/', user_views.register, name='register'), path('profile/', user_views.profile, name='profile'), path('login/', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'), - path('logout/', auth_views.LogoutView.as_view(template_name='users/logout.html'), name='logout'), + path('logout/', user_views.logout_view, name="logout"), path('password-reset/', auth_views.PasswordResetView.as_view( template_name='users/password_reset.html' diff --git a/Django_Blog/13-Deployment-Linode/django_project/users/views.py b/Django_Blog/13-Deployment-Linode/django_project/users/views.py index c9de3bb90..2bc8d92d2 100644 --- a/Django_Blog/13-Deployment-Linode/django_project/users/views.py +++ b/Django_Blog/13-Deployment-Linode/django_project/users/views.py @@ -2,6 +2,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from .forms import UserRegisterForm, UserUpdateForm, ProfileUpdateForm +from django.contrib.auth import logout def register(request): @@ -17,6 +18,10 @@ def register(request): return render(request, 'users/register.html', {'form': form}) +def logout_view(request): + logout(request) + return render(request, 'users/logout.html') + @login_required def profile(request): if request.method == 'POST': From e7a091f8e2618b75e8dd646182f01af7c830bac4 Mon Sep 17 00:00:00 2001 From: rohit singh Date: Wed, 28 Feb 2024 16:39:02 +0530 Subject: [PATCH 4/5] profile and home html change --- .../django_project/blog/static/blog/main.css | 4 +- .../blog/templates/blog/home.html | 33 ++++++++------- .../users/templates/users/profile.html | 42 +++++++++++-------- 3 files changed, 46 insertions(+), 33 deletions(-) diff --git a/Django_Blog/09-Update-User-Profile/django_project/blog/static/blog/main.css b/Django_Blog/09-Update-User-Profile/django_project/blog/static/blog/main.css index 06c3af5f9..b102d94b3 100644 --- a/Django_Blog/09-Update-User-Profile/django_project/blog/static/blog/main.css +++ b/Django_Blog/09-Update-User-Profile/django_project/blog/static/blog/main.css @@ -50,8 +50,8 @@ a.article-title:hover { } .article-img { - height: 65px; - width: 65px; + height: 90px; + width: 90px; margin-right: 16px; } diff --git a/Django_Blog/09-Update-User-Profile/django_project/blog/templates/blog/home.html b/Django_Blog/09-Update-User-Profile/django_project/blog/templates/blog/home.html index 46d5d35ed..4839950f7 100644 --- a/Django_Blog/09-Update-User-Profile/django_project/blog/templates/blog/home.html +++ b/Django_Blog/09-Update-User-Profile/django_project/blog/templates/blog/home.html @@ -1,16 +1,21 @@ -{% extends "blog/base.html" %} +{% extends "blog/base.html"%} {% block content %} - {% for post in posts %} - - {% endfor %} +{% for post in posts %} + +{% endfor %} {% endblock content %} diff --git a/Django_Blog/09-Update-User-Profile/django_project/users/templates/users/profile.html b/Django_Blog/09-Update-User-Profile/django_project/users/templates/users/profile.html index 76fd4d2b8..e091c0bd5 100644 --- a/Django_Blog/09-Update-User-Profile/django_project/users/templates/users/profile.html +++ b/Django_Blog/09-Update-User-Profile/django_project/users/templates/users/profile.html @@ -1,24 +1,32 @@ {% extends "blog/base.html" %} {% load crispy_forms_tags %} + {% block content %} +
-
- -
- -

{{ user.email }}

+ +
+
+ +
+
+ +

{{user.email}}

+
-
-
- {% csrf_token %} -
- Profile Info - {{ u_form|crispy }} - {{ p_form|crispy }} -
-
- -
-
+ + +
+ {% csrf_token %} +
+ Profile Info + {{ u_form|crispy }} + {{ p_form|crispy }} +
+
+ +
+
+ {% endblock content %} From e75811612cf0680c0b19c4d02e91423befbd316a Mon Sep 17 00:00:00 2001 From: rohit singh Date: Mon, 4 Mar 2024 13:48:10 +0530 Subject: [PATCH 5/5] layout bootstrap, logout user, user models file update --- .../blog/templates/blog/base.html | 2 +- .../blog/templates/blog/home.html | 20 ++++--- .../blog/templates/blog/user_posts.html | 56 ++++++++++--------- .../django_project/users/models.py | 4 +- 4 files changed, 47 insertions(+), 35 deletions(-) diff --git a/Django_Blog/12-Password-Reset/django_project/blog/templates/blog/base.html b/Django_Blog/12-Password-Reset/django_project/blog/templates/blog/base.html index bb7c9fd52..29e0164a7 100644 --- a/Django_Blog/12-Password-Reset/django_project/blog/templates/blog/base.html +++ b/Django_Blog/12-Password-Reset/django_project/blog/templates/blog/base.html @@ -23,7 +23,7 @@