From: SleeplessOne1917 <abias1122@gmail.com>
Date: Fri, 16 Jun 2023 21:17:48 +0000 (+0000)
Subject: Merge branch 'main' into feature/add-ids-and-classes
X-Git-Url: http://these/git/%22%7Bauthor_url%7D/static/%24%7Bsubmission.url%7D?a=commitdiff_plain;h=e4561211373b3f56aa1977de37f33ff9bd8e447a;p=lemmy-ui.git

Merge branch 'main' into feature/add-ids-and-classes
---

e4561211373b3f56aa1977de37f33ff9bd8e447a
diff --cc src/shared/components/home/home.tsx
index c7780a9,215075d..870eb76
--- a/src/shared/components/home/home.tsx
+++ b/src/shared/components/home/home.tsx
@@@ -422,37 -419,35 +419,36 @@@ export class Home extends Component<any
      } = this.state;
  
      return (
 -      <div>
 -        <div>
 -          <div className="card border-secondary mb-3">
 -            <div className="card-body">
 -              {this.trendingCommunities()}
 -              {canCreateCommunity(this.state.siteRes) && (
 -                <LinkButton
 -                  path="/create_community"
 -                  translationKey="create_a_community"
 -                />
 -              )}
 +      <div id="sidebarContainer">
 +        <section id="sidebarMain" className="card border-secondary mb-3">
 +          <div className="card-body">
 +            {this.trendingCommunities()}
 +            {canCreateCommunity(this.state.siteRes) && (
                <LinkButton
 -                path="/communities"
 -                translationKey="explore_communities"
 +                path="/create_community"
 +                translationKey="create_a_community"
                />
 -            </div>
 +            )}
 +            <LinkButton
 +              path="/communities"
 +              translationKey="explore_communities"
 +            />
            </div>
 -          <SiteSidebar
 -            site={site}
 -            admins={admins}
 -            counts={counts}
 -            showLocal={showLocal(this.isoData)}
 -          />
 -          {this.hasFollows && (
 -            <div className="card border-secondary mb-3">
 -              <div className="card-body">{this.subscribedCommunities}</div>
 -            </div>
 -          )}
 -        </div>
 +        </section>
 +        <SiteSidebar
 +          site={site}
 +          admins={admins}
 +          counts={counts}
-           online={online}
 +          showLocal={showLocal(this.isoData)}
 +        />
 +        {this.hasFollows && (
 +          <section
 +            id="sidebarSubscribed"
 +            className="card border-secondary mb-3"
 +          >
 +            <div className="card-body">{this.subscribedCommunities}</div>
 +          </section>
 +        )}
        </div>
      );
    }