Skip to content

Commit

Permalink
Update links
Browse files Browse the repository at this point in the history
  • Loading branch information
BrychanOdlum committed Jan 29, 2019
1 parent d46b10e commit 411461f
Show file tree
Hide file tree
Showing 18 changed files with 1,039 additions and 2,233 deletions.
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"jsx-a11y/no-static-element-interactions": false,
"jsx-a11y/click-events-have-key-events": false,
"react/forbid-prop-types": false,
"react/button-has-type": false,
"react/destructuring-assignment": false,
"jsx-a11y/anchor-is-valid": false
},
Expand Down
10 changes: 10 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"react": "^16.6.3",
"react-dom": "^16.6.3",
"react-router-dom": "^4.3.1",
"sass-loader": "^7.1.0"
"sass-loader": "^7.1.0",
"webpack-loader": "^0.0.1"
},
"scripts": {
"start": "encore dev-server --hot --port 8081",
Expand Down
Binary file added src/app/assets/files/resume.pdf
Binary file not shown.
17 changes: 17 additions & 0 deletions src/app/assets/styles/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,23 @@ body {
font-weight: 300;
background: $background_color;
color: $text_color;

animation: bodyLoadAnimation ease-out 0.35s;
transition: opacity 0.05s;


@keyframes bodyLoadAnimation {
0% {
// transform: translateX(-100%);
opacity: 0;
filter: blur(100px);
}
100% {
// transform: translateX(0);
filter: blur(0px);
opacity: 1;
}
}
}

a {
Expand Down
18 changes: 18 additions & 0 deletions src/app/views/components/Button/Button.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react';
import PropTypes from 'prop-types';

import classes from './Button.scss';

function Button({ children, ...props }) {
return (
<a className={classes.button} {...props}>
{children}
</a>
);
}

Button.propTypes = {
children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired,
};

export default Button;
23 changes: 23 additions & 0 deletions src/app/views/components/Button/Button.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@import '../../../assets/styles/common';

.button {
-webkit-appearance: none;
background: none;
border: solid 1px #00c4ff;
padding: 10px 15px;
color: #00c4ff;
font-size: 14px;
font-family: 'Fira Mono', monospace;
cursor: pointer;
margin: 0;

&:hover {
background: #00c4ff;
color: $background_color;
}

&:active {
margin-top: 1px;
margin-bottom: -1px;
}
}
8 changes: 4 additions & 4 deletions src/app/views/components/Header/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ export default function Header() {
</li>
</ul>
<ul className={cx(classes.navMenu, classes.pullRight, classes.arrayStyle)}>
<li><a href="#">About</a></li>
<li><a href="#">Experience</a></li>
<li><a href="#">Projects</a></li>
<li><a href="#">Get in touch</a></li>
<li><a href="#about">About</a></li>
<li><a href="#experience">Experience</a></li>
<li><a href="#projects">Projects</a></li>
<li><a href="#contact">Get in touch</a></li>
</ul>
</nav>
);
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/pages/landing/Sections/About/About.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Title from '../../../../components/Title/Title';

export default function About() {
return (
<section className={classes.about}>
<section className={classes.about} id={'about'}>
<Title title={'😊 A little bit about me.'} alignLeft />

<div className={classes.windowContainer}>
Expand Down
4 changes: 2 additions & 2 deletions src/app/views/pages/landing/Sections/Contact/Contact.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Title from '../../../../components/Title/Title';

export default function Contact() {
return (
<section className={classes.contact}>
<section className={classes.contact} id={'contact'}>
<Title title={'📨 Get in touch with me.'} alignRight />

<div className={classes.contactDetails}>
Expand All @@ -18,7 +18,7 @@ export default function Contact() {
I will soon be seeking employment opportunities for when I graduate in June 2020.
</p>

<a href={'mailto:[email protected]'} target={'_blank'}>
<a href={'mailto:[email protected]'}>
<button>Say hello!</button>
</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Settings from '../../../../../settings';

export default function Experience() {
return (
<section className={classes.experience}>
<section className={classes.experience} id={'experience'}>
<Title title={'💼 Some of my experience.'} alignRight />
<Tabs>
{Settings.experience.map(e => (
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/pages/landing/Sections/Projects/Projects.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Settings from '../../../../../settings';

export default function Projects() {
return (
<section className={classes.projects}>
<section className={classes.projects} id={'projects'}>
<Title title={"🛠 A few projects I've worked on."} alignLeft />

{Settings.projects.map((project, i) => (
Expand Down
13 changes: 9 additions & 4 deletions src/app/views/pages/landing/Sections/Splash/Splash.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import React, { Component } from 'react';

import classes from './Splash.scss';
import Settings from '../../../../../settings';
import Button from '../../../../components/Button/Button';

import Resume from '../../../../../assets/files/resume.pdf';

export default class Splash extends Component {
constructor(props) {
Expand Down Expand Up @@ -52,12 +55,14 @@ export default class Splash extends Component {

<p dangerouslySetInnerHTML={{ __html: Settings.biography }} />

<br/>
<br/>
<br />
<br />

<div className={classes.actionButtons}>
<button onClick="">Get in touch</button>
<button onClick="">Grab my résumé</button>
<Button href={'mailto:[email protected]'}>Get in touch</Button>
<Button href={Resume} target={'_blank'}>
Grab my résumé
</Button>
</div>
</div>
</section>
Expand Down
20 changes: 2 additions & 18 deletions src/app/views/pages/landing/Sections/Splash/Splash.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@

.identityContainer {
display: inline-block;
z-index: -1;
padding: 30px;
margin-top: 50px;
margin-left: 10%;
font-weight: 500;
text-align: left;
animation: identityContainerAnimation ease-out 0.25s;
transition: opacity 0.05s;

> h1, > h2, > h3 {
margin: 0;
Expand Down Expand Up @@ -60,24 +57,11 @@
.actionButtons {
margin-left: -5px;

button {
button, a {
white-space: nowrap;
margin: 5px 5px;
}
}


@keyframes identityContainerAnimation {
0% {
transform: translateX(-100%);
opacity: 0;
filter: blur(100px);
}
100% {
transform: translateX(0);
filter: blur(0px);
opacity: 1;
}
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/views/pages/landing/SocialBars/SocialBars.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function SocialBars() {
</div>
<div className={cx(classes.bottomSocial, classes.right, classes.text)}>
<p>
<a href={'mailto:[email protected]'} target={'_blank'}>[email protected]</a>
<a href={'mailto:[email protected]'}>[email protected]</a>
</p>
</div>
</>
Expand Down
6 changes: 6 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ Encore.setOutputPath('build/')
config.localIdentName = '[name]__[local]--[sha1:hash:hex:4]';
}
})
.addLoader(
{
test: /\.(pdf|zip)$/,
use: 'file-loader?name=[path][name].[ext]',
}
)
.enableReactPreset()
.enableSassLoader();

Expand Down
Loading

0 comments on commit 411461f

Please sign in to comment.