diff --git a/ProjectSourceCode/src/resources/css/league-pages/league-page.css b/ProjectSourceCode/src/resources/css/league-pages/league-page.css index 37a9204..6baf1db 100644 --- a/ProjectSourceCode/src/resources/css/league-pages/league-page.css +++ b/ProjectSourceCode/src/resources/css/league-pages/league-page.css @@ -96,7 +96,7 @@ } /* Styling for Standings and Top Scorers Cards */ -#table-stats-container, #top-scorers-stats-container +#league-table-stats-container, #league-top-scorers-stats-container { /* --- POSITION CONTAINER --- */ margin: 0 10px; diff --git a/ProjectSourceCode/src/resources/css/league-pages/league-table.css b/ProjectSourceCode/src/resources/css/league-pages/league-table.css index 60f6ea2..6fa34c3 100644 --- a/ProjectSourceCode/src/resources/css/league-pages/league-table.css +++ b/ProjectSourceCode/src/resources/css/league-pages/league-table.css @@ -23,13 +23,13 @@ */ /* Container for Table */ -#table-stats-container +#league-table-stats-container { width: 100%; } /* Table that holds all the standing information */ -#standings-table +#league-standings-table { width: 100%; padding: 15px; @@ -60,11 +60,11 @@ */ /* Club Logo Column in Table Style */ - #club-logo-column { + #league-table-club-logo-column { width: 25px; /* Club Logo Style */ - #table-club-logo + #league-table-club-logo { width: 25px; margin-right: 5px; @@ -74,14 +74,14 @@ } /* Club Name Column in Table Style */ - #club-name-column + #league-table-club-name-column { font-weight: 500; cursor: pointer; } /* Points Column in Table Style */ - #points-column + #league-table-points-column { font-weight: bolder; } @@ -93,20 +93,20 @@ */ /* Add hover effect to table rows */ -#standings-table tbody tr:hover +#league-standings-table tbody tr:hover { /* Create border around row on hover */ border: 1px solid lightgray; border-radius: 10px; /* Make club logo larger on hover */ - #table-club-logo + #league-table-club-logo { width: 32px; } /* Undeline club name on hover */ - #club-name-column + #league-table-club-name-column { text-decoration: underline; /* Add underline effect */ } diff --git a/ProjectSourceCode/src/resources/css/league-pages/top-scorers.css b/ProjectSourceCode/src/resources/css/league-pages/league-top-scorers.css similarity index 77% rename from ProjectSourceCode/src/resources/css/league-pages/top-scorers.css rename to ProjectSourceCode/src/resources/css/league-pages/league-top-scorers.css index 03eacea..5cf4fee 100644 --- a/ProjectSourceCode/src/resources/css/league-pages/top-scorers.css +++ b/ProjectSourceCode/src/resources/css/league-pages/league-top-scorers.css @@ -4,12 +4,12 @@ ================================= */ -#top-scorers-container +#league-top-scorers-container { width: 40%; } -#top-scorers-stats-container { +#league-top-scorers-stats-container { /* Table Header Styling */ th @@ -35,21 +35,21 @@ =========================== */ - #goals-column + #league-top-scorers-goals-column { text-align: center; font-size: 20px; font-weight: bolder; } - #top-scorers-logo + #league-top-scorers-logo { width: 25px; margin: 0 15px; cursor: pointer; } - #player-name-column + #league-top-scorers-player-name-column { font-size: 14px; @@ -57,7 +57,7 @@ padding-right: 15px; } - #club-name-column + #league-top-scorers-club-name-column { padding-right: 15px; } @@ -68,16 +68,16 @@ ============================================================== */ -#top-scorers-stats-container tbody tr:hover +#league-top-scorers-stats-container tbody tr:hover { border: 1px solid lightgray; - #top-scorers-logo { + #league-top-scorers-logo { width: 32px; } - #club-name-column { + #league-top-scorers-player-name-column { text-decoration: underline; } } @@ -89,7 +89,7 @@ */ @media (max-width: 1230px) { - #top-scorers-container { + #league-top-scorers-logo { align-items: center; width: 75%; } diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index a8d2dd5..2a9e64f 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -7,24 +7,7 @@ -
-

Competitions

- - - - - - - - - {{#each club.runningCompetitions}} - - - - {{/each}} - -
Name
{{name}}
-
+ @@ -110,3 +93,29 @@ + + +
+ +

Competitions

+ + + + + + + + + + + + {{#each club.runningCompetitions}} + + + + {{/each}} + + +
Name
{{name}}
+ +
diff --git a/ProjectSourceCode/src/views/pages/leagues-page.hbs b/ProjectSourceCode/src/views/pages/leagues-page.hbs index 32d82bc..bfee238 100644 --- a/ProjectSourceCode/src/views/pages/leagues-page.hbs +++ b/ProjectSourceCode/src/views/pages/leagues-page.hbs @@ -14,13 +14,13 @@
-
+

Table

-
- +
+
@@ -38,14 +38,14 @@ {{#each league.standings}} - - + + - - + + {{/each}} @@ -54,12 +54,12 @@ -
-
+
+

Top Scorers

-
+
#
{{table.league_position}}{{table.team_name}}{{table.team_name}} {{games_played}} {{wins}} {{losses}} {{draws}}{{goal_difference}}{{points}}{{goal_difference}}{{points}}
@@ -73,10 +73,10 @@ {{#each topScorers.scorers}} - - - - + + + + {{/each}} diff --git a/ProjectSourceCode/src/views/partials/head.hbs b/ProjectSourceCode/src/views/partials/head.hbs index 92d27bd..9764758 100644 --- a/ProjectSourceCode/src/views/partials/head.hbs +++ b/ProjectSourceCode/src/views/partials/head.hbs @@ -25,7 +25,7 @@ - +
{{goals}}{{player.player_name}}{{team.team_name}}{{goals}}{{player.player_name}}{{team.team_name}} {{games_played}}