Show version info in settings
This commit is contained in:
parent
5d896ae439
commit
fbbcf6457e
8 changed files with 275 additions and 174 deletions
|
@ -812,6 +812,11 @@ input.message-input-nick.invalid {
|
|||
text-align: center;
|
||||
}
|
||||
|
||||
.settings-version {
|
||||
color: #999;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.suspense-fallback {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
|
|
@ -7,6 +7,7 @@ import FileInput from 'components/ui/FileInput';
|
|||
const Settings = ({
|
||||
settings,
|
||||
installable,
|
||||
version,
|
||||
setSetting,
|
||||
onCertChange,
|
||||
onKeyChange,
|
||||
|
@ -71,6 +72,13 @@ const Settings = ({
|
|||
{error ? <p className="error">{error}</p> : null}
|
||||
</div>
|
||||
</div>
|
||||
{version && (
|
||||
<div className="settings-version">
|
||||
<p>{version.tag}</p>
|
||||
<p>Commit: {version.commit}</p>
|
||||
<p>Build Date: {version.date}</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
|
|
@ -12,7 +12,8 @@ import connect from 'utils/connect';
|
|||
|
||||
const mapState = createStructuredSelector({
|
||||
settings: getSettings,
|
||||
installable: state => state.app.installable
|
||||
installable: state => state.app.installable,
|
||||
version: state => state.app.version
|
||||
});
|
||||
|
||||
const mapDispatch = {
|
||||
|
|
|
@ -11,7 +11,12 @@ import { replace } from 'utils/router';
|
|||
|
||||
function loadState({ store }, env) {
|
||||
store.dispatch(setConnectDefaults(env.defaults));
|
||||
store.dispatch(appSet('hexIP', env.hexIP));
|
||||
store.dispatch(
|
||||
appSet({
|
||||
hexIP: env.hexIP,
|
||||
version: env.version
|
||||
})
|
||||
);
|
||||
store.dispatch(setSettings(env.settings, true));
|
||||
|
||||
if (env.servers) {
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
import assign from 'lodash/assign';
|
||||
import createReducer from 'utils/createReducer';
|
||||
import * as actions from './actions';
|
||||
|
||||
|
@ -29,7 +30,11 @@ const initialState = {
|
|||
|
||||
export default createReducer(initialState, {
|
||||
[actions.APP_SET](state, { key, value }) {
|
||||
state[key] = value;
|
||||
if (typeof key === 'object') {
|
||||
assign(state, key);
|
||||
} else {
|
||||
state[key] = value;
|
||||
}
|
||||
},
|
||||
|
||||
[actions.UPDATE_MESSAGE_HEIGHT](state, action) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue