diff --git a/server/src/discord/new_auction.js b/server/src/discord/new_auction.js index 9155add3..8ceddd3f 100644 --- a/server/src/discord/new_auction.js +++ b/server/src/discord/new_auction.js @@ -9,7 +9,7 @@ function money(num) { return `$${num || 0}k`; } function getAuctionMax() { - return 8; + return 7; } function deAirtable(obj) { @@ -62,7 +62,7 @@ const Auction = { activePlayer: null, wait: { afterInitial: 20, - afterBid: 12 + afterBid: 15 }, stats: {}, timeouts: {}, @@ -172,7 +172,7 @@ const Auction = { getBroadcast: async function() { try { return await select("Broadcasts", { - filterByFormula: "{Key} = \"bpl3\"" + filterByFormula: "{Key} = \"vvl\"" }); } catch (e) { console.error(e); diff --git a/server/src/index.js b/server/src/index.js index 470f5f7b..0f7dacd2 100644 --- a/server/src/index.js +++ b/server/src/index.js @@ -37,12 +37,12 @@ function corsHandle(origin, callback) { const io = require("socket.io")(http, {cors: { origin: corsHandle, credentials: true}, allowEIO3: true}); -// const auction = require("./discord/new_auction.js")({ -// to: (...a) => io.to(...a), -// emit: (...a) => io.emit(...a), -// on: (...a) => io.on(...a), -// test: ["hi"] -// }); +const auction = require("./discord/new_auction.js")({ + to: (...a) => io.to(...a), + emit: (...a) => io.emit(...a), + on: (...a) => io.on(...a), + test: ["hi"] +}); const Cache = (require("./cache.js")).setup(io); diff --git a/website/src/components/broadcast/auction/AuctionOverlay.vue b/website/src/components/broadcast/auction/AuctionOverlay.vue index c0252d91..bfa4e35a 100644 --- a/website/src/components/broadcast/auction/AuctionOverlay.vue +++ b/website/src/components/broadcast/auction/AuctionOverlay.vue @@ -19,8 +19,8 @@
{{ player.name }}
-
- +
+
@@ -126,6 +126,22 @@ export default { return true; }).sort((a, b) => sortEvents(a.event, b.event)); }, + groupedTeams() { + if (!this.broadcast?.event?.game) return [{ teams: this.playerTeams, group: "all" }]; + const sameGame = []; + const diffGame = []; + this.playerTeams.forEach(team => { + if (team.game?.[0] === this.broadcast.event.game) { + sameGame.push(team); + } else { + diffGame.push(team); + } + }); + return [ + { teams: sameGame, group: "same" }, + { teams: diffGame, group: "diff" } + ]; + }, eventLogo() { if (!this._broadcast?.event?.theme) return {}; return resizedImage(this._broadcast.event.theme, ["default_logo", "default_wordmark"], "h-200"); @@ -174,12 +190,13 @@ export default { }, displayTeams() { if (!this.teams?.length) return []; - let teams = this.teams; - if (this.teams.length > 8) { - if (this.rightDisplay === "teams-1") teams = teams.slice(0, 8); - if (this.rightDisplay === "teams-2") teams = teams.slice(8, 16); - } + const teams = this.teams; return teams; + // if (this.teams.length > 8) { + // if (this.rightDisplay === "teams-1") teams = teams.slice(0, 8); + // if (this.rightDisplay === "teams-2") teams = teams.slice(8, 16); + // } + // return teams; }, signedTeam() { if (!this.justSigned?.id) return null; @@ -338,6 +355,7 @@ export default { .event-stats div { margin: 2px 0; } - - + .group-diff { + transform: scale(0.75); + }