From af5adf1e083d362b36b11e76e7d5ca76b56b3faf Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 2 Sep 2019 17:08:49 +1000 Subject: [PATCH 01/13] Pog --- VERSION | 2 +- acp/package.json | 2 +- client/package.json | 2 +- ops/package.json | 2 +- server/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 9325c3cc..afaf360d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.0 \ No newline at end of file +1.0.0 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index ef344ba8..9ad1a0b1 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "0.3.0", + "version": "1.0.0", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index 96196e8e..da1b56da 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "0.3.0", + "version": "1.0.0", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index 2b7cd67a..1eb603d9 100755 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "0.3.0", + "version": "1.0.0", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index ab043db4..caea8b7e 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "0.3.0" +version = "1.0.0" authors = ["ntr "] [dependencies] From f2c086e29714be5f02044d6924a67ad1ca4eed61 Mon Sep 17 00:00:00 2001 From: mashy Date: Mon, 2 Sep 2019 18:06:23 +1000 Subject: [PATCH 02/13] worklog --- WORKLOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/WORKLOG.md b/WORKLOG.md index bc56173d..a12975b4 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -11,6 +11,11 @@ * constructs jiggle when clicked * background colour changes depending on time of day +* bug fixes + * pvp 1st player ready up doesn't get put in game + * pvp 1st round doesn't resolve until warden timer completes + + * bot game grind * change score to enum @@ -19,6 +24,8 @@ * send account_instances on players update * convert PlusPlus to ++ or rename +* add speed to descriptions +* add components to description e.g. Strike (red circle red circle attack) * clear skill (if currently targetted) * increase power to speed up early rounds From 3e286757f1249411d425358c8ec3e29f64d4db38 Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 2 Sep 2019 18:12:58 +1000 Subject: [PATCH 03/13] production stripe btns --- client/src/components/stripe.buttons.jsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/components/stripe.buttons.jsx b/client/src/components/stripe.buttons.jsx index 7d15770e..e760fb6b 100644 --- a/client/src/components/stripe.buttons.jsx +++ b/client/src/components/stripe.buttons.jsx @@ -8,18 +8,18 @@ function BitsBtn(args) { } = args; function subscribeClick() { stripe.redirectToCheckout({ - items: [{ plan: 'plan_Fhl9r7UdMadjGi', quantity: 1 }], - successUrl: 'http://localhost', - cancelUrl: 'http://localhost', + items: [{ plan: 'prod_Fjdt7mYvzXkNBN', quantity: 1 }], + successUrl: 'http://mnml.gg', + cancelUrl: 'http://mnml.gg', clientReferenceId: account.id, }); } function bitsClick() { stripe.redirectToCheckout({ - items: [{ sku: 'sku_FHUfNEhWQaVDaT', quantity: 1 }], - successUrl: 'http://localhost', - cancelUrl: 'http://localhost', + items: [{ sku: 'sku_Fjdu7zOy3sLGc5', quantity: 1 }], + successUrl: 'http://mnml.gg', + cancelUrl: 'http://mnml.gg', clientReferenceId: account.id, }); } From 55aba18c93cb4b78a44d8283836aa49e4a20edca Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 2 Sep 2019 18:13:29 +1000 Subject: [PATCH 04/13] version bump --- VERSION | 2 +- acp/package.json | 2 +- client/package.json | 2 +- ops/package.json | 2 +- server/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index afaf360d..7f207341 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0 \ No newline at end of file +1.0.1 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index 9ad1a0b1..5cfb205d 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.0.0", + "version": "1.0.1", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index da1b56da..17da24ac 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.0.0", + "version": "1.0.1", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index 1eb603d9..6017c376 100755 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.0.0", + "version": "1.0.1", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index caea8b7e..ff673688 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.0.0" +version = "1.0.1" authors = ["ntr "] [dependencies] From 7f882d58e340e8c3439d46cc85d6a04c08b76360 Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 2 Sep 2019 18:21:24 +1000 Subject: [PATCH 05/13] production key --- client/src/app.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app.jsx b/client/src/app.jsx index ddd7a1ea..044c2ea1 100644 --- a/client/src/app.jsx +++ b/client/src/app.jsx @@ -30,7 +30,7 @@ document.fonts.load('16pt "Jura"').then(() => { const App = () => ( - + From bb5e4d572868f5c0e565b44ee37888d83dc8dbf3 Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 2 Sep 2019 18:57:46 +1000 Subject: [PATCH 06/13] fixed key" --- client/src/app.jsx | 2 +- client/src/components/stripe.buttons.jsx | 8 ++++---- etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/client/src/app.jsx b/client/src/app.jsx index 044c2ea1..ad0db010 100644 --- a/client/src/app.jsx +++ b/client/src/app.jsx @@ -30,7 +30,7 @@ document.fonts.load('16pt "Jura"').then(() => { const App = () => ( - + diff --git a/client/src/components/stripe.buttons.jsx b/client/src/components/stripe.buttons.jsx index e760fb6b..0dd1a9ed 100644 --- a/client/src/components/stripe.buttons.jsx +++ b/client/src/components/stripe.buttons.jsx @@ -9,8 +9,8 @@ function BitsBtn(args) { function subscribeClick() { stripe.redirectToCheckout({ items: [{ plan: 'prod_Fjdt7mYvzXkNBN', quantity: 1 }], - successUrl: 'http://mnml.gg', - cancelUrl: 'http://mnml.gg', + successUrl: 'https://mnml.gg', + cancelUrl: 'https://mnml.gg', clientReferenceId: account.id, }); } @@ -18,8 +18,8 @@ function BitsBtn(args) { function bitsClick() { stripe.redirectToCheckout({ items: [{ sku: 'sku_Fjdu7zOy3sLGc5', quantity: 1 }], - successUrl: 'http://mnml.gg', - cancelUrl: 'http://mnml.gg', + successUrl: 'https://mnml.gg', + cancelUrl: 'https://mnml.gg', clientReferenceId: account.id, }); } diff --git a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf index cce73707..73941ae9 100644 --- a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf +++ b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf @@ -6,7 +6,6 @@ upstream mnml_ws { server 127.0.0.1:40055; } - map $http_upgrade $connection_upgrade { default upgrade; '' close; From f3237ffe51ab27d25558c93ae9432aa9512368c9 Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 2 Sep 2019 19:09:04 +1000 Subject: [PATCH 07/13] fix plan id --- client/src/components/stripe.buttons.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/stripe.buttons.jsx b/client/src/components/stripe.buttons.jsx index 0dd1a9ed..83076a9d 100644 --- a/client/src/components/stripe.buttons.jsx +++ b/client/src/components/stripe.buttons.jsx @@ -8,7 +8,7 @@ function BitsBtn(args) { } = args; function subscribeClick() { stripe.redirectToCheckout({ - items: [{ plan: 'prod_Fjdt7mYvzXkNBN', quantity: 1 }], + items: [{ plan: 'plan_Fjdtsd4i7aVLe1', quantity: 1 }], successUrl: 'https://mnml.gg', cancelUrl: 'https://mnml.gg', clientReferenceId: account.id, From 2728be796edd334bfcfa9d06b14ab338c1692035 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 3 Sep 2019 10:02:32 +1000 Subject: [PATCH 08/13] fix pvp instance state push notification --- WORKLOG.md | 2 ++ server/src/account.rs | 3 ++- server/src/instance.rs | 2 +- server/src/pg.rs | 2 +- server/src/rpc.rs | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/WORKLOG.md b/WORKLOG.md index a12975b4..a246a525 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -6,6 +6,7 @@ * serde serialize privatise * DO postgres * mobile styles + * can't reset password without knowing password =\ * treats * constructs jiggle when clicked @@ -17,6 +18,7 @@ * bot game grind +* stress test * change score to enum * pct based translates for combat animation diff --git a/server/src/account.rs b/server/src/account.rs index a33b6b02..716c9b10 100644 --- a/server/src/account.rs +++ b/server/src/account.rs @@ -185,8 +185,9 @@ pub fn set_password(tx: &mut Transaction, id: Uuid, current: &String, password: let id: Uuid = row.get(0); let db_pw: String = row.get(1); + // return bad request to prevent being logged out if !verify(current, &db_pw)? { - return Err(MnmlHttpError::PasswordNotMatch); + return Err(MnmlHttpError::BadRequest); } let rounds = 8; diff --git a/server/src/instance.rs b/server/src/instance.rs index eb2c35d7..5443eac9 100644 --- a/server/src/instance.rs +++ b/server/src/instance.rs @@ -724,7 +724,7 @@ pub fn instance_ready(tx: &mut Transaction, account: &Account, instance_id: Uuid Ok(RpcMessage::InstanceState(instance_update(tx, instance)?)) } -pub fn instance_state(tx: &mut Transaction, _account: &Account, instance_id: Uuid) -> Result { +pub fn instance_state(tx: &mut Transaction, instance_id: Uuid) -> Result { let instance = instance_get(tx, instance_id)?; if let Some(game_id) = instance.current_game_id() { diff --git a/server/src/pg.rs b/server/src/pg.rs index 88e05a87..3afabde6 100644 --- a/server/src/pg.rs +++ b/server/src/pg.rs @@ -88,7 +88,7 @@ fn handle_notification(n: Notification, pool: &PgPool, events: &Sender) { Table::Accounts => Some(Event::Push(n.id, RpcMessage::AccountState(account::select(&db, n.id).unwrap()))), Table::Instances => - Some(Event::Push(n.id, RpcMessage::InstanceState(instance::instance_get(&mut tx, n.id).unwrap()))), + Some(Event::Push(n.id, instance::instance_state(&mut tx, n.id).unwrap())), Table::Games => Some(Event::Push(n.id, RpcMessage::GameState(game::game_get(&mut tx, n.id).unwrap()))), _ => { diff --git a/server/src/rpc.rs b/server/src/rpc.rs index df7a503c..01579c23 100644 --- a/server/src/rpc.rs +++ b/server/src/rpc.rs @@ -180,7 +180,7 @@ impl Connection { RpcRequest::InstanceReady { instance_id } => Ok(instance_ready(&mut tx, account, instance_id)?), RpcRequest::InstanceState { instance_id } => - Ok(instance_state(&mut tx, account, instance_id)?), + Ok(instance_state(&mut tx, instance_id)?), RpcRequest::VboxAccept { instance_id, group, index } => Ok(RpcMessage::InstanceState(vbox_accept(&mut tx, account, instance_id, group, index)?)), From fbb7e58f3cffdc6720611d01df2011501f086958 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 3 Sep 2019 10:57:57 +1000 Subject: [PATCH 09/13] make socket url dynamic --- client/src/socket.jsx | 9 +++------ .../sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf | 7 ++++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/client/src/socket.jsx b/client/src/socket.jsx index b8e919b9..e19c5c4b 100644 --- a/client/src/socket.jsx +++ b/client/src/socket.jsx @@ -1,11 +1,8 @@ const toast = require('izitoast'); const cbor = require('borc'); -const socketUrl = () => { - if (process.env.NODE_ENV === 'production') return 'wss://mnml.gg/api/ws'; - if (process.env.NODE_ENV === 'staging') return 'wss://sixtysix.pro/api/ws'; - return 'ws://localhost/api/ws'; -}; +const SOCKET_URL = + `${window.location.protocol === 'https:' ? 'wss://' : 'ws://'}${window.location.host}/api/ws`; function errorToast(err) { console.error(err); @@ -299,7 +296,7 @@ function createSocket(events) { ws = null; } - ws = new WebSocket(socketUrl()); + ws = new WebSocket(SOCKET_URL); ws.binaryType = 'arraybuffer'; // Listen for messages diff --git a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf index 5e3fab85..8383b79d 100644 --- a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf +++ b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf @@ -12,8 +12,9 @@ map $http_upgrade $connection_upgrade { '' close; } -# DEV server { + server_name sixtysix.pro; + location / { root /var/lib/mnml/public/current; index index.html; @@ -40,8 +41,8 @@ server { listen [::]:443 ssl ipv6only=on; # managed by Certbot listen 443 ssl; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/mnml.gg/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/mnml.gg/privkey.pem; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/sixtysix.pro/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/sixtysix.pro/privkey.pem; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot } From 76034973729270ad91b344ef2cb914aeefb0719a Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 3 Sep 2019 11:29:05 +1000 Subject: [PATCH 10/13] dev stripe checks --- client/src/app.jsx | 7 ++++++- client/src/components/stripe.buttons.jsx | 22 ++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/client/src/app.jsx b/client/src/app.jsx index ad0db010..ab17520c 100644 --- a/client/src/app.jsx +++ b/client/src/app.jsx @@ -13,6 +13,11 @@ const registerEvents = require('./events'); const Mnml = require('./components/mnml'); +function stripeKey() { + if (window.location.host === 'mnml.gg') return 'pk_live_fQGrL1uWww2ot8W1G7vTySAv004ygmnMXq'; + return 'pk_test_Cb49tTqTXpzk7nEmlGzRrNJg00AU0aNZDj'; +} + // Redux Store const store = createStore( combineReducers(reducers), @@ -30,7 +35,7 @@ document.fonts.load('16pt "Jura"').then(() => { const App = () => ( - + diff --git a/client/src/components/stripe.buttons.jsx b/client/src/components/stripe.buttons.jsx index 83076a9d..ef72c5a9 100644 --- a/client/src/components/stripe.buttons.jsx +++ b/client/src/components/stripe.buttons.jsx @@ -1,6 +1,16 @@ const preact = require('preact'); const { injectStripe } = require('react-stripe-elements'); +function subPlan() { + if (window.location.host === 'mnml.gg') return 'plan_Fjdtsd4i7aVLe1'; + return 'prod_FWSA8RoyMMV3st'; +} + +function bitsSku() { + if (window.location.host === 'mnml.gg') return 'sku_Fjdu7zOy3sLGc5'; + return 'sku_FjuNxONdWewjH2'; +} + function BitsBtn(args) { const { stripe, @@ -8,18 +18,18 @@ function BitsBtn(args) { } = args; function subscribeClick() { stripe.redirectToCheckout({ - items: [{ plan: 'plan_Fjdtsd4i7aVLe1', quantity: 1 }], - successUrl: 'https://mnml.gg', - cancelUrl: 'https://mnml.gg', + items: [{ plan: subPlan(), quantity: 1 }], + successUrl: window.location.origin, + cancelUrl: window.location.origin, clientReferenceId: account.id, }); } function bitsClick() { stripe.redirectToCheckout({ - items: [{ sku: 'sku_Fjdu7zOy3sLGc5', quantity: 1 }], - successUrl: 'https://mnml.gg', - cancelUrl: 'https://mnml.gg', + items: [{ sku: bitsSku(), quantity: 1 }], + successUrl: window.location.origin, + cancelUrl: window.location.origin, clientReferenceId: account.id, }); } From 3056d08e71e8c8d3179001766bc159e97e26f237 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 3 Sep 2019 12:51:00 +1000 Subject: [PATCH 11/13] version bump and version bin --- VERSION | 2 +- acp/package.json | 2 +- bin/version.sh | 15 +++++++++++++++ client/package.json | 2 +- ops/package.json | 2 +- server/Cargo.toml | 2 +- 6 files changed, 20 insertions(+), 5 deletions(-) create mode 100755 bin/version.sh diff --git a/VERSION b/VERSION index 7f207341..1cc5f657 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1 \ No newline at end of file +1.1.0 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index 5cfb205d..cc7a1379 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.0.1", + "version": "1.1.0", "description": "", "main": "index.js", "scripts": { diff --git a/bin/version.sh b/bin/version.sh new file mode 100755 index 00000000..dd50de69 --- /dev/null +++ b/bin/version.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# bless you chris and andy <3 +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) +MNML_PATH=$(realpath "$DIR/../") + +VERSION=$1 + +echo "Setting version to $VERSION" + +echo $VERSION | tr -d '\n' > VERSION +cd $MNML_PATH/server && sed -i "/^version/c\version = \"$VERSION\"" Cargo.toml +cd $MNML_PATH/ops && npm --allow-same-version --no-git-tag-version version "$VERSION" +cd $MNML_PATH/client && npm --allow-same-version --no-git-tag-version version "$VERSION" +cd $MNML_PATH/acp && npm --allow-same-version --no-git-tag-version version "$VERSION" diff --git a/client/package.json b/client/package.json index 17da24ac..a0ecb408 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.0.1", + "version": "1.1.0", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index 6017c376..ce9cd791 100755 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.0.1", + "version": "1.1.0", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index ff673688..2b528b9b 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.0.1" +version = "1.1.0" authors = ["ntr "] [dependencies] From c83172ca3df4586f62564f2aea22b2c22e4f0676 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 3 Sep 2019 16:15:40 +1000 Subject: [PATCH 12/13] pvp queue join messages --- bin/deploy.sh | 1 + client/src/socket.jsx | 4 ++-- server/src/events.rs | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bin/deploy.sh b/bin/deploy.sh index 15778cd7..f84b7d97 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -24,6 +24,7 @@ ssh -q "$TARGET" ls -lah "$SERVER_BIN_DIR" echo "syncing client $VERSION" rsync -a --delete --delete-excluded "$MNML_PATH/client/dist/" "$TARGET:$CLIENT_DIST_DIR/$VERSION/" ssh -q "$TARGET" ln -nfs "$CLIENT_DIST_DIR/$VERSION" "$CLIENT_PUBLIC_DIR" +ssh -q "$TARGET" ls -lah "$CLIENT_DIST_DIR" echo "restarting mnml service" ssh -q -t "$TARGET" sudo service mnml restart && sleep 1 && systemctl --no-pager status mnml diff --git a/client/src/socket.jsx b/client/src/socket.jsx index e19c5c4b..d4a0c421 100644 --- a/client/src/socket.jsx +++ b/client/src/socket.jsx @@ -223,8 +223,8 @@ function createSocket(events) { ItemInfo: onItemInfo, Pong: onPong, - QueueRequested: () => console.log('pvp queue request received'), - QueueJoined: () => console.log('you have joined the pvp queue'), + QueueRequested: () => events.notify('pvp queue request received'), + QueueJoined: () => events.notify('you have joined the pvp queue'), Error: errHandler, }; diff --git a/server/src/events.rs b/server/src/events.rs index f37b97bd..c6cf57a5 100644 --- a/server/src/events.rs +++ b/server/src/events.rs @@ -192,7 +192,13 @@ impl Events { }, None => { info!("joined game queue id={:?} account={:?}", req.id, req.account); - Some(req) + match self.clients.get(&req.id) { + Some(ref c) => { + c.tx.send(RpcMessage::QueueJoined(()))?; + Some(req) + }, + None => return Err(format_err!("missing client client={:?}", req.id)), + } }, }; From 31f353153b5ba8cfaa7e86624168051d8724e802 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 3 Sep 2019 17:01:59 +1000 Subject: [PATCH 13/13] worklog dones --- WORKLOG.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/WORKLOG.md b/WORKLOG.md index a246a525..999f1afa 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -4,7 +4,6 @@ * ACP * essential * serde serialize privatise - * DO postgres * mobile styles * can't reset password without knowing password =\ @@ -13,10 +12,8 @@ * background colour changes depending on time of day * bug fixes - * pvp 1st player ready up doesn't get put in game * pvp 1st round doesn't resolve until warden timer completes - * bot game grind * stress test @@ -65,12 +62,6 @@ mobile info page reconnect based on time delta consolidate game and instance -ah man -the ready screen should totally be -your constructs facing off against the other guy -the chatwheel -and a ready button - *SERVER* * vbox drops chances * 50% spec, 25% colour etc @@ -78,7 +69,6 @@ and a ready button * mnml tv ## LATER -* chat * elo + leaderboards * constants * change to ownership pattern