Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Bootstrap v5 #1028

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Upgrade to Bootstrap v5 #1028

wants to merge 1 commit into from

Conversation

BenjaminCharmes
Copy link
Contributor

@BenjaminCharmes BenjaminCharmes commented Dec 3, 2024

Closes #32

For now:

  • New <button /> class used to close Modal
  • Replace ml-2 (doesn't exist in Bootstrap v5) by gap-2 (d-flex) for DynamicDataTableButtons (could also use me-2 from bootstrap instead) (Bootstrap left and right replaced by start and end)
  • I had color: black to FormattedItemName because badge light display text in white now
  • Edit every Modal (Item, Batch, Collection, Equipment ...) to stay the same
  • Edit every datablock (and also Bokeh block with querySelector)
  • and more ...

To discuss:

  • Checkbox in Modal
  • Template table in Batch
  • Close button
  • Bokeh plot

To do:

  • Unsaved changes trigger by clicking router-link "Home" in EditPage (❗️❓)
  • Find forgotten components

Also start working on #620:

  • CompactConstituentTable.vue is now responsive.
  • The EditPage and CollectionPage navbar now use a dropdown on small screen
  • DynamicDataTabeButtons also use a dropdown on small screen

Copy link

codecov bot commented Dec 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.04%. Comparing base (cab4149) to head (3c10d26).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1028   +/-   ##
=======================================
  Coverage   70.04%   70.04%           
=======================================
  Files          62       62           
  Lines        3996     3996           
=======================================
  Hits         2799     2799           
  Misses       1197     1197           
Files with missing lines Coverage Δ
pydatalab/src/pydatalab/bokeh_plots.py 82.82% <100.00%> (ø)

Copy link

cypress bot commented Dec 3, 2024

datalab    Run #2910

Run Properties:  status check passed Passed #2910  •  git commit c5b14f5b7d ℹ️: Merge 3c10d2674ed9a31027a3cb989967f368a576ebe7 into cab41498135185953a60a55849f8...
Project datalab
Branch Review bc/update-bootstrap5
Run status status check passed Passed #2910
Run duration 06m 51s
Commit git commit c5b14f5b7d ℹ️: Merge 3c10d2674ed9a31027a3cb989967f368a576ebe7 into cab41498135185953a60a55849f8...
Committer Ben Charmes
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 471
View all changes introduced in this branch ↗︎

@BenjaminCharmes BenjaminCharmes changed the title Update to Bootstrap v5 Ugrade to Bootstrap v5 Dec 4, 2024
@BenjaminCharmes BenjaminCharmes changed the title Ugrade to Bootstrap v5 Upgrade to Bootstrap v5 Dec 4, 2024
@BenjaminCharmes BenjaminCharmes added webapp For issues/PRs pertaining to the web interface dependency_updates For issues/PRs that update the dependencies of the package labels Dec 10, 2024
Update Bootstrap to v5 and update components

Update components with new Bootstrap 5 class

New badge class

Update CreateItemModal with new classes

Update CreateCollectionModal with new classes

Update CreateEquipmentModal with new classes

Update QRScannerModal with new classes

Update CreateEquipmentModal with new classes

Update BatchCreateItemModal with new classes

Update EditAccountSettingsModal and Modal close btn

More updates

More updates

More components updates

More components updates

Update cypress test

Fix cypress e2e editPage

Fix cypress e2e batchSample

Fix modelValue warnings in console

Update for better mobile support

Update CompactConstituentTable for better mobile support

Edit EditPage Navbar to better mobile support

Edit DynamicDataTableButtons to better mobile support

Fix FileList with Bootstrap5

Update CollectionInformation and CollectionPage for better mobile support

Update bokeh_plots to fit on mobile

Fix cypress tests
@ml-evs ml-evs force-pushed the bc/update-bootstrap5 branch from 7a936d1 to 3c10d26 Compare January 27, 2025 22:06
Copy link
Member

@ml-evs ml-evs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've built and played around with the new version and only have a few minor comments of mine (and we can go through yours) -- just a comment below about the deps!

@@ -23,7 +23,8 @@
"@uppy/webcam": "^1.8.4",
"@uppy/xhr-upload": "^1.6.10",
"@vueuse/components": "^10.7.2",
"bootstrap": "^4.5.3",
"boostrap": "^2.0.0",
Copy link
Member

@ml-evs ml-evs Jan 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"boostrap": "^2.0.0",

👁️ think this one needs to be removed! Thankfully this is one where npm have sat on the name to prevent malicious use

@ml-evs ml-evs self-assigned this Feb 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependency_updates For issues/PRs that update the dependencies of the package webapp For issues/PRs pertaining to the web interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update to Bootstrap 5
2 participants