Skip to content

Commit 645be00

Browse files
author
Curtis Gray
committed
Added dynamically set url and port for backend
Build fixes
1 parent cfe0330 commit 645be00

27 files changed

+509
-269
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ wingman_history*.json
99
*.db
1010
build
1111
llama.log
12+
.npm
1213

1314
ux/server/wingman/Windows
1415
ux/server/wingman/Linux

admin/build-ux-ci.ps1

+9-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ param(
77
[switch]$Force,
88

99
[Parameter(Mandatory = $false)]
10-
[switch]$SkipDeployment,
10+
[switch]$SkipCopyTo,
1111

1212
[Parameter(Mandatory = $false)]
1313
[switch]$SkipNpmInstall
@@ -78,15 +78,19 @@ try {
7878
throw "npm run build failed"
7979
}
8080

81-
if ($SkipDeployment) {
82-
Write-Warning "Skipping deployment..."
81+
if ($SkipCopyTo) {
82+
Write-Warning "Skipping copy to destination..."
8383
}
8484
else {
8585
# Copy the dist folder to wingman.cpp if the ../services/wingman.cpp/wingman folder exists
8686
$distRoot = "../services/wingman.cpp/wingman"
87+
$newDestination = Join-Path $distRoot "distadmin"
8788
if (Test-Path $distRoot) {
88-
Write-Host "Copying dist folder to wingman.cpp..."
89-
Copy-Item -Recurse -Force -ErrorAction SilentlyContinue ./dist ../services/wingman.cpp/wingman/distadmin
89+
Write-Host "Copying dist [admin] folder to wingman.cpp..."
90+
if (Test-Path $newDestination) {
91+
Remove-Item -Recurse -Force $newDestination # Delete the entire folder if it exists
92+
}
93+
Copy-Item -Recurse -Force -ErrorAction SilentlyContinue -Path ./dist -Destination $newDestination
9094
}
9195
else {
9296
Write-Warning "wingman.cpp folder not found. Skipping copy of dist folder..."

admin/package-lock.json

+124-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

admin/package.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,23 @@
1212
},
1313
"license": "MIT",
1414
"dependencies": {
15+
"@headlessui/react": "^1.7.18",
16+
"@tabler/icons-react": "^2.9.0",
1517
"react": "^18.2.0",
18+
"react-copy-to-clipboard": "^5.1.0",
1619
"react-dom": "^18.2.0"
1720
},
1821
"devDependencies": {
1922
"@types/react": "^18.2.7",
23+
"@types/react-copy-to-clipboard": "^5.0.7",
2024
"@types/react-dom": "^18.2.4",
2125
"@vitejs/plugin-react": "^4.2.1",
2226
"babel-preset-nano-react-app": "^0.1.0",
2327
"tailwindcss": "^3.4.3",
2428
"typescript": "^5.0.4",
2529
"vite": "^5.2.11",
26-
"vite-tsconfig-paths": "^4.2.0",
2730
"vite-plugin-top-level-await": "^1.4.1",
28-
"vite-plugin-wasm": "^3.3.0"
31+
"vite-plugin-wasm": "^3.3.0",
32+
"vite-tsconfig-paths": "^4.2.0"
2933
}
30-
}
34+
}

0 commit comments

Comments
 (0)