Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(whiteboard): remove vision control #907

Merged
merged 2 commits into from
Sep 1, 2021
Merged

refactor(whiteboard): remove vision control #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53a57e0
refactor(whiteboard): remove Vision control
Leooeloel Sep 1, 2021
39ffcb3
fix(ci): build web and renderer failed
Leooeloel Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions desktop/renderer-app/src/pages/BigClassPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,14 +307,15 @@ export const BigClassPage = observer<BigClassPageProps>(function BigClassPage()
/>
)}

{whiteboardStore.isWritable && (
{/* {whiteboardStore.isWritable && (
<TopBarRightBtn
title="Vision control"
icon="follow"
active={whiteboardStore.viewMode === ViewMode.Broadcaster}
onClick={handleRoomController}
/>
)}
)} */}

{/* <TopBarRightBtn
title="Docs center"
icon="folder"
Expand Down Expand Up @@ -400,6 +401,7 @@ export const BigClassPage = observer<BigClassPageProps>(function BigClassPage()
);
}

// @ts-ignore
function handleRoomController(): void {
const { room } = whiteboardStore;
if (!room) {
Expand Down
6 changes: 4 additions & 2 deletions desktop/renderer-app/src/pages/OneToOnePage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,15 @@ export const OneToOnePage = observer<OneToOnePageProps>(function OneToOnePage()
/>
)}

{whiteboardStore.isWritable && (
{/* {whiteboardStore.isWritable && (
<TopBarRightBtn
title="Vision control"
icon="follow"
active={whiteboardStore.viewMode === ViewMode.Broadcaster}
onClick={handleRoomController}
/>
)}
)} */}

{/* <TopBarRightBtn
title="Docs center"
icon="folder"
Expand Down Expand Up @@ -334,6 +335,7 @@ export const OneToOnePage = observer<OneToOnePageProps>(function OneToOnePage()
);
}

// @ts-ignore
function handleRoomController(): void {
const { room } = whiteboardStore;
if (!room) {
Expand Down
6 changes: 4 additions & 2 deletions desktop/renderer-app/src/pages/SmallClassPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,14 +332,15 @@ export const SmallClassPage = observer<SmallClassPageProps>(function SmallClassP
/>
)}

{whiteboardStore.isWritable && (
{/* {whiteboardStore.isWritable && (
<TopBarRightBtn
title="Vision control"
icon="follow"
active={whiteboardStore.viewMode === ViewMode.Broadcaster}
onClick={handleRoomController}
/>
)}
)} */}

{/* <TopBarRightBtn
title="Docs center"
icon="folder"
Expand Down Expand Up @@ -395,6 +396,7 @@ export const SmallClassPage = observer<SmallClassPageProps>(function SmallClassP
);
}

// @ts-ignore
function handleRoomController(): void {
const { room } = whiteboardStore;
if (!room) {
Expand Down
8 changes: 6 additions & 2 deletions web/flat-web/src/pages/BigClassPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,14 +291,17 @@ export const BigClassPage = observer<BigClassPageProps>(function BigClassPage()
/>
)}

{whiteboardStore.isWritable && (
{/*
* TODO: After the whiteboard supports multi-window, the vision control function is disabled, so hide the function for the time being.
*/}
{/* {whiteboardStore.isWritable && (
<TopBarRightBtn
title="Vision control"
icon="follow"
active={whiteboardStore.viewMode === ViewMode.Broadcaster}
onClick={handleRoomController}
/>
)}
)} */}

{/* <TopBarRightBtn
title="Docs center"
Expand Down Expand Up @@ -385,6 +388,7 @@ export const BigClassPage = observer<BigClassPageProps>(function BigClassPage()
);
}

// @ts-ignore
function handleRoomController(): void {
const { room } = whiteboardStore;
if (!room) {
Expand Down
6 changes: 4 additions & 2 deletions web/flat-web/src/pages/OneToOnePage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,14 +248,15 @@ export const OneToOnePage = observer<OneToOnePageProps>(function OneToOnePage()
/>
)}

{whiteboardStore.isWritable && (
{/* {whiteboardStore.isWritable && (
<TopBarRightBtn
title="Vision control"
icon="follow"
active={whiteboardStore.viewMode === ViewMode.Broadcaster}
onClick={handleRoomController}
/>
)}
)} */}

{/* <TopBarRightBtn
title="Docs center"
icon="folder"
Expand Down Expand Up @@ -317,6 +318,7 @@ export const OneToOnePage = observer<OneToOnePageProps>(function OneToOnePage()
);
}

// @ts-ignore
function handleRoomController(): void {
const { room } = whiteboardStore;
if (!room) {
Expand Down
6 changes: 4 additions & 2 deletions web/flat-web/src/pages/SmallClassPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,15 @@ export const SmallClassPage = observer<SmallClassPageProps>(function SmallClassP
/>
)}

{whiteboardStore.isWritable && (
{/* {whiteboardStore.isWritable && (
<TopBarRightBtn
title="Vision control"
icon="follow"
active={whiteboardStore.viewMode === ViewMode.Broadcaster}
onClick={handleRoomController}
/>
)}
)} */}

{/* <TopBarRightBtn
title="Docs center"
icon="folder"
Expand Down Expand Up @@ -379,6 +380,7 @@ export const SmallClassPage = observer<SmallClassPageProps>(function SmallClassP
);
}

// @ts-ignore
function handleRoomController(): void {
const { room } = whiteboardStore;
if (!room) {
Expand Down