diff --git a/assets/css/custom.css b/assets/css/custom.css
index 7759976a116fbf94cdbe70e1fc6f96da2b8fd363..725a8ac4012c429b53cae1eafbd563eb828066e3 100755
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -1,3 +1,8 @@
+@fontface {
+ font-family: 'Bungee Inline', cursive;
+ src: url('https://fonts.googleapis.com/css?family=Bungee+Inline')
+}
+
html, body{
padding: 0;
height: auto;
@@ -49,42 +54,39 @@ body {
padding: 25px;
}
+.halamanLogin{
+ background-image: url("../img/bw.jpg");
+ background-size: cover;
+ background-position: center;
+ background-attachment: fixed;
+ height: 700px;
+}
+
.formLogin{
margin: 0 auto;
margin-top: 100px;
width: 430px;
border: 2px solid transparent;
border-radius: 12px;
-background-color: transparent;
-padding: 10px;
+border-color:#e8e8e8;
+padding: 20px;
+font-family: 'Bungee Inline';
+ background-color: white;
}
-.formLogin span{
-font-size: 30px;
+.formLogin img{
+height: 70px !important;
+margin:5px;
+margin-bottom:30px;
}
.formLogin span{
- margin-left: 10px;
+font-size: 32px;
}
-.SsoLogin{
-margin: 0 auto;
-margin-top: 100px;
-width: 430px;
-border: 2px solid transparent;
-border-radius: 12px;
-background-color: transparent;
-padding: 10px;
-
-}
-
-.SsoLogin span{
-font-size: 30px;
-}
-
-.SsoLogin span{
- margin-left: 10px;
+.formLogin span{
+ margin-left: 5px;
}
.LoginPage{
@@ -156,4 +158,5 @@ card .formRegis{
itemLowongan{
color: black;
-}
\ No newline at end of file
+}
+
diff --git a/assets/img/bw.jpg b/assets/img/bw.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..820a820d81eecac40fb7e07ffbe3ec5b0f12d012
Binary files /dev/null and b/assets/img/bw.jpg differ
diff --git a/assets/js/Login.jsx b/assets/js/Login.jsx
index 32b47246649c23687ca791a214df781a9c015776..2209c38931b7a047d38c296f610f38340e2a10f4 100644
--- a/assets/js/Login.jsx
+++ b/assets/js/Login.jsx
@@ -16,6 +16,8 @@ export default class Login extends React.Component {
};
render = () => (
+
+ <div className="halamanLogin">
<Grid columns={2} relaxed>
<Grid.Column>
<Segment basic>
@@ -32,6 +34,7 @@ export default class Login extends React.Component {
</Grid.Column>
</Grid>
+ </div>
)
}
diff --git a/assets/js/__test__/CompanyRegister-test.jsx b/assets/js/__test__/components/CompanyRegister-test.jsx
similarity index 100%
rename from assets/js/__test__/CompanyRegister-test.jsx
rename to assets/js/__test__/components/CompanyRegister-test.jsx
diff --git a/assets/js/components/LoginForm.jsx b/assets/js/components/LoginForm.jsx
index feeb5dafa3c1d5bc6b768b2152e070a65a401b2f..4e36d9426fbe0e8763d64ee48d5ec6306e568775 100644
--- a/assets/js/components/LoginForm.jsx
+++ b/assets/js/components/LoginForm.jsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Form, Input, Button, Message, Image } from 'semantic-ui-react';
+import { Form, Input, Button, Message, Image, Card } from 'semantic-ui-react';
import { browserHistory } from 'react-router';
import Server from '../lib/Server';
@@ -45,7 +45,10 @@ export default class LoginForm extends React.Component {
}
render = () => (
+
<div className="formLogin" >
+
+
<Form onSubmit={e => this.handleSubmit(e)} error={this.state.errorFlag}>
<div className="formHeader">
<Image src={`./assets/img/${this.props.imgSrc}`} size={this.props.imgSize} verticalAlign="middle" /> <span>{ this.props.header }</span>
@@ -71,6 +74,9 @@ export default class LoginForm extends React.Component {
/>
</Form>
+
+
</div>
+
)
}
diff --git a/assets/js/components/TopMenu.jsx b/assets/js/components/TopMenu.jsx
index 4dfaad573dced8960f25a92a6d381cab75bc9d9f..c0a2c775f1e973d740411a3a34cb80fc3116b69b 100644
--- a/assets/js/components/TopMenu.jsx
+++ b/assets/js/components/TopMenu.jsx
@@ -5,7 +5,6 @@ import Server from '../lib/Server';
export default class TopMenu extends React.Component {
state = { activeItem: 'home' };
-
handleItemClick = (e, { name }) => this.setState({ activeItem: name })
render() {
const { activeItem } = this.state;
diff --git a/seeder.json b/seeder.json
index 137b14fc6242a52b2a8672bcc7010831d6bb18db..c010634ad7baf8e556783cd2864c5a18977c9e18 100644
--- a/seeder.json
+++ b/seeder.json
@@ -170,7 +170,7 @@
"description": "Ini Company nomor satu",
"verified": true,
"logo": "",
- "alamat": "Alamat company 1"
+ "address": "Alamat company 1"
}
},
{
@@ -185,7 +185,7 @@
"description": "Ini Company nomor dua",
"verified": true,
"logo": "",
- "alamat": "Ini alamat Company duar"
+ "address": "Ini address Company duar"
}
},
{
@@ -2264,7 +2264,7 @@
"path": "/admin/core/company/add/",
"query_params": "",
"raw_body": "",
- "body": "{\n \"_save\": [\n \"Save\"\n ],\n \"alamat\": [\n \"Ini alamat Company duar \"\n ],\n \"csrfmiddlewaretoken\": [\n \"bQaWsFgD1AgeJoBqWmd0TzM4vtOTeBn4b29hrT3Kh8C8mi1UER6VmuWoDNr6TZyM\"\n ],\n \"description\": [\n \"Ini Company nomor dua\"\n ],\n \"logo\": [\n \"\"\n ],\n \"user\": [\n \"4\"\n ],\n \"verified\": [\n \"on\"\n ]\n}",
+ "body": "{\n \"_save\": [\n \"Save\"\n ],\n \"address\": [\n \"Ini address Company duar \"\n ],\n \"csrfmiddlewaretoken\": [\n \"bQaWsFgD1AgeJoBqWmd0TzM4vtOTeBn4b29hrT3Kh8C8mi1UER6VmuWoDNr6TZyM\"\n ],\n \"description\": [\n \"Ini Company nomor dua\"\n ],\n \"logo\": [\n \"\"\n ],\n \"user\": [\n \"4\"\n ],\n \"verified\": [\n \"on\"\n ]\n}",
"method": "POST",
"start_time": "2017-03-28T05:52:02.543Z",
"view_name": "admin:core_company_add",
@@ -2352,7 +2352,7 @@
"path": "/admin/core/company/add/",
"query_params": "",
"raw_body": "",
- "body": "{\n \"_save\": [\n \"Save\"\n ],\n \"alamat\": [\n \"Alamat company 1\"\n ],\n \"csrfmiddlewaretoken\": [\n \"qRrwCYU6nEjXElJviBxGyQDcEGGSJ8gFq3qRBcHdDcFRhf9Z06qB1LNwM0j5owrn\"\n ],\n \"description\": [\n \"Ini Company nomor satu\"\n ],\n \"logo\": [\n \"\"\n ],\n \"user\": [\n \"3\"\n ],\n \"verified\": [\n \"on\"\n ]\n}",
+ "body": "{\n \"_save\": [\n \"Save\"\n ],\n \"address\": [\n \"Alamat company 1\"\n ],\n \"csrfmiddlewaretoken\": [\n \"qRrwCYU6nEjXElJviBxGyQDcEGGSJ8gFq3qRBcHdDcFRhf9Z06qB1LNwM0j5owrn\"\n ],\n \"description\": [\n \"Ini Company nomor satu\"\n ],\n \"logo\": [\n \"\"\n ],\n \"user\": [\n \"3\"\n ],\n \"verified\": [\n \"on\"\n ]\n}",
"method": "POST",
"start_time": "2017-03-28T05:51:12.375Z",
"view_name": "admin:core_company_add",