Merge branch 'tos' into release/1.5.4

client/src/components/welcome.register.jsx

@@ -34,7 +34,7 @@ function Register(args) {
         submitRegister,
     } = args;
 
-    const { password, confirm, name } = this.state;
+    const { password, confirm, name, terms } = this.state;
 
     const registerSubmit = (event) => {
         event.preventDefault();
@@ -45,7 +45,7 @@ function Register(args) {
         password === confirm;
 
     const registerDisabled = () => {
-        return !(registerConfirm() && password && name);
+        return !(registerConfirm() && password && name && terms);
     }
 
     return (
@@ -74,6 +74,14 @@ function Register(args) {
                 value={this.state.confirm}
                 onInput={linkState(this, 'confirm')}
             />
+            <div>
+                <input
+                    type="checkbox"
+                    onInput={linkState(this, 'terms')
+                }/>
+                &nbsp; Confirm agreement to terms of service &nbsp;
+                <button onClick={() => window.open('/tos.html')}>VIEW</button>
+            </div>
             <button
                 class="login-btn"
                 disabled={registerDisabled()}