Move the hardcoded screens and user manager onto tokens

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-09-23 20:15:30 +03:00
parent ee599978da
commit 68cf541bbe
13 changed files with 693 additions and 581 deletions
@@ -4,12 +4,12 @@
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.5);
background: var(--backdrop);
display: flex;
align-items: center;
justify-content: center;
z-index: 1000;
padding: 20px;
padding: var(--space-5);
animation: fadeIn 0.2s ease-in;
}
@@ -23,9 +23,9 @@
}
.overlay-content {
background: white;
background: var(--surface);
border-radius: 12px;
box-shadow: 0 10px 40px rgba(0, 0, 0, 0.3);
box-shadow: var(--shadow-overlay);
width: 100%;
max-width: 480px;
max-height: 90vh;
@@ -45,8 +45,8 @@
}
.overlay-header {
padding: 24px 24px 16px;
border-bottom: 2px solid #667eea;
padding: var(--space-6) var(--space-6) var(--space-4);
border-bottom: 2px solid var(--accent);
display: flex;
justify-content: space-between;
align-items: center;
@@ -54,15 +54,15 @@
.overlay-header h2 {
margin: 0;
color: #667eea;
font-size: 24px;
color: var(--accent);
font-size: var(--fs-2xl);
}
.close-button {
background: none;
border: none;
font-size: 32px;
color: #999;
font-size: var(--fs-display);
color: var(--text-muted);
cursor: pointer;
padding: 0;
width: 32px;
@@ -75,84 +75,84 @@
}
.close-button:hover {
background: #f5f5f5;
color: #333;
background: var(--surface-sunken);
color: var(--text);
}
.password-form {
padding: 24px;
padding: var(--space-6);
display: flex;
flex-direction: column;
gap: 20px;
gap: var(--space-5);
}
.form-group {
display: flex;
flex-direction: column;
gap: 8px;
gap: var(--space-2);
}
.form-group label {
font-weight: 600;
color: #333;
font-size: 14px;
font-weight: var(--fw-semibold);
color: var(--text);
font-size: var(--fs-md);
}
.form-group input {
padding: 12px 16px;
border: 2px solid #e0e0e0;
padding: var(--space-3) var(--space-4);
border: 2px solid var(--border);
border-radius: 8px;
font-size: 16px;
font-size: var(--fs-lg);
transition: border-color 0.3s;
}
.form-group input:focus {
outline: none;
border-color: #667eea;
border-color: var(--accent);
}
.form-group input:disabled {
background-color: #f5f5f5;
background-color: var(--surface-sunken);
cursor: not-allowed;
}
.form-actions {
display: flex;
gap: 12px;
margin-top: 8px;
gap: var(--space-3);
margin-top: var(--space-2);
}
.cancel-button,
.submit-button {
flex: 1;
padding: 12px 24px;
padding: var(--space-3) var(--space-6);
border-radius: 8px;
font-size: 16px;
font-weight: 600;
font-size: var(--fs-lg);
font-weight: var(--fw-semibold);
cursor: pointer;
transition: transform 0.2s, box-shadow 0.2s;
}
.cancel-button {
background: white;
border: 2px solid #ddd;
color: #666;
background: var(--surface);
border: 2px solid var(--border);
color: var(--text-muted);
}
.cancel-button:hover:not(:disabled) {
border-color: #999;
color: #333;
border-color: var(--border-strong);
color: var(--text);
}
.submit-button {
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
background: var(--accent-gradient);
border: none;
color: white;
color: var(--accent-contrast);
}
.submit-button:hover:not(:disabled) {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
box-shadow: 0 4px 12px var(--accent-soft);
}
.cancel-button:disabled,
@@ -162,16 +162,16 @@
}
.error-message {
background-color: #fee;
color: #c33;
padding: 12px 16px;
background-color: var(--danger-soft);
color: var(--danger);
padding: var(--space-3) var(--space-4);
border-radius: 8px;
border: 1px solid #fcc;
font-size: 14px;
border: 1px solid var(--danger);
font-size: var(--fs-md);
}
.success-message {
padding: 40px 24px;
padding: var(--space-10) var(--space-6);
text-align: center;
}
@@ -179,13 +179,13 @@
width: 64px;
height: 64px;
border-radius: 50%;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
color: white;
background: var(--accent-gradient);
color: var(--accent-contrast);
display: flex;
align-items: center;
justify-content: center;
font-size: 36px;
margin: 0 auto 16px;
font-size: var(--fs-display);
margin: 0 auto var(--space-4);
animation: scaleIn 0.4s ease-out;
}
@@ -200,9 +200,9 @@
.success-message p {
margin: 0;
color: #333;
font-size: 18px;
font-weight: 500;
color: var(--text);
font-size: var(--fs-xl);
font-weight: var(--fw-medium);
}
@media (max-width: 540px) {
@@ -211,7 +211,7 @@
}
.password-form {
padding: 20px;
padding: var(--space-5);
}
.form-actions {
+40 -40
View File
@@ -3,88 +3,88 @@
display: flex;
align-items: center;
justify-content: center;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
padding: 20px;
background: var(--accent-gradient);
padding: var(--space-5);
}
.login-card {
background: white;
background: var(--surface);
border-radius: 12px;
box-shadow: 0 10px 40px rgba(0, 0, 0, 0.2);
box-shadow: var(--shadow-overlay);
width: 100%;
max-width: 400px;
padding: 40px;
padding: var(--space-10);
}
.login-header {
text-align: center;
margin-bottom: 30px;
margin-bottom: var(--space-8);
}
.login-header h1 {
margin: 0 0 10px 0;
color: #667eea;
font-size: 32px;
margin: 0 0 var(--space-2-5) 0;
color: var(--accent);
font-size: var(--fs-display);
}
.login-header p {
margin: 0;
color: #666;
font-size: 16px;
color: var(--text-muted);
font-size: var(--fs-lg);
}
.login-form {
display: flex;
flex-direction: column;
gap: 20px;
gap: var(--space-5);
}
.form-group {
display: flex;
flex-direction: column;
gap: 8px;
gap: var(--space-2);
}
.form-group label {
font-weight: 600;
color: #333;
font-size: 14px;
font-weight: var(--fw-semibold);
color: var(--text);
font-size: var(--fs-md);
}
.form-group input {
padding: 12px 16px;
border: 2px solid #e0e0e0;
padding: var(--space-3) var(--space-4);
border: 2px solid var(--border);
border-radius: 8px;
font-size: 16px;
font-size: var(--fs-lg);
transition: border-color 0.3s;
}
.form-group input:focus {
outline: none;
border-color: #667eea;
border-color: var(--accent);
}
.form-group input:disabled {
background-color: #f5f5f5;
background-color: var(--surface-sunken);
cursor: not-allowed;
}
.login-button {
padding: 14px 24px;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
color: white;
padding: var(--space-4) var(--space-6);
background: var(--accent-gradient);
color: var(--accent-contrast);
border: none;
border-radius: 8px;
font-size: 16px;
font-weight: 600;
font-size: var(--fs-lg);
font-weight: var(--fw-semibold);
cursor: pointer;
transition: transform 0.2s, box-shadow 0.2s;
margin-top: 10px;
margin-top: var(--space-2-5);
}
.login-button:hover:not(:disabled) {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
box-shadow: 0 4px 12px var(--accent-soft);
}
.login-button:active:not(:disabled) {
@@ -97,12 +97,12 @@
}
.error-message {
background-color: #fee;
color: #c33;
padding: 12px 16px;
background-color: var(--danger-soft);
color: var(--danger);
padding: var(--space-3) var(--space-4);
border-radius: 8px;
border: 1px solid #fcc;
font-size: 14px;
border: 1px solid var(--danger);
font-size: var(--fs-md);
}
.loading {
@@ -111,18 +111,18 @@
align-items: center;
justify-content: center;
min-height: 100vh;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
color: white;
background: var(--accent-gradient);
color: var(--accent-contrast);
}
.loading-spinner {
border: 4px solid rgba(255, 255, 255, 0.3);
border-top: 4px solid white;
border: 4px solid color-mix(in srgb, var(--accent-contrast) 30%, transparent);
border-top: 4px solid var(--accent-contrast);
border-radius: 50%;
width: 40px;
height: 40px;
animation: spin 1s linear infinite;
margin-bottom: 10px;
margin-bottom: var(--space-2-5);
}
@keyframes spin {
@@ -132,10 +132,10 @@
@media (max-width: 480px) {
.login-card {
padding: 30px 20px;
padding: var(--space-8) var(--space-5);
}
.login-header h1 {
font-size: 28px;
font-size: var(--fs-3xl);
}
}
@@ -0,0 +1,116 @@
/* The form and buttons reuse Main.css classes (.extra-field,
.vehicle-form-actions, .extra-save-btn ...); the compound selectors below
exist only to outrank those where this screen differs. */
.um-page {
padding: var(--space-6);
max-width: 900px;
}
.um-toolbar {
margin-bottom: var(--space-4);
}
.um-add-form {
margin-bottom: var(--space-6);
padding: var(--space-4);
border: 1px solid var(--border);
border-radius: var(--radius);
background: var(--surface-sunken);
}
.um-add-form-title {
margin: 0 0 var(--space-4) 0;
font-size: var(--fs-md);
color: var(--accent);
font-weight: var(--fw-semibold);
}
.extra-field.um-permission-field {
flex-direction: row;
align-items: center;
gap: var(--space-2);
}
/* Three classes deep to outrank the cockpit `.extra-field label` rule */
.um-add-form .extra-field.um-permission-field label {
text-transform: none;
letter-spacing: normal;
cursor: pointer;
}
.vehicle-form-actions.um-form-actions {
margin-top: var(--space-4);
padding-top: var(--space-3);
}
.um-table {
width: 100%;
border-collapse: collapse;
font-size: var(--fs-md);
}
.um-table thead tr {
border-bottom: 2px solid var(--border);
text-align: left;
}
.um-table th,
.um-table td {
padding: var(--space-2-5) var(--space-3);
}
.um-table th {
color: var(--text-muted);
font-weight: var(--fw-semibold);
}
.um-row {
border-bottom: 1px solid var(--border);
background: var(--surface);
}
.um-row--inactive {
background: var(--surface-sunken);
}
.um-table .um-username {
font-weight: var(--fw-semibold);
color: var(--text);
}
.um-table .um-cell-center {
text-align: center;
}
.um-status {
display: inline-block;
padding: var(--space-0-5) var(--space-2);
border-radius: 10px;
font-size: var(--fs-sm);
font-weight: var(--fw-semibold);
background: var(--success-soft);
color: var(--success);
}
.um-status--inactive {
background: var(--danger-soft);
color: var(--danger);
}
.um-checkbox {
width: 18px;
height: 18px;
cursor: pointer;
}
.um-table .um-action-btn {
font-size: var(--fs-sm);
padding: var(--space-1-5) var(--space-3);
}
.um-table .um-empty {
padding: var(--space-5);
text-align: center;
color: var(--text-muted);
}
+24 -33
View File
@@ -2,6 +2,7 @@ import { useState, useEffect } from 'react';
import { useAuth } from '../../contexts/AuthContext';
import api from '../../services/api';
import Header from '../Header';
import './UserManager.css';
const PERMISSION_FIELDS = [
{ key: 'can_measure', label: 'Can Measure' },
@@ -87,12 +88,12 @@ export default function UserManager() {
return (
<div>
<Header />
<div style={{ padding: '24px', maxWidth: '900px' }}>
<div className="um-page">
<h2 className="vehicle-detail-title">User Manager</h2>
{error && <div className="vehicle-error">{error}</div>}
<div style={{ marginBottom: '16px' }}>
<div className="um-toolbar">
<button
className="vehicle-add-btn"
onClick={() => setAddFormOpen(prev => !prev)}
@@ -102,8 +103,8 @@ export default function UserManager() {
</div>
{addFormOpen && (
<form onSubmit={handleAddUser} style={{ marginBottom: '24px', padding: '16px', border: '1px solid #e0e0e0', borderRadius: '8px', background: '#fafafa' }}>
<h3 style={{ margin: '0 0 14px 0', fontSize: '14px', color: '#667eea', fontWeight: 600 }}>New User</h3>
<form onSubmit={handleAddUser} className="um-add-form">
<h3 className="um-add-form-title">New User</h3>
<div className="extra-fields">
<div className="extra-field">
<label>Username</label>
@@ -125,18 +126,18 @@ export default function UserManager() {
/>
</div>
{PERMISSION_FIELDS.map(({ key, label }) => (
<div key={key} className="extra-field" style={{ flexDirection: 'row', alignItems: 'center', gap: '8px' }}>
<div key={key} className="extra-field um-permission-field">
<input
type="checkbox"
id={`new-${key}`}
checked={newUser[key]}
onChange={e => setNewUser(prev => ({ ...prev, [key]: e.target.checked }))}
/>
<label htmlFor={`new-${key}`} style={{ textTransform: 'none', letterSpacing: 'normal', cursor: 'pointer' }}>{label}</label>
<label htmlFor={`new-${key}`}>{label}</label>
</div>
))}
</div>
<div className="vehicle-form-actions" style={{ marginTop: '14px', paddingTop: '12px' }}>
<div className="vehicle-form-actions um-form-actions">
<button
type="button"
className="vehicle-form-cancel"
@@ -155,60 +156,50 @@ export default function UserManager() {
</form>
)}
<table style={{ width: '100%', borderCollapse: 'collapse', fontSize: '14px' }}>
<table className="um-table">
<thead>
<tr style={{ borderBottom: '2px solid #e0e0e0', textAlign: 'left' }}>
<th style={{ padding: '10px 12px', color: '#555', fontWeight: 600 }}>Username</th>
<th style={{ padding: '10px 12px', color: '#555', fontWeight: 600 }}>Status</th>
<tr>
<th>Username</th>
<th>Status</th>
{PERMISSION_FIELDS.map(({ key, label }) => (
<th key={key} style={{ padding: '10px 12px', color: '#555', fontWeight: 600 }}>{label}</th>
<th key={key}>{label}</th>
))}
<th style={{ padding: '10px 12px', color: '#555', fontWeight: 600 }}>Actions</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
{users.map(u => (
<tr key={u.id} style={{ borderBottom: '1px solid #f0f0f0', background: u.is_active ? 'white' : '#fafafa' }}>
<td style={{ padding: '10px 12px', fontWeight: 600, color: '#333' }}>{u.username}</td>
<td style={{ padding: '10px 12px' }}>
<span style={{
display: 'inline-block',
padding: '2px 8px',
borderRadius: '10px',
fontSize: '12px',
fontWeight: 600,
background: u.is_active ? '#e8f5e9' : '#fce4ec',
color: u.is_active ? '#2e7d32' : '#c62828',
}}>
<tr key={u.id} className={u.is_active ? 'um-row' : 'um-row um-row--inactive'}>
<td className="um-username">{u.username}</td>
<td>
<span className={u.is_active ? 'um-status' : 'um-status um-status--inactive'}>
{u.is_active ? 'Active' : 'Inactive'}
</span>
</td>
{PERMISSION_FIELDS.map(({ key }) => (
<td key={key} style={{ padding: '10px 12px', textAlign: 'center' }}>
<td key={key} className="um-cell-center">
<input
type="checkbox"
checked={!!u[key]}
onChange={e => handlePermissionChange(u.id, key, e.target.checked)}
style={{ width: '18px', height: '18px', cursor: 'pointer' }}
className="um-checkbox"
/>
</td>
))}
<td style={{ padding: '10px 12px' }}>
<td>
{u.is_active ? (
<button
className="vehicle-form-cancel"
className="vehicle-form-cancel um-action-btn"
onClick={() => handleDeactivate(u.id)}
disabled={u.id === currentUser?.id}
title={u.id === currentUser?.id ? 'Cannot deactivate yourself' : undefined}
style={{ fontSize: '12px', padding: '5px 12px' }}
>
Deactivate
</button>
) : (
<button
className="extra-save-btn"
className="extra-save-btn um-action-btn"
onClick={() => handleReactivate(u.id)}
style={{ fontSize: '12px', padding: '5px 12px' }}
>
Reactivate
</button>
@@ -218,7 +209,7 @@ export default function UserManager() {
))}
{users.length === 0 && (
<tr>
<td colSpan={PERMISSION_FIELDS.length + 3} style={{ padding: '20px', textAlign: 'center', color: '#999' }}>
<td colSpan={PERMISSION_FIELDS.length + 3} className="um-empty">
No users found
</td>
</tr>