a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lint 4-space indent

Browse Source
This commit is contained in:
Tom Russell 2019-05-27 16:39:16 +01:00
parent 907afa29f0
commit af9c23d883
25 changed files with 622 additions and 603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/.eslintrc
View File

@ -21,7 +21,8 @@
"no-console": "off", "no-console": "off",
"strict": ["error", "global"], "strict": ["error", "global"],
"curly": "warn", "curly": "warn",
"quotes": ["warn", "single"] "quotes": ["warn", "single"],
"indent": ["warn", 4]
}, },
"plugins": [ "plugins": [
"react" "react"

36
app/src/frontend/header.js
View File

@ -34,25 +34,39 @@ class Header extends React.Component {
<div className={this.state.collapseMenu ? 'collapse navbar-collapse' : 'navbar-collapse'}> <div className={this.state.collapseMenu ? 'collapse navbar-collapse' : 'navbar-collapse'}>
<ul className="navbar-nav ml-auto"> <ul className="navbar-nav ml-auto">
<li className="nav-item"> <li className="nav-item">
<a className="nav-link" href="https://pages.colouring.london">Hello</a> <a className="nav-link" href="https://pages.colouring.london">
Hello
</a>
</li> </li>
<li className="nav-item"> <li className="nav-item">
<a className="nav-link" href="https://pages.colouring.london/buildingcategories">Data Categories</a> <a className="nav-link" href="https://pages.colouring.london/buildingcategories">
Data Categories
</a>
</li> </li>
<li className="nav-item"> <li className="nav-item">
<NavLink to="/view/age.html" className="nav-link">View Maps</NavLink> <NavLink to="/view/age.html" className="nav-link">
View Maps
</NavLink>
</li> </li>
<li className="nav-item"> <li className="nav-item">
<NavLink to="/edit/age.html" className="nav-link">Add/Edit Data</NavLink> <NavLink to="/edit/age.html" className="nav-link">
Add/Edit Data
</NavLink>
</li> </li>
<li className="nav-item"> <li className="nav-item">
<a className="nav-link" href="https://pages.colouring.london/about">More about</a> <a className="nav-link" href="https://pages.colouring.london/about">
More about
</a>
</li> </li>
<li className="nav-item"> <li className="nav-item">
<a className="nav-link" href="https://pages.colouring.london/whoisinvolved">Who&rsquo;s Involved?</a> <a className="nav-link" href="https://pages.colouring.london/whoisinvolved">
Who&rsquo;s Involved?
</a>
</li> </li>
<li className="nav-item"> <li className="nav-item">
<a className="nav-link" href="https://discuss.colouring.london">Discuss</a> <a className="nav-link" href="https://discuss.colouring.london">
Discuss
</a>
</li> </li>
{ {
this.props.user? this.props.user?
@ -66,10 +80,14 @@ class Header extends React.Component {
( (
<Fragment> <Fragment>
<li className="nav-item"> <li className="nav-item">
<NavLink to="/login.html" className="nav-link">Log in</NavLink> <NavLink to="/login.html" className="nav-link">
Log in
</NavLink>
</li> </li>
<li className="nav-item"> <li className="nav-item">
<NavLink to="/sign-up.html" className="nav-link">Sign up</NavLink> <NavLink to="/sign-up.html" className="nav-link">
Sign up
</NavLink>
</li> </li>
</Fragment> </Fragment>
) )

4
app/src/server.js
View File

@ -144,12 +144,12 @@ function renderHTML(context, data, req, res) {
assets.client.css assets.client.css
? `<link rel="stylesheet" href="${assets.client.css}">` ? `<link rel="stylesheet" href="${assets.client.css}">`
: '' : ''
} }
${ ${
process.env.NODE_ENV === 'production' process.env.NODE_ENV === 'production'
? `<script src="${assets.client.js}" defer></script>` ? `<script src="${assets.client.js}" defer></script>`
: `<script src="${assets.client.js}" defer crossorigin></script>` : `<script src="${assets.client.js}" defer crossorigin></script>`
} }
</head> </head>
<body> <body>
<div id="root">${markup}</div> <div id="root">${markup}</div>