diff --git a/src/components/shared/portfolio/portfolio.js b/src/components/shared/portfolio/portfolio.js
deleted file mode 100644
index cf77dcd..0000000
--- a/src/components/shared/portfolio/portfolio.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React, {Component} from 'react';
-
-class Portfolio extends Component {
- render() {
- return (
-
- );
- }
-}
-
-export default Portfolio;
\ No newline at end of file
diff --git a/src/components/shared/skills/skills.js b/src/components/shared/skills/skills.js
index a42a03d..3b1fa77 100644
--- a/src/components/shared/skills/skills.js
+++ b/src/components/shared/skills/skills.js
@@ -5,7 +5,7 @@ class Skills extends Component {
constructor(props) {
super(props);
this.state = {
- isProgressBarOneInView: false
+ wasProgressBarInView: [false, false, false, false]
};
this.progressBarRefs = [
@@ -19,35 +19,43 @@ class Skills extends Component {
progressBarRefs = [];
isElementInView = (elementRef, offset = 0) => {
- if (!elementRef) return false;
+ if (!elementRef) {
+ return false;
+ }
const top = elementRef.getBoundingClientRect().top;
return (top + offset) >= 0 && (top - offset) <= window.innerHeight;
}
checkProgressBarsInView = () => {
+ let wasProgressBarInView = this.state.wasProgressBarInView;
+
for (var i = 0; i < this.progressBarRefs.length; i++) {
let progressBarRef = this.progressBarRefs[i];
if (this.isElementInView(progressBarRef)) {
- this.setState({
- isProgressBarOneInView: true /* In Progress */
- });
+ wasProgressBarInView[i] = true;
}
}
+
+ if (wasProgressBarInView.every(x => x)) {
+ window.removeEventListener('scroll', this.checkProgressBarsInView);
+ }
+
+ this.setState({
+ wasProgressBarInView: wasProgressBarInView
+ });
}
render() {
- let isProgressBarOneInView = this.state.isProgressBarOneInView;
-
return (
-
+
Skills and Abilities
C#/.NET
this.progressBarRefs[0] = el}
- role="progressbar" style={{width: isProgressBarOneInView ? 88+'%' : 0}} aria-valuenow="25" aria-valuemin="0" aria-valuemax="100">
+ role="progressbar" style={{width: this.state.wasProgressBarInView[0] ? 88+'%' : 0}} aria-valuenow="25" aria-valuemin="0" aria-valuemax="100">
@@ -55,21 +63,21 @@ class Skills extends Component {
Javascript
this.progressBarRefs[1] = el}
- role="progressbar" style={{width: 75+'%'}} aria-valuenow="25" aria-valuemin="0" aria-valuemax="100">
+ role="progressbar" style={{width: this.state.wasProgressBarInView[1] ? 75+'%' : 0}} aria-valuenow="25" aria-valuemin="0" aria-valuemax="100">
Software Design
this.progressBarRefs[2] = el}
- role="progressbar" style={{width: 70+'%'}} aria-valuenow="25" aria-valuemin="0" aria-valuemax="100">
+ role="progressbar"style={{width: this.state.wasProgressBarInView[2] ? 70+'%' : 0}} aria-valuenow="25" aria-valuemin="0" aria-valuemax="100">
MSSQL
this.progressBarRefs[3] = el}
- role="progressbar" style={{width: 62+'%'}} aria-valuenow="25" aria-valuemin="0" aria-valuemax="100">
+ role="progressbar" style={{width: this.state.wasProgressBarInView[3] ? 62+'%' : 0}} aria-valuenow="25" aria-valuemin="0" aria-valuemax="100">
diff --git a/src/images/home/introductionBackground.jpg b/src/images/home/introductionBackground.jpg
deleted file mode 100644
index 273e41c..0000000
Binary files a/src/images/home/introductionBackground.jpg and /dev/null differ
diff --git a/src/images/home/introductionBackground2.jpg b/src/images/home/introductionBackground2.jpg
deleted file mode 100644
index d36b6e1..0000000
Binary files a/src/images/home/introductionBackground2.jpg and /dev/null differ
diff --git a/src/images/home/profilePicture-2.png b/src/images/home/profilePicture-2.png
new file mode 100644
index 0000000..8b13168
Binary files /dev/null and b/src/images/home/profilePicture-2.png differ