a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show random status and warning

This commit is contained in:
Ildar Kamalov 2019-01-30 16:24:17 +03:00 committed by Eugene Bujak
parent c5b1105fc1
commit c025c845d2
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/App/index.js
View File

@ -51,12 +51,12 @@ class App extends Component {
}
render() {
const { dashboard } = this.props;
const { dashboard, encryption } = this.props;
const updateAvailable =
!dashboard.processingVersions &&
dashboard.isCoreRunning &&
dashboard.isUpdateAvailable;
const isExpiringCertificate = false;
const isExpiringCertificate = !encryption.processing && encryption.warning;
return (
<HashRouter hashType='noslash'>

37
client/src/components/Settings/Encryption/Form.js
View File

@ -1,4 +1,4 @@
import React from 'react';
import React, { Fragment } from 'react';
import PropTypes from 'prop-types';
import { Field, reduxForm } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next';
@ -25,6 +25,8 @@ const Form = (props) => {
invalid,
submitting,
processing,
statusCert,
statusKey,
} = props;
return (
@ -131,10 +133,17 @@ const Form = (props) => {
validate={[required]}
/>
<div className="form__status">
<div className="form__label form__label--bold">
<Trans>encryption_status</Trans>:
</div>
<div>
{statusCert &&
<Fragment>
<div className="form__label form__label--bold">
<Trans>encryption_status</Trans>:
</div>
<div>
{statusCert}
</div>
</Fragment>
}
{/* <div>
<Trans values={{ domains: '*.example.org, example.org' }}>
encryption_certificates_for
</Trans>
@ -143,7 +152,7 @@ const Form = (props) => {
<Trans values={{ date: '2022-01-01' }}>
encryption_expire
</Trans>
</div>
</div> */}
</div>
</div>
</div>
@ -164,10 +173,16 @@ const Form = (props) => {
validate={[required]}
/>
<div className="form__status">
<div className="form__label form__label--bold">
<Trans>encryption_status</Trans>:
</div>
<div>Valid RSA private key</div>
{statusKey &&
<Fragment>
<div className="form__label form__label--bold">
<Trans>encryption_status</Trans>:
</div>
<div>
{statusKey}
</div>
</Fragment>
}
</div>
</div>
</div>
@ -190,6 +205,8 @@ Form.propTypes = {
invalid: PropTypes.bool.isRequired,
initialValues: PropTypes.object.isRequired,
processing: PropTypes.bool.isRequired,
statusCert: PropTypes.string,
statusKey: PropTypes.string,
t: PropTypes.func.isRequired,
};

4
client/src/components/Settings/Encryption/index.js
View File

@ -15,6 +15,8 @@ class Encryption extends Component {
const {
processing,
processingConfig,
status_cert: statusCert,
status_key: statusKey,
...values
} = encryption;
@ -29,6 +31,8 @@ class Encryption extends Component {
<Form
initialValues={{ ...values }}
processing={encryption.processingConfig}
statusCert={statusCert}
statusKey={statusKey}
onSubmit={this.handleFormSubmit}
/>
</Card>