e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add new connect form, closes #7

Browse source
This commit is contained in:
Ken-Håvard Lieng 2018-05-16 05:02:48 +02:00
parent f502fea5c1
commit 6fd5235ec9
16 changed files with 524 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

33
client/src/js/state/servers.js
View file

@ -14,7 +14,7 @@ export const getCurrentNick = createSelector(
return;
}
const { editedNick } = servers[tab.server];
if (!editedNick) {
if (editedNick === null) {
return servers[tab.server].nick;
}
return editedNick;
@ -36,12 +36,12 @@ export const getCurrentServerStatus = createSelector(
export default createReducer(
{},
{
[actions.CONNECT](state, { host, nick, options }) {
[actions.CONNECT](state, { host, nick, name }) {
if (!state[host]) {
state[host] = {
nick,
editedNick: null,
name: options.name || host,
name: name || host,
status: {
connected: false,
error: null
@ -82,7 +82,7 @@ export default createReducer(
[actions.socket.SERVERS](state, { data }) {
if (data) {
data.forEach(({ host, name, nick, status }) => {
state[host] = { name, nick, status };
state[host] = { name, nick, status, editedNick: null };
});
}
},
@ -96,32 +96,13 @@ export default createReducer(
}
);
export function connect(server, nick, options) {
let host = server;
let port;
const i = server.indexOf(':');
if (i > 0) {
host = server.slice(0, i);
port = server.slice(i + 1);
}
export function connect(config) {
return {
type: actions.CONNECT,
host,
nick,
options,
...config,
socket: {
type: 'connect',
data: {
host,
port,
nick,
username: options.username || nick,
password: options.password,
realname: options.realname || nick,
tls: options.tls || false,
name: options.name || server
}
data: config
}
};
}