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.

Sign up for GitHub

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

Jump to bottom

Update frontend build path to be more descriptive #934

Merged
merged 6 commits into from
Jul 25, 2022
Merged

Update frontend build path to be more descriptive #934

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
88a1e03
Update frontend build path to be more descriptive
allisonking Jul 21, 2022
c639c48
Update changelog
allisonking Jul 21, 2022
894b61b
Update dockerignore
allisonking Jul 22, 2022
d1b3bfd
Merge branch 'main' into aking-frontend-build-path
allisonking Jul 22, 2022
e9cc277
Update dockerfile reference paths
allisonking Jul 22, 2022
1f53331
Merge branch 'main' into aking-frontend-build-path
allisonking Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
build/
dist/
src/fidesctl.egg-info/
src/ui-build/

# Ignore Python-Specific Files
.mypy_cache/
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
fidesctl/api/src/main/resources/application.conf
docs/fides/docs/api/openapi.json
docs/fides/docs/schemas/config_schema.json
fidesctl/api/build/static
ui-build/

## generic files to ignore
*~
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ The types of changes are:
* Update `fideslang` to `1.1.0`, simplifying the default taxonomy and adding `tags` for resources [#865](https://github.com/ethyca/fides/pull/865)
* Remove the `obscure` requirement from the `generate` endpoint [#819](https://github.com/ethyca/fides/pull/819)
* Merge existing configurations with `fideslib` library [#913](https://github.com/ethyca/fides/pull/913)
* Moved frontend static files to `src/ui-build/static` [#934](https://github.com/ethyca/fides/pull/934)

### Developer Experience

Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"analyze:server": "cross-env BUNDLE_ANALYZE=server next build",
"analyze:browser": "cross-env BUNDLE_ANALYZE=browser next build",
"export": "next build && next export",
"copy-export": "rsync -a --delete out/ ../../src/fidesctl/api/build/static/",
"copy-export": "rsync -a --delete out/ ../../src/ui-build/static/admin/",
"prod-export": "npm run export && npm run copy-export",
"cy:open": "cypress open",
"cy:run": "cypress run",
Expand Down
3 changes: 2 additions & 1 deletion src/fidesctl/api/routes/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
from fidesctl.api.utils.api_router import APIRouter

API_PREFIX = "/api/v1"
WEBAPP_DIRECTORY = Path("src/fidesctl/api/build/static")
FRONTEND_BUILD_DIRECTORY = Path("src/ui-build/static")
WEBAPP_DIRECTORY = FRONTEND_BUILD_DIRECTORY / "admin"
WEBAPP_INDEX = WEBAPP_DIRECTORY / "index.html"


Expand Down