Skip to content

Commit b818afd

Browse files
tayormitayormi
authored
Merge pull request #142 from viknedus/frontend-UI-Update
Frontend UI update
2 parents 4c3df4e + 8f3a6f1 commit b818afd

28 files changed

+11657
-52638
lines changed

‎.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"editor.bracketPairColorization.enabled": true
3+
}

‎package-lock.json

Lines changed: 0 additions & 40855 deletions
This file was deleted.

‎src/components/ContactUs.js

Lines changed: 53 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,70 @@
22
import React from 'react';
33
import Navbar from './Navbar';
44
import Footer from './Footer';
5-
import ContactUsStyled from './ContactUsStyled';
5+
import './ContactUsStyled.css';
66

77
function ContactUs() {
88
return (
99
<div>
10-
<ContactUsStyled>
11-
1210
<div className="container-fluid pry-padd-form">
1311
<div className="row">
14-
<Navbar/>
12+
<Navbar />
1513
</div>
1614
<div className="row my-5 py-5">
17-
<h1 className="title text-center">
18-
Contact Us
19-
</h1>
20-
<h3 className="text-center">
21-
Get in Touch with us through any channel
22-
</h3>
23-
<ul className="social">
24-
<li>
25-
<a href="mailto:info@codeclan.com" className="fa fa-envelope" target="_blank" rel="noopener noreferrer"></a>
26-
</li>
27-
<li>
28-
<a href="https://twitter.com/codeclannigeria" className="fa fa-twitter" target="_blank" rel="noopener noreferrer"></a>
29-
</li>
30-
15+
<h1 className="title text-center za">Contact Us</h1>
16+
<div className="icons-container">
17+
<h4>Get in touch with us on</h4>
18+
<ul>
19+
<li>
20+
<a
21+
href="https://discord.gg/EUesGvttYA"
22+
target="_blank"
23+
rel="noreferrer"
24+
>
25+
<i className="fab fa-discord"></i>
26+
</a>
27+
</li>
28+
<li>
29+
<a
30+
href="https://twitter.com/codeclannigeria"
31+
target="_blank"
32+
rel="noreferrer"
33+
>
34+
<i className="fab fa-twitter"></i>
35+
</a>
36+
</li>
37+
<li>
38+
<a
39+
href="mailto:info@codeclan.com"
40+
target="_blank"
41+
rel="noreferrer"
42+
>
43+
<i className="fa fa-envelope"></i>
44+
</a>
45+
</li>
46+
<li>
47+
<a
48+
href="https://facebook.com/codeclannigeria"
49+
target="_blank"
50+
rel="noreferrer"
51+
>
52+
<i className="fab fa-facebook"></i>
53+
</a>
54+
</li>
55+
<li>
56+
<a
57+
href="https://instagram.com/codeclannigeria"
58+
target="_blank"
59+
rel="noreferrer"
60+
>
61+
<i className="fab fa-instagram"></i>
62+
</a>
63+
</li>
3164
</ul>
65+
</div>
3266
</div>
33-
34-
3567
</div>
36-
<Footer/>
37-
</ContactUsStyled>
68+
<Footer />
3869
</div>
3970
);
4071
}

‎src/components/ContactUsStyled.css

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
.pry-padd-form {
2+
padding: 0 30px 30px;
3+
padding: 0 clamp(24px, 6vw, 120px) 30px;
4+
}
5+
6+
.py-5 {
7+
display: flex;
8+
justify-content: center;
9+
}
10+
11+
.za {
12+
color: #12376d;
13+
text-align: center;
14+
font-weight: 700;
15+
font-size: 3.5rem;
16+
padding-bottom: 10px;
17+
}
18+
19+
.icons-container {
20+
background-color: #fff;
21+
border-radius: 16px;
22+
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
23+
display: flex;
24+
flex-direction: column;
25+
justify-content: center;
26+
align-items: center;
27+
height: 200px;
28+
width: 500px;
29+
max-width: calc(100% - 10px);
30+
}
31+
32+
.icons-container h4 {
33+
margin: 20px 0;
34+
color: hsl(225, 36%, 70%);
35+
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
36+
font-size: 14px;
37+
line-height: 30px;
38+
text-transform: uppercase;
39+
}
40+
41+
.icons-container ul {
42+
display: flex;
43+
list-style-type: none;
44+
padding: 0;
45+
margin: 0;
46+
}
47+
48+
.icons-container ul li {
49+
margin: 0 10px;
50+
overflow: auto;
51+
padding-bottom: 30px;
52+
}
53+
54+
.icons-container ul li a {
55+
border: 1px solid #dce1f2;
56+
border-radius: 50%;
57+
color: #001f61;
58+
font-size: 30px;
59+
display: flex;
60+
justify-content: center;
61+
align-items: center;
62+
height: 70px;
63+
width: 70px;
64+
text-decoration: none;
65+
transition: all 0.2s linear;
66+
}
67+
68+
.icons-container ul li a:hover {
69+
border-color: #ff6a00;
70+
font-size: 40px;
71+
box-shadow: 0 9px 12px -9px #ff6a00;
72+
}
73+
74+
.icons-container ul li a:hover i {
75+
color: #ff6a00;
76+
}

‎src/components/ContactUsStyled.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/components/Events.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ function Events() {
1919
}}
2020
>
2121
<div className="">
22-
<img alt='code' src={code} style={{ objectFit: 'contain', width: '100%' }} />
22+
<img
23+
src={code}
24+
alt="code"
25+
style={{ objectFit: 'contain', width: '100%' }}
26+
/>
27+
2328
</div>
2429
<div
2530
className=""

‎src/components/MenteeDashboard/mentorInfo/mentorDetails.js

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import DashboardLayout from '../../common/DashboardLayout';
33
import { getUserMentorProfileApi } from '../../../state/user/userActionCreator';
44
import { useDispatch, useSelector } from 'react-redux';
55
import UserProfile from '../userProfile/UserProfile';
6+
67
function MentorDetails() {
78
const dispatch = useDispatch();
89
const user = useSelector(state => state.user);
@@ -14,10 +15,74 @@ function MentorDetails() {
1415
}
1516
}
1617
}, [user, dispatch]);
18+
1719
useEffect(() => {
1820
fetchMentor();
1921
}, [fetchMentor]);
2022

23+
const Tracks = [
24+
{
25+
icon: <i className="far fa-check-circle"></i>,
26+
title: 'Frontend Development',
27+
},
28+
{
29+
icon: <i className="far fa-check-circle"></i>,
30+
title: 'Backend Development',
31+
},
32+
{
33+
icon: <i className="far fa-check-circle"></i>,
34+
title: 'Mobile Development',
35+
},
36+
{
37+
icon: <i className="far fa-check-circle"></i>,
38+
title: 'Desktop Development',
39+
},
40+
{
41+
icon: <i className="far fa-check-circle"></i>,
42+
title: 'Ui/UX',
43+
},
44+
];
45+
46+
const SocialMedia = [
47+
{
48+
icon: <i className="fab fa-twitter"></i>,
49+
title: 'Twitter',
50+
},
51+
{
52+
icon: <i className="fab fa-dribbble"></i>,
53+
title: 'Dribble',
54+
},
55+
{
56+
icon: <i className="fab fa-behance"></i>,
57+
title: 'Behance',
58+
},
59+
{
60+
icon: <i className="fab fa-linkedin-in"></i>,
61+
title: 'LinkedIn',
62+
},
63+
{
64+
icon: <i className="fab fa-github"></i>,
65+
title: 'Github',
66+
},
67+
];
68+
console.log(Tracks, SocialMedia);
69+
70+
// const data = {
71+
// role: 'ADMIN',
72+
// id: '5ed8391c6ee42f00178d4518',
73+
// updatedAt: '2020-07-10T16:58:51.865Z',
74+
// createdAt: '2020-06-03T23:05:57.055Z',
75+
// firstName: 'Onasanya',
76+
// lastName: 'Tunde',
77+
// email: 'onasanyatunde67@gmail.com',
78+
// description: null,
79+
// phoneNumber: null,
80+
// technologies: [],
81+
// photoUrl:
82+
// 'https://res.cloudinary.com/codeclannigeria/image/upload/v1594255930/ccn/avatars/5ed8391c6ee42f00178d4518.jpg',
83+
// tasks: [],
84+
// };
85+
2186

2287
return (
2388
<React.Fragment>

‎src/components/MenteeDashboard/pendingTask/GradingModal.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import Modal from 'antd/lib/modal/Modal';
44
import { Descriptions } from 'antd';
55
import { getTaskSubmissionAction } from '../../../state/tasks/tasksActionCreator';
66
import CustomLoader from '../../common/Spinner/CustomLoader';
7+
78
export const GradingModal = ({ visible, onCancel, onCreate, taskId }) => {
89

910

‎src/components/MenteeDashboard/pendingTask/TaskBrief/TaskBrief.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ function TaskBrief(props) {
1818
const course = useSelector(state => state.courses);
1919

2020
const fetchData = useCallback(async () => {
21+
2122
await dispatch(getSingleTaskAction(id));
2223
}, [dispatch, id]);
2324

25+
2426
useEffect(() => {
2527
fetchData();
2628
}, [fetchData]);

‎src/components/MenteeDashboard/tracks/MentorSelector/SingleMentorCard.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
22
import { Card, Tag } from 'antd';
33

4-
54
function SingleMentorCard({ mentor }) {
65
const {
76
firstName,

0 commit comments

Comments
 (0)