diff --git a/.env.development b/.env.development index 4330e9d..49882ac 100644 --- a/.env.development +++ b/.env.development @@ -2,4 +2,4 @@ VITE_AUTH0_DOMAIN="dev-txpc5harm481cb6o.us.auth0.com" VITE_AUTH0_CLIENT_ID="BOU97TMrp85ftAnrXSLTiYYiuifp9jfz" VITE_API='https://network-class-server.ru' VITE_WS_API='wss://network-class-server.ru' -VITE_VIDEOSDK_HREF='' \ No newline at end of file +VITE_VIDEOSDK_APP='http://localhost:3000/react-rtc-demo' \ No newline at end of file diff --git a/.env.production b/.env.production index f31acec..169fb1e 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,4 @@ VITE_AUTH0_DOMAIN="dev-txpc5harm481cb6o.us.auth0.com" VITE_AUTH0_CLIENT_ID="fOB3CWsgCnNLI5q7OMWe9DfWaAXOme2o" VITE_API='https://network-class-server.ru' VITE_WS_API='wss://network-class-server.ru' -VITE_VIDEOSDK_HREF='' \ No newline at end of file +VITE_VIDEOSDK_APP='https://network-class-videosdk-client.pages.dev' \ No newline at end of file diff --git a/src/entities/room/ui/RoomCard.tsx b/src/entities/room/ui/RoomCard.tsx index 16c51cb..62fc3f4 100644 --- a/src/entities/room/ui/RoomCard.tsx +++ b/src/entities/room/ui/RoomCard.tsx @@ -101,8 +101,8 @@ const RoomCard: React.FC = ({ room }) => { недоступен )} - - + + ; +const CardButton: React.FC = ({ children, onClick }) => { + return ; }; export default CardButton; diff --git a/src/widgets/FunctionsList/functionsObject.tsx b/src/widgets/FunctionsList/functionsObject.tsx index dbb9006..808d94f 100644 --- a/src/widgets/FunctionsList/functionsObject.tsx +++ b/src/widgets/FunctionsList/functionsObject.tsx @@ -10,7 +10,7 @@ const functions: IFunction[] = [ { icon: createClass, iconActive: createClassActive, - title: "Новый класс", + title: "Мои классы", description: "Создать свой класс и провести занятие онлайн", link: "/lobby", onClick: () => { diff --git a/src/widgets/RoomsList.tsx b/src/widgets/RoomsList.tsx index 791640b..30a0582 100644 --- a/src/widgets/RoomsList.tsx +++ b/src/widgets/RoomsList.tsx @@ -75,8 +75,6 @@ const RoomsList: React.FC = observer(({ rooms, loading, error }) => { console.log(searchedRooms); }; - console.log(rooms); - return (
diff --git a/src/widgets/layout/Header.tsx b/src/widgets/layout/Header.tsx index 243c5cd..1bcf9b1 100644 --- a/src/widgets/layout/Header.tsx +++ b/src/widgets/layout/Header.tsx @@ -14,7 +14,9 @@ const Container = styled.div` background-color: var(--white); `; -const Left = styled.div``; +const Left = styled.div` + +`; const Logo = styled.a` text-align: center; diff --git a/src/widgets/layout/Navbar.tsx b/src/widgets/layout/Navbar.tsx index 2b30891..c7d9036 100644 --- a/src/widgets/layout/Navbar.tsx +++ b/src/widgets/layout/Navbar.tsx @@ -70,7 +70,14 @@ const Navbar: React.FC = observer(() => { } function addRoom() { - roomsFormState.openCreateForm(); + if (roomsFormState.state === '' && navbarState.state === 'my') { + roomsFormState.openCreateForm(); + return 0; + } + if (roomsFormState.state === 'create') { + roomsFormState.closeCreateForm(); + return 0; + } } function editRooms() { diff --git a/src/widgets/layout/ProfileFormLayout.tsx b/src/widgets/layout/ProfileFormLayout.tsx new file mode 100644 index 0000000..3086275 --- /dev/null +++ b/src/widgets/layout/ProfileFormLayout.tsx @@ -0,0 +1,26 @@ +import React from "react"; +import styled from "styled-components"; + +const Container = styled.div` + position: relative; + width: 100%; + padding: 20px; + border-radius: 10px; + background: var(--white); + box-shadow: 0px 0px 4px 0px #e5eaf8; + font-family: var(--font); + color: #000; + display: flex; + justify-content: space-between; + align-items: center; +`; + +interface Props { + children?: React.ReactNode; +} + +const ProfileFormLayout: React.FC = ({ children }) => { + return {children}; +}; + +export default ProfileFormLayout;