diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 3d74c83..46b288d 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -14,6 +14,9 @@ concurrency: group: "pages" cancel-in-progress: true +env: + BACKEND_DIR: backend + jobs: build: runs-on: ubuntu-latest @@ -56,11 +59,11 @@ jobs: distribution: temurin java-version: '21' - name: Build Javadoc (Maven) - working-directory: Part1_RESTful-API-SpringBoot + working-directory: ${{ env.BACKEND_DIR }} run: mvn -q -DskipTests javadoc:javadoc # For later(Part 3) when we migrate to gradle # - name: Build Javadoc (Gradle) -# working-directory: Part1_RESTful-API-SpringBoot +# working-directory: ${{ env.BACKEND_DIR }} # run: | # ./gradlew -q clean javadoc @@ -68,9 +71,9 @@ jobs: - name: Copy Javadoc into site run: | mkdir -p fullstack-book/static/javadoc - rsync -av --delete Part1_RESTful-API-SpringBoot/target/site/apidocs/ fullstack-book/static/javadoc/ || true + rsync -av --delete ${{ env.BACKEND_DIR }}/target/site/apidocs/ fullstack-book/static/javadoc/ || true # For later(Part 3) when we migrate to gradle -# rsync -av --delete Part1_RESTful-API-SpringBoot/build/docs/javadoc/ fullstack-book/static/javadoc/ || true +# rsync -av --delete ${{ env.BACKEND_DIR }}/build/docs/javadoc/ fullstack-book/static/javadoc/ || true - uses: actions/setup-node@v4 with: diff --git a/.gitignore b/.gitignore index 4c4cb5f..b71de35 100644 --- a/.gitignore +++ b/.gitignore @@ -76,7 +76,7 @@ Thumbs.db # ------------------------- # Project-specific (multi-part repo) # ------------------------- -Part1_RESTful-API-SpringBoot/target/ +backend/target/ Part2_Responsive-Frontend-React/node_modules/ part3-advanced-backend/target/ part4-advanced-frontend/node_modules/ @@ -85,9 +85,9 @@ part5-devops/.env # ------------------------- # Database Artifacts (H2 file-based) # ------------------------- -Part1_RESTful-API-SpringBoot/.data/ -Part1_RESTful-API-SpringBoot/*.mv.db -Part1_RESTful-API-SpringBoot/*.trace.db +backend/.data/ +backend/*.mv.db +backend/*.trace.db # ------------------------- # Docusaurus / Book Outputs diff --git a/Part1_RESTful-API-SpringBoot/.gitattributes b/backend/.gitattributes similarity index 100% rename from Part1_RESTful-API-SpringBoot/.gitattributes rename to backend/.gitattributes diff --git a/Part1_RESTful-API-SpringBoot/.gitignore b/backend/.gitignore similarity index 100% rename from Part1_RESTful-API-SpringBoot/.gitignore rename to backend/.gitignore diff --git a/Part1_RESTful-API-SpringBoot/.mvn/wrapper/maven-wrapper.properties b/backend/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from Part1_RESTful-API-SpringBoot/.mvn/wrapper/maven-wrapper.properties rename to backend/.mvn/wrapper/maven-wrapper.properties diff --git a/Part1_RESTful-API-SpringBoot/README.md b/backend/README.md similarity index 100% rename from Part1_RESTful-API-SpringBoot/README.md rename to backend/README.md diff --git a/Part1_RESTful-API-SpringBoot/mvnw b/backend/mvnw similarity index 100% rename from Part1_RESTful-API-SpringBoot/mvnw rename to backend/mvnw diff --git a/Part1_RESTful-API-SpringBoot/mvnw.cmd b/backend/mvnw.cmd similarity index 100% rename from Part1_RESTful-API-SpringBoot/mvnw.cmd rename to backend/mvnw.cmd diff --git a/Part1_RESTful-API-SpringBoot/pom.xml b/backend/pom.xml similarity index 97% rename from Part1_RESTful-API-SpringBoot/pom.xml rename to backend/pom.xml index 951b7ca..f881bd0 100644 --- a/Part1_RESTful-API-SpringBoot/pom.xml +++ b/backend/pom.xml @@ -11,8 +11,8 @@ com.example SpringRest 0.0.1-SNAPSHOT - Part1_RESTful-API-SpringBoot - Part1_RESTful-API-SpringBoot + backend + backend diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/SpringRestApplication.java b/backend/src/main/java/com/example/springrest/SpringRestApplication.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/SpringRestApplication.java rename to backend/src/main/java/com/example/springrest/SpringRestApplication.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/config/CorsConfig.java b/backend/src/main/java/com/example/springrest/config/CorsConfig.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/config/CorsConfig.java rename to backend/src/main/java/com/example/springrest/config/CorsConfig.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/config/package-info.java b/backend/src/main/java/com/example/springrest/config/package-info.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/config/package-info.java rename to backend/src/main/java/com/example/springrest/config/package-info.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/controllers/ProductController.java b/backend/src/main/java/com/example/springrest/controllers/ProductController.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/controllers/ProductController.java rename to backend/src/main/java/com/example/springrest/controllers/ProductController.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/controllers/package-info.java b/backend/src/main/java/com/example/springrest/controllers/package-info.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/controllers/package-info.java rename to backend/src/main/java/com/example/springrest/controllers/package-info.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/dto/ProductRequest.java b/backend/src/main/java/com/example/springrest/dto/ProductRequest.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/dto/ProductRequest.java rename to backend/src/main/java/com/example/springrest/dto/ProductRequest.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/dto/ProductResponse.java b/backend/src/main/java/com/example/springrest/dto/ProductResponse.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/dto/ProductResponse.java rename to backend/src/main/java/com/example/springrest/dto/ProductResponse.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/dto/package-info.java b/backend/src/main/java/com/example/springrest/dto/package-info.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/dto/package-info.java rename to backend/src/main/java/com/example/springrest/dto/package-info.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/exceptions/GlobalExceptionHandler.java b/backend/src/main/java/com/example/springrest/exceptions/GlobalExceptionHandler.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/exceptions/GlobalExceptionHandler.java rename to backend/src/main/java/com/example/springrest/exceptions/GlobalExceptionHandler.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/exceptions/ResourceNotFoundException.java b/backend/src/main/java/com/example/springrest/exceptions/ResourceNotFoundException.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/exceptions/ResourceNotFoundException.java rename to backend/src/main/java/com/example/springrest/exceptions/ResourceNotFoundException.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/exceptions/package-info.java b/backend/src/main/java/com/example/springrest/exceptions/package-info.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/exceptions/package-info.java rename to backend/src/main/java/com/example/springrest/exceptions/package-info.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/mappers/ProductMapper.java b/backend/src/main/java/com/example/springrest/mappers/ProductMapper.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/mappers/ProductMapper.java rename to backend/src/main/java/com/example/springrest/mappers/ProductMapper.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/mappers/package-info.java b/backend/src/main/java/com/example/springrest/mappers/package-info.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/mappers/package-info.java rename to backend/src/main/java/com/example/springrest/mappers/package-info.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/models/Product.java b/backend/src/main/java/com/example/springrest/models/Product.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/models/Product.java rename to backend/src/main/java/com/example/springrest/models/Product.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/models/package-info.java b/backend/src/main/java/com/example/springrest/models/package-info.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/models/package-info.java rename to backend/src/main/java/com/example/springrest/models/package-info.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/package-info.java b/backend/src/main/java/com/example/springrest/package-info.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/package-info.java rename to backend/src/main/java/com/example/springrest/package-info.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/repositories/ProductRepo.java b/backend/src/main/java/com/example/springrest/repositories/ProductRepo.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/repositories/ProductRepo.java rename to backend/src/main/java/com/example/springrest/repositories/ProductRepo.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/repositories/package-info.java b/backend/src/main/java/com/example/springrest/repositories/package-info.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/repositories/package-info.java rename to backend/src/main/java/com/example/springrest/repositories/package-info.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/services/ProductService.java b/backend/src/main/java/com/example/springrest/services/ProductService.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/services/ProductService.java rename to backend/src/main/java/com/example/springrest/services/ProductService.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/services/package-info.java b/backend/src/main/java/com/example/springrest/services/package-info.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/java/com/example/springrest/services/package-info.java rename to backend/src/main/java/com/example/springrest/services/package-info.java diff --git a/Part1_RESTful-API-SpringBoot/src/main/javadoc/javadoc.css b/backend/src/main/javadoc/javadoc.css similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/main/javadoc/javadoc.css rename to backend/src/main/javadoc/javadoc.css diff --git a/Part1_RESTful-API-SpringBoot/src/main/resources/application.properties b/backend/src/main/resources/application.properties similarity index 92% rename from Part1_RESTful-API-SpringBoot/src/main/resources/application.properties rename to backend/src/main/resources/application.properties index 26b33c8..26c2c8b 100644 --- a/Part1_RESTful-API-SpringBoot/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.application.name=Part1_RESTful-API-SpringBoot +spring.application.name=backend # CORS - Allowed origins app.cors.origins=http://localhost:5173,http://127.0.0.1:5173 diff --git a/Part1_RESTful-API-SpringBoot/src/test/java/com/example/springrest/SpringRestApplicationTests.java b/backend/src/test/java/com/example/springrest/SpringRestApplicationTests.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/test/java/com/example/springrest/SpringRestApplicationTests.java rename to backend/src/test/java/com/example/springrest/SpringRestApplicationTests.java diff --git a/Part1_RESTful-API-SpringBoot/src/test/java/com/example/springrest/controllers/ProductControllerTest.java b/backend/src/test/java/com/example/springrest/controllers/ProductControllerTest.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/test/java/com/example/springrest/controllers/ProductControllerTest.java rename to backend/src/test/java/com/example/springrest/controllers/ProductControllerTest.java diff --git a/Part1_RESTful-API-SpringBoot/src/test/java/com/example/springrest/repositories/ProductRepoTest.java b/backend/src/test/java/com/example/springrest/repositories/ProductRepoTest.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/test/java/com/example/springrest/repositories/ProductRepoTest.java rename to backend/src/test/java/com/example/springrest/repositories/ProductRepoTest.java diff --git a/Part1_RESTful-API-SpringBoot/src/test/java/com/example/springrest/services/ProductServiceTest.java b/backend/src/test/java/com/example/springrest/services/ProductServiceTest.java similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/test/java/com/example/springrest/services/ProductServiceTest.java rename to backend/src/test/java/com/example/springrest/services/ProductServiceTest.java diff --git a/Part1_RESTful-API-SpringBoot/src/test/postman/API endpoints testing.postman_collection.json b/backend/src/test/postman/API endpoints testing.postman_collection.json similarity index 100% rename from Part1_RESTful-API-SpringBoot/src/test/postman/API endpoints testing.postman_collection.json rename to backend/src/test/postman/API endpoints testing.postman_collection.json diff --git a/fullstack-book/package.json b/fullstack-book/package.json index d720fef..7acae8c 100644 --- a/fullstack-book/package.json +++ b/fullstack-book/package.json @@ -13,7 +13,7 @@ "serve": "docusaurus serve", "write-translations": "docusaurus write-translations", "write-heading-ids": "docusaurus write-heading-ids", - "docs:javadoc": "mvn -q -f ../Part1_RESTful-API-SpringBoot/pom.xml -DskipTests javadoc:javadoc && rm -rf static/javadoc && mkdir -p static/javadoc && rsync -a ../Part1_RESTful-API-SpringBoot/target/site/apidocs/ static/javadoc/", + "docs:javadoc": "mvn -q -f ../backend/pom.xml -DskipTests javadoc:javadoc && rm -rf static/javadoc && mkdir -p static/javadoc && rsync -a ../backend/target/site/apidocs/ static/javadoc/", "start:with-javadoc": "npm run docs:javadoc && cross-env LOCAL_DOCS=external docusaurus start" }, "dependencies": {