From 76e87c8678e34604e922808bbd64b693d865e2e6 Mon Sep 17 00:00:00 2001 From: hyrious Date: Wed, 5 Jan 2022 18:05:26 +0800 Subject: [PATCH] feat(web): add "open in browser" tip in wechat browser (#1268) --- cspell.config.js | 1 + packages/flat-i18n/locales/en.json | 3 +- packages/flat-i18n/locales/zh-CN.json | 3 +- .../src/pages/JoinPage/JoinPageMobile.tsx | 11 +++++- .../pages/JoinPage/icons/open-in-browser.svg | 7 ++++ web/flat-web/src/pages/JoinPage/index.tsx | 1 - web/flat-web/src/pages/JoinPage/style.less | 36 ++++++++++++++++--- 7 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 web/flat-web/src/pages/JoinPage/icons/open-in-browser.svg diff --git a/cspell.config.js b/cspell.config.js index cd690375240..94d13b89c78 100644 --- a/cspell.config.js +++ b/cspell.config.js @@ -113,6 +113,7 @@ module.exports = { "estree", "webstorm", "Frameless", + "micromessenger", // CNCF "nindent", diff --git a/packages/flat-i18n/locales/en.json b/packages/flat-i18n/locales/en.json index 90c35748434..cf5309cc4e4 100644 --- a/packages/flat-i18n/locales/en.json +++ b/packages/flat-i18n/locales/en.json @@ -388,5 +388,6 @@ "user-guide-text": "Want to learn more about Flat? ", "user-guide-button": "Check it out now", "start-recording": "Start recording", - "stop-recording": "Stop recording" + "stop-recording": "Stop recording", + "open-in-browser": "Open in Browser" } diff --git a/packages/flat-i18n/locales/zh-CN.json b/packages/flat-i18n/locales/zh-CN.json index 13c7938e723..00182b94ea4 100644 --- a/packages/flat-i18n/locales/zh-CN.json +++ b/packages/flat-i18n/locales/zh-CN.json @@ -388,5 +388,6 @@ "user-guide-text": "想了解更多 Flat 的使用技巧？", "user-guide-button": "立即查看", "start-recording": "开始录制", - "stop-recording": "停止录制" + "stop-recording": "停止录制", + "open-in-browser": "请在浏览器中打开" } diff --git a/web/flat-web/src/pages/JoinPage/JoinPageMobile.tsx b/web/flat-web/src/pages/JoinPage/JoinPageMobile.tsx index bb9c6ab6abb..5c84fb103e0 100644 --- a/web/flat-web/src/pages/JoinPage/JoinPageMobile.tsx +++ b/web/flat-web/src/pages/JoinPage/JoinPageMobile.tsx @@ -1,4 +1,5 @@ import logoSVG from "./icons/logo-sm.svg"; +import openInBrowserSVG from "./icons/open-in-browser.svg"; import React, { useCallback, useEffect, useMemo } from "react"; import { useTranslation } from "react-i18next"; @@ -10,6 +11,8 @@ export interface JoinPageMobileProps { serviceURL: string; } +const isWeChatBrowser = window.navigator.userAgent.toLowerCase().includes("micromessenger"); + export default function JoinPageMobile({ roomUUID, privacyURL, @@ -33,7 +36,7 @@ export default function JoinPageMobile({ return (
-