From 9a70c1f34e472dd5c10451e7532e941dd08b44b7 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Thu, 12 Sep 2019 11:41:53 +1000
Subject: [PATCH] remove code, fix animation reset

---
 client/src/components/welcome.jsx          | 20 +++++++++++++-------
 client/src/components/welcome.register.jsx | 17 ++++-------------
 client/src/events.jsx                      |  1 +
 server/src/account.rs                      |  6 +-----
 server/src/http.rs                         |  6 +-----
 5 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/client/src/components/welcome.jsx b/client/src/components/welcome.jsx
index f2018d30..80ce32a5 100644
--- a/client/src/components/welcome.jsx
+++ b/client/src/components/welcome.jsx
@@ -53,13 +53,19 @@ function Welcome() {
                 <section>
                     <div class="news">
                         <h1>mnml.gg</h1>
-                        <p>mnml is a turn-based 1v1 strategy game in an abstract setting.</p>
-                        <p>outplay your opponents by building your team of 3 constructs from a shifting meta of skills, effects and specialisations.</p>
-                        <p>simple rules, complex interactions, simultaneous turns to increase the pace, and a unique speed mechanic;</p>
-                        <p>mnml is a tactical game unlike any other.</p>
-                        <p>free to play</p>
-                        <p>no email required</p>
-                        <p>glhf</p>
+                        <p>
+                            mnml is a turn-based 1v1 strategy game in an abstract setting.<br />
+                            outplay your opponents by building your team of 3 constructs from a shifting meta of skills, effects and specialisations.<br />
+                        </p>
+                        <p>
+                            simple rules, complex interactions, simultaneous turns to increase the pace, and a unique speed mechanic;<br />
+                            mnml is a tactical game unlike any other.
+                        </p>
+                        <p>
+                            free to play<br />
+                            no email required<br />
+                            glhf
+                        </p>
                     </div>
                     {pageEl()}
                 </section>
diff --git a/client/src/components/welcome.register.jsx b/client/src/components/welcome.register.jsx
index 7051a8ce..899c8ef6 100644
--- a/client/src/components/welcome.register.jsx
+++ b/client/src/components/welcome.register.jsx
@@ -12,8 +12,8 @@ const addState = connect(
             ws
         } = state;
 
-        function submitRegister(name, password, code) {
-            postData('/account/register', { name, password, code })
+        function submitRegister(name, password) {
+            postData('/account/register', { name, password })
                 .then(res => res.json())
                 .then(data => {
                     if (data.error) return errorToast(data.error);
@@ -34,12 +34,11 @@ function Register(args) {
         submitRegister,
     } = args;
 
-    const { password, confirm, name, code } = this.state;
+    const { password, confirm, name } = this.state;
 
     const registerSubmit = (event) => {
         event.preventDefault();
-        submitRegister(name, password, code);
-        // this.setState({ name: '', password: '', confirm: '', code: ''});
+        submitRegister(name, password);
     }
 
     const registerConfirm = () =>
@@ -75,14 +74,6 @@ function Register(args) {
                 value={this.state.confirm}
                 onInput={linkState(this, 'confirm')}
             />
-            <label for="code">Access Code</label>
-            <input
-                class="login-input"
-                type="text"
-                placeholder="code"
-                value={this.state.code}
-                onInput={linkState(this, 'code')}
-            />
             <button
                 class="login-btn"
                 disabled={registerDisabled()}
diff --git a/client/src/events.jsx b/client/src/events.jsx
index a9481ccd..f2e5d498 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -200,6 +200,7 @@ function registerEvents(store) {
         const startDemo = () => {
             console.log(initial);
             store.dispatch(actions.setDemo(initial));
+            store.dispatch(actions.setAnimTarget(null));
             setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { combiner: [0] }))), 2000);
             setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { combiner: [0, 1] }))), 4000);
             setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { combiner: [0, 1, 2] }))), 6000);
diff --git a/server/src/account.rs b/server/src/account.rs
index db90e6a6..5eaeafd4 100644
--- a/server/src/account.rs
+++ b/server/src/account.rs
@@ -288,15 +288,11 @@ pub fn set_subscribed(tx: &mut Transaction, id: Uuid, subscribed: bool) -> Resul
     Ok(name)
 }
 
-pub fn create(name: &String, password: &String, code: &String, tx: &mut Transaction) -> Result<String, MnmlHttpError> {
+pub fn create(name: &String, password: &String, tx: &mut Transaction) -> Result<String, MnmlHttpError> {
     if password.len() < PASSWORD_MIN_LEN {
         return Err(MnmlHttpError::PasswordUnacceptable);
     }
 
-    if code.to_lowercase() != "grep842" {
-        return Err(MnmlHttpError::InvalidCode);
-    }
-
     if name.len() == 0 {
         return Err(MnmlHttpError::AccountNameNotProvided);
     }
diff --git a/server/src/http.rs b/server/src/http.rs
index c7475ee7..068234f3 100644
--- a/server/src/http.rs
+++ b/server/src/http.rs
@@ -52,8 +52,6 @@ pub enum MnmlHttpError {
     PasswordUnacceptable,
     #[fail(display="incorrect token. refresh or logout of existing sessions")]
     TokenDoesNotMatch,
-    #[fail(display="invalid code. https://discord.gg/YJJgurM")]
-    InvalidCode,
 }
 
 impl From<bcrypt::BcryptError> for MnmlHttpError {
@@ -129,7 +127,6 @@ impl From<MnmlHttpError> for IronError {
             MnmlHttpError::PasswordUnacceptable => (m_err.compat(), status::BadRequest),
 
             MnmlHttpError::PasswordNotMatch |
-            MnmlHttpError::InvalidCode |
             MnmlHttpError::TokenDoesNotMatch |
             MnmlHttpError::Unauthorized => (m_err.compat(), status::Unauthorized),
 
@@ -211,7 +208,6 @@ fn token_res(token: String) -> Response {
 struct RegisterBody {
     name: String,
     password: String,
-    code: String,
 }
 
 fn register(req: &mut Request) -> IronResult<Response> {
@@ -224,7 +220,7 @@ fn register(req: &mut Request) -> IronResult<Response> {
     let db = state.pool.get().or(Err(MnmlHttpError::DbError))?;
     let mut tx = db.transaction().or(Err(MnmlHttpError::DbError))?;
 
-    match account::create(&params.name, &params.password, &params.code, &mut tx) {
+    match account::create(&params.name, &params.password, &mut tx) {
         Ok(token) => {
             tx.commit().or(Err(MnmlHttpError::ServerError))?;
             Ok(token_res(token))