Feat/design overhaul

.djlintrc

@@ -0,0 +1,3 @@
+{
+	"ignore": "H021,D018,H037"
+}

.env.example

@@ -1,9 +1,147 @@
-API_Authorization=<api_authorization_key>
-SENTRY_DSN=<sentry_dsn_url>
-EMAIL_HOST_USER=<email_host_user>
-EMAIL_HOST_PASSWORD=<email_host_password>
-DISCORD_LOGGING_WEBHOOK=<discord_logging_webhook_url>
-HCAPTCHA_SITEKEY=<hcaptcha_sitekey>
-HCAPTCHA_SECRET=<hcaptcha_secret>
-MAINTENANCE_MODE=<true/false>
-BOT_HOST=<bot_host url>
+#==============================================================================
+# Server Configuration
+#==============================================================================
+
+# Enable Django debug mode (True/False)
+# Default: False
+# WARNING: Never set to True in production
+# DEBUG=False
+
+# Django secret key for cryptographic signing
+# REQUIRED: Generate a new one using `python -c 'from django.core.management.utils import get_random_secret_key; print(get_random_secret_key())'`
+# SECRET_KEY=your-secret-key-here
+
+# Comma-separated list of allowed hosts
+# Default: "localhost,127.0.0.1"
+# Example: "example.com,subdomain.example.com,localhost"
+# ALLOWED_HOSTS=localhost,127.0.0.1
+
+# Comma-separated list of trusted origins for CSRF
+# Default: "http://localhost:8000"
+# Example: "https://example.com,https://subdomain.example.com"
+# CSRF_TRUSTED_ORIGINS=http://localhost:8000
+
+#==============================================================================
+# Database Configuration (PostgreSQL)
+#==============================================================================
+
+# PostgreSQL database name
+# REQUIRED: Name of your database
+# DB_NAME=redcrypt
+
+# PostgreSQL database user
+# REQUIRED: Username with access to the database
+# DB_USER=your_db_user
+
+# PostgreSQL database password
+# REQUIRED: Password for the database user
+# DB_PASSWORD=your_db_password
+
+# PostgreSQL host address
+# Default: localhost
+# Example: "db.example.com" or "postgresql.service"
+# DB_HOST=localhost
+
+# PostgreSQL port number
+# Default: 5432
+# DB_PORT=5432
+
+#==============================================================================
+# Email Configuration (SMTP)
+#==============================================================================
+
+# SMTP server hostname
+# Example: "smtp.gmail.com" for Gmail
+# EMAIL_HOST=smtp.gmail.com
+
+# SMTP server port
+# Common values: 587 (TLS) or 465 (SSL)
+# EMAIL_PORT=587
+
+# Enable TLS for SMTP
+# Default: True
+# EMAIL_USE_TLS=True
+
+# SMTP authentication username
+# Usually your email address
+# [email protected]
+
+# SMTP authentication password
+# For Gmail: Use App Password, not account password
+# EMAIL_HOST_PASSWORD=your-app-specific-password
+
+# Email sender address
+# Default: Same as EMAIL_HOST_USER
+# Example: "Re-Dcrypt <[email protected]>"
+# [email protected]
+
+#==============================================================================
+# Authentication & Security
+#==============================================================================
+
+# hCaptcha site key (public key)
+# Get from: https://www.hcaptcha.com/
+# HCAPTCHA_SITEKEY=your-hcaptcha-site-key
+
+# hCaptcha secret key
+# Get from: https://www.hcaptcha.com/
+# HCAPTCHA_SECRET=your-hcaptcha-secret-key
+
+# Google OAuth credentials
+# Get from: https://console.cloud.google.com/
+# GOOGLE_CLIENT_ID=your-google-client-id
+# GOOGLE_CLIENT_SECRET=your-google-client-secret
+
+#==============================================================================
+# Discord Integration
+#==============================================================================
+
+# Discord bot host URL
+# Example: "https://bot.example.com"
+# BOT_HOST=https://your-discord-bot-host
+
+# API authorization token for bot communication
+# REQUIRED: Generate a secure random string
+# API_Authorization=your-api-authorization-token
+
+# Discord webhook URL for backups
+# Get from Discord channel settings
+# Discord_backup_webhook=your-discord-webhook-url
+
+#==============================================================================
+# Application Control
+#==============================================================================
+
+# Maintenance mode toggle (true/false)
+# Default: false
+# MAINTENANCE_MODE=false
+
+# API authentication for cron jobs
+# REQUIRED: Generate a secure random string
+# API_CRON=your-cron-api-key
+
+#==============================================================================
+# Backup Configuration
+#==============================================================================
+
+# Password for encrypting backup ZIP files
+# REQUIRED: Choose a strong password
+# PWD_zip=your-backup-zip-password
+
+#==============================================================================
+# Monitoring (Optional)
+#==============================================================================
+
+# Sentry DSN for error tracking
+# Get from: https://sentry.io/
+# Optional: Leave empty to disable Sentry
+# SENTRY_DSN=your-sentry-dsn
+
+#==============================================================================
+# Site Configuration
+#==============================================================================
+
+# Django site ID for social auth
+# Default: 3
+# WARNING: Change this if you have different site configurations
+# SITE_ID=3

.gitignore

@@ -150,3 +150,7 @@ replit.nix
 poetry.lock
 pyproject.toml
 db.zip
+.aider*
+
+# Avatars file
+media/avatars/*

accounts/adapter.py

@@ -0,0 +1,71 @@
+from allauth.account.adapter import DefaultAccountAdapter
+from django.conf import settings
+from django.core.mail import EmailMultiAlternatives
+from django.template.loader import render_to_string
+import logging
+
+logger = logging.getLogger(__name__)
+
+class CustomAccountAdapter(DefaultAccountAdapter):
+    def send_mail(self, template_prefix, email, context):
+        required_settings = [
+            'EMAIL_HOST',
+            'EMAIL_PORT',
+            'EMAIL_HOST_USER',
+            'EMAIL_HOST_PASSWORD',
+            'EMAIL_SENDER'
+        ]
+
+        smtp_configured = all(hasattr(settings, setting) and getattr(settings, setting) 
+                            for setting in required_settings)
+
+        if not smtp_configured:
+            logger.warning(
+                "SMTP credentials not configured. Skipping email send. "
+                "Please configure EMAIL_HOST, EMAIL_PORT, EMAIL_HOST_USER, EMAIL_HOST_PASSWORD, and EMAIL_SENDER"
+            )
+            return
+
+        try:
+            from_email = f"Re-Dcrypt <{settings.EMAIL_SENDER}>"
+
+            # Remove duplication prior to building final paths
+            if template_prefix.startswith('account/email/'):
+                template_prefix = template_prefix.replace('account/email/', '')
+
+            html_template = f"account/email/{template_prefix}_message.html"
+            text_template = f"account/email/{template_prefix}_message.txt"
+
+            try:
+                context['activate_url'] = context.get('activate_url', '')
+                context['current_site'] = context.get('current_site', '')
+                html_body = render_to_string(html_template, context)
+                text_body = render_to_string(text_template, context)
+            except Exception as e:
+                logger.warning(f"Template rendering failed: {str(e)}")
+                # Fallback to basic text email
+                text_body = (
+                    f"Welcome to Re-Dcrypt!\n\n"
+                    f"Please verify your email by clicking this link: {context.get('activate_url', '')}\n\n"
+                    f"If you did not request this email, please ignore it."
+                )
+                html_body = text_body.replace('\n', '<br>')
+
+            # Create email message
+            msg = EmailMultiAlternatives(
+                subject=f"Re-Dcrypt - {context.get('subject', 'Verify your email')}",
+                body=text_body,
+                from_email=from_email,
+                to=[email],
+                headers={'From': from_email}
+            )
+
+            if html_body:
+                msg.attach_alternative(html_body, "text/html")
+
+            msg.send()
+            logger.info(f"Successfully sent verification email to {email}")
+
+        except Exception as e:
+            logger.error(f"Failed to send email: {str(e)}")
+            logger.exception(e)

accounts/admin.py

@@ -20,6 +20,7 @@ class ProfileAdmin(admin.ModelAdmin):
     list_display = [
         'user',
         'score',
+        'organization',
         'current_level',
         'ip_address_count'
     ]
@@ -31,7 +32,7 @@ class ProfileAdmin(admin.ModelAdmin):
                 ('name', 'is_public_name'),
                 ('organization', 'is_public_organization'),
                 ('discord_id'),
-                ('avatar_url')
+                ('avatar')
                 ]}),
         ('Hunt',
             {'fields': [
@@ -48,13 +49,13 @@ class ProfileAdmin(admin.ModelAdmin):
 
     def reset_profile_pic(self, request, queryset):
         for i in queryset:
-            i.avatar_url=f"https://source.boringavatars.com/beam/512/{i.user.username}?colors=00D2D2,006D6D,002A2A,055D5D,074848&square"
+            i.avatar_url=f"https://api.dicebear.com/9.x/fun-emoji/svg?seed={i.user.username}&backgroundColor=059ff2,71cf62,d84be5,d9915b,f6d594,fcbc34,b6e3f4,c0aede,d1d4f9,ffd5dc,ffdfbf&backgroundRotation[]"
             i.save()
         self.message_user(
             request, "Updated URLs"
             )
 
-    reset_profile_pic.short_description="Reset Avatar URL"
+    reset_profile_pic.short_description = "Reset Avatar"
     actions=[reset_profile_pic]
 
 

accounts/forms.py

@@ -1,15 +1,50 @@
 from django import forms
-from allauth.account.forms import SignupForm, ResetPasswordForm
+from allauth.account.forms import SignupForm, ResetPasswordForm, LoginForm
+from allauth.socialaccount.forms import SignupForm as SocialSignupForm
 from accounts.models import Profile
 from hcaptcha.fields import hCaptchaField
 from datetime import datetime
+from allauth.socialaccount.adapter import get_adapter
+
 import pytz
 
 
+class MyCustomSocialSignupForm(SocialSignupForm):
+    name = forms.CharField(required=False, label="Name [Optional]")
+    organization = forms.CharField(required=False, label='College/Organization [Optional]')
+    email = forms.EmailField(required=False) 
+
+    def save(self, request):
+        adapter = get_adapter(request)
+        user = adapter.save_user(request, self.sociallogin, form=self)
+        self.custom_signup(request, user)
+        try:
+            avatar_url = self.sociallogin.account.get_avatar_url()
+        except:
+            avatar_url = f"https://api.dicebear.com/9.x/fun-emoji/svg?seed={user.username}&backgroundColor=059ff2,71cf62,d84be5,d9915b,f6d594,fcbc34,b6e3f4,c0aede,d1d4f9,ffd5dc,ffdfbf&backgroundRotation[]"
+
+        current_time = datetime.now(pytz.timezone('Asia/Kolkata'))
+        profile = Profile.objects.create(
+            user=user,
+            name=self.cleaned_data['name'],
+            organization=self.cleaned_data['organization'],
+            avatar=avatar_url,
+            last_completed_time=current_time)
+        profile.save()
+        return user
+
+    def validate_unique_email(self, value):
+        try:
+            return super(MyCustomSocialSignupForm, self).validate_unique_email(value)
+        except forms.ValidationError:
+            raise forms.ValidationError(
+                get_adapter().error_messages["email_taken"]
+                % self.sociallogin.account.get_provider().name
+            )
+
 class MyCustomSignupForm(SignupForm):
     name = forms.CharField(required=False, label="Name [Optional]")
-    organization = forms.CharField(required=False,
-                                   label='School/Organization [Optional]')
+    organization = forms.CharField(required=False, label='College/Organization [Optional]')
     hcaptcha = hCaptchaField(theme='dark')
 
     field_order = [
@@ -18,23 +53,18 @@ class MyCustomSignupForm(SignupForm):
     ]
 
     def save(self, request):
-        # Ensure you call the parent class's save.
-        # .save() returns a User object.
         user = super(MyCustomSignupForm, self).save(request)
 
         profile = Profile.objects.create(
             user=user,
             name=self.cleaned_data['name'],
             organization=self.cleaned_data['organization'],
-            avatar_url=
-            f"https://source.boringavatars.com/beam/512/{user.username}?colors=00D2D2,006D6D,002A2A,055D5D,074848&square",
+            avatar=f"https://api.dicebear.com/9.x/fun-emoji/svg?seed={user.username}&backgroundColor=059ff2,71cf62,d84be5,d9915b,f6d594,fcbc34,b6e3f4,c0aede,d1d4f9,ffd5dc,ffdfbf&backgroundRotation[]",
             last_completed_time=datetime.now(pytz.timezone('Asia/Kolkata')))
         profile.save()
+        return user
 
-        # Add your own processing here.
 
-        # You must return the original result.
-        return user
 
 
 class CustomForgetPassword(ResetPasswordForm):
@@ -45,8 +75,19 @@ class ContactForm(forms.Form):
     subject = forms.CharField(
         required=True,
         max_length=150,
-        widget=forms.TextInput(attrs={'class': 'text-nblue p-2'}))
+        label="Subject",
+        widget=forms.TextInput(attrs={
+            'class': 'form-input',
+            'placeholder': 'Enter subject',
+        })
+    )
     body = forms.CharField(
         required=True,
-        widget=forms.Textarea(attrs={'class': 'text-nblue p-2'}))
+        label="Message",
+        widget=forms.Textarea(attrs={
+            'class': 'form-input',
+            'placeholder': 'Type your message here...',
+            'rows': 4,
+        })
+    )
     hCaptcha = hCaptchaField(theme='dark')