]> Untitled Git - lemmy-ui.git/blobdiff - src/shared/components/home/site-sidebar.tsx
Merge remote-tracking branch 'origin/main' into feat/add-badges-common-component
[lemmy-ui.git] / src / shared / components / home / site-sidebar.tsx
index e8642c78366e8da22ed206a5adbdb84fad8d8e1b..66a48ca11e095ec909343a4ba94a170c9eb3baca 100644 (file)
@@ -1,76 +1,54 @@
-import { None, Option, Some } from "@sniptt/monads";
 import { Component, linkEvent } from "inferno";
-import { Link } from "inferno-router";
-import { PersonViewSafe, Site, SiteAggregates } from "lemmy-js-client";
+import { PersonView, Site, SiteAggregates } from "lemmy-js-client";
 import { i18n } from "../../i18next";
-import { amAdmin, mdToHtml, numToSI } from "../../utils";
+import { mdToHtml } from "../../utils";
+import { Badges } from "../common/badges";
 import { BannerIconHeader } from "../common/banner-icon-header";
 import { Icon } from "../common/icon";
 import { PersonListing } from "../person/person-listing";
-import { SiteForm } from "./site-form";
 
 interface SiteSidebarProps {
   site: Site;
   showLocal: boolean;
-  counts: Option<SiteAggregates>;
-  admins: Option<PersonViewSafe[]>;
-  online: Option<number>;
+  counts?: SiteAggregates;
+  admins?: PersonView[];
 }
 
 interface SiteSidebarState {
   collapsed: boolean;
-  showEdit: boolean;
 }
 
 export class SiteSidebar extends Component<SiteSidebarProps, SiteSidebarState> {
-  private emptyState: SiteSidebarState = {
+  state: SiteSidebarState = {
     collapsed: false,
-    showEdit: false,
   };
 
   constructor(props: any, context: any) {
     super(props, context);
-    this.state = this.emptyState;
-    this.handleEditCancel = this.handleEditCancel.bind(this);
-    this.handleEditSite = this.handleEditSite.bind(this);
   }
 
   render() {
-    let site = this.props.site;
     return (
-      <div className="card border-secondary mb-3">
+      <section id="sidebarInfo" className="card border-secondary mb-3">
         <div className="card-body">
-          {!this.state.showEdit ? (
-            <div>
-              <div className="mb-2">
-                {this.siteName()}
-                {this.props.admins.isSome() && this.adminButtons()}
-              </div>
-              {!this.state.collapsed && (
-                <>
-                  <BannerIconHeader banner={site.banner} icon={None} />
-                  {this.siteInfo()}
-                </>
-              )}
-            </div>
-          ) : (
-            <SiteForm
-              site={Some(site)}
-              showLocal={this.props.showLocal}
-              onEdit={this.handleEditSite}
-              onCancel={this.handleEditCancel}
-            />
-          )}
+          <div>
+            <div className="mb-2">{this.siteName()}</div>
+            {!this.state.collapsed && (
+              <>
+                <BannerIconHeader banner={this.props.site.banner} />
+                {this.siteInfo()}
+              </>
+            )}
+          </div>
         </div>
-      </div>
+      </section>
     );
   }
 
   siteName() {
-    let site = this.props.site;
     return (
       <h5 className="mb-0 d-inline">
-        {site.name}
+        {this.props.site.name}
         <button
           className="btn btn-sm text-muted"
           onClick={linkEvent(this, this.handleCollapseSidebar)}
@@ -88,55 +66,24 @@ export class SiteSidebar extends Component<SiteSidebarProps, SiteSidebarState> {
   }
 
   siteInfo() {
-    let site = this.props.site;
+    const site = this.props.site;
     return (
       <div>
-        {site.description.match({
-          some: description => <h6>{description}</h6>,
-          none: <></>,
-        })}
-        {site.sidebar.match({
-          some: sidebar => this.siteSidebar(sidebar),
-          none: <></>,
-        })}
-        {this.props.counts.match({
-          some: counts => this.badges(counts),
-          none: <></>,
-        })}
-        {this.props.admins.match({
-          some: admins => this.admins(admins),
-          none: <></>,
-        })}
+        {site.description && <h6>{site.description}</h6>}
+        {site.sidebar && this.siteSidebar(site.sidebar)}
+        {this.props.counts && <Badges counts={this.props.counts} />}
+        {this.props.admins && this.admins(this.props.admins)}
       </div>
     );
   }
 
-  adminButtons() {
-    return (
-      amAdmin() && (
-        <ul className="list-inline mb-1 text-muted font-weight-bold">
-          <li className="list-inline-item-action">
-            <button
-              className="btn btn-link d-inline-block text-muted"
-              onClick={linkEvent(this, this.handleEditClick)}
-              aria-label={i18n.t("edit")}
-              data-tippy-content={i18n.t("edit")}
-            >
-              <Icon icon="edit" classes="icon-inline" />
-            </button>
-          </li>
-        </ul>
-      )
-    );
-  }
-
   siteSidebar(sidebar: string) {
     return (
       <div className="md-div" dangerouslySetInnerHTML={mdToHtml(sidebar)} />
     );
   }
 
-  admins(admins: PersonViewSafe[]) {
+  admins(admins: PersonView[]) {
     return (
       <ul className="mt-1 list-inline small mb-0">
         <li className="list-inline-item">{i18n.t("admins")}:</li>
@@ -149,115 +96,7 @@ export class SiteSidebar extends Component<SiteSidebarProps, SiteSidebarState> {
     );
   }
 
-  badges(siteAggregates: SiteAggregates) {
-    let counts = siteAggregates;
-    let online = this.props.online.unwrapOr(1);
-    return (
-      <ul className="my-2 list-inline">
-        <li className="list-inline-item badge badge-secondary">
-          {i18n.t("number_online", {
-            count: online,
-            formattedCount: numToSI(online),
-          })}
-        </li>
-        <li
-          className="list-inline-item badge badge-secondary pointer"
-          data-tippy-content={i18n.t("active_users_in_the_last_day", {
-            count: counts.users_active_day,
-            formattedCount: numToSI(counts.users_active_day),
-          })}
-        >
-          {i18n.t("number_of_users", {
-            count: counts.users_active_day,
-            formattedCount: numToSI(counts.users_active_day),
-          })}{" "}
-          / {i18n.t("day")}
-        </li>
-        <li
-          className="list-inline-item badge badge-secondary pointer"
-          data-tippy-content={i18n.t("active_users_in_the_last_week", {
-            count: counts.users_active_week,
-            formattedCount: counts.users_active_week,
-          })}
-        >
-          {i18n.t("number_of_users", {
-            count: counts.users_active_week,
-            formattedCount: numToSI(counts.users_active_week),
-          })}{" "}
-          / {i18n.t("week")}
-        </li>
-        <li
-          className="list-inline-item badge badge-secondary pointer"
-          data-tippy-content={i18n.t("active_users_in_the_last_month", {
-            count: counts.users_active_month,
-            formattedCount: counts.users_active_month,
-          })}
-        >
-          {i18n.t("number_of_users", {
-            count: counts.users_active_month,
-            formattedCount: numToSI(counts.users_active_month),
-          })}{" "}
-          / {i18n.t("month")}
-        </li>
-        <li
-          className="list-inline-item badge badge-secondary pointer"
-          data-tippy-content={i18n.t("active_users_in_the_last_six_months", {
-            count: counts.users_active_half_year,
-            formattedCount: counts.users_active_half_year,
-          })}
-        >
-          {i18n.t("number_of_users", {
-            count: counts.users_active_half_year,
-            formattedCount: numToSI(counts.users_active_half_year),
-          })}{" "}
-          / {i18n.t("number_of_months", { count: 6, formattedCount: 6 })}
-        </li>
-        <li className="list-inline-item badge badge-secondary">
-          {i18n.t("number_of_users", {
-            count: counts.users,
-            formattedCount: numToSI(counts.users),
-          })}
-        </li>
-        <li className="list-inline-item badge badge-secondary">
-          {i18n.t("number_of_communities", {
-            count: counts.communities,
-            formattedCount: numToSI(counts.communities),
-          })}
-        </li>
-        <li className="list-inline-item badge badge-secondary">
-          {i18n.t("number_of_posts", {
-            count: counts.posts,
-            formattedCount: numToSI(counts.posts),
-          })}
-        </li>
-        <li className="list-inline-item badge badge-secondary">
-          {i18n.t("number_of_comments", {
-            count: counts.comments,
-            formattedCount: numToSI(counts.comments),
-          })}
-        </li>
-        <li className="list-inline-item">
-          <Link className="badge badge-primary" to="/modlog">
-            {i18n.t("modlog")}
-          </Link>
-        </li>
-      </ul>
-    );
-  }
-
   handleCollapseSidebar(i: SiteSidebar) {
     i.setState({ collapsed: !i.state.collapsed });
   }
-
-  handleEditClick(i: SiteSidebar) {
-    i.setState({ showEdit: true });
-  }
-
-  handleEditSite() {
-    this.setState({ showEdit: false });
-  }
-
-  handleEditCancel() {
-    this.setState({ showEdit: false });
-  }
 }