fix opening create form

Student-Labs-2023 · Aug 17, 2023 · 8eb248d · 8eb248d
1 parent 1404d6e
commit 8eb248d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/src/entities/room/ui/RoomCard.tsx b/src/entities/room/ui/RoomCard.tsx
@@ -102,7 +102,7 @@ const RoomCard: React.FC<Props> = ({ room }) => {
       )}
       <Access>
         <JoinButton href={`https://network-class-videosdk-client.pages.dev/?roomId=${room.id}&email=${user?.email}`} />
-        <Tooltip active={tooltipActive}>
+        <Tooltip active={tooltipActive} message="Ссылка скопирована!">
           <Button onClick={copyLink}>
             <svg
               width="18"

diff --git a/src/shared/ui/Tooltip.tsx b/src/shared/ui/Tooltip.tsx
@@ -17,6 +17,7 @@ const Content = styled.div`
   box-shadow: 0px 2px 6px 0px #c5ccd5;
   border-radius: 4px;
 
+  white-space: nowrap;
   font-family: var(--font);
   font-size: 14px;
   font-style: normal;
@@ -38,9 +39,10 @@ const Content = styled.div`
 interface Props {
   active: boolean;
   children: React.ReactNode;
+  message: string;
 }
 
-const Tooltip: React.FC<Props> = ({ active, children }) => {
+const Tooltip: React.FC<Props> = ({ active, children, message }) => {
   return (
     <Container>
       <Content
@@ -50,7 +52,7 @@ const Tooltip: React.FC<Props> = ({ active, children }) => {
             : { opacity: 0, visibility: "hidden" }
         }
       >
-        Ссылка скопирована!
+        {message}
       </Content>
       {children}
     </Container>

diff --git 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
@@ -75,8 +75,6 @@ const RoomsList: React.FC<Props> = observer(({ rooms, loading, error }) => {
         console.log(searchedRooms);
     };
 
-    console.log(rooms);
-
   return (
     <Container>
         <Header>

diff --git 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() {