diff --git a/core/settings.py b/core/settings.py index 89d63cf..b24e399 100644 --- a/core/settings.py +++ b/core/settings.py @@ -65,7 +65,7 @@ ROOT_URLCONF = 'core.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': ['templates'], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ diff --git a/core/urls.py b/core/urls.py index dfd476d..2d470e1 100644 --- a/core/urls.py +++ b/core/urls.py @@ -2,7 +2,10 @@ from django.contrib import admin from django.urls import path from django.conf.urls import include +from . import views + urlpatterns = [ + path('', views.Index.as_view(), name='index'), path('user/', include('users.urls')), path('vehicles/', include('vehicles.urls')), path('admin/', admin.site.urls), diff --git a/core/views.py b/core/views.py new file mode 100644 index 0000000..3edd1e5 --- /dev/null +++ b/core/views.py @@ -0,0 +1,5 @@ +from django.views import generic + + +class Index(generic.TemplateView): + template_name = 'index.html' diff --git a/templates/index.html b/templates/index.html new file mode 100644 index 0000000..37df5c9 --- /dev/null +++ b/templates/index.html @@ -0,0 +1,10 @@ +{% extends 'base.html' %} + +{% block content %} +

SUPERINTENDANT

+

Fleet Manager

+

Fljōtr - Swift (Old Norse)

+

+ +Vehicle List

+{% endblock %} diff --git a/users/migrations/0002_driver_licence.py b/users/migrations/0002_driver_licence.py new file mode 100644 index 0000000..c0818c0 --- /dev/null +++ b/users/migrations/0002_driver_licence.py @@ -0,0 +1,39 @@ +# Generated by Django 3.1.6 on 2021-02-14 12:44 + +import django.contrib.auth.models +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Licence', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('licence_number', models.CharField(max_length=100)), + ('date_obtained', models.DateField()), + ], + ), + migrations.CreateModel( + name='Driver', + fields=[ + ('customuser_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='users.customuser')), + ('licence', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.licence')), + ], + options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, + }, + bases=('users.customuser',), + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/vehicles/migrations/0002_auto_20210214_1244.py b/vehicles/migrations/0002_auto_20210214_1244.py new file mode 100644 index 0000000..69ccb61 --- /dev/null +++ b/vehicles/migrations/0002_auto_20210214_1244.py @@ -0,0 +1,47 @@ +# Generated by Django 3.1.6 on 2021-02-14 12:44 + +import datetime +from django.db import migrations, models +import django.db.models.deletion +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0001_initial'), + ] + + operations = [ + migrations.RemoveField( + model_name='vehicle', + name='engine_number', + ), + migrations.AddField( + model_name='vehicle', + name='date_purchased', + field=models.DateField(default=datetime.datetime(2021, 2, 14, 12, 44, 16, 378064, tzinfo=utc)), + preserve_default=False, + ), + migrations.AddField( + model_name='vehicle', + name='first_registered', + field=models.DateField(default=datetime.datetime(2021, 2, 14, 12, 44, 22, 562249, tzinfo=utc)), + preserve_default=False, + ), + migrations.AddField( + model_name='vehicle', + name='yom', + field=models.DateField(default=datetime.datetime(2021, 2, 14, 12, 44, 32, 354386, tzinfo=utc)), + preserve_default=False, + ), + migrations.CreateModel( + name='ICEVehicle', + fields=[ + ('vehicle_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='vehicles.vehicle')), + ('engine_number', models.CharField(max_length=50)), + ('capacity', models.IntegerField()), + ], + bases=('vehicles.vehicle',), + ), + ] diff --git a/vehicles/templates/vehicle_list.html b/vehicles/templates/vehicle_list.html index 5bf3563..b5c8f6f 100644 --- a/vehicles/templates/vehicle_list.html +++ b/vehicles/templates/vehicle_list.html @@ -12,7 +12,7 @@ VIN Number Engine Number Chassis Number - + Links {% for object in object_list %} @@ -25,7 +25,7 @@ {{ object.vin_number|default:"Unknown" }} {{ object.engine_number|default:"Unknown" }} {{ object.chassis_number|default:"Unknown" }} - {% url 'vehicle_detail' object.pk %} + Detail {% empty %}