Get it working for non-setup site.

diff --git a/src/shared/components/main.tsx b/src/shared/components/main.tsx
index 33d79ec16490987c795030639416bb3f4e14ac8e..54bb66b98b0f88275ad298152b1b495764ad1772 100644 (file)
--- a/src/shared/components/main.tsx
+++ b/src/shared/components/main.tsx
@@ -152,6 +152,11 @@ export class Main extends Component<any, MainState> {
   }
 
   componentDidMount() {
   }
 
   componentDidMount() {

+    // This means it hasn't been set up yet
+    if (!this.state.siteRes.site) {
+      this.context.router.history.push('/setup');
+    }
+

     WebSocketService.Instance.communityJoin({ community_id: 0 });
   }
 
     WebSocketService.Instance.communityJoin({ community_id: 0 });
   }
 


@@ -240,7 +245,9 @@ export class Main extends Component<any, MainState> {
   }
 
   get documentTitle(): string {
   }
 
   get documentTitle(): string {

-    return `${this.state.siteRes.site.name}`;
+    return `${
+      this.state.siteRes.site ? this.state.siteRes.site.name : 'Lemmy'
+    }`;

   }
 
   render() {
   }
 
   render() {


@@ -250,12 +257,14 @@ export class Main extends Component<any, MainState> {
           title={this.documentTitle}
           path={this.context.router.route.match.url}
         />
           title={this.documentTitle}
           path={this.context.router.route.match.url}
         />

-        <div class="row">
-          <main role="main" class="col-12 col-md-8">
-            {this.posts()}
-          </main>
-          <aside class="col-12 col-md-4">{this.mySidebar()}</aside>
-        </div>
+        {this.state.siteRes.site && (
+          <div class="row">
+            <main role="main" class="col-12 col-md-8">
+              {this.posts()}
+            </main>
+            <aside class="col-12 col-md-4">{this.mySidebar()}</aside>
+          </div>
+        )}

       </div>
     );
   }
       </div>
     );
   }


@@ -394,7 +403,7 @@ export class Main extends Component<any, MainState> {
   }
 
   siteName() {
   }
 
   siteName() {

-    return <h5 class="mb-0">{`${this.state.siteRes.site.name}`}</h5>;
+    return <h5 class="mb-0">{`${this.documentTitle}`}</h5>;

   }
 
   admins() {
   }
 
   admins() {


@@ -719,18 +728,6 @@ export class Main extends Component<any, MainState> {
       let data = res.data as ListCommunitiesResponse;
       this.state.trendingCommunities = data.communities;
       this.setState(this.state);
       let data = res.data as ListCommunitiesResponse;
       this.state.trendingCommunities = data.communities;
       this.setState(this.state);

-    } else if (res.op == UserOperation.GetSite) {
-      let data = res.data as GetSiteResponse;
-
-      // This means it hasn't been set up yet
-      if (!data.site) {
-        this.context.router.history.push('/setup');
-      }
-      this.state.siteRes.admins = data.admins;
-      this.state.siteRes.site = data.site;
-      this.state.siteRes.banned = data.banned;
-      this.state.siteRes.online = data.online;
-      this.setState(this.state);

     } else if (res.op == UserOperation.EditSite) {
       let data = res.data as SiteResponse;
       this.state.siteRes.site = data.site;
     } else if (res.op == UserOperation.EditSite) {
       let data = res.data as SiteResponse;
       this.state.siteRes.site = data.site;

diff --git a/src/shared/components/setup.tsx b/src/shared/components/setup.tsx
index 6360ec5a36022e4fcb7d21aabc748c1b479dbc50..33fa44323232f9d2919bdae64705457b0eca4a19 100644 (file)
--- a/src/shared/components/setup.tsx
+++ b/src/shared/components/setup.tsx
@@ -205,7 +205,7 @@ export class Setup extends Component<any, State> {
       UserService.Instance.login(data);
       this.setState(this.state);
     } else if (res.op == UserOperation.CreateSite) {
       UserService.Instance.login(data);
       this.setState(this.state);
     } else if (res.op == UserOperation.CreateSite) {

-      this.props.history.push('/');
+      window.location.href = '/';

     }
   }
 }
     }
   }
 }