diff --git a/ProjectSourceCode/src/index.js b/ProjectSourceCode/src/index.js index fe33a52..87425db 100644 --- a/ProjectSourceCode/src/index.js +++ b/ProjectSourceCode/src/index.js @@ -82,10 +82,10 @@ app.use(express.static(path.join(__dirname, 'resources'))); Header Scoreboard Routes *************************/ -const fetchMatchesData = require('./resources/js/scoreboard-header/current-match-routes'); +const fetchMatchesData = require('./resources/js/navigation-bar/scoreboard-header/current-match-routes'); app.use(fetchMatchesData); -const convert_time = require('./resources/js/scoreboard-header/convert-time'); +const convert_time = require('./resources/js/navigation-bar/scoreboard-header/convert-time'); app.use(convert_time); diff --git a/ProjectSourceCode/src/resources/css/navigation-bar/navigation-bar.css b/ProjectSourceCode/src/resources/css/navigation-bar/navigation-bar.css new file mode 100644 index 0000000..e69de29 diff --git a/ProjectSourceCode/src/resources/css/scoreboard-header/game-card.css b/ProjectSourceCode/src/resources/css/navigation-bar/scoreboard-header/game-card.css similarity index 93% rename from ProjectSourceCode/src/resources/css/scoreboard-header/game-card.css rename to ProjectSourceCode/src/resources/css/navigation-bar/scoreboard-header/game-card.css index d6363cc..3de5107 100644 --- a/ProjectSourceCode/src/resources/css/scoreboard-header/game-card.css +++ b/ProjectSourceCode/src/resources/css/navigation-bar/scoreboard-header/game-card.css @@ -8,9 +8,9 @@ margin-left: 5px; min-width: 150px; - color: white; - background-color: rgb(67, 66, 66); - border: 2px solid rgb(52, 52, 52); + color: rgb(0, 0, 0); + background-color: rgb(255, 255, 255); + border: 1px solid rgb(160, 159, 159); box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1); transition: transform 0.4s ease; /* Add transition for smooth effect */ diff --git a/ProjectSourceCode/src/resources/css/scoreboard-header/scoreboard.css b/ProjectSourceCode/src/resources/css/navigation-bar/scoreboard-header/scoreboard.css similarity index 61% rename from ProjectSourceCode/src/resources/css/scoreboard-header/scoreboard.css rename to ProjectSourceCode/src/resources/css/navigation-bar/scoreboard-header/scoreboard.css index 77e5ac9..20bb438 100644 --- a/ProjectSourceCode/src/resources/css/scoreboard-header/scoreboard.css +++ b/ProjectSourceCode/src/resources/css/navigation-bar/scoreboard-header/scoreboard.css @@ -1,13 +1,14 @@ .scoreboard-container { overflow-x: auto; /* Enable horizontal scrolling */ white-space: nowrap; /* Prevent cards from wrapping to the next line */ + border: 1px solid rgb(202, 2, 2); - background-color: rgb(98, 97, 97); + background-color: rgb(255, 255, 255); /* Inner box shadow */ - box-shadow: inset 0px 0px 10px rgba(0, 0, 0, 0.5); + box-shadow: inset 0px 0px 15px rgba(77, 76, 76, 0.3); } .league-container { - display: inline-block; /* Change display property to inline-block to prevent stretching */ + display: inline-block; /* Change display property to inline-block to prevent stretching */ } diff --git a/ProjectSourceCode/src/resources/js/scoreboard-header/convert-time.js b/ProjectSourceCode/src/resources/js/navigation-bar/scoreboard-header/convert-time.js similarity index 100% rename from ProjectSourceCode/src/resources/js/scoreboard-header/convert-time.js rename to ProjectSourceCode/src/resources/js/navigation-bar/scoreboard-header/convert-time.js diff --git a/ProjectSourceCode/src/resources/js/scoreboard-header/current-match-routes.js b/ProjectSourceCode/src/resources/js/navigation-bar/scoreboard-header/current-match-routes.js similarity index 100% rename from ProjectSourceCode/src/resources/js/scoreboard-header/current-match-routes.js rename to ProjectSourceCode/src/resources/js/navigation-bar/scoreboard-header/current-match-routes.js diff --git a/ProjectSourceCode/src/views/layouts/main.hbs b/ProjectSourceCode/src/views/layouts/main.hbs index 65d139f..782d53d 100644 --- a/ProjectSourceCode/src/views/layouts/main.hbs +++ b/ProjectSourceCode/src/views/layouts/main.hbs @@ -6,10 +6,10 @@ - {{> scoreboard-header/scoreboard-header}} + {{> navigation-bar/scoreboard-header/scoreboard-header}} - {{> nav}} + {{> navigation-bar/nav}} {{{body}}} diff --git a/ProjectSourceCode/src/views/partials/head.hbs b/ProjectSourceCode/src/views/partials/head.hbs index 90e18c8..9fef895 100644 --- a/ProjectSourceCode/src/views/partials/head.hbs +++ b/ProjectSourceCode/src/views/partials/head.hbs @@ -7,8 +7,8 @@ - - + + Group 6 Final Project diff --git a/ProjectSourceCode/src/views/partials/nav.hbs b/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs similarity index 100% rename from ProjectSourceCode/src/views/partials/nav.hbs rename to ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs diff --git a/ProjectSourceCode/src/views/partials/scoreboard-header/game-card.hbs b/ProjectSourceCode/src/views/partials/navigation-bar/scoreboard-header/game-card.hbs similarity index 100% rename from ProjectSourceCode/src/views/partials/scoreboard-header/game-card.hbs rename to ProjectSourceCode/src/views/partials/navigation-bar/scoreboard-header/game-card.hbs diff --git a/ProjectSourceCode/src/views/partials/scoreboard-header/scoreboard-header.hbs b/ProjectSourceCode/src/views/partials/navigation-bar/scoreboard-header/scoreboard-header.hbs similarity index 79% rename from ProjectSourceCode/src/views/partials/scoreboard-header/scoreboard-header.hbs rename to ProjectSourceCode/src/views/partials/navigation-bar/scoreboard-header/scoreboard-header.hbs index a17af93..e70e6a3 100644 --- a/ProjectSourceCode/src/views/partials/scoreboard-header/scoreboard-header.hbs +++ b/ProjectSourceCode/src/views/partials/navigation-bar/scoreboard-header/scoreboard-header.hbs @@ -3,7 +3,7 @@ {{#each matches}} - {{> scoreboard-header/game-card}} + {{> navigation-bar/scoreboard-header/game-card}} {{/each}}