diff --git a/assets/css/custom.css b/assets/css/custom.css index 952d1ed8a26e5a9527a47f4b4e681ecb9ec821ea..660c7f39a35a3aeee306a65e7664ab78eff16a05 100755 --- a/assets/css/custom.css +++ b/assets/css/custom.css @@ -27,6 +27,7 @@ body { } + .tabs { margin-top: 100px; margin-left: 150px; @@ -65,6 +66,12 @@ body { height: 700px; } +.register{ +margin-left:180px; +margin-right:110px; + +} + .formLogin{ margin: 0 auto; margin-top: 100px; @@ -77,6 +84,10 @@ padding: 20px; } +.registerModal{ + margin: 0 auto; +} + .bookmark{ float: right; } @@ -134,10 +145,7 @@ textarea{ height: 160px !important; } -.register{ - background-color:#3B8686; -} .note { color: gray; diff --git a/assets/js/CompanyRegister.jsx b/assets/js/CompanyRegister.jsx index 457a2df30ab5697d649ac8d189e91fa71b9888dc..91e0e8acee9e44f374a42e446e840f0d0b1451d6 100644 --- a/assets/js/CompanyRegister.jsx +++ b/assets/js/CompanyRegister.jsx @@ -40,7 +40,7 @@ export default class companyRegister extends React.Component { icon={{ name: 'attach', circular: true, link: true }} placeholder='attach logo' required - type="File" + /> </Form.Field> <Form.Field required> diff --git a/assets/js/Login.jsx b/assets/js/Login.jsx index cd0a8da147bb7c74ffa84235fdbac6ea010ce29f..5a93217b660a249ff753a9da7e6b6bc8e5a24bf1 100644 --- a/assets/js/Login.jsx +++ b/assets/js/Login.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Grid, Segment, Button, Header, Icon, Modal, Form, Input, TextArea, } from 'semantic-ui-react'; +import { Grid, Segment, Button, Header, Icon, Modal, Form, Input, TextArea, Card} from 'semantic-ui-react'; import LoginForm from './components/LoginForm'; export default class Login extends React.Component { @@ -23,8 +23,19 @@ export default class Login extends React.Component { <Segment basic> <LoginForm type="company" header="Company Login" imgSrc="logo.png" imgSize="small" /> {this.props.children} - </Segment> - <RegisterModal/> + + </Segment > + + <div className="register"> + <Card> + <Card.Content> + <Card.Header> + New to us ? + </Card.Header> + <RegisterModal /> + </Card.Content> + </Card> + </div> </Grid.Column> @@ -41,8 +52,8 @@ export default class Login extends React.Component { } const RegisterModal = () => ( - <Modal trigger={<Button>Show Modal</Button>} closeIcon='close'> - <Header icon='archive' content='Archive Old Messages' /> + <Modal trigger={<Button primary floated="right">Register Here!</Button>} closeIcon='close'> + <Header icon='archive' content='Register for More Benefits' /> <Modal.Content> <Form> @@ -95,10 +106,12 @@ const RegisterModal = () => ( <Input placeholder='Provinsi' required /> </Form.Field > + <Button type='submit' floated='right' color='blue'>Submit</Button> </Form> + </Modal.Content> <Modal.Actions> - <Button type='submit' floated='right' color='blue'>Submit</Button> + </Modal.Actions> </Modal> )