Before big moderation merge

2 files changed, 21 insertions, 8 deletions

diff --git a/ui/src/services/UserService.ts b/ui/src/services/UserService.ts
index 4e53aa08..e182134d 100644
--- a/ui/src/services/UserService.ts
+++ b/ui/src/services/UserService.ts
@@ -31,10 +31,6 @@ export class UserService {
     this.sub.next(undefined);
   }
 
-  public get loggedIn(): boolean {
-    return this.user !== undefined;
-  }
-
   public get auth(): string {
     return Cookies.get("jwt");
   }
diff --git a/ui/src/services/WebSocketService.ts b/ui/src/services/WebSocketService.ts
index 3596bb46..80555fd9 100644
--- a/ui/src/services/WebSocketService.ts
+++ b/ui/src/services/WebSocketService.ts
@@ -1,5 +1,5 @@
 import { wsUri } from '../env';
-import { LoginForm, RegisterForm, UserOperation, CommunityForm, PostForm, CommentForm, CommentLikeForm, GetPostsForm, CreatePostLikeForm, FollowCommunityForm, GetUserDetailsForm, ListCommunitiesForm, GetModlogForm, BanFromCommunityForm, AddModToCommunityForm } from '../interfaces';
+import { LoginForm, RegisterForm, UserOperation, CommunityForm, PostForm, CommentForm, CommentLikeForm, GetPostsForm, CreatePostLikeForm, FollowCommunityForm, GetUserDetailsForm, ListCommunitiesForm, GetModlogForm, BanFromCommunityForm, AddModToCommunityForm, SiteForm, Site, UserView } from '../interfaces';
 import { webSocket } from 'rxjs/webSocket';
 import { Subject } from 'rxjs';
 import { retryWhen, delay, take } from 'rxjs/operators';
@@ -8,16 +8,21 @@ import { UserService } from './';
 export class WebSocketService {
   private static _instance: WebSocketService;
   public subject: Subject<any>;
+  public instanceName: string;
+
+  public site: Site;
+  public admins: Array<UserView>;
+  public banned: Array<UserView>;
 
   private constructor() {
     this.subject = webSocket(wsUri);
 
-    // Even tho this isn't used, its necessary to not keep reconnecting
+    // Necessary to not keep reconnecting
     this.subject
       .pipe(retryWhen(errors => errors.pipe(delay(60000), take(999))))
       .subscribe();
 
-    console.log(`Connected to ${wsUri}`);
+      console.log(`Connected to ${wsUri}`);
   }
 
   public static get Instance(){
@@ -125,6 +130,19 @@ export class WebSocketService {
     this.subject.next(this.wsSendWrapper(UserOperation.GetModlog, form));
   }
 
+  public createSite(siteForm: SiteForm) {
+    this.setAuth(siteForm);
+    this.subject.next(this.wsSendWrapper(UserOperation.CreateSite, siteForm));
+  }
+
+  public editSite(siteForm: SiteForm) {
+    this.setAuth(siteForm);
+    this.subject.next(this.wsSendWrapper(UserOperation.EditSite, siteForm));
+  }
+  public getSite() {
+    this.subject.next(this.wsSendWrapper(UserOperation.GetSite, {}));
+  }
+
   private wsSendWrapper(op: UserOperation, data: any) {
     let send = { op: UserOperation[op], data: data };
     console.log(send);
@@ -138,7 +156,6 @@ export class WebSocketService {
       throw "Not logged in";
     }
   }
-
 }
 
 window.onbeforeunload = (() => {