Merge branch 'UserStory2' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory2

assets/css/custom.css

@@ -139,4 +139,5 @@ input.active:invalid {
   color: red;
   font-size: 12px;
   margin-top: 5px;
-}
\ No newline at end of file
+}
+

assets/js/CompanyRegister.jsx

+import React from 'react';
+import { Button, Checkbox, Form, Input, TextArea, Grid, Divider, Header, Icon} from 'semantic-ui-react';
+
+export default class companyRegister extends React.Component {
+
+  render = () => (
+
+     <div  className="register">
+        <div className="registerForm">
+                 <Form>
+                     <Header as='h2' icon textAlign='center'>
+                      <Icon name='signup' circular />
+                      <Header.Content>
+                        Register
+                      </Header.Content>
+                    </Header>
+                    <Form.Field required>
+                      <label>Email</label>
+                      <Input type="text" id="email" icon='user' iconPosition='left' placeholder="email" required />
+                    </Form.Field>
+                    <Form.Field required>
+                      <label>Password</label>
+                      <Input type='password' id="password"  icon='key' iconPosition='left' placeholder="password"  required />
+                    </Form.Field>
+                    <Form.Field required>
+                      <label>Konfirmasi Password</label>
+                      <Input type='password' icon="key" iconPosition="left" placeholder='password'  required />
+                    </Form.Field>
+
+                    <Form.Field required>
+                      <label>Nama Perusahaan</label>
+                      <Input placeholder='Nama Perusahaan' required />
+                    </Form.Field>
+                     <Form.Field required>
+                      <label>Logo</label>
+                     <Input
+                        icon={{ name: 'attach', circular: true, link: true }}
+                        placeholder='attach logo'
+                        required
+                      />
+                    </Form.Field>
+                    <Form.Field required>
+                      <label>Deskripsi</label>
+                       <TextArea placeholder='Tell us more'  required/>
+                    </Form.Field>
+                     <Form.Field required>
+                      <label>Alamat</label>
+                      <Input placeholder='Alamat' required />
+                    </Form.Field>
+                     <Form.Field required>
+                      <label>Kota</label>
+                      <Input placeholder='Kota' required />
+                    </Form.Field>
+                     <Form.Field required>
+                      <label>Provinsi</label>
+                      <Input placeholder='Provinsi' required />
+                    </Form.Field >
+                    <Button type='submit' floated='right' color='blue'>Submit</Button>
+                 </Form>
+             </div>
+     </div>
+
+
+        )
+}

assets/js/VacancyPage.jsx

@@ -20,25 +20,17 @@ export default class VacancyPage extends React.Component {
 
     const {activeItem} = this.state;
 
-    return (
-      <div className="tabs">
-        <Menu tabular>
-          <Menu.Item name='Semua Lowongan' active={activeItem === 'Semua Lowongan'} onClick={this.handleItemClick}/>
+    return (<div>
+    <Tabs selected={0}>
+      <Pane label="Semua Lowongan">
+        <VacancyList vacancies={data} />
+      </Pane>
+      <Pane label="Lamaran saya">
+        <div>This is my tab 2 contents!</div>
+      </Pane>
+    </Tabs>
+  </div>
 
-          <Menu.Item name='Lamaran Saya' active={activeItem === 'Lamaran Saya'} onClick={this.handleItemClick}/>
-
-
-          <Menu.Menu position='right'>
-            <Menu.Item>
-              <Input transparent icon={{name: 'search', link: true}} placeholder='Search users...'/>
-            </Menu.Item>
-          </Menu.Menu>
-        </Menu>
-
-        <Segment>
-          <VacancyList vacancies={data} />
-        </Segment>
-      </div>
     );
   };
-}
\ No newline at end of file
+}

assets/js/components/Lowongan.jsx

@@ -12,20 +12,25 @@ export default class Lowongan extends React.Component {
 
   render() {
     return (
-        <Item>
+
+        <Item >
           {this.props.image}
           <Item.Content verticalAlign="middle">
             <Item.Header>{this.props.header}</Item.Header>
             <Item.Description>{this.props.content}</Item.Description>
             <Item.Extra>
-              <div>
+
                 <h4>{ this.props.data.data1 }</h4>
                 {paragraph}
-                <ModalPendaftaran id={1} data={ { header: 'dor', description: 'blabla' } } buttonTitle="Daftar" />
-              </div>
+
+                <ModalPendaftaran id={1} data={ { header: 'Deskripsi Lowongan', description: 'Lorem ipsum dolor sit amet, consectetur' +
+                ' adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim ' +
+                'veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.' } } buttonTitle="Daftar"  />
+
             </Item.Extra>
           </Item.Content>
         </Item>
+
     );
   }
 }
\ No newline at end of file

assets/js/components/ModalPendaftaran.jsx

@@ -39,7 +39,7 @@ export default class ModalPendaftaran extends React.Component {
 
   render = () => (
     <Modal
-      trigger={<Button onClick={this.handleOpen} >{this.props.buttonTitle}</Button>}
+      trigger={<Button onClick={this.handleOpen}  floated='right'>{this.props.buttonTitle}</Button>}
       closeIcon="close"
       open={this.state.modalOpen}
       onClose={this.handleClose}

assets/js/components/VacancyList.jsx

@@ -15,10 +15,10 @@ export default class VacancyList extends React.Component {
   }
 
   render = () => (
-    <div className="vacancyList" >
+     <Item.Group relaxed>
       {/*<Item.Group relaxed>*/}
         { this.generateVacancies() }
       {/*</Item.Group>*/}
-    </div>
+    </Item.Group>
   )
 }
\ No newline at end of file