diff --git a/taxi/migrations/0001_initial.py b/taxi/migrations/0001_initial.py index ff29293e..6e6e989b 100644 --- a/taxi/migrations/0001_initial.py +++ b/taxi/migrations/0001_initial.py @@ -29,7 +29,7 @@ class Migration(migrations.Migration): ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), - ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting registration.', verbose_name='active')), ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), ('license_number', models.CharField(max_length=255)), ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..2c054693 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,53 @@ from django.shortcuts import render from django.views import generic +from django.contrib.auth.decorators import login_required +from django.contrib.auth.mixins import LoginRequiredMixin from .models import Driver, Car, Manufacturer +@login_required def index(request): """View function for the home page of the site.""" num_drivers = Driver.objects.count() num_cars = Car.objects.count() num_manufacturers = Manufacturer.objects.count() + num_visits = request.session.get("num_visits", 0) + request.session["num_visits"] = num_visits + 1 context = { "num_drivers": num_drivers, "num_cars": num_cars, "num_manufacturers": num_manufacturers, + "num_visits": num_visits + 1, } return render(request, "taxi/index.html", context=context) -class ManufacturerListView(generic.ListView): +class ManufacturerListView(LoginRequiredMixin, generic.ListView): model = Manufacturer context_object_name = "manufacturer_list" template_name = "taxi/manufacturer_list.html" paginate_by = 5 -class CarListView(generic.ListView): +class CarListView(LoginRequiredMixin, generic.ListView): model = Car paginate_by = 5 queryset = Car.objects.select_related("manufacturer") -class CarDetailView(generic.DetailView): +class CarDetailView(LoginRequiredMixin, generic.DetailView): model = Car -class DriverListView(generic.ListView): +class DriverListView(LoginRequiredMixin, generic.ListView): model = Driver paginate_by = 5 -class DriverDetailView(generic.DetailView): +class DriverDetailView(LoginRequiredMixin, generic.DetailView): model = Driver queryset = Driver.objects.prefetch_related("cars__manufacturer") diff --git a/taxi_service/settings.py b/taxi_service/settings.py index b6c0cf19..ac1b79dd 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -15,23 +15,29 @@ # Build paths inside the project like this: BASE_DIR / "subdir". BASE_DIR = Path(__file__).resolve().parent.parent - # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = ( - "django-insecure-8ovil3xu6=eaoqd#-#&ricv159p0pypoh5_lgm*)-dfcjqe=yc" -) +SECRET_KEY = \ + ("django-insecure-8ovil3xu6=eaoqd#" + "-#&ricv159p0pypoh5_lgm*)-dfcjqe=yc") # SECURITY WARNING: don"t run with debug turned on in production! DEBUG = True ALLOWED_HOSTS = [] - # Application definition +INTERNAL_IPS = [ + "127.0.0.1", +] + +AUTHENTICATION_BACKENDS = [ + "django.contrib.auth.backends.ModelBackend", +] + INSTALLED_APPS = [ "django.contrib.admin", "django.contrib.auth", @@ -72,7 +78,6 @@ WSGI_APPLICATION = "taxi_service.wsgi.application" - # Database # https://docs.djangoproject.com/en/4.0/ref/settings/#databases @@ -83,7 +88,6 @@ } } - # Password validation # https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators @@ -94,15 +98,15 @@ }, { "NAME": "django.contrib.auth.password_validation." - "MinimumLengthValidator", + "MinimumLengthValidator", }, { "NAME": "django.contrib.auth.password_validation." - "CommonPasswordValidator", + "CommonPasswordValidator", }, { "NAME": "django.contrib.auth.password_validation." - "NumericPasswordValidator", + "NumericPasswordValidator", }, ] @@ -119,7 +123,6 @@ USE_TZ = True - # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/4.0/howto/static-files/ @@ -129,6 +132,10 @@ STATIC_ROOT = BASE_DIR / "staticfiles" +LOGIN_REDIRECT_URL = "/" +LOGIN_URL = "/accounts/login/" +LOGOUT_URL = "/accounts/logout/" + # Default primary key field type # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 8b94449f..dbb67e08 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -13,13 +13,15 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path("blog/", include("blog.urls")) """ + from django.contrib import admin from django.urls import path, include -from django.conf import settings from django.conf.urls.static import static +from taxi_service import settings urlpatterns = [ path("admin/", admin.site.urls), path("", include("taxi.urls", namespace="taxi")), + path("accounts/", include("django.contrib.auth.urls")), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..1893d45d 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,15 @@ + + +
  • Home page
  • Manufacturers
  • Cars
    • diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html new file mode 100644 index 00000000..10fbccf9 --- /dev/null +++ b/templates/registration/logged_out.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} + +{% block content %} +

    Logged out!

    + Click here to login again. +{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..d2b5b8cf --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} + +{% block content %} +

    Login

    +
    + {% csrf_token %} + {{ form.as_p }} + + +
    +{% endblock %} diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..549801ae 100644 --- a/templates/taxi/index.html +++ b/templates/taxi/index.html @@ -10,4 +10,5 @@

    Dynamic content

  • Drivers: {{ num_drivers }}
  • Manufacturers: {{ num_manufacturers }}
    • +

    You have visited this page {{ num_visits }} time{{ num_visits|pluralize }}

    {% endblock %}