full commit

Author: RustamovAkrom

apps/users/forms.py

@@ -6,25 +6,36 @@
 
 class LoginForm(forms.Form):
     username = forms.CharField(
-        max_length=28,
+        max_length=150,
         widget=forms.TextInput(
             attrs={"placeholder": "Username...", "class": "form-control rounded-4"}
         ),
+        error_messages={
+            "required": "Username is required!",
+            'max_length': "Username is too lang, max length is 150 charecters."
+        }
     )
     password = forms.CharField(
         max_length=60,
         widget=forms.PasswordInput(
             attrs={"placeholder": "Password...", "class": "form-control rounded-4"}
         ),
+        error_messages={
+            "required": "Password is required!",
+            "max_length": "Password is to long, max length is 60 charecters."
+        }
     )
 
 
 class RegisterForm(forms.ModelForm):
     password1 = forms.CharField(
+        label="Password",
         max_length=28,
         widget=forms.PasswordInput(attrs={"id": "password", "type": "password"}),
+
     )
     password2 = forms.CharField(
+        label="Password (Confirm)",
         max_length=28,
         widget=forms.PasswordInput(attrs={"id": "password", "type": "password"}),
     )
@@ -39,7 +50,7 @@ def save(self, commit=True):
             user.set_password(password1)
             user.save()
         else:
-            raise ValidationError("Password must be match")
+            return ValidationError("Passwords must be match!")
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

apps/users/views.py

@@ -20,14 +20,14 @@ def get(self, request):
 
     def post(self, request):
 
-        form = RegisterForm(request.POST, request.FILES)
+        form = RegisterForm(request.POST)
 
         if form.is_valid():
             form.save()
             messages.success(request, "User succesfully registered")
             return redirect(reverse("users:login"))
 
-        messages.warning(request, "Error registered!")
+        messages.warning(request, "Invalid registration fields!")
         return render(request, "auth/register.html", {"form": form})
 
 
@@ -43,6 +43,7 @@ def post(self, request):
         if form.is_valid():
             username = form.cleaned_data.get("username")
             password = form.cleaned_data.get("password")
+
             user = authenticate(username=username, password=password)
 
             if user is not None:
@@ -58,7 +59,7 @@ def post(self, request):
                 response.set_cookie("access_token", access_token, httponly=True)
                 response.set_cookie("refresh_token", refresh_token, httponly=True)
 
-                messages.info(request, f"You are logged in as { username }")
+                messages.success(request, f"You are logged in as { username }")
                 return response
 
             else:

core/config/apps.py

@@ -21,4 +21,5 @@
     "rest_framework",
     "rest_framework_simplejwt",
     "rest_framework_simplejwt.token_blacklist",
+
 ]

db.sqlite3

@@ -4,11 +4,6 @@
 {% block title %} Login {% endblock %}
 
 {% block content %}
-{% for message in massages %}
-<div class="alert alert-{{ message.tags }}">
-<h6>{{ message }}</h6>
-</div>
-{% endfor %}
 <div class="background">
     <div class="shape"></div>
     <div class="shape"></div>
@@ -23,7 +18,17 @@ <h2>Login</h2>
             enctype="multipart/form-data"
             >
                 {% csrf_token %}
-                {{ form.as_p }}
+                <p>
+                    <label>{{ form.username.label }}</label>
+                    {{ form.username.errors }}
+                    {{ form.username }}
+                </p>
+                <p>
+                    <label>{{ form.password.label }}</label>
+                    {{ form.username.errors }}
+                    {{ form.password }}
+                </p>
+                
                 <p>You have an create account? 
                     <a href="{% url 'users:register' %}">Register</a>
                 </p>

templates/auth/login.html

@@ -6,12 +6,40 @@
         <div class="row justify-content-center">
             <div class="col-md-6">
                 <h2>Register</h2>
+
                 <form 
                 action="{% url 'users:register' %}"
                 method="post" 
                 enctype="multipart/form-data">
                     {% csrf_token %}
-                    {{ form.as_p }}
+                    <p>
+                        <label>{{ form.username.label }}</label>
+                        <div class="invalid-feedback d-block">
+                            {{ form.username.errors }}
+                        </div>
+                        {{ form.username }}
+                    </p>
+                    <p>
+                        <label>{{ form.email.label }}</label>
+                        <div class="invalid-feedback d-block">
+                            {{ form.email.errors }}
+                        </div>
+                        {{ form.email }}
+                    </p>
+                    <p>
+                        <label>{{ form.password1.label }}</label>
+                        <div class="invalid-feedback d-block">
+                            {{ form.password1.errors }}
+                        </div>
+                        {{ form.password1 }}
+                    </p>
+                    <p>
+                        <label>{{ form.password2.label }}</label>
+                        <div class="invalid-feedback d-block">
+                            {{ form.password2.errors }}
+                        </div>
+                        {{ form.password2 }}
+                    </p>
                     <button type="submit" class="btn btn-primary">Register</button>
                 </form>
                 <p>Already have an account? 

templates/auth/register.html

@@ -24,10 +24,17 @@
 
           {% if messages %}
             {% for message in messages %}
-            <div class="alert alert-{{ message.tags }} alert-dismissible fade show" role="alert">
-              {{ message }}
-              <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-            </div>
+              {% if message.tags == 'error' %}
+                <div class="alert alert-danger alert-dismissible fade show" role="alert">
+                  {{ message }}
+                  <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+                </div>
+              {% else %}
+              <div class="alert alert-{{ message.tags }} alert-dismissible fade show" role="alert">
+                {{ message }}
+                <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+              </div>
+              {% endif %}
             {% endfor %}
           {% endif %}