From c37c676b29496f3e577524f145425011aae284b9 Mon Sep 17 00:00:00 2001 From: Demur Rumed Date: Mon, 16 Sep 2024 16:26:54 +0000 Subject: [PATCH] Small tweak to Bazaar ui based on cobalt's feedback --- package.json | 10 +++++----- src/rs/server/Cargo.toml | 2 +- src/views/Bazaar.jsx | 26 ++++++++++++++------------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 51ac3d0a..b09b652f 100644 --- a/package.json +++ b/package.json @@ -8,15 +8,15 @@ "url": "https://github.com/serprex/openEtG" }, "devDependencies": { - "@babel/plugin-syntax-import-attributes": "^7.24.7", + "@babel/plugin-syntax-import-attributes": "^7.25.6", "@pencil.js/spritesheet": "^1.5.1", - "babel-loader": "^9.1.3", - "babel-preset-solid": "^1.8.19", + "babel-loader": "^9.2.1", + "babel-preset-solid": "^1.8.22", "copy-webpack-plugin": "^12.0.2", "html-webpack-plugin": "^5.6.0", "prettier": "^3.3.3", - "solid-js": "^1.8.19", - "webpack": "^5.93.0", + "solid-js": "^1.8.22", + "webpack": "^5.94.0", "webpack-cli": "^5.1.4" }, "scripts": { diff --git a/src/rs/server/Cargo.toml b/src/rs/server/Cargo.toml index de748198..56a26b79 100644 --- a/src/rs/server/Cargo.toml +++ b/src/rs/server/Cargo.toml @@ -23,7 +23,7 @@ fxhash = "0.2" getrandom = "0.2" http-body-util = "0.1.0" hyper = { version = "1", features = ["http1", "server"] } -hyper-tungstenite = "0.14" +hyper-tungstenite = "0.15" hyper-util = { version = "0.1", default-features = false } tokio-rustls = { version = "0.26", default-features = false, features = ["ring"] } postgres-types = { version = "0.2", features = ["derive"] } diff --git a/src/views/Bazaar.jsx b/src/views/Bazaar.jsx index 42109658..28ba9962 100644 --- a/src/views/Bazaar.jsx +++ b/src/views/Bazaar.jsx @@ -13,6 +13,7 @@ function Order(p) { return (
p.onClick(Math.abs(p.order.p), p.order.q)}> {p.order.q} @ {Math.abs(p.order.p)} +
); } @@ -37,6 +38,7 @@ function CardOrders(p) { {order => (
0 ? 'color:#4f8' : 'color:#f84'}> {order.q} @ {Math.abs(order.p)} +
)} @@ -263,16 +265,16 @@ export default function Bazaar() { }} style="position:absolute;left:100px;top:8px" /> - setSell(Math.min(e.target.value | 0, 999))} - style="position:absolute;left:200px;top:8px" - /> setSellq(Math.min(e.target.value | 0, 999))} + style="position:absolute;left:200px;top:8px" + /> + setSell(Math.min(e.target.value | 0, 999))} style="position:absolute;left:360px;top:8px" /> {buy() > sellValue(bcard()) && ( @@ -289,16 +291,16 @@ export default function Bazaar() { style="position:absolute;left:100px;top:40px" /> )} - setBuy(Math.min(e.target.value | 0, 999))} - style="position:absolute;left:200px;top:40px" - /> setBuyq(Math.min(e.target.value | 0, 999))} + style="position:absolute;left:200px;top:40px" + /> + setBuy(Math.min(e.target.value | 0, 999))} style="position:absolute;left:360px;top:40px" />