Project Completed for now

sahara/main/forms.py

@@ -1,12 +1,8 @@
 from django import forms
-from django.contrib.auth.forms import AuthenticationForm
+from django.core.exceptions import ValidationError
 from .models import User
 
-from django import forms
-from .models import User, Service
-
 class UserRegistrationForm(forms.ModelForm):
-    # Password and confirm password fields with custom classes
     password = forms.CharField(
         widget=forms.PasswordInput(attrs={
             'class': 'form-control',
@@ -22,7 +18,8 @@ class UserRegistrationForm(forms.ModelForm):
 
     class Meta:
         model = User
-        fields = ['email', 'first_name', 'last_name', 'profile', 'price', 'bio', 'service_offered', 'login_profile']
+        fields = ['email', 'first_name', 'last_name', 'profile', 'price', 
+                 'bio', 'service_offered', 'login_profile']
         widgets = {
             'first_name': forms.TextInput(attrs={
                 'class': 'form-control',
@@ -43,7 +40,7 @@ class UserRegistrationForm(forms.ModelForm):
             'bio': forms.Textarea(attrs={
                 'class': 'form-control',
                 'placeholder': 'Enter your bio',
-                'rows': 4,  # You can customize the rows and columns as needed
+                'rows': 4,
             }),
             'price': forms.NumberInput(attrs={
                 'class': 'form-control',
@@ -57,22 +54,35 @@ class UserRegistrationForm(forms.ModelForm):
             }),
         }
 
+    def clean_email(self):
+        email = self.cleaned_data.get('email')
+        if User.objects.filter(email=email).exists():
+            raise ValidationError('Email is already registered.')
+        return email
+
     def clean(self):
         cleaned_data = super().clean()
         password = cleaned_data.get('password')
         confirm_password = cleaned_data.get('confirm_password')
+        
+        # Password validation
+        if password:
+            if len(password) < 8:
+                raise ValidationError('Password must be at least 8 characters long.')
+            if not any(char.isdigit() for char in password):
+                raise ValidationError('Password must contain at least one number.')
+            if not any(char.isupper() for char in password):
+                raise ValidationError('Password must contain at least one uppercase letter.')
 
         # Check if passwords match
-        if password != confirm_password:
-            self.add_error('confirm_password', 'Passwords do not match')
+        if password and confirm_password and password != confirm_password:
+            raise ValidationError('Passwords do not match.')
 
         return cleaned_data
 
-
-    def clean(self):
-        cleaned_data = super().clean()
-        password = cleaned_data.get('password')
-        confirm_password = cleaned_data.get('confirm_password')
-
-        if password and confirm_password and password != confirm_password:
-            raise forms.ValidationError("Passwords do not match.")
+    def save(self, commit=True):
+        user = super().save(commit=False)
+        user.set_password(self.cleaned_data['password'])
+        if commit:
+            user.save()
+        return user

sahara/main/templates/main/register.html

@@ -1,133 +1,44 @@
+<!-- templates/registration/register.html -->
 {% extends 'base.html' %}
 
 {% block content %}
-<div class="container">
-    <h2>Register</h2>
-    <form method="post" enctype="multipart/form-data">
-        {% csrf_token %}
-        
-        <div class="form-group mb-3">
-            <label for="{{ form.first_name.id_for_label }}">First Name</label>
-            {{ form.first_name }}
-            {% if form.first_name.errors %}
-                <div class="invalid-feedback">
-                    {% for error in form.first_name.errors %}
-                        <p>{{ error }}</p>
-                    {% endfor %}
-                </div>
-            {% endif %}
-        </div>
-
-        <div class="form-group mb-3">
-            <label for="{{ form.last_name.id_for_label }}">Last Name</label>
-            {{ form.last_name }}
-            {% if form.last_name.errors %}
-                <div class="invalid-feedback">
-                    {% for error in form.last_name.errors %}
-                        <p>{{ error }}</p>
-                    {% endfor %}
-                </div>
-            {% endif %}
-        </div>
-
-        <div class="form-group mb-3">
-            <label for="{{ form.email.id_for_label }}">Email</label>
-            {{ form.email }}
-            {% if form.email.errors %}
-                <div class="invalid-feedback">
-                    {% for error in form.email.errors %}
-                        <p>{{ error }}</p>
-                    {% endfor %}
-                </div>
-            {% endif %}
-        </div>
-
-        <div class="form-group mb-3">
-            <label for="{{ form.password.id_for_label }}">Password</label>
-            {{ form.password }}
-            {% if form.password.errors %}
-                <div class="invalid-feedback">
-                    {% for error in form.password.errors %}
-                        <p>{{ error }}</p>
-                    {% endfor %}
-                </div>
-            {% endif %}
-        </div>
-
-        <div class="form-group mb-3">
-            <label for="{{ form.confirm_password.id_for_label }}">Confirm Password</label>
-            {{ form.confirm_password }}
-            {% if form.confirm_password.errors %}
-                <div class="invalid-feedback">
-                    {% for error in form.confirm_password.errors %}
-                        <p>{{ error }}</p>
-                    {% endfor %}
-                </div>
-            {% endif %}
-        </div>
-
-        <div class="form-group mb-3">
-            <label for="{{ form.profile.id_for_label }}">Profile Image</label>
-            {{ form.profile }}
-            {% if form.profile.errors %}
-                <div class="invalid-feedback">
-                    {% for error in form.profile.errors %}
-                        <p>{{ error }}</p>
-                    {% endfor %}
-                </div>
-            {% endif %}
-        </div>
-
-        <div class="form-group mb-3">
-            <label for="{{ form.price.id_for_label }}">Price</label>
-            {{ form.price }}
-            {% if form.price.errors %}
-                <div class="invalid-feedback">
-                    {% for error in form.price.errors %}
-                        <p>{{ error }}</p>
-                    {% endfor %}
-                </div>
-            {% endif %}
-        </div>
-
-        <div class="form-group mb-3">
-            <label for="{{ form.bio.id_for_label }}">Bio</label>
-            {{ form.bio }}
-            {% if form.bio.errors %}
-                <div class="invalid-feedback">
-                    {% for error in form.bio.errors %}
-                        <p>{{ error }}</p>
-                    {% endfor %}
-                </div>
-            {% endif %}
-        </div>
-
-        <div class="form-group mb-3">
-            <label for="{{ form.service_offered.id_for_label }}">Service Offered</label>
-            {{ form.service_offered }}
-            {% if form.service_offered.errors %}
-                <div class="invalid-feedback">
-                    {% for error in form.service_offered.errors %}
-                        <p>{{ error }}</p>
-                    {% endfor %}
-                </div>
-            {% endif %}
-        </div>
-
-        <div class="form-group mb-3">
-            <label for="{{ form.login_profile.id_for_label }}">Login Profile</label>
-            {{ form.login_profile }}
-            {% if form.login_profile.errors %}
-                <div class="invalid-feedback">
-                    {% for error in form.login_profile.errors %}
-                        <p>{{ error }}</p>
-                    {% endfor %}
-                </div>
-            {% endif %}
-        </div>
-
-        <button type="submit" class="btn btn-primary">Register</button>
-    </form>
-    <p>Already have an account? <a href="{% url 'login' %}">Login here</a>.</p>
+<div class="container mt-5">
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">Register</div>
+                <div class="card-body">
+                    {% if messages %}
+                        {% for message in messages %}
+                            <div class="alert alert-{{ message.tags }}">
+                                {{ message }}
+                            </div>
+                        {% endfor %}
+                    {% endif %}
+
+                    <form method="post" enctype="multipart/form-data">
+                        {% csrf_token %}
+                        
+                        {% for field in form %}
+                        <div class="form-group mb-3">
+                            <label for="{{ field.id_for_label }}">{{ field.label }}</label>
+                            {{ field }}
+                            {% if field.help_text %}
+                                <small class="form-text text-muted">{{ field.help_text }}</small>
+                            {% endif %}
+                            {% for error in field.errors %}
+                                <div class="invalid-feedback d-block">
+                                    {{ error }}
+                                </div>
+                            {% endfor %}
+                        </div>
+                        {% endfor %}
+
+                        <button type="submit" class="btn btn-primary">Register</button>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
-{% endblock %}
+{% endblock %}

sahara/main/views.py

@@ -44,28 +44,28 @@ def home(request):
 
 def register(request):
     if request.user.is_authenticated:
-        messages.warning(request,"You are already logged in. Please Logout first to register ")
+        messages.warning(request, "You are already logged in.")
         return redirect('home')
-    if request.method == 'POST' and request.FILES:
-        form = UserRegistrationForm(request.POST,request.FILES, instance=request.user)
-        if form.is_valid():
-            user = form.save(commit=False)
-            user.set_password(form.cleaned_data['password'])
-            user.save()
 
+    if request.method == 'POST':
+        form = UserRegistrationForm(request.POST, request.FILES)
+        if form.is_valid():
             try:
-                user.send_verification_email(user)
-                messages.success(request, 'Registration successful! Please check your email to activate your account.')
+                user = form.save()
+                messages.success(request, 'Registration successful! You can now login.')
+                return redirect('login')
             except Exception as e:
-                logger.error(f"Error sending verification email: {e}")
-                messages.error(request, e)
-
-            return redirect('login')
+                logger.error(f"Registration error: {str(e)}")
+                messages.error(request, 'An error occurred during registration. Please try again.')
+        else:
+            # Display form errors
+            for field, errors in form.errors.items():
+                for error in errors:
+                    messages.error(request, f"{field}: {error}")
     else:
         form = UserRegistrationForm()
-        messages.error(request, 'email already exists')
-    return render(request, 'main/register.html', {'form': form})
 
+    return render(request, 'main/register.html', {'form': form})
 def activate_account(request, uidb64, token):
     try:
         uid = urlsafe_base64_decode(uidb64).decode()

sahara/templates/base.html

@@ -62,4 +62,5 @@
 
       <footer class="bg-dark text-white text-center py-3">
     <p>&copy; 2025 Sahara. All Rights Reserved. | <a href="#" class="text-white">Privacy Policy</a> | <a href="#" class="text-white">Terms of Service</a></p>
-</footer>
+</footer>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>