Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Emil307 committed Jul 27, 2023
2 parents 34e82b6 + 13aa8ba commit 7323da4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"#create repo network-class-frontend"
"#review_code"
1 change: 1 addition & 0 deletions src/features/DeviceSetting/ui/SelectDevice.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const Selected = styled.div`
font-family: var(--font);
font-size: 18px;
font-weight: 400;
width: 214px;
`;

const Icon = styled.img`
Expand Down
8 changes: 7 additions & 1 deletion src/widgets/layout/Navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// import React from 'react';
import { useParams, useSearchParams } from 'react-router-dom';
import styled from 'styled-components';
import { AddRoomButton } from '../../features/AddRoom.tsx/index.ts';
import { SearchInput } from '../../features/Search/index.ts';
Expand Down Expand Up @@ -63,7 +64,12 @@ interface Props {
const Navbar: React.FC<Props> = ({ activeLink, /*allLength, accessLength, myLength*/ }) => {

function addRoom() {
roomsFormState.openCreateForm();
const currentUrl = window.location.href;
if (currentUrl !== "http://localhost:5173/lobby/my") {
window.location.href = '/lobby/my';
roomsFormState.openCreateForm();
}
roomsFormState.openCreateForm();
}

function editRooms() {
Expand Down

0 comments on commit 7323da4

Please sign in to comment.