diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml index 3246c82..5758dfe 100644 --- a/.github/workflows/build-image.yaml +++ b/.github/workflows/build-image.yaml @@ -15,7 +15,7 @@ on: context: description: "Docker build context path" required: false - default: "7project/backend" + default: "7project/src/backend" type: string pr_number: description: "PR number (required when mode=pr)" diff --git a/.github/workflows/deploy-pr.yaml b/.github/workflows/deploy-pr.yaml index a33889c..005b432 100644 --- a/.github/workflows/deploy-pr.yaml +++ b/.github/workflows/deploy-pr.yaml @@ -21,7 +21,7 @@ jobs: with: mode: pr image_repo: lukastrkan/cc-app-demo - context: 7project/backend + context: 7project/src/backend pr_number: ${{ github.event.pull_request.number }} secrets: inherit @@ -90,9 +90,9 @@ jobs: PR=${{ github.event.pull_request.number }} RELEASE=myapp-pr-$PR NAMESPACE=pr-$PR - helm upgrade --install "$RELEASE" ./7project/charts/myapp-chart \ + helm upgrade --install "$RELEASE" ./7project/src/charts/myapp-chart \ -n "$NAMESPACE" --create-namespace \ - -f 7project/charts/myapp-chart/values-dev.yaml \ + -f 7project/src/charts/myapp-chart/values-dev.yaml \ --set prNumber="$PR" \ --set deployment="pr-$PR" \ --set domain="$DOMAIN" \ diff --git a/.github/workflows/deploy-prod.yaml b/.github/workflows/deploy-prod.yaml index 575d7e3..9fa05b9 100644 --- a/.github/workflows/deploy-prod.yaml +++ b/.github/workflows/deploy-prod.yaml @@ -4,9 +4,9 @@ on: push: branches: [ "main" ] paths: - - 7project/backend/** - - 7project/frontend/** - - 7project/charts/myapp-chart/** + - ../../7project/src/backend/** + - ../../7project/src/frontend/** + - ../../7project/src/charts/myapp-chart/** - .github/workflows/deploy-prod.yaml - .github/workflows/build-image.yaml - .github/workflows/frontend-pages.yml @@ -32,7 +32,7 @@ jobs: with: mode: prod image_repo: lukastrkan/cc-app-demo - context: 7project/backend + context: 7project/src/backend secrets: inherit get_urls: @@ -103,9 +103,9 @@ jobs: SMTP_FROM: ${{ secrets.SMTP_FROM }} UNIRATE_API_KEY: ${{ secrets.UNIRATE_API_KEY }} run: | - helm upgrade --install myapp ./7project/charts/myapp-chart \ + helm upgrade --install myapp ./7project/src/charts/myapp-chart \ -n prod --create-namespace \ - -f 7project/charts/myapp-chart/values-prod.yaml \ + -f 7project/src/charts/myapp-chart/values-prod.yaml \ --set deployment="prod" \ --set domain="$DOMAIN" \ --set domain_scheme="$DOMAIN_SCHEME" \ diff --git a/.github/workflows/frontend-pages.yml b/.github/workflows/frontend-pages.yml index 7b46a6f..9c7003d 100644 --- a/.github/workflows/frontend-pages.yml +++ b/.github/workflows/frontend-pages.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: 7project/frontend + working-directory: 7project/src/frontend steps: - name: Checkout uses: actions/checkout@v4 @@ -45,7 +45,7 @@ jobs: with: node-version: '20' cache: 'npm' - cache-dependency-path: 7project/frontend/package-lock.json + cache-dependency-path: 7project/src/frontend/package-lock.json - name: Install dependencies run: npm ci @@ -61,7 +61,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: frontend-dist - path: 7project/frontend/dist + path: 7project/src/frontend/dist deploy: name: Deploy to Cloudflare Pages diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2c73b58..ea2a3bc 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -46,21 +46,21 @@ jobs: - name: Add test dependencies to requirements run: | - echo "pytest==8.4.2" >> ./7project/backend/requirements.txt - echo "pytest-asyncio==1.2.0" >> ./7project/backend/requirements.txt + echo "pytest==8.4.2" >> ./7project/src/backend/requirements.txt + echo "pytest-asyncio==1.2.0" >> ./7project/src/backend/requirements.txt - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r ./7project/backend/requirements.txt + pip install -r ./7project/src/backend/requirements.txt - name: Run Alembic migrations run: | alembic upgrade head - working-directory: ./7project/backend + working-directory: ./7project/src/backend - name: Run tests with pytest env: PYTEST_RUN_CONFIG: "True" run: pytest - working-directory: ./7project/backend \ No newline at end of file + working-directory: ./7project/src/backend \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/7project/.gitignore b/7project/.gitignore index 5cf880e..0056e8d 100644 --- a/7project/.gitignore +++ b/7project/.gitignore @@ -1,8 +1,8 @@ -/tofu/controlplane.yaml -/tofu/kubeconfig -/tofu/talosconfig -/tofu/terraform.tfstate -/tofu/terraform.tfstate.backup -/tofu/worker.yaml -/tofu/.terraform.lock.hcl -/tofu/.terraform/ +/src/tofu/controlplane.yaml +/src/tofu/kubeconfig +/src/tofu/talosconfig +/src/tofu/terraform.tfstate +/src/tofu/terraform.tfstate.backup +/src/tofu/worker.yaml +/src/tofu/.terraform.lock.hcl +/src/tofu/.terraform/ diff --git a/7project/.idea/.gitignore b/7project/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/7project/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/7project/report.md b/7project/report.md index b3e46f8..e56ce8e 100644 --- a/7project/report.md +++ b/7project/report.md @@ -166,7 +166,7 @@ You can run the project with Docker Compose and Python virtual environment for t ```bash git clone https://github.com/dat515-2025/Group-8.git -cd Group-8/7project +cd Group-8/7project/src ``` ### 2) Install dependencies @@ -423,8 +423,8 @@ The tests are located in 7project/backend/tests directory. All tests are run by push to main. See the workflow [here](../.github/workflows/run-tests.yml). -If you want to run the tests locally, the preferred way is to use a [bash script](backend/test_locally.sh) -that will start a test DB container with [docker compose](backend/docker-compose.test.yml) and remove it afterwards. +If you want to run the tests locally, the preferred way is to use a [bash script](src/backend/test_locally.sh) +that will start a test DB container with [docker compose](src/backend/docker-compose.test.yml) and remove it afterwards. ```bash cd 7project/backend bash test_locally.sh @@ -432,7 +432,7 @@ bash test_locally.sh ### Unit Tests -There are only 5 basic unit tests, since our services logic is very simple +There are 5 basic unit tests, since our services logic is very simple ```bash bash test_locally.sh --only-unit @@ -584,7 +584,7 @@ curl -H "Authorization: Bearer $TOKEN" http://127.0.0.1:8000/authenticated-route | 25.9. | Design | 2 | 6design | | | 9.10 to 11.10. | Backend APIs | 14 | Implemented Backend APIs | `PR #26`, `20-create-a-controller-layer-on-backend-side` | | 13.10 to 15.10. | Frontend Development | 8 | Created user interface mockups | `PR #28`, `frontend basics` | -| Continually | Documentation | 7 | Documenting the dev process | | +| Continually | Documentation | 8 | Documenting the dev process | | | 21.10 to 23.10 | Tests, frontend | 10 | Test basics, balance charts, and frontend improvement | `PR #31`, `30 create tests and set up a GitHub pipeline` | | 28.10 to 30.10 | CI | 6 | Integrated tests with test database setup on github workflows | `PR #28`, `frontend basics` | | 28.10 to 30.10 | Frontend | 8 | UI improvements and exchange rate API integration | `PR #28`, `frontend basics` | @@ -594,7 +594,7 @@ curl -H "Authorization: Bearer $TOKEN" http://127.0.0.1:8000/authenticated-route | 11.11 to 12.11 | Tests | 3 | Local testing DB container, few fixes | `PR #28`, `frontend basics` | | 12.11 | Frontend | 3 | Enabled multiple transaction edits at once, CSAS button state | `PR #28`, `frontend basics` | | 13.11 | Video | 3 | Video | | -| **Total** | | **80** | | | +| **Total** | | **81** | | | ### Group Total: [XXX.X] hours diff --git a/7project/src/backend/.idea/.gitignore b/7project/src/backend/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/7project/src/backend/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/7project/backend/Dockerfile b/7project/src/backend/Dockerfile similarity index 100% rename from 7project/backend/Dockerfile rename to 7project/src/backend/Dockerfile diff --git a/7project/backend/alembic.ini b/7project/src/backend/alembic.ini similarity index 100% rename from 7project/backend/alembic.ini rename to 7project/src/backend/alembic.ini diff --git a/7project/backend/alembic/env.py b/7project/src/backend/alembic/env.py similarity index 100% rename from 7project/backend/alembic/env.py rename to 7project/src/backend/alembic/env.py diff --git a/7project/backend/alembic/script.py.mako b/7project/src/backend/alembic/script.py.mako similarity index 100% rename from 7project/backend/alembic/script.py.mako rename to 7project/src/backend/alembic/script.py.mako diff --git a/7project/backend/alembic/versions/2025_10_09_1456-63e072f09836_add_categories.py b/7project/src/backend/alembic/versions/2025_10_09_1456-63e072f09836_add_categories.py similarity index 100% rename from 7project/backend/alembic/versions/2025_10_09_1456-63e072f09836_add_categories.py rename to 7project/src/backend/alembic/versions/2025_10_09_1456-63e072f09836_add_categories.py diff --git a/7project/backend/alembic/versions/2025_10_09_1514-390041bd839e_update_categories_unique.py b/7project/src/backend/alembic/versions/2025_10_09_1514-390041bd839e_update_categories_unique.py similarity index 100% rename from 7project/backend/alembic/versions/2025_10_09_1514-390041bd839e_update_categories_unique.py rename to 7project/src/backend/alembic/versions/2025_10_09_1514-390041bd839e_update_categories_unique.py diff --git a/7project/backend/alembic/versions/2025_10_10_1405-7af8f296d089_add_user_oauth.py b/7project/src/backend/alembic/versions/2025_10_10_1405-7af8f296d089_add_user_oauth.py similarity index 100% rename from 7project/backend/alembic/versions/2025_10_10_1405-7af8f296d089_add_user_oauth.py rename to 7project/src/backend/alembic/versions/2025_10_10_1405-7af8f296d089_add_user_oauth.py diff --git a/7project/backend/alembic/versions/2025_10_11_2107-5ab2e654c96e_change_token_lenght.py b/7project/src/backend/alembic/versions/2025_10_11_2107-5ab2e654c96e_change_token_lenght.py similarity index 100% rename from 7project/backend/alembic/versions/2025_10_11_2107-5ab2e654c96e_change_token_lenght.py rename to 7project/src/backend/alembic/versions/2025_10_11_2107-5ab2e654c96e_change_token_lenght.py diff --git a/7project/backend/alembic/versions/2025_10_21_1856-eabec90a94fe_add_config_to_user.py b/7project/src/backend/alembic/versions/2025_10_21_1856-eabec90a94fe_add_config_to_user.py similarity index 100% rename from 7project/backend/alembic/versions/2025_10_21_1856-eabec90a94fe_add_config_to_user.py rename to 7project/src/backend/alembic/versions/2025_10_21_1856-eabec90a94fe_add_config_to_user.py diff --git a/7project/backend/alembic/versions/2025_10_22_1618-1f2a3c4d5e6f_add_date_to_transaction.py b/7project/src/backend/alembic/versions/2025_10_22_1618-1f2a3c4d5e6f_add_date_to_transaction.py similarity index 100% rename from 7project/backend/alembic/versions/2025_10_22_1618-1f2a3c4d5e6f_add_date_to_transaction.py rename to 7project/src/backend/alembic/versions/2025_10_22_1618-1f2a3c4d5e6f_add_date_to_transaction.py diff --git a/7project/backend/alembic/versions/2025_10_29_1326-46b9e702e83f_add_encrypted_type.py b/7project/src/backend/alembic/versions/2025_10_29_1326-46b9e702e83f_add_encrypted_type.py similarity index 100% rename from 7project/backend/alembic/versions/2025_10_29_1326-46b9e702e83f_add_encrypted_type.py rename to 7project/src/backend/alembic/versions/2025_10_29_1326-46b9e702e83f_add_encrypted_type.py diff --git a/7project/backend/alembic/versions/2025_10_30_1342-59cebf320c4a_cascade_categories.py b/7project/src/backend/alembic/versions/2025_10_30_1342-59cebf320c4a_cascade_categories.py similarity index 100% rename from 7project/backend/alembic/versions/2025_10_30_1342-59cebf320c4a_cascade_categories.py rename to 7project/src/backend/alembic/versions/2025_10_30_1342-59cebf320c4a_cascade_categories.py diff --git a/7project/backend/app/__init__.py b/7project/src/backend/app/__init__.py similarity index 100% rename from 7project/backend/app/__init__.py rename to 7project/src/backend/app/__init__.py diff --git a/7project/backend/app/api/.keep b/7project/src/backend/app/api/.keep similarity index 100% rename from 7project/backend/app/api/.keep rename to 7project/src/backend/app/api/.keep diff --git a/7project/backend/app/api/__init__.py b/7project/src/backend/app/api/__init__.py similarity index 100% rename from 7project/backend/app/api/__init__.py rename to 7project/src/backend/app/api/__init__.py diff --git a/7project/backend/app/api/auth.py b/7project/src/backend/app/api/auth.py similarity index 100% rename from 7project/backend/app/api/auth.py rename to 7project/src/backend/app/api/auth.py diff --git a/7project/backend/app/api/categories.py b/7project/src/backend/app/api/categories.py similarity index 100% rename from 7project/backend/app/api/categories.py rename to 7project/src/backend/app/api/categories.py diff --git a/7project/backend/app/api/csas.py b/7project/src/backend/app/api/csas.py similarity index 100% rename from 7project/backend/app/api/csas.py rename to 7project/src/backend/app/api/csas.py diff --git a/7project/backend/app/api/exchange_rates.py b/7project/src/backend/app/api/exchange_rates.py similarity index 100% rename from 7project/backend/app/api/exchange_rates.py rename to 7project/src/backend/app/api/exchange_rates.py diff --git a/7project/backend/app/api/mock_bank.py b/7project/src/backend/app/api/mock_bank.py similarity index 100% rename from 7project/backend/app/api/mock_bank.py rename to 7project/src/backend/app/api/mock_bank.py diff --git a/7project/backend/app/api/transactions.py b/7project/src/backend/app/api/transactions.py similarity index 100% rename from 7project/backend/app/api/transactions.py rename to 7project/src/backend/app/api/transactions.py diff --git a/7project/backend/app/app.py b/7project/src/backend/app/app.py similarity index 100% rename from 7project/backend/app/app.py rename to 7project/src/backend/app/app.py diff --git a/7project/backend/app/celery_app.py b/7project/src/backend/app/celery_app.py similarity index 100% rename from 7project/backend/app/celery_app.py rename to 7project/src/backend/app/celery_app.py diff --git a/7project/backend/app/core/__init__.py b/7project/src/backend/app/core/__init__.py similarity index 100% rename from 7project/backend/app/core/__init__.py rename to 7project/src/backend/app/core/__init__.py diff --git a/7project/backend/app/core/base.py b/7project/src/backend/app/core/base.py similarity index 100% rename from 7project/backend/app/core/base.py rename to 7project/src/backend/app/core/base.py diff --git a/7project/backend/app/core/db.py b/7project/src/backend/app/core/db.py similarity index 100% rename from 7project/backend/app/core/db.py rename to 7project/src/backend/app/core/db.py diff --git a/7project/backend/app/core/queue.py b/7project/src/backend/app/core/queue.py similarity index 100% rename from 7project/backend/app/core/queue.py rename to 7project/src/backend/app/core/queue.py diff --git a/7project/backend/app/core/security.py b/7project/src/backend/app/core/security.py similarity index 100% rename from 7project/backend/app/core/security.py rename to 7project/src/backend/app/core/security.py diff --git a/7project/backend/app/models/__init__.py b/7project/src/backend/app/models/__init__.py similarity index 100% rename from 7project/backend/app/models/__init__.py rename to 7project/src/backend/app/models/__init__.py diff --git a/7project/backend/app/models/categories.py b/7project/src/backend/app/models/categories.py similarity index 100% rename from 7project/backend/app/models/categories.py rename to 7project/src/backend/app/models/categories.py diff --git a/7project/backend/app/models/transaction.py b/7project/src/backend/app/models/transaction.py similarity index 100% rename from 7project/backend/app/models/transaction.py rename to 7project/src/backend/app/models/transaction.py diff --git a/7project/backend/app/models/user.py b/7project/src/backend/app/models/user.py similarity index 100% rename from 7project/backend/app/models/user.py rename to 7project/src/backend/app/models/user.py diff --git a/7project/backend/app/oauth/__init__.py b/7project/src/backend/app/oauth/__init__.py similarity index 100% rename from 7project/backend/app/oauth/__init__.py rename to 7project/src/backend/app/oauth/__init__.py diff --git a/7project/backend/app/oauth/bank_id.py b/7project/src/backend/app/oauth/bank_id.py similarity index 100% rename from 7project/backend/app/oauth/bank_id.py rename to 7project/src/backend/app/oauth/bank_id.py diff --git a/7project/backend/app/oauth/csas.py b/7project/src/backend/app/oauth/csas.py similarity index 100% rename from 7project/backend/app/oauth/csas.py rename to 7project/src/backend/app/oauth/csas.py diff --git a/7project/backend/app/oauth/custom_openid.py b/7project/src/backend/app/oauth/custom_openid.py similarity index 100% rename from 7project/backend/app/oauth/custom_openid.py rename to 7project/src/backend/app/oauth/custom_openid.py diff --git a/7project/backend/app/oauth/moje_id.py b/7project/src/backend/app/oauth/moje_id.py similarity index 100% rename from 7project/backend/app/oauth/moje_id.py rename to 7project/src/backend/app/oauth/moje_id.py diff --git a/7project/backend/app/oauth/private_key.key b/7project/src/backend/app/oauth/private_key.key similarity index 100% rename from 7project/backend/app/oauth/private_key.key rename to 7project/src/backend/app/oauth/private_key.key diff --git a/7project/backend/app/oauth/public_key.pem b/7project/src/backend/app/oauth/public_key.pem similarity index 100% rename from 7project/backend/app/oauth/public_key.pem rename to 7project/src/backend/app/oauth/public_key.pem diff --git a/7project/backend/app/schemas/__init__.py b/7project/src/backend/app/schemas/__init__.py similarity index 100% rename from 7project/backend/app/schemas/__init__.py rename to 7project/src/backend/app/schemas/__init__.py diff --git a/7project/backend/app/schemas/category.py b/7project/src/backend/app/schemas/category.py similarity index 100% rename from 7project/backend/app/schemas/category.py rename to 7project/src/backend/app/schemas/category.py diff --git a/7project/backend/app/schemas/transaction.py b/7project/src/backend/app/schemas/transaction.py similarity index 100% rename from 7project/backend/app/schemas/transaction.py rename to 7project/src/backend/app/schemas/transaction.py diff --git a/7project/backend/app/schemas/user.py b/7project/src/backend/app/schemas/user.py similarity index 100% rename from 7project/backend/app/schemas/user.py rename to 7project/src/backend/app/schemas/user.py diff --git a/7project/backend/app/services/__init__.py b/7project/src/backend/app/services/__init__.py similarity index 100% rename from 7project/backend/app/services/__init__.py rename to 7project/src/backend/app/services/__init__.py diff --git a/7project/backend/app/services/bank_scraper.py b/7project/src/backend/app/services/bank_scraper.py similarity index 100% rename from 7project/backend/app/services/bank_scraper.py rename to 7project/src/backend/app/services/bank_scraper.py diff --git a/7project/backend/app/services/db.py b/7project/src/backend/app/services/db.py similarity index 100% rename from 7project/backend/app/services/db.py rename to 7project/src/backend/app/services/db.py diff --git a/7project/backend/app/services/prometheus.py b/7project/src/backend/app/services/prometheus.py similarity index 100% rename from 7project/backend/app/services/prometheus.py rename to 7project/src/backend/app/services/prometheus.py diff --git a/7project/backend/app/services/user_service.py b/7project/src/backend/app/services/user_service.py similarity index 100% rename from 7project/backend/app/services/user_service.py rename to 7project/src/backend/app/services/user_service.py diff --git a/7project/backend/app/workers/__init__.py b/7project/src/backend/app/workers/__init__.py similarity index 100% rename from 7project/backend/app/workers/__init__.py rename to 7project/src/backend/app/workers/__init__.py diff --git a/7project/backend/app/workers/celery_tasks.py b/7project/src/backend/app/workers/celery_tasks.py similarity index 100% rename from 7project/backend/app/workers/celery_tasks.py rename to 7project/src/backend/app/workers/celery_tasks.py diff --git a/7project/backend/docker-compose.test.yml b/7project/src/backend/docker-compose.test.yml similarity index 100% rename from 7project/backend/docker-compose.test.yml rename to 7project/src/backend/docker-compose.test.yml diff --git a/7project/backend/main.py b/7project/src/backend/main.py similarity index 100% rename from 7project/backend/main.py rename to 7project/src/backend/main.py diff --git a/7project/backend/pyproject.toml b/7project/src/backend/pyproject.toml similarity index 100% rename from 7project/backend/pyproject.toml rename to 7project/src/backend/pyproject.toml diff --git a/7project/backend/requirements.txt b/7project/src/backend/requirements.txt similarity index 100% rename from 7project/backend/requirements.txt rename to 7project/src/backend/requirements.txt diff --git a/7project/backend/test_locally.sh b/7project/src/backend/test_locally.sh similarity index 100% rename from 7project/backend/test_locally.sh rename to 7project/src/backend/test_locally.sh diff --git a/7project/backend/tests/conftest.py b/7project/src/backend/tests/conftest.py similarity index 100% rename from 7project/backend/tests/conftest.py rename to 7project/src/backend/tests/conftest.py diff --git a/7project/backend/tests/test_e2e.py b/7project/src/backend/tests/test_e2e.py similarity index 100% rename from 7project/backend/tests/test_e2e.py rename to 7project/src/backend/tests/test_e2e.py diff --git a/7project/backend/tests/test_integration_app.py b/7project/src/backend/tests/test_integration_app.py similarity index 100% rename from 7project/backend/tests/test_integration_app.py rename to 7project/src/backend/tests/test_integration_app.py diff --git a/7project/backend/tests/test_unit_user_service.py b/7project/src/backend/tests/test_unit_user_service.py similarity index 100% rename from 7project/backend/tests/test_unit_user_service.py rename to 7project/src/backend/tests/test_unit_user_service.py diff --git a/7project/charts/myapp-chart/Chart.yaml b/7project/src/charts/myapp-chart/Chart.yaml similarity index 100% rename from 7project/charts/myapp-chart/Chart.yaml rename to 7project/src/charts/myapp-chart/Chart.yaml diff --git a/7project/charts/myapp-chart/templates/app-deployment.yaml b/7project/src/charts/myapp-chart/templates/app-deployment.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/app-deployment.yaml rename to 7project/src/charts/myapp-chart/templates/app-deployment.yaml diff --git a/7project/charts/myapp-chart/templates/cron.yaml b/7project/src/charts/myapp-chart/templates/cron.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/cron.yaml rename to 7project/src/charts/myapp-chart/templates/cron.yaml diff --git a/7project/charts/myapp-chart/templates/database-grant.yaml b/7project/src/charts/myapp-chart/templates/database-grant.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/database-grant.yaml rename to 7project/src/charts/myapp-chart/templates/database-grant.yaml diff --git a/7project/charts/myapp-chart/templates/database-secret.yaml b/7project/src/charts/myapp-chart/templates/database-secret.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/database-secret.yaml rename to 7project/src/charts/myapp-chart/templates/database-secret.yaml diff --git a/7project/charts/myapp-chart/templates/database-user.yaml b/7project/src/charts/myapp-chart/templates/database-user.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/database-user.yaml rename to 7project/src/charts/myapp-chart/templates/database-user.yaml diff --git a/7project/charts/myapp-chart/templates/database.yaml b/7project/src/charts/myapp-chart/templates/database.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/database.yaml rename to 7project/src/charts/myapp-chart/templates/database.yaml diff --git a/7project/charts/myapp-chart/templates/monitoring.yaml b/7project/src/charts/myapp-chart/templates/monitoring.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/monitoring.yaml rename to 7project/src/charts/myapp-chart/templates/monitoring.yaml diff --git a/7project/charts/myapp-chart/templates/prod.yaml b/7project/src/charts/myapp-chart/templates/prod.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/prod.yaml rename to 7project/src/charts/myapp-chart/templates/prod.yaml diff --git a/7project/charts/myapp-chart/templates/rabbitmq-cluster.yaml b/7project/src/charts/myapp-chart/templates/rabbitmq-cluster.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/rabbitmq-cluster.yaml rename to 7project/src/charts/myapp-chart/templates/rabbitmq-cluster.yaml diff --git a/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml b/7project/src/charts/myapp-chart/templates/rabbitmq-permission.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/rabbitmq-permission.yaml rename to 7project/src/charts/myapp-chart/templates/rabbitmq-permission.yaml diff --git a/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml b/7project/src/charts/myapp-chart/templates/rabbitmq-queue.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/rabbitmq-queue.yaml rename to 7project/src/charts/myapp-chart/templates/rabbitmq-queue.yaml diff --git a/7project/charts/myapp-chart/templates/rabbitmq-user-secret.yaml b/7project/src/charts/myapp-chart/templates/rabbitmq-user-secret.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/rabbitmq-user-secret.yaml rename to 7project/src/charts/myapp-chart/templates/rabbitmq-user-secret.yaml diff --git a/7project/charts/myapp-chart/templates/rabbitmq-user.yaml b/7project/src/charts/myapp-chart/templates/rabbitmq-user.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/rabbitmq-user.yaml rename to 7project/src/charts/myapp-chart/templates/rabbitmq-user.yaml diff --git a/7project/charts/myapp-chart/templates/service.yaml b/7project/src/charts/myapp-chart/templates/service.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/service.yaml rename to 7project/src/charts/myapp-chart/templates/service.yaml diff --git a/7project/charts/myapp-chart/templates/tunnel.yaml b/7project/src/charts/myapp-chart/templates/tunnel.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/tunnel.yaml rename to 7project/src/charts/myapp-chart/templates/tunnel.yaml diff --git a/7project/charts/myapp-chart/templates/worker-deployment.yaml b/7project/src/charts/myapp-chart/templates/worker-deployment.yaml similarity index 100% rename from 7project/charts/myapp-chart/templates/worker-deployment.yaml rename to 7project/src/charts/myapp-chart/templates/worker-deployment.yaml diff --git a/7project/charts/myapp-chart/values-dev.yaml b/7project/src/charts/myapp-chart/values-dev.yaml similarity index 100% rename from 7project/charts/myapp-chart/values-dev.yaml rename to 7project/src/charts/myapp-chart/values-dev.yaml diff --git a/7project/charts/myapp-chart/values-prod.yaml b/7project/src/charts/myapp-chart/values-prod.yaml similarity index 100% rename from 7project/charts/myapp-chart/values-prod.yaml rename to 7project/src/charts/myapp-chart/values-prod.yaml diff --git a/7project/charts/myapp-chart/values.yaml b/7project/src/charts/myapp-chart/values.yaml similarity index 100% rename from 7project/charts/myapp-chart/values.yaml rename to 7project/src/charts/myapp-chart/values.yaml diff --git a/7project/compose.yml b/7project/src/compose.yml similarity index 100% rename from 7project/compose.yml rename to 7project/src/compose.yml diff --git a/7project/create_migration.sh b/7project/src/create_migration.sh similarity index 100% rename from 7project/create_migration.sh rename to 7project/src/create_migration.sh diff --git a/7project/frontend/.gitignore b/7project/src/frontend/.gitignore similarity index 100% rename from 7project/frontend/.gitignore rename to 7project/src/frontend/.gitignore diff --git a/7project/frontend/README.md b/7project/src/frontend/README.md similarity index 100% rename from 7project/frontend/README.md rename to 7project/src/frontend/README.md diff --git a/7project/frontend/eslint.config.js b/7project/src/frontend/eslint.config.js similarity index 100% rename from 7project/frontend/eslint.config.js rename to 7project/src/frontend/eslint.config.js diff --git a/7project/frontend/index.html b/7project/src/frontend/index.html similarity index 100% rename from 7project/frontend/index.html rename to 7project/src/frontend/index.html diff --git a/7project/frontend/package-lock.json b/7project/src/frontend/package-lock.json similarity index 100% rename from 7project/frontend/package-lock.json rename to 7project/src/frontend/package-lock.json diff --git a/7project/frontend/package.json b/7project/src/frontend/package.json similarity index 100% rename from 7project/frontend/package.json rename to 7project/src/frontend/package.json diff --git a/7project/frontend/public/vite.svg b/7project/src/frontend/public/vite.svg similarity index 100% rename from 7project/frontend/public/vite.svg rename to 7project/src/frontend/public/vite.svg diff --git a/7project/frontend/src/App.tsx b/7project/src/frontend/src/App.tsx similarity index 100% rename from 7project/frontend/src/App.tsx rename to 7project/src/frontend/src/App.tsx diff --git a/7project/frontend/src/api.ts b/7project/src/frontend/src/api.ts similarity index 100% rename from 7project/frontend/src/api.ts rename to 7project/src/frontend/src/api.ts diff --git a/7project/frontend/src/appearance.ts b/7project/src/frontend/src/appearance.ts similarity index 100% rename from 7project/frontend/src/appearance.ts rename to 7project/src/frontend/src/appearance.ts diff --git a/7project/frontend/src/assets/react.svg b/7project/src/frontend/src/assets/react.svg similarity index 100% rename from 7project/frontend/src/assets/react.svg rename to 7project/src/frontend/src/assets/react.svg diff --git a/7project/frontend/src/config.ts b/7project/src/frontend/src/config.ts similarity index 100% rename from 7project/frontend/src/config.ts rename to 7project/src/frontend/src/config.ts diff --git a/7project/frontend/src/index.css b/7project/src/frontend/src/index.css similarity index 100% rename from 7project/frontend/src/index.css rename to 7project/src/frontend/src/index.css diff --git a/7project/frontend/src/main.tsx b/7project/src/frontend/src/main.tsx similarity index 100% rename from 7project/frontend/src/main.tsx rename to 7project/src/frontend/src/main.tsx diff --git a/7project/frontend/src/pages/AccountPage.tsx b/7project/src/frontend/src/pages/AccountPage.tsx similarity index 100% rename from 7project/frontend/src/pages/AccountPage.tsx rename to 7project/src/frontend/src/pages/AccountPage.tsx diff --git a/7project/frontend/src/pages/AppearancePage.tsx b/7project/src/frontend/src/pages/AppearancePage.tsx similarity index 96% rename from 7project/frontend/src/pages/AppearancePage.tsx rename to 7project/src/frontend/src/pages/AppearancePage.tsx index 3aeaa1f..bd23961 100644 --- a/7project/frontend/src/pages/AppearancePage.tsx +++ b/7project/src/frontend/src/pages/AppearancePage.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react'; -import { applyFontSize, applyTheme, loadAppearance, saveAppearance, type FontSize, type Theme } from '../appearance'; +import { applyFontSize, applyTheme, loadAppearance, saveAppearance, type FontSize, type Theme } from '../appearance.ts'; export default function AppearancePage() { const [theme, setTheme] = useState('light'); diff --git a/7project/frontend/src/pages/BalanceChart.tsx b/7project/src/frontend/src/pages/BalanceChart.tsx similarity index 100% rename from 7project/frontend/src/pages/BalanceChart.tsx rename to 7project/src/frontend/src/pages/BalanceChart.tsx diff --git a/7project/frontend/src/pages/CategoryPieChart.tsx b/7project/src/frontend/src/pages/CategoryPieChart.tsx similarity index 98% rename from 7project/frontend/src/pages/CategoryPieChart.tsx rename to 7project/src/frontend/src/pages/CategoryPieChart.tsx index dcda08d..f8e412e 100644 --- a/7project/frontend/src/pages/CategoryPieChart.tsx +++ b/7project/src/frontend/src/pages/CategoryPieChart.tsx @@ -1,7 +1,7 @@ // src/CategoryPieCharts.tsx (renamed from CategoryPieChart.tsx) import { useMemo } from 'react'; import { PieChart, Pie, Cell, Tooltip, Legend, ResponsiveContainer } from 'recharts'; -import { type Transaction, type Category } from '../api'; +import { type Transaction, type Category } from '../api.ts'; const COLORS = ['#0088FE', '#00C49F', '#FFBB28', '#FF8042', '#AF19FF', '#FF4242', '#8884d8', '#82ca9d']; diff --git a/7project/frontend/src/pages/Dashboard.tsx b/7project/src/frontend/src/pages/Dashboard.tsx similarity index 100% rename from 7project/frontend/src/pages/Dashboard.tsx rename to 7project/src/frontend/src/pages/Dashboard.tsx diff --git a/7project/frontend/src/pages/LoginRegisterPage.tsx b/7project/src/frontend/src/pages/LoginRegisterPage.tsx similarity index 100% rename from 7project/frontend/src/pages/LoginRegisterPage.tsx rename to 7project/src/frontend/src/pages/LoginRegisterPage.tsx diff --git a/7project/frontend/src/pages/ManualManagement.tsx b/7project/src/frontend/src/pages/ManualManagement.tsx similarity index 100% rename from 7project/frontend/src/pages/ManualManagement.tsx rename to 7project/src/frontend/src/pages/ManualManagement.tsx diff --git a/7project/frontend/src/pages/MockBankModal.tsx b/7project/src/frontend/src/pages/MockBankModal.tsx similarity index 100% rename from 7project/frontend/src/pages/MockBankModal.tsx rename to 7project/src/frontend/src/pages/MockBankModal.tsx diff --git a/7project/frontend/src/ui.css b/7project/src/frontend/src/ui.css similarity index 100% rename from 7project/frontend/src/ui.css rename to 7project/src/frontend/src/ui.css diff --git a/7project/frontend/tsconfig.app.json b/7project/src/frontend/tsconfig.app.json similarity index 100% rename from 7project/frontend/tsconfig.app.json rename to 7project/src/frontend/tsconfig.app.json diff --git a/7project/frontend/tsconfig.json b/7project/src/frontend/tsconfig.json similarity index 100% rename from 7project/frontend/tsconfig.json rename to 7project/src/frontend/tsconfig.json diff --git a/7project/frontend/tsconfig.node.json b/7project/src/frontend/tsconfig.node.json similarity index 100% rename from 7project/frontend/tsconfig.node.json rename to 7project/src/frontend/tsconfig.node.json diff --git a/7project/frontend/vite.config.ts b/7project/src/frontend/vite.config.ts similarity index 100% rename from 7project/frontend/vite.config.ts rename to 7project/src/frontend/vite.config.ts diff --git a/7project/tofu/main.tf b/7project/src/tofu/main.tf similarity index 100% rename from 7project/tofu/main.tf rename to 7project/src/tofu/main.tf diff --git a/7project/tofu/modules/cert-manager/main.tf b/7project/src/tofu/modules/cert-manager/main.tf similarity index 100% rename from 7project/tofu/modules/cert-manager/main.tf rename to 7project/src/tofu/modules/cert-manager/main.tf diff --git a/7project/tofu/modules/cloudflare/cluster-tunnel.yaml b/7project/src/tofu/modules/cloudflare/cluster-tunnel.yaml similarity index 100% rename from 7project/tofu/modules/cloudflare/cluster-tunnel.yaml rename to 7project/src/tofu/modules/cloudflare/cluster-tunnel.yaml diff --git a/7project/tofu/modules/cloudflare/kustomization/kustomization.yaml b/7project/src/tofu/modules/cloudflare/kustomization/kustomization.yaml similarity index 100% rename from 7project/tofu/modules/cloudflare/kustomization/kustomization.yaml rename to 7project/src/tofu/modules/cloudflare/kustomization/kustomization.yaml diff --git a/7project/tofu/modules/cloudflare/main.tf b/7project/src/tofu/modules/cloudflare/main.tf similarity index 100% rename from 7project/tofu/modules/cloudflare/main.tf rename to 7project/src/tofu/modules/cloudflare/main.tf diff --git a/7project/tofu/modules/cloudflare/secret.yaml b/7project/src/tofu/modules/cloudflare/secret.yaml similarity index 100% rename from 7project/tofu/modules/cloudflare/secret.yaml rename to 7project/src/tofu/modules/cloudflare/secret.yaml diff --git a/7project/tofu/modules/cloudflare/variables.tf b/7project/src/tofu/modules/cloudflare/variables.tf similarity index 100% rename from 7project/tofu/modules/cloudflare/variables.tf rename to 7project/src/tofu/modules/cloudflare/variables.tf diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/Chart.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/Chart.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/Chart.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/Chart.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/backup.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/backup.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/backup.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/backup.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/config.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/config.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/config.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/config.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/garage.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/garage.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/garage.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/garage.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/grant.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/grant.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/grant.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/grant.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-0.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-0.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-0.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-0.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-1.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-1.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-1.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-1.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-2.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-2.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-2.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-2.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/maxscale-ui.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/maxscale-ui.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/maxscale-ui.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/maxscale-ui.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-config-map.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-config-map.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-config-map.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-config-map.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-deployment.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-deployment.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-deployment.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-deployment.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-service.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-service.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-service.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-service.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/user.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/user.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/templates/user.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/templates/user.yaml diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/values.yaml b/7project/src/tofu/modules/maxscale/charts/maxscale-helm/values.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/charts/maxscale-helm/values.yaml rename to 7project/src/tofu/modules/maxscale/charts/maxscale-helm/values.yaml diff --git a/7project/tofu/modules/maxscale/main.tf b/7project/src/tofu/modules/maxscale/main.tf similarity index 100% rename from 7project/tofu/modules/maxscale/main.tf rename to 7project/src/tofu/modules/maxscale/main.tf diff --git a/7project/tofu/modules/maxscale/mariadb-secret.yaml b/7project/src/tofu/modules/maxscale/mariadb-secret.yaml similarity index 100% rename from 7project/tofu/modules/maxscale/mariadb-secret.yaml rename to 7project/src/tofu/modules/maxscale/mariadb-secret.yaml diff --git a/7project/tofu/modules/maxscale/variables.tf b/7project/src/tofu/modules/maxscale/variables.tf similarity index 100% rename from 7project/tofu/modules/maxscale/variables.tf rename to 7project/src/tofu/modules/maxscale/variables.tf diff --git a/7project/tofu/modules/metallb/main.tf b/7project/src/tofu/modules/metallb/main.tf similarity index 100% rename from 7project/tofu/modules/metallb/main.tf rename to 7project/src/tofu/modules/metallb/main.tf diff --git a/7project/tofu/modules/metallb/variables.tf b/7project/src/tofu/modules/metallb/variables.tf similarity index 100% rename from 7project/tofu/modules/metallb/variables.tf rename to 7project/src/tofu/modules/metallb/variables.tf diff --git a/7project/tofu/modules/metrics-server/main.tf b/7project/src/tofu/modules/metrics-server/main.tf similarity index 100% rename from 7project/tofu/modules/metrics-server/main.tf rename to 7project/src/tofu/modules/metrics-server/main.tf diff --git a/7project/tofu/modules/metrics-server/values.yaml b/7project/src/tofu/modules/metrics-server/values.yaml similarity index 100% rename from 7project/tofu/modules/metrics-server/values.yaml rename to 7project/src/tofu/modules/metrics-server/values.yaml diff --git a/7project/tofu/modules/prometheus/grafana-ui.yaml b/7project/src/tofu/modules/prometheus/grafana-ui.yaml similarity index 100% rename from 7project/tofu/modules/prometheus/grafana-ui.yaml rename to 7project/src/tofu/modules/prometheus/grafana-ui.yaml diff --git a/7project/tofu/modules/prometheus/main.tf b/7project/src/tofu/modules/prometheus/main.tf similarity index 100% rename from 7project/tofu/modules/prometheus/main.tf rename to 7project/src/tofu/modules/prometheus/main.tf diff --git a/7project/tofu/modules/prometheus/values.yaml b/7project/src/tofu/modules/prometheus/values.yaml similarity index 100% rename from 7project/tofu/modules/prometheus/values.yaml rename to 7project/src/tofu/modules/prometheus/values.yaml diff --git a/7project/tofu/modules/prometheus/variables.tf b/7project/src/tofu/modules/prometheus/variables.tf similarity index 100% rename from 7project/tofu/modules/prometheus/variables.tf rename to 7project/src/tofu/modules/prometheus/variables.tf diff --git a/7project/tofu/modules/rabbitmq/main.tf b/7project/src/tofu/modules/rabbitmq/main.tf similarity index 100% rename from 7project/tofu/modules/rabbitmq/main.tf rename to 7project/src/tofu/modules/rabbitmq/main.tf diff --git a/7project/tofu/modules/rabbitmq/rabbit-cluster.yaml b/7project/src/tofu/modules/rabbitmq/rabbit-cluster.yaml similarity index 100% rename from 7project/tofu/modules/rabbitmq/rabbit-cluster.yaml rename to 7project/src/tofu/modules/rabbitmq/rabbit-cluster.yaml diff --git a/7project/tofu/modules/rabbitmq/rabbit-ui.yaml b/7project/src/tofu/modules/rabbitmq/rabbit-ui.yaml similarity index 100% rename from 7project/tofu/modules/rabbitmq/rabbit-ui.yaml rename to 7project/src/tofu/modules/rabbitmq/rabbit-ui.yaml diff --git a/7project/tofu/modules/rabbitmq/variables.tf b/7project/src/tofu/modules/rabbitmq/variables.tf similarity index 100% rename from 7project/tofu/modules/rabbitmq/variables.tf rename to 7project/src/tofu/modules/rabbitmq/variables.tf diff --git a/7project/tofu/modules/redis/main.tf b/7project/src/tofu/modules/redis/main.tf similarity index 100% rename from 7project/tofu/modules/redis/main.tf rename to 7project/src/tofu/modules/redis/main.tf diff --git a/7project/tofu/modules/redis/redis-ui.yaml b/7project/src/tofu/modules/redis/redis-ui.yaml similarity index 100% rename from 7project/tofu/modules/redis/redis-ui.yaml rename to 7project/src/tofu/modules/redis/redis-ui.yaml diff --git a/7project/tofu/modules/redis/replication.yaml b/7project/src/tofu/modules/redis/replication.yaml similarity index 100% rename from 7project/tofu/modules/redis/replication.yaml rename to 7project/src/tofu/modules/redis/replication.yaml diff --git a/7project/tofu/modules/redis/sentinel.yaml b/7project/src/tofu/modules/redis/sentinel.yaml similarity index 100% rename from 7project/tofu/modules/redis/sentinel.yaml rename to 7project/src/tofu/modules/redis/sentinel.yaml diff --git a/7project/tofu/modules/redis/variables.tf b/7project/src/tofu/modules/redis/variables.tf similarity index 100% rename from 7project/tofu/modules/redis/variables.tf rename to 7project/src/tofu/modules/redis/variables.tf diff --git a/7project/tofu/modules/storage/main.tf b/7project/src/tofu/modules/storage/main.tf similarity index 100% rename from 7project/tofu/modules/storage/main.tf rename to 7project/src/tofu/modules/storage/main.tf diff --git a/7project/tofu/terraform.tfvars.example b/7project/src/tofu/terraform.tfvars.example similarity index 100% rename from 7project/tofu/terraform.tfvars.example rename to 7project/src/tofu/terraform.tfvars.example diff --git a/7project/tofu/variables.tf b/7project/src/tofu/variables.tf similarity index 100% rename from 7project/tofu/variables.tf rename to 7project/src/tofu/variables.tf diff --git a/7project/upgrade_database.sh b/7project/src/upgrade_database.sh similarity index 100% rename from 7project/upgrade_database.sh rename to 7project/src/upgrade_database.sh