Feliday/Feliday-UI
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into main

Browse source
This commit is contained in:
SleeplessOne1917 2023-06-15 17:24:53 +00:00 committed by GitHub
commit f39b3019c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/shared/components/home/home.tsx
View file

@ -244,9 +244,10 @@ export class Home extends Component<any, HomeState> {
}
async componentDidMount() {
if (!this.state.isIsomorphic) {
if (!this.state.isIsomorphic || !this.isoData.routeData.length) {
await Promise.all([this.fetchTrendingCommunities(), this.fetchData()]);
}
setupTippy();
}
@ -456,7 +457,7 @@ export class Home extends Component<any, HomeState> {
}
trendingCommunities(isMobile = false) {
switch (this.state.trendingCommunitiesRes.state) {
switch (this.state.trendingCommunitiesRes?.state) {
case "loading":
return (
<h5>
@ -573,7 +574,7 @@ export class Home extends Component<any, HomeState> {
const siteRes = this.state.siteRes;
if (dataType === DataType.Post) {
switch (this.state.postsRes.state) {
switch (this.state.postsRes?.state) {
case "loading":
return (
<h5>

4
src/shared/components/home/login.tsx
View file

@ -186,7 +186,9 @@ export class Login extends Component<any, State> {
UserService.Instance.myUserInfo = site.data.my_user;
}
i.props.history.replace("/");
i.props.history.action === "PUSH"
? i.props.history.back()
: i.props.history.replace("/");
break;
}