Skip to content
This repository was archived by the owner on Jun 28, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
eslint in travis
  • Loading branch information
mmahalwy committed Jun 21, 2016
commit 1d9adbb1f820dee797e0717f468710e3516e3411
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"private": true,
"scripts": {
"test": "./node_modules/karma/bin/karma start",
"test:ci:unit": "./node_modules/karma/bin/karma start --browsers PhantomJS --single-run",
"test:ci:unit": "./node_modules/karma/bin/karma start --browsers PhantomJS --single-run; npm run test:ci:lint",
"test:ci:functional": "node ./nightwatch.js -c ./nightwatch.json -e production",
"test:ci:lint": "eslint ./src/scripts/**/*.js",
"test:ci:lint": "eslint ./src/**/*.js",
"test:dev:unit": "./node_modules/karma/bin/karma start",
"test:dev:functional": "node ./nightwatch.js -c ./nightwatch.json",
"test:dev:lint": "eslint ./src/scripts/**/*.js",
Expand Down
109 changes: 57 additions & 52 deletions src/helpers/Html.js
Original file line number Diff line number Diff line change
@@ -1,63 +1,68 @@
import React from 'react';
/* eslint-disable global-require */
import React, { PropTypes } from 'react';
import ReactDOM from 'react-dom/server';
import Helmet from 'react-helmet';
import serialize from 'serialize-javascript';

class Html extends React.Component {
render() {
const { store, component, assets } = this.props;
const content = component ? ReactDOM.renderToString(component) : '';
const head = Helmet.rewind();
const Html = ({ store, component, assets }) => {
const content = component ? ReactDOM.renderToString(component) : '';
const head = Helmet.rewind();

return (
<html>
<head>
{head.base.toComponent()}
{head.title.toComponent()}
{head.meta.toComponent()}
{head.link.toComponent()}
{head.script.toComponent()}
return (
<html>
<head>
{head.base.toComponent()}
{head.title.toComponent()}
{head.meta.toComponent()}
{head.link.toComponent()}
{head.script.toComponent()}

{Object.keys(assets.styles).map((style, i) => (
<link
href={assets.styles[style]}
key={i} media="screen, projection"
rel="stylesheet"
type="text/css"
/>
))}
{
Object.keys(assets.styles).length === 0 ?
{Object.keys(assets.styles).map((style, i) => (
<link
href={assets.styles[style]}
key={i} media="screen, projection"
rel="stylesheet"
type="text/css"
/>
))}
{
Object.keys(assets.styles).length === 0 ?
<style dangerouslySetInnerHTML={{__html: (require('../../bootstrap.config'))}} /> :
null
}
<style id="fonts" />
</head>
<body>
<div id="app" dangerouslySetInnerHTML={{__html: content}} />
null
}
<style id="fonts" />
</head>
<body>
<div id="app" dangerouslySetInnerHTML={{__html: content}} />
<script
dangerouslySetInnerHTML={{
__html: `(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

<script
dangerouslySetInnerHTML={{
__html: `(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-8496014-1', 'auto');
`
}}
charSet="UTF-8"
/>
<script
dangerouslySetInnerHTML={{__html: `window.reduxData=${serialize(store.getState())};`}}
charSet="UTF-8"
/>
<script src="https://cdn.ravenjs.com/3.0.4/raven.min.js" />
{Object.keys(assets.javascript).map((script, i) =>
<script src={assets.javascript[script]} key={i} />
)}
</body>
</html>
);
};

ga('create', 'UA-8496014-1', 'auto');
`
}}
charSet="UTF-8"
/>
<script dangerouslySetInnerHTML={{__html: `window.reduxData=${serialize(store.getState())};`}} charSet="UTF-8"/>
<script src="https://cdn.ravenjs.com/3.0.4/raven.min.js" />
{Object.keys(assets.javascript).map((script, i) =>
<script src={assets.javascript[script]} key={i}/>
)}
</body>

</html>
);
}
}
Html.propTypes = {
store: PropTypes.object,
assets: PropTypes.object,
component: PropTypes.any
};

export default Html;
30 changes: 0 additions & 30 deletions src/helpers/flowType.js

This file was deleted.