diff --git a/package-lock.json b/package-lock.json index c11117f..06298b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9833,14 +9833,6 @@ "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==" }, - "octicons": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/octicons/-/octicons-8.5.0.tgz", - "integrity": "sha512-l4GCHwBvStuwVfIuqUx/ktFJQJdCqLnd0bi2dvYZzkza6wj9EUksfMUlTqyVMULbPIvRTXxOqn/W07fsMu1bXA==", - "requires": { - "object-assign": "4.1.1" - } - }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", diff --git a/package.json b/package.json index 1111726..652b289 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "private": true, "dependencies": { "animate.css": "^3.7.0", - "octicons": "^8.5.0", "react": "^16.8.6", "react-dom": "^16.8.6", "react-scripts": "2.1.8" diff --git a/public/index.html b/public/index.html index 1b1e497..7eb5192 100644 --- a/public/index.html +++ b/public/index.html @@ -23,10 +23,7 @@ Learn how to configure a non-root public URL by running `npm run build`. --> - - - - React App + Giovani Rodriguez @@ -42,4 +39,7 @@ To create a production bundle, use `npm run build` or `yarn build`. --> + + + diff --git a/src/components/App.js b/src/components/App.js index e95471c..b0315ab 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import Home from './pages/home' +import Home from './home/home' import './App.css'; class App extends Component { diff --git a/src/components/shared/bio/bio.css b/src/components/bio/bio.css similarity index 100% rename from src/components/shared/bio/bio.css rename to src/components/bio/bio.css diff --git a/src/components/shared/bio/bio.js b/src/components/bio/bio.js similarity index 100% rename from src/components/shared/bio/bio.js rename to src/components/bio/bio.js diff --git a/src/components/footer/footer.css b/src/components/footer/footer.css new file mode 100644 index 0000000..5114fca --- /dev/null +++ b/src/components/footer/footer.css @@ -0,0 +1,3 @@ +.footer-background-color { + background-color: #eff1f4; +} \ No newline at end of file diff --git a/src/components/footer/footer.js b/src/components/footer/footer.js new file mode 100644 index 0000000..3084394 --- /dev/null +++ b/src/components/footer/footer.js @@ -0,0 +1,33 @@ +import React, {Component} from 'react'; +import './footer.css'; +import GithubIcon from '../../images/github-logo.svg'; +import LinkedInIcon from '../../images/linkedin-logo.svg'; +import TwitterIcon from '../../images/twitter-logo.svg'; + +class Footer extends Component { + render() { + return ( +
+
+
+ + Github Icon + +
+
+ + LinkedIn Icon + +
+
+ + Twitter Icon + +
+
+
+ ); + } +} + +export default Footer; \ No newline at end of file diff --git a/src/components/shared/history/history.css b/src/components/history/history.css similarity index 100% rename from src/components/shared/history/history.css rename to src/components/history/history.css diff --git a/src/components/shared/history/history.js b/src/components/history/history.js similarity index 98% rename from src/components/shared/history/history.js rename to src/components/history/history.js index 0284dde..12b91e7 100644 --- a/src/components/shared/history/history.js +++ b/src/components/history/history.js @@ -101,7 +101,7 @@ class History extends Component {
{this.timelineContainers.map((timelineContainer, i) => { return ( -
timelineContainer.ref = el}> +
timelineContainer.ref = el} key={i}>

{timelineContainer.heading}

{timelineContainer.content}
diff --git a/src/components/home/home.js b/src/components/home/home.js new file mode 100644 index 0000000..ec2da6d --- /dev/null +++ b/src/components/home/home.js @@ -0,0 +1,24 @@ +import React, {Component} from 'react'; +import Navigation from '../navigation/navigation'; +import Footer from "../footer/footer"; +import Introduction from '../introduction/introduction'; +import Bio from '../bio/bio'; +import History from '../history/history'; +import Skills from '../skills/skills' + +class Home extends Component { + render() { + return ( +
+ + + + + +
+
+ ); + } +} + +export default Home; \ No newline at end of file diff --git a/src/components/shared/introduction/introduction.css b/src/components/introduction/introduction.css similarity index 100% rename from src/components/shared/introduction/introduction.css rename to src/components/introduction/introduction.css diff --git a/src/components/shared/introduction/introduction.js b/src/components/introduction/introduction.js similarity index 98% rename from src/components/shared/introduction/introduction.js rename to src/components/introduction/introduction.js index 7d6b42d..8afdbf9 100644 --- a/src/components/shared/introduction/introduction.js +++ b/src/components/introduction/introduction.js @@ -1,5 +1,5 @@ import React, {Component} from 'react'; -import ProfilePicture from '../../../images/home/profilePicture.jpg'; +import ProfilePicture from '../../images/home/profilePicture.jpg'; import "./introduction.css"; const lineOneText = 'Hi, my name is Giovani.'; diff --git a/src/components/shared/navigation/navigation.css b/src/components/navigation/navigation.css similarity index 100% rename from src/components/shared/navigation/navigation.css rename to src/components/navigation/navigation.css diff --git a/src/components/shared/navigation/navigation.js b/src/components/navigation/navigation.js similarity index 96% rename from src/components/shared/navigation/navigation.js rename to src/components/navigation/navigation.js index 569bbe0..f57e7b5 100644 --- a/src/components/shared/navigation/navigation.js +++ b/src/components/navigation/navigation.js @@ -40,7 +40,7 @@ class NavigationBar extends Component {
{this.navigationOptions.map((navigationOption, i) => { return ( - +

{navigationOption.content}

@@ -54,7 +54,7 @@ class NavigationBar extends Component {
{this.navigationOptions.map((navigationOption, i) => { return ( -
+

{navigationOption.content}

 diff --git a/src/components/pages/home.js b/src/components/pages/home.js deleted file mode 100644 index 2cca8ac..0000000 --- a/src/components/pages/home.js +++ /dev/null @@ -1,24 +0,0 @@ -import React, {Component} from 'react'; -import Navigation from '../shared/navigation/navigation'; -import Footer from "../shared/footer/footer"; -import Introduction from '../shared/introduction/introduction'; -import Bio from '../shared/bio/bio'; -import History from '../shared/history/history'; -import Skills from '../shared/skills/skills' - -class Home extends Component { - render() { - return ( -
- - - - - -
-
- ); - } -} - -export default Home; \ No newline at end of file diff --git a/src/components/shared/footer/footer.css b/src/components/shared/footer/footer.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/shared/footer/footer.js b/src/components/shared/footer/footer.js deleted file mode 100644 index 1978d07..0000000 --- a/src/components/shared/footer/footer.js +++ /dev/null @@ -1,23 +0,0 @@ -import React, {Component} from 'react'; - -class Footer extends Component { - render() { - return ( -
-
-
- One -
-
- Two -
-
- Three -
-
-
- ); - } -} - -export default Footer; \ No newline at end of file diff --git a/src/components/shared/skills/skills.css b/src/components/skills/skills.css similarity index 100% rename from src/components/shared/skills/skills.css rename to src/components/skills/skills.css diff --git a/src/components/shared/skills/skills.js b/src/components/skills/skills.js similarity index 98% rename from src/components/shared/skills/skills.js rename to src/components/skills/skills.js index 7e5af76..8810107 100644 --- a/src/components/shared/skills/skills.js +++ b/src/components/skills/skills.js @@ -77,7 +77,7 @@ class Skills extends Component {

Skills and Abilities

{this.progressBars.map((progressBar, i) => { return ( -
+

{progressBar.heading}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/home/desktop.ini b/src/images/home/desktop.ini deleted file mode 100644 index 04f6582..0000000 --- a/src/images/home/desktop.ini +++ /dev/null @@ -1,2 +0,0 @@ -[LocalizedFileNames] -introductionBackground.jpg=@introductionBackground.jpg,0 diff --git a/src/images/home/profilePicture-2.png b/src/images/home/profilePicture-2.png deleted file mode 100644 index 8b13168..0000000 Binary files a/src/images/home/profilePicture-2.png and /dev/null differ diff --git a/src/images/linkedin-logo.svg b/src/images/linkedin-logo.svg new file mode 100644 index 0000000..a08e87d --- /dev/null +++ b/src/images/linkedin-logo.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/twitter-logo.svg b/src/images/twitter-logo.svg new file mode 100644 index 0000000..b44643d --- /dev/null +++ b/src/images/twitter-logo.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/index.js b/src/index.js index 3d36988..23ae40d 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,5 @@ import './css/bootstrap.cosmo.min.css'; -import 'animate.css/animate.min.css' -import 'octicons/build/build.css'; +import 'animate.css/animate.min.css'; import React from 'react'; import ReactDOM from 'react-dom'; import App from './components/App';