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

Merge pull request #26 from LucasPatenaude/database-testing

Browse Source 
Add Database Functionality to Application
This commit is contained in:
Lucas Patenaude
2024-04-22 18:05:03 -06:00
committed by GitHub
parent 847afea108 1e6fd3794d
commit f1c55c6eb9
18 changed files with 288 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ProjectSourceCode/docker-compose.yaml
View File

@@ -33,6 +33,6 @@ services:
volumes:
- ../ProjectSourceCode:/home/node/app # Mount ProjectSourceCode directory
- ../ProjectSourceCode/node_modules:/home/node/app/node_modules # Mount node_modules directory
command: 'npm run testandrun'
command: 'npm run start'
volumes:
group-project:

146
ProjectSourceCode/src/index.js
View File

@@ -73,6 +73,19 @@ app.use(
extended: true,
})
);
app.use(async function(req, res, next) {
res.locals.user = req.session.user;
if(res.locals.user) {
try {
res.locals.fav_teams = await getFavoriteTeamsForUser(res.locals.user.userid);
} catch (error) {
console.error('Error fetching favorite teams:', error);
}
}
next();
});
// Serve static files from the 'public' directory
app.use(express.static(path.join(__dirname, 'resources')));
@@ -108,11 +121,27 @@ app.get('/league/:leagueID', [fetchLeaguesData, fetchLeagueScorerData], (req, re
// Clubs Page Middleware
const fetchClubsData = require('./resources/middleware/clubs-page/get-current-club-information');
const fetchClubTopScorers = require('./resources/middleware/clubs-page/get-current-club-top-scorers');
app.get('/club/:clubID', [fetchClubsData, fetchClubTopScorers], (req, res) => {
app.get('/club/:clubID', [fetchClubsData], (req, res) => {
// Render the Handlebars view with league data
var isFav = false;
var fav_teams = res.locals.fav_teams;
if(res.locals.user && fav_teams)
{
const isTeamIDInFavTeams = fav_teams.some(team => {
const teamIdInt = parseInt(team.teamid);
const clubIdInt = parseInt(req.params.clubID);
console.log('Checking team:', teamIdInt);
console.log('equal to', clubIdInt);
return teamIdInt === clubIdInt;
});
if (isTeamIDInFavTeams) {
isFav = true
}
}
res.render('pages/clubs-page', {
isFav: isFav,
clubID: req.params.clubID,
clubs: res.locals.club
});
@@ -155,13 +184,14 @@ app.post('/login', async (req, res) => {
// Render the login page with the message parameter
return res.render('pages/home', { message: 'Password does not match' });
}
else{
// Save user information in the session variable
req.session.user = user;
req.session.save();
// Redirect user to the home page
res.redirect('/home');
}
} catch (error) {
// Direct user to login screen if no user is found with matching password
res.redirect('/register');
@@ -184,14 +214,24 @@ app.post('/register', async (req, res) => {
// If username or password is missing, respond with status 400 and an error message
return res.status(400).json({ status: 'error', message: 'Invalid input' });
}
// Check if the username already exists in the database
const existingUser = await db.oneOrNone('SELECT * FROM users WHERE username = $1', req.body.username);
if (existingUser) {
// If a user with the same username already exists, respond with status 409 and an error message
return res.status(409).json({ status: 'error', message: 'Username already exists' });
}
// Hash the password using bcrypt library
const hash = await bcrypt.hash(req.body.password, 10);
// Insert username and hashed password into the 'users' table
await db.none('INSERT INTO users (username, password) VALUES ($1, $2)', [req.body.username, hash]);
// Redirect user to the login page after successful registration
res.status(200).json({ status: 'success', message: 'Registration successful' });
const user = await db.oneOrNone('SELECT * FROM users WHERE username = $1', req.body.username);
req.session.user = user;
req.session.save();
// Redirect user to the home page
res.redirect('/home');
} catch (error) {
// If an error occurs during registration, respond with status 500 and an error message
res.status(500).json({ status: 'error', message: 'An error occurred during registration' });
@@ -203,8 +243,19 @@ app.post('/register', async (req, res) => {
*************************/
app.get('/home', (req, res) => {
const loggedIn = req.session.user ? true : false;
res.render('pages/home');
});
app.get('/logout', (req, res) => {
req.session.destroy(err => {
if (err) {
console.error('Error destroying session:', err);
res.status(500).send('Internal Server Error');
} else {
res.render('pages/home', { message: 'Logged out Successfully' });
}
});
});
/************************
League Page Routes
@@ -222,6 +273,89 @@ generateLeagueRoutes(app);
const generateClubRoutes = require('./resources/routes/club-pages/generate-club-routes');
generateClubRoutes(app);
/************************
Favorite Team Database
*************************/
// Function to add a new row to the FavoriteTeams table
// database configuration
app.post('/favteam/add', async (req, res, next) => {
try {
const { userID, teamID, teamName, teamLogo } = req.body;
// Check if the user is logged in
if (!req.session.user) {
return res.status(400).json({ message: 'Login or register to add a favorite team.' });
}
// Insert the new favorite team into the database
const query = {
text: 'INSERT INTO FavoriteTeams (UserID, TeamID, TeamName, TeamLogo) VALUES ($1, $2, $3, $4)',
values: [userID, teamID, teamName, teamLogo],
};
await db.none(query);
console.log('New favorite team added successfully.');
return res.status(200).json({ message: 'New favorite team added successfully.' });
} catch (error) {
console.error('Error adding favorite team:', error);
return res.status(500).json({ error: 'Error adding favorite team' });
}
});
app.post('/favteam/remove', async (req, res) => {
try {
const { userID, teamID } = req.body;
// Check if the team exists for the user
const existingTeam = await db.oneOrNone(
'SELECT * FROM FavoriteTeams WHERE UserID = $1 AND TeamID = $2',
[userID, teamID]
);
// If the team does not exist for the user, return a 404 error
if (!existingTeam) {
return res.status(404).json({ message: 'This team is not in your favorites.' });
}
// Remove the favorite team from the database
await db.none(
'DELETE FROM FavoriteTeams WHERE UserID = $1 AND TeamID = $2',
[userID, teamID]
);
console.log('Favorite team removed successfully.');
return res.status(200).json({ message: 'Favorite team removed successfully.' });
} catch (error) {
console.error('Error removing favorite team:', error);
// If the error is a database error, return a 500 error
if (error instanceof QueryResultError) {
return res.status(500).json({ error: 'Database error occurred while removing favorite team' });
}
// If the error is a generic error, return a 400 error
return res.status(400).json({ error: 'Error occurred while removing favorite team' });
}
});
async function getFavoriteTeamsForUser(userId) {
try {
// Execute the SQL query
const favoriteTeams = await db.any(`
SELECT * FROM FavoriteTeams
WHERE UserID = $1;
`, userId);`a`
// Return the result
return favoriteTeams;
} catch (error) {
console.error('Error fetching favorite teams:', error);
throw error; // Rethrow the error for handling at a higher level
}
}
// *****************************************************
// <!-- Section 5 : Start Server-->
// *****************************************************

4
ProjectSourceCode/src/init_data/create.sql
View File

@@ -5,8 +5,8 @@ CREATE TABLE users (
);
CREATE TABLE FavoriteTeams (
UserID INT REFERENCES users(UserID) ON DELETE CASCADE ON UPDATE CASCADE,
TeamID INT,
UserID INT REFERENCES users(UserID),
TeamName VARCHAR(50),
PRIMARY KEY (UserID, TeamID)
TeamLogo VARCHAR(100)
);

4
ProjectSourceCode/src/init_data/insert.sql
View File

@@ -0,0 +1,4 @@
SELECT FavoriteTeams.*
FROM FavoriteTeams
JOIN users ON FavoriteTeams.UserID = users.UserID
WHERE users.UserID = <user_id>;

23
ProjectSourceCode/src/resources/css/navigation-bar/login.css
View File

@@ -30,6 +30,27 @@
border-color: darkred;
color: white;
}
/* CSS for the account info card */
.account-info-card {
border: 1px solid #ccc;
border-radius: 8px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
padding: 20px;
width: 300px;
}
.info-container {
margin-bottom: 10px;
}
#username {
font-size: 18px;
font-weight: bold;
color: #333;
}
#teamlogo{
width: 23px;
height: 23px;
}

0
ProjectSourceCode/src/resources/js/account-info/favorite-team.js Normal file
View File

62
ProjectSourceCode/src/resources/js/club-page/favorite-button.js
View File

@@ -2,7 +2,67 @@ document.addEventListener("DOMContentLoaded", function() {
var favoriteButton = document.getElementById("club-favorite-button");
if (favoriteButton) {
favoriteButton.addEventListener("click", function() {
favoriteButton.src = "/img/club-page/favorited.png";
var userID = document.getElementById("userID").value;
var teamID = document.getElementById("teamID").value;
var teamName = document.getElementById("teamName").value;
var teamLogo = document.getElementById("teamLogo").value;
if (favoriteButton.src.includes("/favorited.png")) {
removeFavoriteTeam(userID, teamID)
}
else {
addFavoriteTeam(userID, teamID, teamName, teamLogo)
}
});
}
});
async function addFavoriteTeam(userID, teamID, teamName, teamLogo){
try {
const response = await fetch('/favteam/add', {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
userID: userID,
teamID: teamID,
teamName: teamName,
teamLogo: teamLogo
})
});
if (!response.ok) {
throw new Error('Failed to add favorite team');
}
//Changes button if favorite team is added//
console.log('New favorite team added successfully.');
var favoriteButton = document.getElementById("club-favorite-button");
favoriteButton.src = "/img/club-page/favorited.png";
} catch (error) {
console.error('Error adding favorite team:', error);
}
}
async function removeFavoriteTeam(userID, teamID) {
try {
const response = await fetch('/favteam/remove', {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
userID: userID,
teamID: teamID
})
});
console.log('Favorite team removed successfully.');
//Change button source//
var favoriteButton = document.getElementById("club-favorite-button");
favoriteButton.src = "/img/club-page/unfavorited.png";
} catch (error) {
console.error('Error removing favorite team:', error);
}
}

1
ProjectSourceCode/src/resources/js/registration/league-and-team-select.js
View File

@@ -38,3 +38,4 @@ document.addEventListener("DOMContentLoaded", function() {
}
});

3
ProjectSourceCode/src/resources/middleware/clubs-page/get-current-club-information.js
View File

@@ -15,7 +15,7 @@ const fetchClubsData = async (req, res, next) => {
// Extract relevant data from the API response
const clubData = response.data;
// res.locals.user = users
// Attach the data to res.locals
res.locals.club = {
area: {
@@ -63,7 +63,6 @@ const fetchClubsData = async (req, res, next) => {
staff: clubData.staff,
lastUpdated: clubData.lastUpdated
};
next();
} catch (error) {
console.error('Error fetching clubs data:', error);

36
ProjectSourceCode/src/resources/middleware/clubs-page/get-current-club-top-scorers.js
View File

@@ -1,36 +0,0 @@
const axios = require('axios');
// Middleware function to fetch leagues data
const fetchLeagueScorerData = async (req, res, next) => {
try {
// Extract league ID from the URL
const leagueID = req.params.leagueID;
// Make GET request to the API endpoint using the league ID
const response = await axios.get(`http://api.football-data.org/v4/teams/${teamID}/scorers?limit=5`, {
headers: {
'X-Auth-Token': '0aa1ed31245d4a36b1ef5a79150324b3', // Add your API key here
},
});
// Extract relevant data from the API response
const scorerData = response.data;
// Attach the data to res.locals
res.locals.topScorers = {
scorers: scorerData.scorers.map(player => ({
playerID: scorer.player.id,
playerName: scorer.player.name,
goals: scorer.numberOfGoals,
}))
};
next();
} catch (error) {
console.error('Error fetching leagues data:', error);
res.locals.topScorers = null; // Set to null if there's an error
next(); // Call next middleware or route handler
}
};
module.exports = fetchLeagueScorerData;

4
ProjectSourceCode/src/resources/middleware/leagues-page/get-current-league-information.js
View File

@@ -17,6 +17,8 @@ const fetchLeaguesData = async (req, res, next) => {
const leagueData = response.data;
// Attach the data to res.locals
//res.locals.username = req.session.user.username;
console.log(req.session.user)
res.locals.league = {
area: {
league_flag: leagueData.area.flag,
@@ -39,7 +41,7 @@ const fetchLeaguesData = async (req, res, next) => {
draws: team.draw,
goal_difference: team.goalDifference,
points: team.points
}))
})),
};
next();
} catch (error) {

3
ProjectSourceCode/src/resources/routes/club-pages/generate-club-routes.js
View File

@@ -9,9 +9,8 @@ module.exports = function generateClubRoutes(app) {
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, });
});
};

3
ProjectSourceCode/src/resources/routes/league-pages/generate-league-routes.js
View File

@@ -9,9 +9,8 @@ module.exports = function generateLeagueRoutes(app) {
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 });
res.render('pages/leagues-page', { leagueID: leagueID, user: user});
});
};

14
ProjectSourceCode/src/views/pages/clubs-page.hbs
View File

@@ -5,7 +5,21 @@
<img id="generated-page-header-logo" src="{{club.crest}}" alt="{{club.name}} Logo">
<h1 id="generated-page-header-title">{{club.name}}</h1>
<img id="generated-page-header-flag" src="{{club.area.club_flag}}" alt="{{club.name}} Flag">
{{#if user}}
{{#if isFav}}
<img id="club-favorite-button" src="/img/club-page/favorited.png" alt="Favorite Button">
{{else}}
<img id="club-favorite-button" src="/img/club-page/unfavorited.png" alt="Favorite Button">
{{/if}}
{{else}}
Please sign in
{{/if}}
<!-- Hidden input fields -->
<input type="hidden" id="userID" value="{{user.userid}}">
<input type="hidden" id="teamID" value="{{club.club_id}}">
<input type="hidden" id="teamName" value="{{club.name}}">
<input type="hidden" id="teamLogo" value="{{club.crest}}">
</div>
<div id="club-page-contents-container" class="page-content-container">

10
ProjectSourceCode/src/views/pages/home.hbs
View File

@@ -4,17 +4,17 @@
<div class="row g-3" id="card-row">
<!-- 🇬🇧 Premier League -->
<a href="#" onclick="redirectToLeaguePage('2021')" class="card-link" id="league-card">
{{> homepage/league-card leagueName="Premier League" logo="./img/homepage/premier-league/icon.png" title="./img/homepage/premier-league/title.png"}}
{{> homepage/league-card leagueName="Premier League" logo="./img/homepage/premier-league/icon.png" title="./img/homepage/premier-league/title.png" }}
</a>
<!-- 🇪🇸 La Liga -->
<a href="#" onclick="redirectToLeaguePage('2014')" class="card-link" id="league-card">
{{> homepage/league-card leagueName="La Liga" logo="./img/homepage/la-liga/icon.png" title="./img/homepage/la-liga/title.png"}}
{{> homepage/league-card leagueName="La Liga" logo="./img/homepage/la-liga/icon.png" title="./img/homepage/la-liga/title.png" }}
</a>
<!-- 🇩🇪 Bundesliga -->
<a href="#" onclick="redirectToLeaguePage('2002')" class="card-link" id="league-card">
{{> homepage/league-card leagueName="Bundesliga" logo="./img/homepage/bundesliga/icon.png" title="./img/homepage/bundesliga/title.png"}}
{{> homepage/league-card leagueName="Bundesliga" logo="./img/homepage/bundesliga/icon.png" title="./img/homepage/bundesliga/title.png" }}
</a>
<!-- 🇮🇹 Serie A -->
@@ -24,12 +24,12 @@
<!-- 🇫🇷 Ligue 1 -->
<a href="#" onclick="redirectToLeaguePage('2015')" class="card-link" id="league-card">
{{> homepage/league-card leagueName="Ligue 1" logo="./img/homepage/ligue-1/icon.png" title="./img/homepage/ligue-1/title.png"}}
{{> homepage/league-card leagueName="Ligue 1" logo="./img/homepage/ligue-1/icon.png" title="./img/homepage/ligue-1/title.png" }}
</a>
<!-- 🇧🇷 Brasileirao -->
<a href="#" onclick="redirectToLeaguePage('2013')" class="card-link" id="league-card">
{{> homepage/league-card leagueName="Brasileirao" logo="./img/homepage/brasileirao/icon.png" title="./img/homepage/brasileirao/title.png"}}
{{> homepage/league-card leagueName="Brasileirao" logo="./img/homepage/brasileirao/icon.png" title="./img/homepage/brasileirao/title.png" }}
</a>
</div>

12
ProjectSourceCode/src/views/partials/navigation-bar/accountinfo.hbs Normal file
View File

@@ -0,0 +1,12 @@
<!-- Linking forms.css -->
<div class="login-page account-info-card" id="login-page">
<div class="form-container" id="login-form">
<a id="username">Username: {{user.username}}</a>
<a style="text-decoration: underline;">Favorite Teams:</a> <br>
{{#each fav_teams}}
<img id="teamlogo" src="{{this.teamlogo}}" alt="teamlogo">
<span>{{this.teamname}}</span> <br>
{{/each}}
<a class="nav-link" href = "/logout">Logout</a>
</div>
</div>

10
ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs
View File

@@ -48,10 +48,12 @@
</div>
</nav>
<!-- Container for login section -->
{{#if user.username}}
<div class="container" id="login-container">
{{> navigation-bar/accountinfo}}
</div>
{{else}}
<div class="container" id="login-container">
{{> navigation-bar/login}}
</div>
{{/if}}