diff --git a/api/app/static/css/style.css b/api/app/static/css/style.css index a0c1e45..191a48d 100644 --- a/api/app/static/css/style.css +++ b/api/app/static/css/style.css @@ -1,49 +1,171 @@ -/* ── Design tokens ───────────────────────────────── */ +/* ── Design tokens (DESIGN.md) ───────────────────── */ :root { + /* Fonts */ + --font-display: 'Space Grotesk', sans-serif; + --font-body: 'DM Sans', sans-serif; + --font-data: 'JetBrains Mono', monospace; + /* Surfaces */ - --body-bg: #f9fafb; - --card-bg: #ffffff; - --card-shadow: 0 1px 3px rgba(0,0,0,0.1), 0 1px 2px rgba(0,0,0,0.06); + --bg: #F8F7F5; + --surface: #FFFFFF; + --surface-raised: #F3F2EF; + --card-shadow: 0 1px 3px rgba(28,25,23,0.1), 0 1px 2px rgba(28,25,23,0.06); --card-radius: 0.5rem; - /* Semantic colors */ - --blue-600: #2563eb; - --blue-700: #1d4ed8; - --green-100: #dcfce7; --green-800: #166534; - --yellow-100: #fef9c3; --yellow-800: #854d0e; - --red-100: #fee2e2; --red-800: #991b1b; - --blue-100: #dbeafe; --blue-800: #1e40af; - /* Text */ - --text-primary: #111827; - --text-secondary: #4b5563; - --text-muted: #6b7280; - --border-color: #e5e7eb; + --text-primary: #1C1917; + --text-secondary: #57534E; + --text-muted: #78716C; - /* Dots */ - --dot-green: #22c55e; - --dot-yellow: #eab308; - --dot-red: #ef4444; + /* Borders */ + --border: #E7E5E4; + --border-subtle: #F0EFED; + + /* Accent — amber (state: nav active, filter pills) */ + --accent: #D97706; + --accent-hover: #B45309; + --accent-light: #FEF3C7; + --accent-text: #92400E; + + /* Semantic */ + --success: #16A34A; + --success-light: #DCFCE7; + --success-text: #166534; + + --warning: #CA8A04; + --warning-light: #FEF9C3; + --warning-text: #854D0E; + + --error: #DC2626; + --error-light: #FEE2E2; + --error-text: #991B1B; + + --info: #2563EB; + --info-hover: #1D4ED8; + --info-light: #DBEAFE; + --info-text: #1E40AF; + + --cancelled: #78716C; + --cancelled-light: #F5F5F4; + + /* Border radius */ + --radius-sm: 4px; + --radius-md: 8px; + --radius-lg: 12px; + --radius-full: 9999px; } +/* ── Dark mode ──────────────────────────────────── */ +[data-theme="dark"] { + --bg: #121212; + --surface: #1E1E1E; + --surface-raised: #2A2A2A; + --card-shadow: 0 1px 3px rgba(0,0,0,0.4), 0 1px 2px rgba(0,0,0,0.3); + + --text-primary: #E8E4DD; + --text-secondary: #A8A29E; + --text-muted: #78716C; + + --border: #333333; + --border-subtle: #262626; + + --accent: #F59E0B; + --accent-hover: #D97706; + --accent-light: rgba(245,158,11,0.12); + --accent-text: #FCD34D; + + --success: #16A34A; + --success-light: rgba(22,163,74,0.15); + --success-text: #4ADE80; + + --warning: #CA8A04; + --warning-light: rgba(202,138,4,0.15); + --warning-text: #FACC15; + + --error: #DC2626; + --error-light: rgba(220,38,38,0.15); + --error-text: #FCA5A5; + + --info: #2563EB; + --info-hover: #3B82F6; + --info-light: rgba(37,99,235,0.15); + --info-text: #93C5FD; + + --cancelled: #78716C; + --cancelled-light: rgba(120,113,108,0.15); +} + +/* Dark mode overrides for elements with hardcoded colors */ +[data-theme="dark"] body { color-scheme: dark; } +[data-theme="dark"] .top-navbar { background: var(--surface); border-bottom-color: var(--border); } +[data-theme="dark"] .navbar-brand { color: var(--text-primary); } +[data-theme="dark"] .nav-tab { color: var(--text-muted); } +[data-theme="dark"] .nav-tab:hover { color: var(--text-primary); background: var(--surface-raised); } +[data-theme="dark"] .table th { background: var(--surface-raised); color: var(--text-muted); } +[data-theme="dark"] .table td { color: var(--text-secondary); } +[data-theme="dark"] .table tbody tr:nth-child(even) td { background-color: var(--surface-raised); } +[data-theme="dark"] .table-hover tbody tr:hover td { background-color: rgba(37,99,235,0.1) !important; } +[data-theme="dark"] .card-header { background: var(--surface); border-bottom-color: var(--border); } +[data-theme="dark"] .flat-row { border-bottom-color: var(--border-subtle); } +[data-theme="dark"] .flat-row:hover { background: var(--surface-raised); } +[data-theme="dark"] .filter-pill { background: var(--surface); border-color: var(--border); color: var(--text-secondary); } +[data-theme="dark"] .filter-pill:hover { background: var(--surface-raised); } +[data-theme="dark"] .page-btn { background: var(--surface); border-color: var(--border); color: var(--text-secondary); } +[data-theme="dark"] .page-btn:hover:not(:disabled):not(.active) { background: var(--surface-raised); border-color: var(--text-muted); color: var(--text-primary); } +[data-theme="dark"] .page-btn.active { background: var(--info); border-color: var(--info); } +[data-theme="dark"] .form-control, [data-theme="dark"] .form-select { background: var(--surface-raised); border-color: var(--border); color: var(--text-primary); } +[data-theme="dark"] .form-control:focus, [data-theme="dark"] .form-select:focus { border-color: var(--info); } +[data-theme="dark"] .sync-card { background: var(--surface); border-color: var(--border); } +[data-theme="dark"] .sync-card-info:hover { background: var(--surface-raised); } +[data-theme="dark"] .sync-card-progress { background: var(--info-light); color: var(--info-text); border-top-color: var(--border); } +[data-theme="dark"] .autocomplete-dropdown { background: var(--surface); border-color: var(--border); } +[data-theme="dark"] .autocomplete-item:hover, [data-theme="dark"] .autocomplete-item.active { background-color: var(--surface-raised); } +[data-theme="dark"] .autocomplete-item .codmat { color: var(--text-primary); } +[data-theme="dark"] .autocomplete-item .denumire { color: var(--text-muted); } +[data-theme="dark"] .context-menu { background: var(--surface); border-color: var(--border); } +[data-theme="dark"] .context-menu-item { color: var(--text-primary); } +[data-theme="dark"] .context-menu-item:hover { background: var(--surface-raised); } +[data-theme="dark"] .spinner-overlay { background: rgba(18,18,18,0.7); } +[data-theme="dark"] .modal-content { background: var(--surface); color: var(--text-primary); } +[data-theme="dark"] .modal-header { border-bottom-color: var(--border); } +[data-theme="dark"] .modal-footer { border-top-color: var(--border); } +[data-theme="dark"] .detail-item-card { border-color: var(--border); } +[data-theme="dark"] .select-compact { background: var(--surface); border-color: var(--border); color: var(--text-secondary); } +[data-theme="dark"] .search-input { background: var(--surface-raised); border-color: var(--border); color: var(--text-primary); } +[data-theme="dark"] .editable:hover { background-color: var(--surface-raised); } +[data-theme="dark"] .sortable:hover { background-color: var(--surface-raised); } +[data-theme="dark"] .result-banner { background: var(--success-light); color: var(--success-text); border-color: var(--success); } +[data-theme="dark"] .badge-pct.complete { background: var(--success-light); color: var(--success-text); } +[data-theme="dark"] .badge-pct.incomplete { background: var(--warning-light); color: var(--warning-text); } +[data-theme="dark"] .table-light { --bs-table-bg: var(--surface-raised); } +[data-theme="dark"] .bottom-nav { background: var(--surface); border-top-color: var(--border); } +[data-theme="dark"] .qm-line { border-bottom-color: var(--border-subtle); } + /* ── Base ────────────────────────────────────────── */ body { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; + font-family: var(--font-body); font-size: 1rem; - background-color: var(--body-bg); + background-color: var(--bg); + color: var(--text-primary); margin: 0; padding: 0; } h1, h2, h3, h4, h5, h6 { + font-family: var(--font-display); text-wrap: balance; } +/* Data font — selective: codes, numbers, sums, dates. NOT text names. */ +.font-data, code, .dif-sku, .detail-item-card .card-sku { + font-family: var(--font-data); +} + /* ── Checkboxes — accessible size ────────────────── */ input[type="checkbox"] { width: 1.125rem; height: 1.125rem; - accent-color: var(--blue-600); + accent-color: var(--info); cursor: pointer; } @@ -54,8 +176,8 @@ input[type="checkbox"] { left: 0; right: 0; height: 48px; - background: #fff; - border-bottom: 1px solid var(--border-color); + background: var(--surface); + border-bottom: 1px solid var(--border); display: flex; align-items: center; padding: 0 1.5rem; @@ -65,9 +187,10 @@ input[type="checkbox"] { } .navbar-brand { + font-family: var(--font-display); font-weight: 700; font-size: 1rem; - color: #111827; + color: var(--text-primary); white-space: nowrap; } @@ -78,6 +201,7 @@ input[type="checkbox"] { overflow-x: auto; -webkit-overflow-scrolling: touch; scrollbar-width: none; + flex: 1; } .navbar-links::-webkit-scrollbar { display: none; } @@ -86,7 +210,7 @@ input[type="checkbox"] { align-items: center; padding: 0 1rem; height: 48px; - color: #64748b; + color: var(--text-muted); text-decoration: none; font-size: 0.9375rem; font-weight: 500; @@ -96,15 +220,30 @@ input[type="checkbox"] { transition: color 0.15s, border-color 0.15s; } .nav-tab:hover { - color: #111827; - background: #f9fafb; + color: var(--text-primary); + background: var(--surface-raised); text-decoration: none; } .nav-tab.active { - color: var(--blue-600); - border-bottom-color: var(--blue-600); + color: var(--accent); + border-bottom-color: var(--accent); } +/* Dark toggle button in navbar */ +.dark-toggle { + background: none; + border: none; + color: var(--text-muted); + cursor: pointer; + padding: 0.25rem; + font-size: 1.125rem; + line-height: 1; + border-radius: var(--radius-sm); + transition: color 0.15s; + flex-shrink: 0; +} +.dark-toggle:hover { color: var(--text-primary); } + /* ── Main content ────────────────────────────────── */ .main-content { padding-top: 64px; @@ -112,22 +251,27 @@ input[type="checkbox"] { padding-right: 1.5rem; padding-bottom: 1.5rem; min-height: 100vh; - max-width: 1280px; margin-left: auto; margin-right: auto; } +/* Non-table pages: constrained width */ +.main-content.constrained { + max-width: 1200px; +} + /* ── Cards ───────────────────────────────────────── */ .card { border: none; box-shadow: var(--card-shadow); border-radius: var(--card-radius); - background: var(--card-bg); + background: var(--surface); } .card-header { - background: var(--card-bg); - border-bottom: 1px solid var(--border-color); + background: var(--surface); + border-bottom: 1px solid var(--border); + font-family: var(--font-display); font-weight: 600; font-size: 0.9375rem; padding: 0.75rem 1rem; @@ -139,12 +283,13 @@ input[type="checkbox"] { } .table th { - font-size: 0.8125rem; + font-family: var(--font-display); + font-size: 0.75rem; font-weight: 500; text-transform: uppercase; - letter-spacing: 0.05em; + letter-spacing: 0.04em; color: var(--text-muted); - background: #f9fafb; + background: var(--surface-raised); padding: 0.75rem 1rem; border-top: none; } @@ -157,28 +302,28 @@ input[type="checkbox"] { } /* Zebra striping */ -.table tbody tr:nth-child(even) td { background-color: #f7f8fa; } -.table-hover tbody tr:hover td { background-color: #eef2ff !important; } +.table tbody tr:nth-child(even) td { background-color: var(--surface-raised); } +.table-hover tbody tr:hover td { background-color: rgba(37, 99, 235, 0.08) !important; } /* ── Badges — soft pill style ────────────────────── */ .badge { font-size: 0.8125rem; font-weight: 500; padding: 0.125rem 0.5rem; - border-radius: 9999px; + border-radius: var(--radius-full); } -.badge.bg-success { background: var(--green-100) !important; color: var(--green-800) !important; } -.badge.bg-info { background: var(--blue-100) !important; color: var(--blue-800) !important; } -.badge.bg-warning { background: var(--yellow-100) !important; color: var(--yellow-800) !important; } -.badge.bg-danger { background: var(--red-100) !important; color: var(--red-800) !important; } +.badge.bg-success { background: var(--success-light) !important; color: var(--success-text) !important; } +.badge.bg-info { background: var(--info-light) !important; color: var(--info-text) !important; } +.badge.bg-warning { background: var(--warning-light) !important; color: var(--warning-text) !important; } +.badge.bg-danger { background: var(--error-light) !important; color: var(--error-text) !important; } /* Legacy badge classes */ -.badge-imported { background: var(--green-100); color: var(--green-800); } -.badge-skipped { background: var(--yellow-100); color: var(--yellow-800); } -.badge-error { background: var(--red-100); color: var(--red-800); } -.badge-pending { background: #f3f4f6; color: #374151; } -.badge-ready { background: var(--blue-100); color: var(--blue-800); } +.badge-imported { background: var(--success-light); color: var(--success-text); } +.badge-skipped { background: var(--warning-light); color: var(--warning-text); } +.badge-error { background: var(--error-light); color: var(--error-text); } +.badge-pending { background: var(--surface-raised); color: var(--text-secondary); } +.badge-ready { background: var(--info-light); color: var(--info-text); } /* ── Buttons ─────────────────────────────────────── */ .btn { @@ -192,12 +337,12 @@ input[type="checkbox"] { } .btn-primary { - background: var(--blue-600); - border-color: var(--blue-600); + background: var(--info); + border-color: var(--info); } .btn-primary:hover { - background: var(--blue-700); - border-color: var(--blue-700); + background: var(--info-hover); + border-color: var(--info-hover); } /* ── Forms ───────────────────────────────────────── */ @@ -205,11 +350,11 @@ input[type="checkbox"] { font-size: 0.9375rem; padding: 0.5rem 0.75rem; border-radius: 0.375rem; - border-color: #d1d5db; + border-color: var(--border); } .form-control:focus, .form-select:focus { - border-color: var(--blue-600); + border-color: var(--info); box-shadow: 0 0 0 2px rgba(37, 99, 235, 0.2); } @@ -229,9 +374,9 @@ input[type="checkbox"] { height: 2.75rem; padding: 0 0.5rem; font-size: 0.875rem; - border: 1px solid #d1d5db; + border: 1px solid var(--border); border-radius: 0.375rem; - background: #fff; + background: var(--surface); color: var(--text-secondary); cursor: pointer; transition: background 0.12s, border-color 0.12s; @@ -239,14 +384,14 @@ input[type="checkbox"] { user-select: none; } .page-btn:hover:not(:disabled):not(.active) { - background: #f3f4f6; - border-color: #9ca3af; + background: var(--surface-raised); + border-color: var(--text-muted); color: var(--text-primary); text-decoration: none; } .page-btn.active { - background: var(--blue-600); - border-color: var(--blue-600); + background: var(--info); + border-color: var(--info); color: #fff; font-weight: 600; } @@ -275,11 +420,11 @@ input[type="checkbox"] { border-radius: 50%; flex-shrink: 0; } -.dot-green { background: var(--dot-green); } -.dot-yellow { background: var(--dot-yellow); } -.dot-red { background: var(--dot-red); } -.dot-gray { background: #9ca3af; } -.dot-blue { background: #3b82f6; } +.dot-green { background: var(--success); } +.dot-yellow { background: var(--warning); } +.dot-red { background: var(--error); box-shadow: 0 0 8px 2px rgba(220,38,38,0.35); } +.dot-gray { background: var(--cancelled); } +.dot-blue { background: var(--info); } /* ── Flat row (mobile + desktop) ────────────────── */ .flat-row { @@ -287,26 +432,26 @@ input[type="checkbox"] { align-items: center; gap: 0.5rem; padding: 0.5rem 0.75rem; - border-bottom: 1px solid #f3f4f6; + border-bottom: 1px solid var(--border-subtle); font-size: 1rem; } .flat-row:last-child { border-bottom: none; } -.flat-row:hover { background: #f9fafb; cursor: pointer; } +.flat-row:hover { background: var(--surface-raised); cursor: pointer; } .grow { flex: 1; min-width: 0; } .truncate { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } /* ── Colored filter count - text color only ─────── */ -.fc-green { color: #16a34a; } -.fc-yellow { color: #ca8a04; } -.fc-red { color: #dc2626; } -.fc-neutral { color: #6b7280; } -.fc-blue { color: #2563eb; } -.fc-dark { color: #374151; } +.fc-green { color: var(--success); } +.fc-yellow { color: var(--warning); } +.fc-red { color: var(--error); } +.fc-neutral { color: var(--text-muted); } +.fc-blue { color: var(--info); } +.fc-dark { color: var(--text-secondary); } /* ── Log viewer (dark theme — keep as-is) ────────── */ .log-viewer { - font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, monospace; + font-family: var(--font-data); font-size: 0.8125rem; line-height: 1.5; max-height: 600px; @@ -325,7 +470,7 @@ input[type="checkbox"] { cursor: pointer; } .table-hover tbody tr[data-href]:hover { - background-color: #f9fafb; + background-color: var(--surface-raised); } /* ── Sortable table headers ──────────────────────── */ @@ -334,22 +479,22 @@ input[type="checkbox"] { user-select: none; } .sortable:hover { - background-color: #f3f4f6; + background-color: var(--surface-raised); } .sort-icon { font-size: 0.75rem; margin-left: 0.25rem; - color: var(--blue-600); + color: var(--info); } /* ── SKU group visual grouping ───────────────────── */ .sku-group-odd { - background-color: #f8fafc; + background-color: var(--surface-raised); } /* ── Editable cells ──────────────────────────────── */ .editable { cursor: pointer; } -.editable:hover { background-color: #f3f4f6; } +.editable:hover { background-color: var(--surface-raised); } /* ── Order detail modal ──────────────────────────── */ .modal-lg .table-sm td, @@ -364,7 +509,7 @@ input[type="checkbox"] { .modal-backdrop ~ .modal-backdrop { z-index: 1055; } /* ── Quick Map compact lines ─────────────────────── */ -.qm-line { border-bottom: 1px solid #e5e7eb; padding: 6px 0; } +.qm-line { border-bottom: 1px solid var(--border); padding: 6px 0; } .qm-line:last-child { border-bottom: none; } .qm-row { display: flex; gap: 6px; align-items: center; } .qm-codmat-wrap { flex: 1; min-width: 0; } @@ -388,17 +533,17 @@ tr.mapping-deleted td { /* ── Map icon button ─────────────────────────────── */ .btn-map-icon { - color: var(--blue-600); + color: var(--info); padding: 0.1rem 0.25rem; cursor: pointer; font-size: 1rem; text-decoration: none; } -.btn-map-icon:hover { color: var(--blue-700); } +.btn-map-icon:hover { color: var(--info-hover); } /* ── Last sync summary card columns ─────────────── */ .last-sync-col { - border-right: 1px solid var(--border-color); + border-right: 1px solid var(--border); } /* ── Cursor pointer utility ──────────────────────── */ @@ -418,18 +563,19 @@ tr.mapping-deleted td { align-items: center; gap: 0.3rem; padding: 0.5rem 0.75rem; - border: 1px solid #d1d5db; + border: 1px solid var(--border); border-radius: 0.375rem; - background: #fff; + background: var(--surface); font-size: 0.9375rem; cursor: pointer; transition: background 0.15s, border-color 0.15s; white-space: nowrap; + color: var(--text-secondary); } -.filter-pill:hover { background: #f3f4f6; } +.filter-pill:hover { background: var(--surface-raised); } .filter-pill.active { - background: var(--blue-700); - border-color: var(--blue-700); + background: var(--accent); + border-color: var(--accent); color: #fff; } .filter-pill.active .filter-count { @@ -444,22 +590,22 @@ tr.mapping-deleted td { /* ── Search input ────────────────────────────────── */ .search-input { padding: 0.375rem 0.75rem; - border: 1px solid #d1d5db; + border: 1px solid var(--border); border-radius: 0.375rem; font-size: 0.9375rem; width: 160px; } .search-input:focus { - border-color: var(--blue-600); + border-color: var(--info); box-shadow: 0 0 0 2px rgba(37, 99, 235, 0.2); } -/* ── Autocomplete dropdown (keep as-is) ──────────── */ +/* ── Autocomplete dropdown ──────────────────────── */ .autocomplete-dropdown { position: absolute; z-index: 1050; - background: #fff; - border: 1px solid #dee2e6; + background: var(--surface); + border: 1px solid var(--border); border-radius: 0.375rem; box-shadow: 0 4px 12px rgba(0,0,0,0.15); max-height: 300px; @@ -470,17 +616,17 @@ tr.mapping-deleted td { padding: 0.5rem 0.75rem; cursor: pointer; font-size: 0.9375rem; - border-bottom: 1px solid #f1f5f9; + border-bottom: 1px solid var(--border-subtle); } .autocomplete-item:hover, .autocomplete-item.active { - background-color: #f1f5f9; + background-color: var(--surface-raised); } .autocomplete-item .codmat { font-weight: 600; - color: #1e293b; + color: var(--text-primary); } .autocomplete-item .denumire { - color: #64748b; + color: var(--text-muted); font-size: 0.875rem; } @@ -499,7 +645,7 @@ tr.mapping-deleted td { color: #f9fafb; font-size: 0.75rem; padding: 0.3rem 0.6rem; - border-radius: 4px; + border-radius: var(--radius-sm); white-space: nowrap; pointer-events: none; opacity: 0; @@ -510,8 +656,8 @@ tr.mapping-deleted td { /* ── Sync card ───────────────────────────────────── */ .sync-card { - background: #fff; - border: 1px solid var(--border-color); + background: var(--surface); + border: 1px solid var(--border); border-radius: var(--card-radius); overflow: hidden; margin-bottom: 1rem; @@ -525,7 +671,7 @@ tr.mapping-deleted td { } .sync-card-divider { height: 1px; - background: var(--border-color); + background: var(--border); margin: 0; } .sync-card-info { @@ -538,34 +684,34 @@ tr.mapping-deleted td { cursor: pointer; transition: background 0.12s; } -.sync-card-info:hover { background: #f9fafb; } +.sync-card-info:hover { background: var(--surface-raised); } .sync-card-progress { display: flex; align-items: center; gap: 0.5rem; padding: 0.4rem 1rem; - background: #eff6ff; + background: var(--info-light); font-size: 1rem; - color: var(--blue-700); - border-top: 1px solid #dbeafe; + color: var(--info-text); + border-top: 1px solid var(--border); } -/* ── Pulsing live dot (keep as-is) ──────────────── */ +/* ── Pulsing live dot ──────────────────────────── */ .sync-live-dot { display: inline-block; width: 8px; height: 8px; border-radius: 50%; - background: #3b82f6; - animation: pulse-dot 1.2s ease-in-out infinite; + background: var(--info); + animation: pulse-dot 2s ease-in-out infinite; flex-shrink: 0; } @keyframes pulse-dot { - 0%, 100% { opacity: 1; transform: scale(1); } - 50% { opacity: 0.4; transform: scale(0.75); } + 0%, 100% { opacity: 1; } + 50% { opacity: 0.4; } } -/* ── Status dot (keep as-is) ─────────────────────── */ +/* ── Status dot ─────────────────────────────────── */ .sync-status-dot { display: inline-block; width: 10px; @@ -573,10 +719,10 @@ tr.mapping-deleted td { border-radius: 50%; flex-shrink: 0; } -.sync-status-dot.idle { background: #9ca3af; } -.sync-status-dot.running { background: #3b82f6; animation: pulse-dot 1.2s ease-in-out infinite; } -.sync-status-dot.completed { background: #10b981; } -.sync-status-dot.failed { background: #ef4444; } +.sync-status-dot.idle { background: var(--cancelled); } +.sync-status-dot.running { background: var(--info); animation: pulse-dot 2s ease-in-out infinite; } +.sync-status-dot.completed { background: var(--success); } +.sync-status-dot.failed { background: var(--error); } /* ── Custom period range inputs ──────────────────── */ .period-custom-range { @@ -591,13 +737,13 @@ tr.mapping-deleted td { .select-compact { padding: 0.375rem 0.5rem; font-size: 0.9375rem; - border: 1px solid #d1d5db; + border: 1px solid var(--border); border-radius: 0.375rem; - background: #fff; + background: var(--surface); cursor: pointer; } -/* ── btn-compact (kept for backward compat) ──────── */ +/* ── btn-compact ─────────────────────────────────── */ .btn-compact { padding: 0.375rem 0.75rem; font-size: 0.9375rem; @@ -608,26 +754,26 @@ tr.mapping-deleted td { padding: 0.4rem 0.75rem; border-radius: 0.375rem; font-size: 0.9375rem; - background: #d1fae5; - color: #065f46; - border: 1px solid #6ee7b7; + background: var(--success-light); + color: var(--success-text); + border: 1px solid var(--success); } /* ── Badge-pct (mappings page) ───────────────────── */ .badge-pct { font-size: 0.75rem; padding: 0.1rem 0.35rem; - border-radius: 4px; + border-radius: var(--radius-sm); font-weight: 600; } -.badge-pct.complete { background: #d1fae5; color: #065f46; } -.badge-pct.incomplete { background: #fef3c7; color: #92400e; } +.badge-pct.complete { background: var(--success-light); color: var(--success-text); } +.badge-pct.incomplete { background: var(--warning-light); color: var(--warning-text); } /* ── Context Menu ────────────────────────────────── */ .context-menu-trigger { background: none; border: none; - color: #9ca3af; + color: var(--cancelled); padding: 0.2rem 0.4rem; cursor: pointer; border-radius: 0.25rem; @@ -637,14 +783,14 @@ tr.mapping-deleted td { } .context-menu-trigger:hover { color: var(--text-secondary); - background: #f3f4f6; + background: var(--surface-raised); } .context-menu { position: fixed; - background: #fff; - border: 1px solid #e5e7eb; - border-radius: 0.5rem; + background: var(--surface); + border: 1px solid var(--border); + border-radius: var(--card-radius); box-shadow: 0 4px 16px rgba(0,0,0,0.12); z-index: 1050; min-width: 150px; @@ -662,9 +808,9 @@ tr.mapping-deleted td { color: var(--text-primary); transition: background 0.1s; } -.context-menu-item:hover { background: #f3f4f6; } -.context-menu-item.text-danger { color: #dc2626; } -.context-menu-item.text-danger:hover { background: #fee2e2; } +.context-menu-item:hover { background: var(--surface-raised); } +.context-menu-item.text-danger { color: var(--error); } +.context-menu-item.text-danger:hover { background: var(--error-light); } /* ── Pagination info strip ───────────────────────── */ .pag-strip { @@ -673,12 +819,12 @@ tr.mapping-deleted td { justify-content: space-between; gap: 1rem; padding: 0.5rem 1rem; - border-bottom: 1px solid var(--border-color); + border-bottom: 1px solid var(--border); flex-wrap: wrap; } .pag-strip-bottom { border-bottom: none; - border-top: 1px solid var(--border-color); + border-top: 1px solid var(--border); } /* ── Per page selector ───────────────────────────── */ @@ -697,29 +843,56 @@ tr.mapping-deleted td { /* ── Mappings flat-rows: always visible ────────────── */ .mappings-flat-list { display: block; } -/* ── Mobile ⋯ dropdown ─────────────────────────── */ +/* ── Mobile more dropdown ─────────────────────────── */ .mobile-more-dropdown { position: relative; display: inline-block; } .mobile-more-dropdown .dropdown-toggle::after { display: none; } /* ── Mobile segmented control (hidden on desktop) ── */ .mobile-seg { display: none; } +/* ── Bottom nav (mobile) ─────────────────────────── */ +.bottom-nav { + position: fixed; + bottom: 0; + left: 0; + right: 0; + height: 56px; + padding-bottom: env(safe-area-inset-bottom); + background: var(--surface); + border-top: 1px solid var(--border); + display: none; /* shown on mobile */ + justify-content: space-around; + align-items: center; + z-index: 1000; +} + +.bottom-nav-item { + display: flex; + flex-direction: column; + align-items: center; + gap: 2px; + text-decoration: none; + color: var(--text-muted); + font-size: 0.625rem; + font-weight: 500; + padding: 4px 0; + min-width: 48px; + min-height: 44px; + justify-content: center; +} +.bottom-nav-item i { font-size: 1.25rem; } +.bottom-nav-item.active { color: var(--accent); } +.bottom-nav-item:hover { color: var(--text-secondary); text-decoration: none; } + /* ── Responsive ──────────────────────────────────── */ @media (max-width: 767.98px) { - .top-navbar { - padding: 0 0.5rem; - gap: 0.5rem; - } - .navbar-brand { - font-size: 0.875rem; - } - .nav-tab { - padding: 0 0.625rem; - font-size: 0.8125rem; - } + .top-navbar { display: none; } + .bottom-nav { display: flex; } .main-content { padding-left: 0.75rem; padding-right: 0.75rem; + padding-bottom: 72px; + padding-top: 8px; } .filter-bar { gap: 0.375rem; @@ -751,20 +924,22 @@ tr.mapping-deleted td { /* Hide per-page selector on mobile */ .per-page-label { display: none; } + + /* Hide dark toggle in navbar on mobile (use settings page instead) */ + .dark-toggle { display: none; } } /* Mobile article cards in order detail modal */ .detail-item-card { - border: 1px solid #e5e7eb; + border: 1px solid var(--border); border-radius: 6px; padding: 0.5rem 0.75rem; margin-bottom: 0.5rem; font-size: 0.875rem; } .detail-item-card .card-sku { - font-family: monospace; font-size: 0.8rem; - color: #6b7280; + color: var(--text-muted); } .detail-item-card .card-name { font-weight: 500; @@ -773,24 +948,41 @@ tr.mapping-deleted td { .detail-item-card .card-details { display: flex; gap: 1rem; - color: #374151; + color: var(--text-secondary); } /* Clickable CODMAT link in order detail modal */ -.codmat-link { color: #0d6efd; cursor: pointer; text-decoration: underline; } -.codmat-link:hover { color: #0a58ca; } +.codmat-link { color: var(--info); cursor: pointer; text-decoration: underline; } +.codmat-link:hover { color: var(--info-hover); } /* Mobile article flat list in order detail modal */ .detail-item-flat { font-size: 0.85rem; } .detail-item-flat .dif-item { } -.detail-item-flat .dif-item:nth-child(even) .dif-row { background: #f7f8fa; } +.detail-item-flat .dif-item:nth-child(even) .dif-row { background: var(--surface-raised); } .detail-item-flat .dif-row { display: flex; align-items: baseline; gap: 0.5rem; padding: 0.2rem 0.75rem; flex-wrap: wrap; } -.dif-sku { font-family: monospace; font-size: 0.78rem; color: #6b7280; } +.dif-sku { font-size: 0.78rem; color: var(--text-muted); } .dif-name { font-weight: 500; flex: 1; } -.dif-qty { white-space: nowrap; color: #6b7280; } +.dif-qty { white-space: nowrap; color: var(--text-muted); } .dif-val { white-space: nowrap; font-weight: 600; } -.dif-codmat-link { color: #0d6efd; cursor: pointer; font-size: 0.78rem; font-family: monospace; } -.dif-codmat-link:hover { color: #0a58ca; text-decoration: underline; } +.dif-codmat-link { color: var(--info); cursor: pointer; font-size: 0.78rem; } +.dif-codmat-link:hover { color: var(--info-hover); text-decoration: underline; } + +/* ── Dark mode form toggle ──────────────────────── */ +.theme-toggle-card { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0.75rem 1rem; + background: var(--surface); + border: 1px solid var(--border); + border-radius: var(--card-radius); + margin-bottom: 1rem; +} +.theme-toggle-card label { + font-weight: 500; + margin: 0; + cursor: pointer; +} diff --git a/api/app/static/js/dashboard.js b/api/app/static/js/dashboard.js index 5e47c61..fee1790 100644 --- a/api/app/static/js/dashboard.js +++ b/api/app/static/js/dashboard.js @@ -119,7 +119,7 @@ function updateSyncPanel(data) { } if (st) { st.textContent = lr.status === 'completed' ? '\u2713' : '\u2715'; - st.style.color = lr.status === 'completed' ? '#10b981' : '#ef4444'; + st.style.color = lr.status === 'completed' ? 'var(--success)' : 'var(--error)'; } } } @@ -342,7 +342,7 @@ async function loadDashOrders() { const totalStr = o.order_total ? Number(o.order_total).toFixed(2) : ''; return `
${statusDot(o.status)} - ${dateFmt} + ${dateFmt} ${esc(name)} x${o.items_count || 0}${totalStr ? ' · ' + totalStr + '' : ''}
`; diff --git a/api/app/static/js/logs.js b/api/app/static/js/logs.js index fd5eaf5..ea65639 100644 --- a/api/app/static/js/logs.js +++ b/api/app/static/js/logs.js @@ -19,9 +19,9 @@ function fmtDuration(startedAt, finishedAt) { function runStatusBadge(status) { switch ((status || '').toLowerCase()) { - case 'completed': return 'completed'; - case 'running': return 'running'; - case 'failed': return 'failed'; + case 'completed': return 'completed'; + case 'running': return 'running'; + case 'failed': return 'failed'; default: return `${esc(status)}`; } } @@ -174,7 +174,7 @@ async function loadRunOrders(runId, statusFilter, page) { const totalStr = o.order_total ? Number(o.order_total).toFixed(2) : ''; return `
${statusDot(o.status)} - ${dateFmt} + ${dateFmt} ${esc(o.customer_name || '—')} x${o.items_count || 0}${totalStr ? ' · ' + totalStr + '' : ''}
`; diff --git a/api/app/static/js/mappings.js b/api/app/static/js/mappings.js index e8b3674..7c6bbde 100644 --- a/api/app/static/js/mappings.js +++ b/api/app/static/js/mappings.js @@ -107,7 +107,7 @@ function renderTable(mappings, showDeleted) { ? ` Kit · ${skuCodmatCount[m.sku]}` : ''; const inactiveStyle = !m.activ && !m.sters ? 'opacity:0.6;' : ''; - html += `
+ html += `
@@ -135,7 +135,7 @@ function renderTable(mappings, showDeleted) { // After last CODMAT of a kit, add total row const isLastOfKit = isKitRow && (i === mappings.length - 1 || mappings[i + 1].sku !== m.sku); if (isLastOfKit) { - html += ``; + html += ``; } prevSku = m.sku; @@ -523,7 +523,7 @@ function showInlineAddRow() { const row = document.createElement('div'); row.id = 'inlineAddRow'; row.className = 'flat-row'; - row.style.background = '#eff6ff'; + row.style.background = 'var(--info-light)'; row.style.gap = '0.5rem'; row.innerHTML = ` diff --git a/api/app/static/js/settings.js b/api/app/static/js/settings.js index 2bdd066..a869fdb 100644 --- a/api/app/static/js/settings.js +++ b/api/app/static/js/settings.js @@ -15,6 +15,15 @@ document.addEventListener('DOMContentLoaded', async () => { }); }); + // Dark mode toggle + const darkToggle = document.getElementById('settDarkMode'); + if (darkToggle) { + darkToggle.checked = document.documentElement.getAttribute('data-theme') === 'dark'; + darkToggle.addEventListener('change', () => { + if (typeof toggleDarkMode === 'function') toggleDarkMode(); + }); + } + // Catalog sync toggle const catChk = document.getElementById('settCatalogSyncEnabled'); if (catChk) catChk.addEventListener('change', () => { @@ -191,14 +200,14 @@ async function saveSettings() { const data = await res.json(); const resultEl = document.getElementById('settSaveResult'); if (data.success) { - if (resultEl) { resultEl.textContent = 'Salvat!'; resultEl.style.color = '#16a34a'; } + if (resultEl) { resultEl.textContent = 'Salvat!'; resultEl.style.color = 'var(--success)'; } setTimeout(() => { if (resultEl) resultEl.textContent = ''; }, 3000); } else { - if (resultEl) { resultEl.textContent = 'Eroare: ' + JSON.stringify(data); resultEl.style.color = '#dc2626'; } + if (resultEl) { resultEl.textContent = 'Eroare: ' + JSON.stringify(data); resultEl.style.color = 'var(--error)'; } } } catch (err) { const resultEl = document.getElementById('settSaveResult'); - if (resultEl) { resultEl.textContent = 'Eroare: ' + err.message; resultEl.style.color = '#dc2626'; } + if (resultEl) { resultEl.textContent = 'Eroare: ' + err.message; resultEl.style.color = 'var(--error)'; } } } diff --git a/api/app/templates/base.html b/api/app/templates/base.html index a20ef89..cf5c08b 100644 --- a/api/app/templates/base.html +++ b/api/app/templates/base.html @@ -1,16 +1,28 @@ - + {% block title %}GoMag Import Manager{% endblock %} + + + + + + {% set rp = request.scope.get('root_path', '') %} - + - + + + + -
+
{% block content %}{% endblock %}
@@ -39,7 +63,7 @@
Produs:
-
+
CODMAT Cant. @@ -116,7 +140,27 @@ - + + {% block scripts %}{% endblock %} diff --git a/api/app/templates/dashboard.html b/api/app/templates/dashboard.html index 570b675..e28e16d 100644 --- a/api/app/templates/dashboard.html +++ b/api/app/templates/dashboard.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Dashboard - GoMag Import{% endblock %} {% block nav_dashboard %}active{% endblock %} +{% block bnav_dashboard %}active{% endblock %} {% block content %}

Panou de Comanda

@@ -112,5 +113,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/api/app/templates/logs.html b/api/app/templates/logs.html index dea03cb..65ba711 100644 --- a/api/app/templates/logs.html +++ b/api/app/templates/logs.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Jurnale Import - GoMag Import{% endblock %} {% block nav_logs %}active{% endblock %} +{% block bnav_logs %}active{% endblock %} {% block content %}

Jurnale Import

@@ -101,5 +102,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/api/app/templates/mappings.html b/api/app/templates/mappings.html index 7fb8b6a..bbfb97a 100644 --- a/api/app/templates/mappings.html +++ b/api/app/templates/mappings.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Mapari SKU - GoMag Import{% endblock %} {% block nav_mappings %}active{% endblock %} +{% block bnav_mappings %}active{% endblock %} {% block content %}
@@ -150,5 +151,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/api/app/templates/missing_skus.html b/api/app/templates/missing_skus.html index 4b8f6bd..7341ebd 100644 --- a/api/app/templates/missing_skus.html +++ b/api/app/templates/missing_skus.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}SKU-uri Lipsa - GoMag Import{% endblock %} {% block nav_missing %}active{% endblock %} +{% block bnav_missing %}active{% endblock %} {% block content %}
diff --git a/api/app/templates/settings.html b/api/app/templates/settings.html index 05f2620..c1a9fb0 100644 --- a/api/app/templates/settings.html +++ b/api/app/templates/settings.html @@ -1,10 +1,23 @@ {% extends "base.html" %} {% block title %}Setari - GoMag Import{% endblock %} {% block nav_settings %}active{% endblock %} +{% block bnav_settings %}active{% endblock %} +{% block main_class %}constrained{% endblock %} {% block content %}

Setari

+ +
+
+ + +
+
+ +
+
+
@@ -233,5 +246,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/api/tests/e2e/test_design_system_e2e.py b/api/tests/e2e/test_design_system_e2e.py new file mode 100644 index 0000000..c27c9dd --- /dev/null +++ b/api/tests/e2e/test_design_system_e2e.py @@ -0,0 +1,105 @@ +""" +E2E tests for DESIGN.md migration (Commit 0.5). +Tests: dark toggle, FOUC prevention, bottom nav, active tab amber, dark contrast. +""" +import pytest + +pytestmark = [pytest.mark.e2e] + + +def test_dark_mode_toggle(page, app_url): + """Dark toggle switches theme and persists in localStorage.""" + page.goto(f"{app_url}/settings") + page.wait_for_load_state("networkidle") + + # Settings page has the dark mode toggle + toggle = page.locator("#settDarkMode") + assert toggle.is_visible() + + # Start in light mode + theme = page.evaluate("document.documentElement.getAttribute('data-theme')") + if theme == "dark": + toggle.click() + page.wait_for_timeout(200) + + # Toggle to dark + toggle.click() + page.wait_for_timeout(200) + assert page.evaluate("document.documentElement.getAttribute('data-theme')") == "dark" + assert page.evaluate("localStorage.getItem('theme')") == "dark" + + # Toggle back to light + toggle.click() + page.wait_for_timeout(200) + assert page.evaluate("document.documentElement.getAttribute('data-theme')") != "dark" + assert page.evaluate("localStorage.getItem('theme')") == "light" + + +def test_fouc_prevention(page, app_url): + """Theme is applied before CSS loads (inline script in ).""" + # Set dark theme in localStorage before navigation + page.goto(f"{app_url}/") + page.evaluate("localStorage.setItem('theme', 'dark')") + + # Navigate fresh — the inline script should apply dark before paint + page.goto(f"{app_url}/") + # Check immediately (before networkidle) that data-theme is set + theme = page.evaluate("document.documentElement.getAttribute('data-theme')") + assert theme == "dark", "FOUC: dark theme not applied before first paint" + + # Cleanup + page.evaluate("localStorage.removeItem('theme')") + + +def test_bottom_nav_visible_on_mobile(page, app_url): + """Bottom nav is visible on mobile viewport, top navbar is hidden.""" + page.set_viewport_size({"width": 375, "height": 812}) + page.goto(f"{app_url}/") + page.wait_for_load_state("networkidle") + + bottom_nav = page.locator(".bottom-nav") + top_navbar = page.locator(".top-navbar") + + assert bottom_nav.is_visible(), "Bottom nav should be visible on mobile" + assert not top_navbar.is_visible(), "Top navbar should be hidden on mobile" + + # Check 5 tabs exist + tabs = page.locator(".bottom-nav-item") + assert tabs.count() == 5 + + +def test_active_tab_amber_accent(page, app_url): + """Active nav tab uses amber accent color, not blue.""" + page.goto(f"{app_url}/") + page.wait_for_load_state("networkidle") + + active_tab = page.locator(".nav-tab.active") + assert active_tab.count() >= 1 + + # Get computed color of active tab + color = page.evaluate(""" + () => getComputedStyle(document.querySelector('.nav-tab.active')).color + """) + # Amber #D97706 = rgb(217, 119, 6) + assert "217" in color and "119" in color, f"Active tab color should be amber, got: {color}" + + +def test_dark_mode_contrast(page, app_url): + """Dark mode has proper contrast — bg is dark, text is light.""" + page.goto(f"{app_url}/") + page.wait_for_load_state("networkidle") + + # Enable dark mode + page.evaluate("document.documentElement.setAttribute('data-theme', 'dark')") + page.wait_for_timeout(100) + + bg = page.evaluate("getComputedStyle(document.body).backgroundColor") + color = page.evaluate("getComputedStyle(document.body).color") + + # bg should be dark (#121212 = rgb(18, 18, 18)) + assert "18" in bg, f"Dark mode bg should be dark, got: {bg}" + # text should be light (#E8E4DD = rgb(232, 228, 221)) + assert "232" in color or "228" in color, f"Dark mode text should be light, got: {color}" + + # Cleanup + page.evaluate("document.documentElement.removeAttribute('data-theme')") diff --git a/api/tests/e2e/test_order_detail.py b/api/tests/e2e/test_order_detail.py index 2bd980b..3dbab25 100644 --- a/api/tests/e2e/test_order_detail.py +++ b/api/tests/e2e/test_order_detail.py @@ -51,5 +51,5 @@ def test_dashboard_navigates_to_logs(page: Page, app_url: str): page.goto(f"{app_url}/") page.wait_for_load_state("networkidle") - logs_link = page.locator("a[href='/logs']") - expect(logs_link).to_be_visible() + logs_link = page.locator(".top-navbar a[href='/logs'], .bottom-nav a[href='/logs']") + expect(logs_link.first).to_be_visible()