From ea63a01531da59047f26b65663f99794557e5740 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Wed, 3 Apr 2024 17:12:52 -0600 Subject: [PATCH] Scorecard partial template added + changes to file names for clarity purposes --- .../css/live-scoreboard/scoreboard.css | 19 ------- .../css/scoreboard-header/game-card.css | 31 ++++++++++++ .../css/scoreboard-header/scoreboard.css | 9 ++++ .../resources/js/live-scoreboard/carousel.js | 31 ------------ ProjectSourceCode/src/views/layouts/main.hbs | 2 +- ProjectSourceCode/src/views/partials/head.hbs | 5 +- .../partials/live-scoreboard/game-card.hbs | 0 .../live-scoreboard/live-scoreboard.hbs | 50 ------------------- .../partials/scoreboard-header/game-card.hbs | 31 ++++++++++++ .../scoreboard-header/scoreboard-header.hbs | 7 +++ 10 files changed, 83 insertions(+), 102 deletions(-) delete mode 100644 ProjectSourceCode/src/resources/css/live-scoreboard/scoreboard.css create mode 100644 ProjectSourceCode/src/resources/css/scoreboard-header/game-card.css create mode 100644 ProjectSourceCode/src/resources/css/scoreboard-header/scoreboard.css delete mode 100644 ProjectSourceCode/src/resources/js/live-scoreboard/carousel.js delete mode 100644 ProjectSourceCode/src/views/partials/live-scoreboard/game-card.hbs delete mode 100644 ProjectSourceCode/src/views/partials/live-scoreboard/live-scoreboard.hbs create mode 100644 ProjectSourceCode/src/views/partials/scoreboard-header/game-card.hbs create mode 100644 ProjectSourceCode/src/views/partials/scoreboard-header/scoreboard-header.hbs diff --git a/ProjectSourceCode/src/resources/css/live-scoreboard/scoreboard.css b/ProjectSourceCode/src/resources/css/live-scoreboard/scoreboard.css deleted file mode 100644 index ce8564a..0000000 --- a/ProjectSourceCode/src/resources/css/live-scoreboard/scoreboard.css +++ /dev/null @@ -1,19 +0,0 @@ -.scoreboard-container { - overflow-x: auto; /* Enable horizontal scrolling */ - white-space: nowrap; /* Prevent cards from wrapping to the next line */ -} - -.league-container { - display: inline-block; /* Change display property to inline-block to prevent stretching */ - border: 1px solid rgb(206, 202, 202); -} - -#game-card { - display: inline-block; /* Display cards as inline-block to allow them to sit next to each other */ - border: 1px solid #ccc; - padding: 20px; - margin: 10px 0; /* Remove horizontal margin */ - min-height: 100px; - min-width: 150px; - box-sizing: border-box; -} diff --git a/ProjectSourceCode/src/resources/css/scoreboard-header/game-card.css b/ProjectSourceCode/src/resources/css/scoreboard-header/game-card.css new file mode 100644 index 0000000..4321300 --- /dev/null +++ b/ProjectSourceCode/src/resources/css/scoreboard-header/game-card.css @@ -0,0 +1,31 @@ +#game-card { + display: inline-block; /* Display cards as inline-block to allow them to sit next to each other */ + border: 1px solid #ccc; + padding: 20px; + margin: 10px 2px; /* Remove horizontal margin */ + min-height: 100px; + min-width: 150px; + box-sizing: border-box; +} + +.left-side { + width: 70%; + display: flex; + flex-direction: column; + justify-content: center; +} + +.right-side { + width: 30%; + display: flex; + justify-content: center; + align-items: center; +} + +.team { + text-align: center; +} + +.score { + text-align: center; +} diff --git a/ProjectSourceCode/src/resources/css/scoreboard-header/scoreboard.css b/ProjectSourceCode/src/resources/css/scoreboard-header/scoreboard.css new file mode 100644 index 0000000..a732689 --- /dev/null +++ b/ProjectSourceCode/src/resources/css/scoreboard-header/scoreboard.css @@ -0,0 +1,9 @@ +.scoreboard-container { + overflow-x: auto; /* Enable horizontal scrolling */ + white-space: nowrap; /* Prevent cards from wrapping to the next line */ + border: 1px solid rgb(227, 225, 225); +} + +.league-container { + display: inline-block; /* Change display property to inline-block to prevent stretching */ +} diff --git a/ProjectSourceCode/src/resources/js/live-scoreboard/carousel.js b/ProjectSourceCode/src/resources/js/live-scoreboard/carousel.js deleted file mode 100644 index ffb4953..0000000 --- a/ProjectSourceCode/src/resources/js/live-scoreboard/carousel.js +++ /dev/null @@ -1,31 +0,0 @@ -document.addEventListener('DOMContentLoaded', function () { - const carouselInner = document.querySelector('#scoreboard-container'); - const carouselItems = Array.from(carouselInner.children); - const carouselControlPrev = document.querySelector('.carousel-control-prev'); - const carouselControlNext = document.querySelector('.carousel-control-next'); - let currentIndex = 0; - - const updateCarousel = () => { - carouselItems.forEach((item, index) => { - if (index === currentIndex) { - item.classList.add('active'); - } else { - item.classList.remove('active'); - } - }); - }; - - carouselControlPrev.addEventListener('click', () => { - if (currentIndex > 0) { - currentIndex--; - updateCarousel(); - } - }); - - carouselControlNext.addEventListener('click', () => { - if (currentIndex < carouselItems.length - 1) { - currentIndex++; - updateCarousel(); - } - }); - }); \ No newline at end of file diff --git a/ProjectSourceCode/src/views/layouts/main.hbs b/ProjectSourceCode/src/views/layouts/main.hbs index f604083..6d9c23b 100644 --- a/ProjectSourceCode/src/views/layouts/main.hbs +++ b/ProjectSourceCode/src/views/layouts/main.hbs @@ -5,7 +5,7 @@ {{> head}} - {{> live-scoreboard/live-scoreboard}} + {{> scoreboard-header/scoreboard-header}} {{> nav}} diff --git a/ProjectSourceCode/src/views/partials/head.hbs b/ProjectSourceCode/src/views/partials/head.hbs index 70a42ab..23f464d 100644 --- a/ProjectSourceCode/src/views/partials/head.hbs +++ b/ProjectSourceCode/src/views/partials/head.hbs @@ -6,7 +6,10 @@ - + + + + Group 6 Final Project diff --git a/ProjectSourceCode/src/views/partials/live-scoreboard/game-card.hbs b/ProjectSourceCode/src/views/partials/live-scoreboard/game-card.hbs deleted file mode 100644 index e69de29..0000000 diff --git a/ProjectSourceCode/src/views/partials/live-scoreboard/live-scoreboard.hbs b/ProjectSourceCode/src/views/partials/live-scoreboard/live-scoreboard.hbs deleted file mode 100644 index 23358c2..0000000 --- a/ProjectSourceCode/src/views/partials/live-scoreboard/live-scoreboard.hbs +++ /dev/null @@ -1,50 +0,0 @@ -
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
-
diff --git a/ProjectSourceCode/src/views/partials/scoreboard-header/game-card.hbs b/ProjectSourceCode/src/views/partials/scoreboard-header/game-card.hbs new file mode 100644 index 0000000..c8ce5fb --- /dev/null +++ b/ProjectSourceCode/src/views/partials/scoreboard-header/game-card.hbs @@ -0,0 +1,31 @@ + + +
+
+ + +
+ +
+

team 1

+ {{team1.name}} +

0

+
+ +
+

team 2

+ {{team2.name}} +

1

+
+
+ + +
+ +
+ {{time}} +
+
+ +
+
diff --git a/ProjectSourceCode/src/views/partials/scoreboard-header/scoreboard-header.hbs b/ProjectSourceCode/src/views/partials/scoreboard-header/scoreboard-header.hbs new file mode 100644 index 0000000..9e92d1f --- /dev/null +++ b/ProjectSourceCode/src/views/partials/scoreboard-header/scoreboard-header.hbs @@ -0,0 +1,7 @@ +
+
+ + {{> scoreboard-header/game-card}} + +
+