Rename websocket module to socket.

src/app/store.ts

@@ -5,19 +5,18 @@ import {
   Action,
 } from "@reduxjs/toolkit";
 
-import counterReducer from "../features/counter/counterSlice";
+import counterReducer from "features/counter/counterSlice";
 // TODO: Rework these to use a slice, otherwise redux complains about
 // non-serializable Immutable.js types.
 //
-// import rooms from "../reducers/rooms";
 // import users from "../reducers/users";
 //
-import { loginSocketMessageMiddleware } from "../modules/login/message";
-import loginReducer from "../modules/login/slice";
-import { roomSocketMessageMiddleware } from "../modules/room/message";
-import roomReducer from "../modules/room/slice";
-import makeSocketMiddleware from "../modules/websocket/middleware";
-import socketReducer from "../modules/websocket/slice";
+import { loginSocketMessageMiddleware } from "modules/login/message";
+import loginReducer from "modules/login/slice";
+import { roomSocketMessageMiddleware } from "modules/room/message";
+import roomReducer from "modules/room/slice";
+import makeSocketMiddleware from "modules/socket/middleware";
+import socketReducer from "modules/socket/slice";
 
 const rootReducer = combineReducers({
   counter: counterReducer,

src/components/ConnectForm.tsx

@@ -1,14 +1,13 @@
 import { FC } from "react";
-
 import { useDispatch } from "react-redux";
 import { Form, Field } from "react-final-form";
 
-import SocketStatusPane from "./SocketStatusPane";
+import SocketStatusPane from "modules/socket/SocketStatusPane";
 import {
   SocketSliceState,
   SocketState,
   socketOpen,
-} from "../modules/websocket/slice";
+} from "modules/socket/slice";
 
 interface Props {
   socket: SocketSliceState;

src/components/SolsticeApp.tsx

@@ -8,11 +8,11 @@ import {
   useRouteMatch,
 } from "react-router-dom";
 
-import Header from "./Header";
-import ConnectPage from "../containers/ConnectPage";
-import Footer from "../containers/Footer";
-import RoomsPane from "../modules/room/RoomsPane";
-import { selectSocket, SocketState } from "../modules/websocket/slice";
+import Header from "components/Header";
+import ConnectPage from "containers/ConnectPage";
+import Footer from "containers/Footer";
+import RoomsPane from "modules/room/RoomsPane";
+import { selectSocket, SocketState } from "modules/socket/slice";
 
 const MainPane: FC = () => {
   const { path } = useRouteMatch();

src/containers/ConnectPage.tsx

@@ -2,8 +2,8 @@ import { useSelector } from "react-redux";
 import { useLocation } from "react-router";
 import { Redirect } from "react-router-dom";
 
-import ConnectForm from "../components/ConnectForm";
-import { selectSocket, SocketState } from "../modules/websocket/slice";
+import ConnectForm from "components/ConnectForm";
+import { selectSocket, SocketState } from "modules/socket/slice";
 
 const ConnectPage: React.FC = () => {
   const socket = useSelector(selectSocket);

src/containers/Footer.tsx

@@ -1,10 +1,10 @@
 import { FC } from "react";
 import { useSelector } from "react-redux";
 
-import { selectLogin } from "../modules/login/slice";
-import { selectSocket } from "../modules/websocket/slice";
-import LoginStatusPane from "../components/LoginStatusPane";
-import SocketStatusPane from "../components/SocketStatusPane";
+import LoginStatusPane from "components/LoginStatusPane";
+import { selectLogin } from "modules/login/slice";
+import { selectSocket } from "modules/socket/slice";
+import SocketStatusPane from "modules/socket/SocketStatusPane";
 
 const Footer: FC = () => {
   const login = useSelector(selectLogin);

src/components/SocketStatusPane.tsx → src/modules/socket/SocketStatusPane.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { SocketSliceState, SocketState } from "../modules/websocket/slice";
+import { SocketSliceState, SocketState } from "modules/socket/slice";
 
 function socketStateToString(socket: SocketSliceState): string {
   const { state, url } = socket;