Skip to content

Commit

Permalink
Remove Bootstrap3 (#1123)
Browse files Browse the repository at this point in the history
## 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
- [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]>
  • Loading branch information
3 people committed Sep 9, 2024
1 parent d68c5d8 commit 8b12b4b
Show file tree
Hide file tree
Showing 89 changed files with 3 additions and 11,248 deletions.
12 changes: 2 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build_with_version: create_empty_secret
docker compose build --build-arg MAKE_PYTHON_VERSION=$(PYTHON_VERSION)

.PHONY: test_with_version
test_with_version: build_with_version assets
test_with_version: build_with_version
touch OpenOversight/tests/coverage.xml
docker compose run --rm web-test pytest --cov=OpenOversight --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/

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

.PHONY: assets
assets:
docker compose run --rm web yarn build

.PHONY: dev
dev: create_empty_secret build start create_db populate

Expand Down Expand Up @@ -62,18 +58,14 @@ test: start
lint:
pre-commit run --all-files

.PHONY: clean_assets
clean_assets:
rm -rf ./OpenOversight/app/static/dist/

# Stop containers
.PHONY: stop
stop:
docker compose stop

# Remove containers
.PHONY: clean
clean: clean_assets stop
clean: stop
docker compose rm -f

# Wipe database
Expand Down
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 8b12b4b

Please sign in to comment.