lucaspatenaude/ScoreSpot
1
0
Fork 0
Code Projects 1 Releases 1 Wiki Activity

File structure updates

Browse Source
This commit is contained in:
Lucas Patenaude
2024-05-03 00:41:58 -06:00
parent 28489e8db7 717b41bec0
commit 631f82672f
16 changed files with 436 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/assets/css/generated-pages/club-pages/club-page-layouts.css
View File

@@ -1,6 +1,5 @@
/* Main Contents Container (Below Header) */
#club-page-contents-container
{
#club-page-contents-container {
display: flex;
flex-direction: row;
}
@@ -8,8 +7,7 @@
/* Child Containers */
/* Left 20% of #club-page-contents-container */
#club-information-container
{
#club-information-container {
width: 20%;
display: flex;
@@ -17,19 +15,6 @@
}
/* Right 80% of #club-page-contents-container */
#club-stats-and-players-container
{
#club-stats-and-players-container {
width: 80%;
}

9
public/assets/css/generated-pages/club-pages/club-page-styling.css
View File

@@ -1,10 +1,8 @@
#club-information-container
{
#club-information-container {
margin-right: 20px;
}
#club-favorite-button
{
#club-favorite-button {
width: 35px;
transform: skewX(20deg);
margin-right: 25px;
@@ -12,8 +10,7 @@
filter: outline(2px solid red);
}
#club-favorite-button:hover
{
#club-favorite-button:hover {
cursor: pointer;
}

58
public/assets/css/generated-pages/generated-pages-styling.css
View File

@@ -26,8 +26,7 @@
*/
/* Stylization for League Information Header Card */
.information-container
{
.information-container {
/* --- POSITION CONTAINER --- */
align-items: center; /* Center content vertically */
margin: 20px;
@@ -38,7 +37,12 @@
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 */
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);
@@ -48,9 +52,8 @@
}
/* Adds Red Diagonal Strip at the end of the #league-information-container */
.information-container::after
{
content: '';
.information-container::after {
content: "";
position: absolute;
top: 0;
right: 0;
@@ -66,23 +69,20 @@
*/
/* Styling for League Logo in League Information Header */
#generated-page-header-logo
{
#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
{
#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
{
#generated-page-header-flag {
transform: skewX(20deg); /* Skew the banner to create a triangular side */
height: 20px;
margin-right: 130px;
@@ -95,8 +95,7 @@
*/
/* Styling for All Card Containers on Generated Pages */
.card-container
{
.card-container {
/* --- POSITION CONTAINER --- */
margin: 0 10px;
margin-bottom: 20px;
@@ -105,33 +104,34 @@
padding: 15px;
/* --- STYLE CONTAINER --- */
background: linear-gradient(to top, rgb(216, 216, 216), rgb(236, 236, 236), rgb(241, 240, 240));
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);
}
/* Styling for All Tables on Generated Pages */
table
{
table {
width: 100%;
padding: 15px;
/* Table Header Styling */
th
{
th {
border-bottom: 3px solid red; /* Add red bottom border */
}
/* Data in Row Style */
td
{
td {
padding: 5px;
}
}
/* Styling for All Tables Designated to Alternate on Generated Pages */
.alternating-table tbody tr:nth-child(odd)
{
.alternating-table tbody tr:nth-child(odd) {
/* Every Odd Row in Table Style */
background-color: #d2d2d2; /* Light gray for odd rows */
}
@@ -143,28 +143,24 @@ table
*/
/* Hover Styling for All Card Containers on Generated Pages */
.card-container:hover
{
.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
{
.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
{
#league-table-club-logo {
width: 32px;
}
/* Undeline club name on hover */
#league-table-club-name-column
{
#league-table-club-name-column {
text-decoration: underline; /* Add underline effect */
}
}

15
public/assets/css/homepage/homepage.css
View File

@@ -6,7 +6,7 @@
/* Styling for text at top of the page */
#leagues-header {
font-family: 'Scottsdale-Italic';
font-family: "Scottsdale-Italic";
display: inline-block; /* Ensure the width is based on content */
border-bottom: 1.5px solid #999696; /* Adjust the color and thickness as needed */
}
@@ -24,7 +24,12 @@
height: 150px;
margin: 20px;
text-align: center; /* Center the content horizontally */
background: linear-gradient(to right, white, rgb(245, 245, 245), rgb(227, 227, 227)); /* Gradient from white to gray */
background: linear-gradient(
to right,
white,
rgb(245, 245, 245),
rgb(227, 227, 227)
); /* Gradient from white to gray */
padding: 10px; /* Adjust padding as needed */
position: relative; /* Needed for absolute positioning */
overflow: hidden; /* Hide the overflowing skewed content */
@@ -45,14 +50,13 @@
transform: skewX(20deg); /* Skew the banner to create a triangular side */
}
#league-card:hover {
transform: skewX(-20deg) scale(1.05); /* Increase scale on hover to make it pop */
box-shadow: 0 0 20px rgba(0, 0, 0, 0.3); /* Add box-shadow on hover for depth effect */
}
#league-card::after {
content: '';
content: "";
position: absolute;
top: 0;
right: 0;
@@ -61,7 +65,6 @@
background-color: red; /* Red color */
}
#logo {
width: 30%; /* Set width for logo */
max-height: 100px;
@@ -77,5 +80,3 @@
max-height: 80px;
max-width: 250px;
}

32
public/assets/js/club-page/favorite-button.js
View File

@@ -18,56 +18,54 @@ document.addEventListener("DOMContentLoaded", function() {
async function addFavoriteTeam(userID, teamID, teamName, teamLogo) {
try {
const response = await fetch('/favteam/add', {
method: 'POST',
const response = await fetch("/favteam/add", {
method: "POST",
headers: {
'Content-Type': 'application/json'
"Content-Type": "application/json",
},
body: JSON.stringify({
userID: userID,
teamID: teamID,
teamName: teamName,
teamLogo: teamLogo
})
teamLogo: teamLogo,
}),
});
if (!response.ok) {
throw new Error('Failed to add favorite team');
throw new Error("Failed to add favorite team");
}
if (response.status === 200) {
console.log('New favorite team added successfully.');
console.log("New favorite team added successfully.");
var favoriteButton = document.getElementById("club-favorite-button");
favoriteButton.src = "/img/club-page/favorited.png";
location.reload(); // Refresh the page
}
} catch (error) {
console.error('Error adding favorite team:', error);
console.error("Error adding favorite team:", error);
}
}
async function removeFavoriteTeam(userID, teamID) {
try {
const response = await fetch('/favteam/remove', {
method: 'POST',
const response = await fetch("/favteam/remove", {
method: "POST",
headers: {
'Content-Type': 'application/json'
"Content-Type": "application/json",
},
body: JSON.stringify({
userID: userID,
teamID: teamID
})
teamID: teamID,
}),
});
if (response.status === 200) {
console.log('Favorite team removed successfully.');
console.log("Favorite team removed successfully.");
var favoriteButton = document.getElementById("club-favorite-button");
favoriteButton.src = "/img/club-page/unfavorited.png";
location.reload(); // Refresh the page
}
} catch (error) {
console.error('Error removing favorite team:', error);
console.error("Error removing favorite team:", error);
}
}

15
public/assets/js/league-page/change-goal-difference-color.js
View File

@@ -1,26 +1,23 @@
document.addEventListener("DOMContentLoaded", function () {
var goalDifferenceCells = document.querySelectorAll("#league-table-goal-difference-column"); // Selecting the cells in the goal_difference column
var goalDifferenceCells = document.querySelectorAll(
"#league-table-goal-difference-column"
); // Selecting the cells in the goal_difference column
goalDifferenceCells.forEach(function (cell) {
var goalDifference = parseInt(cell.textContent);
var color;
if (goalDifference < 0)
{
if (goalDifference < 0) {
// Gradually darken the text color for negative goal differences
var darkenFactor = Math.ceil(goalDifference / -10); // Calculate the darken factor
var shade = Math.max(0, 255 - darkenFactor * 25); // Calculate the shade of red
color = "rgb(" + shade + ", 0, 0)"; // Create the color value
}
else if (goalDifference > 0)
{
} else if (goalDifference > 0) {
// Gradually darken the text color for positive goal differences
var darkenFactor = Math.floor(goalDifference / 10); // Calculate the darken factor
var shade = Math.max(0, 155 - darkenFactor * 15); // Adjusted the starting point to make greens darker
color = "rgb(0, " + shade + ", 0)"; // Create the color value
}
else
{
} else {
color = "inherit"; // If goal difference is 0, leave text color unchanged
}

2
public/assets/js/navigation-bar/navigation-bar-follow.js
View File

@@ -20,7 +20,7 @@ function makeNavbarSticky() {
// Adjust the position of the account pane
accountPane.style.position = "fixed"; // Make the account pane fixed
accountPane.style.top = navbar.offsetHeight + 20 + 'px'; // Move the account pane below the navbar
accountPane.style.top = navbar.offsetHeight + 20 + "px"; // Move the account pane below the navbar
} else {
// Remove the 'fixed-top' class to make the navbar non-sticky
navbar.classList.remove("fixed-top");

19
public/assets/js/navigation-bar/user/delete-account-favorite-club.js
View File

@@ -1,5 +1,7 @@
document.addEventListener("DOMContentLoaded", function () {
var deleteButtons = document.querySelectorAll("#account-delete-favorite-team-button-hover");
var deleteButtons = document.querySelectorAll(
"#account-delete-favorite-team-button-hover"
);
deleteButtons.forEach(function (deleteButton) {
deleteButton.addEventListener("click", function () {
var userID = deleteButton.getAttribute("userID");
@@ -14,23 +16,22 @@ document.addEventListener("DOMContentLoaded", function() {
async function removeAccountFavoriteTeam(userID, teamID) {
try {
const response = await fetch('/favteam/remove', {
method: 'POST',
const response = await fetch("/favteam/remove", {
method: "POST",
headers: {
'Content-Type': 'application/json'
"Content-Type": "application/json",
},
body: JSON.stringify({
userID: userID,
teamID: teamID
})
teamID: teamID,
}),
});
if (response.status === 200) {
console.log('Favorite team removed successfully.');
console.log("Favorite team removed successfully.");
location.reload(); // Refresh the page
}
} catch (error) {
console.error('Error removing favorite team:', error);
console.error("Error removing favorite team:", error);
}
}

29
public/assets/js/navigation-bar/user/login-and-register-page-linking.js
View File

@@ -1,41 +1,34 @@
$(document).ready(function () {
// When #user is clicked
$('#user-profile-button').click(function() {
$('#register-screen-container').hide();
$("#user-profile-button").click(function () {
$("#register-screen-container").hide();
// Toggle the visibility of the login container
$('#login-pane').toggle();
$("#login-pane").toggle();
});
$('#register-page-login-button').click(function (event) {
$("#register-page-login-button").click(function (event) {
event.preventDefault(); // Prevent the default action of following the link
$('#register-screen-container').hide();
$('#login-pane').show();
$("#register-screen-container").hide();
$("#login-pane").show();
});
});
$(document).ready(function () {
// Listen for click event on the register button
$('#register-button').click(function (event) {
$("#register-button").click(function (event) {
event.preventDefault(); // Prevent the default action of following the link
$('#login-pane').hide();
$("#login-pane").hide();
// Show the register container
$('#register-screen-container').show();
$("#register-screen-container").show();
});
});
$(document).ready(function () {
// When #user is clicked
$('#user-profile-button').click(function() {
$("#user-profile-button").click(function () {
// Toggle the visibility of the login container
$('#account-pane').toggle();
$("#account-pane").toggle();
});
});

2
public/views/partials/navigation-bar/user-menu/login.hbs
View File

@@ -1,6 +1,8 @@
<!-- Linking forms.css -->
<div class="account-portal-container" id="login-pane">
<div class="form-container" id="login-form">
<img id="account-portal-logo" src="/img/logo.png" style="width: 150px;">
<h1 class="mt-5 mb-4">Login</h1>
<!-- Check if message variable is present to display message partial -->

27
src/middleware/clubs-page/get-current-club-information.js
View File

@@ -1,4 +1,4 @@
const axios = require('axios');
const axios = require("axios");
// Middleware function to fetch clubs data
const fetchClubsData = async (req, res, next) => {
@@ -7,11 +7,14 @@ const fetchClubsData = async (req, res, next) => {
const clubID = req.params.clubID;
// Make GET request to the API endpoint using the club ID
const response = await axios.get(`http://api.football-data.org/v4/teams/${clubID}/?offset=&limit=`, {
const response = await axios.get(
`http://api.football-data.org/v4/teams/${clubID}/?offset=&limit=`,
{
headers: {
'X-Auth-Token': '0aa1ed31245d4a36b1ef5a79150324b3', // Add your API key here
"X-Auth-Token": "0aa1ed31245d4a36b1ef5a79150324b3", // Add your API key here
},
});
}
);
// Extract relevant data from the API response
const clubData = response.data;
@@ -34,12 +37,12 @@ const fetchClubsData = async (req, res, next) => {
founded: clubData.founded,
clubColors: clubData.clubColors,
venue: clubData.venue,
runningCompetitions: clubData.runningCompetitions.map(competition => ({
runningCompetitions: clubData.runningCompetitions.map((competition) => ({
id: competition.id,
name: competition.name,
code: competition.code,
type: competition.type,
emblem: competition.emblem
emblem: competition.emblem,
})),
coach: {
id: clubData.coach.id,
@@ -50,22 +53,22 @@ const fetchClubsData = async (req, res, next) => {
nationality: clubData.coach.nationality,
contract: {
start: clubData.coach.contract.start,
until: clubData.coach.contract.until
}
until: clubData.coach.contract.until,
},
squad: clubData.squad.map(player => ({
},
squad: clubData.squad.map((player) => ({
id: player.id,
name: player.name,
position: player.position,
dateOfBirth: player.dateOfBirth,
nationality: player.nationality
nationality: player.nationality,
})),
staff: clubData.staff,
lastUpdated: clubData.lastUpdated
lastUpdated: clubData.lastUpdated,
};
next();
} catch (error) {
console.error('Error fetching clubs data:', error);
console.error("Error fetching clubs data:", error);
res.locals.club = null; // Set to null if there's an error
next(); // Call next middleware or route handler
}

8
src/routes/club-pages/generate-club-routes.js
View File

@@ -1,4 +1,4 @@
const express = require('express');
const express = require("express");
const app = express();
// generate-league-routes.js
@@ -6,12 +6,10 @@ const app = express();
// Define a function to generate league routes
module.exports = function generateClubRoutes(app) {
// Define a route to handle requests to "/league/:leagueName"
app.get('/club/:clubID', (req, res) => {
app.get("/club/:clubID", (req, res) => {
// Extract the league name from the URL parameters
const clubID = req.params.clubID;
// Render the league page template using Handlebars
res.render('pages/club-page', { clubID: clubID, });
res.render("pages/club-page", { clubID: clubID });
});
};

10
src/routes/club-pages/redirect-to-club-url.js
View File

@@ -1,8 +1,12 @@
// Add click event listener to club logos
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) => {
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');
const clubId = element.getAttribute("clubID");
redirectToClubPage(clubId);
});
});

8
src/routes/league-pages/generate-league-routes.js
View File

@@ -1,4 +1,4 @@
const express = require('express');
const express = require("express");
const app = express();
// generate-league-routes.js
@@ -6,12 +6,10 @@ const app = express();
// Define a function to generate league routes
module.exports = function generateLeagueRoutes(app) {
// Define a route to handle requests to "/league/:leagueName"
app.get('/league/:leagueID', (req, res) => {
app.get("/league/:leagueID", (req, res) => {
// Extract the league name from the URL parameters
const leagueID = req.params.leagueID;
// Render the league page template using Handlebars
res.render('pages/leagues-page', { leagueID: leagueID, user: user});
res.render("pages/leagues-page", { leagueID: leagueID, user: user });
});
};

10
src/routes/league-pages/get-team-names-for-registry.js
View File

@@ -1,19 +1,19 @@
const axios = require('axios');
const axios = require("axios");
const fetchTeamNames = async (selectedLeague) => {
try {
const response = await axios({
url: `http://api.football-data.org/v4/competitions/${selectedLeague}/teams`,
method: 'GET',
method: "GET",
headers: {
'X-Auth-Token': '0aa1ed31245d4a36b1ef5a79150324b3',
"X-Auth-Token": "0aa1ed31245d4a36b1ef5a79150324b3",
},
});
const teams = response.data.teams.map(team => team.name);
const teams = response.data.teams.map((team) => team.name);
return teams;
} catch (error) {
console.error('Error fetching teams data:', error);
console.error("Error fetching teams data:", error);
return [];
}
};