mirror of
https://github.com/roleypoly/roleypoly-v1.git
synced 2025-06-17 02:29:10 +00:00
chore: prettier on UI
This commit is contained in:
parent
912b40c383
commit
4b75eaa0ab
49 changed files with 1703 additions and 1267 deletions
|
@ -1,16 +1,16 @@
|
|||
import { combineReducers } from 'redux'
|
||||
import { combineReducers } from 'redux';
|
||||
|
||||
import servers from './servers'
|
||||
import user from './user'
|
||||
import rolePicker from './role-picker'
|
||||
import roleEditor from './role-editor'
|
||||
import { routerMiddleware } from 'react-router-redux'
|
||||
import servers from './servers';
|
||||
import user from './user';
|
||||
import rolePicker from './role-picker';
|
||||
import roleEditor from './role-editor';
|
||||
import { routerMiddleware } from 'react-router-redux';
|
||||
// import roles from './roles'
|
||||
|
||||
const initialState = {
|
||||
ready: false,
|
||||
fade: true
|
||||
}
|
||||
fade: true,
|
||||
};
|
||||
|
||||
const appState = (state = initialState, { type, data }) => {
|
||||
switch (type) {
|
||||
|
@ -18,19 +18,19 @@ const appState = (state = initialState, { type, data }) => {
|
|||
return {
|
||||
...state,
|
||||
ready: true,
|
||||
fade: false
|
||||
}
|
||||
fade: false,
|
||||
};
|
||||
|
||||
case Symbol.for('app fade'):
|
||||
return {
|
||||
...state,
|
||||
fade: data
|
||||
}
|
||||
fade: data,
|
||||
};
|
||||
|
||||
default:
|
||||
return state
|
||||
return state;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const rootReducer = combineReducers({
|
||||
appState,
|
||||
|
@ -39,7 +39,7 @@ const rootReducer = combineReducers({
|
|||
router: routerMiddleware,
|
||||
// roles,
|
||||
rolePicker,
|
||||
roleEditor
|
||||
})
|
||||
roleEditor,
|
||||
});
|
||||
|
||||
export default rootReducer
|
||||
export default rootReducer;
|
||||
|
|
|
@ -1,54 +1,66 @@
|
|||
import { Map, OrderedMap, fromJS } from 'immutable'
|
||||
import { Map, OrderedMap, fromJS } from 'immutable';
|
||||
|
||||
const initialState = Map({
|
||||
viewMap: OrderedMap({}),
|
||||
originalSnapshot: OrderedMap({}),
|
||||
hasAvailableRoles: true
|
||||
})
|
||||
hasAvailableRoles: true,
|
||||
});
|
||||
|
||||
const reducer = (state = initialState, { type, data }) => {
|
||||
switch (type) {
|
||||
case Symbol.for('re: setup'):
|
||||
const { viewMap, originalSnapshot, ...rest } = data
|
||||
return state.merge({ viewMap: OrderedMap(viewMap), originalSnapshot: OrderedMap(originalSnapshot), ...rest })
|
||||
const { viewMap, originalSnapshot, ...rest } = data;
|
||||
return state.merge({
|
||||
viewMap: OrderedMap(viewMap),
|
||||
originalSnapshot: OrderedMap(originalSnapshot),
|
||||
...rest,
|
||||
});
|
||||
|
||||
case Symbol.for('re: set category'):
|
||||
return state.setIn(['viewMap', data.id], Map(data))
|
||||
return state.setIn(['viewMap', data.id], Map(data));
|
||||
|
||||
case Symbol.for('re: edit category'):
|
||||
return state.setIn(['viewMap', data.id, data.key], data.value)
|
||||
return state.setIn(['viewMap', data.id, data.key], data.value);
|
||||
|
||||
case Symbol.for('re: delete category'):
|
||||
return state.deleteIn(['viewMap', data])
|
||||
return state.deleteIn(['viewMap', data]);
|
||||
|
||||
case Symbol.for('re: switch category mode'):
|
||||
return state.setIn(['viewMap', data.id, 'mode'], data.mode)
|
||||
return state.setIn(['viewMap', data.id, 'mode'], data.mode);
|
||||
|
||||
case Symbol.for('re: add role to category'):
|
||||
const category = state.getIn(['viewMap', data.id])
|
||||
return state.setIn(['viewMap', data.id],
|
||||
const category = state.getIn(['viewMap', data.id]);
|
||||
return state.setIn(
|
||||
['viewMap', data.id],
|
||||
category
|
||||
.set('roles', category.get('roles').add(data.role.get('id')))
|
||||
.set('roles_map', category.get('roles_map').add(data.role))
|
||||
)
|
||||
);
|
||||
|
||||
case Symbol.for('re: remove role from category'):
|
||||
const rmCat = state.getIn(['viewMap', data.id])
|
||||
return state.setIn(['viewMap', data.id],
|
||||
const rmCat = state.getIn(['viewMap', data.id]);
|
||||
return state.setIn(
|
||||
['viewMap', data.id],
|
||||
rmCat
|
||||
.set('roles', rmCat.get('roles').filterNot(r => r === data.role.get('id')))
|
||||
.set('roles_map', rmCat.get('roles_map').filterNot(r => r.get('id') === data.role.get('id')))
|
||||
)
|
||||
.set(
|
||||
'roles',
|
||||
rmCat.get('roles').filterNot(r => r === data.role.get('id'))
|
||||
)
|
||||
.set(
|
||||
'roles_map',
|
||||
rmCat.get('roles_map').filterNot(r => r.get('id') === data.role.get('id'))
|
||||
)
|
||||
);
|
||||
|
||||
case Symbol.for('re: reset'):
|
||||
return state.set('viewMap', state.get('originalSnapshot'))
|
||||
return state.set('viewMap', state.get('originalSnapshot'));
|
||||
|
||||
case Symbol.for('re: swap original state'):
|
||||
return state.set('originalSnapshot', state.get('viewMap'))
|
||||
return state.set('originalSnapshot', state.get('viewMap'));
|
||||
|
||||
default:
|
||||
return state
|
||||
return state;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
export default reducer
|
||||
export default reducer;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { Map, OrderedMap } from 'immutable'
|
||||
import { Map, OrderedMap } from 'immutable';
|
||||
|
||||
const initialState = Map({
|
||||
hidden: true, // should the view be hidden?
|
||||
|
@ -7,38 +7,38 @@ const initialState = Map({
|
|||
messageBuffer: '',
|
||||
viewMap: OrderedMap({}), // roles in categories
|
||||
originalRolesSelected: Map({}), // Map<role id, bool> -- original roles for diffing against selected
|
||||
rolesSelected: Map({}) // Map<role id, bool> -- new roles for diffing
|
||||
})
|
||||
rolesSelected: Map({}), // Map<role id, bool> -- new roles for diffing
|
||||
});
|
||||
|
||||
export default (state = initialState, { type, data }) => {
|
||||
switch (type) {
|
||||
case Symbol.for('rp: setup role picker'):
|
||||
return Map(data)
|
||||
return Map(data);
|
||||
|
||||
case Symbol.for('rp: hide role picker ui'):
|
||||
return state.set('hidden', data)
|
||||
return state.set('hidden', data);
|
||||
|
||||
case Symbol.for('rp: reset role picker ui'):
|
||||
return state.set('emptyRoles', data)
|
||||
return state.set('emptyRoles', data);
|
||||
|
||||
case Symbol.for('rp: update selected roles'):
|
||||
return state.mergeIn(['rolesSelected'], data)
|
||||
return state.mergeIn(['rolesSelected'], data);
|
||||
|
||||
case Symbol.for('rp: sync selected roles'):
|
||||
return state.set('originalRolesSelected', state.get('rolesSelected'))
|
||||
return state.set('originalRolesSelected', state.get('rolesSelected'));
|
||||
|
||||
case Symbol.for('rp: reset selected'):
|
||||
return state.set('rolesSelected', state.get('originalRolesSelected'))
|
||||
return state.set('rolesSelected', state.get('originalRolesSelected'));
|
||||
|
||||
case Symbol.for('rp: set message editor state'):
|
||||
return state.set('isEditingMessage', data)
|
||||
|
||||
return state.set('isEditingMessage', data);
|
||||
|
||||
case Symbol.for('rp: edit message buffer'):
|
||||
return state.set('messageBuffer', data)
|
||||
return state.set('messageBuffer', data);
|
||||
// case Symbol.for('rp: zero role picker'):
|
||||
// return initialState
|
||||
// return initialState
|
||||
|
||||
default:
|
||||
return state
|
||||
return state;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
@ -1,48 +1,48 @@
|
|||
import { Set, OrderedMap, Map, fromJS } from 'immutable'
|
||||
import { Set, OrderedMap, Map, fromJS } from 'immutable';
|
||||
|
||||
const blankServer = Map({
|
||||
id: '386659935687147521',
|
||||
gm: {
|
||||
nickname: null,
|
||||
color: '#cca1a1'
|
||||
color: '#cca1a1',
|
||||
},
|
||||
message: 'Hey hey!',
|
||||
server: {
|
||||
id: '386659935687147521',
|
||||
name: 'Roleypoly',
|
||||
ownerID: '62601275618889728',
|
||||
icon: '4fa0c1063649a739f3fe1a0589aa2c03'
|
||||
icon: '4fa0c1063649a739f3fe1a0589aa2c03',
|
||||
},
|
||||
roles: Set([]),
|
||||
categories: OrderedMap(),
|
||||
perms: {
|
||||
isAdmin: true,
|
||||
canManageRoles: true
|
||||
}
|
||||
})
|
||||
canManageRoles: true,
|
||||
},
|
||||
});
|
||||
|
||||
const initialState = OrderedMap({})
|
||||
const initialState = OrderedMap({});
|
||||
|
||||
export default (state = initialState, { type, data }) => {
|
||||
switch (type) {
|
||||
case Symbol.for('update servers'):
|
||||
return data.reduce((acc, s) => acc.set(s.id, fromJS(s)), OrderedMap())
|
||||
|
||||
return data.reduce((acc, s) => acc.set(s.id, fromJS(s)), OrderedMap());
|
||||
|
||||
// case Symbol.for('update server roles'):
|
||||
// return state.set(data.id,
|
||||
// state.get(data.id).set('roles', Set(data.roles))
|
||||
// )
|
||||
|
||||
case Symbol.for('server: set'):
|
||||
return state.set(data.id, fromJS(data))
|
||||
|
||||
return state.set(data.id, fromJS(data));
|
||||
|
||||
case Symbol.for('server: edit message'):
|
||||
return state.setIn([data.id, 'message'], data.message)
|
||||
|
||||
return state.setIn([data.id, 'message'], data.message);
|
||||
|
||||
case Symbol.for('add debug server'):
|
||||
return state.set('0', blankServer)
|
||||
return state.set('0', blankServer);
|
||||
|
||||
default:
|
||||
return state
|
||||
return state;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
@ -1,22 +1,22 @@
|
|||
import { Map } from 'immutable'
|
||||
import { Map } from 'immutable';
|
||||
|
||||
const initialState = Map({
|
||||
isLoggedIn: false,
|
||||
username: 'あたし',
|
||||
discriminator: '0001',
|
||||
id: '',
|
||||
avatar: null
|
||||
})
|
||||
avatar: null,
|
||||
});
|
||||
|
||||
export default (state = initialState, { type, data }) => {
|
||||
switch (type) {
|
||||
case Symbol.for('set user'):
|
||||
return Map({...data, isLoggedIn: true})
|
||||
return Map({ ...data, isLoggedIn: true });
|
||||
|
||||
case Symbol.for('reset user'):
|
||||
return initialState
|
||||
|
||||
return initialState;
|
||||
|
||||
default:
|
||||
return state
|
||||
return state;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue