Skip to content

Commit

Permalink
πŸ”€ Merge pull request #229 from alexlee-dev/update
Browse files Browse the repository at this point in the history
πŸš€ Upgrade Portfolio
  • Loading branch information
actuallyReallyAlex committed Jun 29, 2019
2 parents 17a4981 + 90226f6 commit 6e69c3c
Show file tree
Hide file tree
Showing 103 changed files with 2,665 additions and 2,470 deletions.
5 changes: 1 addition & 4 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"presets": [
"@babel/preset-env",
"@babel/preset-react"
]
"presets": ["@babel/preset-env", "@babel/preset-react"]
}
8 changes: 0 additions & 8 deletions .eslintrc.json

This file was deleted.

15 changes: 6 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
# /build
/build

# misc
.DS_Store
Expand All @@ -20,10 +22,5 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

.env

\.docz/app/

\.docz/cache/

build/
# use of npm
package-lock.json
8 changes: 4 additions & 4 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"useTabs": false,
"singleQuote": true,
"semi": false
}
"useTabs": false,
"singleQuote": true,
"semi": false
}
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: node_js
node_js:
- 'node'
script:
- yarn build
- yarn run test:coveralls
11 changes: 11 additions & 0 deletions colors.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!--?xml version="1.0" encoding="UTF-8"?-->
<resources>
<color name="primaryColor">#42a5f5</color>
<color name="primaryLightColor">#80d6ff</color>
<color name="primaryDarkColor">#0077c2</color>
<color name="secondaryColor">#ffeb3b</color>
<color name="secondaryLightColor">#ffff72</color>
<color name="secondaryDarkColor">#c8b900</color>
<color name="primaryTextColor">#000000</color>
<color name="secondaryTextColor">#000000</color>
</resources>
69 changes: 41 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,46 @@
{
"name": "alexlee-dev-portfolio",
"description": "Alex Lee's online portfolio. Built with React.",
"description": "Alex Lee's portfolio. Built with React.",
"version": "2.1.0",
"dependencies": {
"@sentry/browser": "^5.0.3",
"fg-loadcss": "^2.0.1",
"grommet": "^2.7.0",
"lodash.capitalize": "^4.2.1",
"react": "^16.5.2",
"react-device-detect": "^1.6.1",
"react-dom": "^16.5.2",
"react-scripts": "^3.0.1",
"@sanity/client": "^0.141.1",
"@sentry/browser": "^5.4.3",
"grommet": "^2.7.1",
"grommet-icons": "^4.2.0",
"logrocket": "^1.0.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-intersection-observer": "^8.23.0",
"react-scripts": "3.0.1",
"react-tilt": "^0.1.4",
"styled-components": "^4.2.1"
"styled-components": "^4.3.2"
},
"devDependencies": {
"ajv": "^6.5.4",
"eslint-config-standard": "^12.0.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-node": "^9.1.0",
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-react": "^7.11.1",
"eslint-plugin-standard": "^4.0.0"
"coveralls": "^3.0.4",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "jest",
"test:watch": "jest --watchAll",
"test:coveralls": "jest --coverage --collectCoverageFrom=src/**/*.js --collectCoverageFrom=!src/index.js --collectCoverageFrom=!src/serviceWorker.js --collectCoverageFrom=!src/hooks/**/* --collectCoverageFrom=!src/setupTests.js --coverageReporters=text-lcov | coveralls"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"files": [
"public",
Expand All @@ -30,11 +49,6 @@
"README.md",
"CHANGELOG.md"
],
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "CI=true react-scripts test --env=jsdom"
},
"repository": {
"type": "git",
"url": "git+https://github.com/alexlee-dev/portfolio.git"
Expand All @@ -49,10 +63,9 @@
],
"author": "Alex Lee <alexlee-dev>",
"license": "GPL-3.0",
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
]
"jest": {
"setupFilesAfterEnv": [
"./src/setupTests.js"
]
}
}
15 changes: 0 additions & 15 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,7 @@

gtag('config', 'UA-124507483-3')
</script>

<!-- Grommet CSS -->
<!--
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/grommet/1.11.0/grommet.min.css"
/>
-->
<link
rel="preload"
href="https://cdnjs.cloudflare.com/ajax/libs/grommet/1.11.0/grommet.min.css"
as="style"
onload="this.onload=null;this.rel='stylesheet'"
/>
</head>

<body>
<noscript> You need to enable JavaScript to run this app. </noscript>
<div id="root"></div>
Expand Down
46 changes: 46 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import React, { Fragment } from 'react'
import { Grommet, grommet, ResponsiveContext } from 'grommet'
import Nav from './components/Nav'
import Intro from './components/Intro'
import About from './components/About'
import Resume from './components/Resume'
import Portfolio from './components/Portfolio'
import Contact from './components/Contact'
import Footer from './components/Footer'
import { useInView } from 'react-intersection-observer'

const App = () => {
const [introRef, isIntroInView] = useInView()
const [aboutRef, isAboutInView] = useInView()
const [resumeRef, isResumeInView] = useInView()
const [portfolioRef, isPortfolioInView] = useInView()
const [contactRef, isContactInView] = useInView()

const views = [
{ title: 'Home', isInView: isIntroInView },
{ title: 'About', isInView: isAboutInView },
{ title: 'RΓ©sumΓ©', isInView: isResumeInView },
{ title: 'Portfolio', isInView: isPortfolioInView },
{ title: 'Contact', isInView: isContactInView }
]

return (
<Grommet full theme={grommet}>
<ResponsiveContext.Consumer>
{size => (
<Fragment>
<Nav size={size} views={views} />
<Intro navRef={introRef} size={size} />
<About navRef={aboutRef} size={size} />
<Resume navRef={resumeRef} size={size} />
<Portfolio navRef={portfolioRef} size={size} />
<Contact navRef={contactRef} size={size} />
<Footer size={size} />
</Fragment>
)}
</ResponsiveContext.Consumer>
</Grommet>
)
}

export default App
22 changes: 0 additions & 22 deletions src/ErrorBoundary.js

This file was deleted.

32 changes: 0 additions & 32 deletions src/Site.js

This file was deleted.

Binary file removed src/assets/Resume.pdf
Binary file not shown.
42 changes: 42 additions & 0 deletions src/components/About/InfoList.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import React from 'react'
import PropTypes from 'prop-types'
import { Box, Heading, Paragraph, Text } from 'grommet'
import { info, sections } from '../../config.json'

const about = sections.find(({ title }) => title === 'About')

const InfoList = ({ size }) => (
<Box
align="start"
direction={size === 'small' ? 'column' : 'row'}
fill="horizontal"
gap={size === 'small' ? 'medium' : 'xlarge'}
justify="center"
margin={{ vertical: 'large' }}
>
<Box>
<Heading level="3">Profile</Heading>
<Paragraph>{about.profile}</Paragraph>
</Box>
<Box>
<Heading className="uppercase" level="3" margin="none">
Name:
</Heading>
<Text margin={{ bottom: 'small' }}>{info.name}</Text>
<Heading className="uppercase" level="3" margin="none">
Occupation:
</Heading>
<Text margin={{ bottom: 'small' }}>{info.occupation}</Text>
<Heading className="uppercase" level="3" margin="none">
Email:
</Heading>
<Text>{info.email}</Text>
</Box>
</Box>
)

InfoList.propTypes = {
size: PropTypes.string.isRequired
}

export default InfoList
19 changes: 19 additions & 0 deletions src/components/About/SkillBox.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react'
import PropTypes from 'prop-types'
import { Box, Heading } from 'grommet'

const SkillBox = ({ color, title }) => (
<Box align="center" direction="row" gap="small" justify="start">
<Box background={color} height="10px" width="10px" />
<Heading level="4" margin="none">
{title}
</Heading>
</Box>
)

SkillBox.propTypes = {
color: PropTypes.string.isRequired,
title: PropTypes.string.isRequired
}

export default SkillBox
Loading

0 comments on commit 6e69c3c

Please sign in to comment.