Skip to content

Commit b94a40c

Browse files
Zakaria-B16Zakaria-B16
committed
fix landing page
1 parent de417c6 commit b94a40c

File tree

13 files changed

+533
-526
lines changed

13 files changed

+533
-526
lines changed

‎src/assets/images/Group44.png‎

24.6 KB
Loading

‎src/assets/images/Group54.png‎

58 KB
Loading

‎src/assets/images/Group57.png‎

52.1 KB
Loading

‎src/components/Layout/Footer.js‎

Lines changed: 82 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,87 @@
1-
import React from 'react'
2-
import { Link } from 'react-router-dom'
1+
import React from "react";
2+
import { Link } from "react-router-dom";
33

4-
import FooterLogo from '../../assets/images/footerLogo.png'
5-
import Group54 from '../../assets/images/Group54.png'
6-
import Group57 from '../../assets/images/Group57.png'
4+
import FooterLogo from "../../assets/images/footerLogo.png";
5+
import Group54 from "../../assets/images/Group54.png";
6+
import Group57 from "../../assets/images/Group57.png";
77

88
const Footer = () => {
9-
return (
10-
<div className='footer'>
11-
<div className='footer__company'>
12-
<img src={FooterLogo} alt='' className='footer__logo' />
13-
<p className='footer__copyright'>
14-
&copy; 2020 Safed Pankh Foundation
15-
</p>
16-
</div>
17-
<>
18-
<ul className='footer__list'>
19-
<li className='footer__list--item'>
20-
<Link to='/' className='footer__link'>
21-
About Us
22-
</Link>
23-
</li>
24-
<li className='footer__list--item'>
25-
<Link to='/' className='footer__link'>
26-
Careers
27-
</Link>
28-
</li>
29-
<li className='footer__list--item'>
30-
<Link to='/' className='footer__link'>
31-
Blogs
32-
</Link>
33-
</li>
34-
<li className='footer__list--item'>
35-
<Link to='/' className='footer__link'>
36-
Privacy Policy
37-
</Link>
38-
</li>
39-
<li className='footer__list--item'>
40-
<Link to='/' className='footer__link'>
41-
Terms and Conditions
42-
</Link>
43-
</li>
44-
</ul>
45-
</>
46-
<>
47-
<ul className='footer__list'>
48-
<li className='footer__list--item'>
49-
<Link to='/' className='footer__link'>
50-
User Guildlines
51-
</Link>
52-
</li>
53-
<li className='footer__list--item'>
54-
<Link to='/' className='footer__link'>
55-
Site Map
56-
</Link>
57-
</li>
58-
<li className='footer__list--item'>
59-
<Link to='/' className='footer__link'>
60-
Refund Policy
61-
</Link>
62-
</li>
63-
<li className='footer__list--item'>
64-
<Link to='/' className='footer__link'>
65-
Legal Notices
66-
</Link>
67-
</li>
68-
<li className='footer__list--item'>
69-
<Link to='/' className='footer__link'>
70-
Plus subscriptions T&C
71-
</Link>
72-
</li>
73-
</ul>
74-
</>
75-
<div className='footer__app'>
76-
<p className='footer__app--heading'>Students App</p>
77-
{/* <div className='footer__assets'>
78-
<img
79-
src={Group54}
80-
alt=''
81-
className='footer__assets--item'
82-
/>
83-
<img
84-
src={Group57}
85-
alt=''
86-
className='footer__assets--item'
87-
/>
88-
</div> */}
89-
</div>
90-
<div className='footer__app'>
91-
<p className='footer__app--heading'>Teachers App</p>
92-
{/* <div className='footer__assets'>
93-
<img
94-
src={Group54}
95-
alt=''
96-
className='footer__assets--item'
97-
/>
98-
<img
99-
src={Group57}
100-
alt=''
101-
className='footer__assets--item'
102-
/>
103-
</div> */}
104-
</div>
9+
return (
10+
<div className="footer">
11+
<div className="footer__company">
12+
<img src={FooterLogo} alt="" className="footer__logo" />
13+
<p className="footer__copyright">&copy; 2020 Safed Pankh Foundation</p>
14+
</div>
15+
<ul className="footer__list">
16+
<li className="footer__list--item">
17+
<Link to="/" className="footer__link">
18+
About Us
19+
</Link>
20+
</li>
21+
<li className="footer__list--item">
22+
<Link to="/" className="footer__link">
23+
Careers
24+
</Link>
25+
</li>
26+
<li className="footer__list--item">
27+
<Link to="/" className="footer__link">
28+
Blogs
29+
</Link>
30+
</li>
31+
<li className="footer__list--item">
32+
<Link to="/" className="footer__link">
33+
Privacy Policy
34+
</Link>
35+
</li>
36+
<li className="footer__list--item">
37+
<Link to="/" className="footer__link">
38+
Terms and Conditions
39+
</Link>
40+
</li>
41+
</ul>
42+
<ul className="footer__list">
43+
<li className="footer__list--item">
44+
<Link to="/" className="footer__link">
45+
User Guildlines
46+
</Link>
47+
</li>
48+
<li className="footer__list--item">
49+
<Link to="/" className="footer__link">
50+
Site Map
51+
</Link>
52+
</li>
53+
<li className="footer__list--item">
54+
<Link to="/" className="footer__link">
55+
Refund Policy
56+
</Link>
57+
</li>
58+
<li className="footer__list--item">
59+
<Link to="/" className="footer__link">
60+
Legal Notices
61+
</Link>
62+
</li>
63+
<li className="footer__list--item">
64+
<Link to="/" className="footer__link">
65+
Plus subscriptions T&C
66+
</Link>
67+
</li>
68+
</ul>
69+
<div className="footer__app">
70+
<p className="footer__app--heading">Students App</p>
71+
<div className="footer__assets">
72+
<img src={Group54} alt="" className="footer__assets--item" />
73+
<img src={Group57} alt="" className="footer__assets--item" />
10574
</div>
106-
)
107-
}
75+
</div>
76+
<div className="footer__app">
77+
<p className="footer__app--heading">Teachers App</p>
78+
<div className="footer__assets">
79+
<img src={Group54} alt="" className="footer__assets--item" />
80+
<img src={Group57} alt="" className="footer__assets--item" />
81+
</div>
82+
</div>
83+
</div>
84+
);
85+
};
10886

109-
export default Footer
87+
export default Footer;

‎src/components/Layout/Layout.js‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
1-
import React, { Component } from 'react'
1+
import React, { Component } from "react";
22

3-
import Aux from '../hoc/HigherOrder'
4-
import Toolbar from './Toolbar'
5-
import Footer from './Footer'
3+
import Aux from "../hoc/HigherOrder";
4+
import Toolbar from "./Toolbar";
5+
import Footer from "./Footer";
66

77
class Layout extends Component {
8-
9-
render() {
10-
return (
11-
<Aux>
12-
<div className='app'>
13-
<Toolbar
14-
openSideDrawer={this.switchSideDrawerHandler}
15-
auth={this.props.auth}
16-
logOut={this.props.onLogOut}
17-
/>
18-
19-
<main className='content'>{this.props.children}</main>
20-
<div className='section-footer'>
21-
<Footer />
22-
</div>
23-
</div>
24-
</Aux>
25-
)
26-
}
27-
}
8+
render() {
9+
return (
10+
<Aux>
11+
<div className="app">
12+
<Toolbar
13+
openSideDrawer={this.switchSideDrawerHandler}
14+
auth={this.props.auth}
15+
logOut={this.props.onLogOut}
16+
/>
2817

18+
<main className="content">{this.props.children}</main>
19+
<div className="section-footer">
20+
<Footer />
21+
</div>
22+
</div>
23+
</Aux>
24+
);
25+
}
26+
}
2927

30-
export default Layout
28+
export default Layout;

‎src/components/Layout/Section.js‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,41 @@
1-
import React from 'react'
1+
import React from "react";
22

33
const Section = ({
4-
heading,
5-
text,
6-
btn,
7-
position,
8-
asset,
9-
android,
10-
apple,
11-
image,
4+
heading,
5+
text,
6+
btn,
7+
position,
8+
asset,
9+
android,
10+
apple,
11+
image,
1212
}) => {
13-
const toPosition = {
14-
float: position,
15-
}
16-
return (
17-
<div className='section'>
18-
<div className='section__1' style={toPosition}>
19-
<h1 className='section__header'>{heading}</h1>
20-
<p className='section__text'>{text}</p>
21-
{btn && <button className='section__btn'>{btn}</button>}
22-
{asset && (
23-
<div className='section__asset'>
24-
<img
25-
src={android}
26-
alt=''
27-
className='section__android'
28-
/>
29-
<img src={apple} alt='' className='section__apple' />
30-
</div>
31-
)}
13+
const toPosition = {
14+
float: position,
15+
};
16+
return (
17+
<div className="section">
18+
<div className="section__1" style={toPosition}>
19+
<div className="wrapper">
20+
<h1 className="section__header">{heading}</h1>
21+
<p className="section__text">{text}</p>
22+
{btn && <button className="section__btn">{btn}</button>}
23+
{asset && (
24+
<div className="section__asset">
25+
<img src={android} alt="" className="section__android" />
26+
<img src={apple} alt="" className="section__apple" />
3227
</div>
33-
{image && (
34-
<div className='section__2'>
35-
<img src={image} alt='' />
36-
</div>
37-
)}
28+
)}
3829
</div>
39-
)
40-
}
30+
</div>
4131

42-
export default Section
32+
{image && (
33+
<div className="section__2">
34+
{image && <img className="finalImage" src={image} alt="" />}
35+
</div>
36+
)}
37+
</div>
38+
);
39+
};
40+
41+
export default Section;

0 commit comments

Comments
 (0)