Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Iam #97

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Iam #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92d5003
add description
Jan 2, 2024
809ed47
update iam info
louwiic Feb 10, 2024
5faeb9e
fix css landing
louwiic Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 12 additions & 43 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added src/assets/me.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/svg/projects/phone.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/svg/projects/website.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/components/Education/Education.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
height: 140px;
padding: 1.5rem;
border-radius: 20px;
margin-bottom: 1.5rem;
margin-bottom: 1.9rem;
transition: background-color 200ms ease-in-out;
}

Expand All @@ -57,6 +57,7 @@

.education-details{
margin-left: 0.6rem;
padding-bottom: 2em;
}

.education-details > h6 {
Expand Down Expand Up @@ -114,7 +115,7 @@
.education-card {
width: 100%;
padding: 1.5rem;
margin-bottom: 1.5rem;
margin-bottom: 1.9rem;
}
}

Expand Down
62 changes: 32 additions & 30 deletions src/components/Education/Education.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
import React, { useContext } from 'react';
import React, { useContext } from "react";

import { ThemeContext } from '../../contexts/ThemeContext';
import { ThemeContext } from "../../contexts/ThemeContext";

import './Education.css'
import EducationCard from './EducationCard';
import "./Education.css";
import EducationCard from "./EducationCard";

import { educationData } from '../../data/educationData'
import { educationData } from "../../data/educationData";

function Education() {

const { theme } = useContext(ThemeContext);
return (
<div className="education" id="resume" style={{backgroundColor: theme.secondary}}>
<div className="education-body">
<div className="education-description">
<h1 style={{color:theme.primary}}>Education</h1>
{educationData.map(edu => (
<EducationCard
key={edu.id}
id={edu.id}
institution={edu.institution}
course={edu.course}
startYear={edu.startYear}
endYear={edu.endYear}
/>
))}
</div>
<div className="education-image">
<img src={theme.eduimg} alt=""/>
</div>
</div>
const { theme } = useContext(ThemeContext);
return (
<div
className="education"
id="resume"
style={{ backgroundColor: theme.secondary }}
>
<div className="education-body">
<div className="education-description">
<h1 style={{ color: theme.primary }}>Formations</h1>
{educationData.map((edu) => (
<EducationCard
key={edu.id}
id={edu.id}
institution={edu.institution}
course={edu.course}
startYear={edu.startYear}
endYear={edu.endYear}
/>
))}
</div>
<div className="education-image">
<img src={theme.eduimg} alt="" />
</div>
)
</div>
</div>
);
}

export default Education
export default Education;
76 changes: 40 additions & 36 deletions src/components/Education/EducationCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,46 @@
import React, { useContext } from 'react';
import { makeStyles } from '@material-ui/core/styles';
import Fade from 'react-reveal/Fade';
import React, { useContext } from "react";
import { makeStyles } from "@material-ui/core/styles";
import Fade from "react-reveal/Fade";

import { ThemeContext } from '../../contexts/ThemeContext';
import { ThemeContext } from "../../contexts/ThemeContext";

import eduImgWhite from '../../assets/svg/education/eduImgWhite.svg'
import eduImgBlack from '../../assets/svg/education/eduImgBlack.svg'
import './Education.css'
import eduImgWhite from "../../assets/svg/education/eduImgWhite.svg";
import eduImgBlack from "../../assets/svg/education/eduImgBlack.svg";
import "./Education.css";

function EducationCard({ id, institution, course, startYear, endYear }) {

const { theme } = useContext(ThemeContext);

const useStyles = makeStyles((t) => ({
educationCard : {
backgroundColor:theme.primary30,
"&:hover": {
backgroundColor:theme.primary50,
},
},
}));

const classes = useStyles();

return (
<Fade bottom>
<div key={id} className={`education-card ${classes.educationCard}`} >
<div className="educard-img" style={{backgroundColor: theme.primary}}>
<img src={theme.type === 'light' ? eduImgBlack : eduImgWhite} alt="" />
</div>
<div className="education-details">
<h6 style={{color: theme.primary}}>{startYear}-{endYear}</h6>
<h4 style={{color: theme.tertiary}}>{course}</h4>
<h5 style={{color: theme.tertiary80}}>{institution}</h5>
</div>
</div>
</Fade>
)
const { theme } = useContext(ThemeContext);

const useStyles = makeStyles((t) => ({
educationCard: {
backgroundColor: theme.primary30,
"&:hover": {
backgroundColor: theme.primary50,
},
},
}));

const classes = useStyles();

return (
<Fade bottom>
<div key={id} className={`education-card ${classes.educationCard}`}>
<div className="educard-img" style={{ backgroundColor: theme.primary }}>
<img
src={theme.type === "light" ? eduImgBlack : eduImgWhite}
alt=""
/>
</div>
<div className="education-details">
<h6 style={{ color: theme.primary }}>
{startYear}-{endYear}
</h6>
<h4 style={{ color: theme.tertiary }}>{course}</h4>
<h5 style={{ color: theme.tertiary80 }}>{institution}</h5>
</div>
</div>
</Fade>
);
}

export default EducationCard
export default EducationCard;
4 changes: 2 additions & 2 deletions src/components/Landing/Landing.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.landing {
height: 100vh;
display: flex;
/* display: flex;
align-items: center;
justify-content: center;
justify-content: center; */
}

.landing--container {
Expand Down
Loading