LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-23 04:41:14 +00:00
Code Issues Projects Releases Wiki Activity

Refactor first load handling

Browse source
This commit is contained in:
SleeplessOne1917 2023-06-23 15:41:10 -04:00 committed by Jay Sitter
parent 9166491544
commit 175d43d067
10 changed files with 46 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/shared/components/app/app.tsx
View file

@ -4,7 +4,7 @@ import { Provider } from "inferno-i18next-dess";
import { Route, Switch } from "inferno-router"; import { Route, Switch } from "inferno-router";
import { IsoDataOptionalSite } from "../../interfaces"; import { IsoDataOptionalSite } from "../../interfaces";
import { routes } from "../../routes"; import { routes } from "../../routes";
import { I18NextService } from "../../services"; import { FirstLoadService, I18NextService } from "../../services";
import AuthGuard from "../common/auth-guard"; import AuthGuard from "../common/auth-guard";
import ErrorGuard from "../common/error-guard"; import ErrorGuard from "../common/error-guard";
import { ErrorPage } from "./error-page"; import { ErrorPage } from "./error-page";
@ -45,27 +45,35 @@ export class App extends Component<any, any> {
<Navbar siteRes={siteRes} /> <Navbar siteRes={siteRes} />
<div className="mt-4 p-0 fl-1"> <div className="mt-4 p-0 fl-1">
<Switch> <Switch>
{routes.map(({ path, component: RouteComponent }) => ( {routes.map(
<Route ({ path, component: RouteComponent, fetchInitialData }) => (
key={path} <Route
path={path} key={path}
exact path={path}
component={routeProps => ( exact
<ErrorGuard> component={routeProps => {
<main tabIndex={-1} ref={this.mainContentRef}> if (!fetchInitialData) {
{RouteComponent && FirstLoadService.falsify();
(isAuthPath(path ?? "") ? ( }
<AuthGuard>
<RouteComponent {...routeProps} /> return (
</AuthGuard> <ErrorGuard>
) : ( <main tabIndex={-1} ref={this.mainContentRef}>
<RouteComponent {...routeProps} /> {RouteComponent &&
))} (isAuthPath(path ?? "") ? (
</main> <AuthGuard>
</ErrorGuard> <RouteComponent {...routeProps} />
)} </AuthGuard>
/> ) : (
))} <RouteComponent {...routeProps} />
))}
</main>
</ErrorGuard>
);
}}
/>
)
)}
<Route component={ErrorPage} /> <Route component={ErrorPage} />
</Switch> </Switch>
</div> </div>

4
src/shared/components/community/create-community.tsx
View file

@ -4,7 +4,7 @@ import {
CreateCommunity as CreateCommunityI, CreateCommunity as CreateCommunityI,
GetSiteResponse, GetSiteResponse,
} from "lemmy-js-client"; } from "lemmy-js-client";
import { FirstLoadService, HttpService, I18NextService } from "../../services"; import { HttpService, I18NextService } from "../../services";
import { HtmlTags } from "../common/html-tags"; import { HtmlTags } from "../common/html-tags";
import { CommunityForm } from "./community-form"; import { CommunityForm } from "./community-form";
@ -22,8 +22,6 @@ export class CreateCommunity extends Component<any, CreateCommunityState> {
constructor(props: any, context: any) { constructor(props: any, context: any) {
super(props, context); super(props, context);
this.handleCommunityCreate = this.handleCommunityCreate.bind(this); this.handleCommunityCreate = this.handleCommunityCreate.bind(this);
FirstLoadService.isFirstLoad;
} }
get documentTitle(): string { get documentTitle(): string {

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

@ -2,7 +2,7 @@ import { setIsoData } from "@utils/app";
import { Component } from "inferno"; import { Component } from "inferno";
import { GetSiteResponse } from "lemmy-js-client"; import { GetSiteResponse } from "lemmy-js-client";
import { mdToHtml } from "../../markdown"; import { mdToHtml } from "../../markdown";
import { FirstLoadService, I18NextService } from "../../services"; import { I18NextService } from "../../services";
import { HtmlTags } from "../common/html-tags"; import { HtmlTags } from "../common/html-tags";
interface LegalState { interface LegalState {
@ -17,8 +17,6 @@ export class Legal extends Component<any, LegalState> {
constructor(props: any, context: any) { constructor(props: any, context: any) {
super(props, context); super(props, context);
FirstLoadService.isFirstLoad;
} }
get documentTitle(): string { get documentTitle(): string {

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

@ -3,7 +3,7 @@ import { isBrowser } from "@utils/browser";
import { validEmail } from "@utils/helpers"; import { validEmail } from "@utils/helpers";
import { Component, linkEvent } from "inferno"; import { Component, linkEvent } from "inferno";
import { GetSiteResponse, LoginResponse } from "lemmy-js-client"; import { GetSiteResponse, LoginResponse } from "lemmy-js-client";
import { FirstLoadService, I18NextService, UserService } from "../../services"; import { I18NextService, UserService } from "../../services";
import { HttpService, RequestState } from "../../services/HttpService"; import { HttpService, RequestState } from "../../services/HttpService";
import { toast } from "../../toast"; import { toast } from "../../toast";
import { HtmlTags } from "../common/html-tags"; import { HtmlTags } from "../common/html-tags";
@ -32,8 +32,6 @@ export class Login extends Component<any, State> {
constructor(props: any, context: any) { constructor(props: any, context: any) {
super(props, context); super(props, context);
FirstLoadService.isFirstLoad;
} }
componentDidMount() { componentDidMount() {

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

@ -7,7 +7,7 @@ import {
LoginResponse, LoginResponse,
Register, Register,
} from "lemmy-js-client"; } from "lemmy-js-client";
import { FirstLoadService, I18NextService, UserService } from "../../services"; import { I18NextService, UserService } from "../../services";
import { HttpService, RequestState } from "../../services/HttpService"; import { HttpService, RequestState } from "../../services/HttpService";
import { Spinner } from "../common/icon"; import { Spinner } from "../common/icon";
import { SiteForm } from "./site-form"; import { SiteForm } from "./site-form";
@ -47,8 +47,6 @@ export class Setup extends Component<any, State> {
super(props, context); super(props, context);
this.handleCreateSite = this.handleCreateSite.bind(this); this.handleCreateSite = this.handleCreateSite.bind(this);
FirstLoadService.isFirstLoad;
} }
async componentDidMount() { async componentDidMount() {

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

@ -14,7 +14,7 @@ import {
} from "lemmy-js-client"; } from "lemmy-js-client";
import { joinLemmyUrl } from "../../config"; import { joinLemmyUrl } from "../../config";
import { mdToHtml } from "../../markdown"; import { mdToHtml } from "../../markdown";
import { FirstLoadService, I18NextService, UserService } from "../../services"; import { I18NextService, UserService } from "../../services";
import { HttpService, RequestState } from "../../services/HttpService"; import { HttpService, RequestState } from "../../services/HttpService";
import { toast } from "../../toast"; import { toast } from "../../toast";
import { HtmlTags } from "../common/html-tags"; import { HtmlTags } from "../common/html-tags";
@ -84,8 +84,6 @@ export class Signup extends Component<any, State> {
super(props, context); super(props, context);
this.handleAnswerChange = this.handleAnswerChange.bind(this); this.handleAnswerChange = this.handleAnswerChange.bind(this);
FirstLoadService.isFirstLoad;
} }
async componentDidMount() { async componentDidMount() {

9
src/shared/components/person/password-change.tsx
View file

@ -2,12 +2,7 @@ import { myAuth, setIsoData } from "@utils/app";
import { capitalizeFirstLetter } from "@utils/helpers"; import { capitalizeFirstLetter } from "@utils/helpers";
import { Component, linkEvent } from "inferno"; import { Component, linkEvent } from "inferno";
import { GetSiteResponse, LoginResponse } from "lemmy-js-client"; import { GetSiteResponse, LoginResponse } from "lemmy-js-client";
import { import { HttpService, I18NextService, UserService } from "../../services";
FirstLoadService,
HttpService,
I18NextService,
UserService,
} from "../../services";
import { RequestState } from "../../services/HttpService"; import { RequestState } from "../../services/HttpService";
import { HtmlTags } from "../common/html-tags"; import { HtmlTags } from "../common/html-tags";
import { Spinner } from "../common/icon"; import { Spinner } from "../common/icon";
@ -35,8 +30,6 @@ export class PasswordChange extends Component<any, State> {
constructor(props: any, context: any) { constructor(props: any, context: any) {
super(props, context); super(props, context);
FirstLoadService.isFirstLoad;
} }
get documentTitle(): string { get documentTitle(): string {

4
src/shared/components/person/settings.tsx
View file

@ -29,7 +29,7 @@ import {
SortType, SortType,
} from "lemmy-js-client"; } from "lemmy-js-client";
import { elementUrl, emDash, relTags } from "../../config"; import { elementUrl, emDash, relTags } from "../../config";
import { FirstLoadService, UserService } from "../../services"; import { UserService } from "../../services";
import { HttpService, RequestState } from "../../services/HttpService"; import { HttpService, RequestState } from "../../services/HttpService";
import { I18NextService, languages } from "../../services/I18NextService"; import { I18NextService, languages } from "../../services/I18NextService";
import { setupTippy } from "../../tippy"; import { setupTippy } from "../../tippy";
@ -170,8 +170,6 @@ export class Settings extends Component<any, SettingsState> {
this.handleBlockPerson = this.handleBlockPerson.bind(this); this.handleBlockPerson = this.handleBlockPerson.bind(this);
this.handleBlockCommunity = this.handleBlockCommunity.bind(this); this.handleBlockCommunity = this.handleBlockCommunity.bind(this);
FirstLoadService.isFirstLoad;
const mui = UserService.Instance.myUserInfo; const mui = UserService.Instance.myUserInfo;
if (mui) { if (mui) {
const { const {

4
src/shared/components/person/verify-email.tsx
View file

@ -1,7 +1,7 @@
import { setIsoData } from "@utils/app"; import { setIsoData } from "@utils/app";
import { Component } from "inferno"; import { Component } from "inferno";
import { GetSiteResponse, VerifyEmailResponse } from "lemmy-js-client"; import { GetSiteResponse, VerifyEmailResponse } from "lemmy-js-client";
import { FirstLoadService, I18NextService } from "../../services"; import { I18NextService } from "../../services";
import { HttpService, RequestState } from "../../services/HttpService"; import { HttpService, RequestState } from "../../services/HttpService";
import { toast } from "../../toast"; import { toast } from "../../toast";
import { HtmlTags } from "../common/html-tags"; import { HtmlTags } from "../common/html-tags";
@ -22,8 +22,6 @@ export class VerifyEmail extends Component<any, State> {
constructor(props: any, context: any) { constructor(props: any, context: any) {
super(props, context); super(props, context);
FirstLoadService.isFirstLoad;
} }
async verify() { async verify() {

8
src/shared/services/FirstLoadService.ts
View file

@ -17,6 +17,10 @@ export class FirstLoadService {
return isFirst; return isFirst;
} }
falsify() {
this.#isFirstLoad = false;
}
static get #Instance() { static get #Instance() {
return this.#instance ?? (this.#instance = new this()); return this.#instance ?? (this.#instance = new this());
} }
@ -24,4 +28,8 @@ export class FirstLoadService {
static get isFirstLoad() { static get isFirstLoad() {
return !isBrowser() || this.#Instance.isFirstLoad; return !isBrowser() || this.#Instance.isFirstLoad;
} }
static falsify() {
this.#Instance.falsify();
}
} }