From 2da048febf516092216e54f4470d6c8973b157a9 Mon Sep 17 00:00:00 2001 From: Yohan Boujon Date: Sun, 22 Dec 2024 16:11:40 +0100 Subject: [PATCH] Renamed `helpapp-frontend` to `frontend` and `helpapp-backend` to `backend` --- .github/workflows/main_helpapp.yml | 4 ++-- {helpapp-backend => backend}/.gitignore | 0 {helpapp-backend => backend}/README.md | 0 {helpapp-backend => backend}/administration/pom.xml | 0 .../application/helpapp/rest/AdministrationService.java | 0 .../main/java/insa/application/helpapp/rest/Connection.java | 0 .../insa/application/helpapp/rest/ConnectionRepository.java | 0 {helpapp-backend => backend}/pom.xml | 0 {helpapp-backend => backend}/request-service/pom.xml | 0 .../insa/application/helpapp/rest/RequestRepository.java | 0 .../application/helpapp/rest/RequestServiceApplication.java | 0 .../main/java/insa/application/helpapp/rest/Requests.java | 0 {helpapp-backend => backend}/role-service/pom.xml | 0 .../src/main/java/insa/application/helpapp/rest/Role.java | 0 .../java/insa/application/helpapp/rest/RoleRepository.java | 0 .../application/helpapp/rest/RoleServiceApplication.java | 0 {helpapp-backend => backend}/user-service/pom.xml | 0 .../src/main/java/insa/application/helpapp/rest/User.java | 0 .../java/insa/application/helpapp/rest/UserRepository.java | 0 .../java/insa/application/helpapp/rest/UserService.java | 0 .../application/helpapp/rest/UserServiceApplication.java | 0 {helpapp-frontend => frontend}/.gitignore | 0 {helpapp-frontend => frontend}/README.md | 0 {helpapp-frontend => frontend}/base.js | 0 {helpapp-frontend => frontend}/htmx.html | 0 {helpapp-frontend => frontend}/index.html | 0 {helpapp-frontend => frontend}/index.js | 0 init.sh | 4 ++-- service.sh | 6 +++--- 29 files changed, 7 insertions(+), 7 deletions(-) rename {helpapp-backend => backend}/.gitignore (100%) rename {helpapp-backend => backend}/README.md (100%) rename {helpapp-backend => backend}/administration/pom.xml (100%) rename {helpapp-backend => backend}/administration/src/main/java/insa/application/helpapp/rest/AdministrationService.java (100%) rename {helpapp-backend => backend}/administration/src/main/java/insa/application/helpapp/rest/Connection.java (100%) rename {helpapp-backend => backend}/administration/src/main/java/insa/application/helpapp/rest/ConnectionRepository.java (100%) rename {helpapp-backend => backend}/pom.xml (100%) rename {helpapp-backend => backend}/request-service/pom.xml (100%) rename {helpapp-backend => backend}/request-service/src/main/java/insa/application/helpapp/rest/RequestRepository.java (100%) rename {helpapp-backend => backend}/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java (100%) rename {helpapp-backend => backend}/request-service/src/main/java/insa/application/helpapp/rest/Requests.java (100%) rename {helpapp-backend => backend}/role-service/pom.xml (100%) rename {helpapp-backend => backend}/role-service/src/main/java/insa/application/helpapp/rest/Role.java (100%) rename {helpapp-backend => backend}/role-service/src/main/java/insa/application/helpapp/rest/RoleRepository.java (100%) rename {helpapp-backend => backend}/role-service/src/main/java/insa/application/helpapp/rest/RoleServiceApplication.java (100%) rename {helpapp-backend => backend}/user-service/pom.xml (100%) rename {helpapp-backend => backend}/user-service/src/main/java/insa/application/helpapp/rest/User.java (100%) rename {helpapp-backend => backend}/user-service/src/main/java/insa/application/helpapp/rest/UserRepository.java (100%) rename {helpapp-backend => backend}/user-service/src/main/java/insa/application/helpapp/rest/UserService.java (100%) rename {helpapp-backend => backend}/user-service/src/main/java/insa/application/helpapp/rest/UserServiceApplication.java (100%) rename {helpapp-frontend => frontend}/.gitignore (100%) rename {helpapp-frontend => frontend}/README.md (100%) rename {helpapp-frontend => frontend}/base.js (100%) rename {helpapp-frontend => frontend}/htmx.html (100%) rename {helpapp-frontend => frontend}/index.html (100%) rename {helpapp-frontend => frontend}/index.js (100%) diff --git a/.github/workflows/main_helpapp.yml b/.github/workflows/main_helpapp.yml index 13c6d4a..774dc50 100644 --- a/.github/workflows/main_helpapp.yml +++ b/.github/workflows/main_helpapp.yml @@ -23,10 +23,10 @@ jobs: distribution: 'microsoft' - name: Build with Maven - run: cd helpapp-backend && mvn clean install + run: cd backend && mvn clean install - name: Upload artifact for deployment job uses: actions/upload-artifact@v4 with: name: java-app - path: '${{ github.workspace }}/helpapp-backend/*' \ No newline at end of file + path: '${{ github.workspace }}/backend/*' \ No newline at end of file diff --git a/helpapp-backend/.gitignore b/backend/.gitignore similarity index 100% rename from helpapp-backend/.gitignore rename to backend/.gitignore diff --git a/helpapp-backend/README.md b/backend/README.md similarity index 100% rename from helpapp-backend/README.md rename to backend/README.md diff --git a/helpapp-backend/administration/pom.xml b/backend/administration/pom.xml similarity index 100% rename from helpapp-backend/administration/pom.xml rename to backend/administration/pom.xml diff --git a/helpapp-backend/administration/src/main/java/insa/application/helpapp/rest/AdministrationService.java b/backend/administration/src/main/java/insa/application/helpapp/rest/AdministrationService.java similarity index 100% rename from helpapp-backend/administration/src/main/java/insa/application/helpapp/rest/AdministrationService.java rename to backend/administration/src/main/java/insa/application/helpapp/rest/AdministrationService.java diff --git a/helpapp-backend/administration/src/main/java/insa/application/helpapp/rest/Connection.java b/backend/administration/src/main/java/insa/application/helpapp/rest/Connection.java similarity index 100% rename from helpapp-backend/administration/src/main/java/insa/application/helpapp/rest/Connection.java rename to backend/administration/src/main/java/insa/application/helpapp/rest/Connection.java diff --git a/helpapp-backend/administration/src/main/java/insa/application/helpapp/rest/ConnectionRepository.java b/backend/administration/src/main/java/insa/application/helpapp/rest/ConnectionRepository.java similarity index 100% rename from helpapp-backend/administration/src/main/java/insa/application/helpapp/rest/ConnectionRepository.java rename to backend/administration/src/main/java/insa/application/helpapp/rest/ConnectionRepository.java diff --git a/helpapp-backend/pom.xml b/backend/pom.xml similarity index 100% rename from helpapp-backend/pom.xml rename to backend/pom.xml diff --git a/helpapp-backend/request-service/pom.xml b/backend/request-service/pom.xml similarity index 100% rename from helpapp-backend/request-service/pom.xml rename to backend/request-service/pom.xml diff --git a/helpapp-backend/request-service/src/main/java/insa/application/helpapp/rest/RequestRepository.java b/backend/request-service/src/main/java/insa/application/helpapp/rest/RequestRepository.java similarity index 100% rename from helpapp-backend/request-service/src/main/java/insa/application/helpapp/rest/RequestRepository.java rename to backend/request-service/src/main/java/insa/application/helpapp/rest/RequestRepository.java diff --git a/helpapp-backend/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java b/backend/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java similarity index 100% rename from helpapp-backend/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java rename to backend/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java diff --git a/helpapp-backend/request-service/src/main/java/insa/application/helpapp/rest/Requests.java b/backend/request-service/src/main/java/insa/application/helpapp/rest/Requests.java similarity index 100% rename from helpapp-backend/request-service/src/main/java/insa/application/helpapp/rest/Requests.java rename to backend/request-service/src/main/java/insa/application/helpapp/rest/Requests.java diff --git a/helpapp-backend/role-service/pom.xml b/backend/role-service/pom.xml similarity index 100% rename from helpapp-backend/role-service/pom.xml rename to backend/role-service/pom.xml diff --git a/helpapp-backend/role-service/src/main/java/insa/application/helpapp/rest/Role.java b/backend/role-service/src/main/java/insa/application/helpapp/rest/Role.java similarity index 100% rename from helpapp-backend/role-service/src/main/java/insa/application/helpapp/rest/Role.java rename to backend/role-service/src/main/java/insa/application/helpapp/rest/Role.java diff --git a/helpapp-backend/role-service/src/main/java/insa/application/helpapp/rest/RoleRepository.java b/backend/role-service/src/main/java/insa/application/helpapp/rest/RoleRepository.java similarity index 100% rename from helpapp-backend/role-service/src/main/java/insa/application/helpapp/rest/RoleRepository.java rename to backend/role-service/src/main/java/insa/application/helpapp/rest/RoleRepository.java diff --git a/helpapp-backend/role-service/src/main/java/insa/application/helpapp/rest/RoleServiceApplication.java b/backend/role-service/src/main/java/insa/application/helpapp/rest/RoleServiceApplication.java similarity index 100% rename from helpapp-backend/role-service/src/main/java/insa/application/helpapp/rest/RoleServiceApplication.java rename to backend/role-service/src/main/java/insa/application/helpapp/rest/RoleServiceApplication.java diff --git a/helpapp-backend/user-service/pom.xml b/backend/user-service/pom.xml similarity index 100% rename from helpapp-backend/user-service/pom.xml rename to backend/user-service/pom.xml diff --git a/helpapp-backend/user-service/src/main/java/insa/application/helpapp/rest/User.java b/backend/user-service/src/main/java/insa/application/helpapp/rest/User.java similarity index 100% rename from helpapp-backend/user-service/src/main/java/insa/application/helpapp/rest/User.java rename to backend/user-service/src/main/java/insa/application/helpapp/rest/User.java diff --git a/helpapp-backend/user-service/src/main/java/insa/application/helpapp/rest/UserRepository.java b/backend/user-service/src/main/java/insa/application/helpapp/rest/UserRepository.java similarity index 100% rename from helpapp-backend/user-service/src/main/java/insa/application/helpapp/rest/UserRepository.java rename to backend/user-service/src/main/java/insa/application/helpapp/rest/UserRepository.java diff --git a/helpapp-backend/user-service/src/main/java/insa/application/helpapp/rest/UserService.java b/backend/user-service/src/main/java/insa/application/helpapp/rest/UserService.java similarity index 100% rename from helpapp-backend/user-service/src/main/java/insa/application/helpapp/rest/UserService.java rename to backend/user-service/src/main/java/insa/application/helpapp/rest/UserService.java diff --git a/helpapp-backend/user-service/src/main/java/insa/application/helpapp/rest/UserServiceApplication.java b/backend/user-service/src/main/java/insa/application/helpapp/rest/UserServiceApplication.java similarity index 100% rename from helpapp-backend/user-service/src/main/java/insa/application/helpapp/rest/UserServiceApplication.java rename to backend/user-service/src/main/java/insa/application/helpapp/rest/UserServiceApplication.java diff --git a/helpapp-frontend/.gitignore b/frontend/.gitignore similarity index 100% rename from helpapp-frontend/.gitignore rename to frontend/.gitignore diff --git a/helpapp-frontend/README.md b/frontend/README.md similarity index 100% rename from helpapp-frontend/README.md rename to frontend/README.md diff --git a/helpapp-frontend/base.js b/frontend/base.js similarity index 100% rename from helpapp-frontend/base.js rename to frontend/base.js diff --git a/helpapp-frontend/htmx.html b/frontend/htmx.html similarity index 100% rename from helpapp-frontend/htmx.html rename to frontend/htmx.html diff --git a/helpapp-frontend/index.html b/frontend/index.html similarity index 100% rename from helpapp-frontend/index.html rename to frontend/index.html diff --git a/helpapp-frontend/index.js b/frontend/index.js similarity index 100% rename from helpapp-frontend/index.js rename to frontend/index.js diff --git a/init.sh b/init.sh index 4ef160f..f033008 100755 --- a/init.sh +++ b/init.sh @@ -44,7 +44,7 @@ echo -e $GREEN"Database setup successful!"$RESET services=() port=8081 echo "> Checking Microservices..." -for dir in helpapp-backend/*-service; do +for dir in backend/*-service; do if [[ -d "$dir" ]]; then services+=("$dir") fi @@ -73,5 +73,5 @@ for service in "${services[@]}"; do generated_js+="const $modified_name=$port\n" ((port++)) done -echo -e "$generated_js" > helpapp-frontend/generated.js +echo -e "$generated_js" > frontend/generated.js echo -e $GREEN"Setup successfull for each microservice !" diff --git a/service.sh b/service.sh index 0cfae8f..43c2353 100755 --- a/service.sh +++ b/service.sh @@ -9,7 +9,7 @@ ports=() list_services() { base_port=8081 - cd "$SCRIPT_DIR/helpapp-backend" + cd "$SCRIPT_DIR/backend" for dir in *-service; do if [[ -d "$dir" ]]; then services+=("$dir") @@ -44,7 +44,7 @@ check_services() { # Function to start services start_services() { echo "" > "$SCRIPT_DIR"/process.tmp - cd "$SCRIPT_DIR/helpapp-backend" || exit 1 + cd "$SCRIPT_DIR/backend" || exit 1 for service in "${services[@]}"; do echo "> Starting $service..." mvn spring-boot:run -pl "$service" > /dev/null 2>&1 & @@ -74,7 +74,7 @@ elif [ "$1" == "stop" ]; then list_services stop_services elif [ "$1" == "compile" ]; then - cd "$SCRIPT_DIR/helpapp-backend" || exit 1 + cd "$SCRIPT_DIR/backend" || exit 1 mvn clean install else echo -e $RED"Usage: $0 {compile|start|stop}"$RESET