Skip to content

Commit

Permalink
Website updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@erlisakulla
erlisakulla committed Jan 15, 2022
1 parent 86874ff commit 06e548c
Show file tree
Hide file tree
Showing 9 changed files with 131 additions and 36 deletions.
33 changes: 33 additions & 0 deletions package-lock.json
View file

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

1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"react-scroll": "^1.8.4",
"semantic-ui-css": "^2.4.1",
"semantic-ui-react": "^2.0.3",
"web-vitals": "^1.0.1"
Expand Down
4 changes: 2 additions & 2 deletions src/components/Navbar/Navbar.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
transition: transform 250ms ease-in-out;
}

.nav-link:not(#resume-btn, .wrapper .nav-link):hover:after {
.nav-link:not(#resume-btn, .wrapper .nav-link):hover:after, .nav-link.active::after {
transform: scaleX(1);
}

Expand Down Expand Up @@ -152,4 +152,4 @@ input[type="checkbox"] {

.wrapper ul {
padding: 0;
}
}
19 changes: 6 additions & 13 deletions src/components/Navbar/Navbar.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import { Link } from 'react-scroll';
import './Navbar.css';
import { FiDownload, FiMenu, FiX } from 'react-icons/fi';
import { Button } from 'antd';
Expand All @@ -15,27 +16,19 @@ function Navbar() {
<div id="navbar">
<Nav className="justify-content-center" fixed="top" id="nav">
<Nav.Item>
<Nav.Link href="#skills" id="skills-link">
Skills
</Nav.Link>
<Link activeClass="active" className="nav-link" to="skills" spy={true} smooth={true} duration={500} offset={-150}>Skills</Link>
</Nav.Item>

<Nav.Item id="about-link">
<Nav.Link href="#about" id="about-link">
About
</Nav.Link>
<Nav.Item>
<Link activeClass="active" className="nav-link" to="about" spy={true} smooth={true} duration={500} offset={-150}>About</Link>
</Nav.Item>

<Nav.Item>
<Nav.Link href="#projects" id="projects-link">
Projects
</Nav.Link>
<Link activeClass="active" className="nav-link" to="projects" spy={true} smooth={true} duration={500} offset={-150}>Projects</Link>
</Nav.Item>

<Nav.Item>
<Nav.Link href="#contact" id="contact-link">
Contact
</Nav.Link>
<Link activeClass="active" className="nav-link" to="contact" spy={true} smooth={true} duration={500} offset={-150}>Contact</Link>
</Nav.Item>

<Nav.Item>
Expand Down
6 changes: 3 additions & 3 deletions src/main/Home/HomePage.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@
color: rgb(68, 68, 68);
}

#projects {
padding-left: 20%;
/* #projects {
padding-left: 10%;
padding-right: 20%;
padding-top: 0px;
}
} */

.project-card, .cando-card {
box-shadow: 0px 3px 3px -2px rgb(0 0 0 / 20%), 0px 3px 4px 0px rgb(0 0 0 / 14%), 0px 1px 8px 0px rgb(0 0 0 / 12%);
Expand Down
8 changes: 4 additions & 4 deletions src/main/Home/HomePage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class Home extends React.Component {
</Grid>
</div>

<section id="skills">
<section id="skills" name="skills">
<h1>Skills</h1>

<div id="can-do">
Expand All @@ -80,7 +80,7 @@ class Home extends React.Component {
</div>
</section>

<section id="about">
<section id="about" name="about">
<h1>About Me</h1>
<p style={{fontSize:'16px'}} id="about-text">
I am from Albania, currently located in 📍 Bremen, Germany.
Expand All @@ -99,7 +99,7 @@ class Home extends React.Component {
</div>
</section>

<section id="projects">
<section id="projects" name="projects">
<h1 style={{paddingBottom:30}}>Projects</h1>
<Projects/>
<a href="https://github.com/erlisakulla?tab=repositories" target="_blank" rel="noreferrer">
Expand All @@ -116,7 +116,7 @@ class Home extends React.Component {
</a>
</section>

<div id="contact">
<div id="contact" name="contact">
<h1 style={{fontWeight:700}}>Let's get in touch!</h1>
<h5 style={{paddingBottom:30, opacity:0.8}}>#OpenToWork</h5>
<ContactMe/>
Expand Down
20 changes: 15 additions & 5 deletions src/main/sections/Experience.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,12 @@ export default function CustomizedTimeline() {
setIDMCxpand(!expandIDMC);
};

// add jacobshack experience
// make component reusable

return (
<Timeline align="alternate">
<div className="time">August 2020 - Present</div>
<div className="time">September 2021 - Present</div>
<TimelineItem>
<TimelineOppositeContent>
<Paper elevation={3} className={classes.paper} id="bmw-paper" onClick={handleExpandClick4}>
Expand All @@ -68,8 +71,15 @@ export default function CustomizedTimeline() {
</Grid>
</Grid>

{/* <Collapse in={expandAllianz} timeout="auto" unmountOnExit id="ui-ux-skills">
<Collapse in={expandAllianz} timeout="auto" unmountOnExit id="ui-ux-skills">
<ul style={{listStyle:'circle', fontSize:'13px', lineHeight:'1.5', paddingTop:'10px', paddingRight:'10px', paddingBottom:'15px'}}>
<li>
Worked in an agile environment as part of the Group Data Analytics Team
</li>
<li>
Developed the frontend interface for the Motor Claim Suite Demo platform using Angular and the Allianz Angular components library
</li>
</ul>
</Collapse>

<div style={{textAlign:'center', color:'none'}}>
Expand All @@ -78,7 +88,7 @@ export default function CustomizedTimeline() {
<FiChevronDown size={25} id="backend-expand-arrow"/> :
<FiChevronUp size={25} id="backend-expand-arrow"/>
}
</div> */}
</div>
</Paper>
<br/>
</TimelineOppositeContent>
Expand All @@ -87,7 +97,7 @@ export default function CustomizedTimeline() {
<TimelineConnector className={classes.secondaryTail}/>
</TimelineSeparator>
<TimelineContent id="disappear">
September 2020 - Present
September 2021 - Present
</TimelineContent>
</TimelineItem>

Expand Down
59 changes: 52 additions & 7 deletions src/main/sections/Projects.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,53 @@ export const Projects = () => {
return (
<>
<Grid container spacing={5}>
<Grid item xs={12} md={6} className="projects-grid">
<Grid item xs={12} md={4} className="projects-grid">
<Card
className="project-card"
hoverable
style={{width:400, left:'0', right:'0', margin:'auto', borderRadius:'4px'}}
// cover={
// <img
// alt="example"
// src="https://kinsta.com/wp-content/uploads/2018/04/what-is-github-1-1.png"
// />
// }
actions={[
<a href="https://github.com/jacobs-hack/static-page" target="_blank" rel="noreferrer"><FiGithub key="link" size={15}/></a>,
<a href="https://jhack2021.herokuapp.com"><FiGlobe key="link" size={15}/></a>,
]}
>
<h5>jacobsHack!2021 Website</h5>
<hr/>
Quiz using hand detection user input.<br></br>
<i style={{color:'#3f51b5'}}>HTML, CSS, JavaScript, Github Pages</i>
</Card>
</Grid>

<Grid item xs={12} md={4} className="projects-grid">
<Card
className="project-card"
hoverable
style={{width:400, left:'0', right:'0', margin:'auto', borderRadius:'4px'}}
// cover={
// <img
// alt="example"
// src="https://kinsta.com/wp-content/uploads/2018/04/what-is-github-1-1.png"
// />
// }
actions={[
<a href="https://github.com/jacobs-hack/registration-portal-2021" target="_blank" rel="noreferrer"><FiGithub key="link" size={15}/></a>,
<a href="https://jacobshack.com"><FiGlobe key="link" size={15}/></a>,
]}
>
<h5>jacobsHack!2021 Registration Page</h5>
<hr/>
Quiz using hand detection user input.<br></br>
<i style={{color:'#f50057'}}>React, Express, Node, MongoDB, Heroku</i>
</Card>
</Grid>

<Grid item xs={12} md={4} className="projects-grid">
<Card
className="project-card"
hoverable
Expand All @@ -26,12 +72,11 @@ export const Projects = () => {
<h5>Hand Detection Quiz</h5>
<hr/>
Quiz using hand detection user input.<br></br>
<i style={{color:'#f50057'}}>Python, OpenCV, Mediapipe</i>
<i style={{color:'#3f51b5'}}>Python, OpenCV, Mediapipe</i>
</Card>
</Grid>


<Grid item xs={12} md={6} className="projects-grid" style={{justifyContent:'center'}}>
<Grid item xs={12} md={4} className="projects-grid" style={{justifyContent:'center'}}>
<Card
className="project-card"
hoverable
Expand All @@ -50,11 +95,11 @@ export const Projects = () => {
<h5>Personal Website</h5>
<hr/>
The repository for this website.<br></br>
<i style={{color:'#3f51b5'}}>React, HTML, CSS</i>
<i style={{color:'#f50057'}}>React, HTML, CSS</i>
</Card>
</Grid>

<Grid item xs={12} md={6} className="projects-grid">
<Grid item xs={12} md={4} className="projects-grid">
<Card
className="project-card"
hoverable
Expand All @@ -79,7 +124,7 @@ export const Projects = () => {
</Card>
</Grid>

<Grid item xs={12} md={6} className="projects-grid">
<Grid item xs={12} md={4} className="projects-grid">
<Card
className="project-card"
hoverable
Expand Down
17 changes: 15 additions & 2 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7629,6 +7629,11 @@
dependencies:
"lodash._reinterpolate" "^3.0.0"

"lodash.throttle@^4.1.1":
"integrity" "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
"resolved" "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"
"version" "4.1.1"

"lodash.uniq@^4.5.0":
"integrity" "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
"resolved" "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
Expand Down Expand Up @@ -10129,7 +10134,7 @@
"strip-ansi" "6.0.0"
"text-table" "0.2.0"

"react-dom@*", "react-dom@^16.0.0 || ^17.0.0", "react-dom@^16.8.0 || ^17", "react-dom@^16.8.0 || ^17.0.0", "react-dom@^17.0.2", "react-dom@>= 16.9.0", "react-dom@>=16.3.0", "react-dom@>=16.6.0", "react-dom@>=16.8.0", "react-dom@>=16.9.0":
"react-dom@*", "react-dom@^15.5.4 || ^16.0.0 || ^17.0.0", "react-dom@^16.0.0 || ^17.0.0", "react-dom@^16.8.0 || ^17", "react-dom@^16.8.0 || ^17.0.0", "react-dom@^17.0.2", "react-dom@>= 16.9.0", "react-dom@>=16.3.0", "react-dom@>=16.6.0", "react-dom@>=16.8.0", "react-dom@>=16.9.0":
"integrity" "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA=="
"resolved" "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz"
"version" "17.0.2"
Expand Down Expand Up @@ -10300,6 +10305,14 @@
optionalDependencies:
"fsevents" "^2.1.3"

"react-scroll@^1.8.4":
"integrity" "sha512-J9rFqmdzularCXJoK2vleHVg2//y9Fs6zh7K13x7Yz3Y1kHPfQ/TTq029L09q1Gr5/5JjFLBOB2Sa3yYIqyTyQ=="
"resolved" "https://registry.npmjs.org/react-scroll/-/react-scroll-1.8.4.tgz"
"version" "1.8.4"
dependencies:
"lodash.throttle" "^4.1.1"
"prop-types" "^15.7.2"

"react-side-effect@^2.1.0":
"integrity" "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ=="
"resolved" "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz"
Expand All @@ -10315,7 +10328,7 @@
"loose-envify" "^1.4.0"
"prop-types" "^15.6.2"

"react@*", "react@^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", "react@^16.0.0 || ^17.0.0", "react@^16.3.0 || ^17.0.0", "react@^16.8.0 || ^17", "react@^16.8.0 || ^17.0.0", "react@^17.0.2", "react@>= 16", "react@>= 16.9.0", "react@>=0.14.0", "react@>=15", "react@>=15.0.0", "react@>=16.0.0", "react@>=16.3.0", "react@>=16.3.2", "react@>=16.6.0", "react@>=16.8.0", "react@>=16.9.0", "[email protected]":
"react@*", "react@^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", "react@^15.5.4 || ^16.0.0 || ^17.0.0", "react@^16.0.0 || ^17.0.0", "react@^16.3.0 || ^17.0.0", "react@^16.8.0 || ^17", "react@^16.8.0 || ^17.0.0", "react@^17.0.2", "react@>= 16", "react@>= 16.9.0", "react@>=0.14.0", "react@>=15", "react@>=15.0.0", "react@>=16.0.0", "react@>=16.3.0", "react@>=16.3.2", "react@>=16.6.0", "react@>=16.8.0", "react@>=16.9.0", "[email protected]":
"integrity" "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="
"resolved" "https://registry.npmjs.org/react/-/react-17.0.2.tgz"
"version" "17.0.2"
Expand Down

0 comments on commit 06e548c

Please sign in to comment.