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

Remove losing-edits notice, add links (Closes #111)

Browse Source
This commit is contained in:
Tom Russell 2018-11-21 21:08:55 +00:00
parent 449c778bbc
commit 779b49514f
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/frontend/info-box.js
View File

@ -3,7 +3,7 @@ import React, { Fragment } from 'react';
const InfoBox = (props) => (
<Fragment>
{
(props.msg)?
(props.msg || props.children)?
(
<div className="alert alert-info" role="alert">
{
@ -11,6 +11,9 @@ const InfoBox = (props) => (
props.msg
: 'Enjoy the colouring! Usual service should resume shortly.'
}
{
props.children
}
</div>
) : null
}

8
app/src/frontend/login.js
View File

@ -73,8 +73,12 @@ class Login extends Component {
<article>
<section className="main-col">
<h1 className="h2">Log in</h1>
<InfoBox msg="Colouring London is under active development - at the moment, user accounts
and data may be deleted without notice. Caveat visitor!" />
<InfoBox msg="Welcome to Colouring London. You're one of the first people to use the site! ">
<br/>Please <a href="https://discuss.colouring.london/">discuss
suggestions for improvements</a> and <a
href="https://github.com/tomalrussell/colouring-london/issues">
report issues or problems</a>.
</InfoBox>
<ErrorBox msg={this.state.error} />
<form onSubmit={this.handleSubmit}>
<label htmlFor="username">Username*</label>

7
app/src/frontend/my-account.js
View File

@ -61,9 +61,10 @@ class MyAccountPage extends Component {
<h1 className="h1">Welcome, {this.props.user.username}!</h1>
<p>
Colouring London is under active development, please report any
bugs on <a href="http://github.com/tomalrussell/colouring-london/issues">
GitHub</a>.
Colouring London is under active development, Please <a href="https://discuss.colouring.london/">discuss
suggestions for improvements</a> and <a
href="https://github.com/tomalrussell/colouring-london/issues">
report issues or problems</a>.
</p>
<ErrorBox msg={this.state.error} />

10
app/src/frontend/signup.js
View File

@ -72,8 +72,12 @@ class SignUp extends Component {
<article>
<section className="main-col">
<h1 className="h2">Sign up</h1>
<InfoBox msg="Colouring London is under active development - at the moment, user accounts
and data may be deleted without notice. Caveat visitor!" />
<InfoBox msg="Welcome to Colouring London. You're one of the first people to sign up! ">
<br/>Please <a href="https://discuss.colouring.london/">discuss
suggestions for improvements</a> and <a
href="https://github.com/tomalrussell/colouring-london/issues">
report issues or problems</a>.
</InfoBox>
<p>
Create an account to start colouring in.
</p>
@ -99,7 +103,7 @@ class SignUp extends Component {
value={this.state.confirm_email} onChange={this.handleChange}
/>
<label htmlFor="password">Password</label>
<label htmlFor="password">Password (at least 8 characters)</label>
<input name="password" id="password"
className="form-control"
type={(this.state.show_password)? 'text': 'password'}