From 76b9f58f683197abb539c7ce6af34f90032a3256 Mon Sep 17 00:00:00 2001
From: loulous27 <loulous27@crans.org>
Date: Sat, 22 Nov 2025 19:36:37 +0100
Subject: [PATCH] Add new admin view Fields

---
 photo21/admin.py    | 9 +++++++++
 photo21/settings.py | 8 ++++++--
 photologue/admin.py | 2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 photo21/admin.py

diff --git a/photo21/admin.py b/photo21/admin.py
new file mode 100644
index 0000000..0289b53
--- /dev/null
+++ b/photo21/admin.py
@@ -0,0 +1,9 @@
+from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.models import User
+
+class CustomUserAdmin(UserAdmin):
+    list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff', 'last_login') # Added last_login
+
+admin.site.unregister(User)
+admin.site.register(User, CustomUserAdmin)
diff --git a/photo21/settings.py b/photo21/settings.py
index 9c97c88..2892898 100644
--- a/photo21/settings.py
+++ b/photo21/settings.py
@@ -68,6 +68,7 @@ INSTALLED_APPS = [
     "allauth_note_kfet",
     "crispy_forms",
     "photologue",
+    "photo21"
 ]
 
 MIDDLEWARE = [
@@ -80,6 +81,7 @@ MIDDLEWARE = [
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "django.middleware.locale.LocaleMiddleware",
     "django.contrib.sites.middleware.CurrentSiteMiddleware",
+    "allauth.account.middleware.AccountMiddleware",
 ]
 
 ROOT_URLCONF = "photo21.urls"
@@ -204,9 +206,11 @@ MESSAGE_TAGS = {
 }
 
 # Allauth configuration
-ACCOUNT_EMAIL_REQUIRED = True
+# ACCOUNT_EMAIL_REQUIRED = True
+ACCOUNT_SIGNUP_FIELDS = ['email*', 'username*', 'password1*', 'password2*']
 ACCOUNT_EMAIL_VERIFICATION = "mandatory"
-ACCOUNT_AUTHENTICATION_METHOD = "username_email"
+# ACCOUNT_AUTHENTICATION_METHOD = "username_email"
+ACCOUNT_LOGIN_METHODS = {'username', 'email'}
 ACCOUNT_FORMS = {"signup": "photo21.forms.CustomSignupForm"}
 SOCIALACCOUNT_PROVIDERS = {
     "notekfet": {
diff --git a/photologue/admin.py b/photologue/admin.py
index 272b74c..5bd2f89 100644
--- a/photologue/admin.py
+++ b/photologue/admin.py
@@ -59,4 +59,4 @@ class TagAdmin(admin.ModelAdmin):
 
 admin.site.register(Gallery, GalleryAdmin)
 admin.site.register(Photo, PhotoAdmin)
-admin.site.register(Tag, TagAdmin)
+admin.site.register(Tag, TagAdmin)
\ No newline at end of file