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>
This commit is contained in:
@@ -4,6 +4,8 @@ sqlalchemy[asyncio]==2.0.35
|
|||||||
aiomysql==0.2.0
|
aiomysql==0.2.0
|
||||||
python-jose[cryptography]==3.3.0
|
python-jose[cryptography]==3.3.0
|
||||||
passlib[bcrypt]==1.7.4
|
passlib[bcrypt]==1.7.4
|
||||||
|
bcrypt==3.2.2
|
||||||
pydantic-settings==2.5.2
|
pydantic-settings==2.5.2
|
||||||
alembic==1.13.3
|
alembic==1.13.3
|
||||||
python-multipart==0.0.12
|
python-multipart==0.0.12
|
||||||
|
email-validator==2.2.0
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ services:
|
|||||||
container_name: homeschool_frontend
|
container_name: homeschool_frontend
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "8054:80"
|
- "8057:80"
|
||||||
depends_on:
|
depends_on:
|
||||||
- backend
|
- backend
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
<input v-model="newChild.name" placeholder="Name" required />
|
<input v-model="newChild.name" placeholder="Name" required />
|
||||||
<input v-model="newChild.color" type="color" title="Color" />
|
<input v-model="newChild.color" type="color" title="Color" />
|
||||||
<button type="submit" class="btn-primary btn-sm">Save</button>
|
<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>
|
</form>
|
||||||
|
|
||||||
<div class="item-list">
|
<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.icon" placeholder="Icon (emoji)" maxlength="4" style="width:60px" />
|
||||||
<input v-model="newSubject.color" type="color" title="Color" />
|
<input v-model="newSubject.color" type="color" title="Color" />
|
||||||
<button type="submit" class="btn-primary btn-sm">Save</button>
|
<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>
|
</form>
|
||||||
|
|
||||||
<div class="item-list">
|
<div class="item-list">
|
||||||
|
|||||||
@@ -77,7 +77,7 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="dialog-actions">
|
<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>
|
<button class="btn-primary" @click="startSession">Start</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
<textarea v-model="newLog.notes" placeholder="What did they do?" rows="3"></textarea>
|
<textarea v-model="newLog.notes" placeholder="What did they do?" rows="3"></textarea>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-actions">
|
<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>
|
<button type="submit" class="btn-primary">Save Log</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-actions">
|
<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>
|
<button type="submit" class="btn-primary">Create</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
Reference in New Issue
Block a user