move and rename src/websocket/instanceServices to src/api (#4360)

Co-authored-by: Jeremy Letto <jeremy.letto@datasite.com>

webclient/src/api/ModeratorService.tsx

@@ -1,4 +1,4 @@
-import { webClient } from "..";
+import { webClient } from "websocket";
 
 export default class ModeratorService {
   static viewLogHistory(filters) {

webclient/src/api/RoomsService.tsx

@@ -1,4 +1,4 @@
-import { webClient } from "..";
+import { webClient } from "websocket";
 
 export default class RoomsService {
   static joinRoom(roomId) {

webclient/src/api/RouterService.tsx

@@ -1,4 +1,4 @@
-import { RouteEnum } from "../../types";
+import { RouteEnum } from "types";
 
 export class RouterService {
   resolveUrl(path, params) {

webclient/src/api/SessionService.tsx

@@ -1,4 +1,4 @@
-import { webClient } from "..";
+import { webClient } from "websocket";
 
 export default class SessionService {
   static addToBuddyList(userName) {

webclient/src/components/Guard/AuthGuard.tsx

@@ -5,7 +5,7 @@ import { Redirect } from "react-router-dom";
 import { ServerSelectors } from "store";
 import { RouteEnum } from "types";
 
-import { AuthenticationService } from "websocket";
+import { AuthenticationService } from "api";
 
 class AuthGuard extends Component<AuthGuardProps> {
   render() {

webclient/src/components/Guard/ModGuard.tsx

@@ -5,7 +5,7 @@ import { Redirect } from "react-router-dom";
 import { ServerSelectors } from "store";
 import { User } from "types";
 
-import { AuthenticationService } from "websocket";
+import { AuthenticationService } from "api";
 import { RouteEnum } from "types";
 
 class ModGuard extends Component<ModGuardProps> {

webclient/src/components/Header/Header.tsx

@@ -6,11 +6,9 @@ import Chip from "@material-ui/core/Chip";
 import Toolbar from "@material-ui/core/Toolbar";
 import * as _ from "lodash";
 
+import { AuthenticationService } from "api";
 import {  RoomsSelectors, ServerSelectors } from "store";
-import { Room, User } from "types";
-
-import { AuthenticationService } from "../../websocket";
-import { RouteEnum } from "../../types";
+import { Room, RouteEnum, User } from "types";
 
 import "./Header.css";
 import logo from "./logo.png";

webclient/src/components/Logs/Logs.tsx

@@ -6,7 +6,7 @@ import * as _ from "lodash";
 
 import { ServerDispatch, ServerSelectors, ServerStateLogs } from "store";
 
-import { ModeratorService } from "websocket";
+import { ModeratorService } from "api";
 
 import { AuthGuard, ModGuard} from "components";
 import LogResults from "./LogResults";

webclient/src/components/Room/Room.tsx

@@ -5,9 +5,9 @@ import { withRouter /*, RouteComponentProps */ } from "react-router-dom";
 import ListItem from "@material-ui/core/ListItem";
 import Paper from "@material-ui/core/Paper";
 
-import { RoomsStateMessages, RoomsStateRooms, RoomsSelectors } from "store";
-import { RoomsService } from "websocket";
+import { RoomsService } from "api";
 import { ScrollToBottomOnChanges, ThreePaneLayout, UserDisplay, VirtualList, AuthGuard} from "components";
+import { RoomsStateMessages, RoomsStateRooms, RoomsSelectors } from "store";
 
 
 

webclient/src/components/Server/Rooms.tsx

@@ -11,7 +11,7 @@ import TableHead from "@material-ui/core/TableHead";
 import TableRow from "@material-ui/core/TableRow";
 
 
-import { RoomsService } from "websocket";
+import { RoomsService } from "api";
 import { RouteEnum } from "types";
 
 import "./Rooms.css";

webclient/src/components/Server/Server.tsx

@@ -9,7 +9,7 @@ import Paper from "@material-ui/core/Paper";
 
 import { RoomsSelectors, ServerSelectors } from "store";
 
-import { AuthenticationService } from "websocket";
+import { AuthenticationService } from "api";
 
 import { ThreePaneLayout, UserDisplay, VirtualList } from "components";
 import { ConnectForm, RegisterForm } from "forms";

webclient/src/components/UserDisplay/UserDisplay.tsx

@@ -6,12 +6,9 @@ import { NavLink, generatePath } from "react-router-dom";
 import Menu from "@material-ui/core/Menu";
 import MenuItem from "@material-ui/core/MenuItem";
 
-import { SessionService } from "../../websocket";
-import { ServerSelectors } from "../../store";
-
-import { RouteEnum } from "../../types";
-
-import { User } from "types";
+import { SessionService } from "api";
+import { ServerSelectors } from "store";
+import { RouteEnum, User } from "types";
 
 import "./UserDisplay.css";
 
@@ -93,8 +90,7 @@ class UserDisplay extends Component<UserDisplayProps, UserDisplayState> {
     const isABuddy = this.isABuddy();
     const isIgnored = this.isIgnored();
 
-
-    console.log('user', name, !!isABuddy, !!isIgnored);
+    // console.log('user', name, !!isABuddy, !!isIgnored);
 
     return (
       <div className="user-display">

webclient/src/containers/Account/Account.tsx

@@ -7,7 +7,7 @@ import ListItem from "@material-ui/core/ListItem";
 import Paper from "@material-ui/core/Paper";
 
 import { UserDisplay, VirtualList, AuthGuard } from "components";
-import { AuthenticationService, SessionService } from "websocket";
+import { AuthenticationService, SessionService } from "api";
 import { ServerSelectors } from "store";
 import { User } from 'types';
 

webclient/src/websocket/index.ts

@@ -3,9 +3,4 @@ export { default as ProtoFiles } from './ProtoFiles';
 
 
 // Export common used services
-
-export { NormalizeService, RoomService} from "./services";
-
-
-// Note: this has to come after webClient
-export { AuthenticationService, ModeratorService, RoomsService, SessionService } from "./instanceService";
+export { NormalizeService, RoomService} from "./services";