diff --git a/home/doris-barbell/app/static/app.css b/home/doris-barbell/app/static/app.css index 1b5eb69..7d4c3ad 100644 --- a/home/doris-barbell/app/static/app.css +++ b/home/doris-barbell/app/static/app.css @@ -413,6 +413,79 @@ button:focus, input:focus, select:focus, textarea:focus { outline: 2px solid rgb padding: 14px; } +.compact-casefile-header { + padding-bottom: 0.35rem; +} + +.compact-title-row { + display: grid; + grid-template-columns: minmax(0, 1fr) minmax(220px, 300px); + gap: 16px; +} + +.compact-hot-fuzz-art { + min-width: 0; +} + +.compact-hero-mark { + max-width: 300px; + margin-left: auto; +} + +.compact-page-shell { + padding-bottom: 1.5rem; +} + +.compact-panel { + padding: 1rem; +} + +.compact-stat-grid { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 0.85rem; + margin-bottom: 0.9rem; +} + +.stat-slab { + display: grid; + gap: 0.3rem; +} + +.stat-label, +.section-label { + color: var(--hf-amber); + text-transform: uppercase; + letter-spacing: 0.12em; + font-size: 0.72rem; +} + +.metric-value-sm { + font-size: 1.5rem; +} + +.compact-summary-list { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(130px, 1fr)); + gap: 0.65rem; +} + +.compact-summary-list li { + margin: 0; + padding: 0.7rem 0.8rem; + border: 1px solid rgba(255, 255, 255, 0.08); + border-radius: 14px; + background: rgba(255, 255, 255, 0.03); +} + +.compact-summary-list li + li { + margin-top: 0; +} + +.compact-history-block h3 { + margin-bottom: 0.65rem; +} + @media (max-width: 700px) { .page-header, .page-shell { @@ -431,6 +504,18 @@ button:focus, input:focus, select:focus, textarea:focus { outline: 2px solid rgb flex-basis: 100%; min-width: 0; } + + .compact-title-row { + grid-template-columns: 1fr; + } + + .compact-hero-mark { + margin-left: 0; + } + + .compact-stat-grid { + grid-template-columns: 1fr; + } } .doris-family-shell .case-nav { diff --git a/home/doris-barbell/app/templates/base.html b/home/doris-barbell/app/templates/base.html index d80277e..72f7937 100644 --- a/home/doris-barbell/app/templates/base.html +++ b/home/doris-barbell/app/templates/base.html @@ -4,11 +4,11 @@ {{ title or 'Doris Barbell' }} - + -
+
@@ -24,80 +24,41 @@ Schoolhouse
-
-
+
+

Station training desk

Training Dossier

Doris Barbell

-

Reps, weight, BMI, and body metrics now look like a proper performance dossier instead of generic gym CRUD.

+

Log lifts, body weight, and routines.

For the Greater Good - Evidence locker: reps - Case type: Training Dossier
-
- -
-
-
- Station drill board - Cadet fitness -
- - - - - - - - - RPE - PACE - PLATE - -
    -
  • Clipboard-style slips, radio cues, and drill-board labels make the page read like a police training dossier instead of generic fitness software.
    • -
  • The photo still remains for texture, but the authored graphics now carry the theme.
    • -
-
-
- Sepia-toned training photo with dumbbells, weight plates, and a handwritten workout clipboard. -
Training still · source logged in docs
-
-
+
-
-
-
-
-

Singular front door

-

Doris family directory

-
- Casefile directory -
-

One shell, separate runtimes. Training reports live here, but the rest of the Doris family is one jump away.

-
- - Current desk - Doris Barbell - Body metrics, routines, workouts, and progression dossiers. - - - Operator portal - Doris Dashboard - Canonical front door for the whole Doris family. - - - Switchboard - Services Directory - Dense launch wall for the wider homelab stack. - - - Pantry desk - Doris Kitchen - Recipe leads, repair queue, and planning board. - - - Records desk - Doris Schoolhouse - Assignments, recordings, and school intake packets. - -
-
+
{% block content %}{% endblock %}
diff --git a/home/doris-barbell/app/templates/dashboard.html b/home/doris-barbell/app/templates/dashboard.html index df13508..cc28875 100644 --- a/home/doris-barbell/app/templates/dashboard.html +++ b/home/doris-barbell/app/templates/dashboard.html @@ -1,51 +1,66 @@ {% extends 'base.html' %} {% block content %} -
-
+
+
Training floor board - Training Dossier + John

Current body metrics

-
- {% for user in summary.users %} -
-

{{ user.display_name }} {% if user.is_stub %}stub{% endif %}

+ {% for user in summary.users if user.id == 'john' %} +
+
+ Weight

{{ user.current_weight_lbs if user.current_weight_lbs is not none else '—' }}{% if user.current_weight_lbs is not none %} lb{% endif %}

-

BMI: {{ '%.1f'|format(user.current_bmi) if user.current_bmi is not none else 'Not set yet' }}

-

System: {{ user.measurement_system }}

- {% if user.latest_measurements %} -

- Waist {{ user.latest_measurements.waist_inches or '—' }} in · - Hips {{ user.latest_measurements.hip_inches or '—' }} in · - Chest {{ user.latest_measurements.chest_inches or '—' }} in · - Neck {{ user.latest_measurements.neck_inches or '—' }} in -

- {% else %} -

No body measurements logged yet.

- {% endif %}
- {% endfor %} +
+ BMI +

{{ '%.1f'|format(user.current_bmi) if user.current_bmi is not none else '—' }}

+
+ {% if user.latest_measurements %} +
    +
  • Waist {{ user.latest_measurements.waist_inches or '—' }} in
    • +
  • Chest {{ user.latest_measurements.chest_inches or '—' }} in
    • +
  • Hips {{ user.latest_measurements.hip_inches or '—' }} in
    • +
  • Neck {{ user.latest_measurements.neck_inches or '—' }} in
    • +
+ {% else %} +

No body measurements logged yet.

+ {% endif %} + {% endfor %}
-
+
- Case priorities - Operator notes + Current split + Routine board
-

V1 focus

-
    -
  • Structured workout logging with routines and exercises.
    • -
  • Body-weight, BMI, waist/hip/chest/neck history in imperial units.
    • -
  • Recent workouts, volume trends, and simple PR tracking.
    • +

    Current routine board

    +
      +
    • Routines: {{ summary.counts.routines }}
      • +
    • Exercise templates: {{ summary.counts.exercise_templates }}
      • +
    • Workout sessions: {{ summary.counts.workout_sessions }}
    + {% if summary.routines %} +
    +
      + {% for routine in summary.routines %} +
    • + {{ routine.name }} +

      {{ routine.exercises|length }} exercises

      +

      Open log sheet

      +
      • + {% endfor %} +
    +
    + {% endif %}
-
+
Intake docketWeight log

Log weight

@@ -74,7 +89,7 @@
-
+
Intake docketMeasurements

Log body measurements

@@ -104,109 +119,8 @@
-
-
-
Exercise libraryTemplate intake
-

Add exercise template

- - -
- - -
- - - -
- -
-
Routine intakeDraft split
-

Build routine draft

-
- - - -

Format: exercise | target sets | target reps | optional notes

- - -
-
-
-
-
-
Workout reportQuick log
-

Quick log workout

-
- - - - -

Format: exercise | reps@weight, reps@weight | optional notes

- - -
-
- -
-
Current splitRoutine board
-

Current routine board

-

John's current five-day split is now loaded as the default routine library with a default prescription of 3 sets of 10 reps. Weights are still TBD.

-
    -
  • Exercise templates: {{ summary.counts.exercise_templates }}
    • -
  • Routines: {{ summary.counts.routines }}
    • -
- {% if summary.routines %} -
-

Loaded routine days

-
    - {% for routine in summary.routines %} -
  • - {{ routine.name }} -

    {{ routine.exercises|length }} exercises{% if routine.notes %} · {{ routine.notes }}{% endif %}

    -

    Open log sheet

    -
    • - {% endfor %} -
-
- {% endif %} - {% if summary.exercise_templates %} -
-

Template snapshot

-
    - {% for template in summary.exercise_templates %} -
  • {{ template.name }}{% if template.equipment %} · {{ template.equipment }}{% endif %}
    • - {% endfor %} -
-
- {% endif %} -
-
- -
-
+
Recent logsSession reports

Recent workouts

{% if john_workout_history %} @@ -223,50 +137,7 @@ {% endif %}
-
-
History snapshotJohn file
-

John history snapshot

-
-

Recent weights

- {% if john_weight_history %} -
    - {% for entry in john_weight_history %} -
  • {{ entry.recorded_at }} · {{ entry.weight_lbs }} lb{% if entry.bmi is not none %} · BMI {{ '%.1f'|format(entry.bmi) }}{% endif %}
    • - {% endfor %} -
- {% else %} -

No weight entries yet.

- {% endif %} -
-
-

Recent measurements

- {% if john_measurement_history %} -
    - {% for entry in john_measurement_history %} -
  • {{ entry.recorded_at }} · Waist {{ entry.waist_inches or '—' }} · Chest {{ entry.chest_inches or '—' }} · Hips {{ entry.hip_inches or '—' }} · Neck {{ entry.neck_inches or '—' }}
    • - {% endfor %} -
- {% else %} -

No measurement entries yet.

- {% endif %} -
-
-
- -
-
-
Current countsInventory
-

Current counts

-
    -
  • Workout sessions: {{ summary.counts.workout_sessions }}
    • -
  • Weight entries: {{ summary.counts.weight_entries }}
    • -
  • Measurement entries: {{ summary.counts.measurement_entries }}
    • -
  • Exercise templates: {{ summary.counts.exercise_templates }}
    • -
  • Routines: {{ summary.counts.routines }}
    • -
-
- -
+
Exercise bestsPR board

Exercise bests

{% if john_progression %} @@ -285,14 +156,108 @@
-
-
Next likely buildOpen casework
-

Next likely build

-
    -
  • Replace placeholder routines with John’s real day-by-day program tomorrow.
    • -
  • Routine-specific workout entry flow driven directly from the saved split.
    • -
  • Exercise progression and PR views.
    • -
+
+
Library toolsTemplates
+

Add exercise template

+
+ +
+ + +
+ + +
+ {% if summary.exercise_templates %} +
+

Template snapshot

+
    + {% for template in summary.exercise_templates %} +
  • {{ template.name }}{% if template.equipment %} · {{ template.equipment }}{% endif %}
    • + {% endfor %} +
+
+ {% endif %} +
+ +
+
Workout reportQuick log
+

Quick log workout

+
+ + + + +

Format: exercise | reps@weight, reps@weight | optional notes

+ + +
+
+
+ +
+
+
Routine toolsDraft split
+

Build routine draft

+
+ + + +

Format: exercise | target sets | target reps | optional notes

+ + +
+
+ +
+
History snapshotJohn file
+

Recent body history

+
+

Recent weights

+ {% if john_weight_history %} +
    + {% for entry in john_weight_history %} +
  • {{ entry.recorded_at }} · {{ entry.weight_lbs }} lb{% if entry.bmi is not none %} · BMI {{ '%.1f'|format(entry.bmi) }}{% endif %}
    • + {% endfor %} +
+ {% else %} +

No weight entries yet.

+ {% endif %} +
+
+

Recent measurements

+ {% if john_measurement_history %} +
    + {% for entry in john_measurement_history %} +
  • {{ entry.recorded_at }} · Waist {{ entry.waist_inches or '—' }} · Chest {{ entry.chest_inches or '—' }} · Hips {{ entry.hip_inches or '—' }} · Neck {{ entry.neck_inches or '—' }}
    • + {% endfor %} +
+ {% else %} +

No measurement entries yet.

+ {% endif %} +
{% endblock %} diff --git a/home/doris-barbell/tests/test_app.py b/home/doris-barbell/tests/test_app.py index 08d31c1..b21dedd 100644 --- a/home/doris-barbell/tests/test_app.py +++ b/home/doris-barbell/tests/test_app.py @@ -379,12 +379,16 @@ def test_homepage_renders_core_sections_and_forms(tmp_path: Path) -> None: assert response.status_code == 200 body = response.text assert 'Doris Barbell' in body + assert 'Log lifts, body weight, and routines.' in body assert 'Recent workouts' in body assert 'Current body metrics' in body assert 'Log weight' in body assert 'Add exercise template' in body assert 'Current routine board' in body assert 'Monday: Chest' in body + assert 'Doris family directory' not in body + assert 'V1 focus' not in body + assert 'Next likely build' not in body def test_seeded_routine_can_render_prefilled_log_sheet(tmp_path: Path) -> None: