Skip to content

Commit dd26cf2

Browse files
okibayuokibayu
committed
Updated
1 parent 0e6b275 commit dd26cf2

File tree

6 files changed

+34
-40
lines changed

6 files changed

+34
-40
lines changed

‎ism/react-app/public/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<link src="img/favicon.png" rel="icon" />
77
<link rel='stylesheet' href='https://fonts.googleapis.com/css?family=Poppins:100,200,300,400,500,600,700,800,900' type='text/css'>
88
<link rel="stylesheet" type="text/css" href="vendor/font-awesome/css/all.min.css" />
9-
<link rel="stylesheet" type="text/css" href="vendor/owl.carousel/assets/owl.carousel.min.css" />
10-
<link rel="stylesheet" type="text/css" href="vendor/owl.carousel/assets/owl.theme.default.min.css" />
9+
<!-- <link rel="stylesheet" type="text/css" href="vendor/owl.carousel/assets/owl.carousel.min.css" />
10+
<link rel="stylesheet" type="text/css" href="vendor/owl.carousel/assets/owl.theme.default.min.css" /> -->
1111
<link rel="stylesheet" type="text/css" href="vendor/daterangepicker/daterangepicker.css" />
1212
<link rel="stylesheet" type="text/css" href="css/animate.min.css">
1313
<link rel="stylesheet" type="text/css" href="css/stylesheet.css" />

‎ism/react-app/src/components/reused/ContentFlights.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
import React from 'react';
22
import PageHeader from '../reused/PageHeader';
3-
import Contents from '../trains/Contents';
3+
import Filter from '../trains/Filter';
4+
import AvailTrain from '../trains/AvailTrains';
45

56
class ContentFlights extends React.Component {
67
render() {
78
return (
89
<div>
910
<PageHeader />
10-
<Contents />
11+
<Filter />
12+
<AvailTrain />
1113
</div>
1214
)
1315
}
1416
}
15-
1617

1718
export default ContentFlights

‎ism/react-app/src/components/reused/Footer.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ class Footer extends React.Component {
3434
<div className="col-md-4 d-flex align-items-md-end flex-column">
3535
<p><strong>Keep in touch</strong></p>
3636
<ul className="social-icons">
37-
<li className="social-icons-facebook"><a data-toggle="tooltip" href="http://www.facebook.com/" target="_blank" title="Facebook" rel="noreferrer"><i className="fab fa-facebook-f" /></a></li>
38-
<li className="social-icons-linkedin"><a data-toggle="tooltip" href="http://www.linkedin.com/" target="_blank" title="Linkedin" rel="noreferrer"><i className="fab fa-linkedin-in" /></a></li>
39-
<li className="social-icons-youtube"><a data-toggle="tooltip" href="http://www.youtube.com/" target="_blank" title="Youtube" rel="noreferrer"><i className="fab fa-youtube" /></a></li>
40-
<li className="social-icons-instagram"><a data-toggle="tooltip" href="http://www.instagram.com/" target="_blank" title="Instagram" rel="noreferrer"><i className="fab fa-instagram" /></a></li>
37+
<li className="social-icons-facebook"><a data-toggle="tooltip" href="http://www.facebook.com/" target="_blank" title="Facebook" rel="noopener noreferrer"><i className="fab fa-facebook-f" /></a></li>
38+
<li className="social-icons-linkedin"><a data-toggle="tooltip" href="http://www.linkedin.com/" target="_blank" title="Linkedin" rel="noopener noreferrer"><i className="fab fa-linkedin-in" /></a></li>
39+
<li className="social-icons-youtube"><a data-toggle="tooltip" href="http://www.youtube.com/" target="_blank" title="Youtube" rel="noopener noreferrer"><i className="fab fa-youtube" /></a></li>
40+
<li className="social-icons-instagram"><a data-toggle="tooltip" href="http://www.instagram.com/" target="_blank" title="Instagram" rel="noopener noreferrer"><i className="fab fa-instagram" /></a></li>
4141
</ul>
4242
</div>
4343
</div>

‎ism/react-app/src/components/reused/PromoCard.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ class PromoCard extends React.Component{
1515
autoplayTimeout={5000}
1616
lazyLoad={true}
1717
margin={10}
18-
nav={true}
18+
1919
dots={true}
20-
autoplay={true}
2120
responsive={{
2221
0:{items:1,},
2322
576:{items:2,},
@@ -27,33 +26,33 @@ class PromoCard extends React.Component{
2726
navText={['<i class="fa fa-chevron-left"></i>', '<i class="fa fa-chevron-right"></i>']}
2827
>
2928
<div className="item">
30-
<a>
29+
<a href="#">
3130
<img className="img-fluid rounded" src="img/sliders/banner6.jpg" alt="banner 4" />
3231
</a>
3332
</div>
3433
<div className="item">
35-
<a>
34+
<a href="#">
3635
<img className="img-fluid rounded" src="img/sliders/banner7.jpg" alt="banner 5" />
3736
</a>
3837
</div>
3938
<div className="item">
40-
<a>
39+
<a href="#">
4140
<img className="img-fluid rounded" src="img/sliders/banner8.jpg" alt="banner 6" />
4241
</a>
4342
</div>
4443
<div className="item">
45-
<a>
44+
<a href="#">
4645
<img className="img-fluid rounded" src="img/sliders/banner9.jpg" alt="banner 7" />
4746
</a>
4847
</div>
4948
<div className="item">
50-
<a>
49+
<a href="#">
5150
<img className="img-fluid rounded" src="img/sliders/banner10.jpg" alt="banner 8" />
5251
</a>
5352
</div>
5453
</OwlCarousel>
5554
</div>
56-
</div>
55+
</div>
5756
)
5857
}
5958
}

‎ism/react-app/src/components/trains/AvailFlights.js

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
import React from 'react';
2-
import PageHeader from '../reused/PageHeader';
3-
import Filter from '../trains/Filter';
4-
import AvailTrain from '../trains/AvailTrains';
1+
import React, {Component} from 'react';
2+
import SliderTop from '../SliderTop';
3+
import SearchForm from '../SearchForm';
4+
import PopularTrain from '../PopularTrain';
55

6-
class AvailFlights extends React.Component {
6+
class ContentFlights extends Component {
77
render() {
8-
return (
9-
8+
return (
109
<div>
11-
<PageHeader />
12-
<Filter />
13-
<AvailTrain />
10+
<SliderTop />
11+
<SearchForm />
12+
<PopularTrain />
1413
</div>
15-
)
14+
)
1615
}
1716
}
1817

19-
export default AvailFlights
18+
export default ContentFlights

‎ism/react-app/src/index.js

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
3-
import { BrowserRouter as Router, Route, Switch, useParams } from 'react-router-dom';
3+
import { BrowserRouter, Route, Switch, useParams } from 'react-router-dom';
44
import { Suspense } from 'react';
55
import loadable from '@loadable/component';
66
import 'bootstrap/dist/css/bootstrap.min.css';
@@ -19,7 +19,7 @@ const Footer = loadable(() => import('./components/reused/Footer'));
1919
class Main extends React.Component {
2020
render() {
2121
return (
22-
<Router>
22+
<BrowserRouter>
2323
<div id="main-wrapper">
2424
<header id="header">
2525
<NavbarTop fallback={<Loading />}/>
@@ -31,13 +31,13 @@ class Main extends React.Component {
3131
<Route path="/flights" component={ContentFlights} />
3232
<Route path="/hotels" component={ContentHotels} />
3333
<Route path="/trains" component={ContentTrains} />
34-
<Route path="/:id" children={<Child/>} />
34+
<Route path="/:id" children={<Child />} />
3535
</Switch>
3636
</div>
3737
</Suspense>
3838
<Footer />
3939
</div>
40-
</Router>
40+
</BrowserRouter>
4141
);
4242
}
4343
}
@@ -51,17 +51,12 @@ function Child () {
5151
position: "cover"
5252
};
5353

54-
let icon = {
55-
src:`url(${icon404})`
56-
};
57-
58-
59-
return (
54+
return (
6055
<div className="section" style={bg404} background-size="contain">
6156
<div className="container">
6257
<div className="row align-items-center p-3">
6358
<div className="col text-center">
64-
<img src={icon404}></img>
59+
<img src={icon404}></img> >
6560
<h3>WHOOPS!</h3>
6661
Looks like something's broken here.<br></br>
6762
The page you were looking for could not be found.<br></br>

0 commit comments

Comments
 (0)