Skip to content

Commit 14f61f8

Browse files
refactor: restructure frontend folder - move contents to app/, rename frontend-server to server
1 parent 47e087c commit 14f61f8

39 files changed

Lines changed: 31 additions & 32 deletions

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ updates:
3535
# npm dependencies - grouped
3636
- package-ecosystem: "npm"
3737
directories:
38-
- "/src/app/frontend"
39-
- "/src/app/frontend-server"
38+
- "/src/app"
39+
- "/src/app/server"
4040
schedule:
4141
interval: "monthly"
4242
target-branch: "dependabotchanges"

.github/workflows/docker-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
- demo
99
paths:
1010
- 'src/backend/**'
11-
- 'src/app/frontend/**'
12-
- 'src/app/frontend-server/**'
11+
- 'src/app/**'
12+
- 'src/app/server/**'
1313
- '.github/workflows/docker-build.yml'
1414
pull_request:
1515
types:
@@ -23,8 +23,8 @@ on:
2323
- demo
2424
paths:
2525
- 'src/backend/**'
26-
- 'src/app/frontend/**'
27-
- 'src/app/frontend-server/**'
26+
- 'src/app/**'
27+
- 'src/app/server/**'
2828
- '.github/workflows/docker-build.yml'
2929
workflow_dispatch:
3030

.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ eggs/
3636
*.swo
3737

3838
# Node
39-
/src/app/frontend/node_modules/
40-
/src/app/frontend-server/node_modules/
41-
/src/app/frontend-server/static/
42-
/src/app/frontend-server/*.zip
39+
/src/app/node_modules/
40+
/src/app/server/node_modules/
41+
/src/app/server/static/
42+
/src/app/server/*.zip
4343
node_modules/
4444

4545
# Build output
4646
/src/app/static/
47-
/src/app/frontend/dist/
47+
/src/app/dist/
4848

4949
# Logs
5050
*.log

docs/AZD_DEPLOYMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ Error: az webapp deploy failed
251251

252252
**Solution**: Ensure the frontend builds successfully:
253253
```bash
254-
cd src/app/frontend
254+
cd src/app
255255
npm install
256256
npm run build
257257
```

docs/TECHNICAL_GUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ pip install -r requirements.txt
142142
python app.py
143143

144144
# Frontend
145-
cd src/app/frontend
145+
cd src/app
146146
npm install
147147
npm run dev
148148
```

scripts/deploy.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,14 @@ if ($continue -eq "y" -or $continue -eq "Y") {
131131
Write-Host "Step 3: Building and deploying frontend..." -ForegroundColor Green
132132
Write-Host "==========================================" -ForegroundColor Green
133133

134-
Set-Location "$ProjectDir\src\frontend"
134+
Set-Location "$ProjectDir\src\app"
135135
npm install
136136
npm run build
137137

138138
# Copy built files to server directory
139-
Copy-Item -Path "$ProjectDir\src\static\*" -Destination "$ProjectDir\src\frontend-server\static\" -Recurse -Force
139+
Copy-Item -Path "$ProjectDir\src\app\static\*" -Destination "$ProjectDir\src\app\server\static\" -Recurse -Force
140140

141-
Set-Location "$ProjectDir\src\frontend-server"
141+
Set-Location "$ProjectDir\src\app\server"
142142

143143
# Create deployment package
144144
if (Test-Path "frontend-deploy.zip") {

scripts/deploy.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
129129
echo "Step 3: Building and deploying frontend..."
130130
echo "=========================================="
131131

132-
cd "$PROJECT_DIR/src/frontend"
132+
cd "$PROJECT_DIR/src/app"
133133
npm install
134134
npm run build
135135

136136
# Copy built files to server directory
137-
cp -r "$PROJECT_DIR/src/static/"* "$PROJECT_DIR/src/frontend-server/static/"
137+
cp -r "$PROJECT_DIR/src/app/static/"* "$PROJECT_DIR/src/app/server/static/"
138138

139-
cd "$PROJECT_DIR/src/frontend-server"
139+
cd "$PROJECT_DIR/src/app/server"
140140

141141
# Create deployment package
142142
rm -f frontend-deploy.zip

scripts/local_dev.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
3131
$ProjectRoot = Split-Path -Parent $ScriptDir
3232
$SrcDir = Join-Path $ProjectRoot "src"
3333
$BackendDir = Join-Path $SrcDir "backend"
34-
$FrontendDir = Join-Path $SrcDir "app\frontend"
34+
$FrontendDir = Join-Path $SrcDir "app"
3535

3636
# Default ports
3737
$BackendPort = if ($env:BACKEND_PORT) { $env:BACKEND_PORT } else { "5000" }

scripts/local_dev.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
3434
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
3535
SRC_DIR="$PROJECT_ROOT/src"
3636
BACKEND_DIR="$SRC_DIR/backend"
37-
FRONTEND_DIR="$SRC_DIR/app/frontend"
37+
FRONTEND_DIR="$SRC_DIR/app"
3838

3939
# Default ports
4040
BACKEND_PORT=${BACKEND_PORT:-5000}

src/app/.dockerignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Build outputs (will be built in container)
1010
static/
1111
**/dist/
12-
frontend-server/static/
12+
server/static/
1313

1414
# Development files
1515
*.log
@@ -36,7 +36,6 @@ Thumbs.db
3636

3737
# Deployment artifacts
3838
*.zip
39-
frontend-deploy.zip
4039

4140
# Backend not needed for frontend build (and vice versa)
4241
# Comment out if building full-stack image

0 commit comments

Comments
 (0)