diff --git a/.github/workflows/test.lint.frontend.yml b/.github/workflows/test.lint.frontend.yml index 93364ca7..ab7229f4 100644 --- a/.github/workflows/test.lint.frontend.yml +++ b/.github/workflows/test.lint.frontend.yml @@ -1,10 +1,10 @@ -name: test:lint:frontend +name: test:lint:app on: push jobs: files-changed: - name: Detect File Changes - lint - frontend + name: Detect File Changes - lint - app runs-on: ubuntu-latest outputs: lint: ${{ steps.filter.outputs.lint }} @@ -16,11 +16,11 @@ jobs: filters: | lint: - '.github/workflows/**/*' - - 'frontend/**/*' + - 'app/**/*' lint: if: needs.files-changed.outputs.lint == 'true' - name: Lint - frontend + name: Lint - app needs: files-changed runs-on: ubuntu-latest steps: @@ -30,4 +30,4 @@ jobs: node-version-file: '.tool-versions' - name: Lint run: npm install && npm run test:lint:eslint - working-directory: frontend/ + working-directory: app/ diff --git a/.github/workflows/test.lint.pr.yml b/.github/workflows/test.lint.pr.yml index 43f8438d..8e24a2c7 100644 --- a/.github/workflows/test.lint.pr.yml +++ b/.github/workflows/test.lint.pr.yml @@ -30,7 +30,7 @@ jobs: # Append a scope for each service here scopes: | backend - frontend + app lib docu docker diff --git a/frontend/.env b/app/.env similarity index 100% rename from frontend/.env rename to app/.env diff --git a/frontend/.eslintignore b/app/.eslintignore similarity index 100% rename from frontend/.eslintignore rename to app/.eslintignore diff --git a/frontend/.eslintrc.cjs b/app/.eslintrc.cjs similarity index 100% rename from frontend/.eslintrc.cjs rename to app/.eslintrc.cjs diff --git a/frontend/.gitignore b/app/.gitignore similarity index 100% rename from frontend/.gitignore rename to app/.gitignore diff --git a/frontend/.prettierrc.json b/app/.prettierrc.json similarity index 100% rename from frontend/.prettierrc.json rename to app/.prettierrc.json diff --git a/frontend/docker-compose.yml b/app/docker-compose.yml similarity index 98% rename from frontend/docker-compose.yml rename to app/docker-compose.yml index 829739ed..ff7d9f5e 100644 --- a/frontend/docker-compose.yml +++ b/app/docker-compose.yml @@ -38,7 +38,7 @@ services: backend: container_name: backend build: - context: ./backend + context: ../backend depends_on: database: condition: service_healthy diff --git a/frontend/index.html b/app/index.html similarity index 100% rename from frontend/index.html rename to app/index.html diff --git a/frontend/localhost-cert.pem b/app/localhost-cert.pem similarity index 100% rename from frontend/localhost-cert.pem rename to app/localhost-cert.pem diff --git a/frontend/localhost-key.pem b/app/localhost-key.pem similarity index 100% rename from frontend/localhost-key.pem rename to app/localhost-key.pem diff --git a/frontend/package-lock.json b/app/package-lock.json similarity index 100% rename from frontend/package-lock.json rename to app/package-lock.json diff --git a/frontend/package.json b/app/package.json similarity index 100% rename from frontend/package.json rename to app/package.json diff --git a/frontend/public/3markers-globe.svg b/app/public/3markers-globe.svg similarity index 100% rename from frontend/public/3markers-globe.svg rename to app/public/3markers-globe.svg diff --git a/frontend/public/bg1.webp b/app/public/bg1.webp similarity index 100% rename from frontend/public/bg1.webp rename to app/public/bg1.webp diff --git a/frontend/public/github.svg b/app/public/github.svg similarity index 100% rename from frontend/public/github.svg rename to app/public/github.svg diff --git a/frontend/public/opencollective.svg b/app/public/opencollective.svg similarity index 100% rename from frontend/public/opencollective.svg rename to app/public/opencollective.svg diff --git a/frontend/public/style.css b/app/public/style.css similarity index 100% rename from frontend/public/style.css rename to app/public/style.css diff --git a/frontend/src/App.css b/app/src/App.css similarity index 100% rename from frontend/src/App.css rename to app/src/App.css diff --git a/frontend/src/App.tsx b/app/src/App.tsx similarity index 100% rename from frontend/src/App.tsx rename to app/src/App.tsx diff --git a/frontend/src/ModalContent.tsx b/app/src/ModalContent.tsx similarity index 100% rename from frontend/src/ModalContent.tsx rename to app/src/ModalContent.tsx diff --git a/frontend/src/api/assetsApi.ts b/app/src/api/assetsApi.ts similarity index 100% rename from frontend/src/api/assetsApi.ts rename to app/src/api/assetsApi.ts diff --git a/frontend/src/api/directus.ts b/app/src/api/directus.ts similarity index 100% rename from frontend/src/api/directus.ts rename to app/src/api/directus.ts diff --git a/frontend/src/api/itemsApi.ts b/app/src/api/itemsApi.ts similarity index 100% rename from frontend/src/api/itemsApi.ts rename to app/src/api/itemsApi.ts diff --git a/frontend/src/api/layersApi.ts b/app/src/api/layersApi.ts similarity index 100% rename from frontend/src/api/layersApi.ts rename to app/src/api/layersApi.ts diff --git a/frontend/src/api/mapApi.ts b/app/src/api/mapApi.ts similarity index 100% rename from frontend/src/api/mapApi.ts rename to app/src/api/mapApi.ts diff --git a/frontend/src/api/permissionsApi.ts b/app/src/api/permissionsApi.ts similarity index 100% rename from frontend/src/api/permissionsApi.ts rename to app/src/api/permissionsApi.ts diff --git a/frontend/src/api/readUserApi.ts b/app/src/api/readUserApi.ts similarity index 100% rename from frontend/src/api/readUserApi.ts rename to app/src/api/readUserApi.ts diff --git a/frontend/src/api/refiBcnApi.ts b/app/src/api/refiBcnApi.ts similarity index 100% rename from frontend/src/api/refiBcnApi.ts rename to app/src/api/refiBcnApi.ts diff --git a/frontend/src/api/userApi.ts b/app/src/api/userApi.ts similarity index 100% rename from frontend/src/api/userApi.ts rename to app/src/api/userApi.ts diff --git a/frontend/src/index.css b/app/src/index.css similarity index 100% rename from frontend/src/index.css rename to app/src/index.css diff --git a/frontend/src/main.tsx b/app/src/main.tsx similarity index 100% rename from frontend/src/main.tsx rename to app/src/main.tsx diff --git a/frontend/src/pages/Concept.tsx b/app/src/pages/Concept.tsx similarity index 100% rename from frontend/src/pages/Concept.tsx rename to app/src/pages/Concept.tsx diff --git a/frontend/src/pages/ConceptDE.tsx b/app/src/pages/ConceptDE.tsx similarity index 100% rename from frontend/src/pages/ConceptDE.tsx rename to app/src/pages/ConceptDE.tsx diff --git a/frontend/src/pages/Landingpage.tsx b/app/src/pages/Landingpage.tsx similarity index 100% rename from frontend/src/pages/Landingpage.tsx rename to app/src/pages/Landingpage.tsx diff --git a/frontend/src/pages/MapContainer.tsx b/app/src/pages/MapContainer.tsx similarity index 100% rename from frontend/src/pages/MapContainer.tsx rename to app/src/pages/MapContainer.tsx diff --git a/frontend/src/pages/data.ts b/app/src/pages/data.ts similarity index 100% rename from frontend/src/pages/data.ts rename to app/src/pages/data.ts diff --git a/frontend/src/routes/sidebar.tsx b/app/src/routes/sidebar.tsx similarity index 100% rename from frontend/src/routes/sidebar.tsx rename to app/src/routes/sidebar.tsx diff --git a/frontend/src/vite-env.d.ts b/app/src/vite-env.d.ts similarity index 100% rename from frontend/src/vite-env.d.ts rename to app/src/vite-env.d.ts diff --git a/frontend/tailwind.config.js b/app/tailwind.config.js similarity index 100% rename from frontend/tailwind.config.js rename to app/tailwind.config.js diff --git a/frontend/tsconfig.json b/app/tsconfig.json similarity index 100% rename from frontend/tsconfig.json rename to app/tsconfig.json diff --git a/frontend/tsconfig.node.json b/app/tsconfig.node.json similarity index 100% rename from frontend/tsconfig.node.json rename to app/tsconfig.node.json diff --git a/frontend/video_preview.png b/app/video_preview.png similarity index 100% rename from frontend/video_preview.png rename to app/video_preview.png diff --git a/frontend/vite.config.ts b/app/vite.config.ts similarity index 100% rename from frontend/vite.config.ts rename to app/vite.config.ts diff --git a/backend/README.md b/backend/README.md index f796ee30..7d280167 100644 --- a/backend/README.md +++ b/backend/README.md @@ -1,4 +1,4 @@ -In order to pull data from your locally running backend (see [docker-compose](../docker-compose.yml)) to your local harddrive, you can run the following command +In order to pull data from your locally running backend (see [docker-compose](../app/docker-compose.yml)) to your local harddrive, you can run the following command ``` npx directus-sync pull \