development branch created to preserve working deploy project

This commit is contained in:
2025-08-02 17:37:16 +03:00
parent 5e65ea0f7c
commit e824e87953
659 changed files with 90008 additions and 137 deletions
+2 -2
View File
@@ -180,7 +180,7 @@
<div class="dashboard-card">
<div class="card-content">
<div class="icon-circle">
<svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<svg xmlns="http://www.w3.org/2000/svg" class="dashboard-icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
</div>
@@ -194,7 +194,7 @@
<div class="dashboard-card">
<div class="card-content">
<div class="icon-circle">
<svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<svg xmlns="http://www.w3.org/2000/svg" class="dashboard-icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7h12m0 0l-4-4m4 4l-4 4m0 6H4m0 0l4 4m-4-4l4-4" />
</svg>
</div>
+28 -7
View File
@@ -1,11 +1,14 @@
{% load static %}
<aside class="sidebar">
<div class="header">
<h1>Container Depot</h1>
<a href="{% url 'index' %}" class="link-no-style">
<h1>Container Depot</h1>
</a>
<p class="subtitle">Line Operator Portal</p>
</div>
{% url 'dashboard' as dashboard_url %}
{% url 'client_preinfo' as client_preinfo_url %}
{% url 'client_containers' as client_containers_url %}
{% url 'client_booking' as client_booking_url %}
{% url 'register' as register_url %}
{% url 'client_company' as client_company_url %}
@@ -25,6 +28,12 @@
</svg>
Container Preinfo
</a>
<a href="{{ client_containers_url }}" class="nav-item {% if request.path == client_containers_url %}active{% endif %}" id="preinfoNav">
<svg xmlns="http://www.w3.org/2000/svg" class="icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2" />
</svg>
Containers
</a>
<a href="{{ client_booking_url }}" class="nav-item {% if request.path == client_booking_url %}active{% endif %}" id="ordersNav">
<svg xmlns="http://www.w3.org/2000/svg" class="icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7h12m0 0l-4-4m4 4l-4 4m0 6H4m0 0l4 4m-4-4l4-4" />
@@ -62,16 +71,28 @@
{% endif %}
</nav>
<div class="user-profile">
<div class="avatar">LO</div>
{# <div class="avatar">LO</div>#}
<a href="{% url 'change_password' %}?next={{ request.path }}">
<div class="avatar">LO</div>
</a>
<div class="user-info">
<p class="username">{{ request.user }}</p>
<p class="company">{{ request.user.company }}</p>
</div>
<a href="{% url 'login' %}" class="logout">
<svg xmlns="http://www.w3.org/2000/svg" class="icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" />
</svg>
</a>
{# <a href="{% url 'relogin' %}" class="logout">#}
{# <svg xmlns="http://www.w3.org/2000/svg" class="icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">#}
{# <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" />#}
{# </svg>#}
{# </a>#}
<form action="{% url 'relogin' %}" method="post" style="display:inline;">
{% csrf_token %}
<button type="submit" class="logout" style="background:none; border:none; padding:0;">
<svg xmlns="http://www.w3.org/2000/svg" class="icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" />
</svg>
</button>
</form>
</div>
</aside>
+8
View File
@@ -1,6 +1,14 @@
{% extends 'list-crud.html' %}
{% load static %}
{% block filter %}
<form id="filterForm" method="get" style="display: inline;">
<input type="hidden" name="filter" id="filterInput" value="{{ request.GET.filter|default:'active' }}">
<button type="button" class="btn btn-primary" id="activeBtn">Active</button>
<button type="button" class="btn btn-primary" id="allBtn">All</button>
</form>
{% endblock filter %}
{% block table_header %}
<th style="display: none;">Select</th>
<th>Line</th>
+8
View File
@@ -1,6 +1,14 @@
{% extends 'list-crud.html' %}
{% load static %}
{% block filter %}
<form id="filterForm" method="get" style="display: inline;">
<input type="hidden" name="filter" id="filterInput" value="{{ request.GET.filter|default:'active' }}">
<button type="button" class="btn btn-primary" id="activeBtn">Active</button>
<button type="button" class="btn btn-primary" id="allBtn">All</button>
</form>
{% endblock filter %}
{% block table_header %}
<th style="display: none;">Select</th>
<th>Line name</th>
+5 -1
View File
@@ -2,7 +2,11 @@
{% load static %}
{% block filter %}
<form id="filterForm" method="get" style="display: inline;">
<input type="hidden" name="filter" id="filterInput" value="{{ request.GET.filter|default:'active' }}">
<button type="button" class="btn btn-primary" id="activeBtn">Active</button>
<button type="button" class="btn btn-primary" id="allBtn">All</button>
</form>
{% endblock filter %}
{% block table_header %}
+55
View File
@@ -0,0 +1,55 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Vehicles with bookings</title>
<style>
body {
font-family: Arial, sans-serif;
margin: 40px;
background-color: black;
color: white;
}
h1 {
font-size: 2.5em;
margin-bottom: 20px;
}
.table-container {
width: 90%;
margin: 0 auto;
}
table {
width: 100%;
border-collapse: collapse;
}
th, td {
text-align: left;
padding: 12px;
border: 1px solid #ddd;
}
th {
background-color: #f5f5f5;
}
</style>
</head>
<body>
<h1>Vehicles with bookings</h1>
<div class="table-container">
<table>
<thead>
<tr>
<th>Line name</th>
</tr>
</thead>
<tbody>
<tr>
<td>BB1234TT, TT1234BB</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>
+2 -2
View File
@@ -20,7 +20,7 @@
<div class="dashboard-card">
<div class="card-content">
<div class="icon-circle">
<svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<svg xmlns="http://www.w3.org/2000/svg" class="dashboard-icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
</div>
@@ -34,7 +34,7 @@
<div class="dashboard-card">
<div class="card-content">
<div class="icon-circle">
<svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<svg xmlns="http://www.w3.org/2000/svg" class="dashboard-icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7h12m0 0l-4-4m4 4l-4 4m0 6H4m0 0l4 4m-4-4l4-4" />
</svg>
</div>
+3 -1
View File
@@ -1,7 +1,9 @@
{% load static %}
<aside class="sidebar">
<div class="header">
<h1>Container Depot</h1>
<a href="{% url 'index' %}" class="link-no-style">
<h1>Container Depot</h1>
</a>
<p class="subtitle">Line Operator Portal</p>
</div>
{% url 'employee_dashboard' as dashboard_url %}
+13 -5
View File
@@ -15,10 +15,14 @@
padding: 0;
background-color: #ead9cb;
}
.header-links {
display: flex;
gap: 1rem;
}
header {
position: relative;
display: flex;
justify-content: center;
justify-content: space-between;
align-items: center;
padding: 1rem 2rem;
}
@@ -70,14 +74,14 @@ header {
}
.login-link {
position: absolute;
position: static;
right: 2rem;
top: 50%;
transform: translateY(-50%);
color: white;
color: #a57d52;
text-decoration: none;
padding: 0.5rem 1rem;
border: 1px solid white;
border: 1px solid #a57d52;
border-radius: 4px;
}
@@ -97,7 +101,11 @@ header {
</h1>
<p>Operated by Kikimor EOOD</p>
</div>
<a href="{% url 'login' %}" class="login-link">Login</a>
<div class="header-links">
<a href="{% url 'login' %}" class="login-link">Login</a>
<a href="{% url 'allowed_vehicles' %}" class="login-link">Vehicles</a>
</div>
</header>
<section class="hero">