diff --git a/.gitignore b/.gitignore index e788132..ff1d479 100644 --- a/.gitignore +++ b/.gitignore @@ -351,11 +351,10 @@ MigrationBackup/ .DS_Store *.g.* -src/wwwroot/is-cache/* -src/wwwroot/assets/ -src/wwwroot/.vite/ -src/wwwroot/* -src/wwwroot/index.html +src/CookTime/wwwroot/is-cache/* +src/CookTime/wwwroot/assets/ +src/CookTime/wwwroot/.vite/ +src/CookTime/wwwroot/* FoodData_Central_sr_legacy_food_json_2021-10-28.json FoodData_Central_branded_food_json_2021-10-28.json .env.development.local diff --git a/scripts/build b/scripts/build index 111c6c2..5505173 100755 --- a/scripts/build +++ b/scripts/build @@ -5,13 +5,13 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" ROOT_DIR="$(dirname "$SCRIPT_DIR")" echo "Building frontend..." -cd "$ROOT_DIR/src/client-app" +cd "$ROOT_DIR/src/CookTime/client-app" npm ci npm run build echo "Copying frontend to wwwroot..." -cp -r build/client/* "$ROOT_DIR/src/wwwroot/" +cp -r build/client/* "$ROOT_DIR/src/CookTime/wwwroot/" echo "Building backend..." -cd "$ROOT_DIR" +cd "$ROOT_DIR/src" dotnet build diff --git a/scripts/build.sh b/scripts/build.sh deleted file mode 100755 index e96aadc..0000000 --- a/scripts/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -e - -echo "Building the solution..." -dotnet build diff --git a/scripts/publish b/scripts/publish index 787e66d..c5a8a59 100755 --- a/scripts/publish +++ b/scripts/publish @@ -6,12 +6,11 @@ ROOT_DIR="$(dirname "$SCRIPT_DIR")" OUTPUT_PATH=${1:-"./publish"} echo "Building frontend..." -cd "$ROOT_DIR/src/client-app" +cd "$ROOT_DIR/src/CookTime/client-app" npm run build echo "Copying frontend to wwwroot..." -cp -r build/client/* "$ROOT_DIR/src/wwwroot/" - +cp -r build/client/* "$ROOT_DIR/src/CookTime/wwwroot/" echo "Publishing backend to $OUTPUT_PATH..." cd "$ROOT_DIR/src" dotnet publish --configuration Release --verbosity normal --output "$OUTPUT_PATH" diff --git a/scripts/publish.sh b/scripts/publish.sh deleted file mode 100755 index 41700dc..0000000 --- a/scripts/publish.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e - -OUTPUT_PATH=${1:-"./publish"} - -echo "Publishing to $OUTPUT_PATH..." -cd src -dotnet publish --configuration Release --verbosity normal --output "$OUTPUT_PATH" diff --git a/src/CookTime/wwwroot/index.html b/src/CookTime/wwwroot/index.html deleted file mode 100644 index f2ff7e9..0000000 --- a/src/CookTime/wwwroot/index.html +++ /dev/null @@ -1,14 +0,0 @@ -