From 7dc6b4fa08df237e6aa341fb1481745cd52c620b Mon Sep 17 00:00:00 2001 From: BruCandy <161817534+BruCandy@users.noreply.github.com> Date: Fri, 12 Dec 2025 13:43:49 +0900 Subject: [PATCH 1/3] =?UTF-8?q?both:Dockerfile=E3=80=81docker-compose.yml?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/Dockerfile | 14 ++++++++++++++ backend/core/settings.py | 2 +- docker-compose.yml | 34 ++++++++++++++++++++++++++++++++++ frontend/.dockerignore | 2 ++ frontend/Dockerfile | 11 +++++++++++ frontend/vite.config.ts | 3 +++ 6 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 backend/Dockerfile create mode 100644 docker-compose.yml create mode 100644 frontend/.dockerignore create mode 100644 frontend/Dockerfile diff --git a/backend/Dockerfile b/backend/Dockerfile new file mode 100644 index 0000000..484cb27 --- /dev/null +++ b/backend/Dockerfile @@ -0,0 +1,14 @@ +FROM python:3.12 + +ENV PYTHONUNBUFFERED=1 + +WORKDIR /backend + +RUN pip install poetry +RUN poetry config virtualenvs.create false + +COPY pyproject.toml* poetry.lock* ./ + +RUN poetry install --no-root --no-interaction --no-ansi + +COPY . . diff --git a/backend/core/settings.py b/backend/core/settings.py index 5a656ac..24c10be 100644 --- a/backend/core/settings.py +++ b/backend/core/settings.py @@ -90,7 +90,7 @@ DATABASES = { "default": { "ENGINE": "django.db.backends.sqlite3", - "NAME": BASE_DIR / "db.sqlite3", + "NAME": BASE_DIR / "db" / "db.sqlite3", } } diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..f17fedd --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,34 @@ +services: + frontend: + build: + context: ./frontend + dockerfile: Dockerfile + volumes: + - ./frontend:/frontend + - /frontend/node_modules + command: pnpm run dev + ports: + - "5173:5173" + depends_on: + - backend + + backend: + build: + context: ./backend + dockerfile: Dockerfile + volumes: + - ./backend:/backend + - sqlite_data:/backend/db + command: daphne core.asgi:application --port 8000 --bind 0.0.0.0 + ports: + - "8000:8000" + depends_on: + - redis + + redis: + image: redis:latest + ports: + - "6379:6379" + +volumes: + sqlite_data: \ No newline at end of file diff --git a/frontend/.dockerignore b/frontend/.dockerignore new file mode 100644 index 0000000..dd87e2d --- /dev/null +++ b/frontend/.dockerignore @@ -0,0 +1,2 @@ +node_modules +build diff --git a/frontend/Dockerfile b/frontend/Dockerfile new file mode 100644 index 0000000..df02ae8 --- /dev/null +++ b/frontend/Dockerfile @@ -0,0 +1,11 @@ +FROM node:22.12.0 + +RUN npm install -g pnpm + +WORKDIR /frontend + +COPY package.json pnpm-lock.yaml ./ + +RUN pnpm install --frozen-lockfile + +COPY . . diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index f3d8926..b441547 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -11,4 +11,7 @@ export default defineConfig({ "@": path.resolve(__dirname, "./src"), }, }, + server: { + host: true + } }); From ec583d6899bc51b8fa6266c5c1ea8bbf1f02a70a Mon Sep 17 00:00:00 2001 From: BruCandy <161817534+BruCandy@users.noreply.github.com> Date: Fri, 12 Dec 2025 14:14:12 +0900 Subject: [PATCH 2/3] =?UTF-8?q?both:=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AE?= =?UTF-8?q?=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/core/settings.py | 2 +- frontend/src/pages/AlgorithmAndResultPage.tsx | 8 ++++---- frontend/src/pages/BillingPage.tsx | 4 ++-- frontend/src/pages/MembersPage.tsx | 4 ++-- frontend/vite.config.ts | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/backend/core/settings.py b/backend/core/settings.py index 24c10be..53ced92 100644 --- a/backend/core/settings.py +++ b/backend/core/settings.py @@ -140,7 +140,7 @@ "default": { "BACKEND": "channels_redis.core.RedisChannelLayer", "CONFIG": { - "hosts": [("127.0.0.1", 6379)], + "hosts": [("redis", 6379)], }, }, } \ No newline at end of file diff --git a/frontend/src/pages/AlgorithmAndResultPage.tsx b/frontend/src/pages/AlgorithmAndResultPage.tsx index 048643d..27c02f5 100644 --- a/frontend/src/pages/AlgorithmAndResultPage.tsx +++ b/frontend/src/pages/AlgorithmAndResultPage.tsx @@ -1,9 +1,9 @@ import { useEffect, useState } from "react"; import { useNavigate, useParams } from "react-router-dom"; -// import { ConnectAlert } from "@/components/ConnectAlert"; +import { ConnectAlert } from "@/components/ConnectAlert"; import NetworkGraph from "@/components/NetworkGraph"; import SelectAlgorithm from "@/components/SelectAlgorithm"; -// import { useSharedChatHandler } from "@/hooks/WebSocketContext"; +import { useSharedChatHandler } from "@/hooks/WebSocketContext"; import { deleteResult } from "@/lib/deleteResult"; import { downloadCsv } from "@/lib/downloadCsv"; import { fetchResult } from "@/lib/fetchResult"; @@ -29,7 +29,7 @@ export default function AlgorithmAndResultPage({ payments, members }: Props) { const [isLoading, setIsLoading] = useState(false); const [error, setError] = useState(null); const { eventId } = useParams(); - // const ws = useSharedChatHandler(); + const ws = useSharedChatHandler(); const handleSubmit = async () => { if (!algorithmId) return setError("アルゴリズムを選択してください"); @@ -75,7 +75,7 @@ export default function AlgorithmAndResultPage({ payments, members }: Props) { return (
- {/* */} + - {/* */} + - {/* */} + Date: Fri, 12 Dec 2025 14:53:02 +0900 Subject: [PATCH 3/3] =?UTF-8?q?backend:=E3=82=B7=E3=82=A7=E3=83=AB?= =?UTF-8?q?=E3=82=B9=E3=82=AF=E3=83=AA=E3=83=97=E3=83=88=E3=81=A7migration?= =?UTF-8?q?=E3=82=92=E4=BD=9C=E6=88=90=E3=81=97=E3=80=81=E9=81=A9=E7=94=A8?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/migrate.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 resources/migrate.sh diff --git a/resources/migrate.sh b/resources/migrate.sh new file mode 100644 index 0000000..4cb406f --- /dev/null +++ b/resources/migrate.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +docker compose exec backend python3 manage.py makemigrations +docker compose exec backend python3 manage.py migrate