Merge pull request #26 from aimingmed/feature/backend-frontend-structure

Feature/backend frontend structure

.github/workflows/develop.yml

@@ -1,9 +1,6 @@
 name: CI/CD - develop
 
 on: 
-  push:
-    branches:
-      - develop
   pull_request:
     branches:
       - develop
@@ -82,4 +79,5 @@ jobs:
       # - name: Black
       #   run: docker exec backend pipenv run python -m black . --check
       # - name: isort
-      #   run: docker exec backend pipenv run python -m isort . --check-only
+      #   run: docker exec backend pipenv run python -m isort . --check-only
+      

app/backend/Dockerfile.prod

@@ -23,7 +23,7 @@ RUN pip install --upgrade pip setuptools wheel -i https://pypi.tuna.tsinghua.edu
 RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -i https://pypi.tuna.tsinghua.edu.cn/simple pipenv
 RUN pip install --no-cache-dir --find-links=/usr/src/app/wheels pipenv
 COPY ./Pipfile .
-RUN pipenv install --deploy
+RUN pipenv lock --pre && pipenv install --deploy
 
 # add app
 COPY . /usr/src/app
@@ -68,7 +68,7 @@ COPY --from=builder /usr/src/app/wheels /wheels
 COPY --from=builder /usr/src/app/Pipfile .
 RUN pip install --upgrade pip setuptools wheel -i https://pypi.tuna.tsinghua.edu.cn/simple
 RUN pip install --no-cache /wheels/*
-RUN pipenv install --deploy
+RUN pipenv lock --pre && pipenv install --deploy 
 RUN pipenv run pip install "uvicorn[standard]==0.26.0"
 
 # add app

app/docker-compose.yml

@@ -13,6 +13,7 @@ services:
     build:
       context: ./backend
       dockerfile: Dockerfile
+    container_name: backend
     platform: linux/amd64
     command: pipenv run uvicorn main:app --reload --workers 1 --host 0.0.0.0 --port 8000
     volumes:
@@ -22,3 +23,18 @@ services:
     environment:
       - ENVIRONMENT=dev
       - TESTING=0
+
+  frontend:
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile.local
+    container_name: frontend
+    platform: linux/amd64
+    volumes:
+      - ./frontend:/usr/src/app
+    ports:
+      - "3004:5173"
+    depends_on:
+      - backend
+    environment:
+      LOG_LEVEL: "DEBUG"

app/frontend/.dockerignore

@@ -0,0 +1 @@
+node_modules

app/frontend/.env.production

@@ -0,0 +1 @@
+REACT_APP_BASE_URL=https://backend.aimingmed.com/

app/frontend/package-lock.json

@@ -16,6 +16,7 @@
         "@eslint/js": "^9.21.0",
         "@testing-library/jest-dom": "^6.6.3",
         "@testing-library/react": "^16.3.0",
+        "@types/node": "^22.14.0",
         "@types/react": "^19.0.10",
         "@types/react-dom": "^19.0.4",
         "@vitejs/plugin-react": "^4.3.4",
@@ -31,6 +32,9 @@
         "typescript-eslint": "^8.24.1",
         "vite": "^6.2.0",
         "vitest": "^3.1.1"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-linux-x64-gnu": "4.9.5"
       }
     },
     "node_modules/@adobe/css-tools": {
@@ -1484,13 +1488,12 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.39.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz",
-      "integrity": "sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.5.tgz",
+      "integrity": "sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1711,6 +1714,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/node": {
+      "version": "22.14.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.0.tgz",
+      "integrity": "sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.21.0"
+      }
+    },
     "node_modules/@types/react": {
       "version": "19.1.0",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.0.tgz",
@@ -4674,6 +4687,20 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/rollup/node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz",
+      "integrity": "sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/rrweb-cssom": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
@@ -5228,6 +5255,13 @@
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
+    "node_modules/undici-types": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",

app/frontend/package.json

@@ -20,6 +20,7 @@
     "@eslint/js": "^9.21.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
+    "@types/node": "^22.14.0",
     "@types/react": "^19.0.10",
     "@types/react-dom": "^19.0.4",
     "@vitejs/plugin-react": "^4.3.4",
@@ -35,5 +36,8 @@
     "typescript-eslint": "^8.24.1",
     "vite": "^6.2.0",
     "vitest": "^3.1.1"
+  },
+  "optionalDependencies": {
+    "@rollup/rollup-linux-x64-musl": "^3.28.0"
   }
 }

app/frontend/src/App.tsx

@@ -1,5 +1,8 @@
 import React, { useState, useEffect, useRef } from 'react';
 
+const BASE_DOMAIN_NAME = process.env.REACT_APP_DOMAIN_NAME || 'localhost';
+
+
 interface Message {
   sender: 'user' | 'bot';
   text: string;
@@ -13,7 +16,7 @@ const App: React.FC = () => {
 
   useEffect(() => {
     mounted.current = true;
-    const ws = new WebSocket('ws://localhost:8000/ws');
+    const ws = new WebSocket(`ws://${BASE_DOMAIN_NAME}:8004/ws`);
     setSocket(ws);
     ws.onopen = () => {
       console.log('WebSocket connection opened');

app/frontend/vite.config.ts

@@ -4,9 +4,11 @@ import react from '@vitejs/plugin-react'
 // https://vite.dev/config/
 export default defineConfig({
   plugins: [react()],
-  test: {
-    globals: true,
-    environment: "jsdom",
-    setupFiles: "./tests/setup.ts",
-  },
 });
+
+// https://vitest.dev/config/
+export const test = {
+  globals: true,
+  environment: "jsdom",
+  setupFiles: "./tests/setup.ts",
+};