Merge pull request #56 from john0isaac/restructure-files

Restructure files

Author: pamelafox

.devcontainer/devcontainer.json

@@ -54,7 +54,7 @@
 		}
 	},
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "pip install -r requirements-dev.txt && pip install -e src",
+	"postCreateCommand": "pip install -r requirements-dev.txt && pip install -e src/backend",
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode"
 }

.github/workflows/app-tests.yaml

@@ -55,12 +55,12 @@ jobs:
             python -m pip install -r requirements-dev.txt
         - name: Install app as editable app
           run: |
-            python -m pip install -e src
+            python -m pip install -e src/backend
         - name: Setup local database with seed data
           run: |
             cp .env.sample .env
-            python ./src/fastapi_app/setup_postgres_database.py
-            python ./src/fastapi_app/setup_postgres_seeddata.py
+            python ./src/backend/fastapi_app/setup_postgres_database.py
+            python ./src/backend/fastapi_app/setup_postgres_seeddata.py
         - name: Setup node
           uses: actions/setup-node@v4
           with:

README.md

@@ -4,7 +4,7 @@ metadata:
     template: [email protected]
 services:
     web:
-        project: ./src
+        project: ./src/backend
         language: py
         module: web
         host: containerapp

azure.yaml

@@ -1,4 +1,4 @@
--r src/requirements.txt
+-r src/backend/requirements.txt
 ruff
 pre-commit
 pip-tools

requirements-dev.txt

@@ -4,5 +4,5 @@ echo 'Creating Python virtual environment in .venv...'
 python3 -m venv .venv
 
 echo 'Installing dependencies from "requirements.txt" into virtual environment (in quiet mode)...'
-.venv/bin/python -m pip --quiet --disable-pip-version-check install -e src
+.venv/bin/python -m pip --quiet --disable-pip-version-check install -e src/backend
 .venv/bin/python -m pip --quiet --disable-pip-version-check install -r requirements-dev.txt

scripts/load_python_env.sh

@@ -7,4 +7,4 @@ if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRE
     exit 1
 }
 
-python ./src/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME
+python ./src/backend/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME

scripts/setup_postgres_azurerole.ps1

@@ -9,4 +9,4 @@ fi
 
 . ./scripts/load_python_env.sh
 
-.venv/bin/python ./src/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME
+.venv/bin/python ./src/backend/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME

scripts/setup_postgres_azurerole.sh

@@ -7,4 +7,4 @@ if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRE
     exit 1
 }
 
-python ./src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --password $POSTGRES_PASSWORD
+python ./backend/src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --password $POSTGRES_PASSWORD

scripts/setup_postgres_database.ps1

@@ -4,4 +4,4 @@ POSTGRES_DATABASE=$(azd env get-values | grep POSTGRES_DATABASE | sed 's/="/=/'
 
 . ./scripts/load_python_env.sh
 
-.venv/bin/python ./src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE
+.venv/bin/python ./src/backend/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE