diff --git a/.run/GatewayApplication.run.xml b/.run/GatewayApplication.run.xml deleted file mode 100644 index 12fd0a8..0000000 --- a/.run/GatewayApplication.run.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/backend/.gitlab-ci.yml b/backend/.gitlab-ci.yml index 14f3acb..8d58bed 100644 --- a/backend/.gitlab-ci.yml +++ b/backend/.gitlab-ci.yml @@ -7,7 +7,6 @@ build_backend: artifacts: paths: - backend/common/target/ - - backend/gateway/target/ - backend/discovery/target/ - backend/server/target expire_in: 1 hour @@ -21,18 +20,6 @@ docker_common: needs: - build_backend -docker_gateway: - extends: .docker-build-template - variables: - IMAGE_NAME: gateway - COMMON_IMAGE: "$CI_REGISTRY/$CI_PROJECT_PATH/common" - WORKDIR_PATH: backend - DOCKERFILE_PATH: Dockerfile.app - BUILD_FOLDER: "gateway/target" - MAIN_CLASS: dev.rheinsw.gateway.GatewayApplication - needs: - - build_backend - - docker_common docker_server: extends: .docker-build-template diff --git a/backend/gateway/pom.xml b/backend/gateway/pom.xml deleted file mode 100644 index 8fb5eaa..0000000 --- a/backend/gateway/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - 4.0.0 - - dev.rheinsw - backend - 1.0.0 - - - dev.rheinsw.backend - gateway - - - 21 - 21 - UTF-8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - ${maven.compiler.source} - ${maven.compiler.target} - - - org.projectlombok - lombok - ${lombok.version} - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.6.0 - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory}/libs - runtime - - - - - - - - - - org.springframework.cloud - spring-cloud-starter-gateway - - - - com.github.ben-manes.caffeine - caffeine - 3.2.0 - - - - - org.projectlombok - lombok - ${lombok.version} - provided - - - - dev.rheinsw - common - 1.0.0 - compile - - - - \ No newline at end of file diff --git a/backend/gateway/src/main/java/dev/rheinsw/gateway/GatewayApplication.java b/backend/gateway/src/main/java/dev/rheinsw/gateway/GatewayApplication.java deleted file mode 100644 index 30f8d2a..0000000 --- a/backend/gateway/src/main/java/dev/rheinsw/gateway/GatewayApplication.java +++ /dev/null @@ -1,15 +0,0 @@ -package dev.rheinsw.gateway; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Thatsaphorn Atchariyaphap - * @since 04.05.25 - */ -@SpringBootApplication -public class GatewayApplication { - public static void main(String[] args) { - SpringApplication.run(GatewayApplication.class, args); - } -} diff --git a/backend/gateway/src/main/resources/application.yml b/backend/gateway/src/main/resources/application.yml deleted file mode 100644 index eb79d03..0000000 --- a/backend/gateway/src/main/resources/application.yml +++ /dev/null @@ -1,19 +0,0 @@ -server: - port: 8080 - -spring: - application: - name: gateway - main: - web-application-type: reactive # Set the application type to reactive - - cloud: - gateway: - routes: - - id: server - uri: http://${SERVER_HOST:localhost}:8081 - predicates: - - Path=/api/** - filters: - - StripPrefix=1 - - PreserveHostHeader \ No newline at end of file diff --git a/backend/pom.xml b/backend/pom.xml index fe5e54c..89691d7 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -11,7 +11,6 @@ common - gateway server diff --git a/backend/server/src/main/java/dev/rheinsw/server/contact/controller/ContactController.java b/backend/server/src/main/java/dev/rheinsw/server/contact/controller/ContactController.java index 79a700e..b0b7d02 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/contact/controller/ContactController.java +++ b/backend/server/src/main/java/dev/rheinsw/server/contact/controller/ContactController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @AllArgsConstructor -@RequestMapping("/contact") +@RequestMapping("/api/contact") public class ContactController { private static final Logger log = LoggerFactory.getLogger(ContactController.class); diff --git a/backend/server/src/main/java/dev/rheinsw/server/customer/controller/CustomerController.java b/backend/server/src/main/java/dev/rheinsw/server/customer/controller/CustomerController.java index 67106c9..582a4ca 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/customer/controller/CustomerController.java +++ b/backend/server/src/main/java/dev/rheinsw/server/customer/controller/CustomerController.java @@ -24,7 +24,7 @@ import java.util.UUID; * @since 02.07.25 */ @RestController -@RequestMapping("/customers") +@RequestMapping("/api/customers") @RequiredArgsConstructor public class CustomerController extends AbstractController { diff --git a/backend/server/src/main/java/dev/rheinsw/server/mail/controller/MailController.java b/backend/server/src/main/java/dev/rheinsw/server/mail/controller/MailController.java index 298abf8..a15a8b0 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/mail/controller/MailController.java +++ b/backend/server/src/main/java/dev/rheinsw/server/mail/controller/MailController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; * @since 04.05.25 */ @RestController -@RequestMapping("/mail") +@RequestMapping("/api/mail") @RequiredArgsConstructor public class MailController { diff --git a/backend/server/src/main/java/dev/rheinsw/server/project/controller/ProjectController.java b/backend/server/src/main/java/dev/rheinsw/server/project/controller/ProjectController.java index 13763e9..d6db837 100644 --- a/backend/server/src/main/java/dev/rheinsw/server/project/controller/ProjectController.java +++ b/backend/server/src/main/java/dev/rheinsw/server/project/controller/ProjectController.java @@ -23,7 +23,7 @@ import java.util.UUID; * @since 12.07.25 */ @RestController -@RequestMapping("/projects") +@RequestMapping("/api/projects") @RequiredArgsConstructor public class ProjectController extends AbstractController { diff --git a/backend/server/src/main/resources/application.yml b/backend/server/src/main/resources/application.yml index 16a934b..caf605b 100644 --- a/backend/server/src/main/resources/application.yml +++ b/backend/server/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8081 + port: 8080 spring: application: @@ -49,4 +49,4 @@ hcaptcha: logging: level: org.hibernate.SQL: ${LOG_SQL_LEVEL} - org.hibernate.type.descriptor.sql.BasicBinder: ${LOG_BINDER_LEVEL} \ No newline at end of file + org.hibernate.type.descriptor.sql.BasicBinder: ${LOG_BINDER_LEVEL} diff --git a/docker-compose.yml b/docker-compose.yml index fbb28e9..0e88cd0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,18 +1,11 @@ services: - gateway: - image: registry.boomlab.party/rheinsw/rheinsw-mono-repo/gateway - container_name: gateway - env_file: - - ./gateway.env - restart: on-failure - networks: - - rheinsw-net - server: image: registry.boomlab.party/rheinsw/rheinsw-mono-repo/server container_name: server env_file: - ./server.env + ports: + - "8080:8080" restart: on-failure networks: - rheinsw-net diff --git a/frontend/app/api/contact/route.ts b/frontend/app/api/contact/route.ts index 598b515..7b45e22 100644 --- a/frontend/app/api/contact/route.ts +++ b/frontend/app/api/contact/route.ts @@ -3,10 +3,10 @@ import {NextRequest, NextResponse} from 'next/server' const HCAPTCHA_SECRET = process.env.HCAPTCHA_SECRET ?? '' const SHARED_API_KEY = process.env.SHARED_API_KEY ?? '' -// Detect whether to use localhost or Docker gateway -const useLocalGatewayEnv = process.env.USE_LOCAL_GATEWAY -const useLocalGateway = useLocalGatewayEnv?.toLowerCase() === 'true' -const gatewayHost = useLocalGateway ? 'http://localhost:8080' : 'http://gateway:8080' +// Detect whether to use localhost or Docker server +const useLocalServerEnv = process.env.USE_LOCAL_SERVER +const useLocalServer = useLocalServerEnv?.toLowerCase() === 'true' +const serverHost = useLocalServer ? 'http://localhost:8080' : 'http://server:8080' export async function POST(req: NextRequest) { try { @@ -42,7 +42,7 @@ export async function POST(req: NextRequest) { // } // Step 2: Forward to backend service - const backendRes = await fetch(`${gatewayHost}/api/contact`, { + const backendRes = await fetch(`${serverHost}/api/contact`, { method: 'POST', headers: { Origin: origin,