Fakultas Ilmu Komputer UI

Commit b0421790 authored by M. Reza Qorib's avatar M. Reza Qorib
Browse files

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

# Conflicts:
#	seeder.json
parents 6abfa677 d79c880a
@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
}
......@@ -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>
)
}
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';
import Storage from '../lib/Storage';
......@@ -48,7 +48,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>
......@@ -74,6 +77,9 @@ export default class LoginForm extends React.Component {
/>
</Form>
</div>
)
}
......@@ -6,6 +6,12 @@ import Server from '../lib/Server';
import Storage from '../lib/Storage';
export default class TopMenu extends React.Component {
<<<<<<< HEAD
state = { activeItem: 'home' };
handleItemClick = (e, { name }) => this.setState({ activeItem: name })
render() {
const { activeItem } = this.state;
=======
constructor(props) {
super(props);
/* istanbul ignore next */
......@@ -18,6 +24,7 @@ export default class TopMenu extends React.Component {
browserHistory.push('/login');
});
};
>>>>>>> 83ea6c3d4376e9644af1ae3104de3d496ee20b98
render() {
return (
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment