From 1c1b24adf57bc3b7a5c2dce1dd1628cc67a03a5c Mon Sep 17 00:00:00 2001 From: Titouan Rigoudy Date: Thu, 29 Jul 2021 20:12:26 -0400 Subject: [PATCH] Rename websocket module to socket. --- src/app/store.ts | 15 +++++++-------- src/components/ConnectForm.tsx | 5 ++--- src/components/SolsticeApp.tsx | 10 +++++----- src/containers/ConnectPage.tsx | 4 ++-- src/containers/Footer.tsx | 8 ++++---- .../socket}/SocketStatusPane.tsx | 2 +- src/modules/{websocket => socket}/message.ts | 0 src/modules/{websocket => socket}/middleware.ts | 0 src/modules/{websocket => socket}/slice.ts | 0 9 files changed, 21 insertions(+), 23 deletions(-) rename src/{components => modules/socket}/SocketStatusPane.tsx (89%) rename src/modules/{websocket => socket}/message.ts (100%) rename src/modules/{websocket => socket}/middleware.ts (100%) rename src/modules/{websocket => socket}/slice.ts (100%) diff --git a/src/app/store.ts b/src/app/store.ts index 4e53622..72b04aa 100644 --- a/src/app/store.ts +++ b/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, diff --git a/src/components/ConnectForm.tsx b/src/components/ConnectForm.tsx index 2fa5d89..7411d10 100644 --- a/src/components/ConnectForm.tsx +++ b/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; diff --git a/src/components/SolsticeApp.tsx b/src/components/SolsticeApp.tsx index fc27a82..97e9668 100644 --- a/src/components/SolsticeApp.tsx +++ b/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(); diff --git a/src/containers/ConnectPage.tsx b/src/containers/ConnectPage.tsx index 90fc838..153663c 100644 --- a/src/containers/ConnectPage.tsx +++ b/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); diff --git a/src/containers/Footer.tsx b/src/containers/Footer.tsx index 71c634a..0b0ca63 100644 --- a/src/containers/Footer.tsx +++ b/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); diff --git a/src/components/SocketStatusPane.tsx b/src/modules/socket/SocketStatusPane.tsx similarity index 89% rename from src/components/SocketStatusPane.tsx rename to src/modules/socket/SocketStatusPane.tsx index d4bbe12..e86823f 100644 --- a/src/components/SocketStatusPane.tsx +++ b/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; diff --git a/src/modules/websocket/message.ts b/src/modules/socket/message.ts similarity index 100% rename from src/modules/websocket/message.ts rename to src/modules/socket/message.ts diff --git a/src/modules/websocket/middleware.ts b/src/modules/socket/middleware.ts similarity index 100% rename from src/modules/websocket/middleware.ts rename to src/modules/socket/middleware.ts diff --git a/src/modules/websocket/slice.ts b/src/modules/socket/slice.ts similarity index 100% rename from src/modules/websocket/slice.ts rename to src/modules/socket/slice.ts