diff --git a/client/assets/styles/styles.css b/client/assets/styles/styles.css index 52d7b6e4..83338932 100644 --- a/client/assets/styles/styles.css +++ b/client/assets/styles/styles.css @@ -114,11 +114,15 @@ nav button[disabled], nav button[disabled]:hover { text-decoration: none; } -nav button:hover, nav button:focus { - color: whitesmoke; +nav button:hover { + color: #888; text-decoration: underline; } +nav button:focus, nav button:active { + color: whitesmoke; +} + main { padding-top: 1em; grid-area: main; @@ -154,7 +158,12 @@ button, input { transition-timing-function: ease; } -button:hover, button:focus { +button:hover { + color: whitesmoke; + border-color: #888; +} + +button:focus { /*colour necesary to bash skellington*/ color: whitesmoke; border-color: whitesmoke; diff --git a/client/src/components/instance.create.form.jsx b/client/src/components/instance.create.form.jsx index 5efee252..0ccf3738 100644 --- a/client/src/components/instance.create.form.jsx +++ b/client/src/components/instance.create.form.jsx @@ -58,7 +58,7 @@ class InstanceCreateForm extends Component {
New Instance - + - + + - +
{joined} {haxSection} diff --git a/client/src/socket.jsx b/client/src/socket.jsx index b8a114d7..3c4b9831 100644 --- a/client/src/socket.jsx +++ b/client/src/socket.jsx @@ -43,8 +43,8 @@ function createSocket(events) { send({ method: 'account_login', params: { name, password } }); } - function sendAccountCreate(name, password) { - send({ method: 'account_create', params: { name, password } }); + function sendAccountCreate(name, password, code) { + send({ method: 'account_create', params: { name, password, code } }); } function sendAccountConstructs() { diff --git a/server/src/account.rs b/server/src/account.rs index 080bc2ee..80dc7f7f 100644 --- a/server/src/account.rs +++ b/server/src/account.rs @@ -65,7 +65,7 @@ pub fn account_create(params: AccountCreateParams, tx: &mut Transaction) -> Resu return Err(err_msg("password must be at least 12 characters")); } - if params.password != "grepgrepgrep" { + if params.code.to_lowercase() != "grep842" { return Err(err_msg("https://discord.gg/YJJgurM")); } diff --git a/server/src/rpc.rs b/server/src/rpc.rs index a9b43ffa..05a812a0 100644 --- a/server/src/rpc.rs +++ b/server/src/rpc.rs @@ -472,6 +472,7 @@ struct AccountCreateMsg { pub struct AccountCreateParams { pub name: String, pub password: String, + pub code: String, } #[derive(Debug,Clone,Serialize,Deserialize)]