diff --git a/admin_votes.go b/admin_votes.go index 582ba50..3030bc3 100644 --- a/admin_votes.go +++ b/admin_votes.go @@ -141,9 +141,15 @@ func handleAdminVotes(w http.ResponseWriter, req *http.Request, page *pageData) Results []Ranking } vpd := new(votePageData) + now := time.Now() + dayThresh := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) for i := range m.jam.Votes { v := new(vpdVote) - v.Timestamp = m.jam.Votes[i].Timestamp.Format(time.RFC3339) + if m.jam.Votes[i].Timestamp.Before(dayThresh) { + v.Timestamp = m.jam.Votes[i].Timestamp.Format("Jan _2 15:04") + } else { + v.Timestamp = m.jam.Votes[i].Timestamp.Format(time.Kitchen) + } v.ClientId = m.jam.Votes[i].ClientId for _, choice := range m.jam.Votes[i].Choices { for _, fndTm := range m.jam.Teams { diff --git a/assets.go b/assets.go index 1ec3136..260744c 100644 --- a/assets.go +++ b/assets.go @@ -192,43 +192,46 @@ var _escData = map[string]*_escFile{ "/assets/css/admin.css": { local: "assets/css/admin.css", - size: 291, - modtime: 1517696170, + size: 252, + modtime: 1529324817, compressed: ` -H4sIAAAAAAAC/2TPwWoDIRAG4LtPMZCzIWnpYXev+yKuWjtUZ2QcS6Dk3YtJWNrm+vvp/xvw6+iZNJLC -twEoThKSzfFdZzi/neplMVdjBttYlYtt1fn4297zoR8YSzrqRy8bOcw36bs0lhkqI2mU/UmJrWdtdixw -SFFuemMJUWY41ws0zhjgME3Tsp9YcQF7m+F1FAJszn8m4U7Bes6j57Cu6/K88OV0v1BdCEjp8cv/6V99 -NT8BAAD//49jsTYjAQAA +H4sIAAAJbogA/2SOzarDIBCF9z7FQNaGm3u5iyTbvIhRa4eqI6OWQMm7Nz9QKNl+8805x+CznakUCjIn +pS28BEBQ7DDKkw/Q/adlFKsQGFxb7jXMUaE/TF05Ew+QCGOxfFh7JNtcfclSUywKo+XDnomN3ewuLZDJ +o4Gm7/vxc5GsDNY8wN9euFGlH46pRrMF+b2nmaZpvC78/TkfkjIGo5Pe3sqVftureAcAAP//BQCMs/wA +AAA= `, }, "/assets/css/gjvote.css": { local: "assets/css/gjvote.css", - size: 4497, - modtime: 1517698891, + size: 5010, + modtime: 1529328784, compressed: ` -H4sIAAAAAAAC/6xX62rcOBT+n6cQhEICK2OnmSZxICz08gL9WfpDtjT2IbJkZHlm0pJ3X3TzWLY8XZaF -BMY6F53Ldy5qdcfR7yuEOhC4ZdC0ukRFnn94vnq/uqokfbPUWnKpSnT98PDwvMVMLKdmJ40pq6UiGqQo -kZCCWTqFQ1ZLoZnQlrMnlIJoSlTs+lNa63RxxUn9OmlpCd9bFUegui3RzluQtYxQppw/RDUgMGd7XaLc -kfcE31niXgqNB/jFSnTHOkfsFXRExe7m+cMje4jouGosS0Xq10bJUVCc4mZKSRXp+vIlz/N8Rr2gacZ7 -BaIfdbYHzuKoZTvWoeyTMR8hCkPPyVuJQHAQDFdcmnghVElFmSpR0Z/QIDlQdF3XtaOc8NASKo9GamAa -5ZbrY39C15TSszRWhMI4lOje5Ok9mKSIeAXRYPsVp8PlcyG9m59GFn3+/Pk5QIdwaESJaiY0Uw6Eo9ZS -ZMNYdaDxQWoTCGNF1skDw1BL4QI9qsFETwxYMZNcK33dMTHOrQvICki799b2cgCHWMU40XBgz1FySnRd -PBWPxaM5PrLqFTSWB6b2XB7xUCvJuc2LlmPdzq7O+lExbH5iA08QLusbGUuJCWlYXlOFGKOhWIBhQsFG -USJ0bEEzPPSkZubwqEg/t8Fe7+KfMjoOG6kGyUdtT7XsS+QDq1yc/ZevS8tQxGcqlL479a5aE58vdhZv -p9RadlGqF0h0l06485oX7poWRUD4NjJ5HCKW9jf20d4TcJUo74CjrZtfRr7VGWaithNKBb+MGPcQtHIT -LE8lcseubLsm0+3YVYKAY5x125CJ06oFm7OodkzEJz1b8Zqwt1SXcOrr168zMLs03eW+2WT+OO5+u0C1 -2J11/CUJD0DZsB4JuxT0FqIHpjTUhM+lrXGxsAPeTJoT1bDloCkeA7mCBq/NLiaHjYHnWeobojk05Mya -uiLbU0t3nXPFMGuongUTD5cUG0LB+TUlWExGLa1CTSrOwsXaLA0vml6ywAmExHreVW4tF9J7KZ2/6Sp2 -08MCxXRM163wef5eGK/ndvrt27e1Di2bhjO8BzUsDXCAmUZb3GYcHlIs78kLOqDUT/fFyIz7owMujuao -P1yHI3URJ2tHjPxlP1Ic/8WiyKSSwmDSS7dy5HeC8Pn09OT7paSE42kxXZRgEbDj+Uwn5MSxHmCACjjo -txK1QCkT2/3cr42zdu5/bywR4TtdSr8wCMpOli1P90DVVOQm/wv5v2x3m3DjhcJh0TM+mP+ZYY+hZweG -vD/5Qk2G2QI/uZQFU2NEhuG8Wt43Kp3C4Zp1FTQNE4x+rxVj4nvrCzpsbL2EEKotEy+oeoGu+R3Nqfnk -8hmaJpeZmvuR88HKL6fgh0SO/7zhxGhJQmDeM6d8BFwUeV7MKmQvVYfsVv0jVMnPUkh980O/9eznbRZO -TS1hC+vQPjYTHD53u525yW3wdk6p+cZ0n4cp9HfHKBB0Yx5lE5F1t5b7vFSvd611POch3MOJ2afF+9Wk -Z7VmJtauFfu0diwEQIAGwp8j27whVslqWUy5kDB4kWZTGa7n+AOnfPYCXXTJSbtltDDkZGg96/xFen/R -ijnw0h5Oumev0D/MwWgSesgsdA1jXbNh2NZ2d/dE9k8XtUXv/0V8HnYhPGf0+SIlgqKbc3l/3JnXzq3f -Nw+uaIxmJTk2RvWIk4rxLJzZL3/neqf6N1d+ujcXusNZQTz+/2b8EwAA//8cq67XkREAAA== +H4sIAAAJbogA/6xY3WvcOBB/z18hCIWm1O5umm02GwgH/eAe7p76WPogW7ItIltGlpNNS//3G315JVve +HseVBmJpNPrNzG8+lEa1HP28QKhlXdZQVjfqgLabzav7i18XF4UgL2a3FFzIA7q8vb29XxPGRlLRo8oI +LYXEionugDrRUbNP2FNeik7RThnJHhPCuho07PpjWut0ccFx+ThpaTCvjIpnRlRzQDuHIG8oJlRae7Cs +QR+nFWjb2O0KZ9dmswIY2cB+0AO6pq3d7CWDM7G5m83tnt5G+1lRG5ECANVSjB3JUtJUSiEjXZ8+beBf +sHtGUyB7wbp+VHnFOI29lu9oi/IPGj5ChA09xy8HxDrOOpoVXGh/gXIhwSPgz/6IBsEZQZdlWdqdYzY0 +mIhnfWqgCm2M1Hv4uSSEnE5nEhM2Dgd0o+P0y0OSuHsEJJn5isNh4zk7vQtXI0QfP36899TBnNXAmhJY +QqUl4aiU6PJhLFqmsiehtCM0irwVTzRjwCnr6FEO2nvdkEmqg2tOX7a0G0N0nlmeaTcObS8GZhkrKQfu +PtH7KDgQlu3ddr/d6+VnWjwCGLhfVlw8Z0MpBecmLkqMZRNcnfejpJn+NdP0BBmDZiViqWOQQSDymErE +mA3bGRkmFqwkJdjRMEWzoccl1YvPEvchBnO99X8KdOw2XEA4R2VWlegh66xjpfWz+3J5aQS28Zr0qW9X +nakG4hkjdD5ZnAJwtlGoZ0y0l068c5pn5uoShcE4GVvsPZa2N7bR3ON5lUhvz6O1mx9GvlYZgqOmEgrJ +fuhj3FHQnJtoeTwgu2zTtq1z1Yxt0WFmBYNq6yNxXJRgvRbljvb4pGfNXxP35uoSRn3+/Dkgsw3T9cYV +m9wtx9Vv53cNd4OKP9+CMk/osGwJuxT1ZkfBjYqVmIenDbj4sCVecJrDOp03mu3ebxeszpawt5PBGuCp +l7qCqBf1dm6gLrbNqtm3lXMhEBRUJwI7fFUMIW/8cscjxqMSRqHCBaf+YqWHhgdFziGwB3xgnewitkYK +qUoIa286i233METRFdNWq+zUf8+011M5/fLly1KHEnXNaVYxOcwBWMJMrS0uM5YPKZFfyQtaRojr7rOW +GddHS9ws6qNucemO1EUcLw3R58/bkZL4L4giSAcoFDq8ZC1Gbibwn3d3d65eCgKcnAbTWQpuPXecnK6E +UI6M6BMbWME4U1CdGnA57dbruRsbg3Lufl8ZIvx3OpV+wIxE6NGIbdI1UNYFfr15i9z/fHeVMOMBSv6s +ZrzSPwGwva/ZXgBwu0RNutkQPzmUeagxI31zXgzvK5kOiC9pCxWvph0lX0tJafe1cQntJ7ZeMO+qNYhn +VD1AX/sZ9amwc7kITZ1Ld81q5Hww5+dd8FUixr+fcGK2JCkQ1swpHp4XcNM2yJBKyBaZqfqbz5Lvh06o +19/US0+/X+V+VedSZmjty8dqgP3nbrfTN9kJ3vQpGU5MNxvfhf5oKWEYvdaPsmmTtldG+jRUL2etpT9D +F1bsSM3TAq7wehZjZmLsWohPY8fsAOvgJszvI2wOiFGyGBZTJiQAz8KsM8PWHLdglQcv0FmVnLQbQUND +qMeNEw1fpDdnUYTES1s46Q5eob/pg1EndJSZ6RrGsqTDsK7t+voOV3fr2kDfuzfoa6vHDpu9A3rzzhPN +5SPuCHBuyuT3O/2wuXKj5ZPNDx16GGozfX+POC4oz/2a+XIYl+OThgFBgvfUS3Ya0pJ082JD68ekQIzQ +Co/8pFBR3GYt7nBNgV3KcXlY4ohgrJx6CPtkzCQ7+thX3uRQhWFQgzEKK+vct+j0Klhz8Cmp5x4O/0Kz +zuD/PRpJN5+iEXLnz5N1UEv/BuPG9t/bOSMYutkb65G9wWn7DT2DkrhP6PxwE6r8yxbZpcpQT3DknwAA +AP//znRJ1pITAAA= `, }, @@ -323,27 +326,28 @@ H4sIAAAAAAAC/wEAAP//AAAAAAAAAAA= "/assets/js/gjvote.js": { local: "assets/js/gjvote.js", - size: 3561, - modtime: 1517696170, + size: 3874, + modtime: 1517841211, compressed: ` -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 `, }, @@ -11942,67 +11946,69 @@ NeurW5vrS2g3c+5HAAAA//8MM1iJSgMAAA== "/templates/admin-clients.html": { local: "templates/admin-clients.html", - size: 1023, - modtime: 1517696170, + size: 1173, + modtime: 1529329301, compressed: ` -H4sIAAAAAAAC/5RTTYvbMBC951cMJsc6gh6LIigNhdAS9tA99DjxjGOBIgV51iWI/Pcif2zjbLJlcwjz -8UZ+b/SUEtgafBBY/eLjyaHwBgVX35xlLy1cLgtNtoPKYduui/aEFZcdR7EVusLsAiCRFRs8OqjGoQY7 -hj2zB3yRhn0GC5NWZDuzSAnYtdwfLbh3DJbWxThb9pXi9XshDpDTS+TyNiz3IRJHJqjYC8fCLAC0NIyU -o/zTEqdwSBvzPVr25M6wwyNrJc0tYNAO28295k9sBX748MfD9uke4Otc8lvAdU2rgV+ujay17AOdJ0BK -ENEfGJb2Eyw7+LJ+eFHwSDKZlGDZrbJeuFy0EroPeH7ebt4FbJ8et22dEVl95vKbW/h30bALfebpwfxV -2mueHTZraoQmcr0uFNLRejX6Rs0UKOLsvFcbnaI9YjwXRtupVCPUWH7OfxIOB8dl8IXRyhqt8A2fybAf -ZzLjwTGG+B8Wdf0OjX6B17u72uXkpVusVqOjtOpfzfACh+7fAAAA///E71UP/wMAAA== +H4sIAAAJbogA/5RUwYrbMBC95ysGkUMLdQQ9FsWwNJfQsuyhe+hxEo0TgSwZSesSlv33jqI4jd1smwRi +xqN5M8/znv36CqYB5xMsflDbWUy0woSLr9aQSxHe3mZKmx62FmNcitjhlqqeQjJbtKJ+9IBam2S8Q8tF +BbTHnmBD5ABf0p5TXJxIK8md6hmPJBvp2DrhxhIYvRQnbHXMiPM8H0pJ9xKomobVxgdNgTRsGUtB1DMA +xRNR5yj/VApDWG739QNzUpKDSf4RW7qSH6h4Zw+VxbAjUZftwHp1Y/13jAm+Of/LwfrpRszDeHV/MBwf +nynnTk+q0sbrw1DACw7odgRz8wnmPXxZvisuvLcmfXl7bMk2mfeLzCord3moEPaBmqWQqFvj5ElKySBG +PD+vV4yQmrIZzsp2wbQYDqJWZkg1CA1Wn/Ml+d2O9fWOz6XhP/7FZ/DQ/UxGPCgEH/7Domn+QcPpMQuW +RU93WeZng3Gt6kZyxxYtv0kfRhw/KtnVVzpdM8oIeBdm/XQXYuQA+EnxQgbgL8F5G5ctB7dO18X54lkO +8rtcvgvl9HcAAAD//w5BhnqVBAAA `, }, "/templates/admin-editteam.html": { local: "templates/admin-editteam.html", - size: 13682, - modtime: 1517696170, + size: 13866, + modtime: 1529328971, compressed: ` -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 `, }, @@ -12027,14 +12033,14 @@ tlNKdgYAAA== "/templates/admin-games.html": { local: "templates/admin-games.html", - size: 507, - modtime: 1517696170, + size: 592, + modtime: 1529329086, compressed: ` -H4sIAAAAAAAC/3SRvW7DMAyE9zzFwcjY2HsheyrQLUvzArR1jQ3YUiCpBgrB715I6k/aNNuJH0kdyRgx -vcLYgPrE5TJL4JMEqU+UxWPbdkpPa3e0OMtCj1FWoicNBkcJ1KpJfBcjOHvmgiD9TEy6rXLNIb8rDLN4 -31beupJweXM8/JWH3jpNR42BJtBV3Q5QYaTopJJ2ReRw9ywLcZSFqgnjNUj+/wUvgyONH23wP0g1pW2K -fH6lQm/1e8Exwok5E/vpAfsVj+2dbeHWo+5ixH6tk9M6GcK2qSbo24z7cKb5bnHl/1fy1wjZLY1Op8jR -MoZq8n7LpQr9CAAA//9TakiY+wEAAA== +H4sIAAAJbogA/3RRQW/zIAy991dYqMcvzf0T5TRpt162P2CKl0QiEAGLFFX97zPQqE3XXdCz3zN+ti8X +GL7A+QSHTxoni4neMCEHOEa4XnfSDLM6eehwpAg9zgSayME5EGuNbDO/42/IRioFCbUlGMxRlJqmxALO +FmM8iuhDFUzfgZpn2GgfDAUycCaXKAi1A5CpJzQZZRwqKGn1zh3gxI9sOboTazfv7NJYDB0JlUd6pVUf +PAu52PsU7xSj0ilnbt1l0t4sleaBA7qOYD/8g/0M/49/LBB+2zaKq/fzIZs/ZEMsk9PGchzRWqH0InWA +9qZfpe2k2JV5+PDVuE81G30mLR9xNfGwgY14XUKZl5zJ9y3ZuggG+Wj1/JX9CQAA//9YnNSjUAIAAA== `, }, @@ -12054,17 +12060,17 @@ vh6n2F5nK55X3h/q0K8AAAD//5F9arwmAwAA "/templates/admin-main.html": { local: "templates/admin-main.html", - size: 1541, - modtime: 1517696170, + size: 1534, + modtime: 1529324657, compressed: ` -H4sIAAAAAAAC/6yTT4/aMBDF7/spphESlybZP7dViISo1FP/aEvb85AMibXOmNqTIITy3SsnAUGX7SKW -C0OS5+fn+Y2TXDWQaXRuEmSGhViC9AbAv/cVICkf0u/1QqsMvpickrh8GD4sahHDYDjTKnueBGvFuVlH -2mQoynBUWlpOxjHmleK4MjnFt+Ngt9mqthT2DqGYotAULpV1AgcfYLsFtQT6A1GfwAeAW2jbw9Urqyq0 -m+0WiHNo2yD9jUoUF0ncKy6Oe/ffuBrPSXv3Ztpf5t+wSTx0P/kQhi9gTLU2a8qhXwdzspVi1O5SMlhL -+U4601rKM9l8Y70BrycWlaFQDjOtiMW9B9f+DBcj2x/hbWBT3gyZYYbsOdBJemHof1+digHsLq4lV2tx -ob+FqJhsfw/L+3RWW+s3e+oVSVzeD8YWuSAYqY8wauBxAtGcqpVGoU8o2G9xqBMvlE45aqI5YeV2ok42 -aqIn5Gdo28fuUZroK1YEbZssLMTpzq5vxM3x//2xj14eT65nBT8o8wBPzOtLcMGZ/Bsj5MbdXaJXBuly -c/GNGgdp17BrmxdYdck/+3pt89qR9eY/fT0xo0P5GwAA//8pWoRoBQYAAA== +H4sIAAAJbogA/6xTTW/bMAy991dwRoBcJrvtboVtIMiAnfaBrtvOis3YQmUpk2QHQdH/Psqyg2RN28Dt +xbLIp6dHPiotRQeF5NZmUZRfAPiAX+mv/pT/aFdSFPBVl5gmtA+JVeucVqBVQcn7LNoKVeptLHXBndAq +rg2us3nCy0aopKGzyeU8Gm/ZtAZZYGBOV5VEthbGOjhIwMMDiDXgX4iDAi8ALuHx8fD0xoiGmx1hUZWU +i/I/XDihqjQJiMlyr16US4kz1F69qva3/l9smgzdTz8w9sSMhZR6iyWEc3CHhgRzaac6w1tXv9GdBVGc +6c13JXfg8aicIDlUyFIK2ti32LWvYbJl+xJeN2yhdoNmWHLlfcCT7jHmv89OxWDsKNegbaWzrNDKcaHQ +hHdYX+fL1hh/2W1AkM/XA7HhqkKYiY8w6+Amg/gOm42kpn7mjocrDnHOA12PnHWE5Y0dQT2Mgrdc3VPs +pt+6Lv7GG6R9ujKQ5CNdaMTF8f++7KPg8eR6r+AnFt7AE/P61LjoTP878sDO+7eEzwzSdHLnG0XkfcPe +m7yiBnvyL359b/LWovHkv/x6YkaH5V8AAAD//6BFHFz+BQAA `, }, @@ -12079,17 +12085,17 @@ H4sIAAAAAAAC/wEAAP//AAAAAAAAAAA= "/templates/admin-teams.html": { local: "templates/admin-teams.html", - size: 1090, - modtime: 1517696170, + size: 1248, + modtime: 1529326977, compressed: ` -H4sIAAAAAAAC/5xT0arbMAx971eI0Melfh+u4cKFMdju070foETqjZnjBFvNGCH/Pmw3W1vSjS1Pknws -6Zwca7ITtA5jPFbNIDL0dRyxZWjZC4fK7AA0gqVj1Yh/Inpl7Kv1xngOXDdnkcHDVVzHc9tyjBV0gU/H -SiH11ith7KPy/L0y2q4tTggnrEd3jpXRyhp4IoI0RCs0O63ITmY3z2BP4AeBwyv3o0PhZxQ8JFyEZdkl -GuZlgDwCOpwYGmYPbWAUpt9t2EXOFwQbx5lXvlPn/BexOIQCyKzuw7oZAnFgulFJOkZKUfq0hDUsaWde -sGetpLuvf0WP79yzF/hi/bdNCPcNh7h19OlB1+uaVmWbVLvsqKUZ6McKmGcI6N8Z9vYD7Cf4eHwgNDyi -R2aeYT8dEklYFq2E7gEaVzskxVXBv719foZlqcxNmv79Vot5Bsc+AS+KPBhVmiVp/rTQVZpNvmHWm60U -k5W/en90aP2Gw9m31hWPZ2v/63Bix8L/O14Cxm5z+rUyq1EunmBP6a3kerGLVvkBlKdUTn8GAAD//1lQ -SRlCBAAA +H4sIAAAJbogA/5xTzW7bMAy+5ykII8c5ug+KgAEFhgFbT+0D0BYTC9OPISkZiqLvPkq2u6R1sWw+kTS/ +jz/iJ7U5Q28xpX3ThZyDa9OIPUFPPlNs1AZAIhjNv7P/ovUDoWsWxHiK1HYnhnm4sNt06ntKqYEh0mHf +CNTOeJEZmoSnX42SZqE4IBywHe0pcVQYBVwDShEpUG2k4P7U5vkZzAF8yLB7IDdazHSHGXclL8HLy6aM +oe4D1BIw4JmgI/LQR+Jc/YeGbKIKyNhZqnNVTFv918FSiFNCneqt2XYhaoqkr7aUB0JdrPLJHBdzcgd1 +j46kYOM6vpQM3j61FuORGvUDPR7JMTl8N/7nrShyHcV0Y/bX9XbUZYztOkaJzcPJ3AX9tCTwRiP6I8HW +fILtGT7vP3gh+GgvWjHH9rwr2+E8OV71mhxa28wppePXPDGWTvUbsrVB+XznMywvLSaux8dvd0yzUM9u +ubkbWRln+cAYO6+9wm+FvpvmHfDSrRJckdJV74K0yX9VJr+M8Sv6I98bOymwCu9fi2uylOl/y+eIaVit +frmZ5RrnwyOvi5JrfLpJNoo8J6FPf38HAAD//zs8r8zgBAAA `, }, @@ -12111,16 +12117,16 @@ GXvy3PwYKZ6fyZHhEKvyv82bVJmo3N8XAPZYvcMb01mHkXzjyL9wpz4sHABCwHMXXoE7Wthy9p3rhfjJ "/templates/admin-votes.html": { local: "templates/admin-votes.html", - size: 848, - modtime: 1517696170, + size: 881, + modtime: 1529325858, compressed: ` -H4sIAAAAAAAC/3xSTW/bMAy9+1cQRo6LBXS3ghEwpJdediiC3RWJrYXJkiExBobC/32QbEdLm/XGj0fy -8ZFo7ATaqZQObaR0cZz2OnhW1lNsZYP9gzxeYiTP8LLkUfQPsnl/h6j8G8HOfoPdBI8H6E40jE4xPSlW -3YqGeW4AKpoznAt+N3UnUsMKKaDd1L0o/xvm+bG4PHU/1UAwz3iOIOTSirzJNdVCYewkG2R1dgTWHNop -MKV98dttvxTiAhgvkfYfzf05REORDGjyXJYHQO5JGVnoIcfFKGF5sgMlVsOIgvt/E0dns1rPTx8TeTPr -31KNo1h65sg6B/kczB+5CfK1xj+c+5UX3RS8oWjkIuiVaFZRsPmMWBg/mzuA1QTA4KpTienMTG/nPPbB -6kpnrXS2zNH1lsLZm2brGa8Vog6rhDaxbitQXAVDfg2B7xzLbB/g6JVb0MGlUflD+73NxBz5/8sKp8DK -QXE/U0GxjkRRfkg2fwMAAP//DHOOx1ADAAA= +H4sIAAAJbogA/3xSwW7bMAy95ysII8c5BrZboQgY0ksvOxTB7rLFJsJkyZAYA0XRfx8l2VWSdT2FfHn0 +e3yU0GaGwaoY903AeLEU28E7UsZhaORGnL/LwyUEdATP5X/RMbZ5e4Og3Alha77BdoaHPeyOOE5WET4q +UruFDe/vG4DKpkSnzN/OPKHGhZJJDD0r94eRh9zSvPulRuRe9AE6WT6FTqeZWomO12CzpHqLYPS+mT1h +bHPfrPtFHwphugRs78u290FjQA0DL5uXBxB0RqVlticolCLD8mhGFB0XV1jybtwp3uGrAe/sa2tVOGEj +D9akTJ8eK5errJCQRVVQ7/WrXOP5OvGf1v5Oa6953hjWssSbbEdS45Qy7UhfM5aSG29rU3WHJDystzuc +vRmq2jJpTRYa6uE6hq4/ttzsY6KrYneGPsutbFHSe9I3S6z53aowumYo6MV7+uSaH0oWX4jfi7dxUm7f +/Mh6Ft3/k4ajJ2Uht/9a4d8iyUV6ZHLzNwAA//+9mrcmcQMAAA== `, }, diff --git a/assets/css/admin.css b/assets/css/admin.css index a63ecfa..2384de9 100644 --- a/assets/css/admin.css +++ b/assets/css/admin.css @@ -1,7 +1,3 @@ -div.content { - margin-left: 150px; -} - div.bottom-space { margin-bottom: 15px; } diff --git a/assets/css/gjvote.css b/assets/css/gjvote.css index 5c191f1..957a71f 100644 --- a/assets/css/gjvote.css +++ b/assets/css/gjvote.css @@ -312,21 +312,46 @@ input.larger { background-color: #229af9; color: #FFFFFF; } - - .content { - margin-left: 75px; - } } +/* Small Screens */ @media screen and (max-width:35.5em) { div.pure-control-group label.control-label { text-align: left; } -} - -@media screen and (max-width:64em) and (min-width: 48em) { - div.pure-control-group label.control-label { - text-align: left; + .only-large { + display: none; + } + .only-small { + display: default; + } + .team-management-buttons { + text-align:left; + } + .team-management-buttons>.pure-button { + margin-top: 1em; } } +/* Starting at Small, horizontal */ +@media screen and (min-width: 35.5em) { + div.content { + margin-left: 150px; + } + div.pure-control-group label.control-label { + text-align: left; + } + .only-small { + display: none; + } +} + +/* Small Horizontal to Medium */ +@media screen and (min-width: 35.5em) and (max-width: 48em) { } + +/* Medium Screens */ +@media screen and (min-width: 48em) and (max-width:64em) { } + +/* Larger Screens */ +@media (min-width: 64em) { } + diff --git a/assets/js/gjvote.js b/assets/js/gjvote.js index 812627a..04d171a 100644 --- a/assets/js/gjvote.js +++ b/assets/js/gjvote.js @@ -1,3 +1,26 @@ +(function(){ + document.onkeydown = function(evt) { + evt = evt || window.event; + var isEscape = false; + if("key" in evt) { + isEscape = (evt.key == "Escape" || evt.key == "Esc"); + } else { + isEscape = (evt.keyCode == 27); + } + if(isEscape) { + toggleAdminPanel(); + } + } + document.querySelector('.menu-button').onclick = function() { + var mnu = document.querySelector('#menu .menu-container'); + if(mnu.style.display == 'inline-block') { + mnu.style.display = 'none'; + } else { + mnu.style.display = 'inline-block'; + } + } +})() + function toggleAdminPanel() { var menu = document.querySelector('#menu'); if(menu.classList.contains('hidden')) { @@ -9,20 +32,6 @@ function toggleAdminPanel() { } } - -document.onkeydown = function(evt) { - evt = evt || window.event; - var isEscape = false; - if("key" in evt) { - isEscape = (evt.key == "Escape" || evt.key == "Esc"); - } else { - isEscape = (evt.keyCode == 27); - } - if(isEscape) { - toggleAdminPanel(); - } -} - function showModal(options) { var modal = document.getElementById('modal-overlay'); document.getElementById('modal-title').innerText = (options.title)?options.title:""; diff --git a/main.go b/main.go index 253c726..605b4c1 100644 --- a/main.go +++ b/main.go @@ -136,7 +136,7 @@ func main() { }() fmt.Printf("Listening on port %d\n", m.site.Port) - log.Fatal(http.ListenAndServe("127.0.0.1:"+strconv.Itoa(m.site.Port), chain)) + log.Fatal(http.ListenAndServe(m.site.Ip+":"+strconv.Itoa(m.site.Port), chain)) } func loadConfig() { @@ -154,6 +154,9 @@ func loadConfig() { case "-title": m.site.Title = val fmt.Print("Set site title: ", m.site.Title, "\n") + case "-ip": + m.site.Ip = val + fmt.Print("Set site IP: ", m.site.Ip, "\n") case "-port": var tryPort int var err error diff --git a/model_sitedata.go b/model_sitedata.go index 6150a40..894beff 100644 --- a/model_sitedata.go +++ b/model_sitedata.go @@ -12,6 +12,7 @@ import ( */ type siteData struct { Title string + Ip string Port int SessionName string ServerDir string @@ -32,6 +33,7 @@ type siteData struct { func NewSiteData(m *model) *siteData { ret := new(siteData) ret.Title = "ICT GameJam" + ret.Ip = "127.0.0.1" ret.Port = 8080 ret.SessionName = "ict-gamejam" ret.ServerDir = "./" @@ -65,6 +67,9 @@ func (s *siteData) LoadFromDB() error { if title, _ := s.m.bolt.GetValue(s.mPath, "title"); strings.TrimSpace(title) != "" { s.Title = title } + if ip, err := s.m.bolt.GetValue(s.mPath, "ip"); err == nil { + s.Ip = ip + } if port, err := s.m.bolt.GetInt(s.mPath, "port"); err == nil { s.Port = port } @@ -97,6 +102,9 @@ func (s *siteData) SaveToDB() error { if err = s.m.bolt.SetValue(s.mPath, "title", s.Title); err != nil { return err } + if err = s.m.bolt.SetValue(s.mPath, "ip", s.Ip); err != nil { + return err + } if err = s.m.bolt.SetInt(s.mPath, "port", s.Port); err != nil { return err } diff --git a/templates/admin-clients.html b/templates/admin-clients.html index bf27b6c..342845f 100644 --- a/templates/admin-clients.html +++ b/templates/admin-clients.html @@ -4,20 +4,16 @@ - - - - - + + + + + {{ range $i, $v := .TemplateData.Clients }} - - - - + + + + {{ end }} diff --git a/templates/admin-editteam.html b/templates/admin-editteam.html index aaf451a..e7fbace 100644 --- a/templates/admin-editteam.html +++ b/templates/admin-editteam.html @@ -1,10 +1,10 @@ {{ $uuid := .TemplateData.UUID }}
-
+

Team Management

- - - +
+
+
@@ -16,10 +16,10 @@
-
- Cancel - - +
+ Cancel + +
@@ -73,9 +73,9 @@
- - - + + + @@ -83,9 +83,9 @@ {{ range $i, $v := .TemplateData.Members }} - - - + + + - + {{ range $i, $v := .TemplateData.Teams }} - - + + {{ end }} diff --git a/templates/admin-main.html b/templates/admin-main.html index 489cc8a..a7e1c9d 100644 --- a/templates/admin-main.html +++ b/templates/admin-main.html @@ -1,4 +1,4 @@ -
+

Public Mode

diff --git a/templates/admin-teams.html b/templates/admin-teams.html index 58721c1..b37919b 100644 --- a/templates/admin-teams.html +++ b/templates/admin-teams.html @@ -8,19 +8,19 @@
- - - + + + {{ range $i, $v := .TemplateData.Teams }} - - - - + + + +
Friendly NameClient IDLast Known IPAuthenticatedAuthNameClient IDLast Known IPAuthenticated
{{ $v.Name }}{{ $v.UUID }}{{ $v.IP }}{{ if $v.Auth }} Yes {{ else }} No {{ end }} {{ if $v.Auth }} @@ -25,6 +21,10 @@ {{ end }} {{ $v.Name }}

({{ $v.UUID }})

{{ $v.UUID }}{{ $v.IP }}{{ if $v.Auth }} Yes {{ else }} No {{ end }}
NameSlack IDTwitterEmailSlack IDTwitterEmail Remove
{{ $v.Name }}{{ $v.SlackId }}{{ $v.Twitter }}{{ $v.Email }}{{ $v.SlackId }}{{ $v.Twitter }}{{ $v.Email }}
diff --git a/templates/admin-games.html b/templates/admin-games.html index dfdb7fe..1c7feaf 100644 --- a/templates/admin-games.html +++ b/templates/admin-games.html @@ -5,15 +5,15 @@
Game NameTeam NameTeam Name Screenshots
{{ $v.Game.Name }}{{ $v.Name }}{{ $v.Game.Name }}

by
{{ $v.Name }}

{{ $v.Name }} {{ len $v.Game.Screenshots }}
NameManagement LinkMembersGameManagement LinkMembersGame
{{ $v.Name }}{{ $v.UUID }}{{ len $v.Members }}{{ $v.Game.Name }}{{ $v.Name }}

{{ $v.Game.Name }}

{{ $v.UUID }}{{ len $v.Members }}{{ $v.Game.Name }} diff --git a/templates/admin-votes.html b/templates/admin-votes.html index 203e447..fef9990 100644 --- a/templates/admin-votes.html +++ b/templates/admin-votes.html @@ -9,16 +9,15 @@ - - + + {{ range $i, $v := .TemplateData.AllVotes }} - + {{ end }}
TimestampClient IDTime RankingsClient ID
{{ $v.Timestamp }}{{ $v.ClientId }}
    {{ range $ci, $cv := $v.Choices }} @@ -26,6 +25,7 @@ {{ end }}
{{ $v.ClientId }}