diff --git a/.babelrc b/.babelrc index 02402a7..d2609ca 100644 --- a/.babelrc +++ b/.babelrc @@ -1,6 +1,17 @@ { - "presets": [ - "es2015", - "react" - ] + "presets":[ + "es2015", "react" + ], + "env": { + "development": { + "presets": ["es2015", "react", "stage-0"], + "plugins": ["transform-runtime"], + "presets": ["react-hmre"] + } + }, + "env": { + "build": { + "presets": ["es2015", "react", "stage-0"] + } + } } diff --git a/.gitignore b/.gitignore index 5148e52..4ebbd48 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1,4 @@ -# Logs -logs -*.log -npm-debug.log* - -# Runtime data -pids -*.pid -*.seed - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (http://nodejs.org/api/addons.html) -build/Release - -# Dependency directories node_modules -jspm_packages - -# Optional npm cache directory -.npm - -# Optional REPL history -.node_repl_history +dist +public +*.log diff --git a/package.json b/package.json index 48d1883..0003b8c 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,9 @@ "description": "portfolio", "main": "index.js", "scripts": { - "start": "npm run build && babel-node src/server.js", - "start:dev": "export NODE_ENV=development && npm run build:dev && nodemon --exec babel-node -- src/server.js", - "build": "NODE_ENV=production webpack -p", - "build:dev": "webpack -d", - "build:dev:watch": "webpack -d --watch" + "build": "NODE_ENV=production babel src --out-dir dist --copy-files && webpack -p --progress --config webpack.config.js", + "start": "NODE_ENV=production node ./src/server.js", + "dev": "NODE_ENV=development babel-node ./src/server.js --presets es2015,stage-2 ./srcserver.js" }, "keywords": [ "porfolio", @@ -17,27 +15,34 @@ "author": "Matúš Námešný", "license": "ISC", "dependencies": { - "ejs": "^2.5.6", - "express": "^4.15.2", - "react": "^15.4.2", - "react-dom": "^15.4.2", - "react-router-dom": "^4.0.0" + "babel-cli": "^6.24.1", + "babel-polyfill": "^6.7.4", + "babel-runtime": "^6.6.1", + "express": "^4.13.4", + "isomorphic-fetch": "^2.2.1", + "react": "^15.0.1", + "react-dom": "^15.0.1", + "react-redux": "^4.4.4", + "react-router-dom": "^4.1.1" }, "devDependencies": { - "babel-core": "^6.24.0", - "babel-loader": "^6.4.1", - "babel-preset-es2015": "^6.24.0", - "babel-preset-react": "^6.23.0", - "css-loader": "^0.28.0", - "file-loader": "^0.11.1", - "html-webpack-plugin": "^2.28.0", - "json-loader": "^0.5.4", - "node-sass": "^4.5.2", - "nodemon": "^1.11.0", - "sass-loader": "^6.0.3", - "style-loader": "^0.16.1", - "url-loader": "^0.5.8", - "webpack": "^2.3.2", - "webpack-dev-server": "^2.4.2" + "babel-core": "^6.7.6", + "babel-jest": "*", + "babel-loader": "^6.2.4", + "babel-plugin-transform-runtime": "^6.7.5", + "babel-preset-es2015": "^6.6.0", + "babel-preset-react": "^6.5.0", + "babel-preset-react-hmre": "^1.1.1", + "babel-preset-stage-0": "^6.5.0", + "babel-register": "^6.7.2", + "css-loader": "^0.28.4", + "css-modules-require-hook": "^4.0.6", + "extract-text-webpack-plugin": "^2.1.2", + "sass-loader": "^6.0.6", + "style-loader": "^0.18.2", + "url-loader": "^0.5.9", + "webpack": "^2.5.1", + "webpack-dev-middleware": "^1.10.2", + "webpack-hot-middleware": "^2.18.0" } } diff --git a/src/app-client.js b/src/app-client.js index e3d9acb..7b008f4 100644 --- a/src/app-client.js +++ b/src/app-client.js @@ -13,6 +13,6 @@ const AppClient = () => ( window.onload = () => { render( , - document.getElementById('app') + document.getElementById('root') ); }; diff --git a/src/components/About.js b/src/components/About.js index ced802a..bdb79bc 100644 --- a/src/components/About.js +++ b/src/components/About.js @@ -1,9 +1,14 @@ -import React, {Component} from 'react'; +import React from 'react'; +// import { Home } from '.'; export const About = () => ( -
-

About

+
+
+

About

+
); export default About; + +// diff --git a/src/components/App.js b/src/components/App.js index eb5020b..8147e2f 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -1,16 +1,15 @@ import React from 'react'; -import {Route, Switch} from 'react-router-dom'; -import {Home, About, Blog, Portfolio, Resume, NotFoundPage} from '.'; - +import { Route, Switch } from 'react-router-dom'; +import { Home, About, Blog, Portfolio, Resume, NotFoundPage } from '.'; export const App = () => (
- + - - - - + + + +
diff --git a/src/components/Blog.js b/src/components/Blog.js index 4b24c86..823d443 100644 --- a/src/components/Blog.js +++ b/src/components/Blog.js @@ -1,12 +1,11 @@ -import React, {Component} from 'react'; +import React from 'react'; -export default class Blog extends Component { +export const Blog = () => ( +
+
+

Hello

+
+
+); - render () { - return ( -
-

Hello

-
- ) - } -} +export default Blog; diff --git a/src/components/Home.js b/src/components/Home.js index 2ff9173..e60ecc8 100644 --- a/src/components/Home.js +++ b/src/components/Home.js @@ -1,43 +1,66 @@ -import React, {Component, PropTypes} from 'react'; -import config from '../config/config.json'; -import {Link} from 'react-router-dom'; +import React, { Component } from 'react'; +import { Link } from 'react-router-dom'; +import config from '../static/config/config.json'; export default class Home extends Component { render() { - var socialLinks = []; - var key = 0; - for (var i in config.social) { - socialLinks.push( - - - + let key = 0; + const objKeys = Object.keys(config.social); + + const socialLinks = objKeys.map((val) => { + const link = ( + +