diff --git a/Dockerfiles/Dockerfile_etl b/Dockerfiles/Dockerfile_etl index 7ddbfe2..c721b51 100644 --- a/Dockerfiles/Dockerfile_etl +++ b/Dockerfiles/Dockerfile_etl @@ -1,6 +1,13 @@ FROM python:3.12-slim WORKDIR /app/modules/anime_etl + +# RUN apt-get update && apt-get install -y --no-install-recommends \ +# build-essential \ +# libpq-dev \ +# ca-certificates \ +# && rm -rf /var/lib/apt/lists/* + COPY modules/anime_etl/pyproject.toml modules/anime_etl/uv.lock ./ RUN pip install --no-cache-dir uv \ @@ -10,4 +17,5 @@ COPY modules/anime_etl ./ ENV NYANIMEDB_MEDIA_ROOT=/media +# было: CMD ["python", "-m", "rabbit_worker"] CMD ["uv", "run", "python", "-m", "rabbit_worker"] diff --git a/Dockerfiles/Dockerfile_image_storage b/Dockerfiles/Dockerfile_image_storage index e0f60b5..34d7496 100644 --- a/Dockerfiles/Dockerfile_image_storage +++ b/Dockerfiles/Dockerfile_image_storage @@ -1,15 +1,25 @@ FROM python:3.12-slim +# каталог внутри контейнера WORKDIR /app/modules/image_storage + +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates \ + && rm -rf /var/lib/apt/lists/* + +# 1. зависимости через uv COPY modules/image_storage/pyproject.toml modules/image_storage/uv.lock ./ RUN pip install --no-cache-dir uv \ && uv sync --frozen --no-dev +# 2. сам код COPY modules/image_storage ./ +# 3. где будем хранить файлы внутри контейнера ENV NYANIMEDB_MEDIA_ROOT=/media EXPOSE 8000 -CMD ["uv", "run", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] \ No newline at end of file +# 4. поднимаем FastAPI-приложение (app/main.py → app.main:app) +CMD ["uv", "run", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] diff --git a/modules/frontend/src/App.tsx b/modules/frontend/src/App.tsx index de7101c..a92cc17 100644 --- a/modules/frontend/src/App.tsx +++ b/modules/frontend/src/App.tsx @@ -1,5 +1,4 @@ import React from "react"; -import { useState, useEffect } from "react"; import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; import UserPage from "./pages/UserPage/UserPage"; import TitlesPage from "./pages/TitlesPage/TitlesPage"; @@ -12,22 +11,8 @@ import { Header } from "./components/Header/Header"; // OpenAPI.WITH_CREDENTIALS = true const App: React.FC = () => { - const [userId, setUserId] = useState(localStorage.getItem("user_id")); - - // 2. Listen for the same event the Header uses - useEffect(() => { - const handleAuthChange = () => { - setUserId(localStorage.getItem("user_id")); - }; - - window.addEventListener("storage", handleAuthChange); - window.addEventListener("local-storage-update", handleAuthChange); - - return () => { - window.removeEventListener("storage", handleAuthChange); - window.removeEventListener("local-storage-update", handleAuthChange); - }; - }, []); + // const username = localStorage.getItem("username") || undefined; + const userId = localStorage.getItem("user_id"); return (