diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index adcf4706e0..02f691fb0d 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -9,7 +9,7 @@ updates: - python - dependabot - package-ecosystem: npm - directory: "/clients/ops/admin-ui" + directory: "/clients/admin-ui" schedule: interval: weekly labels: @@ -17,7 +17,7 @@ updates: - javascript - dependabot - package-ecosystem: npm - directory: "/clients/ops/privacy-center" + directory: "/clients/privacy-center" schedule: interval: weekly labels: diff --git a/.github/workflows/frontend_checks.yml b/.github/workflows/frontend_checks.yml index 8211cdc315..725a587ece 100644 --- a/.github/workflows/frontend_checks.yml +++ b/.github/workflows/frontend_checks.yml @@ -77,7 +77,7 @@ jobs: node-version: [16.x] defaults: run: - working-directory: clients/ops/privacy-center + working-directory: clients/privacy-center steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/publish_privacy_center_to_dockerhub.yaml b/.github/workflows/publish_privacy_center_to_dockerhub.yaml index 2f05912dfb..51fdc9cf34 100644 --- a/.github/workflows/publish_privacy_center_to_dockerhub.yaml +++ b/.github/workflows/publish_privacy_center_to_dockerhub.yaml @@ -30,7 +30,7 @@ jobs: - name: Build and publish uses: docker/build-push-action@v3 with: - context: ./clients/ops/privacy-center + context: ./clients/privacy-center push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.metadata.outputs.labels }} diff --git a/.vscode/launch.json b/.vscode/launch.json index 4d9109b9d8..d47906f142 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,7 @@ "request": "launch", "type": "chrome", "url": "http://localhost:3000", - "webRoot": "${workspaceFolder}/clients/ops/admin-ui" + "webRoot": "${workspaceFolder}/clients/admin-ui" }, { "name": "Attach to Chrome", @@ -17,7 +17,7 @@ "request": "attach", "type": "chrome", "urlFilter": "http://localhost:3000/*", // use urlFilter instead of url! - "webRoot": "${workspaceFolder}/clients/ops/admin-ui" + "webRoot": "${workspaceFolder}/clients/admin-ui" } ] } diff --git a/clients/admin-ui/README.md b/clients/admin-ui/README.md index d1e70d6820..125be2b5df 100644 --- a/clients/admin-ui/README.md +++ b/clients/admin-ui/README.md @@ -5,7 +5,7 @@ Admin UI for managing Fides privacy requests. A web application built in Next.js ## Running Locally 1. Run `nox -s create_user` and follow prompts to create a user. Note that password requires 8 or more characters, upper and lowercase chars, a number, and a symbol. -2. In a new shell, `cd` into `clients/ops/admin-ui`, then run `npm run dev`. +2. In a new shell, `cd` into `clients/admin-ui`, then run `npm run dev`. 3. Nav to `http://localhost:3000/` and logged in using created user. The `email` field is simply the `user` that was created, not a valid email address. ## Testing Entire Request Flow diff --git a/clients/admin-ui/src/features/user-management/form/inputs.tsx b/clients/admin-ui/src/features/user-management/form/inputs.tsx index e1bfd484f1..ef6af3762e 100644 --- a/clients/admin-ui/src/features/user-management/form/inputs.tsx +++ b/clients/admin-ui/src/features/user-management/form/inputs.tsx @@ -1,4 +1,4 @@ -// Adapted from https://github.com/ethyca/fides/blob/main/clients/ops/admin-ui/src/features/common/form/inputs.tsx +// Adapted from https://github.com/ethyca/fides/blob/main/clients/admin-ui/src/features/common/form/inputs.tsx // Should in the future consider pulling this into fidesui import { diff --git a/clients/ops/privacy-center/.babelrc b/clients/privacy-center/.babelrc similarity index 100% rename from clients/ops/privacy-center/.babelrc rename to clients/privacy-center/.babelrc diff --git a/clients/ops/privacy-center/.dockerignore b/clients/privacy-center/.dockerignore similarity index 100% rename from clients/ops/privacy-center/.dockerignore rename to clients/privacy-center/.dockerignore diff --git a/clients/ops/privacy-center/.eslintignore b/clients/privacy-center/.eslintignore similarity index 100% rename from clients/ops/privacy-center/.eslintignore rename to clients/privacy-center/.eslintignore diff --git a/clients/ops/privacy-center/.eslintrc.json b/clients/privacy-center/.eslintrc.json similarity index 100% rename from clients/ops/privacy-center/.eslintrc.json rename to clients/privacy-center/.eslintrc.json diff --git a/clients/ops/privacy-center/.gitignore b/clients/privacy-center/.gitignore similarity index 100% rename from clients/ops/privacy-center/.gitignore rename to clients/privacy-center/.gitignore diff --git a/clients/ops/privacy-center/.prettierignore b/clients/privacy-center/.prettierignore similarity index 100% rename from clients/ops/privacy-center/.prettierignore rename to clients/privacy-center/.prettierignore diff --git a/clients/ops/privacy-center/.prettierrc.json b/clients/privacy-center/.prettierrc.json similarity index 100% rename from clients/ops/privacy-center/.prettierrc.json rename to clients/privacy-center/.prettierrc.json diff --git a/clients/ops/privacy-center/Dockerfile b/clients/privacy-center/Dockerfile similarity index 100% rename from clients/ops/privacy-center/Dockerfile rename to clients/privacy-center/Dockerfile diff --git a/clients/ops/privacy-center/LICENSE b/clients/privacy-center/LICENSE similarity index 100% rename from clients/ops/privacy-center/LICENSE rename to clients/privacy-center/LICENSE diff --git a/clients/ops/privacy-center/README.md b/clients/privacy-center/README.md similarity index 100% rename from clients/ops/privacy-center/README.md rename to clients/privacy-center/README.md diff --git a/clients/ops/privacy-center/__tests__/RequestModal.test.tsx b/clients/privacy-center/__tests__/RequestModal.test.tsx similarity index 100% rename from clients/ops/privacy-center/__tests__/RequestModal.test.tsx rename to clients/privacy-center/__tests__/RequestModal.test.tsx diff --git a/clients/ops/privacy-center/__tests__/index.test.tsx b/clients/privacy-center/__tests__/index.test.tsx similarity index 100% rename from clients/ops/privacy-center/__tests__/index.test.tsx rename to clients/privacy-center/__tests__/index.test.tsx diff --git a/clients/ops/privacy-center/__tests__/jest.setup.ts b/clients/privacy-center/__tests__/jest.setup.ts similarity index 100% rename from clients/ops/privacy-center/__tests__/jest.setup.ts rename to clients/privacy-center/__tests__/jest.setup.ts diff --git a/clients/ops/privacy-center/common/CommonHeaders.ts b/clients/privacy-center/common/CommonHeaders.ts similarity index 100% rename from clients/ops/privacy-center/common/CommonHeaders.ts rename to clients/privacy-center/common/CommonHeaders.ts diff --git a/clients/ops/privacy-center/common/hooks/index.ts b/clients/privacy-center/common/hooks/index.ts similarity index 100% rename from clients/ops/privacy-center/common/hooks/index.ts rename to clients/privacy-center/common/hooks/index.ts diff --git a/clients/ops/privacy-center/common/hooks/useLocalStorage.ts b/clients/privacy-center/common/hooks/useLocalStorage.ts similarity index 100% rename from clients/ops/privacy-center/common/hooks/useLocalStorage.ts rename to clients/privacy-center/common/hooks/useLocalStorage.ts diff --git a/clients/ops/privacy-center/components/Card.tsx b/clients/privacy-center/components/Card.tsx similarity index 100% rename from clients/ops/privacy-center/components/Card.tsx rename to clients/privacy-center/components/Card.tsx diff --git a/clients/ops/privacy-center/components/ConsentCard.tsx b/clients/privacy-center/components/ConsentCard.tsx similarity index 100% rename from clients/ops/privacy-center/components/ConsentCard.tsx rename to clients/privacy-center/components/ConsentCard.tsx diff --git a/clients/ops/privacy-center/components/ConsentItemCard.tsx b/clients/privacy-center/components/ConsentItemCard.tsx similarity index 100% rename from clients/ops/privacy-center/components/ConsentItemCard.tsx rename to clients/privacy-center/components/ConsentItemCard.tsx diff --git a/clients/ops/privacy-center/components/PrivacyCard.tsx b/clients/privacy-center/components/PrivacyCard.tsx similarity index 100% rename from clients/ops/privacy-center/components/PrivacyCard.tsx rename to clients/privacy-center/components/PrivacyCard.tsx diff --git a/clients/ops/privacy-center/components/modals/PrivacyRequestForm.tsx b/clients/privacy-center/components/modals/PrivacyRequestForm.tsx similarity index 100% rename from clients/ops/privacy-center/components/modals/PrivacyRequestForm.tsx rename to clients/privacy-center/components/modals/PrivacyRequestForm.tsx diff --git a/clients/ops/privacy-center/components/modals/RequestModal.tsx b/clients/privacy-center/components/modals/RequestModal.tsx similarity index 100% rename from clients/ops/privacy-center/components/modals/RequestModal.tsx rename to clients/privacy-center/components/modals/RequestModal.tsx diff --git a/clients/ops/privacy-center/components/modals/RequestSubmitted.tsx b/clients/privacy-center/components/modals/RequestSubmitted.tsx similarity index 100% rename from clients/ops/privacy-center/components/modals/RequestSubmitted.tsx rename to clients/privacy-center/components/modals/RequestSubmitted.tsx diff --git a/clients/ops/privacy-center/components/modals/VerificationForm.tsx b/clients/privacy-center/components/modals/VerificationForm.tsx similarity index 100% rename from clients/ops/privacy-center/components/modals/VerificationForm.tsx rename to clients/privacy-center/components/modals/VerificationForm.tsx diff --git a/clients/ops/privacy-center/components/modals/consent-request-modal/ConsentRequestForm.tsx b/clients/privacy-center/components/modals/consent-request-modal/ConsentRequestForm.tsx similarity index 100% rename from clients/ops/privacy-center/components/modals/consent-request-modal/ConsentRequestForm.tsx rename to clients/privacy-center/components/modals/consent-request-modal/ConsentRequestForm.tsx diff --git a/clients/ops/privacy-center/components/modals/consent-request-modal/ConsentRequestModal.tsx b/clients/privacy-center/components/modals/consent-request-modal/ConsentRequestModal.tsx similarity index 100% rename from clients/ops/privacy-center/components/modals/consent-request-modal/ConsentRequestModal.tsx rename to clients/privacy-center/components/modals/consent-request-modal/ConsentRequestModal.tsx diff --git a/clients/ops/privacy-center/components/modals/privacy-request-modal/PrivacyRequestForm.tsx b/clients/privacy-center/components/modals/privacy-request-modal/PrivacyRequestForm.tsx similarity index 100% rename from clients/ops/privacy-center/components/modals/privacy-request-modal/PrivacyRequestForm.tsx rename to clients/privacy-center/components/modals/privacy-request-modal/PrivacyRequestForm.tsx diff --git a/clients/ops/privacy-center/components/modals/privacy-request-modal/PrivacyRequestModal.tsx b/clients/privacy-center/components/modals/privacy-request-modal/PrivacyRequestModal.tsx similarity index 100% rename from clients/ops/privacy-center/components/modals/privacy-request-modal/PrivacyRequestModal.tsx rename to clients/privacy-center/components/modals/privacy-request-modal/PrivacyRequestModal.tsx diff --git a/clients/ops/privacy-center/components/modals/privacy-request-modal/RequestSubmitted.tsx b/clients/privacy-center/components/modals/privacy-request-modal/RequestSubmitted.tsx similarity index 100% rename from clients/ops/privacy-center/components/modals/privacy-request-modal/RequestSubmitted.tsx rename to clients/privacy-center/components/modals/privacy-request-modal/RequestSubmitted.tsx diff --git a/clients/ops/privacy-center/components/modals/types.ts b/clients/privacy-center/components/modals/types.ts similarity index 100% rename from clients/ops/privacy-center/components/modals/types.ts rename to clients/privacy-center/components/modals/types.ts diff --git a/clients/ops/privacy-center/config/__mocks__/config.json b/clients/privacy-center/config/__mocks__/config.json similarity index 100% rename from clients/ops/privacy-center/config/__mocks__/config.json rename to clients/privacy-center/config/__mocks__/config.json diff --git a/clients/ops/privacy-center/config/config.css b/clients/privacy-center/config/config.css similarity index 100% rename from clients/ops/privacy-center/config/config.css rename to clients/privacy-center/config/config.css diff --git a/clients/ops/privacy-center/config/config.json b/clients/privacy-center/config/config.json similarity index 100% rename from clients/ops/privacy-center/config/config.json rename to clients/privacy-center/config/config.json diff --git a/clients/ops/privacy-center/constants/index.ts b/clients/privacy-center/constants/index.ts similarity index 100% rename from clients/ops/privacy-center/constants/index.ts rename to clients/privacy-center/constants/index.ts diff --git a/clients/ops/privacy-center/jest.config.js b/clients/privacy-center/jest.config.js similarity index 100% rename from clients/ops/privacy-center/jest.config.js rename to clients/privacy-center/jest.config.js diff --git a/clients/ops/privacy-center/next-env.d.ts b/clients/privacy-center/next-env.d.ts similarity index 100% rename from clients/ops/privacy-center/next-env.d.ts rename to clients/privacy-center/next-env.d.ts diff --git a/clients/ops/privacy-center/next.config.js b/clients/privacy-center/next.config.js similarity index 100% rename from clients/ops/privacy-center/next.config.js rename to clients/privacy-center/next.config.js diff --git a/clients/ops/privacy-center/package-lock.json b/clients/privacy-center/package-lock.json similarity index 100% rename from clients/ops/privacy-center/package-lock.json rename to clients/privacy-center/package-lock.json diff --git a/clients/ops/privacy-center/package.json b/clients/privacy-center/package.json similarity index 100% rename from clients/ops/privacy-center/package.json rename to clients/privacy-center/package.json diff --git a/clients/ops/privacy-center/pages/404.tsx b/clients/privacy-center/pages/404.tsx similarity index 100% rename from clients/ops/privacy-center/pages/404.tsx rename to clients/privacy-center/pages/404.tsx diff --git a/clients/ops/privacy-center/pages/_app.tsx b/clients/privacy-center/pages/_app.tsx similarity index 100% rename from clients/ops/privacy-center/pages/_app.tsx rename to clients/privacy-center/pages/_app.tsx diff --git a/clients/ops/privacy-center/pages/consent.tsx b/clients/privacy-center/pages/consent.tsx similarity index 100% rename from clients/ops/privacy-center/pages/consent.tsx rename to clients/privacy-center/pages/consent.tsx diff --git a/clients/ops/privacy-center/pages/index.tsx b/clients/privacy-center/pages/index.tsx similarity index 100% rename from clients/ops/privacy-center/pages/index.tsx rename to clients/privacy-center/pages/index.tsx diff --git a/clients/ops/privacy-center/public/consent.svg b/clients/privacy-center/public/consent.svg similarity index 100% rename from clients/ops/privacy-center/public/consent.svg rename to clients/privacy-center/public/consent.svg diff --git a/clients/ops/privacy-center/public/delete.svg b/clients/privacy-center/public/delete.svg similarity index 100% rename from clients/ops/privacy-center/public/delete.svg rename to clients/privacy-center/public/delete.svg diff --git a/clients/ops/privacy-center/public/download.svg b/clients/privacy-center/public/download.svg similarity index 100% rename from clients/ops/privacy-center/public/download.svg rename to clients/privacy-center/public/download.svg diff --git a/clients/ops/privacy-center/public/edit.svg b/clients/privacy-center/public/edit.svg similarity index 100% rename from clients/ops/privacy-center/public/edit.svg rename to clients/privacy-center/public/edit.svg diff --git a/clients/ops/privacy-center/public/favicon.ico b/clients/privacy-center/public/favicon.ico similarity index 100% rename from clients/ops/privacy-center/public/favicon.ico rename to clients/privacy-center/public/favicon.ico diff --git a/clients/ops/privacy-center/public/green-check.svg b/clients/privacy-center/public/green-check.svg similarity index 100% rename from clients/ops/privacy-center/public/green-check.svg rename to clients/privacy-center/public/green-check.svg diff --git a/clients/ops/privacy-center/public/logo-icon.svg b/clients/privacy-center/public/logo-icon.svg similarity index 100% rename from clients/ops/privacy-center/public/logo-icon.svg rename to clients/privacy-center/public/logo-icon.svg diff --git a/clients/ops/privacy-center/public/logo.svg b/clients/privacy-center/public/logo.svg similarity index 100% rename from clients/ops/privacy-center/public/logo.svg rename to clients/privacy-center/public/logo.svg diff --git a/clients/ops/privacy-center/start.sh b/clients/privacy-center/start.sh similarity index 100% rename from clients/ops/privacy-center/start.sh rename to clients/privacy-center/start.sh diff --git a/clients/ops/privacy-center/theme/index.ts b/clients/privacy-center/theme/index.ts similarity index 100% rename from clients/ops/privacy-center/theme/index.ts rename to clients/privacy-center/theme/index.ts diff --git a/clients/ops/privacy-center/tsconfig.json b/clients/privacy-center/tsconfig.json similarity index 100% rename from clients/ops/privacy-center/tsconfig.json rename to clients/privacy-center/tsconfig.json diff --git a/clients/ops/privacy-center/types/AlertState.ts b/clients/privacy-center/types/AlertState.ts similarity index 100% rename from clients/ops/privacy-center/types/AlertState.ts rename to clients/privacy-center/types/AlertState.ts diff --git a/clients/ops/privacy-center/types/environment.d.ts b/clients/privacy-center/types/environment.d.ts similarity index 100% rename from clients/ops/privacy-center/types/environment.d.ts rename to clients/privacy-center/types/environment.d.ts diff --git a/clients/ops/privacy-center/types/index.ts b/clients/privacy-center/types/index.ts similarity index 100% rename from clients/ops/privacy-center/types/index.ts rename to clients/privacy-center/types/index.ts diff --git a/docker-compose.yml b/docker-compose.yml index bb4b8f7175..dbd3e2222c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,7 +61,7 @@ services: - "3001:3000" volumes: - type: bind - source: ./clients/ops/privacy-center/config + source: ./clients/privacy-center/config target: /app/config read_only: False diff --git a/docs/fides/docs/development/ui.md b/docs/fides/docs/development/ui.md index dd5ec87b32..94d6c8bdfb 100644 --- a/docs/fides/docs/development/ui.md +++ b/docs/fides/docs/development/ui.md @@ -17,7 +17,7 @@ additional [user endpoints](#managing-users). From the root `fidesops` directory, run the following: ``` sh - cd clients/ops/admin-ui + cd clients/admin-ui npm install npm run dev ``` @@ -43,7 +43,7 @@ Fidesops automatically serves a version of the UI when running `nox -s dev`. To deploy a full version of the UI from a backend, run the following from the root fidesops directory: ```sh - cd clients/ops/admin-ui + cd clients/admin-ui npm install npm run prod-export ``` diff --git a/noxfiles/docker_nox.py b/noxfiles/docker_nox.py index a232fa6106..de8cab07d9 100644 --- a/noxfiles/docker_nox.py +++ b/noxfiles/docker_nox.py @@ -42,7 +42,7 @@ def build(session: nox.Session, image: str) -> None: session.run( "docker", "build", - "clients/ops/privacy-center", + "clients/privacy-center", "--tag", "ethyca/fides-privacy-center:local", external=True,