From 1cc38665e562c7b447f073fd786a0167c4444271 Mon Sep 17 00:00:00 2001 From: Elijah Steres Date: Tue, 29 Dec 2020 22:21:47 -0500 Subject: [PATCH 1/4] nearly done with the html/css; grids are the worst --- static/.DS_Store | Bin 0 -> 6148 bytes static/games_page.css | 164 ++++++++++++++++++++++++++++++++++++- static/img/base_empty.png | Bin 0 -> 1169 bytes static/img/base_filled.png | Bin 0 -> 1194 bytes static/img/out_in.png | Bin 0 -> 4094 bytes static/img/out_out.png | Bin 0 -> 3443 bytes templates/index.html | 56 ++++++++++++- 7 files changed, 217 insertions(+), 3 deletions(-) create mode 100644 static/.DS_Store create mode 100644 static/img/base_empty.png create mode 100644 static/img/base_filled.png create mode 100644 static/img/out_in.png create mode 100644 static/img/out_out.png diff --git a/static/.DS_Store b/static/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a09a1797229b394436d0b5a793040fb34b159a6f GIT binary patch literal 6148 zcmeHKJ5Iwu5S<|@EYYN(K%&_z8Dj+1Z^dai_c^WhV%a7hup zk!GHEKD+iSc03}YtK)VlvJjC5YA7#eYO%O!B^T+L1J(9et{;c~P~}ZItac{P(#vkY ztLih-4_&v}4;$n*H&^$sAMbCsKXv`EoroTus$HkvhcPlh2FL&zAOq*l0D87ba~ViW z2FL&z_-4TFhXOTh6URWmI$(SR0NQW73!Z(J02Xrq+r%*t9*9OMFiJH?42^R5OXjtS zV_=kv`pMWQPu84J)K7=Mc)DmCNJ|FDz$pW>ST3yp-$DPF|4)m!A_HXLtQgRFx9(Q> zr0lKL$62o}&c}*5j~)%+dJZ?nR>P-5nMwE9UBSbXjuAv7zILkL|>`GY5)m?jAmVeYeK>Pj=s*zX<=N#$2QHQRXslcSUnW+T}}@ z?}ghVJcByUcOK{6rSMVtdg}E17UHsE6=^34nz#BZf4IxkPl_?x zc`D&agoCJ-%5naG?E80{atBY&3o>A1iOcz&%=6+N>#Wk-|LnHCea88qo^9QhZToLA zq}h9}-@f&Opuq;-n3(ORmHa#IFt*JvIXOY*q<^r6NW*vIU&~|+D!9L_+qrk^x58fx zDJxb#m45I*phHBn`tIYqwsZIXtzLHZK7X21(W0Bp-j2X%VN3FMcVYMsf(!O8p9~b? zEbxddW?;}$24TjErS@e&LG}_)Usv`gJYw8DN-fOa>w!X&C9V-A&iT2ysd*&~&PAz- zC8;S2<(VZJ3hti10pX2&;tUK-nVv3=Ar-gY-cjs|4wPtnIRB7nq=W0-H3~^Sp$l%$ zFwo`<)x2tW(>W!`ZAxII!vm+3MXR)o0)!=I248mYojhaZ&w28EF@+Y-YTrFw5k1v5 ze$}h+(7pP?=JQvt`WtDlaH5yL@rOVMoH%l%zNRK;^;NE>BR}~0`QKL9Y`Yd!U02tp zVEV68fuj$u5URz|<SZi@p~ui6%)r|8jJA1A?In19OO8{Pe7_^{dBXwi51gx6h|-UU}`-)!Op%^3c$$ zrFZvltFf@J*{zalHv6th-tN0q&i5;PmtQWkn!9e>jkjgn=X`&e&r69f|CEs8D=cBL zkmJ|B{K+R>{-m%xa#pZ|6Lm&##Q`jzf9`qvz53&1U_kaQcy0BumJ=2w;7~pH{mYO2 Zj7cdjD^nWI)d5o`gQu&X%Q~loCIE+802u%P literal 0 HcmV?d00001 diff --git a/static/img/base_filled.png b/static/img/base_filled.png new file mode 100644 index 0000000000000000000000000000000000000000..84e24edcff0924f8db5ff4fbf808277de863a55f GIT binary patch literal 1194 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU~I{Bb`J1#c2+1T%1_J8No8Qr zm{>c}*5j~)%+dJZ?nR>P-5nMwE9UBSbXjuAv7zILkL|>`GY5)m?jAmVeYeK>Pj=s*zX<=N#$2QHQRXslcSUnW+T}}@ z?}ghVJcByUcOK{6rSMVtdg}E17UHsE6=^34nz#BZf4IxkPl_?x zc`D&agoCJ-%5naG?E80{atBY&3o>A1iOcz&%=6+N>#Wk-|LnHCea88qo^9QhZToLA zq}h9}-@f&Opuq;-n3(ORmHa#IFt*JvIXOY*q<^r6NW*vIU&~|+D!9L_+qrk^x58fx zDJxb#m45I*phHBn`tIYqwsZIXtzLHZK7X21(W0Bp-j2X%VN3FMcLCBs@Y8vBJ&@uo z@Q5sCV9-+rVaAH3_GLgp_7YEDSN117V%*$nXY`jY1PV!(xJHyX=jZ08=9Mrw7o{ea zq^2m8XO?6rxO@5rgg5euGcYhUdAc};RNQ)db7R)zM26Of&5F+3_4x8+xo#Tmn6Yth z&y={X*%sw5MJ+6^c`~(DNuPZ3YguvjUt55dQz^Q_+r{I~x}m{;RQ*zxMj80ngzL5jqMPz5j~^ zM2@#R)NmZ30`aGc<&n6uzxQVcNAiJDVA=GsLT6t*(?>-Cc@P1Loz~xXhovz)v|;z&adFv&7_y85}Sb4q9e E0AKt8jsO4v literal 0 HcmV?d00001 diff --git a/static/img/out_in.png b/static/img/out_in.png new file mode 100644 index 0000000000000000000000000000000000000000..0e6fa3eecb05372367899dc5b10ed0d4939ebfb2 GIT binary patch literal 4094 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 VaMp0zzperhMN3T&Uax8s^ilASE0gw$Y= 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 PwR;07B--?e2`=G($$vw& literal 0 HcmV?d00001 diff --git a/templates/index.html b/templates/index.html index af42576..ab2df6c 100644 --- a/templates/index.html +++ b/templates/index.html @@ -16,7 +16,61 @@
-
+
+
+
+ Inning: πŸ”Ό 1/9 +
+
+ 🌟 Supernova +
+
+
+
+
+
Halifax Fire Sharks
+
0
+
+
+
Dead Batteries
+
1
+
+
+
+
+ +
+ + +
+
+
+
OUTS
+
+ + +
+
+
+
+
+
Pitcher:
+
Hot Fish Summer
+
+
+
Batter:
+
Shape Batteries
+
+
+
+
🏏
+
Shape Batteries grounds out to Honk For Santa.
+
+
+
+
Dead Batteries batting
+
+
From 53da277ee56757472b2f95684de38e601bc2dc71 Mon Sep 17 00:00:00 2001 From: Elijah Steres Date: Tue, 29 Dec 2020 22:29:28 -0500 Subject: [PATCH 2/4] tiny tweaks trying to fix wide team names not getting shortened --- static/games_page.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/static/games_page.css b/static/games_page.css index fd2aabd..999f63f 100644 --- a/static/games_page.css +++ b/static/games_page.css @@ -7,7 +7,7 @@ body { .container { font-family: 'Alegreya', serif; display: grid; - grid-template-columns: 1fr 1fr 1fr; + grid-template-columns: repeat(auto-fill, minmax(500px, 1fr)); grid-template-rows: 100px 330px; grid-gap: 50px 30px; /*space between rows, then columns*/ align-items: center; @@ -34,6 +34,7 @@ body { justify-self: stretch; text-align: center; color: white; + flex: 1; } .game { @@ -51,6 +52,7 @@ body { border-top: none; border-right: none; border-bottom: none; + flex: 1; } h2 { @@ -95,6 +97,7 @@ h2 { display: flex; flex-direction: column; justify-content: space-around; + flex: 1; } .team { From ed56c8c0ce0a6e94d39920ac56b04673112ebcdd Mon Sep 17 00:00:00 2001 From: Elijah Steres Date: Tue, 29 Dec 2020 22:57:07 -0500 Subject: [PATCH 3/4] html/css done! next, js loading. --- static/games_page.css | 5 +++- templates/game.html | 55 ++++++++++++++++++++++++++++++++++++++++++ templates/index.html | 56 +------------------------------------------ 3 files changed, 60 insertions(+), 56 deletions(-) create mode 100644 templates/game.html diff --git a/static/games_page.css b/static/games_page.css index 999f63f..b5a2453 100644 --- a/static/games_page.css +++ b/static/games_page.css @@ -82,7 +82,7 @@ h2 { .body { margin: 10px; display: grid; - grid-template-columns: 3fr 2fr; + grid-template-columns: 60% 40%; grid-template-areas: "scores info" "players players" @@ -119,6 +119,7 @@ h2 { padding-top: 8px; padding-bottom: 4px; margin-left: 15%; + margin-right: 10px; border-radius: 4px; } @@ -156,8 +157,10 @@ h2 { .score { background: #4f545c; /*discord's background-accent*/ width: 40px; + min-width: 40px; height: 40px; border-radius: 20px; + margin-left: 10px; } .players { diff --git a/templates/game.html b/templates/game.html new file mode 100644 index 0000000..e12a2e4 --- /dev/null +++ b/templates/game.html @@ -0,0 +1,55 @@ +
+
+
+ Inning: πŸ”Ό 1/9 +
+
+ 🌟 Supernova +
+
+
+
+
+
Halifax Fire Sharks
+
0
+
+
+
Dead Batteries
+
1
+
+
+
+
+ +
+ + +
+
+
+
OUTS
+
+ + +
+
+
+
+
+
Pitcher:
+
Hot Fish Summer
+
+
+
Batter:
+
Shape Batteries
+
+
+
+
🏏
+
Shape Batteries grounds out to Honk For Santa.
+
+
+
+
Dead Batteries batting
+
+
\ No newline at end of file diff --git a/templates/index.html b/templates/index.html index ab2df6c..af42576 100644 --- a/templates/index.html +++ b/templates/index.html @@ -16,61 +16,7 @@
-
-
-
- Inning: πŸ”Ό 1/9 -
-
- 🌟 Supernova -
-
-
-
-
-
Halifax Fire Sharks
-
0
-
-
-
Dead Batteries
-
1
-
-
-
-
- -
- - -
-
-
-
OUTS
-
- - -
-
-
-
-
-
Pitcher:
-
Hot Fish Summer
-
-
-
Batter:
-
Shape Batteries
-
-
-
-
🏏
-
Shape Batteries grounds out to Honk For Santa.
-
-
-
-
Dead Batteries batting
-
-
+
From b236445d8b1fc169ef879f439badc764527ee13e Mon Sep 17 00:00:00 2001 From: Elijah Steres Date: Wed, 30 Dec 2020 01:31:19 -0500 Subject: [PATCH 4/4] frontend complete! for now, at least --- main_controller.py | 4 +-- static/game.html | 49 +++++++++++++++++++++++++++++++++++++ static/games_page.css | 17 +++++++------ static/loader.js | 52 ++++++++++++++++++++++++++++++++++----- templates/.DS_Store | Bin 0 -> 6148 bytes templates/game.html | 55 ------------------------------------------ 6 files changed, 106 insertions(+), 71 deletions(-) create mode 100644 static/game.html create mode 100644 templates/.DS_Store delete mode 100644 templates/game.html diff --git a/main_controller.py b/main_controller.py index 0c36ce0..ddcd3b6 100644 --- a/main_controller.py +++ b/main_controller.py @@ -68,7 +68,7 @@ def update_loop(): for attempt in this_game.last_update[0]["steals"]: updatestring += attempt + "\n" - state["emoji"] = "πŸ’Ž" + state["update_emoji"] = "πŸ’Ž" state["update_text"] = updatestring else: @@ -85,7 +85,7 @@ def update_loop(): if this_game.last_update[1] > 0: updatestring += f"{this_game.last_update[1]} runs scored!" - state["emoji"] = "🏏" + state["update_emoji"] = "🏏" state["update_text"] = updatestring state["bases"] = this_game.named_bases() diff --git a/static/game.html b/static/game.html new file mode 100644 index 0000000..1e1dc91 --- /dev/null +++ b/static/game.html @@ -0,0 +1,49 @@ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+ + +
+
+
+
OUTS
+
+ + +
+
+
+
+
+
Pitcher:
+
+
+
+
Batter:
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/static/games_page.css b/static/games_page.css index b5a2453..10fe41b 100644 --- a/static/games_page.css +++ b/static/games_page.css @@ -7,7 +7,7 @@ body { .container { font-family: 'Alegreya', serif; display: grid; - grid-template-columns: repeat(auto-fill, minmax(500px, 1fr)); + grid-template-columns: repeat(3, minmax(500px, 1fr)); grid-template-rows: 100px 330px; grid-gap: 50px 30px; /*space between rows, then columns*/ align-items: center; @@ -84,7 +84,7 @@ h2 { display: grid; grid-template-columns: 60% 40%; grid-template-areas: - "scores info" + "teams info" "players players" "update update"; grid-template-rows: 130px; @@ -93,7 +93,8 @@ h2 { flex: 1; } -.scores { +.teams { + grid-area: teams; display: flex; flex-direction: column; justify-content: space-around; @@ -111,6 +112,7 @@ h2 { } .info { + grid-area: info; display: flex; flex-direction: column; align-items: center; @@ -124,7 +126,6 @@ h2 { } .batting { - grid-area: batting; font-size: 10pt; text-align: left; height: max-content; @@ -164,11 +165,11 @@ h2 { } .players { + grid-area: players; display: flex; flex-direction: column; justify-content: space-between; align-items: center; - grid-area: players; height: max-content; width: 100%; } @@ -177,7 +178,7 @@ h2 { display: flex; justify-content: space-between; width: 100%; - max-width: 330px; + max-width: 250px; } .player_name { @@ -200,10 +201,10 @@ h2 { flex-direction: column; } -.base1, .base2, .base3 { +.base { height: 60px; } -.base2 { +.base_2 { margin-bottom: -25% } diff --git a/static/loader.js b/static/loader.js index 550dfae..bb7190f 100644 --- a/static/loader.js +++ b/static/loader.js @@ -2,6 +2,7 @@ $(document).ready(function (){ var socket = io.connect(); var gameslist = []; var maxslot = 3; + var totalslots = 15; var grid = document.getElementById("container"); @@ -14,7 +15,7 @@ $(document).ready(function (){ if (!gameslist.includes(timestamp)) { //adds game to list if not there already gameslist.push(timestamp) var gridBoxes = grid.children; - for (var slotnum = 3; slotnum <= maxslot; slotnum++) { + for (var slotnum = 3; slotnum <= Math.min(maxslot, totalslots-1); slotnum++) { if (gridBoxes[slotnum].className == "emptyslot") { insertGame(slotnum, json[timestamp], timestamp); maxslot += 1; @@ -23,10 +24,10 @@ $(document).ready(function (){ }; }; - for (var slotnum = 3; slotnum <= maxslot; slotnum++) { + for (var slotnum = 3; slotnum <= Math.min(maxslot, totalslots-1); slotnum++) { if (grid.children[slotnum].timestamp == timestamp) { - console.log(json[timestamp].update_text) - grid.children[slotnum].textContent = json[timestamp].update_text; + console.log(json[timestamp].update_text); + updateGame(grid.children[slotnum], json[timestamp]); }; }; }; @@ -35,7 +36,46 @@ $(document).ready(function (){ const insertGame = (gridboxnum, gamestate, timestamp) => { var thisBox = grid.children[gridboxnum]; thisBox.className = "game"; - thisBox.timestamp = timestamp - thisBox.textContent = gamestate.update_text; + thisBox.timestamp = timestamp; + thisBox.id = "loadTarget"; + $('#loadTarget').load("static/game.html"); + thisBox.id = ""; + updateGame(thisBox, gamestate); + }; + + const BASE_EMPTY = "/static/img/base_empty.png" + const BASE_FILLED = "/static/img/base_filled.png" + const OUT_OUT = "/static/img/out_out.png" + const OUT_IN = "/static/img/out_in.png" + + const updateGame = (gamediv, gamestate) => { + gamediv.id = "updateTarget"; + $('#updateTarget .inning').html("Inning: " + (gamestate.top_of_inning ? "πŸ”Ό" : "πŸ”½") + " " + gamestate.display_inning + "/" + gamestate.max_innings); + $('#updateTarget .weather').html(gamestate.weather_emoji + " " + gamestate.weather_text); + + $('#updateTarget .away_name').html(gamestate.away_name); + $('#updateTarget .home_name').html(gamestate.home_name); + $('#updateTarget .away_score').html("" + gamestate.away_score); + $('#updateTarget .home_score').html("" + gamestate.home_score); + + for (var i = 1; i <= 3; i++) { + + $('#updateTarget .base_' + i).attr('src', (gamestate.bases[i] == null ? BASE_EMPTY : BASE_FILLED)); + } + + $('#updateTarget .outs_count').children().each(function(index) { + $(this).attr('src', index < gamestate.outs ? OUT_OUT : OUT_IN); + }); + + $('#updateTarget .pitcher_name').html(gamestate.pitcher); + $('#updateTarget .batter_name').html(gamestate.batter); + + console.log(gamestate.update_emoji); + $('#updateTarget .update_emoji').html(gamestate.update_emoji); + $('#updateTarget .update_text').html(gamestate.update_text); + + $('#updateTarget .batting').html((gamestate.top_of_inning ? gamestate.away_name : gamestate.home_name) + " batting."); + + gamediv.id = ""; }; }); \ No newline at end of file diff --git a/templates/.DS_Store b/templates/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 -
-
- Inning: πŸ”Ό 1/9 -
-
- 🌟 Supernova -
-
-
-
-
-
Halifax Fire Sharks
-
0
-
-
-
Dead Batteries
-
1
-
-
-
-
- -
- - -
-
-
-
OUTS
-
- - -
-
-
-
-
-
Pitcher:
-
Hot Fish Summer
-
-
-
Batter:
-
Shape Batteries
-
-
-
-
🏏
-
Shape Batteries grounds out to Honk For Santa.
-
-
-
-
Dead Batteries batting
-
- \ No newline at end of file