diff --git a/api/app/domain/models/lessons.py b/api/app/domain/models/lessons.py index fb7ca89..b6cdaa1 100644 --- a/api/app/domain/models/lessons.py +++ b/api/app/domain/models/lessons.py @@ -21,4 +21,4 @@ class Lesson(RootTable): creator: Mapped['User'] = relationship('User', back_populates='created_lessons', lazy='joined') files: Mapped[List['LessonFile']] = relationship('LessonFile', back_populates='lesson') - user_check_lessons: Mapped[List['UserCheckLessons']] = relationship('UserCheckLessons', back_populates='lesson') + user_check_lessons: Mapped[List['UserCheckLessons']] = relationship('UserCheckLessons', back_populates='lesson', cascade="all, delete-orphan",) diff --git a/api/app/main.py b/api/app/main.py index 47f738a..489fb71 100644 --- a/api/app/main.py +++ b/api/app/main.py @@ -20,7 +20,7 @@ def start_app(): api_app.add_middleware( CORSMiddleware, - allow_origins=['https://api.lectio.numerum.team', 'https://lectio.numerum.team', 'http://localhost:5173'], + allow_origins=['https://api.lectio.numerum.team', 'https://lectio.numerum.team', 'http://localhost:5173', 'http://localhost:3000', 'http://localhost:8000'], allow_credentials=True, allow_methods=['*'], allow_headers=['*'], diff --git a/web/Dockerfile b/web/Dockerfile index 388a3e3..e1bb99b 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -9,7 +9,7 @@ RUN npm install COPY . . ARG VITE_BASE_URL -ENV VITE_BASE_URL=https://api.lectio.numerum.team/api/v1 +ENV VITE_BASE_URL=http://localhost:8000/api/v1 ARG VITE_ROOT_ROLE_NAME ENV VITE_ROOT_ROLE_NAME=root RUN npm run build diff --git a/web/src/Components/Pages/LoginPage/LoginPage.jsx b/web/src/Components/Pages/LoginPage/LoginPage.jsx index e3912b2..10cc178 100644 --- a/web/src/Components/Pages/LoginPage/LoginPage.jsx +++ b/web/src/Components/Pages/LoginPage/LoginPage.jsx @@ -1,4 +1,4 @@ -import { Button, Col, Flex, Form, Input, Typography } from "antd"; +import {Button, Col, Flex, Form, Input, Space, Image, Typography} from "antd"; import { Link } from "react-router-dom"; import useLoginPage from "./useLoginPage.js"; @@ -24,6 +24,31 @@ const LoginPage = () => { gap={24} > + + Lectio API Logo + + Lectio + + Аутентификация