Skip to content

T
Tia-dev
Commit f766844a authored by EKSAD's avatar EKSAD
Browse files
Options

reset lagi

parent 43c55968
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 94 deletions
src/container/ForgotPassword.js
View file @ f766844a
...@@ -38,7 +38,7 @@ class ForgotPassword extends Component { ...@@ -38,7 +38,7 @@ class ForgotPassword extends Component {
} }
api.create().verification(payload).then((response) => { api.create().verification(payload).then((response) => {
if(response.data.status === 'success') { if(response.data.status === 'success') {
this.props.history.push('/email-verification') this.props.history.push('/login')
} else { } else {
if (response.data.message == 'Akun Tidak Ditemukan!') { if (response.data.message == 'Akun Tidak Ditemukan!') {
this.setState({ errorEmail: true, msgEmail: response.data.message }) this.setState({ errorEmail: true, msgEmail: response.data.message })
......
src/container/ItemLaporan.js
View file @ f766844a
import React, { Component } from 'react'; import React, { Component } from "react";
import { Typography, InputAdornment, IconButton } from '@material-ui/core'; import { Container, Row, Col } from "react-bootstrap";
import TextField from "@material-ui/core/TextField"; import { makeStyles, createMuiTheme, MuiThemeProvider } from '@material-ui/core/styles';
import Images from '../assets/Images';
import MUIDataTable from "mui-datatables";
import SearchIcon from '@material-ui/icons/Search'; import SearchIcon from '@material-ui/icons/Search';
import Images from "../assets/Images";
import MUIDataTable from "mui-datatables";
import { TextField, InputBase } from "@material-ui/core";
import { ExcelRenderer } from 'react-excel-renderer';
var ct = require("../library/CustomTable");
const getMuiTheme = () => createMuiTheme(ct.customTable());
const options = ct.customOptions();
const options2 = ct.customOptions2();
class ItemLaporan extends Component { class ItemLaporan extends Component {
render() { render() {
...@@ -48,69 +55,42 @@ class ItemLaporan extends Component { ...@@ -48,69 +55,42 @@ class ItemLaporan extends Component {
} }
return ( return (
<div style={{ flex: 1 }}> <div style={{ height: this.props.height }}>
<div style={{ height: 150, width: '100%', backgroundColor: '#354960', padding: 24, paddingTop: 30 }}> {/* <Row> */}
<div style={{ display: 'flex' }}>
<Typography style={{ paddingTop: 8, paddingBottom: 7, fontSize: '16px', color: 'white' }}>Master Data - Approval Matrix</Typography> <div style={{ height: 199, backgroundColor: '#354960', width: '100%' }} />
<form style={{ marginLeft: 110}}> <div>
<TextField <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>
id="search" <label style={{ color: 'white', fontSize: 16, alignSelf: 'center' }}>Master Data - Item Laporan</label>
label="" <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5 }}>
variant="outlined" <img src={Images.searchBlack} style={{ marginRight: 10 }} />
size="small" <InputBase
style={{ width: '100%' }}
placeholder="Search" placeholder="Search"
style={{ width: 423, backgroundColor: 'white', borderRadius: 6 }} value={""}
InputProps={{ onChange={(e) => this.handleInputChange(e)}
startAdornment: <InputAdornment position="start"><img src={Images.searchBlack} style={{marginRight: 6}} /></InputAdornment>, inputProps={{ 'aria-label': 'naked' }}
}}
/> />
</form> </div>
<div style={{ display: 'flex' }}> <div style={{ width: '20%', justifyContent: 'space-around', display: 'flex' }}>
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
marginLeft: 82,
padding: 0
}}
onClick={() => null}
>
<img src={Images.template} /> <img src={Images.template} />
</button>
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent'
marginLeft: 16,
padding:0
}} }}
onClick={() => null} onClick={() => this.setState({ visibleUpload: true })}
> >
<img src={Images.upload} /> <img src={Images.upload} />
</button> </button>
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
marginLeft: 16,
padding:0
}}
onClick={() => null}
>
<img src={Images.download} /> <img src={Images.download} />
</button>
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent'
marginLeft: 16,
padding:0
}} }}
onClick={() => null}
> >
<img src={Images.visualisasi} /> <img src={Images.visualisasi} />
</button> </button>
...@@ -118,25 +98,24 @@ class ItemLaporan extends Component { ...@@ -118,25 +98,24 @@ class ItemLaporan extends Component {
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent'
marginLeft: 16,
padding:0
}} }}
onClick={() => null} onClick={() => this.setState({ visibleCreate: true })}
> >
<img src={Images.add} /> <img src={Images.add} />
</button> </button>
</div >
</div> </div>
</div> </div>
<div style={{ flex: 1, padding: 20, width: '100%' }}> <div style={{ padding: 25 }}>
<div> <MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable <MUIDataTable
theme={getMuiTheme()}
data={data} data={data}
columns={columns} columns={columns}
options={options} options={options}
/> />
</MuiThemeProvider>
</div> </div>
</div> </div>
</div> </div>
......
src/container/ResetPassword.js
View file @ f766844a
...@@ -115,7 +115,7 @@ class ResetPassword extends Component { ...@@ -115,7 +115,7 @@ class ResetPassword extends Component {
}} }}
/> />
<Button name="submit" variant="contained" disabled={this.state.password.trim() == '' && this.state.confirmPassword.trim() == '' ? true : false} onClick={() => this.confirmPassword()} style={{ marginTop: 30, width: '100%', height: 35, borderRadius: 4, color: this.state.password.trim() == '' && this.state.confirmPassword.trim() == '' ? '#4b4b4b' : '#fff', backgroundColor: this.state.password.trim() == '' && this.state.confirmPassword.trim() == '' ? '#d8d8d8' : '#51c6ea' }}> <Button name="submit" variant="contained" disabled={this.state.password.trim() == '' && this.state.confirmPassword.trim() == '' ? true : false} onClick={() => this.confirmPassword()} style={{ marginTop: 30, width: '100%', height: 35, borderRadius: 4, color: this.state.password.trim() == '' && this.state.confirmPassword.trim() == '' ? '#ffffff' : '#fff', backgroundColor: this.state.password.trim() == '' && this.state.confirmPassword.trim() == '' ? '#d8d8d8' : '#51c6ea' }}>
<Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Lanjut</Typography> <Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Lanjut</Typography>
</Button> </Button>
</div> </div>
......
Markdown is supported
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