step 2 done

gordienkoas · gordienkoas · commit db91825941c5 · 2025-06-03T09:05:41.000Z
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,6 +7,7 @@ requires-python = ">=3.11"
 dependencies = [
     "dj-database-url>=2.3.0",
     "django>=5.2.1",
+    "django-bootstrap5>=25.1",
     "gunicorn>=23.0.0",
     "make>=0.1.6.post2",
     "python-dotenv>=1.1.0",
diff --git a/task_manager/settings.py b/task_manager/settings.py
@@ -54,6 +54,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'task_manager',
+    'django_bootstrap5',
 ]
 
 MIDDLEWARE = [
@@ -71,7 +72,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [BASE_DIR / 'templates'],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -125,6 +126,8 @@
 
 USE_I18N = True
 
+USE_L10N = True
+
 USE_TZ = True
 
 
diff --git a/task_manager/templates/base.html b/task_manager/templates/base.html
@@ -0,0 +1,38 @@
+{% load django_bootstrap5 %}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>{% block title %}My Project{% endblock %}</title>
+    {% bootstrap_css %}
+    {% bootstrap_javascript %}
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-light bg-light">
+  <div class="container-fluid">
+    <a class="navbar-brand" href="#">MyApp</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>
+    <div class="collapse navbar-collapse" id="navbarNav">
+      <ul class="navbar-nav">
+        <li class="nav-item">
+          <a class="nav-link" href="{% url 'login' %}">Вход</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="{% url 'register' %}">Регистрация</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="{% url 'users' %}">Пользователи</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</nav>
+
+<div class="container mt-4">
+    {% block content %}
+    {% endblock %}
+</div>
+</body>
+</html>
diff --git a/task_manager/templates/index.html b/task_manager/templates/index.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block title %}Главная{% endblock %}
+
+{% block content %}
+<h1>Добро пожаловать на главную страницу!</h1>
+<p>Используйте меню для навигации.</p>
+{% endblock %}
diff --git a/task_manager/templates/login.html b/task_manager/templates/login.html
@@ -0,0 +1,24 @@
+<!-- templates/login.html -->
+
+{% extends "base.html" %}
+
+{% block title %}Вход{% endblock %}
+
+{% block content %}
+  <h2>Вход</h2>
+  {% if form.errors %}
+    <p style="color: red;">Неверное имя пользователя или пароль.</p>
+  {% endif %}
+  <form method="post">
+    {% csrf_token %}
+    <div>
+      <label for="id_username">Имя пользователя:</label>
+      {{ form.username }}
+    </div>
+    <div>
+      <label for="id_password">Пароль:</label>
+      {{ form.password }}
+    </div>
+    <button type="submit">Войти</button>
+  </form>
+{% endblock %}
diff --git a/task_manager/templates/register.html b/task_manager/templates/register.html
@@ -0,0 +1,14 @@
+<!-- templates/register.html -->
+
+{% extends "base.html" %}
+
+{% block title %}Регистрация{% endblock %}
+
+{% block content %}
+  <h2>Регистрация</h2>
+  <form method="post">
+    {% csrf_token %}
+    {{ form.as_p }}  <!-- Отображение формы, переданной из представления -->
+    <button type="submit">Зарегистрироваться</button>
+  </form>
+{% endblock %}
diff --git a/task_manager/urls.py b/task_manager/urls.py
@@ -1,6 +1,13 @@
+from django.contrib import admin
 from django.urls import path
-from .views import home
+from django.contrib.auth import views as auth_views
+from django.views.generic import TemplateView
+from .views import users_view, register_view  # Импорт функций-представлений
 
 urlpatterns = [
-    path('', home, name='home'),
-]
+    path('admin/', admin.site.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
@@ -1,5 +1,24 @@
-from django.http import HttpResponse
+from django.shortcuts import render
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.forms import UserCreationForm
+from django.shortcuts import redirect
 
-def home(request):
-    return HttpResponse("Hello, World!")
-# Create your views here.
+def home_view(request):
+    return render(request, 'index.html')
+
+def register_view(request):
+    if request.method == 'POST':
+        form = UserCreationForm(request.POST)
+        if form.is_valid():
+            form.save()
+            return redirect('login')  # После регистрации перенаправляем на вход
+    else:
+        form = UserCreationForm()
+    return render(request, 'register.html', {'form': form})
+
+@login_required
+def users_view(request):
+    # Страница со списком пользователей (требует авторизации)
+    from django.contrib.auth.models import User
+    users = User.objects.all()
+    return render(request, 'users.html', {'users': users})
diff --git a/uv.lock b/uv.lock
