diff --git a/README.en.md b/README.en.md index 590ebb0..f918140 100644 --- a/README.en.md +++ b/README.en.md @@ -66,7 +66,7 @@ Highlight activities of DevFactory ๐Ÿค— Soohyun Kim
-
+

@@ -77,7 +77,7 @@ Highlight activities of DevFactory ๐Ÿค— Yesin Kim
-
+

@@ -87,7 +87,7 @@ Highlight activities of DevFactory ๐Ÿค— Seungkyu Kim
-
+

@@ -108,7 +108,7 @@ Highlight activities of DevFactory ๐Ÿค— Yujin Choi
-
+


diff --git a/README.md b/README.md index 62a4632..6d74c95 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ DevFactory์˜ ์ฃผ์š” ํ™œ๋™ ๋‚ด์—ญ์ž…๋‹ˆ๋‹ค ๐Ÿค— ๊น€์ˆ˜ํ˜„
-
+

@@ -72,7 +72,7 @@ DevFactory์˜ ์ฃผ์š” ํ™œ๋™ ๋‚ด์—ญ์ž…๋‹ˆ๋‹ค ๐Ÿค— ๊น€์˜ˆ์‹ 
-
+

@@ -82,7 +82,7 @@ DevFactory์˜ ์ฃผ์š” ํ™œ๋™ ๋‚ด์—ญ์ž…๋‹ˆ๋‹ค ๐Ÿค— ๊น€์Šน๊ทœ
-
+

@@ -103,7 +103,7 @@ DevFactory์˜ ์ฃผ์š” ํ™œ๋™ ๋‚ด์—ญ์ž…๋‹ˆ๋‹ค ๐Ÿค— ์ตœ์œ ์ง„
-
+


diff --git a/platform/docker-compose.dev.yml b/platform/docker-compose.dev.yml index 8213292..cb3bee3 100644 --- a/platform/docker-compose.dev.yml +++ b/platform/docker-compose.dev.yml @@ -1,43 +1,20 @@ services: - # Development Overrides with Traefik Support + # Development mode (Hot-Reloading) frontend: build: context: ./frontend target: build-stage - image: devfactory-frontend:dev - command: npm run dev -- --host 0.0.0.0 + command: npm run dev -- --host 0.0.0.0 --port 80 volumes: - ./frontend:/app - /app/node_modules - labels: - - traefik.enable=true - - traefik.docker.network=traefik - - traefik.http.routers.df-platform-web.rule=Host(`${APP_HOST}`) - - traefik.http.routers.df-platform-web.entrypoints=websecure - - traefik.http.routers.df-platform-web.tls=true - - traefik.http.routers.df-platform-web.tls.certresolver=le - - traefik.http.services.df-platform-web.loadbalancer.server.port=5173 - # HTTP โ†’ HTTPS redirect (re-adding to ensure full functionality) - - traefik.http.routers.df-platform-web-http.rule=Host(`${APP_HOST}`) - - traefik.http.routers.df-platform-web-http.entrypoints=web - - traefik.http.routers.df-platform-web-http.middlewares=redirect-to-https@file - - traefik.http.routers.df-platform-web-http.service=df-platform-web + ports: + - "8081:80" server: command: npm run dev volumes: - ./server:/app - /app/node_modules - labels: - - traefik.enable=true - - traefik.docker.network=traefik - - traefik.http.routers.df-platform-api.rule=Host(`${APP_HOST}`) && PathPrefix(`/api`) - - traefik.http.routers.df-platform-api.entrypoints=websecure - - traefik.http.routers.df-platform-api.tls=true - - traefik.http.routers.df-platform-api.tls.certresolver=le - - traefik.http.services.df-platform-api.loadbalancer.server.port=3000 - # HTTP โ†’ HTTPS redirect - - traefik.http.routers.df-platform-api-http.rule=Host(`${APP_HOST}`) && PathPrefix(`/api`) - - traefik.http.routers.df-platform-api-http.entrypoints=web - - traefik.http.routers.df-platform-api-http.middlewares=redirect-to-https@file - - traefik.http.routers.df-platform-api-http.service=df-platform-api + ports: + - "3000:3000" diff --git a/platform/docker-compose.yml b/platform/docker-compose.yml index ab83126..3601198 100644 --- a/platform/docker-compose.yml +++ b/platform/docker-compose.yml @@ -3,60 +3,22 @@ services: frontend: build: context: ./frontend - labels: - - "org.pseudolab.project=devfactory-platform" container_name: devfactory-frontend restart: unless-stopped - networks: - - traefik - - internal - labels: - - traefik.enable=true - - traefik.docker.network=traefik - # --- Traefik Router (frontend) --- - - traefik.http.routers.df-platform-web.rule=Host(`${APP_HOST}`) - - traefik.http.routers.df-platform-web.entrypoints=websecure - - traefik.http.routers.df-platform-web.tls=true - - traefik.http.routers.df-platform-web.tls.certresolver=le - - traefik.http.services.df-platform-web.loadbalancer.server.port=80 - # HTTP โ†’ HTTPS redirect - - traefik.http.routers.df-platform-web-http.rule=Host(`${APP_HOST}`) - - traefik.http.routers.df-platform-web-http.entrypoints=web - - traefik.http.routers.df-platform-web-http.middlewares=redirect-to-https@file - - traefik.http.routers.df-platform-web-http.service=df-platform-web + ports: + - "8081:80" # Caddy๊ฐ€ 8081๋กœ ์ ‘์†ํ•˜๋„๋ก ์„ค์ • + depends_on: + - server # Backend API server server: build: context: ./server - labels: - - "org.pseudolab.project=devfactory-platform" container_name: devfactory-api restart: unless-stopped environment: - DATABASE_URL=${DATABASE_URL} - ACCESS_LOGGING_IP_SALT=${ACCESS_LOGGING_IP_SALT} - PORT=3000 - networks: - - traefik - - internal - labels: - - traefik.enable=true - - traefik.docker.network=traefik - # --- Traefik Router (backend) --- - - traefik.http.routers.df-platform-api.rule=Host(`${APP_HOST}`) && PathPrefix(`/api`) - - traefik.http.routers.df-platform-api.entrypoints=websecure - - traefik.http.routers.df-platform-api.tls=true - - traefik.http.routers.df-platform-api.tls.certresolver=le - - traefik.http.services.df-platform-api.loadbalancer.server.port=3000 - # HTTP โ†’ HTTPS redirect - - traefik.http.routers.df-platform-api-http.rule=Host(`${APP_HOST}`) && PathPrefix(`/api`) - - traefik.http.routers.df-platform-api-http.entrypoints=web - - traefik.http.routers.df-platform-api-http.middlewares=redirect-to-https@file - - traefik.http.routers.df-platform-api-http.service=df-platform-api - -networks: - traefik: - external: true - internal: - driver: bridge + ports: + - "3000:3000" diff --git a/platform/frontend/history/index.html b/platform/frontend/history/index.html index cfa7f6d..1207e16 100644 --- a/platform/frontend/history/index.html +++ b/platform/frontend/history/index.html @@ -5,7 +5,7 @@ DevFactory | Our Journey - + @@ -13,15 +13,39 @@
- + DevFactory +
+ + +
+ +
+ + +
+
@@ -133,11 +157,61 @@

6th PseudoCon

-