diff --git a/ProjectSourceCode/src/resources/css/login-and-registration/login.css b/ProjectSourceCode/src/resources/css/login-and-registration/login.css index 7392897..baed53c 100644 --- a/ProjectSourceCode/src/resources/css/login-and-registration/login.css +++ b/ProjectSourceCode/src/resources/css/login-and-registration/login.css @@ -1,4 +1,4 @@ -#login-screen-container { +#login-page { display: none; } diff --git a/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js b/ProjectSourceCode/src/resources/js/navigation-bar/user/login-and-register-page-linking.js similarity index 57% rename from ProjectSourceCode/src/resources/js/navigation-bar/user/login.js rename to ProjectSourceCode/src/resources/js/navigation-bar/user/login-and-register-page-linking.js index 5b19749..d83d818 100644 --- a/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js +++ b/ProjectSourceCode/src/resources/js/navigation-bar/user/login-and-register-page-linking.js @@ -16,3 +16,15 @@ $(document).ready(function() { }); }); + +$(document).ready(function () { + + // Listen for click event on the register button + $('#register-button').click(function (event) { + event.preventDefault(); // Prevent the default action of following the link + + $('#login-screen-container').hide(); + // Show the register container + $('#register-screen-container').show(); + }); +}); \ No newline at end of file diff --git a/ProjectSourceCode/src/resources/js/navigation-bar/user/register.js b/ProjectSourceCode/src/resources/js/navigation-bar/user/register.js deleted file mode 100644 index 0a32d6c..0000000 --- a/ProjectSourceCode/src/resources/js/navigation-bar/user/register.js +++ /dev/null @@ -1,12 +0,0 @@ -$(document).ready(function () { - - // Listen for click event on the register button - $('#register-button').click(function (event) { - event.preventDefault(); // Prevent the default action of following the link - - $('#login-screen-container').hide(); - // Show the register container - $('#register-screen-container').show(); - }); - }); - \ No newline at end of file diff --git a/ProjectSourceCode/src/resources/middleware/navigation-bar/current-match-information.js b/ProjectSourceCode/src/resources/middleware/navigation-bar/current-match-information.js index a57a137..dc99dc6 100644 --- a/ProjectSourceCode/src/resources/middleware/navigation-bar/current-match-information.js +++ b/ProjectSourceCode/src/resources/middleware/navigation-bar/current-match-information.js @@ -7,13 +7,13 @@ const fetchMatchesData = async (req, res, next) => { const today = moment().format('YYYY-MM-DD'); // Get today's date in YYYY-MM-DD format // Subtract one day to get yesterday's date - const yesterdayUnformatted = moment().subtract(4, 'days'); + const yesterdayUnformatted = moment().subtract(1, 'days'); // Format yesterday's date as YYYY-MM-DD const yesterday = yesterdayUnformatted.format('YYYY-MM-DD'); // Array of years to fetch matches data - const league_ids = [2021]; /* Readd , 2002, 2014, 2019, 2015, 2013 */ + const league_ids = [2021, 2002, 2014, 2019, 2015, 2013]; // Array to store all matches data let allMatches = []; @@ -21,7 +21,7 @@ const fetchMatchesData = async (req, res, next) => { // Loop through each year and fetch matches data for (const league_id of league_ids) { const response = await axios({ - url: `http://api.football-data.org/v4/competitions/2021/matches`, /* Resinsert ${league_id} for 2021 */ + url: `http://api.football-data.org/v4/competitions/${league_id}/matches`, method: 'GET', params: { dateFrom: yesterday, // Set dateFrom to yesterday's date diff --git a/ProjectSourceCode/src/views/partials/footer.hbs b/ProjectSourceCode/src/views/partials/footer.hbs index 6759434..11ffc4b 100644 --- a/ProjectSourceCode/src/views/partials/footer.hbs +++ b/ProjectSourceCode/src/views/partials/footer.hbs @@ -8,8 +8,7 @@ - - +