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

fix(classroom): not support require.context #1317

Merged
merged 1 commit into from
Jan 20, 2022
Merged

fix(classroom): not support require.context #1317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 0 additions & 23 deletions desktop/renderer-app/src/components/TopBarRoundBtn.tsx
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 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 @@ -17,8 +17,7 @@ import {
} from "flat-components";

import InviteButton from "../../components/InviteButton";
import { TopBarRoundBtn } from "../../components/TopBarRoundBtn";
import { TopBarRightBtn } from "flat-components";
import { TopBarRightBtn, TopBarRoundBtn } from "flat-components";
import { RealtimePanel } from "../../components/RealtimePanel";
import { ChatPanel } from "../../components/ChatPanel";
import { SmallClassAvatar } from "./SmallClassAvatar";
Expand Down Expand Up @@ -52,6 +51,8 @@ import shareScreenSVG from "../../assets/image/share-screen.svg";
import exitSVG from "../../assets/image/exit.svg";
import hideSideSVG from "../../assets/image/hide-side.svg";
import hideSideActiveSVG from "../../assets/image/hide-side-active.svg";
import classInteractionSVG from "../../assets/image/class-interaction.svg";
import classLectureSVG from "../../assets/image/class-lecture.svg";

const CLASSROOM_WIDTH = 1200;
const AVATAR_AREA_WIDTH = CLASSROOM_WIDTH - 16 * 2;
Expand Down Expand Up @@ -245,7 +246,7 @@ export const SmallClassPage = observer<SmallClassPageProps>(function SmallClassP
return classRoomStore.classMode === ClassModeType.Lecture ? (
<TopBarRoundBtn
dark
iconName="class-interaction"
icon={<img src={classInteractionSVG} />}
title={t("lecture-mode")}
onClick={classRoomStore.toggleClassMode}
>
Expand All @@ -254,7 +255,7 @@ export const SmallClassPage = observer<SmallClassPageProps>(function SmallClassP
) : (
<TopBarRoundBtn
dark
iconName="class-lecture"
icon={<img src={classLectureSVG} />}
title={t("interactive-mode")}
onClick={classRoomStore.toggleClassMode}
>
Expand Down
0 ...opBarRoundBtn/icons/class-interaction.svg → ...eb/src/assets/image/class-interaction.svg
View file
Open in desktop
File renamed without changes
0 ...ts/TopBarRoundBtn/icons/class-lecture.svg → ...at-web/src/assets/image/class-lecture.svg
View file
Open in desktop
File renamed without changes
1 change: 0 additions & 1 deletion web/flat-web/src/components/TopBarRoundBtn/icons/class-begin.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion web/flat-web/src/components/TopBarRoundBtn/icons/class-pause.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion web/flat-web/src/components/TopBarRoundBtn/icons/class-resume.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion web/flat-web/src/components/TopBarRoundBtn/icons/class-stop.svg
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions web/flat-web/src/components/TopBarRoundBtn/index.tsx
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 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 @@ -11,10 +11,10 @@ import {
LoadingPage,
Timer,
CloudRecordBtn,
TopBarRoundBtn,
} from "flat-components";

import InviteButton from "../../components/InviteButton";
import { TopBarRoundBtn } from "../../components/TopBarRoundBtn";
import { TopBarRightBtn } from "../../components/TopBarRightBtn";
import { RealtimePanel } from "../../components/RealtimePanel";
import { ChatPanel } from "../../components/ChatPanel";
Expand Down Expand Up @@ -43,6 +43,8 @@ import { useTranslation } from "react-i18next";
import { ShareScreen } from "../../components/ShareScreen";
import { generateAvatar } from "../../utils/generate-avatar";
import { AppStoreButton } from "../../components/AppStoreButton";
import classInteractionSVG from "../../assets/image/class-interaction.svg";
import classLectureSVG from "../../assets/image/class-lecture.svg";

const CLASSROOM_WIDTH = 1200;
const AVATAR_AREA_WIDTH = CLASSROOM_WIDTH - 16 * 2;
Expand Down Expand Up @@ -226,7 +228,7 @@ export const SmallClassPage = observer<SmallClassPageProps>(function SmallClassP
return classRoomStore.classMode === ClassModeType.Lecture ? (
<TopBarRoundBtn
dark
iconName="class-interaction"
icon={<img src={classInteractionSVG} />}
title={t("lecture-mode")}
onClick={classRoomStore.toggleClassMode}
>
Expand All @@ -235,7 +237,7 @@ export const SmallClassPage = observer<SmallClassPageProps>(function SmallClassP
) : (
<TopBarRoundBtn
dark
iconName="class-lecture"
icon={<img src={classLectureSVG} />}
title={t("interactive-mode")}
onClick={classRoomStore.toggleClassMode}
>
Expand Down