Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency rebuild #45

Merged
merged 4 commits into from
Mar 31, 2021
Merged

Dependency rebuild #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83bc340
hard bump of dependencies
ADMARIl Mar 31, 2021
765df31
Updated core information
ADMARIl Mar 31, 2021
cc62801
Rolled back styled-components to 5.2.1 due to bug
ADMARIl Mar 31, 2021
84fe6b6
Merge branch 'master' into dependency-rebuild
ADMARIl Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions content/coursework/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ skills:
- Software Engineering
- Database Management Systems
- Graphics for Games (Unreal)
- Computer Vision
- Data Science
---

Here are some of my classes so far:
Binary file added content/hero/AndrewHeadshot2-old.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified content/hero/AndrewHeadshot2.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 37 additions & 44 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,64 +19,57 @@
"serve": "gatsby serve",
"clean": "gatsby clean"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.{js,css,json,md}": [
"prettier --write",
"git add"
],
"*.js": [
"eslint --fix",
"git add"
]
"*.js": "eslint --cache --fix",
"*.{js,jsx,json,md}": "prettier --write"
},
"dependencies": {
"animejs": "^3.1.0",
"babel-plugin-styled-components": "^1.10.6",
"gatsby": "^3.0.4",
"gatsby-image": "^3.0.0",
"gatsby-plugin-dark-mode": "^1.1.0",
"gatsby-plugin-google-analytics": "^3.0.0",
"gatsby-plugin-manifest": "^3.0.0",
"gatsby-plugin-netlify": "^3.0.0",
"gatsby-plugin-offline": "^3.0.27",
"gatsby-plugin-react-helmet": "^4.0.0",
"gatsby-plugin-robots-txt": "^1.5.0",
"gatsby-plugin-sharp": "^2.3.5",
"gatsby-plugin-sitemap": "^3.0.0",
"gatsby-plugin-styled-components": "^3.1.14",
"animejs": "^3.2.1",
"babel-plugin-styled-components": "^1.12.0",
"gatsby": "^3.2.0",
"gatsby-image": "^3.2.0",
"gatsby-plugin-dark-mode": "^1.1.2",
"gatsby-plugin-google-analytics": "^3.2.0",
"gatsby-plugin-manifest": "^3.2.0",
"gatsby-plugin-netlify": "^3.2.0",
"gatsby-plugin-offline": "^4.2.0",
"gatsby-plugin-react-helmet": "^4.2.0",
"gatsby-plugin-robots-txt": "^1.5.5",
"gatsby-plugin-sharp": "^3.2.0",
"gatsby-plugin-sitemap": "^3.2.0",
"gatsby-plugin-styled-components": "^4.2.0",
"gatsby-remark-external-links": "0.0.4",
"gatsby-remark-images": "^4.0.0",
"gatsby-remark-prismjs": "^3.3.25",
"gatsby-source-filesystem": "^3.0.0",
"gatsby-transformer-remark": "^3.0.0",
"gatsby-transformer-sharp": "^2.3.7",
"lodash": "^4.17.15",
"prismjs": "^1.17.1",
"gatsby-remark-images": "^4.2.0",
"gatsby-remark-prismjs": "^4.2.0",
"gatsby-source-filesystem": "^3.2.0",
"gatsby-transformer-remark": "^3.2.0",
"gatsby-transformer-sharp": "^3.2.0",
"lodash": "^4.17.21",
"prismjs": "^1.23.0",
"prop-types": "^15.7.2",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
"react-transition-group": "^4.3.0",
"scrollreveal": "^4.0.5",
"smooth-scroll": "^16.1.0",
"styled-components": "^5.2.1"
"react-transition-group": "^4.4.1",
"scrollreveal": "^4.0.9",
"smooth-scroll": "^16.1.3",
"styled-components": "5.2.1"
},
"devDependencies": {
"@upstatement/eslint-config": "0.4.3",
"@upstatement/eslint-config": "^0.4.3",
"@upstatement/prettier-config": "^0.3.0",
"babel-eslint": "^10.0.3",
"eslint": "^7.12.1",
"eslint-config-prettier": "^6.7.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.17.0",
"eslint": "^7.23.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.23.1",
"gatsby-remark-code-titles": "^1.1.0",
"husky": "^5.1.3",
"lint-staged": "^10.5.1",
"prettier": "^2.1.2"
"lint-staged": "^10.5.4",
"prettier": "^2.2.1",
"simple-git-hooks": "^2.2.0"
}
}
60 changes: 27 additions & 33 deletions src/components/nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@ import { Link } from 'gatsby';
import Helmet from 'react-helmet';
import PropTypes from 'prop-types';
import { CSSTransition, TransitionGroup } from 'react-transition-group';
import { ThemeToggler } from 'gatsby-plugin-dark-mode';
import { throttle } from '@utils';
import { navLinks, navHeight } from '@config';
import { navHeight, navLinks } from '@config';
import { Menu } from '@components';
import { IconLogo } from '@components/icons';
import styled from 'styled-components';
import styles from './toggle.module.css';
import { theme, mixins, media } from '@styles';
import { media, mixins, theme } from '@styles';

const { colors, fontSizes, fonts } = theme;

const StyledContainer = styled.header`
${mixins.flexBetween};
position: fixed;
top: 0;
padding: 0px 50px;
padding: 0 50px;
background-color: ${colors.mapDarkBlue};
transition: ${theme.transition};
z-index: 11;
Expand All @@ -28,15 +27,10 @@ const StyledContainer = styled.header`
height: ${props => (props.scrollDirection === 'none' ? theme.navHeight : theme.navScrollHeight)};
box-shadow: ${props =>
props.scrollDirection === 'up' ? `0 10px 30px -10px ${colors.shadowNavy}` : 'none'};
transform: translateY(
${props => (props.scrollDirection === 'down' ? `-${theme.navScrollHeight}` : '0px')}
);
transform: translateY(${props => (props.scrollDirection === 'down' ? `-${theme.navScrollHeight}` : '0px')});
${media.desktop`padding: 0 40px;`};
${media.tablet`padding: 0 25px;`};
`;
const ToggleContainer = styled.div`
padding: 0px 0px 0px 20px;
`;
const StyledNav = styled.nav`
${mixins.flexBetween};
position: relative;
Expand Down Expand Up @@ -311,28 +305,28 @@ class Nav extends Component {
</StyledLink>
</StyledNav>

<ToggleContainer>
<CSSTransition classNames={fadeClass} timeout={timeout}>
<ThemeToggler>
{({ theme, toggleTheme }) => (
<label>
<input
type="checkbox"
onChange={e => toggleTheme(e.target.checked ? 'light' : 'dark')}
checked={theme === 'light'}
hidden
/>
{theme === 'light' ? (
<div className={styles.on} />
) : (
<div className={styles.off} />
)}
</label>
)}
</ThemeToggler>
</CSSTransition>
</ToggleContainer>
<Menu menuOpen={menuOpen} toggleMenu={this.toggleMenu} />
{/*<ToggleContainer>*/}
{/* <CSSTransition classNames={fadeClass} timeout={timeout}>*/}
{/* <ThemeToggler>*/}
{/* {({ theme, toggleTheme }) => (*/}
{/* <label>*/}
{/* <input*/}
{/* type="checkbox"*/}
{/* onChange={e => toggleTheme(e.target.checked ? 'light' : 'dark')}*/}
{/* checked={theme === 'light'}*/}
{/* hidden*/}
{/* />*/}
{/* {theme === 'light' ? (*/}
{/* <div className={styles.on} />*/}
{/* ) : (*/}
{/* <div className={styles.off} />*/}
{/* )}*/}
{/* </label>*/}
{/* )}*/}
{/* </ThemeToggler>*/}
{/* </CSSTransition>*/}
{/*</ToggleContainer>*/}
<Menu menuOpen={menuOpen} toggleMenu={this.toggleMenu}/>
</StyledContainer>
);
}
Expand Down
Binary file modified static/resume.pdf
View file
Open in desktop
Binary file not shown.