From f922213e334b88d77ac879d30669c9f95b0f9f60 Mon Sep 17 00:00:00 2001
From: Zamil Majdy <z.majdy1996@gmail.com>
Date: Tue, 18 Apr 2017 14:37:18 +0700
Subject: [PATCH] [Refactor] Html CSS visual stuffs
---
assets/css/custom.css | 9 ++------
assets/js/components/ModalAlert.jsx | 29 ++++++++++++++------------
assets/js/components/RegisterModal.jsx | 2 +-
assets/js/components/Tabs.jsx | 4 ----
assets/js/components/TopMenu.jsx | 6 +++---
assets/js/components/VacancyList.jsx | 7 ++++---
core/templates/core/index.html | 1 +
7 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/assets/css/custom.css b/assets/css/custom.css
index 67735bc6..706d9ddf 100755
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -115,7 +115,7 @@ font-size: 32px;
}
.daftar{
float: right;
- margin-top:10px;
+ margin-top:10px;
}
.coverLetter{
@@ -132,7 +132,7 @@ font-size: 32px;
.registerForm{
margin: 0 auto;
- padding:50px;
+ /*padding:50px;*/
background-color: #3B8686;
}
@@ -148,11 +148,6 @@ h5{
color: black;
}
-textarea{
- width: 800px !important;
- height: 160px !important;
-}
-
.note {
color: gray;
margin: 8px 0;
diff --git a/assets/js/components/ModalAlert.jsx b/assets/js/components/ModalAlert.jsx
index de5e94f2..e5c723ab 100644
--- a/assets/js/components/ModalAlert.jsx
+++ b/assets/js/components/ModalAlert.jsx
@@ -31,17 +31,20 @@ export default class ModalAlert extends React.Component {
this.setState({ open: false });
};
- render = () => (
- <Modal open={this.state.open} basic size="small">
- <Header icon="warning sign" content={this.state.header} />
- <Modal.Content>
- <p>{this.state.content}</p>
- </Modal.Content>
- <Modal.Actions>
- <Button color="green" inverted onClick={this.close}>
- <Icon name="checkmark" /> OK
- </Button>
- </Modal.Actions>
- </Modal>
- );
+ render = () => {
+ const style = { 'white-space': 'pre-wrap' };
+ return (
+ <Modal open={this.state.open} basic size="small">
+ <Header icon="warning sign" content={this.state.header} />
+ <Modal.Content>
+ <p style={style}>{this.state.content}</p>
+ </Modal.Content>
+ <Modal.Actions>
+ <Button color="green" inverted onClick={this.close}>
+ <Icon name="checkmark" /> OK
+ </Button>
+ </Modal.Actions>
+ </Modal>
+ );
+ };
}
diff --git a/assets/js/components/RegisterModal.jsx b/assets/js/components/RegisterModal.jsx
index bbcbc9d7..b5e583e4 100644
--- a/assets/js/components/RegisterModal.jsx
+++ b/assets/js/components/RegisterModal.jsx
@@ -90,7 +90,7 @@ export default class RegisterModal extends React.Component {
</Form.Field>
<Form.Field required>
<label htmlFor="description">Deskripsi</label>
- <TextArea onChange={this.handleChange} placeholder="Tell us more" name="description" required />
+ <TextArea onChange={this.handleChange} placeholder="Tell us more" name="description" autoHeight required />
</Form.Field>
<Form.Field required>
<label htmlFor="address">Alamat</label>
diff --git a/assets/js/components/Tabs.jsx b/assets/js/components/Tabs.jsx
index 601d8f45..aa6f7510 100644
--- a/assets/js/components/Tabs.jsx
+++ b/assets/js/components/Tabs.jsx
@@ -11,10 +11,6 @@ export default class Tabs extends React.Component {
]).isRequired,
};
- static defaultProps = () => ({
- selected: 0,
- });
-
constructor(props) {
super(props);
this.state = {
diff --git a/assets/js/components/TopMenu.jsx b/assets/js/components/TopMenu.jsx
index ad5b6bed..43319101 100644
--- a/assets/js/components/TopMenu.jsx
+++ b/assets/js/components/TopMenu.jsx
@@ -7,15 +7,15 @@ import Storage from '../lib/Storage';
export default class TopMenu extends React.Component {
- state = { activeItem: 'home' };
- handleItemClick = (e, { name }) => this.setState({ activeItem: name });
-
constructor(props) {
super(props);
/* istanbul ignore next */
+ this.state = { activeItem: 'home' };
this.logout = this.logout.bind(this);
}
+ handleItemClick = (e, { name }) => this.setState({ activeItem: name });
+
logout = () => {
Server.get('/api-auth/logout/?next=/', true).then(() => {
Storage.clear();
diff --git a/assets/js/components/VacancyList.jsx b/assets/js/components/VacancyList.jsx
index c8c22211..412f4cc9 100644
--- a/assets/js/components/VacancyList.jsx
+++ b/assets/js/components/VacancyList.jsx
@@ -3,6 +3,7 @@ import { Segment, Item, Button } from 'semantic-ui-react';
import Vacancy from './Vacancy';
import CompanyVacancy from './CompanyVacancy';
import Server from '../lib/Server';
+import {Link} from "react-router";
export default class VacancyList extends React.Component {
@@ -73,7 +74,7 @@ export default class VacancyList extends React.Component {
return (
<div>
<Button icon="eye" secondary labelPosition="left" content="Lihat Semua Pendaftar" />
- <Button icon="add" secondary labelPosition="left" content="Tambah Lowongan Baru" />
+ <Button as={Link} to="/buat-lowongan" icon="add" secondary labelPosition="left" content="Tambah Lowongan Baru" />
</div>
);
}
@@ -82,11 +83,11 @@ export default class VacancyList extends React.Component {
}
render = () => (
- <div>
+ <div>
{ this.companyHeader() }
<Item.Group relaxed>
{ this.generateVacancies() }
</Item.Group>
- </div>
+ </div>
);
}
diff --git a/core/templates/core/index.html b/core/templates/core/index.html
index 4c14575b..b15d9a2c 100755
--- a/core/templates/core/index.html
+++ b/core/templates/core/index.html
@@ -8,6 +8,7 @@
<title>Yuk Cari Tempat Kape :)</title>
<link rel="stylesheet" href="{% static 'css/custom.css' %}"/>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.2/semantic.min.css"/>
+ <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/react-datepicker/0.44.0/react-datepicker.min.css"/>
<link rel="icon" type="image/png" href="{% static 'img/logo-sm.png'%}" sizes="32x32" />
</head>
--
GitLab