step 3 done

gordienkoas · gordienkoas · commit 6ea6735af0cc · 2025-06-06T12:11:46.000Z
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/task_manager/forms.py b/task_manager/forms.py
@@ -0,0 +1,15 @@
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm
+from django.contrib.auth.models import User
+from django import forms
+
+class UserRegisterForm(UserCreationForm):
+    class Meta:
+        model = User
+        fields = ('username', 'first_name', 'last_name', 'email')
+
+class UserUpdateForm(UserChangeForm):
+    password = None  # не показываем поле пароля для редактирования
+
+    class Meta:
+        model = User
+        fields = ('username', 'first_name', 'last_name', 'email')
diff --git a/task_manager/templates/base.html b/task_manager/templates/base.html
@@ -10,7 +10,7 @@
 <body>
 <nav class="navbar navbar-expand-lg navbar-light bg-light">
   <div class="container-fluid">
-    <a class="navbar-brand" href="#">MyApp</a>
+    <a class="navbar-brand" href="#">Менеджер задач</a>
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
@@ -23,7 +23,7 @@
           <a class="nav-link" href="{% url 'register' %}">Регистрация</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="{% url 'users' %}">Пользователи</a>
+          <a class="nav-link" href="{% url 'user-list' %}">Пользователи</a>
         </li>
       </ul>
     </div>
diff --git a/task_manager/templates/users/login.html b/task_manager/templates/users/login.html
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+{% block content %}
+<h1>Вход</h1>
+<form method="post">
+    {% csrf_token %}
+    {{ form.as_p }}
+    <button type="submit" class="btn btn-primary">Войти</button>
+</form>
+{% endblock %}
diff --git a/task_manager/templates/users/user_confirm_delete.html b/task_manager/templates/users/user_confirm_delete.html
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+{% block content %}
+<h1>Удалить пользователя {{ object.username }}?</h1>
+<form method="post">
+    {% csrf_token %}
+    <button type="submit" class="btn btn-danger">Удалить</button>
+    <a href="{% url 'user-list' %}">Отмена</a>
+</form>
+{% endblock %}
diff --git a/task_manager/templates/users/user_form.html b/task_manager/templates/users/user_form.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+{% block content %}
+<h1>{% if form.instance.pk %}Редактировать пользователя{% else %}Регистрация{% endif %}</h1>
+<form method="post">
+    {% csrf_token %}
+    {{ form.as_p }}
+    <button type="submit" class="btn btn-primary">
+        {% if form.instance.pk %}Сохранить{% else %}Зарегистрироваться{% endif %}
+    </button>
+</form>
+{% endblock %}
diff --git a/task_manager/templates/users/user_list.html b/task_manager/templates/users/user_list.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+{% block content %}
+<h1>Пользователи</h1>
+<a href="{% url 'user-create' %}">Зарегистрировать нового пользователя</a>
+<ul>
+    {% for user in users %}
+        <li>
+            {{ user.username }}
+            {% if request.user == user %}
+                <a href="{% url 'user-update' user.pk %}">Редактировать</a>
+                <a href="{% url 'user-delete' user.pk %}">Удалить</a>
+            {% endif %}
+        </li>
+    {% empty %}
+        <li>Пользователей нет</li>
+    {% endfor %}
+</ul>
+{% endblock %}
diff --git a/task_manager/urls.py b/task_manager/urls.py
@@ -1,14 +1,35 @@
 from django.contrib import admin
-from django.urls import path, include
-from django.contrib.auth import views as auth_views
+from django.urls import path
 from django.views.generic import TemplateView
-from .views import users_view, register_view  # Импорт функций-представлений
+from .views import (
+    UserListView, UserCreateView, UserUpdateView, UserDeleteView,
+    UserLoginView, UserLogoutView, register_view
+)
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path('accounts/', include('django.contrib.auth.urls')),
-    path('login/', auth_views.LoginView.as_view(), name='login'),
-    path('register/', register_view, name='register'),  # без .as_view()
-    path('users/', users_view, name='users'),           # без .as_view()
+    path('register/', register_view, name='register'),
     path('', TemplateView.as_view(template_name='index.html'), name='home'),
+    path('users/', UserListView.as_view(), name='user-list'),  # Обратите внимание на имя
+    path('users/create/', UserCreateView.as_view(), name='user-create'),
+    path('users/<int:pk>/update/', UserUpdateView.as_view(), name='user-update'),
+    path('users/<int:pk>/delete/', UserDeleteView.as_view(), name='user-delete'),
+    path('login/', UserLoginView.as_view(), name='login'),
+    path('logout/', UserLogoutView.as_view(), name='logout'),
 ]
+
+
+
+# from django.urls import path, include
+# from django.contrib.auth import views as auth_views
+# from django.views.generic import TemplateView
+# from .views import users_view, register_view  # Импорт функций-представлений
+#
+# urlpatterns = [
+#     path('admin/', admin.site.urls),
+#     path('accounts/', include('django.contrib.auth.urls')),
+#     path('login/', auth_views.LoginView.as_view(), name='login'),
+#     path('register/', register_view, name='register'),  # без .as_view()
+#     path('users/', users_view, name='users'),           # без .as_view()
+#     path('', TemplateView.as_view(template_name='index.html'), name='home'),
+# ]
diff --git a/task_manager/views.py b/task_manager/views.py
@@ -3,6 +3,13 @@
 from django.contrib.auth.forms import AuthenticationForm
 from django.shortcuts import render, redirect
 from django.contrib.auth import login
+from django.contrib.auth.models import User
+from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
+from django.urls import reverse_lazy
+from django.views.generic import ListView, CreateView, UpdateView, DeleteView
+from django.contrib.auth.views import LoginView, LogoutView
+from .forms import UserRegisterForm, UserUpdateForm
+
 
 def home_view(request):
     return render(request, 'index.html')
@@ -38,4 +45,48 @@ def login_view(request):
         user = form.get_user()
         login(request, user)
         return redirect('home')
-    return render(request, 'login.html', {'form': form})
+    return render(request, 'login.html', {'form': form})
+
+class UserListView(ListView):
+    model = User
+    template_name = 'users/user_list.html'
+    context_object_name = 'users'
+
+# Создание пользователя (регистрация)
+class UserCreateView(CreateView):
+    model = User
+    form_class = UserRegisterForm
+    template_name = 'users/user_form.html'
+    success_url = reverse_lazy('login')  # после регистрации — вход
+
+# Редактирование пользователя — только сам пользователь
+class UserUpdateView(LoginRequiredMixin, UserPassesTestMixin, UpdateView):
+    model = User
+    form_class = UserUpdateForm
+    template_name = 'users/user_form.html'
+    success_url = reverse_lazy('user-list')
+
+    def test_func(self):
+        user = self.get_object()
+        return self.request.user == user
+
+# Удаление пользователя — только сам пользователь
+class UserDeleteView(LoginRequiredMixin, UserPassesTestMixin, DeleteView):
+    model = User
+    template_name = 'users/user_confirm_delete.html'
+    success_url = reverse_lazy('user-list')
+
+    def test_func(self):
+        user = self.get_object()
+        return self.request.user == user
+
+# Вход
+class UserLoginView(LoginView):
+    template_name = 'users/login.html'
+
+    def get_success_url(self):
+        return reverse_lazy('home')  # замените на ваш URL главной страницы
+
+# Выход
+class UserLogoutView(LogoutView):
+    next_page = reverse_lazy('login')
