From 30f005300ca98be22fed318cb2b3d430b75357ba Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 16:02:19 -0600 Subject: [PATCH 01/24] Reversion of styles on leagues page --- ProjectSourceCode/node_modules/.bin/_mocha | 13 +------------ ProjectSourceCode/node_modules/.bin/esparse | 13 +------------ ProjectSourceCode/node_modules/.bin/esvalidate | 13 +------------ ProjectSourceCode/node_modules/.bin/flat | 13 +------------ ProjectSourceCode/node_modules/.bin/he | 13 +------------ ProjectSourceCode/node_modules/.bin/js-yaml | 13 +------------ ProjectSourceCode/node_modules/.bin/mocha | 13 +------------ ProjectSourceCode/node_modules/.bin/nodemon | 13 +------------ ProjectSourceCode/node_modules/.bin/npm-run-all | 13 +------------ ProjectSourceCode/node_modules/.bin/pidtree | 13 +------------ ProjectSourceCode/node_modules/.bin/resolve | 13 +------------ ProjectSourceCode/node_modules/.bin/run-p | 13 +------------ ProjectSourceCode/node_modules/.bin/run-s | 13 +------------ .../node_modules/mocha/node_modules/.bin/mkdirp | 13 +------------ .../node_modules/mocha/node_modules/.bin/which | 13 +------------ .../node-environment-flags/node_modules/.bin/semver | 13 +------------ .../normalize-package-data/node_modules/.bin/semver | 13 +------------ .../npm-run-all/node_modules/.bin/semver | 13 +------------ .../npm-run-all/node_modules/.bin/which | 13 +------------ .../node_modules/superagent/node_modules/.bin/mime | 13 +------------ .../node_modules/tar/node_modules/.bin/mkdirp | 13 +------------ .../src/resources/css/club-pages/club-page.css | 4 ---- .../resources/css/club-pages/club-top-scorers.css | 4 +++- .../src/resources/css/league-pages/league-table.css | 5 ++--- ProjectSourceCode/src/views/pages/leagues-page.hbs | 5 +++-- 25 files changed, 29 insertions(+), 262 deletions(-) diff --git a/ProjectSourceCode/node_modules/.bin/_mocha b/ProjectSourceCode/node_modules/.bin/_mocha index 47a3b10..f2a54ff 120000 --- a/ProjectSourceCode/node_modules/.bin/_mocha +++ b/ProjectSourceCode/node_modules/.bin/_mocha @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../mocha/bin/_mocha" "$@" -else - exec node "$basedir/../mocha/bin/_mocha" "$@" -fi +../mocha/bin/_mocha \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/.bin/esparse b/ProjectSourceCode/node_modules/.bin/esparse index 1cc1c96..7423b18 120000 --- a/ProjectSourceCode/node_modules/.bin/esparse +++ b/ProjectSourceCode/node_modules/.bin/esparse @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../esprima/bin/esparse.js" "$@" -else - exec node "$basedir/../esprima/bin/esparse.js" "$@" -fi +../esprima/bin/esparse.js \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/.bin/esvalidate b/ProjectSourceCode/node_modules/.bin/esvalidate index 91a4c9b..16069ef 120000 --- a/ProjectSourceCode/node_modules/.bin/esvalidate +++ b/ProjectSourceCode/node_modules/.bin/esvalidate @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../esprima/bin/esvalidate.js" "$@" -else - exec node "$basedir/../esprima/bin/esvalidate.js" "$@" -fi +../esprima/bin/esvalidate.js \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/.bin/flat b/ProjectSourceCode/node_modules/.bin/flat index 50faba1..5fed16b 120000 --- a/ProjectSourceCode/node_modules/.bin/flat +++ b/ProjectSourceCode/node_modules/.bin/flat @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../flat/cli.js" "$@" -else - exec node "$basedir/../flat/cli.js" "$@" -fi +../flat/cli.js \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/.bin/he b/ProjectSourceCode/node_modules/.bin/he index 70e18de..2a8eb5e 120000 --- a/ProjectSourceCode/node_modules/.bin/he +++ b/ProjectSourceCode/node_modules/.bin/he @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../he/bin/he" "$@" -else - exec node "$basedir/../he/bin/he" "$@" -fi +../he/bin/he \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/.bin/js-yaml b/ProjectSourceCode/node_modules/.bin/js-yaml index ed78a86..9dbd010 120000 --- a/ProjectSourceCode/node_modules/.bin/js-yaml +++ b/ProjectSourceCode/node_modules/.bin/js-yaml @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../js-yaml/bin/js-yaml.js" "$@" -else - exec node "$basedir/../js-yaml/bin/js-yaml.js" "$@" -fi +../js-yaml/bin/js-yaml.js \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/.bin/mocha b/ProjectSourceCode/node_modules/.bin/mocha index c2fdccc..43c668d 120000 --- a/ProjectSourceCode/node_modules/.bin/mocha +++ b/ProjectSourceCode/node_modules/.bin/mocha @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../mocha/bin/mocha" "$@" -else - exec node "$basedir/../mocha/bin/mocha" "$@" -fi +../mocha/bin/mocha \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/.bin/nodemon b/ProjectSourceCode/node_modules/.bin/nodemon index 4d75661..1056ddc 120000 --- a/ProjectSourceCode/node_modules/.bin/nodemon +++ b/ProjectSourceCode/node_modules/.bin/nodemon @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../nodemon/bin/nodemon.js" "$@" -else - exec node "$basedir/../nodemon/bin/nodemon.js" "$@" -fi +../nodemon/bin/nodemon.js \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/.bin/npm-run-all b/ProjectSourceCode/node_modules/.bin/npm-run-all index c508194..0424f3c 120000 --- a/ProjectSourceCode/node_modules/.bin/npm-run-all +++ b/ProjectSourceCode/node_modules/.bin/npm-run-all @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../npm-run-all/bin/npm-run-all/index.js" "$@" -else - exec node "$basedir/../npm-run-all/bin/npm-run-all/index.js" "$@" -fi +../npm-run-all/bin/npm-run-all/index.js \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/.bin/pidtree b/ProjectSourceCode/node_modules/.bin/pidtree index 1b48499..42c3f06 120000 --- a/ProjectSourceCode/node_modules/.bin/pidtree +++ b/ProjectSourceCode/node_modules/.bin/pidtree @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../pidtree/bin/pidtree.js" "$@" -else - exec node "$basedir/../pidtree/bin/pidtree.js" "$@" -fi +../pidtree/bin/pidtree.js \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/.bin/resolve b/ProjectSourceCode/node_modules/.bin/resolve index 757d454..b6afda6 120000 --- a/ProjectSourceCode/node_modules/.bin/resolve +++ b/ProjectSourceCode/node_modules/.bin/resolve @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../resolve/bin/resolve" "$@" -else - exec node "$basedir/../resolve/bin/resolve" "$@" -fi +../resolve/bin/resolve \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/.bin/run-p b/ProjectSourceCode/node_modules/.bin/run-p index 9bff487..98a2c9c 120000 --- a/ProjectSourceCode/node_modules/.bin/run-p +++ b/ProjectSourceCode/node_modules/.bin/run-p @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../npm-run-all/bin/run-p/index.js" "$@" -else - exec node "$basedir/../npm-run-all/bin/run-p/index.js" "$@" -fi +../npm-run-all/bin/run-p/index.js \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/.bin/run-s b/ProjectSourceCode/node_modules/.bin/run-s index 377521c..5938622 120000 --- a/ProjectSourceCode/node_modules/.bin/run-s +++ b/ProjectSourceCode/node_modules/.bin/run-s @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../npm-run-all/bin/run-s/index.js" "$@" -else - exec node "$basedir/../npm-run-all/bin/run-s/index.js" "$@" -fi +../npm-run-all/bin/run-s/index.js \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/mocha/node_modules/.bin/mkdirp b/ProjectSourceCode/node_modules/mocha/node_modules/.bin/mkdirp index 6ba5765..017896c 120000 --- a/ProjectSourceCode/node_modules/mocha/node_modules/.bin/mkdirp +++ b/ProjectSourceCode/node_modules/mocha/node_modules/.bin/mkdirp @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../mkdirp/bin/cmd.js" "$@" -else - exec node "$basedir/../mkdirp/bin/cmd.js" "$@" -fi +../mkdirp/bin/cmd.js \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/mocha/node_modules/.bin/which b/ProjectSourceCode/node_modules/mocha/node_modules/.bin/which index c51820f..f62471c 120000 --- a/ProjectSourceCode/node_modules/mocha/node_modules/.bin/which +++ b/ProjectSourceCode/node_modules/mocha/node_modules/.bin/which @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../which/bin/which" "$@" -else - exec node "$basedir/../which/bin/which" "$@" -fi +../which/bin/which \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/node-environment-flags/node_modules/.bin/semver b/ProjectSourceCode/node_modules/node-environment-flags/node_modules/.bin/semver index 86cee84..317eb29 120000 --- a/ProjectSourceCode/node_modules/node-environment-flags/node_modules/.bin/semver +++ b/ProjectSourceCode/node_modules/node-environment-flags/node_modules/.bin/semver @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../semver/bin/semver" "$@" -else - exec node "$basedir/../semver/bin/semver" "$@" -fi +../semver/bin/semver \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/normalize-package-data/node_modules/.bin/semver b/ProjectSourceCode/node_modules/normalize-package-data/node_modules/.bin/semver index 86cee84..317eb29 120000 --- a/ProjectSourceCode/node_modules/normalize-package-data/node_modules/.bin/semver +++ b/ProjectSourceCode/node_modules/normalize-package-data/node_modules/.bin/semver @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../semver/bin/semver" "$@" -else - exec node "$basedir/../semver/bin/semver" "$@" -fi +../semver/bin/semver \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/npm-run-all/node_modules/.bin/semver b/ProjectSourceCode/node_modules/npm-run-all/node_modules/.bin/semver index 86cee84..317eb29 120000 --- a/ProjectSourceCode/node_modules/npm-run-all/node_modules/.bin/semver +++ b/ProjectSourceCode/node_modules/npm-run-all/node_modules/.bin/semver @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../semver/bin/semver" "$@" -else - exec node "$basedir/../semver/bin/semver" "$@" -fi +../semver/bin/semver \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/npm-run-all/node_modules/.bin/which b/ProjectSourceCode/node_modules/npm-run-all/node_modules/.bin/which index c51820f..f62471c 120000 --- a/ProjectSourceCode/node_modules/npm-run-all/node_modules/.bin/which +++ b/ProjectSourceCode/node_modules/npm-run-all/node_modules/.bin/which @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../which/bin/which" "$@" -else - exec node "$basedir/../which/bin/which" "$@" -fi +../which/bin/which \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/superagent/node_modules/.bin/mime b/ProjectSourceCode/node_modules/superagent/node_modules/.bin/mime index 0a62a1b..fbb7ee0 120000 --- a/ProjectSourceCode/node_modules/superagent/node_modules/.bin/mime +++ b/ProjectSourceCode/node_modules/superagent/node_modules/.bin/mime @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../mime/cli.js" "$@" -else - exec node "$basedir/../mime/cli.js" "$@" -fi +../mime/cli.js \ No newline at end of file diff --git a/ProjectSourceCode/node_modules/tar/node_modules/.bin/mkdirp b/ProjectSourceCode/node_modules/tar/node_modules/.bin/mkdirp index 6ba5765..017896c 120000 --- a/ProjectSourceCode/node_modules/tar/node_modules/.bin/mkdirp +++ b/ProjectSourceCode/node_modules/tar/node_modules/.bin/mkdirp @@ -1,12 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../mkdirp/bin/cmd.js" "$@" -else - exec node "$basedir/../mkdirp/bin/cmd.js" "$@" -fi +../mkdirp/bin/cmd.js \ No newline at end of file diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/club-pages/club-page.css index abf0903..e8b4f7d 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-page.css @@ -24,10 +24,6 @@ padding: 30px; } -#top-scorers-container { - padding : 30px -} - #club-information-container { height: 100px; width: fit-content; diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-top-scorers.css b/ProjectSourceCode/src/resources/css/club-pages/club-top-scorers.css index 2d62b21..9453548 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-top-scorers.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-top-scorers.css @@ -1,6 +1,8 @@ +/* #club-top-scorers-container { flex: 1; background-color: #dcdcdc; /* Example background color */ width: 40%; /* Add any other styling you need for the top scorers container */ -} +} +*/ diff --git a/ProjectSourceCode/src/resources/css/league-pages/league-table.css b/ProjectSourceCode/src/resources/css/league-pages/league-table.css index 6bf663a..60f6ea2 100644 --- a/ProjectSourceCode/src/resources/css/league-pages/league-table.css +++ b/ProjectSourceCode/src/resources/css/league-pages/league-table.css @@ -29,7 +29,7 @@ } /* Table that holds all the standing information */ -#standings-table, .table +#standings-table { width: 100%; padding: 15px; @@ -43,8 +43,7 @@ /* Data in Row Style */ td { - padding: 15px; - + padding: 5px; } /* Every Odd Row in Table Style */ diff --git a/ProjectSourceCode/src/views/pages/leagues-page.hbs b/ProjectSourceCode/src/views/pages/leagues-page.hbs index fab8b93..32d82bc 100644 --- a/ProjectSourceCode/src/views/pages/leagues-page.hbs +++ b/ProjectSourceCode/src/views/pages/leagues-page.hbs @@ -1,4 +1,5 @@
+
@@ -19,7 +20,7 @@
- +
@@ -85,4 +86,4 @@ - + \ No newline at end of file From 103b2e8a46927a2c201d179b94ce59bbdb220731 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 16:16:47 -0600 Subject: [PATCH 02/24] Preliminary comments added to clubs-page.hbs --- .../src/views/pages/clubs-page.hbs | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index 290f23c..712f9a8 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -1,11 +1,3 @@ - - - - - - Club Details - -
@@ -34,33 +26,39 @@
#
-
+ +

Information

    + + + + +
    Club Address:
    {{club.address}}
    Founded
    {{club.founded}}
    Manager
    @@ -91,10 +89,5 @@ {{/each}}
    -
    -
    - - - - \ No newline at end of file +
    \ No newline at end of file From e232b9bd37254c0f2e4802adcc7a14295577d263 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 16:49:15 -0600 Subject: [PATCH 03/24] More comments added to clubs-page.hbs --- .../src/views/pages/clubs-page.hbs | 165 ++++++++++-------- 1 file changed, 92 insertions(+), 73 deletions(-) diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index 712f9a8..a8d2dd5 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -1,78 +1,13 @@
    -
    -
    -

    Players

    -
      - - - - - - - - - - - - {{#each club.squad}} - - - - - - - {{/each}} - -
      NamePositionDOBNationality
      {{name}}{{position}}{{dateOfBirth}}{{nationality}}
      -
      - -
      -

      Information

      -
        - - + +
        + +
        - - - - - - - - - - - - - - - - - - - - - -
        - -
        - -
        - Club Address:
        - {{club.address}} -
        - Founded
        - {{club.founded}} -
        - Manager
        - Name : {{club.coach.name}}
        - Nationality : {{club.coach.nationality}}
        - DOB : {{club.coach.dateOfBirth}}
        - contract start : {{club.coach.contract.start}}
        - contract end : {{club.coach.contract.until}}
        -
        + +

        Competitions

          @@ -89,5 +24,89 @@ {{/each}}
          -
          -
          \ No newline at end of file +
          + +
          + + +
          +

          Players

          +
            + + + + + + + + + + + {{#each club.squad}} + + + + + + + {{/each}} + +
            NamePositionDOBNationality
            {{name}}{{position}}{{dateOfBirth}}{{nationality}}
            +
            + + +
            + +

            Information

            + + +
              + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
              + +
              + +
              + Club Address:
              + {{club.address}} +
              + Founded
              + {{club.founded}} +
              + Manager
              + Name: {{club.coach.name}}
              + Nationality: {{club.coach.nationality}}
              + DOB: {{club.coach.dateOfBirth}}
              + contract start: {{club.coach.contract.start}}
              + contract end: {{club.coach.contract.until}}
              +
              + +
              From 18a18cebf820d92db586672acea8d958cf7d06b1 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 17:05:19 -0600 Subject: [PATCH 04/24] Changes to league-pages.hbs to make individual elements more clear --- .../css/league-pages/league-page.css | 2 +- .../css/league-pages/league-table.css | 18 ++++---- ...top-scorers.css => league-top-scorers.css} | 20 ++++----- .../src/views/pages/clubs-page.hbs | 45 +++++++++++-------- .../src/views/pages/leagues-page.hbs | 28 ++++++------ ProjectSourceCode/src/views/partials/head.hbs | 2 +- 6 files changed, 62 insertions(+), 53 deletions(-) rename ProjectSourceCode/src/resources/css/league-pages/{top-scorers.css => league-top-scorers.css} (77%) 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 @@ - + From 3667d6a58399ceaccaee7fbd84a1c17ca068f0d3 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 17:08:16 -0600 Subject: [PATCH 05/24] Links on league page to clubs fixed --- .../src/resources/routes/club-pages/redirect-to-club-url.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSourceCode/src/resources/routes/club-pages/redirect-to-club-url.js b/ProjectSourceCode/src/resources/routes/club-pages/redirect-to-club-url.js index 408d964..d3ebcc5 100644 --- a/ProjectSourceCode/src/resources/routes/club-pages/redirect-to-club-url.js +++ b/ProjectSourceCode/src/resources/routes/club-pages/redirect-to-club-url.js @@ -1,5 +1,5 @@ // Add click event listener to club logos -document.querySelectorAll('#table-club-logo, #club-name, #top-scorers-logo, #club-name-column').forEach(element => { +document.querySelectorAll('#league-table-club-logo, #league-table-club-name-column, #league-top-scorers-logo, #league-top-scorers-club-name-column').forEach(element => { element.addEventListener('click', (event) => { // Get the club ID from the clicked club logo's clubID attribute const clubId = element.getAttribute('clubID'); From 0ffb8f65d6a07dbf82984421ac812f472965b807 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 18:31:33 -0600 Subject: [PATCH 06/24] Club Header Template readded --- ProjectSourceCode/src/views/pages/clubs-page.hbs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index 2a9e64f..4cfc87a 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -2,10 +2,12 @@
                - + +

                {{club.name}}

                + {{club.name}} Flag
                - + From 335f7ef403c298a600e7f6c1fcc428615814c7d6 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 18:51:26 -0600 Subject: [PATCH 07/24] club-page.hbs rearranged and commented out --- .../src/views/pages/clubs-page.hbs | 212 +++++++++--------- 1 file changed, 105 insertions(+), 107 deletions(-) diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index 4cfc87a..e00fd82 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -1,123 +1,121 @@ -
                +
                - -
                + +

                {{club.name}}

                {{club.name}} Flag
                - + +
                + +
                + +

                Information

                + + +
                  +
                  {{goals}}{{player.player_name}}{{team.team_name}}{{goals}}{{player.player_name}}{{team.team_name}} {{games_played}}
                  + + + + + + + + + + + + + + + + + + +
                  + Club Address:
                  + {{club.address}} +
                  + Founded
                  + {{club.founded}} +
                  + Manager
                  + Name: {{club.coach.name}}
                  + Nationality: {{club.coach.nationality}}
                  + DOB: {{club.coach.dateOfBirth}}
                  + contract start: {{club.coach.contract.start}}
                  + contract end: {{club.coach.contract.until}}
                  +
                  + +
                  + +
                  + +

                  Competitions

                  + +
                    + + + + + + + + {{#each club.runningCompetitions}} + + + + {{/each}} + +
                    Name
                    {{name}}
                    + +
                    + +
                    + + +
                    + + +
                    + +

                    Players

                    + +
                      + + + + + + + + + + + {{#each club.squad}} + + + + + + + {{/each}} + +
                      NamePositionDOBNationality
                      {{name}}{{position}}{{dateOfBirth}}{{nationality}}
                      + +
                      + +
                      - -
                      -

                      Players

                      - - - - - - - - - - - - {{#each club.squad}} - - - - - - - {{/each}} - -
                      NamePositionDOBNationality
                      {{name}}{{position}}{{dateOfBirth}}{{nationality}}
                      -
                      - -
                      -

                      Information

                      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
                      - -
                      - -
                      - Club Address:
                      - {{club.address}} -
                      - Founded
                      - {{club.founded}} -
                      - Manager
                      - Name: {{club.coach.name}}
                      - Nationality: {{club.coach.nationality}}
                      - DOB: {{club.coach.dateOfBirth}}
                      - contract start: {{club.coach.contract.start}}
                      - contract end: {{club.coach.contract.until}}
                      -
                      - -
                      - - -
                      - -

                      Competitions

                      - - - - - - - - - - - - {{#each club.runningCompetitions}} - - - - {{/each}} - - -
                      Name
                      {{name}}
                      - -
                      From c71866cceb3f556129c747b567866cb3df37df0d Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 19:06:04 -0600 Subject: [PATCH 08/24] CSS styling that rearranges containers added to club page --- .../resources/css/club-pages/club-page.css | 32 ++-- .../src/views/pages/clubs-page.hbs | 181 +++++++++--------- 2 files changed, 102 insertions(+), 111 deletions(-) diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/club-pages/club-page.css index e8b4f7d..e39d278 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-page.css @@ -1,27 +1,6 @@ #club-page-body { display: flex; flex-direction: column; - width: 100%; -} - -#club-page-body { - padding: 50px; -} - -#club-crest { - text-align: center; -} - -#club-area-flag-row { - text-align: center; -} - -#club-area-flag { - width : 150px; -} - -#club-players-container { - padding: 30px; } #club-information-container { @@ -40,6 +19,17 @@ /* Add any other styling you need for the club information container */ } +#club-page-contents-container { + display: flex; + flex-direction: row; +} + +#club-players-container { + +} + + + #club-information-container::after { content: ''; position: absolute; diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index e00fd82..0ed7859 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -7,111 +7,112 @@ {{club.name}} Flag - -
                      +
                      - -
                      + +
                      -

                      Information

                      + +
                      - -
                        - - +

                        Information

                        - - - - + +
                        - Club Address:
                        - {{club.address}} -
                        + - - - - + + + + - - - - + + + + - -
                        - Founded
                        - {{club.founded}} -
                        + Club Address:
                        + {{club.address}} +
                        - Manager
                        - Name: {{club.coach.name}}
                        - Nationality: {{club.coach.nationality}}
                        - DOB: {{club.coach.dateOfBirth}}
                        - contract start: {{club.coach.contract.start}}
                        - contract end: {{club.coach.contract.until}}
                        -
                        + Founded
                        + {{club.founded}} +
                        + + + + Manager
                        + Name: {{club.coach.name}}
                        + Nationality: {{club.coach.nationality}}
                        + DOB: {{club.coach.dateOfBirth}}
                        + contract start: {{club.coach.contract.start}}
                        + contract end: {{club.coach.contract.until}}
                        + + -
                        + + + +
                        + + +
                        + +

                        Competitions

                        + + + + + + + + + {{#each club.runningCompetitions}} + + + + {{/each}} + +
                        Name
                        {{name}}
                        + +
                        - -
                        +
                        -

                        Competitions

                        + +
                        -
                          - - - - - - - - {{#each club.runningCompetitions}} - - - - {{/each}} - -
                          Name
                          {{name}}
                          + +
                          -
                          +

                          Players

                          + + + + + + + + + + + + {{#each club.squad}} + + + + + + + {{/each}} + +
                          NamePositionDOBNationality
                          {{name}}{{position}}{{dateOfBirth}}{{nationality}}
                          + +
                          + +
                          - -
                          - - -
                          - -

                          Players

                          - -
                            - - - - - - - - - - - {{#each club.squad}} - - - - - - - {{/each}} - -
                            NamePositionDOBNationality
                            {{name}}{{position}}{{dateOfBirth}}{{nationality}}
                            - -
                            - -
                            -
                            From ac744ddc0291c9265a115f79ecb4ef6581575d05 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 19:51:01 -0600 Subject: [PATCH 09/24] More style and arrangement changes to club page --- .../src/resources/css/club-pages/club-page.css | 8 +++++--- ProjectSourceCode/src/views/pages/clubs-page.hbs | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/club-pages/club-page.css index e39d278..2debd9d 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-page.css @@ -24,11 +24,13 @@ flex-direction: row; } -#club-players-container { - +#club-history-container { + width: 20%; } - +#club-stats-and-players-container { + width: 80%; +} #club-information-container::after { content: ''; diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index 0ed7859..95793ae 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -1,7 +1,7 @@
                            -
                            +

                            {{club.name}}

                            {{club.name}} Flag @@ -13,7 +13,7 @@
                            -
                            +

                            Information

                            From b540360e3fbb0047ec6d23819331567f1f7e4f14 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 19:52:47 -0600 Subject: [PATCH 10/24] Reformatting of club-page CSS --- .../resources/css/club-pages/club-page.css | 47 ++++--------------- 1 file changed, 10 insertions(+), 37 deletions(-) diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/club-pages/club-page.css index 2debd9d..825e56d 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-page.css @@ -19,6 +19,16 @@ /* Add any other styling you need for the club information container */ } +#club-information-container::after { + content: ''; + position: absolute; + top: 0; + right: 0; + bottom: 0; + width: 8px; /* Width of the red strip */ + background-color: red; /* Red color */ + } + #club-page-contents-container { display: flex; flex-direction: row; @@ -32,48 +42,11 @@ width: 80%; } -#club-information-container::after { - content: ''; - position: absolute; - top: 0; - right: 0; - bottom: 0; - width: 8px; /* Width of the red strip */ - background-color: red; /* Red color */ - } -#club-logo { - margin: 0px 20px; - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - height: 80px; -} -#club-title { - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - margin-right: 20px; -} -#club-flag { - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - height: 20px; - margin-right: 200px; -} -#club-stats-container { - width: 100%; - display: flex; - flex: 1; -} -#club-stats-container .container { - margin: 0 10px; - background-color: #eaeaea; /* Example background color */ - border: 1px solid gray; - border-radius: 8px; - - box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.4); - /* Add any other styling you need for the club table container */ -} From 9e9717dd2ef4d3cca394241410ca88e89f4a4784 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 20:17:43 -0600 Subject: [PATCH 11/24] CSS arrangement updated. More comments added to .hbs and .css files --- .../css/club-pages/club-information-card.css | 3 + .../resources/css/club-pages/club-page.css | 81 +++++++++++++++---- .../club-players-and-stats-card.css | 3 + .../css/club-pages/club-top-scorers.css | 8 -- .../css/club-pages/players-table.css | 0 .../src/views/pages/clubs-page.hbs | 6 +- ProjectSourceCode/src/views/partials/head.hbs | 7 +- 7 files changed, 78 insertions(+), 30 deletions(-) create mode 100644 ProjectSourceCode/src/resources/css/club-pages/club-information-card.css create mode 100644 ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css delete mode 100644 ProjectSourceCode/src/resources/css/club-pages/club-top-scorers.css delete mode 100644 ProjectSourceCode/src/resources/css/club-pages/players-table.css diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-information-card.css b/ProjectSourceCode/src/resources/css/club-pages/club-information-card.css new file mode 100644 index 0000000..7ea8057 --- /dev/null +++ b/ProjectSourceCode/src/resources/css/club-pages/club-information-card.css @@ -0,0 +1,3 @@ +#club-history-container { + width: 20%; +} diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/club-pages/club-page.css index 825e56d..60544d2 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-page.css @@ -3,6 +3,12 @@ flex-direction: column; } +/* +================================= + LEAGUE INFORMATION HEADER +================================= +*/ + #club-information-container { height: 100px; width: fit-content; @@ -15,31 +21,73 @@ display: flex; /* Use flexbox for layout */ align-items: center; /* Center content vertically */ - - /* Add any other styling you need for the club information container */ } -#club-information-container::after { - content: ''; - position: absolute; - top: 0; - right: 0; - bottom: 0; - width: 8px; /* Width of the red strip */ - background-color: red; /* Red color */ - } + /* + =========================== + LEAGUE INFORMATION CHILD ITEMS + =========================== + */ + + /* Adds Red Diagonal Strip at the end of the #club-information-container */ + #club-information-container::after { + content: ''; + position: absolute; + top: 0; + right: 0; + bottom: 0; + width: 8px; /* Width of the red strip */ + background-color: red; /* Red color */ + } + + /* Styling for League Logo in Club Information Header */ + #club-logo + { + margin: 0px 30px; + transform: skewX(20deg); /* Skew the banner to create a triangular side */ + height: 80%; + } + + /* Styling for League Title in Club Information Header */ + #club-title + { + transform: skewX(20deg); /* Skew the banner to create a triangular side */ + margin-right: 20px; + } + + /* Styling for FLag in Club Information Header */ + #club-flag + { + transform: skewX(20deg); /* Skew the banner to create a triangular side */ + height: 20px; + margin-right: 200px; + } + +/* +============================================= + CARDS IN PAGE BODY +============================================= +*/ #club-page-contents-container { display: flex; flex-direction: row; } -#club-history-container { - width: 20%; -} +/* Styling for Standings and Top Scorers Cards */ +#club-history-container, #club-stats-and-players-container +{ + /* --- POSITION CONTAINER --- */ + margin: 0 10px; + margin-bottom: 20px; -#club-stats-and-players-container { - width: 80%; + /* --- SIZE CONTAINER --- */ + padding: 15px; + + /* --- STYLE CONTAINER --- */ + background: linear-gradient(to top, rgb(216, 216, 216), rgb(236, 236, 236), rgb(241, 240, 240)); + border: 1px solid gray; + box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.5); } @@ -50,3 +98,4 @@ + diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css b/ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css new file mode 100644 index 0000000..66df4fd --- /dev/null +++ b/ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css @@ -0,0 +1,3 @@ +#club-stats-and-players-container { + width: 80%; +} \ No newline at end of file diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-top-scorers.css b/ProjectSourceCode/src/resources/css/club-pages/club-top-scorers.css deleted file mode 100644 index 9453548..0000000 --- a/ProjectSourceCode/src/resources/css/club-pages/club-top-scorers.css +++ /dev/null @@ -1,8 +0,0 @@ -/* -#club-top-scorers-container { - flex: 1; - background-color: #dcdcdc; /* Example background color */ - width: 40%; - /* Add any other styling you need for the top scorers container */ -} -*/ diff --git a/ProjectSourceCode/src/resources/css/club-pages/players-table.css b/ProjectSourceCode/src/resources/css/club-pages/players-table.css deleted file mode 100644 index e69de29..0000000 diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index 95793ae..cd4e644 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -2,9 +2,9 @@
                            - -

                            {{club.name}}

                            - {{club.name}} Flag + +

                            {{club.name}}

                            + {{club.name}} Flag
                            diff --git a/ProjectSourceCode/src/views/partials/head.hbs b/ProjectSourceCode/src/views/partials/head.hbs index 9764758..1905c75 100644 --- a/ProjectSourceCode/src/views/partials/head.hbs +++ b/ProjectSourceCode/src/views/partials/head.hbs @@ -4,6 +4,7 @@ + @@ -27,10 +28,10 @@ - + - - + + Group 6 Final Project From e58d6266fcda60e9c917ece02ed27c727e580ea5 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 20:19:58 -0600 Subject: [PATCH 12/24] Bootstrap table styling removed --- .../src/resources/css/club-pages/club-information-card.css | 1 + ProjectSourceCode/src/views/pages/clubs-page.hbs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-information-card.css b/ProjectSourceCode/src/resources/css/club-pages/club-information-card.css index 7ea8057..fbd364c 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-information-card.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-information-card.css @@ -1,3 +1,4 @@ #club-history-container { width: 20%; + height: fit-content; } diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index cd4e644..9ef947f 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -18,7 +18,7 @@

                            Information

                            - +
                            @@ -59,7 +59,7 @@

                            Competitions

                            -
                            +
                            @@ -86,7 +86,7 @@

                            Players

                            -
                            Name
                            +
                            From 5200bd9981e5afde96954467d652ae4207ab3cb3 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 20:22:53 -0600 Subject: [PATCH 13/24] More Bootstrap styling removed --- .../src/resources/css/club-pages/club-page.css | 1 + ProjectSourceCode/src/views/pages/clubs-page.hbs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/club-pages/club-page.css index 60544d2..ce11aca 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-page.css @@ -1,6 +1,7 @@ #club-page-body { display: flex; flex-direction: column; + width: 100%; } /* diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index 9ef947f..20aac90 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -1,4 +1,4 @@ -
                            +
                            @@ -55,7 +55,7 @@
                            -
                            +

                            Competitions

                            @@ -82,7 +82,7 @@
                            -
                            +

                            Players

                            From 693a347448fea1d1a3326b9bca1bd48e36e922a2 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Mon, 15 Apr 2024 20:47:55 -0600 Subject: [PATCH 14/24] Additional styling added for club-page.hbs. Table has been set to fill it's container to 100% width --- .../css/club-pages/club-players-and-stats-card.css | 6 ++++++ ProjectSourceCode/src/views/pages/clubs-page.hbs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css b/ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css index 66df4fd..8e1b5b2 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css @@ -1,3 +1,9 @@ +/* Container for all stats and player cards */ #club-stats-and-players-container { width: 80%; +} + +/* Table containing player information */ +#club-players-table { + width: 100%; } \ No newline at end of file diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index 20aac90..b6a2f0c 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -86,7 +86,7 @@

                            Players

                            -
                            Name
                            +
                            From 2f0b12663a971ba5103ff5db1b58578a8fc26205 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Tue, 16 Apr 2024 13:22:40 -0600 Subject: [PATCH 15/24] More changes to club page. Cards and Headers are now mostly split --- .../css/club-pages/club-information-card.css | 7 +- .../resources/css/club-pages/club-page.css | 4 +- .../club-players-and-stats-card.css | 25 ++++ .../css/league-pages/league-table.css | 8 +- .../src/views/pages/clubs-page.hbs | 116 +++++++++--------- 5 files changed, 93 insertions(+), 67 deletions(-) diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-information-card.css b/ProjectSourceCode/src/resources/css/club-pages/club-information-card.css index fbd364c..125f994 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-information-card.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-information-card.css @@ -1,4 +1,7 @@ -#club-history-container { - width: 20%; +#club-information-container { height: fit-content; + width: 20%; + + display: flex; + flex-direction: column; } diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/club-pages/club-page.css index ce11aca..5a7d046 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-page.css @@ -10,7 +10,7 @@ ================================= */ -#club-information-container { +#club-header-container { height: 100px; width: fit-content; margin: 20px; @@ -76,7 +76,7 @@ } /* Styling for Standings and Top Scorers Cards */ -#club-history-container, #club-stats-and-players-container +#club-information-table-container, #club-competitions-table-container, #club-stats-and-players-container { /* --- POSITION CONTAINER --- */ margin: 0 10px; diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css b/ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css index 8e1b5b2..80001e3 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css @@ -3,7 +3,32 @@ width: 80%; } +/* +================================= + PLAYER TABLE CONTAINER +================================= +*/ + /* Table containing player information */ #club-players-table { width: 100%; + padding: 15px; + + /* Table Header Styling */ + th + { + border-bottom: 3px solid red; /* Add red bottom border */ + } + + /* Data in Row Style */ + td + { + padding: 5px; + } + + /* Every Odd Row in Table Style */ + tbody tr:nth-child(odd) + { + background-color: #d2d2d2; /* Light gray for odd rows */ + } } \ No newline at end of file diff --git a/ProjectSourceCode/src/resources/css/league-pages/league-table.css b/ProjectSourceCode/src/resources/css/league-pages/league-table.css index 6fa34c3..7603578 100644 --- a/ProjectSourceCode/src/resources/css/league-pages/league-table.css +++ b/ProjectSourceCode/src/resources/css/league-pages/league-table.css @@ -1,6 +1,6 @@ /* ================================= - TABLE ADN HEADER CONTAINER + TABLE AND HEADER CONTAINER ================================= */ @@ -22,12 +22,6 @@ ================================= */ -/* Container for Table */ -#league-table-stats-container -{ - width: 100%; -} - /* Table that holds all the standing information */ #league-standings-table { diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index b6a2f0c..241b779 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -1,7 +1,7 @@
                            -
                            +

                            {{club.name}}

                            {{club.name}} Flag @@ -9,74 +9,78 @@
                            - -
                            + +
                            - -
                            + +
                            -

                            Information

                            +
                            +

                            Information

                            +
                            -
                            Name
                            - +
                            +
                            + + + + + - - - - - - - - - - - - - - - - -
                            + Club Address:
                            + {{club.address}} +
                            - Club Address:
                            - {{club.address}} -
                            - Founded
                            - {{club.founded}} -
                            - Manager
                            - Name: {{club.coach.name}}
                            - Nationality: {{club.coach.nationality}}
                            - DOB: {{club.coach.dateOfBirth}}
                            - contract start: {{club.coach.contract.start}}
                            - contract end: {{club.coach.contract.until}}
                            -
                            + + + + Founded
                            + {{club.founded}} + + + + + + Manager
                            + Name: {{club.coach.name}}
                            + Nationality: {{club.coach.nationality}}
                            + DOB: {{club.coach.dateOfBirth}}
                            + contract start: {{club.coach.contract.start}}
                            + contract end: {{club.coach.contract.until}}
                            + + + + +
                            - +
                            -

                            Competitions

                            - - - - - - - - - {{#each club.runningCompetitions}} - - - - {{/each}} - -
                            Name
                            {{name}}
                            +
                            +

                            Competitions

                            +
                            +
                            + + + + + + + + {{#each club.runningCompetitions}} + + + + {{/each}} + +
                            Name
                            {{name}}
                            +
                            -
                            +
                            From c5336b6baec3fc3722d55290439bb7a3870bf411 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Tue, 16 Apr 2024 13:41:40 -0600 Subject: [PATCH 16/24] More changes to layout and code implementation on club page template and its CSS. All cards and their child container are now implemented with a corresponding class to their purpose. This make styling consistenly much easier and consistent --- .../resources/css/club-pages/club-page.css | 4 +- .../src/views/pages/clubs-page.hbs | 69 ++++++++++--------- ProjectSourceCode/src/views/pages/home.hbs | 2 +- 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/club-pages/club-page.css index 5a7d046..ce8391a 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/club-pages/club-page.css @@ -31,7 +31,7 @@ */ /* Adds Red Diagonal Strip at the end of the #club-information-container */ - #club-information-container::after { + #club-header-container::after { content: ''; position: absolute; top: 0; @@ -76,7 +76,7 @@ } /* Styling for Standings and Top Scorers Cards */ -#club-information-table-container, #club-competitions-table-container, #club-stats-and-players-container +.card-container { /* --- POSITION CONTAINER --- */ margin: 0 10px; diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index 241b779..8a9d4d8 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -7,20 +7,20 @@ {{club.name}} Flag
                            -
                            +
                            -
                            +
                            -
                            +

                            Information

                            -
                            +
                            @@ -56,13 +56,13 @@ -
                            +
                            -
                            +

                            Competitions

                            -
                            +
                            @@ -83,35 +83,38 @@ -
                            +
                            -
                            - -

                            Players

                            +
                            -
                            - - - - - - - - - - {{#each club.squad}} - - - - - - - {{/each}} - -
                            NamePositionDOBNationality
                            {{name}}{{position}}{{dateOfBirth}}{{nationality}}
                            - -
                            +
                            +

                            Players

                            +
                            + +
                            + + + + + + + + + + + {{#each club.squad}} + + + + + + + {{/each}} + +
                            NamePositionDOBNationality
                            {{name}}{{position}}{{dateOfBirth}}{{nationality}}
                            +
                            +
                            diff --git a/ProjectSourceCode/src/views/pages/home.hbs b/ProjectSourceCode/src/views/pages/home.hbs index 3d718bf..8fe6d22 100644 --- a/ProjectSourceCode/src/views/pages/home.hbs +++ b/ProjectSourceCode/src/views/pages/home.hbs @@ -1,6 +1,6 @@

                            Leagues

                            -
                            +
                            From f7cc4263586f787351bfee8ced45aeebf4ca5aef Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Tue, 16 Apr 2024 13:48:57 -0600 Subject: [PATCH 17/24] CSS reorganization started to streamline elements on generated pages --- .../css/generated-pages/card-styling.css | 0 .../club-pages/club-information-card.css | 0 .../club-pages/club-page.css | 1 + .../club-players-and-stats-card.css | 0 .../league-pages/league-page.css | 0 .../league-pages/league-table.css | 0 .../league-pages/league-top-scorers.css | 0 ProjectSourceCode/src/views/partials/head.hbs | 19 +++++++++++-------- 8 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 ProjectSourceCode/src/resources/css/generated-pages/card-styling.css rename ProjectSourceCode/src/resources/css/{ => generated-pages}/club-pages/club-information-card.css (100%) rename ProjectSourceCode/src/resources/css/{ => generated-pages}/club-pages/club-page.css (98%) rename ProjectSourceCode/src/resources/css/{ => generated-pages}/club-pages/club-players-and-stats-card.css (100%) rename ProjectSourceCode/src/resources/css/{ => generated-pages}/league-pages/league-page.css (100%) rename ProjectSourceCode/src/resources/css/{ => generated-pages}/league-pages/league-table.css (100%) rename ProjectSourceCode/src/resources/css/{ => generated-pages}/league-pages/league-top-scorers.css (100%) diff --git a/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css b/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css new file mode 100644 index 0000000..e69de29 diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-information-card.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-information-card.css similarity index 100% rename from ProjectSourceCode/src/resources/css/club-pages/club-information-card.css rename to ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-information-card.css diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css similarity index 98% rename from ProjectSourceCode/src/resources/css/club-pages/club-page.css rename to ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css index ce8391a..d82f2f6 100644 --- a/ProjectSourceCode/src/resources/css/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css @@ -2,6 +2,7 @@ display: flex; flex-direction: column; width: 100%; + padding: 10px 100px; } /* diff --git a/ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-players-and-stats-card.css similarity index 100% rename from ProjectSourceCode/src/resources/css/club-pages/club-players-and-stats-card.css rename to ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-players-and-stats-card.css diff --git a/ProjectSourceCode/src/resources/css/league-pages/league-page.css b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-page.css similarity index 100% rename from ProjectSourceCode/src/resources/css/league-pages/league-page.css rename to ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-page.css diff --git a/ProjectSourceCode/src/resources/css/league-pages/league-table.css b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-table.css similarity index 100% rename from ProjectSourceCode/src/resources/css/league-pages/league-table.css rename to ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-table.css diff --git a/ProjectSourceCode/src/resources/css/league-pages/league-top-scorers.css b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-top-scorers.css similarity index 100% rename from ProjectSourceCode/src/resources/css/league-pages/league-top-scorers.css rename to ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-top-scorers.css diff --git a/ProjectSourceCode/src/views/partials/head.hbs b/ProjectSourceCode/src/views/partials/head.hbs index 1905c75..d64d926 100644 --- a/ProjectSourceCode/src/views/partials/head.hbs +++ b/ProjectSourceCode/src/views/partials/head.hbs @@ -23,15 +23,18 @@ - - - - + + - - - - + + + + + + + + + Group 6 Final Project From 6cdec740297c4caff0fde29b8e2ff4838bafb7a5 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Tue, 16 Apr 2024 14:30:18 -0600 Subject: [PATCH 18/24] CSS styling streamlined for all generated page contents --- .../css/generated-pages/card-styling.css | 83 ++++++++++++ .../generated-pages/club-pages/club-page.css | 107 +++++----------- .../league-pages/league-page.css | 121 +++++------------- .../league-pages/league-top-scorers.css | 2 +- .../src/views/pages/leagues-page.hbs | 19 +-- 5 files changed, 157 insertions(+), 175 deletions(-) diff --git a/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css b/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css index e69de29..c46c3d6 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css @@ -0,0 +1,83 @@ +/* +============================================================== + ENTIRE PAGE CONTAINER +============================================================== +*/ + +.page-container { + /* --- SIZE CONTAINER --- */ + width: 100%; /* Set the width to the full width of screen */ + padding: 10px 100px; /* Create some distance between page boundries and elements */ + + /* --- FORMAT CHILD ITEMS (Table and Leading Scorers Cards) --- */ + display: flex; /* Enable flexbox layout */ + flex-direction: column; /* Arrange child elements vertically */ +} + +/* +================================= + LEAGUE INFORMATION HEADER +================================= +*/ + +/* Stylization for League Information Header Card */ +.information-container +{ + /* --- POSITION CONTAINER --- */ + align-items: center; /* Center content vertically */ + margin: 20px; + + /* --- SIZE CONTAINER --- */ + height: 100px; + width: fit-content; + padding: 10px 20px; /* Adjust padding as needed */ + + /* --- STYLE CONTAINER --- */ + background: linear-gradient(to right, white, rgb(245, 245, 245), rgb(227, 227, 227)); /* Gradient from white to gray */ + transform: skewX(-20deg); /* Skew the banner to create a triangular side */ + box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.4); + + /* --- FORMAT CHILD ITEMS (logo, league name, flag) --- */ + display: flex; /* Enable flexbox layout */ + flex-direction: row; /* Arrange child elements horizontally */ +} + + /* + =========================== + LEAGUE INFORMATION CHILD ITEMS + =========================== + */ + + /* Adds Red Diagonal Strip at the end of the #league-information-container */ + .information-container::after + { + content: ''; + position: absolute; + top: 0; + right: 0; + bottom: 0; + width: 8px; /* Width of the red strip */ + background-color: red; /* Red color */ + } + +/* +============================================= + CARDS IN PAGE BODY +============================================= +*/ + +/* Styling for Standings and Top Scorers Cards */ +.card-container +{ + /* --- POSITION CONTAINER --- */ + margin: 0 10px; + margin-bottom: 20px; + + /* --- SIZE CONTAINER --- */ + padding: 15px; + + /* --- STYLE CONTAINER --- */ + background: linear-gradient(to top, rgb(216, 216, 216), rgb(236, 236, 236), rgb(241, 240, 240)); + border: 1px solid gray; + box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.5); +} \ No newline at end of file diff --git a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css index d82f2f6..b8b757a 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css @@ -1,69 +1,42 @@ -#club-page-body { - display: flex; - flex-direction: column; - width: 100%; - padding: 10px 100px; -} - /* -================================= - LEAGUE INFORMATION HEADER -================================= +=========================== +LEAGUE INFORMATION CHILD ITEMS +=========================== */ -#club-header-container { - height: 100px; - width: fit-content; - margin: 20px; - background: linear-gradient(to right, white, rgb(245, 245, 245), rgb(227, 227, 227)); /* Gradient from white to gray */ - padding: 10px 20px; /* Adjust padding as needed */ - transform: skewX(-20deg); /* Skew the banner to create a triangular side */ - cursor: pointer; /* Change cursor to pointer on hover */ - box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.4); +/* Adds Red Diagonal Strip at the end of the #club-information-container */ +#club-header-container::after { + content: ''; + position: absolute; + top: 0; + right: 0; + bottom: 0; + width: 8px; /* Width of the red strip */ + background-color: red; /* Red color */ + } - display: flex; /* Use flexbox for layout */ - align-items: center; /* Center content vertically */ +/* Styling for League Logo in Club Information Header */ +#club-logo +{ + margin: 0px 30px; + transform: skewX(20deg); /* Skew the banner to create a triangular side */ + height: 80%; } - /* - =========================== - LEAGUE INFORMATION CHILD ITEMS - =========================== - */ +/* Styling for League Title in Club Information Header */ +#club-title +{ + transform: skewX(20deg); /* Skew the banner to create a triangular side */ + margin-right: 20px; +} - /* Adds Red Diagonal Strip at the end of the #club-information-container */ - #club-header-container::after { - content: ''; - position: absolute; - top: 0; - right: 0; - bottom: 0; - width: 8px; /* Width of the red strip */ - background-color: red; /* Red color */ - } - - /* Styling for League Logo in Club Information Header */ - #club-logo - { - margin: 0px 30px; - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - height: 80%; - } - - /* Styling for League Title in Club Information Header */ - #club-title - { - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - margin-right: 20px; - } - - /* Styling for FLag in Club Information Header */ - #club-flag - { - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - height: 20px; - margin-right: 200px; - } +/* Styling for FLag in Club Information Header */ +#club-flag +{ + transform: skewX(20deg); /* Skew the banner to create a triangular side */ + height: 20px; + margin-right: 200px; +} /* ============================================= @@ -76,21 +49,7 @@ flex-direction: row; } -/* Styling for Standings and Top Scorers Cards */ -.card-container -{ - /* --- POSITION CONTAINER --- */ - margin: 0 10px; - margin-bottom: 20px; - - /* --- SIZE CONTAINER --- */ - padding: 15px; - - /* --- STYLE CONTAINER --- */ - background: linear-gradient(to top, rgb(216, 216, 216), rgb(236, 236, 236), rgb(241, 240, 240)); - border: 1px solid gray; - box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.5); -} + diff --git a/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-page.css b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-page.css index 6baf1db..65de088 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-page.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-page.css @@ -1,88 +1,43 @@ /* -============================================================== - OVERALL PAGE STYLES -============================================================== +=========================== +LEAGUE INFORMATION CHILD ITEMS +=========================== */ -#league-page-body +/* Adds Red Diagonal Strip at the end of the #league-information-container */ +#league-information-container::after { - /* --- SIZE CONTAINER --- */ - width: 100%; /* Set the width to the full width of screen */ - padding: 10px 100px; /* Create some distance between page boundries and elements */ - - /* --- FORMAT CHILD ITEMS (Table and Leading Scorers Cards) --- */ - display: flex; /* Enable flexbox layout */ - flex-direction: column; /* Arrange child elements vertically */ + content: ''; + position: absolute; + top: 0; + right: 0; + bottom: 0; + width: 8px; /* Width of the red strip */ + background-color: red; /* Red color */ } -/* -================================= - LEAGUE INFORMATION HEADER -================================= -*/ - -/* Stylization for League Information Header Card */ -#league-information-container +/* Styling for League Logo in League Information Header */ +#league-logo { - /* --- POSITION CONTAINER --- */ - align-items: center; /* Center content vertically */ - margin: 20px; - - /* --- SIZE CONTAINER --- */ - height: 100px; - width: fit-content; - padding: 10px 20px; /* Adjust padding as needed */ - - /* --- STYLE CONTAINER --- */ - background: linear-gradient(to right, white, rgb(245, 245, 245), rgb(227, 227, 227)); /* Gradient from white to gray */ - transform: skewX(-20deg); /* Skew the banner to create a triangular side */ - box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.4); - - /* --- FORMAT CHILD ITEMS (logo, league name, flag) --- */ - display: flex; /* Enable flexbox layout */ - flex-direction: row; /* Arrange child elements horizontally */ + margin: 0px 30px; + transform: skewX(20deg); /* Skew the banner to create a triangular side */ + height: 80%; } - /* - =========================== - LEAGUE INFORMATION CHILD ITEMS - =========================== - */ +/* Styling for League Title in League Information Header */ +#league-title +{ + transform: skewX(20deg); /* Skew the banner to create a triangular side */ + margin-right: 20px; +} - /* Adds Red Diagonal Strip at the end of the #league-information-container */ - #league-information-container::after - { - content: ''; - position: absolute; - top: 0; - right: 0; - bottom: 0; - width: 8px; /* Width of the red strip */ - background-color: red; /* Red color */ - } - - /* Styling for League Logo in League Information Header */ - #league-logo - { - margin: 0px 30px; - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - height: 80%; - } - - /* Styling for League Title in League Information Header */ - #league-title - { - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - margin-right: 20px; - } - - /* Styling for FLag in League Information Header */ - #league-flag - { - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - height: 20px; - margin-right: 200px; - } +/* Styling for FLag in League Information Header */ +#league-flag +{ + transform: skewX(20deg); /* Skew the banner to create a triangular side */ + height: 20px; + margin-right: 200px; +} /* ============================================= @@ -95,22 +50,6 @@ flex-direction: row; } -/* Styling for Standings and Top Scorers Cards */ -#league-table-stats-container, #league-top-scorers-stats-container -{ - /* --- POSITION CONTAINER --- */ - margin: 0 10px; - margin-bottom: 20px; - - /* --- SIZE CONTAINER --- */ - padding: 15px; - - /* --- STYLE CONTAINER --- */ - background: linear-gradient(to top, rgb(216, 216, 216), rgb(236, 236, 236), rgb(241, 240, 240)); - border: 1px solid gray; - box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.5); -} - /* ============================================================== HOVER STYLES diff --git a/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-top-scorers.css b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-top-scorers.css index 5cf4fee..0fef2d5 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-top-scorers.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-top-scorers.css @@ -1,6 +1,6 @@ /* ================================= - TABLE ADN HEADER CONTAINER + TABLE AND HEADER CONTAINER ================================= */ diff --git a/ProjectSourceCode/src/views/pages/leagues-page.hbs b/ProjectSourceCode/src/views/pages/leagues-page.hbs index bfee238..2b7e39d 100644 --- a/ProjectSourceCode/src/views/pages/leagues-page.hbs +++ b/ProjectSourceCode/src/views/pages/leagues-page.hbs @@ -1,25 +1,25 @@
                            -
                            +

                            {{league.competition.league_name}}

                            {{league.competition.league_name}} Flag
                            -
                            +
                            -
                            +
                            -
                            +

                            Table

                            -
                            +
                            @@ -54,13 +54,14 @@ -
                            -
                            +
                            + +

                            Top Scorers

                            -
                            -
                            +
                            +
                            From 7ce001cf205a9e0433b4af1a92bf740911834852 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Tue, 16 Apr 2024 14:31:54 -0600 Subject: [PATCH 19/24] CSS Cleanup --- .../css/generated-pages/card-styling.css | 16 +++++----------- .../css/generated-pages/club-pages/club-page.css | 11 ----------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css b/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css index c46c3d6..f6ac9a5 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css @@ -37,17 +37,6 @@ transform: skewX(-20deg); /* Skew the banner to create a triangular side */ box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.4); - /* --- FORMAT CHILD ITEMS (logo, league name, flag) --- */ - display: flex; /* Enable flexbox layout */ - flex-direction: row; /* Arrange child elements horizontally */ -} - - /* - =========================== - LEAGUE INFORMATION CHILD ITEMS - =========================== - */ - /* Adds Red Diagonal Strip at the end of the #league-information-container */ .information-container::after { @@ -60,6 +49,11 @@ background-color: red; /* Red color */ } + /* --- FORMAT CHILD ITEMS (logo, league name, flag) --- */ + display: flex; /* Enable flexbox layout */ + flex-direction: row; /* Arrange child elements horizontally */ +} + /* ============================================= CARDS IN PAGE BODY diff --git a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css index b8b757a..f841b9f 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css @@ -4,17 +4,6 @@ LEAGUE INFORMATION CHILD ITEMS =========================== */ -/* Adds Red Diagonal Strip at the end of the #club-information-container */ -#club-header-container::after { - content: ''; - position: absolute; - top: 0; - right: 0; - bottom: 0; - width: 8px; /* Width of the red strip */ - background-color: red; /* Red color */ - } - /* Styling for League Logo in Club Information Header */ #club-logo { From 80c1dca846bc9d803dde5c466115cbc8b52f9f1e Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Tue, 16 Apr 2024 14:36:59 -0600 Subject: [PATCH 20/24] More CSS streamlining --- .../css/generated-pages/card-styling.css | 42 ++++++++++++++ .../generated-pages/club-pages/club-page.css | 29 ---------- .../league-pages/league-page.css | 57 +------------------ .../src/views/pages/clubs-page.hbs | 6 +- .../src/views/pages/leagues-page.hbs | 6 +- 5 files changed, 50 insertions(+), 90 deletions(-) diff --git a/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css b/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css index f6ac9a5..6152c67 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css @@ -54,6 +54,35 @@ flex-direction: row; /* Arrange child elements horizontally */ } + /* + =========================== + LEAGUE INFORMATION CHILD ITEMS + =========================== + */ + + /* Styling for League Logo in League Information Header */ + #generated-page-header-logo + { + margin: 0px 30px; + transform: skewX(20deg); /* Skew the banner to create a triangular side */ + height: 80%; + } + + /* Styling for League Title in League Information Header */ + #generated-page-header-title + { + transform: skewX(20deg); /* Skew the banner to create a triangular side */ + margin-right: 20px; + } + + /* Styling for Flag in League Information Header */ + #generated-page-header-flag + { + transform: skewX(20deg); /* Skew the banner to create a triangular side */ + height: 20px; + margin-right: 200px; + } + /* ============================================= CARDS IN PAGE BODY @@ -74,4 +103,17 @@ background: linear-gradient(to top, rgb(216, 216, 216), rgb(236, 236, 236), rgb(241, 240, 240)); border: 1px solid gray; box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.5); +} + +/* +============================================================== + HOVER STYLES +============================================================== +*/ + +/* Hover Styling for Standings and Top Scorers Cards */ +.card-container:hover +{ + transform: scale(1.01); /* Scale the row by 1.1 on hover */ + box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.3); } \ No newline at end of file diff --git a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css index f841b9f..126b4b9 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css @@ -1,32 +1,3 @@ -/* -=========================== -LEAGUE INFORMATION CHILD ITEMS -=========================== -*/ - -/* Styling for League Logo in Club Information Header */ -#club-logo -{ - margin: 0px 30px; - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - height: 80%; -} - -/* Styling for League Title in Club Information Header */ -#club-title -{ - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - margin-right: 20px; -} - -/* Styling for FLag in Club Information Header */ -#club-flag -{ - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - height: 20px; - margin-right: 200px; -} - /* ============================================= CARDS IN PAGE BODY diff --git a/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-page.css b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-page.css index 65de088..05bd64d 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-page.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-page.css @@ -1,68 +1,15 @@ -/* -=========================== -LEAGUE INFORMATION CHILD ITEMS -=========================== -*/ - -/* Adds Red Diagonal Strip at the end of the #league-information-container */ -#league-information-container::after -{ - content: ''; - position: absolute; - top: 0; - right: 0; - bottom: 0; - width: 8px; /* Width of the red strip */ - background-color: red; /* Red color */ -} - -/* Styling for League Logo in League Information Header */ -#league-logo -{ - margin: 0px 30px; - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - height: 80%; -} - -/* Styling for League Title in League Information Header */ -#league-title -{ - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - margin-right: 20px; -} - -/* Styling for FLag in League Information Header */ -#league-flag -{ - transform: skewX(20deg); /* Skew the banner to create a triangular side */ - height: 20px; - margin-right: 200px; -} - /* ============================================= CARDS IN PAGE BODY ============================================= */ -#table-and-top-scorers-containers { +#table-and-top-scorers-containers +{ display: flex; flex-direction: row; } -/* -============================================================== - HOVER STYLES -============================================================== -*/ - - /* Hover Styling for Standings and Top Scorers Cards */ - #table-stats-container:hover, #top-scorers-stats-container:hover - { - transform: scale(1.01); /* Scale the row by 1.1 on hover */ - box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.3); - } - /* ============================================================== DYNAMIC PAGE WIDTH STYLES diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index 8a9d4d8..fb4e34e 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -2,9 +2,9 @@
                            - -

                            {{club.name}}

                            - {{club.name}} Flag + +

                            {{club.name}}

                            + {{club.name}} Flag
                            diff --git a/ProjectSourceCode/src/views/pages/leagues-page.hbs b/ProjectSourceCode/src/views/pages/leagues-page.hbs index 2b7e39d..ef48def 100644 --- a/ProjectSourceCode/src/views/pages/leagues-page.hbs +++ b/ProjectSourceCode/src/views/pages/leagues-page.hbs @@ -2,9 +2,9 @@
                            - -

                            {{league.competition.league_name}}

                            - {{league.competition.league_name}} Flag + +

                            {{league.competition.league_name}}

                            + {{league.competition.league_name}} Flag
                            From ae054ed60a7739f33e1febefe9f6a91ff5ad17cd Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Tue, 16 Apr 2024 14:56:22 -0600 Subject: [PATCH 21/24] More CSS clean-up to remove redundant styling and streamline elements --- .../css/generated-pages/card-styling.css | 50 ++++++++- .../club-pages/club-information-card.css | 7 -- .../generated-pages/club-pages/club-page.css | 6 - .../club-players-and-stats-card.css | 30 ----- .../league-pages/league-table.css | 106 ++++-------------- .../league-pages/league-top-scorers.css | 72 +++++------- .../src/views/pages/clubs-page.hbs | 2 +- .../src/views/pages/leagues-page.hbs | 2 +- 8 files changed, 98 insertions(+), 177 deletions(-) delete mode 100644 ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-information-card.css diff --git a/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css b/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css index 6152c67..2f69b9f 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css @@ -89,7 +89,7 @@ ============================================= */ -/* Styling for Standings and Top Scorers Cards */ +/* Styling for All Card Containers on Generated Pages */ .card-container { /* --- POSITION CONTAINER --- */ @@ -105,15 +105,61 @@ box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.5); } +/* Styling for All Tables on Generated Pages */ +table +{ + width: 100%; + padding: 15px; + + /* Table Header Styling */ + th + { + border-bottom: 3px solid red; /* Add red bottom border */ + } + + /* Data in Row Style */ + td + { + padding: 5px; + } +} + +/* Styling for All Tables Designated to Alternate on Generated Pages */ +.alternating-table tbody tr:nth-child(odd) +{ + /* Every Odd Row in Table Style */ + background-color: #d2d2d2; /* Light gray for odd rows */ +} + /* ============================================================== HOVER STYLES ============================================================== */ -/* Hover Styling for Standings and Top Scorers Cards */ +/* Hover Styling for All Card Containers on Generated Pages */ .card-container:hover { transform: scale(1.01); /* Scale the row by 1.1 on hover */ box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.3); +} + +/* Hover Styling for All Tables Designated to Alternate on Generated Pages */ +.alternating-table tbody tr:hover +{ + /* Create border around row on hover */ + border: 1px solid lightgray; + border-radius: 10px; + + /* Make club logo larger on hover */ + #league-table-club-logo + { + width: 32px; + } + + /* Undeline club name on hover */ + #league-table-club-name-column + { + text-decoration: underline; /* Add underline effect */ + } } \ No newline at end of file diff --git a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-information-card.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-information-card.css deleted file mode 100644 index 125f994..0000000 --- a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-information-card.css +++ /dev/null @@ -1,7 +0,0 @@ -#club-information-container { - height: fit-content; - width: 20%; - - display: flex; - flex-direction: column; -} diff --git a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css index 126b4b9..6e688be 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css @@ -1,9 +1,3 @@ -/* -============================================= - CARDS IN PAGE BODY -============================================= -*/ - #club-page-contents-container { display: flex; flex-direction: row; diff --git a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-players-and-stats-card.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-players-and-stats-card.css index 80001e3..17d01a9 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-players-and-stats-card.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-players-and-stats-card.css @@ -1,34 +1,4 @@ /* Container for all stats and player cards */ #club-stats-and-players-container { width: 80%; -} - -/* -================================= - PLAYER TABLE CONTAINER -================================= -*/ - -/* Table containing player information */ -#club-players-table { - width: 100%; - padding: 15px; - - /* Table Header Styling */ - th - { - border-bottom: 3px solid red; /* Add red bottom border */ - } - - /* Data in Row Style */ - td - { - padding: 5px; - } - - /* Every Odd Row in Table Style */ - tbody tr:nth-child(odd) - { - background-color: #d2d2d2; /* Light gray for odd rows */ - } } \ No newline at end of file diff --git a/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-table.css b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-table.css index 7603578..a9031d3 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-table.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-table.css @@ -1,6 +1,6 @@ /* ================================= - TABLE AND HEADER CONTAINER + LEAGUE TABLE CONTAINER ================================= */ @@ -8,102 +8,40 @@ #league-table-container { width: 60%; - justify-content: center; - align-items: center; - margin-right: 30px; - - transition: transform 0.3s ease; /* Add smooth transition effect */ } /* -================================= - TABLE CONTAINER -================================= +============================================ + LEAGUE TABLE COLUMNS STYLE +============================================ */ -/* Table that holds all the standing information */ -#league-standings-table -{ - width: 100%; - padding: 15px; +/* Club Logo Column in Table Style */ +#league-table-club-logo-column { + width: 25px; - /* Table Header Styling */ - th - { - border-bottom: 3px solid red; /* Add red bottom border */ - } - - /* Data in Row Style */ - td - { - padding: 5px; - } - - /* Every Odd Row in Table Style */ - tbody tr:nth-child(odd) - { - background-color: #d2d2d2; /* Light gray for odd rows */ - } -} - - /* - =========================== - TABLE COLUMNS STYLE - =========================== - */ - - /* Club Logo Column in Table Style */ - #league-table-club-logo-column { - width: 25px; - - /* Club Logo Style */ - #league-table-club-logo - { - width: 25px; - margin-right: 5px; - cursor: pointer; - } - - } - - /* Club Name Column in Table Style */ - #league-table-club-name-column - { - font-weight: 500; + /* Club Logo Style */ + #league-table-club-logo + { + width: 25px; + margin-right: 5px; cursor: pointer; } - /* Points Column in Table Style */ - #league-table-points-column - { - font-weight: bolder; - } +} -/* -============================================================== - HOVER STYLES -============================================================== -*/ - -/* Add hover effect to table rows */ -#league-standings-table tbody tr:hover +/* Club Name Column in Table Style */ +#league-table-club-name-column { - /* Create border around row on hover */ - border: 1px solid lightgray; - border-radius: 10px; + font-weight: 500; + cursor: pointer; +} - /* Make club logo larger on hover */ - #league-table-club-logo - { - width: 32px; - } - - /* Undeline club name on hover */ - #league-table-club-name-column - { - text-decoration: underline; /* Add underline effect */ - } +/* Points Column in Table Style */ +#league-table-points-column +{ + font-weight: bolder; } /* diff --git a/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-top-scorers.css b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-top-scorers.css index 0fef2d5..1f65f87 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-top-scorers.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/league-pages/league-top-scorers.css @@ -9,58 +9,38 @@ width: 40%; } -#league-top-scorers-stats-container { +/* +=========================== + TABLE COLUMNS STYLE +=========================== +*/ - /* Table Header Styling */ - th - { - border-bottom: 3px solid red; /* Add red bottom border */ - } - - tr - { - padding: 3px; - } - - /* Data in Row Style */ - td - { - padding: 5px; - } +#league-top-scorers-goals-column +{ + text-align: center; + font-size: 20px; + font-weight: bolder; } - /* - =========================== - TABLE COLUMNS STYLE - =========================== - */ +#league-top-scorers-logo +{ + width: 25px; + margin: 0 15px; + cursor: pointer; +} - #league-top-scorers-goals-column - { - text-align: center; - font-size: 20px; - font-weight: bolder; - } +#league-top-scorers-player-name-column +{ - #league-top-scorers-logo - { - width: 25px; - margin: 0 15px; - cursor: pointer; - } + font-size: 14px; + font-weight: bold; + padding-right: 15px; +} - #league-top-scorers-player-name-column - { - - font-size: 14px; - font-weight: bold; - padding-right: 15px; - } - - #league-top-scorers-club-name-column - { - padding-right: 15px; - } +#league-top-scorers-club-name-column +{ + padding-right: 15px; +} /* ============================================================== diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index fb4e34e..78bd9af 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -93,7 +93,7 @@
                            -
                            Goals
                            +
                            diff --git a/ProjectSourceCode/src/views/pages/leagues-page.hbs b/ProjectSourceCode/src/views/pages/leagues-page.hbs index ef48def..15e142e 100644 --- a/ProjectSourceCode/src/views/pages/leagues-page.hbs +++ b/ProjectSourceCode/src/views/pages/leagues-page.hbs @@ -20,7 +20,7 @@
                            -
                            Name
                            +
                            From 94788a8dbe1e252837612ba0aa8be47e69878b1a Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Tue, 16 Apr 2024 15:19:30 -0600 Subject: [PATCH 22/24] Updates to CSS but some formatting appears to have broken --- .../club-pages/club-page-layout.css | 35 +++++++++++++++++++ ...d-stats-card.css => club-page-styling.css} | 0 .../generated-pages/club-pages/club-page.css | 16 --------- ...tyling.css => generated-pages-styling.css} | 5 +++ ProjectSourceCode/src/views/partials/head.hbs | 7 ++-- 5 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page-layout.css rename ProjectSourceCode/src/resources/css/generated-pages/club-pages/{club-players-and-stats-card.css => club-page-styling.css} (100%) delete mode 100644 ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css rename ProjectSourceCode/src/resources/css/generated-pages/{card-styling.css => generated-pages-styling.css} (98%) diff --git a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page-layout.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page-layout.css new file mode 100644 index 0000000..7da2418 --- /dev/null +++ b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page-layout.css @@ -0,0 +1,35 @@ +/* Main Contents Container (Below Header) */ +#club-page-contents-container +{ + display: flex; + flex-direction: row; +} + /* Child Containers */ + + /* Left 20% of #club-page-contents-container + #club-information-container + { + width: 20%; + } */ + +#club-information-container { + display: flex; + flex-direction: column; +} + +#club-stats-and-players-container + { + width: 80%; + } + + + + + + + + + + + + diff --git a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-players-and-stats-card.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page-styling.css similarity index 100% rename from ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-players-and-stats-card.css rename to ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page-styling.css diff --git a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css deleted file mode 100644 index 6e688be..0000000 --- a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page.css +++ /dev/null @@ -1,16 +0,0 @@ -#club-page-contents-container { - display: flex; - flex-direction: row; -} - - - - - - - - - - - - diff --git a/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css b/ProjectSourceCode/src/resources/css/generated-pages/generated-pages-styling.css similarity index 98% rename from ProjectSourceCode/src/resources/css/generated-pages/card-styling.css rename to ProjectSourceCode/src/resources/css/generated-pages/generated-pages-styling.css index 2f69b9f..f759c24 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/card-styling.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/generated-pages-styling.css @@ -14,6 +14,11 @@ flex-direction: column; /* Arrange child elements vertically */ } +.page-content-container { + display: flex; + flex-direction: row; +} + /* ================================= LEAGUE INFORMATION HEADER diff --git a/ProjectSourceCode/src/views/partials/head.hbs b/ProjectSourceCode/src/views/partials/head.hbs index d64d926..604aeac 100644 --- a/ProjectSourceCode/src/views/partials/head.hbs +++ b/ProjectSourceCode/src/views/partials/head.hbs @@ -24,7 +24,7 @@ - + @@ -32,9 +32,8 @@ - - - + + Group 6 Final Project From 705f6f96d646f6cb1b340d27d80f975c613dcb30 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Tue, 16 Apr 2024 15:24:46 -0600 Subject: [PATCH 23/24] Fixes to formatting. Bug with formatting on club page appears to be fixed --- ...b-page-layout.css => club-page-layouts.css} | 18 +++++++++--------- .../src/views/pages/clubs-page.hbs | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) rename ProjectSourceCode/src/resources/css/generated-pages/club-pages/{club-page-layout.css => club-page-layouts.css} (54%) diff --git a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page-layout.css b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page-layouts.css similarity index 54% rename from ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page-layout.css rename to ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page-layouts.css index 7da2418..db5cd96 100644 --- a/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page-layout.css +++ b/ProjectSourceCode/src/resources/css/generated-pages/club-pages/club-page-layouts.css @@ -4,20 +4,20 @@ display: flex; flex-direction: row; } + /* Child Containers */ - /* Left 20% of #club-page-contents-container + /* Left 20% of #club-page-contents-container */ #club-information-container { width: 20%; - } */ - -#club-information-container { - display: flex; - flex-direction: column; -} - -#club-stats-and-players-container + + display: flex; + flex-direction: column; + } + + /* Right 80% of #club-page-contents-container */ + #club-stats-and-players-container { width: 80%; } diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index 78bd9af..cda915a 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -3,7 +3,7 @@
                            -

                            {{club.name}}

                            +

                            {{club.name}}

                            {{club.name}} Flag
                            From ed07a14ac940e359fa40190ddb36eab4c129a178 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Tue, 16 Apr 2024 15:25:41 -0600 Subject: [PATCH 24/24] More code clean-up --- ProjectSourceCode/src/views/pages/clubs-page.hbs | 1 - 1 file changed, 1 deletion(-) diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index cda915a..9050cbc 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -19,7 +19,6 @@

                            Information

                            -
                            #