Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue when navigating awat from settings #1528

Merged
merged 1 commit into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/shared/components/community/create-community.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
CreateCommunity as CreateCommunityI,
GetSiteResponse,
} from "lemmy-js-client";
import { HttpService, I18NextService } from "../../services";
import { FirstLoadService, HttpService, I18NextService } from "../../services";
import { HtmlTags } from "../common/html-tags";
import { CommunityForm } from "./community-form";

Expand All @@ -22,6 +22,8 @@ export class CreateCommunity extends Component<any, CreateCommunityState> {
constructor(props: any, context: any) {
super(props, context);
this.handleCommunityCreate = this.handleCommunityCreate.bind(this);

FirstLoadService.isFirstLoad;
}

get documentTitle(): string {
Expand Down
4 changes: 3 additions & 1 deletion src/shared/components/home/legal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { setIsoData } from "@utils/app";
import { Component } from "inferno";
import { GetSiteResponse } from "lemmy-js-client";
import { mdToHtml } from "../../markdown";
import { I18NextService } from "../../services";
import { FirstLoadService, I18NextService } from "../../services";
import { HtmlTags } from "../common/html-tags";

interface LegalState {
Expand All @@ -17,6 +17,8 @@ export class Legal extends Component<any, LegalState> {

constructor(props: any, context: any) {
super(props, context);

FirstLoadService.isFirstLoad;
}

get documentTitle(): string {
Expand Down
4 changes: 3 additions & 1 deletion src/shared/components/home/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { isBrowser } from "@utils/browser";
import { validEmail } from "@utils/helpers";
import { Component, linkEvent } from "inferno";
import { GetSiteResponse, LoginResponse } from "lemmy-js-client";
import { I18NextService, UserService } from "../../services";
import { FirstLoadService, I18NextService, UserService } from "../../services";
import { HttpService, RequestState } from "../../services/HttpService";
import { toast } from "../../toast";
import { HtmlTags } from "../common/html-tags";
Expand Down Expand Up @@ -32,6 +32,8 @@ export class Login extends Component<any, State> {

constructor(props: any, context: any) {
super(props, context);

FirstLoadService.isFirstLoad;
}

componentDidMount() {
Expand Down
4 changes: 3 additions & 1 deletion src/shared/components/home/setup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
LoginResponse,
Register,
} from "lemmy-js-client";
import { I18NextService, UserService } from "../../services";
import { FirstLoadService, I18NextService, UserService } from "../../services";
import { HttpService, RequestState } from "../../services/HttpService";
import { Spinner } from "../common/icon";
import { SiteForm } from "./site-form";
Expand Down Expand Up @@ -47,6 +47,8 @@ export class Setup extends Component<any, State> {
super(props, context);

this.handleCreateSite = this.handleCreateSite.bind(this);

FirstLoadService.isFirstLoad;
}

async componentDidMount() {
Expand Down
4 changes: 3 additions & 1 deletion src/shared/components/home/signup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
} from "lemmy-js-client";
import { joinLemmyUrl } from "../../config";
import { mdToHtml } from "../../markdown";
import { I18NextService, UserService } from "../../services";
import { FirstLoadService, I18NextService, UserService } from "../../services";
import { HttpService, RequestState } from "../../services/HttpService";
import { toast } from "../../toast";
import { HtmlTags } from "../common/html-tags";
Expand Down Expand Up @@ -84,6 +84,8 @@ export class Signup extends Component<any, State> {
super(props, context);

this.handleAnswerChange = this.handleAnswerChange.bind(this);

FirstLoadService.isFirstLoad;
}

async componentDidMount() {
Expand Down
9 changes: 8 additions & 1 deletion src/shared/components/person/password-change.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ import { myAuth, setIsoData } from "@utils/app";
import { capitalizeFirstLetter } from "@utils/helpers";
import { Component, linkEvent } from "inferno";
import { GetSiteResponse, LoginResponse } from "lemmy-js-client";
import { HttpService, I18NextService, UserService } from "../../services";
import {
FirstLoadService,
HttpService,
I18NextService,
UserService,
} from "../../services";
import { RequestState } from "../../services/HttpService";
import { HtmlTags } from "../common/html-tags";
import { Spinner } from "../common/icon";
Expand Down Expand Up @@ -30,6 +35,8 @@ export class PasswordChange extends Component<any, State> {

constructor(props: any, context: any) {
super(props, context);

FirstLoadService.isFirstLoad;
}

get documentTitle(): string {
Expand Down
5 changes: 3 additions & 2 deletions src/shared/components/person/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
SortType,
} from "lemmy-js-client";
import { elementUrl, emDash, relTags } from "../../config";
import { UserService } from "../../services";
import { FirstLoadService, UserService } from "../../services";
import { HttpService, RequestState } from "../../services/HttpService";
import { I18NextService, languages } from "../../services/I18NextService";
import { setupTippy } from "../../tippy";
Expand Down Expand Up @@ -170,6 +170,8 @@ export class Settings extends Component<any, SettingsState> {
this.handleBlockPerson = this.handleBlockPerson.bind(this);
this.handleBlockCommunity = this.handleBlockCommunity.bind(this);

FirstLoadService.isFirstLoad;

const mui = UserService.Instance.myUserInfo;
if (mui) {
const {
Expand Down Expand Up @@ -1177,7 +1179,6 @@ export class Settings extends Component<any, SettingsState> {
});
if (saveRes.state === "success") {
UserService.Instance.login(saveRes.data);
location.reload();
toast(I18NextService.i18n.t("saved"));
window.scrollTo(0, 0);
}
Expand Down
4 changes: 3 additions & 1 deletion src/shared/components/person/verify-email.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { setIsoData } from "@utils/app";
import { Component } from "inferno";
import { GetSiteResponse, VerifyEmailResponse } from "lemmy-js-client";
import { I18NextService } from "../../services";
import { FirstLoadService, I18NextService } from "../../services";
import { HttpService, RequestState } from "../../services/HttpService";
import { toast } from "../../toast";
import { HtmlTags } from "../common/html-tags";
Expand All @@ -22,6 +22,8 @@ export class VerifyEmail extends Component<any, State> {

constructor(props: any, context: any) {
super(props, context);

FirstLoadService.isFirstLoad;
}

async verify() {
Expand Down