Py taxi service home page (add empty lines)

mate-academy · Jul 26, 2023 · 698c3a2 · 698c3a2
1 parent 4e41134
commit 698c3a2
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 10 deletions.
diff --git a/static/css/styles.css b/static/css/styles.css
@@ -0,0 +1,9 @@
+body {
+    margin-top: 10px;
+}
+
+.sidebar-nav {
+    padding: 10px;
+    list-style: none;
+}
+
diff --git a/taxi/views.py b/taxi/views.py
@@ -3,7 +3,6 @@
 from taxi.models import Driver, Manufacturer, Car
 
 
-# Create your views here.
 def index(request):
     num_drivers = Driver.objects.count()
     num_manufacturers = Manufacturer.objects.count()

diff --git a/taxi_service/settings.py b/taxi_service/settings.py
@@ -1,5 +1,5 @@
 """
-Django settings for taxi_service project.
+Django's settings for taxi_service project.
 
 Generated by 'django-admin startproject' using Django 4.0.2.
 
@@ -56,7 +56,7 @@
 TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
-        "DIRS": ["templates"],
+        "DIRS": [BASE_DIR / "templates"],
         "APP_DIRS": True,
         "OPTIONS": {
             "context_processors": [

diff --git a/taxi_service/urls.py b/taxi_service/urls.py
@@ -13,11 +13,13 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+from django.conf import settings
+from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import path, include
 
 
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("", include("taxi.urls", namespace="taxi"))
-]
+] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/templates/base.html b/templates/base.html
@@ -6,15 +6,25 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <title>Taxi Service</title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
 
   {% load static %}
   <link rel="stylesheet" href="{% static 'css/styles.css' %}">
 </head>
 <body>
-  {% block sidebar %}
-    {% include 'includes/sidebar.html' %}
-  {% endblock %}
+  <div class="container-fluid">
+        <div class="row">
+            <div class="col-sm-3">
+                {% block sidebar %}
+                    {% include 'includes/sidebar.html' %}
+                {% endblock %}
 
-  {% block content %}{% endblock %}
+            </div>
+            <div class="col-sm-9">
+                {% block content %}{% endblock %}
+
+            </div>
+        </div>
+    </div>
 </body>
 </html>
diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html
@@ -1,4 +1,4 @@
-<ul>
+<ul class="sidebar-nav">
   <li><a href="{% url 'taxi:index' %}">Home page</a></li>
   <li><a href="#">Manufacturers</a></li>
   <li><a href="#">Cars</a></li>

diff --git a/templates/taxi/index.html b/templates/taxi/index.html
@@ -1,7 +1,9 @@
 {% extends 'base.html' %}
 
 {% block content %}
-<ul>
+  <h1 class="p-3 mb-2 bg-primary text-white">Welcome to the Greatest Taxi Service!</h1>
+  <h3>Our content:</h3>
+<ul class="content">
   <li>Number of cars: {{ num_cars }}</li>
   <li>Number of drivers: {{ num_drivers }}</li>
   <li>Number of manufacturers: {{ num_manufacturers }}</li>