Merge branch 'main' into feat/default-to-user-primary-lang

src/assets/css/themes/_variables.darkly-compact.scss

@@ -0,0 +1 @@
+@import "variables.darkly";

src/assets/css/themes/_variables.litely-compact.scss

@@ -0,0 +1 @@
+@import "variables.litely";

src/assets/css/themes/darkly-compact.scss

@@ -0,0 +1,59 @@
+@import "variables.darkly-compact";
+
+/*
+    GENERAL
+*/
+
+// Desktop Breakpoint
+$container-max-widths: (
+  lg: 1920px,
+);
+
+// Reduce hr height
+hr.my-3 {
+  margin-top: 0.5rem !important;
+  margin-bottom: 0.5rem !important;
+}
+
+/*
+    POST-LISTING
+*/
+
+.post-listing {
+  line-height: 1;
+
+  .post-title h5 {
+    margin: 0;
+  }
+
+  .post-title + p {
+    padding-top: 0.125rem !important;
+    padding-bottom: 0.125rem !important;
+  }
+
+  .community-link {
+    padding-left: 0.125rem;
+  }
+
+  .person-listing {
+    padding-right: 0.125rem;
+  }
+
+  ul.list-inline {
+    &.mt-2 {
+      margin-top: 0.125rem !important;
+    }
+    &.mb-1 {
+      margin-bottom: 0.125rem !important;
+    }
+  }
+
+  .btn-sm {
+    --bs-btn-padding-y: 0;
+  }
+  .img-icon {
+    display: none;
+  }
+}
+
+@import "../../../../node_modules/bootstrap/scss/bootstrap";

src/assets/css/themes/litely-compact.scss

@@ -0,0 +1,59 @@
+@import "variables.litely-compact";
+
+/*
+    GENERAL
+*/
+
+// Desktop Breakpoint
+$container-max-widths: (
+  lg: 1920px,
+);
+
+// Reduce hr height
+hr.my-3 {
+  margin-top: 0.5rem !important;
+  margin-bottom: 0.5rem !important;
+}
+
+/*
+    POST-LISTING
+*/
+
+.post-listing {
+  line-height: 1;
+
+  .post-title h5 {
+    margin: 0;
+  }
+
+  .post-title + p {
+    padding-top: 0.125rem !important;
+    padding-bottom: 0.125rem !important;
+  }
+
+  .community-link {
+    padding-left: 0.125rem;
+  }
+
+  .person-listing {
+    padding-right: 0.125rem;
+  }
+
+  ul.list-inline {
+    &.mt-2 {
+      margin-top: 0.125rem !important;
+    }
+    &.mb-1 {
+      margin-bottom: 0.125rem !important;
+    }
+  }
+
+  .btn-sm {
+    --bs-btn-padding-y: 0;
+  }
+  .img-icon {
+    display: none;
+  }
+}
+
+@import "../../../../node_modules/bootstrap/scss/bootstrap";

src/server/utils/build-themes-list.ts

@@ -7,8 +7,10 @@ const extraThemesFolder =
 const themes: ReadonlyArray<string> = [
   "darkly",
   "darkly-red",
+  "darkly-compact",
   "litely",
   "litely-red",
+  "litely-compact",
 ];
 
 export async function buildThemeList(): Promise<ReadonlyArray<string>> {

src/shared/components/app/app.tsx

@@ -4,7 +4,7 @@ import { Provider } from "inferno-i18next-dess";
 import { Route, Switch } from "inferno-router";
 import { IsoDataOptionalSite } from "../../interfaces";
 import { routes } from "../../routes";
-import { I18NextService } from "../../services";
+import { FirstLoadService, I18NextService } from "../../services";
 import AuthGuard from "../common/auth-guard";
 import ErrorGuard from "../common/error-guard";
 import { ErrorPage } from "./error-page";
@@ -45,27 +45,35 @@ export class App extends Component<any, any> {
             <Navbar siteRes={siteRes} />
             <div className="mt-4 p-0 fl-1">
               <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} />
               </Switch>
             </div>

src/shared/components/common/language-select.tsx

@@ -49,39 +49,42 @@ export class LanguageSelect extends Component<LanguageSelectProps, any> {
     return this.props.iconVersion ? (
       this.selectBtn
     ) : (
-      <div className="language-select">
+      <div className="language-select mb-3">
+        <label
+          className={classNames(
+            "col-form-label",
+            `col-sm-${this.props.multiple ? 3 : 2}`
+          )}
+          htmlFor={this.id}
+        >
+          {I18NextService.i18n.t(
+            this.props.multiple ? "language_plural" : "language"
+          )}
+        </label>
         {this.props.multiple && this.props.showLanguageWarning && (
-          <div className="alert alert-warning" role="alert">
+          <div
+            id="lang-warning"
+            className="alert small alert-warning"
+            role="alert"
+          >
+            <Icon icon="alert-triangle" classes="icon-inline me-2" />
             {I18NextService.i18n.t("undetermined_language_warning")}
           </div>
         )}
-        <div className="mb-3 row">
+        <div
-          <label
+          className={classNames(`col-sm-${this.props.multiple ? 9 : 10}`, {
-            className={classNames(
+            "input-group": this.props.multiple,
-              "col-form-label",
+          })}
-              `col-sm-${this.props.multiple ? 3 : 2}`
+        >
-            )}
+          {this.selectBtn}
-            htmlFor={this.id}
+          {this.props.multiple && (
-          >
+            <button
-            {I18NextService.i18n.t(
+              className="btn btn-outline-secondary"
-              this.props.multiple ? "language_plural" : "language"
+              onClick={linkEvent(this, this.handleDeselectAll)}
-            )}
+            >
-          </label>
+              <Icon icon="x" />
-          <div
+            </button>
-            className={classNames(`col-sm-${this.props.multiple ? 9 : 10}`, {
+          )}
-              "input-group": this.props.multiple,
-            })}
-          >
-            {this.selectBtn}
-            {this.props.multiple && (
-              <button
-                className="btn btn-outline-secondary"
-                onClick={linkEvent(this, this.handleDeselectAll)}
-              >
-                <Icon icon="x" />
-              </button>
-            )}
-          </div>
         </div>
       </div>
     );
@@ -105,6 +108,11 @@ export class LanguageSelect extends Component<LanguageSelectProps, any> {
         id={this.id}
         onChange={linkEvent(this, this.handleLanguageChange)}
         aria-label={I18NextService.i18n.t("language_select_placeholder")}
+        aria-describedby={
+          this.props.multiple && this.props.showLanguageWarning
+            ? "lang-warning"
+            : ""
+        }
         multiple={this.props.multiple}
         disabled={this.props.disabled}
       >

src/shared/components/community/create-community.tsx

@@ -4,7 +4,7 @@ import {
   CreateCommunity as CreateCommunityI,
   GetSiteResponse,
 } from "lemmy-js-client";
-import { FirstLoadService, HttpService, I18NextService } from "../../services";
+import { HttpService, I18NextService } from "../../services";
 import { HtmlTags } from "../common/html-tags";
 import { CommunityForm } from "./community-form";
 
@@ -22,8 +22,6 @@ 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 {

src/shared/components/home/legal.tsx

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

src/shared/components/home/login.tsx

@@ -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 { FirstLoadService, I18NextService, UserService } from "../../services";
+import { I18NextService, UserService } from "../../services";
 import { HttpService, RequestState } from "../../services/HttpService";
 import { toast } from "../../toast";
 import { HtmlTags } from "../common/html-tags";
@@ -32,8 +32,6 @@ export class Login extends Component<any, State> {
 
   constructor(props: any, context: any) {
     super(props, context);
-
-    FirstLoadService.isFirstLoad;
   }
 
   componentDidMount() {

src/shared/components/home/setup.tsx

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

src/shared/components/home/signup.tsx

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

src/shared/components/person/password-change.tsx

@@ -2,12 +2,7 @@ import { myAuth, setIsoData } from "@utils/app";
 import { capitalizeFirstLetter } from "@utils/helpers";
 import { Component, linkEvent } from "inferno";
 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 { HtmlTags } from "../common/html-tags";
 import { Spinner } from "../common/icon";
@@ -35,8 +30,6 @@ export class PasswordChange extends Component<any, State> {
 
   constructor(props: any, context: any) {
     super(props, context);
-
-    FirstLoadService.isFirstLoad;
   }
 
   get documentTitle(): string {

src/shared/components/person/settings.tsx

@@ -29,7 +29,7 @@ import {
   SortType,
 } from "lemmy-js-client";
 import { elementUrl, emDash, relTags } from "../../config";
-import { FirstLoadService, UserService } from "../../services";
+import { UserService } from "../../services";
 import { HttpService, RequestState } from "../../services/HttpService";
 import { I18NextService, languages } from "../../services/I18NextService";
 import { setupTippy } from "../../tippy";
@@ -170,8 +170,6 @@ 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 {

src/shared/components/person/verify-email.tsx

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

src/shared/services/FirstLoadService.ts

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