From b8f071ed47b369c2f5dbc67ebe8cc1f15a388312 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Fri, 19 Apr 2024 18:08:07 -0600 Subject: [PATCH 1/7] Basic player card hover file implementations added --- .../src/resources/js/club-page/player-card-hover.js | 0 .../views/partials/{player-card => club-page}/player-card.hbs | 0 ProjectSourceCode/src/views/partials/footer.hbs | 1 + 3 files changed, 1 insertion(+) create mode 100644 ProjectSourceCode/src/resources/js/club-page/player-card-hover.js rename ProjectSourceCode/src/views/partials/{player-card => club-page}/player-card.hbs (100%) diff --git a/ProjectSourceCode/src/resources/js/club-page/player-card-hover.js b/ProjectSourceCode/src/resources/js/club-page/player-card-hover.js new file mode 100644 index 0000000..e69de29 diff --git a/ProjectSourceCode/src/views/partials/player-card/player-card.hbs b/ProjectSourceCode/src/views/partials/club-page/player-card.hbs similarity index 100% rename from ProjectSourceCode/src/views/partials/player-card/player-card.hbs rename to ProjectSourceCode/src/views/partials/club-page/player-card.hbs diff --git a/ProjectSourceCode/src/views/partials/footer.hbs b/ProjectSourceCode/src/views/partials/footer.hbs index dee842b..dcdbd58 100644 --- a/ProjectSourceCode/src/views/partials/footer.hbs +++ b/ProjectSourceCode/src/views/partials/footer.hbs @@ -19,5 +19,6 @@ + \ No newline at end of file From 0cc7bebf0bd28b32e63a0182da65a74e1c86756e Mon Sep 17 00:00:00 2001 From: Aviral Date: Sun, 21 Apr 2024 14:11:35 -0600 Subject: [PATCH 2/7] player hover initial addition --- .../src/resources/js/club-page/player-card-hover.js | 6 ++++++ .../middleware/clubs-page/get-current-club-information.js | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ProjectSourceCode/src/resources/js/club-page/player-card-hover.js b/ProjectSourceCode/src/resources/js/club-page/player-card-hover.js index e69de29..61efc24 100644 --- a/ProjectSourceCode/src/resources/js/club-page/player-card-hover.js +++ b/ProjectSourceCode/src/resources/js/club-page/player-card-hover.js @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/ProjectSourceCode/src/resources/middleware/clubs-page/get-current-club-information.js b/ProjectSourceCode/src/resources/middleware/clubs-page/get-current-club-information.js index c28ec43..cec319b 100644 --- a/ProjectSourceCode/src/resources/middleware/clubs-page/get-current-club-information.js +++ b/ProjectSourceCode/src/resources/middleware/clubs-page/get-current-club-information.js @@ -58,7 +58,9 @@ const fetchClubsData = async (req, res, next) => { name: player.name, position: player.position, dateOfBirth: player.dateOfBirth, - nationality: player.nationality + nationality: player.nationality, + contractStart: player.contract.start, + contractEnd: player.contract.until })), staff: clubData.staff, lastUpdated: clubData.lastUpdated From 60fabe096206965515af5b98e3915f6a0b9ff3ef Mon Sep 17 00:00:00 2001 From: Aviral Date: Sun, 21 Apr 2024 14:24:22 -0600 Subject: [PATCH 3/7] player hover commit two --- .../src/resources/js/club-page/player-card-hover.js | 6 ------ .../src/views/partials/club-page/player-hover.hbs | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 ProjectSourceCode/src/views/partials/club-page/player-hover.hbs diff --git a/ProjectSourceCode/src/resources/js/club-page/player-card-hover.js b/ProjectSourceCode/src/resources/js/club-page/player-card-hover.js index 61efc24..e69de29 100644 --- a/ProjectSourceCode/src/resources/js/club-page/player-card-hover.js +++ b/ProjectSourceCode/src/resources/js/club-page/player-card-hover.js @@ -1,6 +0,0 @@ - \ No newline at end of file diff --git a/ProjectSourceCode/src/views/partials/club-page/player-hover.hbs b/ProjectSourceCode/src/views/partials/club-page/player-hover.hbs new file mode 100644 index 0000000..61efc24 --- /dev/null +++ b/ProjectSourceCode/src/views/partials/club-page/player-hover.hbs @@ -0,0 +1,6 @@ + \ No newline at end of file From a8170991c23af6516df4b13a5d8b5b2dcce6b66e Mon Sep 17 00:00:00 2001 From: Aviral Date: Sun, 21 Apr 2024 14:42:56 -0600 Subject: [PATCH 4/7] player hover initial addition to club page --- ProjectSourceCode/src/views/pages/clubs-page.hbs | 4 ++++ .../src/views/partials/club-page/player-hover.hbs | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index fb35c60..ec560c9 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -104,6 +104,10 @@ {{#each club.squad}} + {{name}} {{position}} diff --git a/ProjectSourceCode/src/views/partials/club-page/player-hover.hbs b/ProjectSourceCode/src/views/partials/club-page/player-hover.hbs index 61efc24..f353aac 100644 --- a/ProjectSourceCode/src/views/partials/club-page/player-hover.hbs +++ b/ProjectSourceCode/src/views/partials/club-page/player-hover.hbs @@ -1,5 +1,4 @@ + - {{name}} + + + {{position}} {{dateOfBirth}} {{nationality}} From a1440dc8d72d8ee37ee7a09c1d2654d001e12552 Mon Sep 17 00:00:00 2001 From: Aviral Date: Sun, 21 Apr 2024 14:51:06 -0600 Subject: [PATCH 6/7] player hover club page changes --- ProjectSourceCode/src/views/pages/clubs-page.hbs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index fa5e0dd..3c342e4 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -107,9 +107,8 @@ - {{position}} From 6ce596771e19dd67d7185d09307ae5684dabbfe0 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Sun, 21 Apr 2024 18:11:03 -0600 Subject: [PATCH 7/7] Fixes to player hover branch. Club page was not returning data to it --- .../middleware/clubs-page/get-current-club-information.js | 4 +--- ProjectSourceCode/src/views/pages/clubs-page.hbs | 7 +------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ProjectSourceCode/src/resources/middleware/clubs-page/get-current-club-information.js b/ProjectSourceCode/src/resources/middleware/clubs-page/get-current-club-information.js index cec319b..c28ec43 100644 --- a/ProjectSourceCode/src/resources/middleware/clubs-page/get-current-club-information.js +++ b/ProjectSourceCode/src/resources/middleware/clubs-page/get-current-club-information.js @@ -58,9 +58,7 @@ const fetchClubsData = async (req, res, next) => { name: player.name, position: player.position, dateOfBirth: player.dateOfBirth, - nationality: player.nationality, - contractStart: player.contract.start, - contractEnd: player.contract.until + nationality: player.nationality })), staff: clubData.staff, lastUpdated: clubData.lastUpdated diff --git a/ProjectSourceCode/src/views/pages/clubs-page.hbs b/ProjectSourceCode/src/views/pages/clubs-page.hbs index 3c342e4..fb35c60 100644 --- a/ProjectSourceCode/src/views/pages/clubs-page.hbs +++ b/ProjectSourceCode/src/views/pages/clubs-page.hbs @@ -104,13 +104,8 @@ {{#each club.squad}} - - - - + {{name}} {{position}} {{dateOfBirth}} {{nationality}}