From 781e17909019ad7e2ff82d9c382942a5dfa6d3f6 Mon Sep 17 00:00:00 2001
From: derekc <cooperd12003@msn.com>
Date: Fri, 27 Feb 2026 23:24:39 -0800
Subject: [PATCH] Fix backend deps and apply theme to all Cancel buttons

- Pin bcrypt==3.2.2 to fix passlib bcrypt backend detection error
- Add email-validator==2.2.0 required by Pydantic EmailStr
- Add btn-sm class to Cancel buttons in Admin, Dashboard, Log, Schedule views

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 backend/requirements.txt             | 2 ++
 docker-compose.yml                   | 2 +-
 frontend/src/views/AdminView.vue     | 4 ++--
 frontend/src/views/DashboardView.vue | 2 +-
 frontend/src/views/LogView.vue       | 2 +-
 frontend/src/views/ScheduleView.vue  | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/backend/requirements.txt b/backend/requirements.txt
index 0025d52..d5ceaf6 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -4,6 +4,8 @@ sqlalchemy[asyncio]==2.0.35
 aiomysql==0.2.0
 python-jose[cryptography]==3.3.0
 passlib[bcrypt]==1.7.4
+bcrypt==3.2.2
 pydantic-settings==2.5.2
 alembic==1.13.3
 python-multipart==0.0.12
+email-validator==2.2.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 93b1236..98137f2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,7 @@ services:
     container_name: homeschool_frontend
     restart: unless-stopped
     ports:
-      - "8054:80"
+      - "8057:80"
     depends_on:
       - backend
     networks:
diff --git a/frontend/src/views/AdminView.vue b/frontend/src/views/AdminView.vue
index 06c14fb..7e8f0a2 100644
--- a/frontend/src/views/AdminView.vue
+++ b/frontend/src/views/AdminView.vue
@@ -15,7 +15,7 @@
           <input v-model="newChild.name" placeholder="Name" required />
           <input v-model="newChild.color" type="color" title="Color" />
           <button type="submit" class="btn-primary btn-sm">Save</button>
-          <button type="button" @click="showChildForm = false">Cancel</button>
+          <button type="button" class="btn-sm" @click="showChildForm = false">Cancel</button>
         </form>
 
         <div class="item-list">
@@ -46,7 +46,7 @@
           <input v-model="newSubject.icon" placeholder="Icon (emoji)" maxlength="4" style="width:60px" />
           <input v-model="newSubject.color" type="color" title="Color" />
           <button type="submit" class="btn-primary btn-sm">Save</button>
-          <button type="button" @click="showSubjectForm = false">Cancel</button>
+          <button type="button" class="btn-sm" @click="showSubjectForm = false">Cancel</button>
         </form>
 
         <div class="item-list">
diff --git a/frontend/src/views/DashboardView.vue b/frontend/src/views/DashboardView.vue
index 8c2898d..4005498 100644
--- a/frontend/src/views/DashboardView.vue
+++ b/frontend/src/views/DashboardView.vue
@@ -77,7 +77,7 @@
             </select>
           </div>
           <div class="dialog-actions">
-            <button @click="showStartDialog = false">Cancel</button>
+            <button class="btn-sm" @click="showStartDialog = false">Cancel</button>
             <button class="btn-primary" @click="startSession">Start</button>
           </div>
         </div>
diff --git a/frontend/src/views/LogView.vue b/frontend/src/views/LogView.vue
index 40b7ce5..1231155 100644
--- a/frontend/src/views/LogView.vue
+++ b/frontend/src/views/LogView.vue
@@ -43,7 +43,7 @@
             <textarea v-model="newLog.notes" placeholder="What did they do?" rows="3"></textarea>
           </div>
           <div class="form-actions">
-            <button type="button" @click="showForm = false">Cancel</button>
+            <button type="button" class="btn-sm" @click="showForm = false">Cancel</button>
             <button type="submit" class="btn-primary">Save Log</button>
           </div>
         </form>
diff --git a/frontend/src/views/ScheduleView.vue b/frontend/src/views/ScheduleView.vue
index 2ce422b..032b1cb 100644
--- a/frontend/src/views/ScheduleView.vue
+++ b/frontend/src/views/ScheduleView.vue
@@ -23,7 +23,7 @@
             </select>
           </div>
           <div class="form-actions">
-            <button type="button" @click="showCreateForm = false">Cancel</button>
+            <button type="button" class="btn-sm" @click="showCreateForm = false">Cancel</button>
             <button type="submit" class="btn-primary">Create</button>
           </div>
         </form>