From d5e4ab303bf64acb811c6ca1efb563bfbeb62933 Mon Sep 17 00:00:00 2001 From: zenghongtu Date: Wed, 22 Feb 2023 20:55:50 +0800 Subject: [PATCH] fix --- src/components/user-info/index.tsx | 2 +- src/pages/activity/index.tsx | 2 +- src/pages/developer/index.tsx | 14 ++++++++------ src/pages/login/index.tsx | 2 +- src/pages/repos/readme/index.module.scss | 2 +- src/pages/repos/readme/index.tsx | 5 ++++- src/pages/search/index.module.scss | 3 ++- src/pages/search/index.tsx | 1 + 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/components/user-info/index.tsx b/src/components/user-info/index.tsx index 1f70254..5def24f 100644 --- a/src/components/user-info/index.tsx +++ b/src/components/user-info/index.tsx @@ -255,7 +255,7 @@ const UserInfo = ({ style={{ ...style, fontWeight: '800' }} hasBorder={true} // arrow="right" - title="Support" + title="Star Support" onClick={handleSupport} /> )} diff --git a/src/pages/activity/index.tsx b/src/pages/activity/index.tsx index 17b27a2..ab6ca9f 100644 --- a/src/pages/activity/index.tsx +++ b/src/pages/activity/index.tsx @@ -11,7 +11,7 @@ import useRequestWIthMore from '../../hooks/useRequestWIthMore'; const Activity = () => { const { params: { name }, - } = useRouter(); + } = useRouter<{ name: string }>(); const [eventsData, hasMore, refresh, getMoreData] = useRequestWIthMore(name, getUserEvents); diff --git a/src/pages/developer/index.tsx b/src/pages/developer/index.tsx index 7b0351c..15eda39 100644 --- a/src/pages/developer/index.tsx +++ b/src/pages/developer/index.tsx @@ -9,25 +9,27 @@ import { import { Block } from '@tarojs/components'; import Taro, { useRouter, useShareAppMessage } from '@tarojs/taro'; import { useEffect, useState } from 'react'; +import { useSelector } from 'react-redux'; const Developer = () => { const { params: { name }, - } = useRouter(); - const username = name!; + } = useRouter<{ name: string }>(); + const username = useSelector((state) => state.user.username); + const { data: userInfo, isError, isLoading, } = useUsersGetByUsername({ - pathParams: { username }, + pathParams: { username: name }, }); const [isFollowing, setIsFollowing] = useState(false); useUsersCheckPersonIsFollowedByAuthenticated( { - pathParams: { username }, + pathParams: { username: name }, }, { enabled: !!username, @@ -49,13 +51,13 @@ const Developer = () => { const handleFollowBtnClick = () => { if (isFollowing) { - unFollow({ pathParams: { username } }).then((data) => { + unFollow({ pathParams: { username: name } }).then((data) => { if (!data && data !== null) { setIsFollowing(false); } }); } else { - updateFollow({ pathParams: { username } }).then((data) => { + updateFollow({ pathParams: { username: name } }).then((data) => { if (!data && data !== null) { setIsFollowing(true); } diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index 83875b6..fe367de 100644 --- a/src/pages/login/index.tsx +++ b/src/pages/login/index.tsx @@ -92,7 +92,7 @@ const Login = () => { { await copyText( - 'https://github.com/settings/tokens/new?scopes=repo,workflow,notifications,user,gist,project&description=Github%20Pro', + 'https://github.com/settings/tokens/new?scopes=repo%2Cworkflow%2Cnotifications%2Cuser%2Cgist%2Cproject&description=Github%20Pro', ); }} > diff --git a/src/pages/repos/readme/index.module.scss b/src/pages/repos/readme/index.module.scss index 63bac70..25e4089 100644 --- a/src/pages/repos/readme/index.module.scss +++ b/src/pages/repos/readme/index.module.scss @@ -1,5 +1,5 @@ .wrap { - height: 800px; + max-height: 800px; overflow: hidden; position: relative; padding-bottom: 150px; diff --git a/src/pages/repos/readme/index.tsx b/src/pages/repos/readme/index.tsx index 4ecc489..142851c 100644 --- a/src/pages/repos/readme/index.tsx +++ b/src/pages/repos/readme/index.tsx @@ -23,7 +23,10 @@ const Readme = ({ owner, repo, full_name }, ref) => { return ( {data && ( - + { diff --git a/src/pages/search/index.module.scss b/src/pages/search/index.module.scss index d20be84..013a2a7 100644 --- a/src/pages/search/index.module.scss +++ b/src/pages/search/index.module.scss @@ -7,7 +7,8 @@ position: fixed; top: 0; left: 0; - right: 0; + width: 100%; + overflow: hidden; z-index: 2; } diff --git a/src/pages/search/index.tsx b/src/pages/search/index.tsx index 875b717..252ec12 100644 --- a/src/pages/search/index.tsx +++ b/src/pages/search/index.tsx @@ -65,6 +65,7 @@ const Search = () => {