mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-01 02:53:56 -07:00
Webatrice P.O.C. (#3854)
* port webclient POC into react shell * Abstract websocket messaging behind redux store * refactor architecture * add rooms store * introduce application service layer and login form * display room messages * implement roomSay * improve Room view styling * display room games * improve gameList update logic * hide protected games * improve game update logic * move mapping to earlier lifecycle hook * add autoscroll to bottom * tabs to spaces, refresh guard * implement server joins/leaves * show users in room * add material-ui to build * refactor, add room joins/leaves to store and render * begin using Material UI components * fix spectatorsCount * remove unused package * improve Server and Room styling * fix scroll context * route on room join * refactor room path * add auth guard * refactor authGuard export * add missing files * clear store on disconnect, add logout button to Account view * fix disconnect handling * Safari fixes * organize current todos * improve login page and server status tracking * improve login page * introduce sorting arch, refine reducers, begin viewLogHistory * audit fix for handlebars * implement moderator log view * comply with code style rules * remove original POC from codebase * add missing semi * minor improvements, begin registration functionality * retry as ws when wss fails additionally, dont mutate the default options when connecting * retain user/pass in WebClient.options for login * take protocol off of options, make it a connect param that defaults to wss * cleanup server page styling * match wss logic with desktop client * add virtual scroll component, add context menu to UserDisplay * revert VirtualTable on messages * improve styling for Room view * add routing to Player view * increase tooltip delay * begin implementing Account view * disable app level contextMenu * implement buddy/ignore list management * fix gitignore Co-authored-by: Jay Letto <jeremy.letto@merrillcorp.com> Co-authored-by: skwerlman <skwerlman@users.noreply.github.com> Co-authored-by: Jeremy Letto <jeremy.letto@datasite.com>
This commit is contained in:
parent
d5b36e8b8a
commit
0457e65751
152 changed files with 19573 additions and 1071 deletions
210
webclient/src/store/server/server.reducer.tsx
Normal file
210
webclient/src/store/server/server.reducer.tsx
Normal file
|
|
@ -0,0 +1,210 @@
|
|||
import { SortDirection, StatusEnum, UserSortField } from "types";
|
||||
|
||||
import { SortUtil } from "../common";
|
||||
|
||||
import { ServerState } from "./server.interfaces"
|
||||
import { Types } from "./server.types";
|
||||
|
||||
const initialState: ServerState = {
|
||||
buddyList: [],
|
||||
ignoreList: [],
|
||||
|
||||
status: {
|
||||
state: StatusEnum.DISCONNECTED,
|
||||
description: null
|
||||
},
|
||||
info: {
|
||||
message: null,
|
||||
name: null,
|
||||
version: null
|
||||
},
|
||||
logs: {
|
||||
room: [],
|
||||
game: [],
|
||||
chat: []
|
||||
},
|
||||
user: null,
|
||||
users: [],
|
||||
sortUsersBy: {
|
||||
field: UserSortField.NAME,
|
||||
order: SortDirection.ASC
|
||||
}
|
||||
};
|
||||
|
||||
export const serverReducer = (state = initialState, action: any) => {
|
||||
switch(action.type) {
|
||||
case Types.CLEAR_STORE: {
|
||||
return {
|
||||
...initialState,
|
||||
status: {
|
||||
...state.status
|
||||
}
|
||||
}
|
||||
}
|
||||
case Types.SERVER_MESSAGE: {
|
||||
const { message } = action;
|
||||
const { info } = state;
|
||||
|
||||
return {
|
||||
...state,
|
||||
info: { ...info, message }
|
||||
}
|
||||
}
|
||||
case Types.UPDATE_BUDDY_LIST: {
|
||||
const { buddyList } = action;
|
||||
const { sortUsersBy } = state;
|
||||
|
||||
SortUtil.sortUsersByField(buddyList, sortUsersBy);
|
||||
|
||||
return {
|
||||
...state,
|
||||
buddyList: [
|
||||
...buddyList
|
||||
]
|
||||
};
|
||||
}
|
||||
case Types.ADD_TO_BUDDY_LIST: {
|
||||
const { user } = action;
|
||||
const { sortUsersBy } = state;
|
||||
|
||||
const buddyList = [ ...state.buddyList ];
|
||||
|
||||
buddyList.push(user);
|
||||
SortUtil.sortUsersByField(buddyList, sortUsersBy);
|
||||
|
||||
return {
|
||||
...state,
|
||||
buddyList
|
||||
};
|
||||
}
|
||||
case Types.REMOVE_FROM_BUDDY_LIST: {
|
||||
const { userName } = action;
|
||||
const buddyList = state.buddyList.filter(user => user.name !== userName);
|
||||
|
||||
return {
|
||||
...state,
|
||||
buddyList
|
||||
};
|
||||
}
|
||||
case Types.UPDATE_IGNORE_LIST: {
|
||||
const { ignoreList } = action;
|
||||
const { sortUsersBy } = state;
|
||||
|
||||
SortUtil.sortUsersByField(ignoreList, sortUsersBy);
|
||||
|
||||
return {
|
||||
...state,
|
||||
ignoreList: [
|
||||
...ignoreList
|
||||
]
|
||||
};
|
||||
}
|
||||
case Types.ADD_TO_IGNORE_LIST: {
|
||||
const { user } = action;
|
||||
const { sortUsersBy } = state;
|
||||
|
||||
const ignoreList = [ ...state.ignoreList ];
|
||||
|
||||
ignoreList.push(user);
|
||||
SortUtil.sortUsersByField(ignoreList, sortUsersBy);
|
||||
|
||||
return {
|
||||
...state,
|
||||
ignoreList
|
||||
};
|
||||
}
|
||||
case Types.REMOVE_FROM_IGNORE_LIST: {
|
||||
const { userName } = action;
|
||||
const ignoreList = state.ignoreList.filter(user => user.name !== userName);
|
||||
|
||||
return {
|
||||
...state,
|
||||
ignoreList
|
||||
};
|
||||
}
|
||||
case Types.UPDATE_INFO: {
|
||||
const { name, version } = action.info;
|
||||
const { info } = state;
|
||||
|
||||
return {
|
||||
...state,
|
||||
info: { ...info, name, version }
|
||||
}
|
||||
}
|
||||
case Types.UPDATE_STATUS: {
|
||||
const { status } = action;
|
||||
|
||||
return {
|
||||
...state,
|
||||
status: { ...status }
|
||||
}
|
||||
}
|
||||
case Types.UPDATE_USER: {
|
||||
const { user } = action;
|
||||
|
||||
return {
|
||||
...state,
|
||||
user: {
|
||||
...state.user,
|
||||
...user
|
||||
}
|
||||
}
|
||||
}
|
||||
case Types.UPDATE_USERS: {
|
||||
const users = [ ...action.users ];
|
||||
const { sortUsersBy } = state;
|
||||
|
||||
|
||||
SortUtil.sortUsersByField(users, sortUsersBy);
|
||||
|
||||
return {
|
||||
...state,
|
||||
users
|
||||
};
|
||||
}
|
||||
case Types.USER_JOINED: {
|
||||
const { sortUsersBy } = state;
|
||||
|
||||
const users = [
|
||||
...state.users,
|
||||
{ ...action.user }
|
||||
];
|
||||
|
||||
SortUtil.sortUsersByField(users, sortUsersBy);
|
||||
|
||||
return {
|
||||
...state,
|
||||
users
|
||||
};
|
||||
}
|
||||
case Types.USER_LEFT: {
|
||||
const { name } = action;
|
||||
const users = state.users.filter(user => user.name !== name);
|
||||
|
||||
return {
|
||||
...state,
|
||||
users
|
||||
};
|
||||
}
|
||||
case Types.VIEW_LOGS: {
|
||||
const { logs } = action;
|
||||
|
||||
return {
|
||||
...state,
|
||||
logs: {
|
||||
...logs
|
||||
}
|
||||
};
|
||||
}
|
||||
case Types.CLEAR_LOGS: {
|
||||
return {
|
||||
...state,
|
||||
logs: {
|
||||
...initialState.logs
|
||||
}
|
||||
}
|
||||
}
|
||||
default:
|
||||
return state;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue