From a32ebf852fbd3c5480b8fd32c77ee1b724420c85 Mon Sep 17 00:00:00 2001 From: Tristan Yang Date: Sun, 26 Feb 2023 21:15:32 +0800 Subject: [PATCH] chore: tweaks --- package.json | 12 +++---- src/common/component/ChannelModal/index.tsx | 2 +- src/common/component/Send/index.tsx | 4 +-- src/widget/Popup/Login/index.tsx | 3 +- yarn.lock | 40 ++++++++++----------- 5 files changed, 31 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 7d97628d..4d988826 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,20 @@ { "name": "vocechat-web", - "version": "0.3.44", + "version": "0.3.45", "private": true, "homepage": "https://voce.chat", "dependencies": { "@emoji-mart/react": "^1.1.1", "@metamask/onboarding": "^1.0.1", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10", - "@react-oauth/google": "^0.7.1", + "@react-oauth/google": "^0.8.0", "@reduxjs/toolkit": "^1.9.3", "@svgr/webpack": "^6.5.1", "@tippyjs/react": "^4.2.6", "@toast-ui/editor": "^3.2.2", "@toast-ui/editor-plugin-code-syntax-highlight": "^3.1.0", "@toast-ui/react-editor": "^3.2.3", - "@types/node": "^18.14.0", + "@types/node": "^18.14.1", "@types/react": "^18.0.28", "@types/react-dom": "^18.0.11", "@udecode/plate": "16.8", @@ -53,7 +53,7 @@ "react-dom": "^18.2.0", "react-helmet": "^6.1.0", "react-hot-toast": "^2.4.0", - "react-i18next": "^12.1.5", + "react-i18next": "^12.2.0", "react-redux": "^8.0.5", "react-refresh": "0.14.0", "react-router-dom": "^6.8.1", @@ -63,9 +63,9 @@ "react-use-wizard": "^2.2.1", "resolve": "^1.22.1", "rooks": "^7.4.3", - "slate": "^0.91.1", + "slate": "^0.91.4", "slate-history": "^0.86.0", - "slate-react": "^0.91.2", + "slate-react": "^0.91.5", "source-map-loader": "^4.0.1", "style-loader": "^3.3.1", "styled-components": "^5.3.6", diff --git a/src/common/component/ChannelModal/index.tsx b/src/common/component/ChannelModal/index.tsx index 20c0312d..69d05a69 100644 --- a/src/common/component/ChannelModal/index.tsx +++ b/src/common/component/ChannelModal/index.tsx @@ -142,7 +142,7 @@ const ChannelModal: FC = ({ personal = false, closeModal }) => {
{t("channel_name")}
- +
diff --git a/src/common/component/Send/index.tsx b/src/common/component/Send/index.tsx index 97aa8327..9e0370c4 100644 --- a/src/common/component/Send/index.tsx +++ b/src/common/component/Send/index.tsx @@ -38,7 +38,7 @@ const Send: FC = ({ const [markdownEditor, setMarkdownEditor] = useState(null); const [markdownFullscreen, setMarkdownFullscreen] = useState(false); const dispatch = useAppDispatch(); - const addLocalFileMesage = useAddLocalFileMessage({ context, to: id }); + const addLocalFileMessage = useAddLocalFileMessage({ context, to: id }); // 谁发的 const { from_uid, @@ -111,7 +111,7 @@ const Send: FC = ({ from_uid, sending: true }; - addLocalFileMesage(tmpMsg); + addLocalFileMessage(tmpMsg); }); resetStageFiles(); } diff --git a/src/widget/Popup/Login/index.tsx b/src/widget/Popup/Login/index.tsx index 57e5ddc9..7f45c003 100644 --- a/src/widget/Popup/Login/index.tsx +++ b/src/widget/Popup/Login/index.tsx @@ -57,6 +57,7 @@ const Login = () => { google: enableGoogleLogin, } = loginConfig; const googleLogin = enableGoogleLogin && clientId; + const hasSocialLogins = enableGithubLogin || googleLogin; return (
@@ -64,7 +65,7 @@ const Login = () => { Start Chat - + {hasSocialLogins && } {googleLogin && } {enableGithubLogin && } diff --git a/yarn.lock b/yarn.lock index c8dfcdac..ed262571 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2218,10 +2218,10 @@ resolved "https://mirrors.cloud.tencent.com/npm/@react-hook%2fmerged-ref/-/merged-ref-1.3.2.tgz#919b387a5f79ed67f2578f2015ab7b7d337787d2" integrity sha512-cQ9Y8m4zlrw/qotReo33E+3Sy9FVqMZb5JwUlb3wj3IJJ1cNJtxcgfWF6rS2NZQrfBJ2nAnckUdPJjMyIJTNZg== -"@react-oauth/google@^0.7.1": - version "0.7.1" - resolved "https://mirrors.cloud.tencent.com/npm/@react-oauth%2fgoogle/-/google-0.7.1.tgz#3a68444468a9196882b724295b8d2ab62a42596d" - integrity sha512-FIMKcXGAbgUinUSM7VpH9VbA6tZNcXEYgi0jmlHIT1FDs4aON80jZsPUX98/TqKznWZHY4l2J9CTL62bskr7Fg== +"@react-oauth/google@^0.8.0": + version "0.8.0" + resolved "https://mirrors.cloud.tencent.com/npm/@react-oauth/google/-/google-0.8.0.tgz#e95c9e2ef28f0da6d5de223e48c391a12eb4f821" + integrity sha512-xmIhYvvaBSblOzo3Fqv762lqub92SOFR8eRR7QpPyFPZEXZcOymaMuEkRSUKUrbu+9wfB8qtOaGMRJzrN7U2PA== "@reduxjs/toolkit@^1.9.3": version "1.9.3" @@ -2807,10 +2807,10 @@ resolved "https://mirrors.cloud.tencent.com/npm/@types%2fnode/-/node-18.13.0.tgz#0400d1e6ce87e9d3032c19eb6c58205b0d3f7850" integrity sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg== -"@types/node@^18.14.0": - version "18.14.0" - resolved "https://mirrors.cloud.tencent.com/npm/@types%2fnode/-/node-18.14.0.tgz#94c47b9217bbac49d4a67a967fdcdeed89ebb7d0" - integrity sha512-5EWrvLmglK+imbCJY0+INViFWUHg1AHel1sq4ZVSfdcNqGy9Edv3UB9IIzzg+xPaUcAgZYcfVs2fBcwDeZzU0A== +"@types/node@^18.14.1": + version "18.14.1" + resolved "https://mirrors.cloud.tencent.com/npm/@types/node/-/node-18.14.1.tgz#90dad8476f1e42797c49d6f8b69aaf9f876fc69f" + integrity sha512-QH+37Qds3E0eDlReeboBxfHbX9omAcBCXEzswCu6jySP642jiM3cYSIkU/REqwhCUqXdonHFuBfJDiAJxMNhaQ== "@types/parse-json@^4.0.0": version "4.0.0" @@ -10123,10 +10123,10 @@ react-hotkeys-hook@^3.4.6: dependencies: hotkeys-js "3.9.4" -react-i18next@^12.1.5: - version "12.1.5" - resolved "https://mirrors.cloud.tencent.com/npm/react-i18next/-/react-i18next-12.1.5.tgz#b65f5733dd2f96188a9359c009b7dbe27443f009" - integrity sha512-7PQAv6DA0TcStG96fle+8RfTwxVbHVlZZJPoEszwUNvDuWpGldJmNWa3ZPesEsZQZGF6GkzwvEh6p57qpFD2gQ== +react-i18next@^12.2.0: + version "12.2.0" + resolved "https://mirrors.cloud.tencent.com/npm/react-i18next/-/react-i18next-12.2.0.tgz#010e3f6070b8d700442947233352ebe4b252d7a1" + integrity sha512-5XeVgSygaGfyFmDd2WcXvINRw2WEC1XviW1LXY/xLOEMzsCFRwKqfnHN+hUjla8ZipbVJR27GCMSuTr0BhBBBQ== dependencies: "@babel/runtime" "^7.20.6" html-parse-stringify "^3.0.1" @@ -10919,10 +10919,10 @@ slate-history@^0.86.0: dependencies: is-plain-object "^5.0.0" -slate-react@^0.91.2: - version "0.91.2" - resolved "https://mirrors.cloud.tencent.com/npm/slate-react/-/slate-react-0.91.2.tgz#7bec89b497b939a9d17292d6183f88a7ca3916ea" - integrity sha512-D+rm72Q2b81aqlw/+2Kcu8p3fmsKF2v8i134bu1oGfJWy6XTSTVyEXSca0+V5CHdxWgOMu02iXNjnVI2qmIsYw== +slate-react@^0.91.5: + version "0.91.5" + resolved "https://mirrors.cloud.tencent.com/npm/slate-react/-/slate-react-0.91.5.tgz#0632ab708a0e88e7a3140c663d0a96662b5c3145" + integrity sha512-QHaslGr8sj4YNaWHCHKuBN89OfPPBpkyL7oPbahwwtxt1eWaxRDYQN1HnLot+ofYTL5GUWrRNsaG5TunS3tbxQ== dependencies: "@juggle/resize-observer" "^3.4.0" "@types/is-hotkey" "^0.1.1" @@ -10934,10 +10934,10 @@ slate-react@^0.91.2: scroll-into-view-if-needed "^2.2.20" tiny-invariant "1.0.6" -slate@^0.91.1: - version "0.91.1" - resolved "https://mirrors.cloud.tencent.com/npm/slate/-/slate-0.91.1.tgz#1891e03dc7e3f585a23fb20149e2c7a4614b0ddc" - integrity sha512-t8R6y2CjVD/NNo3h6fyM9tOH2mwJVETzSq7cNBfhAHwTRsKQ0fF0nxErxwWURiRFr1ZMOCk7rJXfgLxI95ZNFA== +slate@^0.91.4: + version "0.91.4" + resolved "https://mirrors.cloud.tencent.com/npm/slate/-/slate-0.91.4.tgz#759764d63c8a8a7aff29a29e598e593ed80277f9" + integrity sha512-aUJ3rpjrdi5SbJ5G1Qjr3arytfRkEStTmHjBfWq2A2Q8MybacIzkScSvGJjQkdTk3djCK9C9SEOt39sSeZFwTw== dependencies: immer "^9.0.6" is-plain-object "^5.0.0"