Skip to content

Commit ce0fb52

Browse files
Merge remote-tracking branch 'origin/dev-v4' into DependentBotFix_Akhileswar
2 parents 6e95e44 + e98f209 commit ce0fb52

173 files changed

Lines changed: 3603 additions & 3813 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ updates:
3232
- "*"
3333

3434
- package-ecosystem: "pip"
35-
directory: "/src/frontend"
35+
directory: "/src/App"
3636
schedule:
3737
interval: "monthly"
3838
commit-message:

.github/workflows/docker-build-and-push.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- demo-v4
99
- hotfix
1010
paths:
11-
- 'src/frontend/**'
11+
- 'src/App/**'
1212
- 'src/backend/**'
1313
- 'src/mcp_server/**'
1414
- '.github/workflows/docker-build-and-push.yml'
@@ -31,7 +31,7 @@ on:
3131
- demo-v4
3232
- hotfix
3333
paths:
34-
- 'src/frontend/**'
34+
- 'src/App/**'
3535
- 'src/backend/**'
3636
- 'src/mcp_server/**'
3737
- '.github/workflows/docker-build-and-push.yml'
@@ -117,8 +117,8 @@ jobs:
117117
- name: Build and optionally push Frontend Docker image
118118
uses: docker/build-push-action@v6
119119
with:
120-
context: ./src/frontend
121-
file: ./src/frontend/Dockerfile
120+
context: ./src/App
121+
file: ./src/App/Dockerfile
122122
push: ${{ env.TAG != 'pullrequest-ignore' }}
123123
tags: |
124124
${{ steps.registry.outputs.ext_registry }}/macaefrontend:${{ env.TAG }}

.github/workflows/job-docker-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ jobs:
7474
env:
7575
DOCKER_BUILD_SUMMARY: false
7676
with:
77-
context: ./src/frontend
78-
file: ./src/frontend/Dockerfile
77+
context: ./src/App
78+
file: ./src/App/Dockerfile
7979
push: true
8080
tags: |
8181
${{ secrets.ACR_TEST_LOGIN_SERVER }}/macaefrontend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}

Multi-Agent-Custom-Automation-Engine-Solution-Accelerator.code-workspace

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"path": "."
55
},
66
// {
7-
// "path": "./src/frontend"
7+
// "path": "./src/App"
88
// },
99
// {
1010
// "path": "./src/backend"

azure_custom.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ services:
2626
remoteBuild: true
2727

2828
frontend:
29-
project: ./src/frontend
29+
project: ./src/App
3030
language: py
3131
host: appservice
3232
dist: ./dist

docs/LocalDevelopmentSetup.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Multi-Agent-Custom-Automation-Engine-Solution-Accelerator/ ← Repository roo
3434
│ │ ├── .venv/ ← Virtual environment
3535
│ │ └── .env ← Backend config file
3636
│ │ └── app.py ← Backend Entry Point
37-
│ ├── frontend/ ← cd src/frontend
37+
│ ├── App/ cd src/App
3838
│ │ ├── node_modules/ ← npm dependencies
3939
│ │ ├── .venv/ ← Virtual environment
4040
│ │ ├── frontend_server.py ← Frontend entry point
@@ -60,7 +60,7 @@ cd path/to/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator
6060
This project uses Backend `.env` file in Backend directory with different configuration requirements:
6161

6262
- **Backend**: `src/backend/.env`
63-
<!-- - **Frontend**: `src/frontend.env`
63+
<!-- - **Frontend**: `src/App.env`
6464
- **MCP Server**: `src/mcp_sevrer/.env` -->
6565

6666

@@ -189,7 +189,7 @@ Create `.vscode/settings.json` and copy the following JSON:
189189
},
190190
{
191191
"name": "Frontend",
192-
"path": "./src/frontend"
192+
"path": "./src/App"
193193
}
194194
]
195195
}
@@ -443,13 +443,13 @@ python mcp_server.py --transport streamable-http --host 0.0.0.0 --port 9000
443443

444444
> **📋 Terminal Reminder**: Open a **third dedicated terminal window (Terminal 3)** for the Frontend. Keep Terminals 1 (Backend) and 2 (MCP Server) running. All commands assume you start from the **repository root directory**.
445445
446-
The UI is located under `src/frontend`.
446+
The UI is located under `src/App`.
447447

448448
### 6.1. Navigate to Frontend Directory
449449

450450
```bash
451451
# From repository root
452-
cd src/frontend
452+
cd src/App
453453
```
454454

455455
### 6.2. Install UI Dependencies

docs/ManualAzureDeployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ az acr login --name <e.g. macaeacr2t62qyozi76bs>
5454

5555
## Build and push the image
5656

57-
Build the frontend and backend Docker images and push them to your Azure Container Registry. Run the following from the src/backend and the src/frontend directory contexts:
57+
Build the frontend and backend Docker images and push them to your Azure Container Registry. Run the following from the src/backend and the src/App directory contexts:
5858

5959
```sh
6060
az acr build \

0 commit comments

Comments
 (0)