diff --git a/app/FullPage.js b/app/FullPage.js deleted file mode 100644 index ad37036a2c..0000000000 --- a/app/FullPage.js +++ /dev/null @@ -1,27 +0,0 @@ -import React, { PropTypes } from 'react'; -import Helmet from 'react-helmet'; - -import Header from './components/Template/Header'; - -const FullPage = ({ children }) => ( -
- -
-
- {children} -
-
-); - -FullPage.propTypes = { - children: PropTypes.oneOfType([ - PropTypes.arrayOf(PropTypes.node), - PropTypes.node, - ]), -}; - -FullPage.defaultProps = { - children: null, -}; - -export default FullPage; diff --git a/app/data/about.md b/app/data/about.md index 13882a59c8..711565fe82 100644 --- a/app/data/about.md +++ b/app/data/about.md @@ -75,4 +75,4 @@ Palo Alto, Mountain View, San Francisco, Seattle, and New York. - always finding inspiration. - enabling a brighter future. - doing better. -- no one checking my commit history for early drafts of this branch. +- no one checking my commit history for early drafts of this file. diff --git a/app/main.js b/app/entry.js similarity index 89% rename from app/main.js rename to app/entry.js index 4f2a1bb3c4..daa8a0a312 100644 --- a/app/main.js +++ b/app/entry.js @@ -3,8 +3,8 @@ import ReactDOM from 'react-dom'; import { Router, Route, IndexRoute, browserHistory } from 'react-router'; import ReactGA from 'react-ga'; -import App from './App'; -import FullPage from './FullPage'; +// Layouts +import Main from './layouts/Main'; import Index from './pages/Index'; import About from './pages/About'; @@ -34,7 +34,7 @@ require('../public/css/main.scss'); ReactDOM.render( - + @@ -42,7 +42,8 @@ ReactDOM.render( - + + (
{props.children}
)}> diff --git a/app/App.js b/app/layouts/Main.js similarity index 55% rename from app/App.js rename to app/layouts/Main.js index 54340e6eeb..d0203cfb61 100644 --- a/app/App.js +++ b/app/layouts/Main.js @@ -1,29 +1,31 @@ import React, { PropTypes } from 'react'; import Helmet from 'react-helmet'; -import Header from './components/Template/Header'; -import Nav from './components/Template/Nav'; +import Header from '../components/Template/Header'; +import Nav from '../components/Template/Nav'; -const App = ({ children }) => ( +const Main = props => (
- {children} + {props.children}
-
); -App.propTypes = { +Main.propTypes = { children: PropTypes.oneOfType([ PropTypes.arrayOf(PropTypes.node), PropTypes.node, ]), + fullPage: PropTypes.boolean, }; -App.defaultProps = { +Main.defaultProps = { children: null, + fullPage: false, }; -export default App; +export default Main; diff --git a/public/css/main.scss b/public/css/main.scss index 72ad0b1ea5..b19b407bc8 100644 --- a/public/css/main.scss +++ b/public/css/main.scss @@ -59,10 +59,10 @@ @import 'layout/footer'; @import 'layout/menu'; - @import 'layout/about'; - @import 'layout/resume'; - @import 'layout/skills'; - @import 'layout/stats'; - @import 'layout/contact'; - @import 'layout/music'; - @import 'layout/notFound'; + @import 'pages/about'; + @import 'pages/contact'; + @import 'pages/music'; + @import 'pages/notFound'; + @import 'pages/resume'; + @import 'pages/skills'; + @import 'pages/stats'; diff --git a/public/css/layout/_about.scss b/public/css/pages/_about.scss similarity index 100% rename from public/css/layout/_about.scss rename to public/css/pages/_about.scss diff --git a/public/css/layout/_contact.scss b/public/css/pages/_contact.scss similarity index 100% rename from public/css/layout/_contact.scss rename to public/css/pages/_contact.scss diff --git a/public/css/layout/_music.scss b/public/css/pages/_music.scss similarity index 100% rename from public/css/layout/_music.scss rename to public/css/pages/_music.scss diff --git a/public/css/layout/_notFound.scss b/public/css/pages/_notFound.scss similarity index 100% rename from public/css/layout/_notFound.scss rename to public/css/pages/_notFound.scss diff --git a/public/css/layout/_resume.scss b/public/css/pages/_resume.scss similarity index 100% rename from public/css/layout/_resume.scss rename to public/css/pages/_resume.scss diff --git a/public/css/layout/_skills.scss b/public/css/pages/_skills.scss similarity index 100% rename from public/css/layout/_skills.scss rename to public/css/pages/_skills.scss diff --git a/public/css/layout/_stats.scss b/public/css/pages/_stats.scss similarity index 100% rename from public/css/layout/_stats.scss rename to public/css/pages/_stats.scss diff --git a/webpack/webpack.config.js b/webpack/webpack.config.js index 7ee4091675..828696f641 100644 --- a/webpack/webpack.config.js +++ b/webpack/webpack.config.js @@ -6,7 +6,7 @@ export default { devtool: 'eval-source-map', entry: [ 'webpack-hot-middleware/client?path=//localhost:7999/__webpack_hmr&reload=true', - path.join(__dirname, '../app/main.js'), + path.join(__dirname, '../app/entry.js'), ], output: { path: path.join(__dirname, '../dist/'), diff --git a/webpack/webpack.production.config.js b/webpack/webpack.production.config.js index 3f4729ad09..7613fc68ae 100644 --- a/webpack/webpack.production.config.js +++ b/webpack/webpack.production.config.js @@ -6,7 +6,7 @@ import StatsPlugin from 'stats-webpack-plugin'; export default { entry: [ - path.join(__dirname, '../app/main.js'), + path.join(__dirname, '../app/entry.js'), ], output: { path: path.join(__dirname, '../tmp/'), diff --git a/yarn.lock b/yarn.lock index fa1d12c099..62bcf2c9db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -222,13 +222,17 @@ async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" -async@0.2.9, async@0.2.x, async@~0.2.6, async@~0.2.9: +async@0.2.9: version "0.2.9" resolved "https://registry.yarnpkg.com/async/-/async-0.2.9.tgz#df63060fbf3d33286a76aaf6d55a2986d9ff8619" +async@0.2.x, async@~0.2.6, async@~0.2.9: + version "0.2.10" + resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" + async@^2.0.1, async@^2.1.2: - version "2.1.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4" + version "2.1.5" + resolved "https://registry.yarnpkg.com/async/-/async-2.1.5.tgz#e587c68580994ac67fc56ff86d3ac56bdbe810bc" dependencies: lodash "^4.14.0" @@ -1058,10 +1062,10 @@ browserify-zlib@^0.1.4: pako "~0.2.0" browserslist@^1.0.1, browserslist@^1.5.2, browserslist@^1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.3.tgz#25ead9c917b278ad668b83f39c8025697797b2ab" + version "1.7.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.4.tgz#56a12da876f787223743a866224ccd8f97014628" dependencies: - caniuse-db "^1.0.30000623" + caniuse-db "^1.0.30000624" electron-to-chromium "^1.2.2" buffer-shims@^1.0.0: @@ -1147,9 +1151,9 @@ caniuse-api@^1.5.2: lodash.memoize "^4.1.0" lodash.uniq "^4.3.0" -caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000623: - version "1.0.30000623" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000623.tgz#6e9dc4385d00a8f587efbb23fcbed7916f186e5d" +caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000623, caniuse-db@^1.0.30000624: + version "1.0.30000624" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000624.tgz#554b87547895e36f5fe128f4b7448a2ea5bf2213" caseless@~0.11.0: version "0.11.0" @@ -1663,13 +1667,13 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -debug@2, debug@2.6.1, debug@^2.1.1, debug@^2.2.0: +debug@2, debug@2.6.1, debug@^2.2.0: version "2.6.1" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351" dependencies: ms "0.7.2" -debug@2.2.0, debug@~2.2.0: +debug@2.2.0, debug@^2.1.1, debug@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" dependencies: @@ -2751,8 +2755,8 @@ html-entities@^1.2.0: resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.0.tgz#41948caf85ce82fed36e4e6a0ed371a6664379e2" html-minifier@^3.2.3: - version "3.3.1" - resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.3.1.tgz#dd38e60571537bf34a8171889c64fce73c45edad" + version "3.3.3" + resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.3.3.tgz#5e85516b2aff3c3fb9bda351879375868386d6f6" dependencies: camel-case "3.0.x" clean-css "4.0.x" @@ -3063,7 +3067,7 @@ is-plain-obj@^1.0.0: is-posix-bracket@^0.1.0: version "0.1.1" - resolved "http://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" + resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" is-primitive@^2.0.0: version "2.0.0" @@ -3078,8 +3082,10 @@ is-redirect@^1.0.0: resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" is-regex@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.3.tgz#0d55182bddf9f2fde278220aec3a75642c908637" + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" + dependencies: + has "^1.0.1" is-resolvable@^1.0.0: version "1.0.0" @@ -4339,8 +4345,8 @@ postcss-zindex@^2.0.1: uniqs "^2.0.0" postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.13: - version "5.2.13" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.13.tgz#1be52a32cf2ef58c0d75f1aedb3beabcf257cef3" + version "5.2.14" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.14.tgz#47b4fbde363fd4f81e547f7e0e43d6d300267330" dependencies: chalk "^1.1.3" js-base64 "^2.1.9" @@ -4518,13 +4524,13 @@ raw-loader@^0.5.1: resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" rc@^1.0.1, rc@~1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.6.tgz#43651b76b6ae53b5c802f1151fa3fc3b059969c9" + version "1.1.7" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.7.tgz#c5ea564bb07aff9fd3a5b32e906c1d3a65940fea" dependencies: deep-extend "~0.4.0" ini "~1.3.0" minimist "^1.2.0" - strip-json-comments "~1.0.4" + strip-json-comments "~2.0.1" react-burger-menu@^1.10.12: version "1.10.12" @@ -4701,8 +4707,8 @@ regenerate@^1.2.1: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260" regenerator-runtime@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz#257f41961ce44558b18f7814af48c17559f9faeb" + version "0.10.3" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e" regenerator-transform@0.9.8: version "0.9.8" @@ -4714,7 +4720,7 @@ regenerator-transform@0.9.8: regex-cache@^0.4.2: version "0.4.3" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" + resolved "http://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" dependencies: is-equal-shallow "^0.1.3" is-primitive "^2.0.0" @@ -4860,7 +4866,13 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.4.0, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4: +rimraf@2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.4.0, rimraf@^2.5.4: + version "2.6.0" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.0.tgz#89b8a0fe432b9ff9ec9a925a00b6cdb3a91bbada" + dependencies: + glob "^7.0.5" + +rimraf@~2.5.1, rimraf@~2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" dependencies: @@ -5200,10 +5212,6 @@ strip-json-comments@~0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-0.1.3.tgz#164c64e370a8a3cc00c9e01b539e569823f0ee54" -strip-json-comments@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91" - strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" @@ -5563,8 +5571,8 @@ watchpack@^1.2.0: graceful-fs "^4.1.2" webpack-dev-middleware@^1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.0.tgz#7d5be2651e692fddfafd8aaed177c16ff51f0eb8" + version "1.10.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz#c6b4cf428139cf1aefbe06a0c00fdb4f8da2f893" dependencies: memory-fs "~0.4.1" mime "^1.3.4"