blockchain-desktop#200

IamChuancey · Apr 2, 2019 · 9d47192 · 9d47192
1 parent 6714ef6
commit 9d47192
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 87 deletions.
diff --git a/resources/key/users/.gitkeep b/resources/key/users/.gitkeep
diff --git a/src/components/content/CARegisterContent.jsx b/src/components/content/CARegisterContent.jsx
@@ -123,65 +123,32 @@ export default class CARegisterContent extends React.Component {
 
   render() {
     const outerDivStyle = {
-      padding: '24px',
+      padding: '10px 24px',
     };
     const spanStyle = {
-      marginRight: '10px',
       display: 'inline-block',
       width: '100px',
     };
-    const SpanStyle = {
-      marginTop: '30px',
-    };
-    const fileStyle = {
-      width: '0.1px',
-      height: '0.1px',
-      opacity: 0,
-      overflow: 'hidden',
-      position: 'absolute',
-      zIndex: -1,
-    };
-    const labelStyle = {
-      fontSize: '1.1em',
-      border: '1px solid rgb(217, 217, 217)',
-      borderRadius: '4px',
-      display: 'block',
-      width: '60%',
-      height: '32px',
-      verticalAlign: 'middle',
-      textAlign: 'center',
-      lineHeight: '30px',
-      cursor: 'pointer',
-      whiteSpace: 'nowrap',
-      textOverflow: 'ellipsis',
-      overflow: 'hidden',
-      marginLeft: '146px',
-      marginTop: '-25px',
-    };
     const configInputStyle = {
-      marginLeft: '30px',
+      marginLeft: '20px',
       width: '60%',
     };
-    const CreateInputStyle = {
-      marginLeft: '36px',
-      width: '40%',
-    };
-    const AddInputStyle = {
-      marginLeft: '36px',
-      width: '40%',
+    const optionalInputStyle = {
+        marginLeft: '28px',
+        width: '60%',
     };
     const DivStyle = {
       width: '560px',
       marginBottom: '10px',
     };
     const titleStyle = {
       fontSize: '130%',
-      marginTop: '20px',
       textAlign: 'center',
+      marginBottom:'10px',
     };
     const ButtonStyle = {
-      marginLeft: '20px',
       width: '15%',
+      marginBottom: '10px',
     };
     const TipDivStyle = {
       display: 'inline-block',
@@ -213,7 +180,7 @@ export default class CARegisterContent extends React.Component {
         </div>
         <div style={DivStyle}>
           <span style={spanStyle}>{this.state.Common.REGISTER_OPTIONAL}</span>
-          <Input placeholder="Optional json parameters" style={configInputStyle} value={this.state.registerOptional} onChange={this.onChangeRegisterOptional} />
+          <Input placeholder="Optional json parameters" style={optionalInputStyle} value={this.state.registerOptional} onChange={this.onChangeRegisterOptional} />
         </div>
         <div style={DivStyle}>
           <Button style={ButtonStyle} type="primary" onClick={this.handleRegister}>{this.state.Common.REGISTER_CONFIRM}</Button>
@@ -238,14 +205,14 @@ export default class CARegisterContent extends React.Component {
         </div>
         <div style={DivStyle}>
           <span style={spanStyle}>{this.state.Common.ENROLL_OPTIONAL}</span>
-          <Input placeholder="Optional json parameters" style={configInputStyle} value={this.state.enrollOptional} onChange={this.onChangeEnrollOptional} />
+          <Input placeholder="Optional json parameters" style={optionalInputStyle} value={this.state.enrollOptional} onChange={this.onChangeEnrollOptional} />
         </div>
         <div style={DivStyle}>
           <Button style={ButtonStyle} type="primary" onClick={this.handleEnroll}>{this.state.Common.ENROLL_CONFIRM}</Button>
           <TextArea
             placeholder="Enroll Result"
             value={this.state.enrollResult}
-            autosize={{ minRows: 4, maxRows: 4 }}
+            autosize={{ minRows: 3, maxRows: 3 }}
             readOnly
           />
         </div>

diff --git a/src/components/content/CAUpdateContent.jsx b/src/components/content/CAUpdateContent.jsx
@@ -121,65 +121,33 @@ export default class CAUpdateContent extends React.Component {
 
   render() {
     const outerDivStyle = {
-      padding: '24px',
+      padding: '0px 24px',
     };
     const spanStyle = {
-      marginRight: '10px',
       display: 'inline-block',
       width: '100px',
     };
-    const SpanStyle = {
-      marginTop: '30px',
-    };
-    const fileStyle = {
-      width: '0.1px',
-      height: '0.1px',
-      opacity: 0,
-      overflow: 'hidden',
-      position: 'absolute',
-      zIndex: -1,
-    };
-    const labelStyle = {
-      fontSize: '1.1em',
-      border: '1px solid rgb(217, 217, 217)',
-      borderRadius: '4px',
-      display: 'block',
-      width: '60%',
-      height: '32px',
-      verticalAlign: 'middle',
-      textAlign: 'center',
-      lineHeight: '30px',
-      cursor: 'pointer',
-      whiteSpace: 'nowrap',
-      textOverflow: 'ellipsis',
-      overflow: 'hidden',
-      marginLeft: '146px',
-      marginTop: '-25px',
-    };
     const configInputStyle = {
-      marginLeft: '30px',
+      marginLeft: '20px',
       width: '60%',
     };
-    const CreateInputStyle = {
-      marginLeft: '36px',
-      width: '40%',
-    };
-    const AddInputStyle = {
-      marginLeft: '36px',
-      width: '40%',
+    const optionalInputStyle = {
+        marginLeft: '26px',
+        width: '60%',
     };
     const DivStyle = {
       width: '560px',
       marginBottom: '10px',
     };
     const titleStyle = {
       fontSize: '130%',
-      marginTop: '20px',
+      marginTop: '10px',
+      marginBottom:'10px',
       textAlign: 'center',
     };
     const ButtonStyle = {
-      marginLeft: '20px',
       width: '15%',
+      marginBottom: '10px',
     };
     const TipDivStyle = {
       display: 'inline-block',
@@ -196,14 +164,14 @@ export default class CAUpdateContent extends React.Component {
         <div style={titleStyle}>{this.state.Common.REENROLL}</div>
         <div style={DivStyle}>
           <span style={spanStyle}>{this.state.Common.REENROLL_OPTIONAL}</span>
-          <Input placeholder="Optional json parameters" style={configInputStyle} value={this.state.reenrollOptional} onChange={this.onChangeReenrollOptional} />
+          <Input placeholder="Optional json parameters" style={optionalInputStyle} value={this.state.reenrollOptional} onChange={this.onChangeReenrollOptional} />
         </div>
         <div style={DivStyle}>
           <Button style={ButtonStyle} type="primary" onClick={this.handleReenroll}>{this.state.Common.REENROLL_CONFIRM}</Button>
           <TextArea
             placeholder="Reenroll Result"
             value={this.state.reenrollResult}
-            autosize={{ minRows: 4, maxRows: 4 }}
+            autosize={{ minRows: 2, maxRows: 2 }}
             readOnly
           />
         </div>
@@ -216,7 +184,7 @@ export default class CAUpdateContent extends React.Component {
         </div>
         <div style={DivStyle}>
           <span style={spanStyle}>{this.state.Common.REVOKE_OPTIONAL}</span>
-          <Input placeholder="Optional json parameters" style={configInputStyle} value={this.state.revokeOptional} onChange={this.onChangeRevokeOptional} />
+          <Input placeholder="Optional json parameters" style={optionalInputStyle} value={this.state.revokeOptional} onChange={this.onChangeRevokeOptional} />
         </div>
         <div style={DivStyle}>
           <Button style={ButtonStyle} type="primary" onClick={this.handleRevoke}>{this.state.Common.REVOKE_CONFIRM}</Button>
@@ -231,7 +199,7 @@ export default class CAUpdateContent extends React.Component {
         <div style={titleStyle}>{this.state.Common.GENERATE_CRL}</div>
         <div style={DivStyle}>
           <span style={spanStyle}>{this.state.Common.GENERATE_CRL_OPTIONAL}</span>
-          <Input placeholder="Optional json parameters" style={configInputStyle} value={this.state.generateCrlOptional} onChange={this.onChangeGenerateCrlOptional} />
+          <Input placeholder="Optional json parameters" style={optionalInputStyle} value={this.state.generateCrlOptional} onChange={this.onChangeGenerateCrlOptional} />
         </div>
         <div style={DivStyle}>
           <Button style={ButtonStyle} type="primary" onClick={this.handleGenerateCrl}>{this.state.Common.GENERATE_CRL_CONFIRM}</Button>