This commit is contained in:
Flatlogic Bot 2026-02-03 15:57:35 +00:00
parent 2235a3a25d
commit 5bf8837f1c
11 changed files with 367 additions and 182 deletions

View File

@ -1,3 +1,23 @@
from django.contrib import admin
from .models import Worker, Project, Team, WorkLog
# Register your models here.
@admin.register(Worker)
class WorkerAdmin(admin.ModelAdmin):
list_display = ('name', 'id_no', 'phone_no', 'monthly_salary', 'day_rate')
search_fields = ('name', 'id_no', 'phone_no')
@admin.register(Project)
class ProjectAdmin(admin.ModelAdmin):
list_display = ('name', 'created_at')
search_fields = ('name',)
@admin.register(Team)
class TeamAdmin(admin.ModelAdmin):
list_display = ('name', 'created_at')
filter_horizontal = ('workers',)
@admin.register(WorkLog)
class WorkLogAdmin(admin.ModelAdmin):
list_display = ('date', 'project')
list_filter = ('date', 'project')
filter_horizontal = ('workers',)

View File

@ -0,0 +1,56 @@
# Generated by Django 5.2.7 on 2026-02-03 15:47
import django.core.validators
import django.db.models.deletion
from decimal import Decimal
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
]
operations = [
migrations.CreateModel(
name='Project',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=200)),
('description', models.TextField(blank=True)),
('created_at', models.DateTimeField(auto_now_add=True)),
],
),
migrations.CreateModel(
name='Worker',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=200)),
('id_no', models.CharField(max_length=50, unique=True, verbose_name='ID Number')),
('phone_no', models.CharField(max_length=20, verbose_name='Phone Number')),
('monthly_salary', models.DecimalField(decimal_places=2, max_digits=10, validators=[django.core.validators.MinValueValidator(Decimal('0.00'))])),
('created_at', models.DateTimeField(auto_now_add=True)),
],
),
migrations.CreateModel(
name='Team',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=200)),
('created_at', models.DateTimeField(auto_now_add=True)),
('workers', models.ManyToManyField(related_name='teams', to='core.worker')),
],
),
migrations.CreateModel(
name='WorkLog',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('date', models.DateField()),
('notes', models.TextField(blank=True)),
('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='logs', to='core.project')),
('workers', models.ManyToManyField(related_name='work_logs', to='core.worker')),
],
),
]

View File

@ -1,3 +1,42 @@
from django.db import models
from django.core.validators import MinValueValidator
from decimal import Decimal
# Create your models here.
class Project(models.Model):
name = models.CharField(max_length=200)
description = models.TextField(blank=True)
created_at = models.DateTimeField(auto_now_add=True)
def __str__(self):
return self.name
class Worker(models.Model):
name = models.CharField(max_length=200)
id_no = models.CharField(max_length=50, unique=True, verbose_name="ID Number")
phone_no = models.CharField(max_length=20, verbose_name="Phone Number")
monthly_salary = models.DecimalField(max_digits=10, decimal_places=2, validators=[MinValueValidator(Decimal('0.00'))])
created_at = models.DateTimeField(auto_now_add=True)
@property
def day_rate(self):
return self.monthly_salary / Decimal('20.0')
def __str__(self):
return self.name
class Team(models.Model):
name = models.CharField(max_length=200)
workers = models.ManyToManyField(Worker, related_name='teams')
created_at = models.DateTimeField(auto_now_add=True)
def __str__(self):
return self.name
class WorkLog(models.Model):
date = models.DateField()
project = models.ForeignKey(Project, on_delete=models.CASCADE, related_name='logs')
workers = models.ManyToManyField(Worker, related_name='work_logs')
notes = models.TextField(blank=True)
def __str__(self):
return f"{self.date} - {self.project.name}"

View File

@ -1,25 +1,37 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>{% block title %}Knowledge Base{% endblock %}</title>
{% if project_description %}
<meta name="description" content="{{ project_description }}">
<meta property="og:description" content="{{ project_description }}">
<meta property="twitter:description" content="{{ project_description }}">
{% endif %}
{% if project_image_url %}
<meta property="og:image" content="{{ project_image_url }}">
<meta property="twitter:image" content="{{ project_image_url }}">
{% endif %}
{% load static %}
<link rel="stylesheet" href="{% static 'css/custom.css' %}?v={{ deployment_timestamp }}">
{% block head %}{% endblock %}
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}LabourFlow - Work & Payroll{% endblock %}</title>
{% if project_description %}
<meta name="description" content="{{ project_description }}">
{% endif %}
{% load static %}
<!-- Bootstrap 5 CDN -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom CSS -->
<link rel="stylesheet" href="{% static 'css/custom.css' %}?v={{ deployment_timestamp }}">
{% block head %}{% endblock %}
</head>
<body>
{% block content %}{% endblock %}
</body>
<nav class="navbar navbar-expand-lg navbar-dark" style="background-color: #1e293b;">
<div class="container">
<a class="navbar-brand heading-font" href="/">LabourFlow</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav ms-auto">
<li class="nav-item"><a class="nav-link" href="/">Dashboard</a></li>
<li class="nav-item"><a class="nav-link" href="/admin/">Admin</a></li>
</ul>
</div>
</div>
</nav>
</html>
{% block content %}{% endblock %}
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
</body>
</html>

View File

@ -1,145 +1,130 @@
{% extends "base.html" %}
{% extends 'base.html' %}
{% load static %}
{% block title %}{{ project_name }}{% endblock %}
{% block head %}
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;700&display=swap" rel="stylesheet">
<style>
:root {
--bg-color-start: #6a11cb;
--bg-color-end: #2575fc;
--text-color: #ffffff;
--card-bg-color: rgba(255, 255, 255, 0.01);
--card-border-color: rgba(255, 255, 255, 0.1);
}
* {
box-sizing: border-box;
}
body {
margin: 0;
font-family: 'Inter', sans-serif;
background: linear-gradient(45deg, var(--bg-color-start), var(--bg-color-end));
color: var(--text-color);
display: flex;
justify-content: center;
align-items: center;
min-height: 100vh;
text-align: center;
overflow: hidden;
position: relative;
}
body::before {
content: '';
position: absolute;
inset: 0;
background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='100' height='100' viewBox='0 0 100 100'><path d='M-10 10L110 10M10 -10L10 110' stroke-width='1' stroke='rgba(255,255,255,0.05)'/></svg>");
animation: bg-pan 20s linear infinite;
z-index: -1;
}
@keyframes bg-pan {
0% {
background-position: 0% 0%;
}
100% {
background-position: 100% 100%;
}
}
main {
padding: 2rem;
}
.card {
background: var(--card-bg-color);
border: 1px solid var(--card-border-color);
border-radius: 16px;
padding: 2.5rem 2rem;
backdrop-filter: blur(20px);
-webkit-backdrop-filter: blur(20px);
box-shadow: 0 12px 36px rgba(0, 0, 0, 0.25);
}
h1 {
font-size: clamp(2.2rem, 3vw + 1.2rem, 3.2rem);
font-weight: 700;
margin: 0 0 1.2rem;
letter-spacing: -0.02em;
}
p {
margin: 0.5rem 0;
font-size: 1.1rem;
opacity: 0.92;
}
.loader {
margin: 1.5rem auto;
width: 56px;
height: 56px;
border: 4px solid rgba(255, 255, 255, 0.25);
border-top-color: #fff;
border-radius: 50%;
animation: spin 1s linear infinite;
}
@keyframes spin {
to {
transform: rotate(360deg);
}
}
.runtime code {
background: rgba(0, 0, 0, 0.25);
padding: 0.15rem 0.45rem;
border-radius: 4px;
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
}
.sr-only {
position: absolute;
width: 1px;
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
}
footer {
position: absolute;
bottom: 1rem;
width: 100%;
text-align: center;
font-size: 0.85rem;
opacity: 0.75;
}
</style>
{% endblock %}
{% block title %}Dashboard | LabourFlow{% endblock %}
{% block content %}
<main>
<div class="card">
<h1>Analyzing your requirements and generating your app…</h1>
<div class="loader" role="status" aria-live="polite" aria-label="Applying initial changes">
<span class="sr-only">Loading…</span>
<div class="dashboard-header">
<div class="container">
<div class="row align-items-center">
<div class="col-md-8">
<h1 class="display-5 mb-2">Welcome Back, Admin</h1>
<p class="lead opacity-75">Track your projects, workers, and payroll in one place.</p>
</div>
<div class="col-md-4 text-md-end">
<a href="/admin/core/worklog/add/" class="btn btn-accent shadow-sm">
+ Log Daily Work
</a>
</div>
</div>
</div>
<p class="hint">AppWizzy AI is collecting your requirements and applying the first changes.</p>
<p class="hint">This page will refresh automatically as the plan is implemented.</p>
<p class="runtime">
Runtime: Django <code>{{ django_version }}</code> · Python <code>{{ python_version }}</code>
— UTC <code>{{ current_time|date:"Y-m-d H:i:s" }}</code>
</p>
</div>
</main>
<footer>
Page updated: {{ current_time|date:"Y-m-d H:i:s" }} (UTC)
</footer>
{% endblock %}
</div>
<div class="container mb-5">
<div class="row g-4 mb-5">
<!-- Stats Cards -->
<div class="col-md-4">
<div class="card stat-card p-4">
<div class="d-flex justify-content-between align-items-center">
<div>
<p class="text-uppercase small fw-bold mb-1 opacity-75">Active Workers</p>
<h2 class="mb-0">{{ workers_count }}</h2>
</div>
<div class="p-3 bg-white bg-opacity-25 rounded-circle">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-primary"><path d="M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2"></path><circle cx="9" cy="7" r="4"></circle><path d="M22 21v-2a4 4 0 0 0-3-3.87"></path><path d="M16 3.13a4 4 0 0 1 0 7.75"></path></svg>
</div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="card stat-card p-4">
<div class="d-flex justify-content-between align-items-center">
<div>
<p class="text-uppercase small fw-bold mb-1 opacity-75">Projects</p>
<h2 class="mb-0">{{ projects_count }}</h2>
</div>
<div class="p-3 bg-white bg-opacity-25 rounded-circle">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-primary"><rect x="3" y="3" width="18" height="18" rx="2" ry="2"></rect><line x1="3" y1="9" x2="21" y2="9"></line><line x1="9" y1="21" x2="9" y2="9"></line></svg>
</div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="card stat-card p-4">
<div class="d-flex justify-content-between align-items-center">
<div>
<p class="text-uppercase small fw-bold mb-1 opacity-75">Teams</p>
<h2 class="mb-0">{{ teams_count }}</h2>
</div>
<div class="p-3 bg-white bg-opacity-25 rounded-circle">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-primary"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="9" cy="7" r="4"></circle><path d="M23 21v-2a4 4 0 0 0-3-3.87"></path><path d="M16 3.13a4 4 0 0 1 0 7.75"></path></svg>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-8">
<div class="card p-4 mb-4">
<h3 class="mb-4">Recent Daily Logs</h3>
{% if recent_logs %}
<div class="table-responsive">
<table class="table align-middle">
<thead class="table-light">
<tr>
<th>Date</th>
<th>Project</th>
<th>Workers</th>
<th>Status</th>
</tr>
</thead>
<tbody>
{% for log in recent_logs %}
<tr>
<td>{{ log.date }}</td>
<td><strong>{{ log.project.name }}</strong></td>
<td>{{ log.workers.count }} labourers</td>
<td><span class="badge bg-success bg-opacity-10 text-success">Submitted</span></td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% else %}
<div class="text-center py-5">
<div class="mb-3 opacity-25">
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path><polyline points="14 2 14 8 20 8"></polyline><line x1="16" y1="13" x2="8" y2="13"></line><line x1="16" y1="17" x2="8" y2="17"></line><polyline points="10 9 9 9 8 9"></polyline></svg>
</div>
<p class="text-muted">No recent work logs found.</p>
<a href="/admin/core/worklog/add/" class="btn btn-sm btn-outline-primary">Create First Log</a>
</div>
{% endif %}
</div>
</div>
<div class="col-lg-4">
<div class="card p-4">
<h3 class="mb-4">Quick Links</h3>
<nav class="nav flex-column">
<a class="sidebar-link" href="/admin/core/worker/">
<span class="me-2">👷</span> Manage Workers
</a>
<a class="sidebar-link" href="/admin/core/project/">
<span class="me-2">🏗️</span> Manage Projects
</a>
<a class="sidebar-link" href="/admin/core/team/">
<span class="me-2">👥</span> Manage Teams
</a>
<a class="sidebar-link" href="/admin/core/worklog/">
<span class="me-2">📅</span> View All Logs
</a>
<hr>
<a class="sidebar-link text-primary fw-bold" href="/admin/core/worker/add/">
+ Add New Worker
</a>
</nav>
</div>
</div>
</div>
</div>
{% endblock %}

View File

@ -1,25 +1,21 @@
import os
import platform
from django import get_version as django_version
from django.shortcuts import render
from django.utils import timezone
from .models import Worker, Project, Team, WorkLog
def home(request):
"""Render the landing screen with loader and environment details."""
host_name = request.get_host().lower()
agent_brand = "AppWizzy" if host_name == "appwizzy.com" else "Flatlogic"
now = timezone.now()
"""Render the landing screen with dashboard stats."""
workers_count = Worker.objects.count()
projects_count = Project.objects.count()
teams_count = Team.objects.count()
recent_logs = WorkLog.objects.order_by('-date')[:5]
context = {
"project_name": "New Style",
"agent_brand": agent_brand,
"django_version": django_version(),
"python_version": platform.python_version(),
"current_time": now,
"host_name": host_name,
"project_description": os.getenv("PROJECT_DESCRIPTION", ""),
"project_image_url": os.getenv("PROJECT_IMAGE_URL", ""),
"workers_count": workers_count,
"projects_count": projects_count,
"teams_count": teams_count,
"recent_logs": recent_logs,
"current_time": timezone.now(),
}
return render(request, "core/index.html", context)
return render(request, "core/index.html", context)

View File

@ -1,4 +1,81 @@
/* Custom styles for the application */
body {
font-family: system-ui, -apple-system, sans-serif;
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=Poppins:wght@600;700&display=swap');
:root {
--primary-color: #1e293b;
--accent-color: #10b981;
--bg-color: #f1f5f9;
--text-main: #334155;
--text-light: #64748b;
--white: #ffffff;
--glass-bg: rgba(255, 255, 255, 0.7);
}
body {
font-family: 'Inter', sans-serif;
background-color: var(--bg-color);
color: var(--text-main);
margin: 0;
padding: 0;
}
h1, h2, h3, .heading-font {
font-family: 'Poppins', sans-serif;
font-weight: 700;
}
.dashboard-header {
background: linear-gradient(135deg, var(--primary-color) 0%, #334155 100%);
color: var(--white);
padding: 4rem 2rem;
margin-bottom: -4rem;
}
.card {
border: none;
border-radius: 1rem;
box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
transition: transform 0.2s ease-in-out;
}
.card:hover {
transform: translateY(-5px);
}
.stat-card {
background: var(--glass-bg);
backdrop-filter: blur(10px);
border: 1px solid rgba(255, 255, 255, 0.3);
}
.btn-accent {
background-color: var(--accent-color);
color: white;
font-weight: 600;
padding: 0.75rem 1.5rem;
border-radius: 0.5rem;
border: none;
}
.btn-accent:hover {
background-color: #059669;
color: white;
}
.sidebar-link {
display: block;
padding: 0.75rem 1rem;
color: var(--text-main);
text-decoration: none;
border-radius: 0.5rem;
margin-bottom: 0.5rem;
}
.sidebar-link:hover {
background-color: #e2e8f0;
color: var(--primary-color);
}
.sidebar-link.active {
background-color: var(--primary-color);
color: var(--white);
}