From 43dc5c1067539f8573e29e8feb0fb29308a923ef Mon Sep 17 00:00:00 2001 From: Jori Lallo Date: Tue, 24 May 2016 00:11:34 -0700 Subject: [PATCH] Added Application.js wrapper and viewport meta tag --- package.json | 58 +++++++++++++++++++-------------------- src/index.js | 4 ++- src/scenes/Application.js | 22 +++++++++++++++ 3 files changed, 54 insertions(+), 30 deletions(-) create mode 100644 src/scenes/Application.js diff --git a/package.json b/package.json index 29ff15518..09f274fee 100644 --- a/package.json +++ b/package.json @@ -31,65 +31,58 @@ "babel-preset-react": "^6.3.13", "babel-preset-react-hmre": "^1.0.1", "babel-preset-stage-0": "^6.5.0", + "classnames": "^2.2.3", + "codemirror": "^5.11.0", + "cross-env": "^1.0.7", "crypto": "0.0.3", + "css-loader": "^0.23.1", "debug": "^2.2.0", + "dotenv": "^2.0.0", + "eslint": "^1.10.3", + "eslint-config-airbnb": "^5.0.0", + "eslint-plugin-react": "^3.16.1", + "exports-loader": "^0.6.3", "extract-text-webpack-plugin": "^1.0.1", + "file-loader": "^0.8.5", "highlight.js": "^9.4.0", + "history": "^1.17.0", "html-webpack-plugin": "^2.17.0", "http-errors": "^1.4.0", + "imports-loader": "^0.6.5", "isomorphic-fetch": "^2.2.1", + "json-loader": "^0.5.4", "jsonwebtoken": "^5.7.0", "koa": "^2.0.0", "koa-bodyparser": "^2.0.1", "koa-compress": "^2.0.0", "koa-connect": "^1.0.0", + "koa-convert": "^1.2.0", "koa-helmet": "^1.0.0", "koa-jwt": "^1.2.0", "koa-logger": "^2.0.0", "koa-mount": "^2.0.0", "koa-router": "^7.0.1", "koa-sendfile": "^2.0.0", + "koa-webpack-dev-middleware": "^1.2.0", + "koa-webpack-hot-middleware": "^1.0.3", "localenv": "^0.2.2", "lodash": "^4.3.0", "marked": "^0.3.5", "moment": "^2.13.0", - "pg": "^4.5.3", - "pg-hstore": "^2.3.2", - "querystring": "^0.2.0", - "react": "^0.14.7", - "react-dom": "^0.14.7", - "react-keyframes": "^0.1.4", - "safestart": "^0.8.0", - "sequelize": "^3.21.0", - "sequelize-cli": "^2.3.1", - "sequelize-encrypted": "^0.1.0", - "truncate-html": "0.0.6", - "uuid": "^2.0.2", - "validator": "^5.2.0", - "classnames": "^2.2.3", - "codemirror": "^5.11.0", - "cross-env": "^1.0.7", - "css-loader": "^0.23.1", - "dotenv": "^2.0.0", - "eslint": "^1.10.3", - "eslint-config-airbnb": "^5.0.0", - "eslint-plugin-react": "^3.16.1", - "exports-loader": "^0.6.3", - "file-loader": "^0.8.5", - "history": "^1.17.0", - "imports-loader": "^0.6.5", - "json-loader": "^0.5.4", - "koa-convert": "^1.2.0", - "koa-webpack-dev-middleware": "^1.2.0", - "koa-webpack-hot-middleware": "^1.0.3", "node-dev": "^3.1.0", "node-sass": "^3.4.2", "nodemon": "^1.9.1", "normalize.css": "^3.0.3", "normalizr": "^2.0.1", + "pg": "^4.5.3", + "pg-hstore": "^2.3.2", + "querystring": "^0.2.0", "react": "^0.14.7", "react-codemirror": "^0.2.5", + "react-dom": "^0.14.7", "react-dropzone": "^3.3.2", + "react-helmet": "^3.1.0", + "react-keyframes": "^0.1.4", "react-medium-editor": "^1.6.2", "react-redux": "^4.4.0", "react-router": "^2.0.0", @@ -99,10 +92,17 @@ "redux-logger": "^2.6.1", "redux-persist": "3.0.3", "redux-thunk": "^2.0.1", + "safestart": "^0.8.0", "sass-loader": "^3.2.0", + "sequelize": "^3.21.0", + "sequelize-cli": "^2.3.1", + "sequelize-encrypted": "^0.1.0", "style-loader": "^0.13.0", "to-markdown": "^2.0.1", + "truncate-html": "0.0.6", "url-loader": "^0.5.7", + "uuid": "^2.0.2", + "validator": "^5.2.0", "webpack": "^1.12.12" }, "devDependencies": { diff --git a/src/index.js b/src/index.js index 52bbd77e0..5f121fc25 100644 --- a/src/index.js +++ b/src/index.js @@ -20,6 +20,8 @@ import 'utils/base-styles.scss'; import 'fonts/atlas/atlas.css'; import 'assets/styles/github-gist.scss'; +import Application from 'scenes/Application'; + import Home from 'scenes/Home'; import Editor from 'scenes/Editor'; import Dashboard from 'scenes/Dashboard'; @@ -54,7 +56,7 @@ persistStore(store, { render(( - + diff --git a/src/scenes/Application.js b/src/scenes/Application.js new file mode 100644 index 000000000..dd6c14e11 --- /dev/null +++ b/src/scenes/Application.js @@ -0,0 +1,22 @@ +import React from "react"; +import Helmet from "react-helmet"; + +const Application = (props) => { + return ( +
+ + { props.children } +
+ ); +}; + +Application.propTypes = { + children: React.PropTypes.node.isRequired, +} + +export default Application; \ No newline at end of file