Skip to content

Commit c314963

Browse files
committed
updated
1 parent c9c4ed0 commit c314963

File tree

6 files changed

+43
-29
lines changed

6 files changed

+43
-29
lines changed

ism/react-app/package-lock.json

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ism/react-app/package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
"node-sass": "^4.13.0",
1414
"popper.js": "^1.16.0",
1515
"prop-types": "^15.7.2",
16-
"react": "^16.12.0",
16+
"react": "16.12.0",
1717
"react-bootstrap": "^1.0.0-beta.16",
18-
"react-dom": "^16.12.0",
18+
"react-dom": "16.12.0",
1919
"react-ion-slider": "^1.0.5",
2020
"react-owl-carousel": "^2.3.1",
2121
"react-popper": "^1.3.7",
2222
"react-router-dom": "^5.1.2",
23-
"react-scripts": "3.3.0"
23+
"react-scripts": "3.3.0",
24+
"react-spring": "^8.0.27"
2425
},
2526
"scripts": {
2627
"start": "react-scripts start",

ism/react-app/src/components/SearchForm.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class SearchForm extends React.Component {
124124
this.$el.on('change', this.handleChange);
125125

126126
this.slideToggle = this.slideToggle;
127-
this.$el.slideToggle('fast', this.handleClick);
127+
this.$el.slideToggle('fast', this.state);
128128

129129
}
130130

@@ -442,7 +442,7 @@ class SearchForm extends React.Component {
442442
method="post"
443443
onSubmit={this.submitForm}
444444
>
445-
{fireRedirect && (<Redirect to={'/trains/available'}/>)}
445+
{fireRedirect && (<Redirect to={'/trains/results'}/>)}
446446
<div className="mb-3">
447447
<div className="custom-control custom-radio custom-control-inline">
448448
<input id="train-oneway" name="train-trip" className="custom-control-input" defaultChecked required type="radio" />

ism/react-app/src/components/scss/_mixins.scss

+5
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,8 @@
3030
transform: scale($val);
3131
}
3232

33+
@mixin transform($property) {
34+
-webkit-transform: $property;
35+
-ms-transform: $property;
36+
transform: $property;
37+
}

ism/react-app/src/components/trains/Filter.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class Filter extends React.Component {
1212
</div>
1313
<div className="filter-header">
1414
<a href="#" className="btn btn-sm shadow-sm collapsed" data-toggle="collapse" data-target="#kelas" role="button" aria-expanded="false" aria-controls="#kelas">Kelas</a>
15+
<div className="status" />
1516
</div>
1617
<div className="filter-header">
1718
<a href="#" className="btn btn-sm shadow-sm collapsed" data-toggle="collapse" data-target="#kereta" role="button" aria-expanded="false" aria-controls="#kereta">Kereta Api</a>

ism/react-app/src/index.js

+22-24
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const ContentHome = loadable(() => import('./components/reused/ContentHome'));
1414
const ContentFlights = loadable(() => import('./components/reused/ContentFlights'));
1515
const ContentHotels = loadable(() => import('./components/reused/ContentHotels'));
1616
const ContentTrains = loadable(() => import('./components/reused/ContentTrains'));
17-
// const TrainResults = loadable(() => import('./components/trains/TrainResults'));
1817
const Footer = loadable(() => import('./components/reused/Footer'));
1918

2019
class DynamicImport extends Component {
@@ -36,30 +35,29 @@ class DynamicImport extends Component {
3635

3736
function Child () {
3837
let {id} = useParams();
39-
let bg404 = {
40-
width: "100%",
41-
height: "100%",
42-
backgroundImage: `url(${Background})`,
43-
position: "cover"
44-
};
38+
const bg404 = {
39+
width: "100%",
40+
backgroundImage: `url(${Background})`,
41+
position: "cover"
42+
};
4543

46-
return (
47-
<div className="section" style={bg404} background-size="contain">
48-
<div className="container">
49-
<div className="row align-items-center p-3">
50-
<div className="col text-center">
51-
<img src={icon404}></img> >
52-
<h3>WHOOPS!</h3>
53-
Looks like something's broken here.<br></br>
54-
The page you were looking for could not be found.<br></br>
55-
<i className="fas fa-link"></i> <span className="text-danger"> {id}<br></br>
56-
</span>
57-
</div>
58-
</div>
59-
</div>
60-
</div>
61-
);
62-
}
44+
return (
45+
<div className="section" style={bg404} background-size="contain">
46+
<div className="container">
47+
<div className="row align-items-center p-3">
48+
<div className="col text-center">
49+
<img src={icon404}></img> >
50+
<h3>WHOOPS!</h3>
51+
Looks like something's broken here.<br></br>
52+
The page you were looking for could not be found.<br></br>
53+
<i className="fas fa-link"></i> <span className="text-danger"> {id}<br></br>
54+
</span>
55+
</div>
56+
</div>
57+
</div>
58+
</div>
59+
);
60+
}
6361

6462
const TrainResults = (props) => (
6563
<DynamicImport load={() => import('./components/trains/TrainResults')}>

0 commit comments

Comments
 (0)