fix(flat-pages): wrong inviteBaseUrl (#1657)

netless-io · Aug 24, 2022 · 8c5ab11 · 8c5ab11
1 parent 44148a7
commit 8c5ab11
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 22 deletions.
diff --git a/packages/flat-pages/src/HomePage/MainRoomListPanel/MainRoomList.tsx b/packages/flat-pages/src/HomePage/MainRoomListPanel/MainRoomList.tsx
@@ -13,18 +13,14 @@ import {
     RoomStatusType,
     errorTips,
 } from "flat-components";
-import {
-    FLAT_SERVER_BASE_URL,
-    ListRoomsType,
-    RoomStatus,
-    RoomType,
-} from "@netless/flat-server-api";
+import { ListRoomsType, RoomStatus, RoomType } from "@netless/flat-server-api";
 import { GlobalStoreContext, RoomStoreContext } from "../../components/StoreProvider";
 import { RoomItem } from "@netless/flat-stores";
 import { useSafePromise } from "../../utils/hooks/lifecycle";
 import { RouteNameType, usePushHistory } from "../../utils/routes";
 import { joinRoomHandler } from "../../utils/join-room-handler";
 import { useTranslate } from "@netless/flat-i18n";
+import { FLAT_WEB_BASE_URL } from "../../constants/process";
 
 export interface MainRoomListProps {
     listRoomsType: ListRoomsType;
@@ -233,7 +229,7 @@ export const MainRoomList = observer<MainRoomListProps>(function MainRoomList({
             )}
             {currentRoom && (
                 <InviteModal
-                    baseUrl={FLAT_SERVER_BASE_URL}
+                    baseUrl={FLAT_WEB_BASE_URL}
                     periodicWeeks={periodicInfo?.periodic.weeks}
                     room={currentRoom}
                     userName={globalStore.userName ?? ""}
@@ -263,10 +259,7 @@ export const MainRoomList = observer<MainRoomListProps>(function MainRoomList({
 
     function replayRoom(config: { roomUUID: string; ownerUUID: string; roomType: RoomType }): void {
         const { roomUUID, ownerUUID, roomType } = config;
-        window.open(
-            `${FLAT_SERVER_BASE_URL}/replay/${roomType}/${roomUUID}/${ownerUUID}/`,
-            "_blank",
-        );
+        window.open(`${FLAT_WEB_BASE_URL}/replay/${roomType}/${roomUUID}/${ownerUUID}/`, "_blank");
     }
 
     function hideCancelModal(): void {

diff --git a/packages/flat-pages/src/PeriodicRoomDetailPage/index.tsx b/packages/flat-pages/src/PeriodicRoomDetailPage/index.tsx
@@ -10,12 +10,9 @@ import { useTranslate } from "@netless/flat-i18n";
 import { PageStoreContext, RoomStoreContext } from "../components/StoreProvider";
 import { globalStore } from "@netless/flat-stores";
 import { RouteNameType, RouteParams, usePushHistory } from "../utils/routes";
-import {
-    cancelPeriodicRoom,
-    cancelPeriodicSubRoom,
-    FLAT_SERVER_BASE_URL,
-} from "@netless/flat-server-api";
+import { cancelPeriodicRoom, cancelPeriodicSubRoom } from "@netless/flat-server-api";
 import { useLoginCheck } from "../utils/use-login-check";
+import { FLAT_WEB_BASE_URL } from "../constants/process";
 
 export const PeriodicRoomDetailPage = observer<{}>(function PeriodicRoomDetailPage() {
     useLoginCheck();
@@ -140,7 +137,7 @@ export const PeriodicRoomDetailPage = observer<{}>(function PeriodicRoomDetailPa
     return (
         <div className="periodic-room-detail-page-container">
             <PeriodicRoomPanel
-                inviteBaseUrl={FLAT_SERVER_BASE_URL}
+                inviteBaseUrl={FLAT_WEB_BASE_URL}
                 isCreator={isCreator}
                 jumpToModifyOrdinaryRoomPage={jumpToModifyOrdinaryRoomPage}
                 jumpToModifyPeriodicRoomPage={jumpToModifyPeriodicRoomPage}

diff --git a/packages/flat-pages/src/RoomDetailPage/index.tsx b/packages/flat-pages/src/RoomDetailPage/index.tsx
@@ -7,15 +7,16 @@ import { observer } from "mobx-react-lite";
 import { useHistory, useParams } from "react-router-dom";
 import { useTranslate } from "@netless/flat-i18n";
 import { message } from "antd";
+import { RoomStatus } from "@netless/flat-server-api";
 import {
     GlobalStoreContext,
     PageStoreContext,
     RoomStoreContext,
 } from "../components/StoreProvider";
 import { RouteNameType, RouteParams, usePushHistory } from "../utils/routes";
 import { joinRoomHandler } from "../utils/join-room-handler";
-import { FLAT_SERVER_BASE_URL, RoomStatus } from "@netless/flat-server-api";
 import { useLoginCheck } from "../utils/use-login-check";
+import { FLAT_WEB_BASE_URL } from "../constants/process";
 
 export const RoomDetailPage = observer(function RoomDetailPage() {
     useLoginCheck();
@@ -103,7 +104,7 @@ export const RoomDetailPage = observer(function RoomDetailPage() {
         if (roomInfo) {
             const { roomType, roomUUID, ownerUUID } = roomInfo;
             window.open(
-                `${FLAT_SERVER_BASE_URL}/replay/${roomType}/${roomUUID}/${ownerUUID}/`,
+                `${FLAT_WEB_BASE_URL}/replay/${roomType}/${roomUUID}/${ownerUUID}/`,
                 "_blank",
             );
         }
@@ -122,7 +123,7 @@ export const RoomDetailPage = observer(function RoomDetailPage() {
         <div className="room-detail-page-container">
             <div className="room-detail-page-panel-container">
                 <RoomDetailPanel
-                    inviteBaseUrl={FLAT_SERVER_BASE_URL}
+                    inviteBaseUrl={FLAT_WEB_BASE_URL}
                     isCreator={isCreator}
                     isPeriodicDetailsPage={false}
                     jumpToPeriodicRoomDetailPage={jumpToPeriodicRoomDetailPage}

diff --git a/packages/flat-pages/src/components/Modal/InviteModal.tsx b/packages/flat-pages/src/components/Modal/InviteModal.tsx
@@ -5,7 +5,7 @@ import { InviteModal as InviteModalImpl, errorTips } from "flat-components";
 import { useTranslate } from "@netless/flat-i18n";
 import { RoomItem } from "@netless/flat-stores";
 import { GlobalStoreContext, RoomStoreContext } from "../StoreProvider";
-import { FLAT_SERVER_BASE_URL } from "@netless/flat-server-api";
+import { FLAT_WEB_BASE_URL } from "../../constants/process";
 
 export interface InviteModalProps {
     visible: boolean;
@@ -45,7 +45,7 @@ export const InviteModal = observer<InviteModalProps>(function InviteModal({
 
     return (
         <InviteModalImpl
-            baseUrl={FLAT_SERVER_BASE_URL}
+            baseUrl={FLAT_WEB_BASE_URL}
             periodicWeeks={periodicInfo?.periodic.weeks}
             room={room}
             userName={globalStore.userName ?? ""}

diff --git a/packages/flat-pages/src/constants/process.ts b/packages/flat-pages/src/constants/process.ts
@@ -39,3 +39,5 @@ export const PRIVACY_URL = "https://flat.whiteboard.agora.io/privacy.html";
 
 export const SERVICE_URL_CN = "https://flat.whiteboard.agora.io/service.html";
 export const SERVICE_URL = "https://flat.whiteboard.agora.io/service.html";
+
+export const FLAT_WEB_BASE_URL = `https://${process.env.FLAT_WEB_DOMAIN}`;