Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ concurrency:
group: "pages"
cancel-in-progress: true

env:
BACKEND_DIR: backend

jobs:
build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -56,21 +59,21 @@ 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

# Copy Javadoc into Docusaurus static path
- 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:
Expand Down
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions Part1_RESTful-API-SpringBoot/pom.xml → backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<groupId>com.example</groupId>
<artifactId>SpringRest</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>Part1_RESTful-API-SpringBoot</name>
<description>Part1_RESTful-API-SpringBoot</description>
<name>backend</name>
<description>backend</description>
<url/>
<licenses>
<license/>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion fullstack-book/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down