From 8389dd29ee0b65eb911d3bc5a7783800fcae4679 Mon Sep 17 00:00:00 2001 From: Efrain Villanueva Date: Sun, 2 May 2021 09:20:58 -0500 Subject: [PATCH 1/2] Restructure and add blog - Remove unsued pages - Add blog link, route, and page to the router --- src/components/Common/Links/index.js | 38 +++++-- src/components/Layout/index.js | 5 +- src/components/Pages/About/index.jsx | 70 ------------ src/components/Pages/Contact/index.js | 112 ------------------- src/components/Pages/Experience/index.jsx | 100 ----------------- src/components/Pages/Hireme/index.jsx | 32 ------ src/components/Pages/Projects/index.js | 101 ----------------- src/components/Pages/Skills/index.jsx | 127 ---------------------- src/components/Routes/index.js | 14 --- 9 files changed, 29 insertions(+), 570 deletions(-) delete mode 100644 src/components/Pages/About/index.jsx delete mode 100644 src/components/Pages/Contact/index.js delete mode 100644 src/components/Pages/Experience/index.jsx delete mode 100644 src/components/Pages/Hireme/index.jsx delete mode 100644 src/components/Pages/Projects/index.js delete mode 100644 src/components/Pages/Skills/index.jsx diff --git a/src/components/Common/Links/index.js b/src/components/Common/Links/index.js index ce4b838..748906f 100644 --- a/src/components/Common/Links/index.js +++ b/src/components/Common/Links/index.js @@ -1,5 +1,8 @@ import React from 'react'; -import { Link } from 'react-scroll'; +import { Link as Anchor } from 'react-scroll'; +import { + Link +} from "react-router-dom"; import withWidth, { isWidthDown } from '@material-ui/core/withWidth'; import IconButton from '@material-ui/core/IconButton'; @@ -13,6 +16,14 @@ const Links = (props) => { const menuBehaviour = props.opened ? 'open' : ''; const linksData = [ + { + props: { + props: { + link: '/blog' + }, + title: 'Blog' + } + }, { props: { containerId: 'homeAboutSection', @@ -55,16 +66,21 @@ const Links = (props) => { ) : null} {linksData.map((link, index) => (
  • - props.behaviourHandler(false)} - smooth={true} - spy={true} - to={link.props.containerId} - > - {link.title} - + { + link.props.containerId ? + props.behaviourHandler(false)} + smooth={true} + spy={true} + to={link.props.containerId} + > + {link.title} + + : + {link.title} + }
    • ))} diff --git a/src/components/Layout/index.js b/src/components/Layout/index.js index 47c3140..05ef05a 100644 --- a/src/components/Layout/index.js +++ b/src/components/Layout/index.js @@ -6,8 +6,7 @@ import CssBaseline from '@material-ui/core/CssBaseline'; import Grid from '@material-ui/core/Grid'; -// import Routes from '../Routes'; -import Home from '../Pages/Home'; +import Routes from '../Routes'; import Header from '../Common/Header'; import Footer from '../Common/Footer'; import SocialMedia from '../Common/SocialMedia'; @@ -23,7 +22,7 @@ const Layout = (props) => {
    - +
    diff --git a/src/components/Pages/About/index.jsx b/src/components/Pages/About/index.jsx deleted file mode 100644 index 94c45fb..0000000 --- a/src/components/Pages/About/index.jsx +++ /dev/null @@ -1,70 +0,0 @@ -import React from 'react'; -import Container from '@material-ui/core/Container'; - -const About = () => ( -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    About

    -

    About Me

    -

    - A small river named Duden flows by their place and supplies it - with the necessary regelialia. -

    -
      -
    • - Name: Clark Thompson -
      • -
    • - Date of birth: January 01, 1987 -
      • -
    • - Address:{' '} - San Francisco CA 97987 USA -
      • -
    • - Zip code: 1000 -
      • -
    • - Email: clarkthomp@gmail.com -
      • -
    • - Phone: +1-2234-5678-9-0 -
      • -
    -
    -
    -
    -
    -

    - - 0 - - Project complete -

    -
    -
    -
    -
    -
    -     -
    -); - -export default About; diff --git a/src/components/Pages/Contact/index.js b/src/components/Pages/Contact/index.js deleted file mode 100644 index b76f7ad..0000000 --- a/src/components/Pages/Contact/index.js +++ /dev/null @@ -1,112 +0,0 @@ -import React from 'react'; -import Container from '@material-ui/core/Container'; - -const Contact = () => ( -
    - -
    -
    -
    -

    Contact

    -

    Contact Me

    -

    - Far far away, behind the word mountains, far from the countries - Vokalia and Consonantia -

    -
    -
    - -
    -
    -
    -
    - -
    -

    Address

    -

    198 West 21th Street, Suite 721 New York NY 10016

    -
    -
    -
    -
    -
    - -
    -

    Contact Number

    -

    - + 1235 2355 98 -

    -
    -
    -
    -
    -
    - -
    -

    Email Address

    -

    - info@yoursite.com -

    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    - -
    -
    -
    -
    -
    -     -
    -); - -export default Contact; diff --git a/src/components/Pages/Experience/index.jsx b/src/components/Pages/Experience/index.jsx deleted file mode 100644 index c12a542..0000000 --- a/src/components/Pages/Experience/index.jsx +++ /dev/null @@ -1,100 +0,0 @@ -import React from 'react'; -import Container from '@material-ui/core/Container'; - -const Resume = () => ( -
    - -
    -
    -
    -

    Resume

    -

    Resume

    -

    - A small river named Duden flows by their place and supplies it - with the necessary regelialia. It is a paradisematic country, in - which roasted parts of sentences fly into your mouth. -

    -
    -
    -
    -
    -
    - 2014-2015 -

    Master Degree of Design

    - Cambridge University -

    - A small river named Duden flows by their place and supplies it - with the necessary regelialia. It is a paradisematic country, in - which roasted parts of sentences fly into your mouth. -

    -
    -
    - 2014-2015 -

    Bachelor's Degree of C.A

    - Cambridge University -

    - A small river named Duden flows by their place and supplies it - with the necessary regelialia. It is a paradisematic country, in - which roasted parts of sentences fly into your mouth. -

    -
    -
    - 2014-2015 -

    Diploma in Computer

    - Cambridge University -

    - A small river named Duden flows by their place and supplies it - with the necessary regelialia. It is a paradisematic country, in - which roasted parts of sentences fly into your mouth. -

    -
    -
    - -
    -
    - 2014-2015 -

    Art & Creative Director

    - Cambridge University -

    - A small river named Duden flows by their place and supplies it - with the necessary regelialia. It is a paradisematic country, in - which roasted parts of sentences fly into your mouth. -

    -
    -
    - 2014-2015 -

    Wordpress Developer

    - Cambridge University -

    - A small river named Duden flows by their place and supplies it - with the necessary regelialia. It is a paradisematic country, in - which roasted parts of sentences fly into your mouth. -

    -
    -
    - 2017-2018 -

    UI/UX Designer

    - Cambridge University -

    - A small river named Duden flows by their place and supplies it - with the necessary regelialia. It is a paradisematic country, in - which roasted parts of sentences fly into your mouth. -

    -
    -
    -
    -
    - -
    -
    -     -
    -); - -export default Resume; diff --git a/src/components/Pages/Hireme/index.jsx b/src/components/Pages/Hireme/index.jsx deleted file mode 100644 index e2ec59d..0000000 --- a/src/components/Pages/Hireme/index.jsx +++ /dev/null @@ -1,32 +0,0 @@ -import React from 'react'; - -const Hireme = () => ( -
    -
    -
    -
    -

    - I'm Available for freelancing -

    -

    - A small river named Duden flows by their place and supplies it with - the necessary regelialia. -

    -

    - - Hire me - -

    -
    -
    -
    -
    -); - -export default Hireme; diff --git a/src/components/Pages/Projects/index.js b/src/components/Pages/Projects/index.js deleted file mode 100644 index 2a14803..0000000 --- a/src/components/Pages/Projects/index.js +++ /dev/null @@ -1,101 +0,0 @@ -import React from 'react'; -import Container from '@material-ui/core/Container'; - -const Projects = () => ( -
    - -
    -
    -
    -

    Projects

    -

    Our Projects

    -

    - Far far away, behind the word mountains, far from the countries - Vokalia and Consonantia -

    -
    -
    -
    -
    -
    -
    -
    -

    Branding & Illustration Design

    - Web Design -
    -
    -
    -
    -
    -
    -
    -

    Branding & Illustration Design

    - Web Design -
    -
    -
    - -
    -
    -
    -
    -

    Branding & Illustration Design

    - Web Design -
    -
    - -
    -
    -
    -

    Branding & Illustration Design

    - Web Design -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Branding & Illustration Design

    - Web Design -
    -
    -
    -
    -
    -
    -
    -

    Branding & Illustration Design

    - Web Design -
    -
    -
    -
    -
    -
    -
    -     -
    -); - -export default Projects; diff --git a/src/components/Pages/Skills/index.jsx b/src/components/Pages/Skills/index.jsx deleted file mode 100644 index 9e58e7e..0000000 --- a/src/components/Pages/Skills/index.jsx +++ /dev/null @@ -1,127 +0,0 @@ -import React from 'react'; -import Container from '@material-ui/core/Container'; - -const Skills = () => ( -
    - -
    -
    -
    -

    Skills

    -

    My Skills

    -

    - Far far away, behind the word mountains, far from the countries - Vokalia and Consonantia -

    -
    -
    -
    -
    -
    -

    Photoshop

    -
    -
    - 90% -
    -
    -
    -
    -
    -
    -

    jQuery

    -
    -
    - 85% -
    -
    -
    -
    -
    -
    -

    HTML5

    -
    -
    - 95% -
    -
    -
    -
    -
    -
    -

    CSS3

    -
    -
    - 90% -
    -
    -
    -
    -
    -
    -

    WordPress

    -
    -
    - 70% -
    -
    -
    -
    -
    -
    -

    SEO

    -
    -
    - 80% -
    -
    -
    -
    -
    -
    -     -
    -); - -export default Skills; diff --git a/src/components/Routes/index.js b/src/components/Routes/index.js index f6c995d..47aeb09 100644 --- a/src/components/Routes/index.js +++ b/src/components/Routes/index.js @@ -2,28 +2,14 @@ import React, { Component } from 'react'; import { Route } from 'react-router'; import Home from '../Pages/Home'; -import About from '../Pages/About'; import Blog from '../Pages/Blog'; -import Contact from '../Pages/Contact'; -import Counter from '../Common/Counter'; -import Hireme from '../Pages/Hireme'; -import Projects from '../Pages/Projects'; -import Experience from '../Pages/Experience'; -import Skills from '../Pages/Skills'; class Routes extends Component { render() { return ( - - - - - - - ); } From b6b4320052e780a91a52fa57d423e705a71ebde8 Mon Sep 17 00:00:00 2001 From: Efrain Villanueva Date: Wed, 26 May 2021 18:31:04 -0500 Subject: [PATCH 2/2] Create blog Create blog stream Create post template Configured multiple route Add README file to explain WHAT IS HAPPENING AAdapt links to use react scroll and react router --- .prettierrc | 8 + package.json | 2 +- src/assets/images/efra_avatar.gif | Bin 0 -> 17076 bytes src/components/Common/Links/index.js | 168 ++++++------ src/components/Layout/index.js | 34 +-- src/components/Pages/Blog/EntriesSkelleton.js | 63 +++++ src/components/Pages/Blog/README.md | 3 + src/components/Pages/Blog/index.js | 75 +----- src/components/Pages/Blog/styles.js | 9 +- src/components/Pages/Home/AboutSection.js | 219 ++++++++-------- src/components/Pages/Home/ContactSection.js | 72 ++--- src/components/Pages/Home/HeroSection.js | 80 +++--- src/components/Pages/Home/ProjectsSection.js | 242 +++++++++-------- src/components/Pages/Home/WorkedSection.js | 248 ++++++++++-------- src/components/Pages/Home/index.js | 41 ++- src/components/Pages/Post/Footer.js | 30 +++ src/components/Pages/Post/Header.js | 37 +++ src/components/Pages/Post/index.js | 45 ++++ src/components/Pages/Post/styles.js | 63 +++++ src/components/Routes/index.js | 19 +- src/constants/blogEntries.js | 180 +++++++++++++ yarn.lock | 8 +- 22 files changed, 1062 insertions(+), 584 deletions(-) create mode 100644 .prettierrc create mode 100644 src/assets/images/efra_avatar.gif create mode 100644 src/components/Pages/Blog/EntriesSkelleton.js create mode 100644 src/components/Pages/Blog/README.md create mode 100644 src/components/Pages/Post/Footer.js create mode 100644 src/components/Pages/Post/Header.js create mode 100644 src/components/Pages/Post/index.js create mode 100644 src/components/Pages/Post/styles.js create mode 100644 src/constants/blogEntries.js diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..9bdf4a6 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,8 @@ +{ + "semi": true, + "trailingComma": "all", + "singleQuote": true, + "tabWidth": 2, + "useTabs": false, + "printWidth": 70 +} diff --git a/package.json b/package.json index 6e139a1..2cb79da 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "dependencies": { "@babel/core": "7.9.0", "@material-ui/core": "^4.11.0", - "@material-ui/icons": "^4.9.1", + "@material-ui/icons": "^4.11.2", "@material-ui/lab": "^4.0.0-alpha.56", "@material-ui/styles": "^4.10.0", "@svgr/webpack": "4.3.3", diff --git a/src/assets/images/efra_avatar.gif b/src/assets/images/efra_avatar.gif new file mode 100644 index 0000000000000000000000000000000000000000..bbe168b98ada4d6830ade373296443c791a44673 GIT binary patch literal 17076 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 literal 0 HcmV?d00001 diff --git a/src/components/Common/Links/index.js b/src/components/Common/Links/index.js index 748906f..5cfd200 100644 --- a/src/components/Common/Links/index.js +++ b/src/components/Common/Links/index.js @@ -1,8 +1,6 @@ import React from 'react'; import { Link as Anchor } from 'react-scroll'; -import { - Link -} from "react-router-dom"; +import { Link, useLocation } from 'react-router-dom'; import withWidth, { isWidthDown } from '@material-ui/core/withWidth'; import IconButton from '@material-ui/core/IconButton'; @@ -10,83 +8,99 @@ import CloseIcon from '@material-ui/icons/Close'; import useStyles from './styles'; -const Links = (props) => { - const classes = useStyles(); +const Links = ({ behaviourHandler, opened, width }) => { + const classes = useStyles(); - const menuBehaviour = props.opened ? 'open' : ''; + const menuBehaviour = opened ? 'open' : ''; - const linksData = [ - { - props: { - props: { - link: '/blog' - }, - title: 'Blog' - } - }, - { - props: { - containerId: 'homeAboutSection', - }, - title: 'About', - }, - { - props: { - containerId: 'homeWorkedSection', - }, - title: 'Experience', - }, - { - props: { - containerId: 'homeProjectsSection', - }, - title: 'Projects', - }, - { - props: { - containerId: 'homeContactSection', - }, - title: 'Contact', - }, - ]; + const linksData = [ + { + props: { + link: '/blog', + }, + title: 'Blog', + }, + { + props: { + containerId: 'homeAboutSection', + }, + title: 'About', + }, + { + props: { + containerId: 'homeWorkedSection', + }, + title: 'Experience', + }, + { + props: { + containerId: 'homeProjectsSection', + }, + title: 'Projects', + }, + { + props: { + containerId: 'homeContactSection', + }, + title: 'Contact', + }, + ]; - return ( - - - - ); + return ( + <> + + + ); +}; + +const AppLink = (link, behaviourHandler) => { + const { pathname } = useLocation(); + + return pathname !== '/' ? ( + link.props.containerId ? ( + + {link.title} + + ) : ( + {link.title} + ) + ) : !link.props.containerId ? ( + {link.title} + ) : ( + behaviourHandler(false)} + smooth={true} + spy={true} + to={link.props.containerId} + > + {link.title} + + ); }; export default withWidth()(Links); diff --git a/src/components/Layout/index.js b/src/components/Layout/index.js index 05ef05a..c300480 100644 --- a/src/components/Layout/index.js +++ b/src/components/Layout/index.js @@ -1,11 +1,9 @@ import React from 'react'; -import { BrowserRouter } from 'react-router-dom'; +import { BrowserRouter, Switch } from 'react-router-dom'; import { ThemeProvider } from '@material-ui/core/styles'; import withWidth, { isWidthDown } from '@material-ui/core/withWidth'; import CssBaseline from '@material-ui/core/CssBaseline'; -import Grid from '@material-ui/core/Grid'; - import Routes from '../Routes'; import Header from '../Common/Header'; import Footer from '../Common/Footer'; @@ -14,23 +12,19 @@ import SocialMedia from '../Common/SocialMedia'; import { darkTheme } from './styles'; const Layout = (props) => { - return ( - - - -
    -
    - - - - - -
    -