fixes #95

.vscode/tasks.json

@@ -4,9 +4,9 @@
     {
       "label": "Start App ",
       "type": "shell",
-      "command": "${workspaceFolder}/app/start.sh",
+      "command": "${workspaceFolder}/deploy/app-service/start.sh",
       "windows": {
-        "command": "pwsh ${workspaceFolder}/app/start.ps1"
+        "command": "pwsh ${workspaceFolder}/deploy/app-service/start.ps1"
       },
       "presentation": {
         "reveal": "always"

app/frontend/package.json

@@ -12,17 +12,18 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@azure/msal-react": "^2.0.4",
     "@azure/msal-browser": "^3.1.0",
+    "@azure/msal-react": "^2.0.4",
     "@fluentui/react": "^8.112.5",
     "@fluentui/react-components": "^9.37.3",
     "@fluentui/react-icons": "^2.0.221",
     "@react-spring/web": "^9.7.3",
     "dompurify": "^3.0.6",
+    "frontend": "file:",
+    "ndjson-readablestream": "^1.0.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.18.0",
-    "ndjson-readablestream": "^1.0.7",
     "scheduler": "^0.20.2"
   },
   "devDependencies": {
@@ -33,6 +34,5 @@
     "prettier": "^3.0.3",
     "typescript": "^5.2.2",
     "vite": "^4.5.3"
-
   }
 }

app/start.ps1 → deploy/app-service/start.ps1

@@ -19,7 +19,7 @@ if ($LASTEXITCODE -ne 0) {
 Write-Host ""
 Write-Host "Restoring frontend npm packages"
 Write-Host ""
-Set-Location ./frontend
+Set-Location ../../app/frontend
 npm install
 if ($LASTEXITCODE -ne 0) {
     Write-Host "Failed to restore frontend npm packages"
@@ -35,11 +35,20 @@ if ($LASTEXITCODE -ne 0) {
     exit $LASTEXITCODE
 }
 
+Write-Host ""
+Write-Host "Copying build files to backend static resources"
+Write-Host ""
+$staticPath = "../backend/src/main/resources/static"
+if (-Not (Test-Path -Path $staticPath)) {
+    New-Item -ItemType Directory -Path $staticPath
+}
+Copy-Item -Path "./build/*" -Destination $staticPath -Recurse -Force
+
 Write-Host ""
 Write-Host "Starting spring boot api backend and react spa from backend/public static content"
 Write-Host ""
 Set-Location ../backend
-Start-Process http://localhost:8080
+#Start-Process http://localhost:8080
 
 Start-Process -FilePath "./mvnw.cmd" -ArgumentList "spring-boot:run -Dspring-boot.run.profiles=dev" -Wait -NoNewWindow
 

app/start.sh → deploy/app-service/start.sh

@@ -21,7 +21,7 @@ echo ""
 echo "Restoring frontend npm packages"
 echo ""
 
-cd ./frontend
+cd ../../app/frontend
 npm install
 if [ $? -ne 0 ]; then
     echo "Failed to restore frontend npm packages"
@@ -38,6 +38,12 @@ if [ $? -ne 0 ]; then
     exit $?
 fi
 
+# Create static folder if it doesn't exist
+mkdir -p ../backend/src/main/resources/static
+
+# Copy files from build folder to static folder
+cp -r build/* ../backend/src/main/resources/static/
+
 echo ""
 echo "Starting spring boot api backend and react spa from backend/public static content"
 echo "Spring-boot application.properties use values from azd .env file which have been exported as environment variables"

docs/app-service/README-App-Service.md

@@ -193,7 +193,7 @@ azd up
     az login
     ```
 
-2. Change dir to `app`
+2. Change dir to `deploy\app-service`
 
     ```shell
     cd app