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

assets/css/custom.css

 
 
-html, body{
+body{
   padding: 0;
   height: auto;
   width: auto;
+  background-color: black;
 }
 
 .center{
@@ -18,10 +19,15 @@ html, body{
 }
 body {
   font: 300 14px/1.4 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  background: #eee;
   margin: 0;
   padding: 0;
 }
+
+.halamanLowongan{
+
+}
+
+
 .tabs {
   margin-top: 100px;
   margin-left:  150px;
@@ -29,6 +35,7 @@ body {
   background: #fff;
   border: 1px solid #e5e5e5;
   border-radius: 3px;
+  margin-bottom: 30px;
 }
 .tabs__labels {
   margin: 0;
@@ -59,6 +66,12 @@ body {
   height: 700px;
 }
 
+.register{
+margin-left:180px;
+margin-right:110px;
+
+}
+
 .formLogin{
 margin: 0 auto;
 margin-top: 100px;
@@ -71,6 +84,10 @@ padding: 20px;
 
 }
 
+.registerModal{
+  margin: 0 auto;
+}
+
 .bookmark{
   float: right;
 }
@@ -128,10 +145,7 @@ textarea{
   height: 160px !important;
 }
 
-.register{
-  background-color:#3B8686;
 
-}
 
 .note {
   color: gray;

assets/js/CompanyRegister.jsx

@@ -40,6 +40,7 @@ export default class companyRegister extends React.Component {
                         icon={{ name: 'attach', circular: true, link: true }}
                         placeholder='attach logo'
                         required
+
                       />
                     </Form.Field>
                     <Form.Field required>

assets/js/Login.jsx

 import React from 'react';
-import { Grid, Segment } 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,7 +23,20 @@ export default class Login extends React.Component {
         <Segment basic>
           <LoginForm type="company" header="Company Login" imgSrc="logo.png" imgSize="small" />
           {this.props.children}
-        </Segment>
+
+        </Segment >
+
+          <div className="register">
+            <Card>
+                <Card.Content>
+                    <Card.Header>
+                      New to us ?
+                    </Card.Header>
+                 <RegisterModal />
+                </Card.Content>
+             </Card>
+          </div>
+
       </Grid.Column>
 
       <Grid.Column>
@@ -38,3 +51,67 @@ export default class Login extends React.Component {
   )
 }
 
+const RegisterModal = () => (
+  <Modal trigger={<Button primary floated="right">Register Here!</Button>} closeIcon='close'>
+    <Header icon='archive' content='Register for More Benefits' />
+    <Modal.Content>
+
+         <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
+                        type="File"
+                      />
+                    </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>
+
+    </Modal.Content>
+    <Modal.Actions>
+
+    </Modal.Actions>
+  </Modal>
+)

assets/js/VacancyPage.jsx

@@ -23,7 +23,8 @@ export default class VacancyPage extends React.Component {
   render() {
     const student = Storage.get('user-data').student;
 
-    return (<div>
+    return (
+  <div className="halamanLowongan">
       <Tabs selected={0}>
         <Pane label="Semua Lowongan" >
           <VacancyList key={1} url="/vacancies/" />
@@ -35,7 +36,8 @@ export default class VacancyPage extends React.Component {
           <VacancyList key={3} url={`/students/${student.id}/bookmarked-vacancies/`} />
         </Pane>
       </Tabs>
-    </div>
+
+  </div>
 
     );
   }

assets/js/components/Vacancy.jsx

@@ -37,7 +37,6 @@ export default class Vacancy extends React.Component {
             <h4>{ this.props.data.company.name }</h4>
             <h5>{ this.props.data.company.address }</h5>
 
-
             <ModalPendaftaran
               id={this.props.data.id} data={{ header: this.props.data.name,
                 description: this.props.data.description }} buttonTitle="Daftar"