From a60edbde9daa116a33325955b920c52e06c5018b Mon Sep 17 00:00:00 2001 From: OJ Adeyemi Date: Mon, 6 May 2024 19:41:07 -0400 Subject: [PATCH] group pages together --- usport_flask_app/static/css/input.css | 14 +- usport_flask_app/static/css/output.css | 389 +++++++----------- usport_flask_app/templates/base.html | 4 +- usport_flask_app/templates/error.html | 195 ++++++++- .../templates/landing_page/countdown.html | 93 ++--- .../templates/landing_page/feedback.html | 66 +-- usport_flask_app/templates/league.html | 147 +------ .../templates/league_page/comingsoon.html | 22 +- .../templates/league_page/leaderboard.html | 107 +++++ .../templates/league_page/playoffs.html | 4 +- .../templates/league_page/standings.html | 100 +++++ .../templates/macros/standings_table.html | 74 ---- .../macros/stats_leaderboard_table.html | 27 -- usport_flask_app/templates/team.html | 18 +- .../templates/team_page/header.html | 7 - .../templates/team_page/per_game_stats.html | 77 ++-- .../templates/team_page/roster_table.html | 1 - .../templates/team_page/team_banner.html | 128 +++--- 18 files changed, 750 insertions(+), 723 deletions(-) create mode 100644 usport_flask_app/templates/league_page/leaderboard.html create mode 100644 usport_flask_app/templates/league_page/standings.html delete mode 100644 usport_flask_app/templates/macros/standings_table.html delete mode 100644 usport_flask_app/templates/macros/stats_leaderboard_table.html delete mode 100644 usport_flask_app/templates/team_page/header.html diff --git a/usport_flask_app/static/css/input.css b/usport_flask_app/static/css/input.css index 4339f37..1ace250 100644 --- a/usport_flask_app/static/css/input.css +++ b/usport_flask_app/static/css/input.css @@ -27,28 +27,16 @@ } .standings-team-logos { - @apply max-w-10 max-h-10 md:max-w-12 md:max-h-10 mx-6 px-1; + @apply max-w-10 max-h-10 md:max-w-12 md:max-h-10 px-1 mx-6 ; } .standings-table-rows { @apply text-sm md:text-base text-center even:bg-slate-900; } - .leaderboard-stats-subtitle { - @apply mb-4 mt-8 text-center text-xl font-bold; - } - - .leaderboard-stats-table { - @apply mx-auto mb-5 w-full rounded-lg bg-slate-950 text-sm shadow-md md:w-3/4 md:text-base lg:w-3/5; - } - .leaderboard-stats-rows { @apply even:bg-slate-900; } - .leaderboard-stats-images { - @apply max-w-10 max-h-10 md:max-w-12 md:max-h-10 mx-6 px-1; - } - .glossary-titles { @apply text-base md:text-lg font-semibold m-1; } diff --git a/usport_flask_app/static/css/output.css b/usport_flask_app/static/css/output.css index 3799440..730b71b 100644 --- a/usport_flask_app/static/css/output.css +++ b/usport_flask_app/static/css/output.css @@ -752,65 +752,11 @@ video { } } -.leaderboard-stats-subtitle { - margin-bottom: 1rem; - margin-top: 2rem; - text-align: center; - font-size: 1.25rem; - line-height: 1.75rem; - font-weight: 700; -} - -.leaderboard-stats-table { - margin-left: auto; - margin-right: auto; - margin-bottom: 1.25rem; - width: 100%; - border-radius: 0.5rem; - --tw-bg-opacity: 1; - background-color: rgb(2 6 23 / var(--tw-bg-opacity)); - font-size: 0.875rem; - line-height: 1.25rem; - --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); - --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); - box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); -} - -@media (min-width: 768px) { - .leaderboard-stats-table { - width: 75%; - font-size: 1rem; - line-height: 1.5rem; - } -} - -@media (min-width: 1024px) { - .leaderboard-stats-table { - width: 60%; - } -} - .leaderboard-stats-rows:nth-child(even) { --tw-bg-opacity: 1; background-color: rgb(15 23 42 / var(--tw-bg-opacity)); } -.leaderboard-stats-images { - margin-left: 1.5rem; - margin-right: 1.5rem; - max-height: 2.5rem; - max-width: 2.5rem; - padding-left: 0.25rem; - padding-right: 0.25rem; -} - -@media (min-width: 768px) { - .leaderboard-stats-images { - max-height: 2.5rem; - max-width: 3rem; - } -} - .glossary-text { margin-bottom: 0.25rem; font-size: 0.75rem; @@ -830,10 +776,6 @@ video { position: static; } -.absolute { - position: absolute; -} - .relative { position: relative; } @@ -842,28 +784,8 @@ video { bottom: 0px; } -.left-0 { - left: 0px; -} - -.right-0 { - right: 0px; -} - -.right-\[-25px\] { - right: -25px; -} - -.top-1\/2 { - top: 50%; -} - -.col-span-1 { - grid-column: span 1 / span 1; -} - -.col-span-2 { - grid-column: span 2 / span 2; +.col-auto { + grid-column: auto; } .m-1 { @@ -882,8 +804,13 @@ video { margin: 1.5rem; } -.m-8 { - margin: 2rem; +.m-auto { + margin: auto; +} + +.mx-2 { + margin-left: 0.5rem; + margin-right: 0.5rem; } .mx-4 { @@ -891,6 +818,11 @@ video { margin-right: 1rem; } +.mx-6 { + margin-left: 1.5rem; + margin-right: 1.5rem; +} + .mx-auto { margin-left: auto; margin-right: auto; @@ -931,11 +863,6 @@ video { margin-bottom: 2rem; } -.mx-2 { - margin-left: 0.5rem; - margin-right: 0.5rem; -} - .mb-1 { margin-bottom: 0.25rem; } @@ -976,32 +903,16 @@ video { margin-top: 0.75rem; } -.mt-4 { - margin-top: 1rem; -} - .mt-5 { margin-top: 1.25rem; } -.mt-9 { - margin-top: 2.25rem; -} - .mt-8 { margin-top: 2rem; } -.mb-10 { - margin-bottom: 2.5rem; -} - -.ml-20 { - margin-left: 5rem; -} - -.mt-10 { - margin-top: 2.5rem; +.mt-9 { + margin-top: 2.25rem; } .block { @@ -1032,6 +943,14 @@ video { height: 0.25rem; } +.h-1\/2 { + height: 50%; +} + +.h-1\/4 { + height: 25%; +} + .h-10 { height: 2.5rem; } @@ -1044,6 +963,10 @@ video { height: 7rem; } +.h-3\/5 { + height: 60%; +} + .h-32 { height: 8rem; } @@ -1068,20 +991,8 @@ video { height: 100vh; } -.h-1\/2 { - height: 50%; -} - -.h-px { - height: 1px; -} - -.h-20 { - height: 5rem; -} - -.h-1\/4 { - height: 25%; +.max-h-10 { + max-height: 2.5rem; } .min-h-screen { @@ -1104,6 +1015,10 @@ video { width: 75%; } +.w-3\/5 { + width: 60%; +} + .w-5 { width: 1.25rem; } @@ -1116,16 +1031,8 @@ video { width: 100%; } -.w-px { - width: 1px; -} - -.w-72 { - width: 18rem; -} - -.w-40 { - width: 10rem; +.max-w-10 { + max-width: 2.5rem; } .max-w-5 { @@ -1136,10 +1043,6 @@ video { max-width: 64rem; } -.max-w-md { - max-width: 28rem; -} - .max-w-screen-2xl { max-width: 1536px; } @@ -1148,28 +1051,10 @@ video { max-width: 36rem; } -.max-w-60 { - max-width: 15rem; -} - -.table-auto { - table-layout: auto; -} - .border-collapse { border-collapse: collapse; } -.-translate-x-full { - --tw-translate-x: -100%; - transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); -} - -.translate-x-full { - --tw-translate-x: 100%; - transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); -} - .transform { transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); } @@ -1186,14 +1071,6 @@ video { grid-auto-flow: column; } -.grid-cols-5 { - grid-template-columns: repeat(5, minmax(0, 1fr)); -} - -.grid-cols-4 { - grid-template-columns: repeat(4, minmax(0, 1fr)); -} - .grid-cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); } @@ -1202,10 +1079,6 @@ video { grid-template-columns: repeat(3, minmax(0, 1fr)); } -.grid-cols-1 { - grid-template-columns: repeat(1, minmax(0, 1fr)); -} - .grid-rows-1 { grid-template-rows: repeat(1, minmax(0, 1fr)); } @@ -1222,10 +1095,6 @@ video { flex-direction: row; } -.flex-row-reverse { - flex-direction: row-reverse; -} - .flex-col { flex-direction: column; } @@ -1234,14 +1103,6 @@ video { flex-wrap: wrap; } -.items-start { - align-items: flex-start; -} - -.items-end { - align-items: flex-end; -} - .items-center { align-items: center; } @@ -1250,10 +1111,6 @@ video { justify-content: flex-start; } -.justify-end { - justify-content: flex-end; -} - .justify-center { justify-content: center; } @@ -1274,10 +1131,6 @@ video { gap: 1rem; } -.gap-10 { - gap: 2.5rem; -} - .space-x-14 > :not([hidden]) ~ :not([hidden]) { --tw-space-x-reverse: 0; margin-right: calc(3.5rem * var(--tw-space-x-reverse)); @@ -1296,16 +1149,22 @@ video { margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse))); } +.space-y-2 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(0.5rem * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(0.5rem * var(--tw-space-y-reverse)); +} + .space-y-5 > :not([hidden]) ~ :not([hidden]) { --tw-space-y-reverse: 0; margin-top: calc(1.25rem * calc(1 - var(--tw-space-y-reverse))); margin-bottom: calc(1.25rem * var(--tw-space-y-reverse)); } -.space-y-2 > :not([hidden]) ~ :not([hidden]) { - --tw-space-y-reverse: 0; - margin-top: calc(0.5rem * calc(1 - var(--tw-space-y-reverse))); - margin-bottom: calc(0.5rem * var(--tw-space-y-reverse)); +.space-x-7 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(1.75rem * var(--tw-space-x-reverse)); + margin-left: calc(1.75rem * calc(1 - var(--tw-space-x-reverse))); } .divide-y > :not([hidden]) ~ :not([hidden]) { @@ -1354,9 +1213,9 @@ video { border-bottom-width: 2px; } -.border-cyan-800 { +.border-cyan-300 { --tw-border-opacity: 1; - border-color: rgb(21 94 117 / var(--tw-border-opacity)); + border-color: rgb(103 232 249 / var(--tw-border-opacity)); } .border-gray-300 { @@ -1364,6 +1223,11 @@ video { border-color: rgb(209 213 219 / var(--tw-border-opacity)); } +.border-gray-400 { + --tw-border-opacity: 1; + border-color: rgb(156 163 175 / var(--tw-border-opacity)); +} + .border-gray-800 { --tw-border-opacity: 1; border-color: rgb(31 41 55 / var(--tw-border-opacity)); @@ -1374,26 +1238,26 @@ video { border-color: rgb(255 255 255 / var(--tw-border-opacity)); } -.border-gray-200 { - --tw-border-opacity: 1; - border-color: rgb(229 231 235 / var(--tw-border-opacity)); -} - -.border-gray-400 { - --tw-border-opacity: 1; - border-color: rgb(156 163 175 / var(--tw-border-opacity)); -} - .bg-amber-200 { --tw-bg-opacity: 1; background-color: rgb(253 230 138 / var(--tw-bg-opacity)); } +.bg-black { + --tw-bg-opacity: 1; + background-color: rgb(0 0 0 / var(--tw-bg-opacity)); +} + .bg-gray-100 { --tw-bg-opacity: 1; background-color: rgb(243 244 246 / var(--tw-bg-opacity)); } +.bg-gray-200 { + --tw-bg-opacity: 1; + background-color: rgb(229 231 235 / var(--tw-bg-opacity)); +} + .bg-gray-800 { --tw-bg-opacity: 1; background-color: rgb(31 41 55 / var(--tw-bg-opacity)); @@ -1419,6 +1283,11 @@ video { background-color: rgb(15 23 42 / var(--tw-bg-opacity)); } +.bg-slate-950 { + --tw-bg-opacity: 1; + background-color: rgb(2 6 23 / var(--tw-bg-opacity)); +} + .bg-stone-800 { --tw-bg-opacity: 1; background-color: rgb(41 37 36 / var(--tw-bg-opacity)); @@ -1433,31 +1302,6 @@ video { background-color: rgb(91 33 182 / var(--tw-bg-opacity)); } -.bg-white { - --tw-bg-opacity: 1; - background-color: rgb(255 255 255 / var(--tw-bg-opacity)); -} - -.bg-gray-300 { - --tw-bg-opacity: 1; - background-color: rgb(209 213 219 / var(--tw-bg-opacity)); -} - -.bg-gray-200 { - --tw-bg-opacity: 1; - background-color: rgb(229 231 235 / var(--tw-bg-opacity)); -} - -.bg-gray-900 { - --tw-bg-opacity: 1; - background-color: rgb(17 24 39 / var(--tw-bg-opacity)); -} - -.bg-gray-400 { - --tw-bg-opacity: 1; - background-color: rgb(156 163 175 / var(--tw-bg-opacity)); -} - .bg-\[url\(\'https\:\/\/images\.pexels\.com\/photos\/5249020\/pexels-photo-5249020\.jpeg\?auto\=compress\&cs\=tinysrgb\&w\=1260\&h\=750\&dpr\=1\'\)\] { background-image: url('https://images.pexels.com/photos/5249020/pexels-photo-5249020.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1'); } @@ -1466,6 +1310,10 @@ video { background-image: linear-gradient(to right, var(--tw-gradient-stops)); } +.bg-gradient-to-tl { + background-image: linear-gradient(to top left, var(--tw-gradient-stops)); +} + .bg-gradient-to-tr { background-image: linear-gradient(to top right, var(--tw-gradient-stops)); } @@ -1498,10 +1346,6 @@ video { --tw-gradient-to: #fcd34d var(--tw-gradient-to-position); } -.to-amber-800 { - --tw-gradient-to: #92400e var(--tw-gradient-to-position); -} - .to-blue-800 { --tw-gradient-to: #1e40af var(--tw-gradient-to-position); } @@ -1510,8 +1354,8 @@ video { --tw-gradient-to: #a855f7 var(--tw-gradient-to-position); } -.bg-cover { - background-size: cover; +.to-slate-700 { + --tw-gradient-to: #334155 var(--tw-gradient-to-position); } .bg-clip-text { @@ -1523,6 +1367,10 @@ video { background-position: center; } +.p-2 { + padding: 0.5rem; +} + .p-3 { padding: 0.75rem; } @@ -1535,12 +1383,9 @@ video { padding: 2rem; } -.p-5 { - padding: 1.25rem; -} - -.p-10 { - padding: 2.5rem; +.px-1 { + padding-left: 0.25rem; + padding-right: 0.25rem; } .px-16 { @@ -1742,6 +1587,11 @@ video { color: rgb(37 99 235 / var(--tw-text-opacity)); } +.text-cyan-300 { + --tw-text-opacity: 1; + color: rgb(103 232 249 / var(--tw-text-opacity)); +} + .text-gray-300 { --tw-text-opacity: 1; color: rgb(209 213 219 / var(--tw-text-opacity)); @@ -1757,11 +1607,6 @@ video { color: rgb(107 114 128 / var(--tw-text-opacity)); } -.text-gray-600 { - --tw-text-opacity: 1; - color: rgb(75 85 99 / var(--tw-text-opacity)); -} - .text-gray-700 { --tw-text-opacity: 1; color: rgb(55 65 81 / var(--tw-text-opacity)); @@ -1772,6 +1617,11 @@ video { color: rgb(31 41 55 / var(--tw-text-opacity)); } +.text-gray-900 { + --tw-text-opacity: 1; + color: rgb(17 24 39 / var(--tw-text-opacity)); +} + .text-transparent { color: transparent; } @@ -1781,11 +1631,6 @@ video { color: rgb(255 255 255 / var(--tw-text-opacity)); } -.text-gray-900 { - --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); -} - .no-underline { text-decoration-line: none; } @@ -1888,6 +1733,10 @@ video { cursor: pointer; } +.hover\:border-transparent:hover { + border-color: transparent; +} + .hover\:bg-blue-300:hover { --tw-bg-opacity: 1; background-color: rgb(147 197 253 / var(--tw-bg-opacity)); @@ -1898,6 +1747,11 @@ video { background-color: rgb(37 99 235 / var(--tw-bg-opacity)); } +.hover\:bg-cyan-300:hover { + --tw-bg-opacity: 1; + background-color: rgb(103 232 249 / var(--tw-bg-opacity)); +} + .hover\:bg-gray-500:hover { --tw-bg-opacity: 1; background-color: rgb(107 114 128 / var(--tw-bg-opacity)); @@ -1933,10 +1787,21 @@ video { color: rgb(31 41 55 / var(--tw-text-opacity)); } +.hover\:text-white:hover { + --tw-text-opacity: 1; + color: rgb(255 255 255 / var(--tw-text-opacity)); +} + .hover\:underline:hover { text-decoration-line: underline; } +.hover\:shadow-lg:hover { + --tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); +} + .focus\:border-indigo-500:focus { --tw-border-opacity: 1; border-color: rgb(99 102 241 / var(--tw-border-opacity)); @@ -2021,6 +1886,10 @@ video { display: inline; } + .md\:flex { + display: flex; + } + .md\:table-cell { display: table-cell; } @@ -2037,6 +1906,10 @@ video { height: 3rem; } + .md\:max-h-10 { + max-height: 2.5rem; + } + .md\:w-11\/12 { width: 91.666667%; } @@ -2045,10 +1918,22 @@ video { width: 3rem; } + .md\:w-3\/4 { + width: 75%; + } + + .md\:max-w-12 { + max-width: 3rem; + } + .md\:max-w-7 { max-width: 1.75rem; } + .md\:items-center { + align-items: center; + } + .md\:p-4 { padding: 1rem; } @@ -2104,6 +1989,10 @@ video { } @media (min-width: 1024px) { + .lg\:flex { + display: flex; + } + .lg\:h-32 { height: 8rem; } @@ -2112,10 +2001,18 @@ video { height: 2.25rem; } + .lg\:w-1\/2 { + width: 50%; + } + .lg\:w-2\/3 { width: 66.666667%; } + .lg\:items-center { + align-items: center; + } + .lg\:px-32 { padding-left: 8rem; padding-right: 8rem; diff --git a/usport_flask_app/templates/base.html b/usport_flask_app/templates/base.html index 7cb8ef5..72d9521 100644 --- a/usport_flask_app/templates/base.html +++ b/usport_flask_app/templates/base.html @@ -12,8 +12,8 @@ - -
+ +
U Sports Basketball diff --git a/usport_flask_app/templates/error.html b/usport_flask_app/templates/error.html index a24fd1b..f5a0571 100644 --- a/usport_flask_app/templates/error.html +++ b/usport_flask_app/templates/error.html @@ -1,14 +1,191 @@ {% extends "base.html" %} {% block content %} -Error - -
-

- Oops! Something went wrong. -

-

{{ message }}

- Go back to homepage -
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

{{ message }}

+ + Home Page +
+
+
+
+ {% endblock %} \ No newline at end of file diff --git a/usport_flask_app/templates/landing_page/countdown.html b/usport_flask_app/templates/landing_page/countdown.html index b0ff356..f42d4b5 100644 --- a/usport_flask_app/templates/landing_page/countdown.html +++ b/usport_flask_app/templates/landing_page/countdown.html @@ -1,58 +1,59 @@ -
- -
-

2024-2025 Season Starts in:

-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ +
+

2024-2025 Season Starts in:

+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/usport_flask_app/templates/landing_page/feedback.html b/usport_flask_app/templates/landing_page/feedback.html index 0a0c0a9..baac6d9 100644 --- a/usport_flask_app/templates/landing_page/feedback.html +++ b/usport_flask_app/templates/landing_page/feedback.html @@ -1,34 +1,34 @@
- -

- Feedback -

-

- Appreciate any issues or feedback -

-
-
- - -
- -
- - -
-
- - -
- -
-

- Feel free to connect with me on my social media platforms. -

-
\ No newline at end of file + +

+ Feedback +

+

+ Appreciate any issues or feedback +

+
+
+ + +
+ +
+ + +
+
+ + +
+ +
+

+ Feel free to connect with me on my social media platforms. +

+ \ No newline at end of file diff --git a/usport_flask_app/templates/league.html b/usport_flask_app/templates/league.html index d67548b..c0b62ba 100644 --- a/usport_flask_app/templates/league.html +++ b/usport_flask_app/templates/league.html @@ -1,5 +1,3 @@ -{% import './macros/standings_table.html' as standings_table %} -{% import './macros/stats_leaderboard_table.html' as leaderboard_table %} {% extends "base.html" %} {% block subheader %} @@ -29,145 +27,15 @@

- -

- STANDINGS -

- -
-

OUA Conference

-
{{ standings_table.render_standings_table(league_path,["OUA East","OUA West","OUA Central"],teams)}}
-
-
-

CW Conference

-
{{ standings_table.render_standings_table(league_path,"CW",teams) }}
-
-
-

AUS Conference

-
{{ standings_table.render_standings_table(league_path,"AUS",teams) }}
-
-
-

RSEQ Conference

-
{{ standings_table.render_standings_table(league_path,"RSEQ",teams) }}
-
- +

STANDINGS

+ {% include "league_page/playoffs.html" %} + {% include "league_page/standings.html" %}
@@ -178,10 +46,7 @@

TEAM ANALYTICS

diff --git a/usport_flask_app/templates/league_page/comingsoon.html b/usport_flask_app/templates/league_page/comingsoon.html index d5c08bd..d3ebd82 100644 --- a/usport_flask_app/templates/league_page/comingsoon.html +++ b/usport_flask_app/templates/league_page/comingsoon.html @@ -1,12 +1,12 @@
- Logo -

- This page is under maintenance -

-
- Contact - Me - Standings -
-
\ No newline at end of file + Logo +

+ This page is under maintenance +

+
+ Contact + Me + Standings +
+
\ No newline at end of file diff --git a/usport_flask_app/templates/league_page/leaderboard.html b/usport_flask_app/templates/league_page/leaderboard.html new file mode 100644 index 0000000..b0cdf6d --- /dev/null +++ b/usport_flask_app/templates/league_page/leaderboard.html @@ -0,0 +1,107 @@ +{% set num = 10 %} + +{% macro render_player_row(player, category) %} + + {{ player.lastname_initials }}   {{ player.first_name }} + + + Team Logo + + {% if player.school == 'Toronto Metropolitan' %} + TMU + {% else %} + {{ player.school }} + {% endif %} + + + + {{ player[category] | round(1) }} + +{% endmacro %} + + +{% macro render_leaderboard_table(title,category,players) %} +

{{ title }}

+ + {% set count = namespace(value=num) %} + {% for player in players|sort(attribute=category, reverse=true) %} + {% if player.games_played > (0.6 * player.team_games_played) %} + {% if count.value >= 1 %} + {% if category == 'field_goal_percentage' %} + + {% if player.field_goal_made_per_game > 3 %} + + + {{ render_player_row(player, category)}} + + {% set count.value = count.value - 1 %} + {% endif %} + + {% elif category == 'three_pointers_percentage' %} + + {% if player.three_pointers_made_per_game > 1 %} + + + {{ render_player_row(player, category)}} + + {% set count.value = count.value - 1 %} + {% endif %} + + {% elif category == 'free_throws_percentage' %} + + {% if player.free_throws_made_per_game > 2 %} + + + {{ render_player_row(player, category)}} + + {% set count.value = count.value - 1 %} + {% endif %} + + {% else %} + + + + {{ render_player_row(player, category)}} + + {% set count.value = count.value - 1 %} + + {% endif %} + {% endif %} + {% endif %} + {% endfor %} +
{{ num - count.value + 1 }}
{{ num - count.value + 1 }}
{{ num - count.value + 1 }}
{{ num - count.value + 1 }}
+{% endmacro %} + + + +
{{ render_leaderboard_table("Points per game","points_per_game",players) }}
+ + +
{{ render_leaderboard_table("Rebounds per game","rebounds_per_game",players) }}
+ + +
{{ render_leaderboard_table("Assists per game","assists_per_game",players) }}
+ + +
{{ render_leaderboard_table("Field Goal Percentage","field_goal_percentage",players) }}
+ + +
{{ render_leaderboard_table("3PT per game","three_pointers_made_per_game",players) }}
+ + +
{{ render_leaderboard_table("3PT Percentage","three_pointers_percentage",players)}}
+ + +
{{ render_leaderboard_table("Blocks per game","blocks_per_game",players) }}
+ + +
{{ render_leaderboard_table("Steals per game","steals_per_game",players) }}
+ + +
{{ render_leaderboard_table("Free throws made per game","free_throws_made_per_game",players)}}
+ + +
{{ render_leaderboard_table("Free throws Percentage","free_throws_percentage",players)}}
\ No newline at end of file diff --git a/usport_flask_app/templates/league_page/playoffs.html b/usport_flask_app/templates/league_page/playoffs.html index d22b904..8dadca0 100644 --- a/usport_flask_app/templates/league_page/playoffs.html +++ b/usport_flask_app/templates/league_page/playoffs.html @@ -1,5 +1,5 @@
-

Canada West Playoff Bracket So Far

+

Canada West

Quarterfinals
@@ -89,7 +89,7 @@

Canada West Playoff Bracket So Far -

AUS Playoff Bracket So Far

+

AUS

Semifinals
diff --git a/usport_flask_app/templates/league_page/standings.html b/usport_flask_app/templates/league_page/standings.html new file mode 100644 index 0000000..c7e3ec1 --- /dev/null +++ b/usport_flask_app/templates/league_page/standings.html @@ -0,0 +1,100 @@ + +{% macro render_standings_table(title,league_path,conference_name,teams) %} +

{{ title }}

+
+ + + + + + + + + + + + + + + {% for team in teams if team.conference in conference_name %} + {% if conference_name == 'CW' and loop.index == 13 %} + + + + {% endif %} + {% if conference_name == 'AUS' and loop.index == 7 %} + + + + {% endif %} + {% if conference_name == 'RSEQ' and loop.index == 5 %} + + + + {% endif %} + + + + + + + + + + + {% endfor %} + +
#TEAM + + + W + + + + + L + + + + + L 10 + + + + + STRK + +
+
+
+
+
+
+
{{ loop.index }} + Team Logo + + {% if team.team_name == 'Toronto Metropolitan' %} + TMU + {% else %} + {{ team.team_name }} + {% endif %} + + {{ team.total_wins }}{{ team.total_losses }}{{ team.last_ten_games }}{{ team.streak }}
+
+{% endmacro %} + + +
+ +
{{ render_standings_table("OUA Conference",league_path,["OUA East","OUA West","OUA Central"],teams)}}
+ +
{{ render_standings_table("CW Conference",league_path,"CW",teams) }}
+ +
{{ render_standings_table("AUS Conference",league_path,"AUS",teams) }}
+ +
{{ render_standings_table("RSEQ Conference",league_path,"RSEQ",teams) }}
+ +
\ No newline at end of file diff --git a/usport_flask_app/templates/macros/standings_table.html b/usport_flask_app/templates/macros/standings_table.html deleted file mode 100644 index 22f64f9..0000000 --- a/usport_flask_app/templates/macros/standings_table.html +++ /dev/null @@ -1,74 +0,0 @@ - -{% macro render_standings_table(league_path,conference_name,teams) %} -
- - - - - - - - - - - - - - - {% for team in teams if team.conference in conference_name %} - {% if conference_name == 'CW' and loop.index == 13 %} - - {% endif %} - {% if conference_name == 'AUS' and loop.index == 7 %} - - {% endif %} - {% if conference_name == 'RSEQ' and loop.index == 5 %} - - {% endif %} - - - - - - - - - - - {% endfor %} - -
#TEAM - - - W - - - - - L - - PCT - - - L 10 - - - - - STRK - -
{{ loop.index }} - Team Logo - - {% if team.team_name == 'Toronto Metropolitan' %} - TMU - {% else %} - {{ team.team_name }} - {% endif %} - - {{ team.total_wins }}{{ team.total_losses }}{{ team.win_percentage }}{{ team.last_ten_games }}{{ team.streak }}
-
-{% endmacro %} \ No newline at end of file diff --git a/usport_flask_app/templates/macros/stats_leaderboard_table.html b/usport_flask_app/templates/macros/stats_leaderboard_table.html deleted file mode 100644 index ff55501..0000000 --- a/usport_flask_app/templates/macros/stats_leaderboard_table.html +++ /dev/null @@ -1,27 +0,0 @@ -{% set num = 5 %} -{% macro render_leaderboard_table(title,category,players) %} -

{{ title }}

- - {% set count = namespace(value=num) %} {% for player in - (players|sort(attribute=category, reverse=true)) %} {% if - player.games_played > (0.6 * player.team_games_played) %}{%if - count.value >= 1%} - - - - - - - - - {% set count.value = count.value - 1 %} {% endif %} {% endif %} {% - endfor %} -
{{ num - count.value + 1}} - {{ player.lastname_initials }}   {{ player.first_name }} - - Team Logo - {{ player.school }} - {{ player[category] | round(1) }} -
-{% endmacro %} \ No newline at end of file diff --git a/usport_flask_app/templates/team.html b/usport_flask_app/templates/team.html index 51f8885..d58db4c 100644 --- a/usport_flask_app/templates/team.html +++ b/usport_flask_app/templates/team.html @@ -1,19 +1,23 @@ {% extends "base.html" %} {% block subheader %} -{% include "team_page/header.html" %} +

+ {{ league }} League +

+ + Back + {% endblock %} {% block content %} -
+
-
- {% include "team_page/team_banner.html" %} + {% include "team_page/team_banner.html" %} - {% include "team_page/per_game_stats.html" %} + {% include "team_page/per_game_stats.html" %} - {% include "team_page/roster_table.html" %} -
+ {% include "team_page/roster_table.html" %}
{% endblock %} \ No newline at end of file diff --git a/usport_flask_app/templates/team_page/header.html b/usport_flask_app/templates/team_page/header.html deleted file mode 100644 index 1cf5494..0000000 --- a/usport_flask_app/templates/team_page/header.html +++ /dev/null @@ -1,7 +0,0 @@ -

- {{ league }} League -

- - Back - \ No newline at end of file diff --git a/usport_flask_app/templates/team_page/per_game_stats.html b/usport_flask_app/templates/team_page/per_game_stats.html index 60da8f0..3dd5972 100644 --- a/usport_flask_app/templates/team_page/per_game_stats.html +++ b/usport_flask_app/templates/team_page/per_game_stats.html @@ -1,44 +1,43 @@
-

- PER GAME - STATS VS OPPONENTS

- - {% for val in teamstats %} -
-
-
{{ val }}
-
{{ categories[loop.index - 1] }}
-
{{ opponentstats[loop.index - 1] }}
-
- + // Draw second colored segment + context.fillStyle = color2; + context.fillRect(percent1 + leadingspace, 0, percent2, canvas.height); + } + {% for val in teamstats %} +
+
+
{{ val }}
+
{{ categories[loop.index - 1] }}
+
{{ opponentstats[loop.index - 1] }}
- - {% endfor %} + +
+ + {% endfor %} -
\ No newline at end of file +
\ No newline at end of file diff --git a/usport_flask_app/templates/team_page/roster_table.html b/usport_flask_app/templates/team_page/roster_table.html index 246681c..b0820cb 100644 --- a/usport_flask_app/templates/team_page/roster_table.html +++ b/usport_flask_app/templates/team_page/roster_table.html @@ -91,7 +91,6 @@

Roster

div.dataTables_wrapper div.dataTables_filter { display: none; } - diff --git a/usport_flask_app/templates/team_page/team_banner.html b/usport_flask_app/templates/team_page/team_banner.html index d4f879f..42efa5f 100644 --- a/usport_flask_app/templates/team_page/team_banner.html +++ b/usport_flask_app/templates/team_page/team_banner.html @@ -1,79 +1,77 @@ + +
+
+
{{ team.last_ten_games }}
+
L10
+
- -
-
-
{{ team.last_ten_games }}
-
L10
-
- -
- Team Logo -
{{ team.team_name }}
+
+ Team Logo +
{{ team.team_name }}
- {% if team.conference == 'OUA East' or team.conference == 'OUA West' or team.conference == - 'OUA Central' %} -
- Team Logo -
- {% else %} -
- Team Logo -
- {% endif %} + {% if team.conference == 'OUA East' or team.conference == 'OUA West' or team.conference == + 'OUA Central' %} +
+ Team Logo
-
-
{{ team.streak }}
-
Streak
+ {% else %} +
+ Team Logo
+ {% endif %}
+
+
{{ team.streak }}
+
Streak
+
+
- -