From b33997772bf948f91ed7da1f051489fa5eefcd18 Mon Sep 17 00:00:00 2001 From: nihonium Date: Fri, 19 Dec 2025 23:03:03 +0300 Subject: [PATCH 1/2] cicd: slightly refactored python Dockerfiles --- Dockerfiles/Dockerfile_etl | 8 -------- Dockerfiles/Dockerfile_image_storage | 12 +----------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Dockerfiles/Dockerfile_etl b/Dockerfiles/Dockerfile_etl index c721b51..7ddbfe2 100644 --- a/Dockerfiles/Dockerfile_etl +++ b/Dockerfiles/Dockerfile_etl @@ -1,13 +1,6 @@ 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 \ @@ -17,5 +10,4 @@ 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 34d7496..e0f60b5 100644 --- a/Dockerfiles/Dockerfile_image_storage +++ b/Dockerfiles/Dockerfile_image_storage @@ -1,25 +1,15 @@ 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 -# 4. поднимаем FastAPI-приложение (app/main.py → app.main:app) -CMD ["uv", "run", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] +CMD ["uv", "run", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] \ No newline at end of file From 82842b3bf355a3f51e2e9f88c706be3121ef3455 Mon Sep 17 00:00:00 2001 From: nihonium Date: Fri, 19 Dec 2025 23:35:30 +0300 Subject: [PATCH 2/2] fix: redirect user to profile after login --- modules/frontend/src/App.tsx | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/frontend/src/App.tsx b/modules/frontend/src/App.tsx index a92cc17..de7101c 100644 --- a/modules/frontend/src/App.tsx +++ b/modules/frontend/src/App.tsx @@ -1,4 +1,5 @@ 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"; @@ -11,8 +12,22 @@ import { Header } from "./components/Header/Header"; // OpenAPI.WITH_CREDENTIALS = true const App: React.FC = () => { - // const username = localStorage.getItem("username") || undefined; - const userId = localStorage.getItem("user_id"); + 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); + }; + }, []); return (