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

Remove Bootstrap3 #1123

Merged
merged 10 commits into from
Sep 9, 2024
Merged

Remove Bootstrap3 #1123

merged 10 commits into from
Sep 9, 2024

Conversation

b-meson
Copy link
Member

@b-meson b-meson commented Sep 5, 2024

Fixes issue

Migrates off bootstrap3 and into bootstrap5. Thank you @psjalltheway !!!

Description of Changes

Removes deprecated files which are causing conflicts for the new HTML/CSS which will come in a separate PR.

Notes for Deployment

Screenshots (if appropriate)

Tests and Linting

  • This branch is up-to-date with the develop branch.
  • pytest passes on my local development environment.
  • pre-commit passes on my local development environment.

@sea-kelp sea-kelp self-requested a review September 6, 2024 04:14
Copy link
Collaborator

@sea-kelp sea-kelp left a comment

Choose a reason for hiding this comment

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

I had to remove the node.js/sass build logic since the index.scss file is no longer used. Looks good to me!

@@ -31,10 +31,6 @@ create_db: start
## Creating database
docker compose run --rm web alembic --config=./OpenOversight/migrations/alembic.ini stamp head

.PHONY: assets
Copy link
Collaborator

Choose a reason for hiding this comment

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

🥳 🥳 🥳 🥳

Comment on lines -15 to -18
# install node
ENV NODE_SETUP_SHA=5d07994f59e3edc2904c547e772b818d10abb066f6ff36ab3db5d686b0fe9a73
RUN curl ${CURL_FLAGS} \
https://raw.githubusercontent.com/nodesource/distributions/b8510857fb4ce4b023161be8490b00119884974c/deb/setup_12.x
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm so happy to see this removed.

@michplunkett michplunkett changed the title Bootstrap3 deprecation Remove Bootstrap3 Sep 7, 2024
@michplunkett michplunkett linked an issue Sep 7, 2024 that may be closed by this pull request
Copy link
Collaborator

@michplunkett michplunkett left a comment

Choose a reason for hiding this comment

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

This is great! The only thing I'd want to make sure is that we have people available to roll it back should we need to when we push to production.

@michplunkett michplunkett merged commit 8b12b4b into develop Sep 9, 2024
3 checks passed
@michplunkett michplunkett deleted the bootstrap3-deprecation branch September 9, 2024 03:59
sea-kelp added a commit to OrcaCollective/OpenOversight that referenced this pull request Sep 9, 2024
Migrates off bootstrap3 and into bootstrap5. Thank you @psjalltheway !!!

Removes deprecated files which are causing conflicts for the new
HTML/CSS which will come in a separate PR.

- [x] This branch is up-to-date with the `develop` branch.
- [x] `pytest` passes on my local development environment.
- [x] `pre-commit` passes on my local development environment.

---------

Co-authored-by: psjalltheway <[email protected]>
Co-authored-by: sea-kelp <[email protected]>
AetherUnbound pushed a commit to OrcaCollective/OpenOversight that referenced this pull request Oct 28, 2024
Migrates off bootstrap3 and into bootstrap5. Thank you @psjalltheway !!!

Removes deprecated files which are causing conflicts for the new
HTML/CSS which will come in a separate PR.

- [x] This branch is up-to-date with the `develop` branch.
- [x] `pytest` passes on my local development environment.
- [x] `pre-commit` passes on my local development environment.

---------

Co-authored-by: Freddy Martinez <[email protected]>
Co-authored-by: psjalltheway <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update node.js install in docker build
4 participants