diff --git a/start-dev.sh b/start-dev.sh deleted file mode 100755 index d35cd17..0000000 --- a/start-dev.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash -# Temporary dev script for ERP migration — starts NocoDB + Express server + Vite - -set -e - -cleanup() { - echo "" - echo "Shutting down..." - kill $SERVER_PID $CLIENT_PID 2>/dev/null - docker stop nocodb 2>/dev/null - echo "Done." -} - -trap cleanup EXIT INT TERM - -cd "$(dirname "$0")" - -# Start NocoDB -if docker ps --format '{{.Names}}' | grep -q '^nocodb$'; then - echo "NocoDB already running on port 8090" -else - echo "Starting NocoDB..." - docker start nocodb 2>/dev/null || docker run -d \ - --name nocodb -p 8090:8080 nocodb/nocodb:latest -fi - -echo "Waiting for NocoDB..." -for i in $(seq 1 30); do - curl -s http://localhost:8090/api/v1/health >/dev/null 2>&1 && echo "NocoDB ready" && break - sleep 1 -done - -# Start Express server (port 3002) -echo "Starting Express server..." -(cd server && npm run dev) & -SERVER_PID=$! - -sleep 2 - -# Start Vite (port 3000) -echo "Starting Vite..." -npx vite & -CLIENT_PID=$! - -wait $CLIENT_PID diff --git a/start.sh b/start.sh index a3d198c..a6726dc 100755 --- a/start.sh +++ b/start.sh @@ -1,46 +1,45 @@ #!/usr/bin/env bash -# Launch both NocoDB (backend) and React (frontend) +# Start local dev environment: NocoDB + Express server + Vite set -e cleanup() { echo "" echo "Shutting down..." - if [ -n "$REACT_PID" ]; then - kill "$REACT_PID" 2>/dev/null - fi + kill $SERVER_PID $CLIENT_PID 2>/dev/null docker stop nocodb 2>/dev/null echo "Done." } trap cleanup EXIT INT TERM -# Start NocoDB container +cd "$(dirname "$0")" + +# Start NocoDB if docker ps --format '{{.Names}}' | grep -q '^nocodb$'; then echo "NocoDB already running on port 8090" else echo "Starting NocoDB..." docker start nocodb 2>/dev/null || docker run -d \ - --name nocodb \ - -p 8090:8080 \ - nocodb/nocodb:latest - echo "NocoDB started on port 8090" + --name nocodb -p 8090:8080 nocodb/nocodb:latest fi -# Wait for NocoDB to be ready echo "Waiting for NocoDB..." for i in $(seq 1 30); do - if curl -s http://localhost:8090/api/v1/health >/dev/null 2>&1; then - echo "NocoDB is ready" - break - fi + curl -s http://localhost:8090/api/v1/health >/dev/null 2>&1 && echo "NocoDB ready" && break sleep 1 done -# Start React dev server -echo "Starting React dev server..." -cd "$(dirname "$0")" -npm start & -REACT_PID=$! +# Start Express server (port 3002) +echo "Starting Express server..." +(cd server && npm run dev) & +SERVER_PID=$! -wait $REACT_PID +sleep 2 + +# Start Vite (port 3000) +echo "Starting Vite..." +npx vite & +CLIENT_PID=$! + +wait $CLIENT_PID