-
- );
-};
-
-export default Certificate;
diff --git a/Client/src/screens/GameOver.jsx b/Client/src/screens/GameOver.jsx
index e3f9669..9a25534 100644
--- a/Client/src/screens/GameOver.jsx
+++ b/Client/src/screens/GameOver.jsx
@@ -1,21 +1,51 @@
import React, { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
-import bg1 from '/gameOver_bg.png';
-import bg2 from '/gameOver_bg2.png';
-import signboard from '/signboard.png';
+import bg1 from '../assets/gameOver_bg.png'; // Import background image for large screens
+import bg2 from '../assets/gameOver_bg2.png'; // Import background image for small screens
+import signboard from '../assets/signboard.png'; // Import image for the signboard
-const GameOver = ({ score, bestScore, username }) => {
- const navigate = useNavigate();
- useEffect(() => {
+// The GameOver component displays the game over screen with the user's score, best score, and buttons for actions
+
+const GameOver = ({ score, bestScore, username, resetGame}) => {
+ const navigate = useNavigate();// Hook for programmatic navigation
+
+ // Function to submit the score to the API
+
+ const submitScore = async (username, score) => {
+ try {
+ const data = { username, score };// Prepare data to send to the API
+ console.log("started fetch");// Log fetch initiation
+ const response = await fetch('https://flappy-api.poseidon0z.com/api/gameusers', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify(data),// Convert data to JSON format
+ });
+ console.log("completed fetch");// Log fetch completion
+
+ if (!response.ok) throw new Error('Failed to submit game data');// Check for errors
+
+ const result = await response.json();// Parse response data
+ console.log(result.message);// Log success message from API
+ } catch (error) {
+ console.error('Error submitting game data:', error);
+ }
+ };
+
+ // Effect hook to add and remove keydown event listener for spacebar
+ useEffect(() => {
const handleKeyDown = (event) => {
- if (event.key === ' ' && !event.repeat) {
- event.preventDefault();
- location.reload();
+ if (event.key === ' ' && !event.repeat) {// Check if the spacebar key is pressed
+ event.preventDefault(); // Prevent the default action
+ resetGame();// Call the function to restart the game
}
};
- window.addEventListener('keydown', handleKeyDown);
+ window.addEventListener('keydown', handleKeyDown); // Add event listener for keydown
+ // Clean up the event listener when the component is unmounted
+ return () => {
+ window.removeEventListener('keydown', handleKeyDown);
+ };
}, []);
return (
@@ -83,20 +113,23 @@ const GameOver = ({ score, bestScore, username }) => {
{/* Buttons section */}
-
-
-
-
- 
-
- - CERTIFICATE -
-
-
- - Congratulations -
- - {localStorage.getItem('username')} - -
-
-
- - for achieving an -
- - impressive score of - -- - {bestScore} - -
-
-
-
-
-
+
User : {username}
-
+ {/* Container with background images and full-height */}
+
+
+ {/* Logo image with responsive width and bottom padding */}
+
-
);
};
diff --git a/Client/src/screens/LeaderBoard.jsx b/Client/src/screens/LeaderBoard.jsx
index 5ece887..050ab9d 100644
--- a/Client/src/screens/LeaderBoard.jsx
+++ b/Client/src/screens/LeaderBoard.jsx
@@ -1,55 +1,71 @@
-import { React, useState, useEffect } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { React, useState, useEffect } from "react";
+import { useNavigate } from "react-router-dom";
-import bird from '/leaderBoard_bird.png';
-import crownGold from '/leaderBoard_crown_r1.png';
-import crownSilver from '/leaderBoard_crown_r2.png';
-import crownBronze from '/leaderBoard_crown_r3.png';
+// Import images for the leaderboard
+import bird from "../assets/leaderBoard_bird.png";
+import crownGold from "../assets/leaderBoard_crown_r1.png";
+import crownSilver from "../assets/leaderBoard_crown_r2.png";
+import crownBronze from "../assets/leaderBoard_crown_r3.png";
-const LeaderBoard = ({ setScreen, players }) => {
- const navigate = useNavigate();
- const [playersData, setPlayers] = useState([]);
+const LeaderBoard = ({ stayAnonymous, isLoggedIn }) => {
+ const navigate = useNavigate(); // Hook to navigate programmatically
+ const [playersData, setPlayers] = useState([]); // State to hold player data
+ // useEffect hook to fetch player data when the component mounts
useEffect(() => {
const fetchPlayers = async () => {
try {
- const response = await fetch('https://flappy-api.poseidon0z.com/api/gameusers');
+ const response = await fetch("https://flappy-api.poseidon0z.com/api/gameusers");
const data = await response.json();
- const sortedPlayers = data.sort((a, b) => a.rank - b.rank);
- setPlayers(sortedPlayers);
+ setPlayers(data); // Update state with fetched player data
} catch (error) {
- console.error('Error fetching players:', error);
+ console.error("Error fetching players:", error); // Log errors if fetch fails
}
};
- fetchPlayers();
- }, []);
+ fetchPlayers(); // Call fetch function
+ }, []); // Empty dependency array means this effect runs once on mount
- console.log(playersData);
return (
+ +
Click / Press The Space Bar to Start
+ {/* Instruction text centered and white-colored */}
- {/* Div for larger screens */}
+ {/* Main container for the leaderboard */}
+
+ {/* Large screen leaderboard container */}
+
);
};
-export default LeaderBoard;
\ No newline at end of file
+export default LeaderBoard;
diff --git a/Client/src/screens/Objects/Bird.jsx b/Client/src/screens/Objects/Bird.jsx
index fb9fca3..302b310 100644
--- a/Client/src/screens/Objects/Bird.jsx
+++ b/Client/src/screens/Objects/Bird.jsx
@@ -1,15 +1,22 @@
+import React from 'react';
+
+// The Bird component displays the bird in the game.
const Bird = (props) => {
return (
);
diff --git a/Client/src/screens/Objects/CountDown.jsx b/Client/src/screens/Objects/CountDown.jsx
index 72aef7c..8d690f3 100644
--- a/Client/src/screens/Objects/CountDown.jsx
+++ b/Client/src/screens/Objects/CountDown.jsx
@@ -1,32 +1,40 @@
import React, { useEffect, useState } from 'react';
+// CountDown component to display a countdown timer before starting the game
function CountDown({ count, setGameStopped }) {
+ // State to keep track of the current countdown value
const [countdown, setCountdown] = useState(count);
+
+ // Use effect to set up a timer when the component mounts
useEffect(() => {
- const always = setInterval(() => {
+ // Set up an interval that decreases the countdown value every second
+ const timer = setInterval(() => {
setCountdown((prevCount) => prevCount - 1);
}, 1000);
+ // Cleanup function to clear the interval when the component unmounts
return () => {
- clearInterval(always);
+ clearInterval(timer);
};
- }, []);
+ }, []); // Empty dependency array means this effect runs once when the component mounts
+ // Use effect to update game state when countdown reaches zero
useEffect(() => {
- if (countdown == 0) {
+ if (countdown === 0) {
+ // Set game to not stopped, indicating the game can start
setGameStopped(false);
}
- }, [countdown]);
+ }, [countdown]); // This effect runs whenever the countdown value changes
return (
-
+ {/* Container for the leaderboard title with images */}
+
+ {/* Image on the left of the title */}
+
+ {/* Image on the right of the title, mirrored horizontally */}
LEADERBOARD
+ {/* Title of the leaderboard */} +-
+ {/* List of leaderboard entries */}
+
- + {/* Container for top three players */} + + {playersData[2] && ( +
-
+ {/* Third place player */}
+
{ className="absolute crown3 h-80px top-[-45px] left-[-90px]" /> - - {!(playersData[2] === undefined) - ? playersData[2].username - : ''} + {/* Bronze crown */} + + + {playersData[2].username} + {/* Player's username */} + - {!(playersData[2] === undefined) ? playersData[2].score : ''} + {playersData[2].score} + {/* Player's score */}
)}
- {players[0] && (
- - + {playersData[0] && ( +
-
+ {/* First place player */}
+
{ className="absolute crown1 -top-45px -left-110px w-100px h-90px" /> - - {!(playersData[0] === undefined) - ? playersData[0].username - : ''} + {/* Gold crown */} + + + {playersData[0].username} + {/* Player's username */} + - {!(playersData[0] === undefined) ? playersData[0].score : ''} + {playersData[0].score} + {/* Player's score */}
)}
- {players[1] && (
- - + {playersData[1] && ( +
-
+ {/* Second place player */}
+
{ className="absolute crown2 w-90% h-80px top-[-45px] left-[-90px]" /> - - {!(playersData[1] === undefined) - ? playersData[1].username - : ''} + {/* Silver crown */} + + + {playersData[1].username} - - {!(playersData[1] === undefined) ? playersData[1].score : ''} + {/* Player's username */} + + + {playersData[1].score} + {/* Player's score */}
)}
- { #{index + 4} - + {/* Player's rank */} + + {player.username} + {/* Player's username */} + {player.score} + {/* Player's score */} ))}
-
+ {/* First place player */}
+
- )}
-
-
-
)}
- {players[1] && (
-
-
- + {/* Container for second and third place players */} + + {playersData[2] && ( ++ {playersData[1] && ( +
- + {/* Third place player */} + +
+ )} - - {!(playersData[1] === undefined) - ? playersData[1].username - : ''} - - - {!(playersData[1] === undefined) ? playersData[1].score : ''} - - - )} - - + {/* Third place player */} + +
-
+ {/* Second place player */}
+
+
+ )}
+
- - - #{index + 4} - - - {player.username} - - - {player.score} - - - ))} +
- + + #{index + 4} + + {/* Player's rank */} + + + {player.username} + + {/* Player's username */} + + + {player.score} + + {/* Player's score */} + + ))} +
- {players[2] && (
-
-
+
- {/* Div for smaller screens */}
+ {/* List of remaining players */}
+
{playersData.slice(3).map((player, index) => (
+
+ {/* Button to navigate back to the play screen */}
- {/* Mobile version content */}
+ {/* Mobile screen leaderboard container */}
+
+ {/* Container for the leaderboard title with images */}
+
+ {/* Image on the left of the title */}
+
+ {/* Image on the right of the title, mirrored horizontally */}
LEADERBOARD
+ {/* Title of the leaderboard */} +-
+ {/* List of leaderboard entries */}
+
- {players[0] && (
+ {/* Container for top three players */}
+
+ {playersData[0] && (
-
-
- {players[2] && (
-
-
- {playersData.slice(3).map((player, index) => (
-
+ {/* List of remaining players */}
+
+ {playersData.slice(3).map((player, index) => (
+
-
-
-
- Get ready to
- flap in
+
+
+
+
Get ready to
+ flap in
- {countdown}
+ {countdown} {/* Display the current countdown value */}
diff --git a/Client/src/screens/Objects/Pipe.jsx b/Client/src/screens/Objects/Pipe.jsx
index 7a187d1..253e42a 100644
--- a/Client/src/screens/Objects/Pipe.jsx
+++ b/Client/src/screens/Objects/Pipe.jsx
@@ -1,19 +1,20 @@
+// Pipe component renders an image of a pipe that represents an obstacle in the game
const Pipe = ({ x, height, pipeImg }) => {
return (
);
};
-export default Pipe;
+
+export default Pipe; // Export the component for use in other parts of the application
diff --git a/Client/src/screens/Objects/PipeBottom.jsx b/Client/src/screens/Objects/PipeBottom.jsx
index fedf710..7d59323 100644
--- a/Client/src/screens/Objects/PipeBottom.jsx
+++ b/Client/src/screens/Objects/PipeBottom.jsx
@@ -1,18 +1,20 @@
+// PipeBottom component renders an image of the bottom part of a pipe obstacle
const PipeBottom = ({ pipeImg, x, height }) => {
return (
);
};
-export default PipeBottom;
+
+export default PipeBottom; // Export the component for use in other parts of the application
diff --git a/Client/src/screens/Objects/ScoreBoard.jsx b/Client/src/screens/Objects/ScoreBoard.jsx
index 16f1019..a15afe2 100644
--- a/Client/src/screens/Objects/ScoreBoard.jsx
+++ b/Client/src/screens/Objects/ScoreBoard.jsx
@@ -1,18 +1,27 @@
import React from 'react';
-import ScoreBoardImg from '/playscreen_ScoreBoard.png';
+import ScoreBoardImg from '../../assets/playscreen_ScoreBoard.png'; // Import the background image for the scoreboard
function ScoreBoard({ score }) {
+ // Format the score: round it and ensure it's a string, default to '0' if not a number
const formattedScore = isNaN(score) ? '0' : Math.round(score).toString();
return (
-
+
-
- {formattedScore}
+
+ {formattedScore} {/* Display the formatted score */}
);
diff --git a/Client/src/screens/PlayScreen.jsx b/Client/src/screens/PlayScreen.jsx
index 119a9ed..10806e3 100644
--- a/Client/src/screens/PlayScreen.jsx
+++ b/Client/src/screens/PlayScreen.jsx
@@ -1,13 +1,14 @@
import React, { useEffect, useState } from 'react';
+import { useGameContext } from '../contexts/gameContext';
-import pipe_xs from '/Totem-xs.png';
-import pipe_s from '/Totem-s.png';
-import pipe_m from '/Totem-m.png';
-import pipe_l from '/Totem-l.png';
-import pipe_xl from '/Totem-xl.png';
-
-import './play.css';
+// Importing images for different sizes of pipes
+import pipe_xs from '../assets/Totem-xs.png';
+import pipe_s from '../assets/Totem-s.png';
+import pipe_m from '../assets/Totem-m.png';
+import pipe_l from '../assets/Totem-l.png';
+import pipe_xl from '../assets/Totem-xl.png';
+// Importing components used in the game
import Bird from './Objects/Bird';
import Pipe from './Objects/Pipe';
import PipeBottom from './Objects/PipeBottom';
@@ -15,84 +16,124 @@ import ScoreBoard from './Objects/ScoreBoard';
import CountDown from './Objects/CountDown';
import GameOver from './GameOver';
+// Information about the obstacles
const obstacle_info = [
- { name: 'xs', img: pipe_xs, height: 4 / 6 },
- { name: 's', img: pipe_s, height: 5 / 6 },
- { name: 'm', img: pipe_m, height: 1 },
- { name: 'l', img: pipe_l, height: 7 / 6 },
- { name: 'xl', img: pipe_xl, height: 8 / 6 },
+ { name: 'xs', img: pipe_xs, height: 4 / 6 }, // Extra small pipe
+ { name: 's', img: pipe_s, height: 5 / 6 }, // Small pipe
+ { name: 'm', img: pipe_m, height: 1 }, // Medium pipe
+ { name: 'l', img: pipe_l, height: 7 / 6 }, // Large pipe
+ { name: 'xl', img: pipe_xl, height: 8 / 6 }, // Extra large pipe
];
function PlayScreen() {
- const floorRatio = 0.092;
- const gap = 150;
- const availableHeight =
- document.documentElement.clientHeight * (1 - floorRatio);
- const totem_height = (availableHeight - gap) / 2;
- const birdLeft = document.documentElement.clientWidth * 0.05;
- const gravity = 1;
- const obstacleCount = 4;
- const totemGap = 750;
-
- const [gameStopped, setGameStopped] = useState(true);
- const [distance, setDistance] = useState(0);
+ // Game context to get and set the current score and player name
+ const { setCurrentScore, playerName, currentScore } = useGameContext();
+
+ // Get username from localStorage or use the default player name
+ const uname = (localStorage.getItem("isLoggedIn") === "true") ? localStorage.getItem("UserInfo") : playerName;
+
+ // Game parameters
+ const floorRatio = 0.092; // Ratio of the screen taken up by the floor
+ const gap = 150; // Gap between pipes
+ const availableHeight = document.documentElement.clientHeight * (1 - floorRatio); // Usable height for the game
+ const totem_height = (availableHeight - gap) / 2; // Height of the pipes
+ const birdLeft = document.documentElement.clientWidth * 0.05; // Initial horizontal position of the bird
+ const gravity = 1; // Gravity affecting the bird
+ const obstacleCount = 4; // Number of obstacles in view
+ const totemGap = 750; // Gap between obstacles
+
+ // Game state
+ const [gameStopped, setGameStopped] = useState(true); // Indicates if the game is stopped
+ const [distance, setDistance] = useState(0); // Distance traveled by the bird
const [obstacles, setObstacles] = useState([
- { index: 2, pos: totemGap },
+ { index: 2, pos: totemGap }, // Initial positions of obstacles
{ index: 1, pos: totemGap * 2 },
{ index: 3, pos: totemGap * 3 },
{ index: 4, pos: totemGap * 4 },
{ index: 0, pos: totemGap * 5 },
]);
- const [birdDead, setBirdDead] = useState(false);
- const [birdTop, setBirdTop] = useState(availableHeight * 0.5);
- const [velocity, setVelocity] = useState(0);
- const [angle, setAngle] = useState(0);
- const [bestScore, setBestScore] = useState(0);
+ const [birdDead, setBirdDead] = useState(false); // Indicates if the bird is dead
+ const [birdTop, setBirdTop] = useState(availableHeight * 0.5); // Vertical position of the bird
+ const [velocity, setVelocity] = useState(0); // Speed of the bird
+ const [angle, setAngle] = useState(0); // Angle of the bird
+ const [bestScore, setBestScore] = useState(0); // Best score in the game
- const score = Math.floor(distance / totemGap);
+ const score = Math.floor(distance / totemGap); // Calculate the current score
+ // Function to reset the game state
+ const resetGame = () => {
+ setDistance(0);
+ setObstacles([
+ { index: 2, pos: totemGap },
+ { index: 1, pos: totemGap * 2 },
+ { index: 3, pos: totemGap * 3 },
+ { index: 4, pos: totemGap * 4 },
+ { index: 0, pos: totemGap * 5 },
+ ]);
+ setBirdDead(false);
+ setBirdTop(availableHeight * 0.5);
+ setVelocity(0);
+ setAngle(0);
+ setGameStopped(true);
+ };
+
+ // Function to handle bird flapping
const clicked = () => {
if (birdTop > 58) {
- setVelocity(-10);
- setAngle(-30);
+ setVelocity(-10); // Move the bird up
+ setAngle(-30); // Change the angle of the bird
}
};
+ // Event listener for key presses (spacebar for flapping)
useEffect(() => {
const handleKeyDown = (event) => {
if (event.key === ' ' && !event.repeat) {
- event.preventDefault();
-
+ event.preventDefault(); // Prevent the default action of the spacebar
clicked();
}
};
window.addEventListener('keydown', handleKeyDown);
+
+ // Cleanup event listener on component unmount
+ return () => {
+ window.removeEventListener('keydown', handleKeyDown);
+ };
}, []);
+ // Game loop for updating distance and velocity
useEffect(() => {
if (!gameStopped) {
const always = setInterval(() => {
- setDistance((prevDistance) => prevDistance + 10);
+ var amount = document.documentElement.clientWidth > 500 ? 10 : 5; // Adjust speed based on screen size
+ setDistance(
+ (prevDistance) => prevDistance + amount + prevDistance / 1000
+ );
setVelocity((prevVelocity) => prevVelocity + gravity);
}, 25);
+ // Cleanup interval on component unmount
return () => {
clearInterval(always);
};
}
}, [gameStopped]);
+ // Update bird position and angle based on velocity
useEffect(() => {
setBirdTop((prevBirdTop) => prevBirdTop + velocity);
setAngle(Math.min(90, Math.max(-30, velocity * 3)));
}, [velocity]);
+ // Check for collisions and update obstacles
useEffect(() => {
+ // Remove obstacles that are out of view
if (obstacles[0].pos < distance - 200) {
var ob = obstacles;
ob.shift();
setObstacles(ob);
}
+ // Add new obstacles as needed
if (obstacles[obstacles.length - 1].pos - distance < totemGap * 10) {
var ob = obstacles;
setObstacles([
@@ -103,6 +144,7 @@ function PlayScreen() {
},
]);
}
+ // Check for collisions with obstacles or floor
if (
(obstacles[0].pos - distance + (totem_height * 4) / 18 < birdLeft + 60 &&
obstacles[0].pos - distance + (totem_height * 4) / 18 > birdLeft &&
@@ -113,20 +155,23 @@ function PlayScreen() {
totem_height)) ||
birdTop > availableHeight - 60
) {
- localStorage.setItem("currentScore",score);
setGameStopped(true);
if (score > bestScore) {
setBestScore(score);
+ setCurrentScore(score);
+ console.log("best: " + bestScore + " Current: " + currentScore);
}
setBirdDead(true);
}
}, [distance]);
+
+ // Render the game screen
if (!birdDead) {
return (
-
- Login to have your name
- on the leaderboard
-
-
+ return (
+
+ {/* Background and title section */}
+
+
+
+ Login to have your name
+ on the leaderboard
+
+
-
- 
-
-
-
-
+ {/* Sign-in and anonymous buttons */}
+
+
+
+
+
+
-
-
-
-
+
+
- );
+
+
+ );
};
-export default SignInPage;
\ No newline at end of file
+export default SignInPage;
diff --git a/Client/src/screens/play.css b/Client/src/screens/play.css
deleted file mode 100644
index 1162cb6..0000000
--- a/Client/src/screens/play.css
+++ /dev/null
@@ -1,20 +0,0 @@
-@keyframes scrollBackground {
- from {
- background-position: 0 0;
- }
-
- to {
- background-position: 1000% 0;
- }
-}
-
-.background-stuff {
- background-image: url('../assets/playBackground.png');
- background-repeat: repeat-x;
- background-size: cover;
- position: relative;
-}
-
-.bg-scroll {
- animation: scrollBackground 120s linear infinite;
-}
\ No newline at end of file
diff --git a/Client/src/utils/utils.js b/Client/src/utils/utils.js
index 2dcb9f2..bd43111 100644
--- a/Client/src/utils/utils.js
+++ b/Client/src/utils/utils.js
@@ -1,3 +1,5 @@
+// Array of animal and bird names
+
const animalsAndBirds = [
'Lion',
'Elephant',
@@ -83,14 +85,26 @@ const animalsAndBirds = [
'Exotic',
'Scavenging',
];
+ // Function to generate a random name
+
const getRandomName = () => {
+ // Randomly select an adjective from the adjectives array
+
const randomAdjective =
adjectives[Math.floor(Math.random() * adjectives.length)];
+ // Randomly select an animal or bird from the animalsAndBirds array
+
const randomAnimalOrBird =
animalsAndBirds[Math.floor(Math.random() * animalsAndBirds.length)];
+ // Combine the selected adjective and animal/bird name to form a random name
+
const randomName = randomAdjective + randomAnimalOrBird;
+ // Save the generated random name to local storage under the key 'username'
+
localStorage.setItem('username', randomName);
+ // Return the generated random name
+
return randomName;
};
diff --git a/Client/tailwind.config.js b/Client/tailwind.config.js
index d867cbf..cfc665e 100644
--- a/Client/tailwind.config.js
+++ b/Client/tailwind.config.js
@@ -1,76 +1,91 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
+ // Specifies the files Tailwind should scan for class names
content: ['./index.html', './src/**/*.{js,jsx,ts,tsx}'],
+
theme: {
extend: {
+ // Custom font families for the project
fontFamily: {
- fonts: ['"Post No Bills Colombo ExtraBold"', 'sans-serif'],
- fam: ['"Post No Bills Jaffna ExtraBold"', 'sans-serif'],
+ fonts: ['"Post No Bills Colombo ExtraBold"', 'sans-serif'], // Custom font for "fonts" key
+ fam: ['"Post No Bills Jaffna ExtraBold"', 'sans-serif'], // Custom font for "fam" key
},
+
+ // Custom background images
backgroundImage: {
- playbg: 'url(./assets/playBackground.png)',
- 'signin-bg': 'url(./assets/LoginPage_bg.png)',
- 'flappybird-playbg': "url('./assets/playscreen_bg.jpg')",
- 'flappybird-mobbg': "url('./assets/playscreen_mobile-bg.png')",
- pipe: "url('./assets/playscreen_obstacle.png')",
- flappybird: "url('./assets/playscreen_bird.png')",
- flappybirdbigeye: "url('./assets/playscreen_bird_big_eye.png')",
- 'flappybird-desk': "url('./assets/homePage_desktopBg.png')",
- 'flappybird-mob': "url('./assets/homePage_mobileBg.png')",
- deskview: "url('./assets/certificate_gamebg.png')",
- phoneview: "url('./assets/certificate_phonebgg.png')",
- },
+ playbg: 'url(./src/assets/playBackground.png)',
+ 'signin-bg': "url('./src/assets/homePage_desktopBg.png')",
+ 'flappybird-playbg': "url('./src/assets/playscreen_bg.jpg')",
+ 'flappybird-mobbg': "url('./src/assets/playscreen_mobile-bg.png')",
+ pipe: "url('./src/assets/playscreen_obstacle.png')",
+ flappybird: "url('./src/assets/playscreen_bird.png')",
+ flappybirdbigeye: "url('./src/assets/playscreen_bird_big_eye.png')",
+ 'flappybird-desk': "url('./src/assets/homePage_desktopBg.png')",
+ 'flappybird-mob': "url('./src/assets/homePage_mobileBg.png')",
+ "background-stuff" : "url('./src/assets/playBackground.png')",
+ },
+
+ // Custom screen sizes for responsive design
screens: {
- 'max-w-600px': { max: '600px' },
- 'min-w-600px': { min: '600px' },
- '927px': '927px',
- '741px':'741px',
- 'custom-xs':'400px',
+ 'max-w-600px': { max: '600px' }, // Maximum width of 600px
+ 'min-w-600px': { min: '600px' }, // Minimum width of 600px
+ '927px': '927px', // Custom screen size at 927px
+ '741px': '741px', // Custom screen size at 741px
+ 'custom-xs': '400px', // Custom screen size at 400px
},
+
+ // Custom border-radius values
borderRadius: {
- custom: '50px',
- 'custom-tl': '15px',
- 'custom-br-tr': '50px',
- 'custom-bl': '50px',
+ custom: '50px', // Custom border-radius of 50px
+ 'custom-tl': '15px', // Custom border-radius for top-left corner
+ 'custom-br-tr': '50px', // Custom border-radius for bottom-right and top-right corners
+ 'custom-bl': '50px', // Custom border-radius for bottom-left corner
},
+ // Custom font sizes
fontSize: {
- 'custom-large': '57px',
- 'custom-30px': '30px',
- 'custom-27px': '27px',
- 'custom-20px': '20px',
- 'custom-22px': '22px',
- 'custom-25px': '25px',
+ 'custom-large': '57px', // Custom large font size
+ 'custom-30px': '30px', // Custom font size of 30px
+ 'custom-27px': '27px', // Custom font size of 27px
+ 'custom-20px': '20px', // Custom font size of 20px
+ 'custom-22px': '22px', // Custom font size of 22px
+ 'custom-25px': '25px', // Custom font size of 25px
},
+ // Custom spacing values
spacing: {
- 16: '65px',
- 'custom-width': '230px',
- 'custom-margin-top': '100px',
- '-45px': '-45px',
- '-110px': '-110px',
- '50px': '50px',
- '200px': '200px',
- '150px': '150px',
- '110px': '110px',
- '80px': '80px',
- '-90px': '-90px',
- '180px': '180px',
- '130px': '130px',
- '30px': '30px',
- '25px': '25px',
- '40px': '40px',
- '90px': '90px',
- '100px': '100px',
+ 16: '65px', // Custom spacing of 65px
+ 'custom-width': '230px', // Custom width of 230px
+ 'custom-margin-top': '100px', // Custom margin-top of 100px
+ '-45px': '-45px', // Custom negative spacing of -45px
+ '-110px': '-110px', // Custom negative spacing of -110px
+ '50px': '50px', // Custom spacing of 50px
+ '200px': '200px', // Custom spacing of 200px
+ '150px': '150px', // Custom spacing of 150px
+ '110px': '110px', // Custom spacing of 110px
+ '80px': '80px', // Custom spacing of 80px
+ '-90px': '-90px', // Custom negative spacing of -90px
+ '180px': '180px', // Custom spacing of 180px
+ '130px': '130px', // Custom spacing of 130px
+ '30px': '30px', // Custom spacing of 30px
+ '25px': '25px', // Custom spacing of 25px
+ '40px': '40px', // Custom spacing of 40px
+ '90px': '90px', // Custom spacing of 90px
+ '100px': '100px', // Custom spacing of 100px
},
+ // Custom letter spacing
letterSpacing: {
- 'custom-spacing': '1px',
+ 'custom-spacing': '1px', // Custom letter spacing of 1px
},
+
+ // Custom height values
height: {
- '95px': '95px',
+ '95px': '95px', // Custom height of 95px
},
},
+
+ // No additional plugins used
plugins: [],
},
};
diff --git a/Server/src/firebase/firebase.js b/Server/src/firebase/firebase.js
index 4bf3c97..a54a92c 100644
--- a/Server/src/firebase/firebase.js
+++ b/Server/src/firebase/firebase.js
@@ -2,15 +2,16 @@ import { initializeApp } from 'firebase/app';
import { getAuth, GoogleAuthProvider,signInWithPopup, signOut } from 'firebase/auth';
const firebaseConfig = {
- apiKey: "AIzaSyDLVc3eY_nDJIN456OtwK-BNzmLZPGV6xI",
- authDomain: "flappy-bird-73f3e.firebaseapp.com",
- projectId: "flappy-bird-73f3e",
- storageBucket: "flappy-bird-73f3e.appspot.com",
- messagingSenderId: "280886096397",
- appId: "1:280886096397:web:d7966ad1c7bd2e52979b44",
- measurementId: "G-Q7LT2VR698"
+ apiKey: "AIzaSyCe9jnQ_hwakzp0xQXXxcp6kdpr5OOY3mk",
+ authDomain: "flappy-bird-codechef.firebaseapp.com",
+ projectId: "flappy-bird-codechef",
+ storageBucket: "flappy-bird-codechef.appspot.com",
+ messagingSenderId: "292086757103",
+ appId: "1:292086757103:web:9b752cc035f33b52810d1a",
+ measurementId: "G-36K0VEV71M"
};
+
const app = initializeApp(firebaseConfig);
const auth = getAuth(app);
const provider = new GoogleAuthProvider();
diff --git a/Server/src/gameUserModel.js b/Server/src/gameUserModel.js
index bc2a10b..22cf6f1 100644
--- a/Server/src/gameUserModel.js
+++ b/Server/src/gameUserModel.js
@@ -3,7 +3,6 @@ import mongoose from 'mongoose';
const gameUserSchema = new mongoose.Schema({
username: { type: String, required: true, unique: true },
score: { type: Number, required: true },
- rank: { type: Number, required: true }
});
const GameUser = mongoose.model('GameUser', gameUserSchema);
diff --git a/Server/src/index.js b/Server/src/index.js
index 245eebb..1702ba1 100644
--- a/Server/src/index.js
+++ b/Server/src/index.js
@@ -1,6 +1,4 @@
import express from 'express';
-import https from 'https';
-import fs from 'fs';
import bodyParser from 'body-parser';
import cors from 'cors';
import mongoose from 'mongoose';
@@ -21,6 +19,7 @@ mongoose.connect(MONGO_URI, {
app.use(cors());
app.use(bodyParser.json());
+
app.use('/api', userRoutes);
if (process.env.NODE_ENV !== 'test') {
diff --git a/Server/src/routes.js b/Server/src/routes.js
index 557b658..b61559d 100644
--- a/Server/src/routes.js
+++ b/Server/src/routes.js
@@ -1,39 +1,30 @@
import express from 'express';
import GameUser from './gameUserModel.js';
-const updateAllRanks = async () => {
- try {
- const users = await GameUser.find().sort({ score: -1 });
- for (let i = 0; i < users.length; i++) {
- users[i].rank = i + 1;
- await users[i].save();
- }
- } catch (error) {
- console.error('Error updating ranks:', error);
- }
-};
const router = express.Router();
router.post('/gameusers', async (req, res) => {
- const { username, score, rank } = req.body;
+ const { username, score } = req.body;
- if (!username || !score || !rank) {
+ if (!username || !score) {
return res.status(400).json({ error: 'All fields are required' });
}
try {
const existingUser = await GameUser.findOne({ username });
if (existingUser) {
- return res.status(400).json({ error: 'User already exists' });
+ if (score > existingUser.score) {
+ await GameUser.updateOne({ username }, { score });
+ return res.status(200).json({ message: 'User score updated successfully' });
+ } else {
+ return res.status(200).json({ message: 'New score is not higher than existing score' });
+ }
+ }else{
+ const newUser = new GameUser({ username, score});
+ await newUser.save();
+ res.status(201).json({ message: 'Game user created successfully' });
}
-
- const newUser = new GameUser({ username, score, rank });
- await newUser.save();
-
- await updateAllRanks();
-
- res.status(201).json({ message: 'Game user created successfully' });
} catch (error) {
console.error('Error creating game user:', error);
res.status(500).json({ error: 'Internal server error' });
@@ -58,7 +49,7 @@ router.delete('/gameusers/:username', async (req, res) => {
router.get('/gameusers', async (_req, res) => {
try {
- const users = await GameUser.find().sort({ rank: 1 });
+ const users = await GameUser.find().sort({ score: -1 }).limit(100);
res.status(200).json(users);
} catch (error) {
console.error('Error fetching game users:', error);
+
+
Get ready to
+flap in
- {countdown} + {countdown} {/* Display the current countdown value */}
- {formattedScore}
+
);
diff --git a/Client/src/screens/PlayScreen.jsx b/Client/src/screens/PlayScreen.jsx
index 119a9ed..10806e3 100644
--- a/Client/src/screens/PlayScreen.jsx
+++ b/Client/src/screens/PlayScreen.jsx
@@ -1,13 +1,14 @@
import React, { useEffect, useState } from 'react';
+import { useGameContext } from '../contexts/gameContext';
-import pipe_xs from '/Totem-xs.png';
-import pipe_s from '/Totem-s.png';
-import pipe_m from '/Totem-m.png';
-import pipe_l from '/Totem-l.png';
-import pipe_xl from '/Totem-xl.png';
-
-import './play.css';
+// Importing images for different sizes of pipes
+import pipe_xs from '../assets/Totem-xs.png';
+import pipe_s from '../assets/Totem-s.png';
+import pipe_m from '../assets/Totem-m.png';
+import pipe_l from '../assets/Totem-l.png';
+import pipe_xl from '../assets/Totem-xl.png';
+// Importing components used in the game
import Bird from './Objects/Bird';
import Pipe from './Objects/Pipe';
import PipeBottom from './Objects/PipeBottom';
@@ -15,84 +16,124 @@ import ScoreBoard from './Objects/ScoreBoard';
import CountDown from './Objects/CountDown';
import GameOver from './GameOver';
+// Information about the obstacles
const obstacle_info = [
- { name: 'xs', img: pipe_xs, height: 4 / 6 },
- { name: 's', img: pipe_s, height: 5 / 6 },
- { name: 'm', img: pipe_m, height: 1 },
- { name: 'l', img: pipe_l, height: 7 / 6 },
- { name: 'xl', img: pipe_xl, height: 8 / 6 },
+ { name: 'xs', img: pipe_xs, height: 4 / 6 }, // Extra small pipe
+ { name: 's', img: pipe_s, height: 5 / 6 }, // Small pipe
+ { name: 'm', img: pipe_m, height: 1 }, // Medium pipe
+ { name: 'l', img: pipe_l, height: 7 / 6 }, // Large pipe
+ { name: 'xl', img: pipe_xl, height: 8 / 6 }, // Extra large pipe
];
function PlayScreen() {
- const floorRatio = 0.092;
- const gap = 150;
- const availableHeight =
- document.documentElement.clientHeight * (1 - floorRatio);
- const totem_height = (availableHeight - gap) / 2;
- const birdLeft = document.documentElement.clientWidth * 0.05;
- const gravity = 1;
- const obstacleCount = 4;
- const totemGap = 750;
-
- const [gameStopped, setGameStopped] = useState(true);
- const [distance, setDistance] = useState(0);
+ // Game context to get and set the current score and player name
+ const { setCurrentScore, playerName, currentScore } = useGameContext();
+
+ // Get username from localStorage or use the default player name
+ const uname = (localStorage.getItem("isLoggedIn") === "true") ? localStorage.getItem("UserInfo") : playerName;
+
+ // Game parameters
+ const floorRatio = 0.092; // Ratio of the screen taken up by the floor
+ const gap = 150; // Gap between pipes
+ const availableHeight = document.documentElement.clientHeight * (1 - floorRatio); // Usable height for the game
+ const totem_height = (availableHeight - gap) / 2; // Height of the pipes
+ const birdLeft = document.documentElement.clientWidth * 0.05; // Initial horizontal position of the bird
+ const gravity = 1; // Gravity affecting the bird
+ const obstacleCount = 4; // Number of obstacles in view
+ const totemGap = 750; // Gap between obstacles
+
+ // Game state
+ const [gameStopped, setGameStopped] = useState(true); // Indicates if the game is stopped
+ const [distance, setDistance] = useState(0); // Distance traveled by the bird
const [obstacles, setObstacles] = useState([
- { index: 2, pos: totemGap },
+ { index: 2, pos: totemGap }, // Initial positions of obstacles
{ index: 1, pos: totemGap * 2 },
{ index: 3, pos: totemGap * 3 },
{ index: 4, pos: totemGap * 4 },
{ index: 0, pos: totemGap * 5 },
]);
- const [birdDead, setBirdDead] = useState(false);
- const [birdTop, setBirdTop] = useState(availableHeight * 0.5);
- const [velocity, setVelocity] = useState(0);
- const [angle, setAngle] = useState(0);
- const [bestScore, setBestScore] = useState(0);
+ const [birdDead, setBirdDead] = useState(false); // Indicates if the bird is dead
+ const [birdTop, setBirdTop] = useState(availableHeight * 0.5); // Vertical position of the bird
+ const [velocity, setVelocity] = useState(0); // Speed of the bird
+ const [angle, setAngle] = useState(0); // Angle of the bird
+ const [bestScore, setBestScore] = useState(0); // Best score in the game
- const score = Math.floor(distance / totemGap);
+ const score = Math.floor(distance / totemGap); // Calculate the current score
+ // Function to reset the game state
+ const resetGame = () => {
+ setDistance(0);
+ setObstacles([
+ { index: 2, pos: totemGap },
+ { index: 1, pos: totemGap * 2 },
+ { index: 3, pos: totemGap * 3 },
+ { index: 4, pos: totemGap * 4 },
+ { index: 0, pos: totemGap * 5 },
+ ]);
+ setBirdDead(false);
+ setBirdTop(availableHeight * 0.5);
+ setVelocity(0);
+ setAngle(0);
+ setGameStopped(true);
+ };
+
+ // Function to handle bird flapping
const clicked = () => {
if (birdTop > 58) {
- setVelocity(-10);
- setAngle(-30);
+ setVelocity(-10); // Move the bird up
+ setAngle(-30); // Change the angle of the bird
}
};
+ // Event listener for key presses (spacebar for flapping)
useEffect(() => {
const handleKeyDown = (event) => {
if (event.key === ' ' && !event.repeat) {
- event.preventDefault();
-
+ event.preventDefault(); // Prevent the default action of the spacebar
clicked();
}
};
window.addEventListener('keydown', handleKeyDown);
+
+ // Cleanup event listener on component unmount
+ return () => {
+ window.removeEventListener('keydown', handleKeyDown);
+ };
}, []);
+ // Game loop for updating distance and velocity
useEffect(() => {
if (!gameStopped) {
const always = setInterval(() => {
- setDistance((prevDistance) => prevDistance + 10);
+ var amount = document.documentElement.clientWidth > 500 ? 10 : 5; // Adjust speed based on screen size
+ setDistance(
+ (prevDistance) => prevDistance + amount + prevDistance / 1000
+ );
setVelocity((prevVelocity) => prevVelocity + gravity);
}, 25);
+ // Cleanup interval on component unmount
return () => {
clearInterval(always);
};
}
}, [gameStopped]);
+ // Update bird position and angle based on velocity
useEffect(() => {
setBirdTop((prevBirdTop) => prevBirdTop + velocity);
setAngle(Math.min(90, Math.max(-30, velocity * 3)));
}, [velocity]);
+ // Check for collisions and update obstacles
useEffect(() => {
+ // Remove obstacles that are out of view
if (obstacles[0].pos < distance - 200) {
var ob = obstacles;
ob.shift();
setObstacles(ob);
}
+ // Add new obstacles as needed
if (obstacles[obstacles.length - 1].pos - distance < totemGap * 10) {
var ob = obstacles;
setObstacles([
@@ -103,6 +144,7 @@ function PlayScreen() {
},
]);
}
+ // Check for collisions with obstacles or floor
if (
(obstacles[0].pos - distance + (totem_height * 4) / 18 < birdLeft + 60 &&
obstacles[0].pos - distance + (totem_height * 4) / 18 > birdLeft &&
@@ -113,20 +155,23 @@ function PlayScreen() {
totem_height)) ||
birdTop > availableHeight - 60
) {
- localStorage.setItem("currentScore",score);
setGameStopped(true);
if (score > bestScore) {
setBestScore(score);
+ setCurrentScore(score);
+ console.log("best: " + bestScore + " Current: " + currentScore);
}
setBirdDead(true);
}
}, [distance]);
+
+ // Render the game screen
if (!birdDead) {
return (
+ {formattedScore} {/* Display the formatted score */}
-
- );
- })}
+ obstacles.map((item, index) => (
+
+
+ ))}
-
-
-
+ return (
+
-
- Login to have your name
-on the leaderboard
-
+ {/* Background and title section */}
+
+ );
};
-export default SignInPage;
\ No newline at end of file
+export default SignInPage;
diff --git a/Client/src/screens/play.css b/Client/src/screens/play.css
deleted file mode 100644
index 1162cb6..0000000
--- a/Client/src/screens/play.css
+++ /dev/null
@@ -1,20 +0,0 @@
-@keyframes scrollBackground {
- from {
- background-position: 0 0;
- }
-
- to {
- background-position: 1000% 0;
- }
-}
-
-.background-stuff {
- background-image: url('../assets/playBackground.png');
- background-repeat: repeat-x;
- background-size: cover;
- position: relative;
-}
-
-.bg-scroll {
- animation: scrollBackground 120s linear infinite;
-}
\ No newline at end of file
diff --git a/Client/src/utils/utils.js b/Client/src/utils/utils.js
index 2dcb9f2..bd43111 100644
--- a/Client/src/utils/utils.js
+++ b/Client/src/utils/utils.js
@@ -1,3 +1,5 @@
+// Array of animal and bird names
+
const animalsAndBirds = [
'Lion',
'Elephant',
@@ -83,14 +85,26 @@ const animalsAndBirds = [
'Exotic',
'Scavenging',
];
+ // Function to generate a random name
+
const getRandomName = () => {
+ // Randomly select an adjective from the adjectives array
+
const randomAdjective =
adjectives[Math.floor(Math.random() * adjectives.length)];
+ // Randomly select an animal or bird from the animalsAndBirds array
+
const randomAnimalOrBird =
animalsAndBirds[Math.floor(Math.random() * animalsAndBirds.length)];
+ // Combine the selected adjective and animal/bird name to form a random name
+
const randomName = randomAdjective + randomAnimalOrBird;
+ // Save the generated random name to local storage under the key 'username'
+
localStorage.setItem('username', randomName);
+ // Return the generated random name
+
return randomName;
};
diff --git a/Client/tailwind.config.js b/Client/tailwind.config.js
index d867cbf..cfc665e 100644
--- a/Client/tailwind.config.js
+++ b/Client/tailwind.config.js
@@ -1,76 +1,91 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
+ // Specifies the files Tailwind should scan for class names
content: ['./index.html', './src/**/*.{js,jsx,ts,tsx}'],
+
theme: {
extend: {
+ // Custom font families for the project
fontFamily: {
- fonts: ['"Post No Bills Colombo ExtraBold"', 'sans-serif'],
- fam: ['"Post No Bills Jaffna ExtraBold"', 'sans-serif'],
+ fonts: ['"Post No Bills Colombo ExtraBold"', 'sans-serif'], // Custom font for "fonts" key
+ fam: ['"Post No Bills Jaffna ExtraBold"', 'sans-serif'], // Custom font for "fam" key
},
+
+ // Custom background images
backgroundImage: {
- playbg: 'url(./assets/playBackground.png)',
- 'signin-bg': 'url(./assets/LoginPage_bg.png)',
- 'flappybird-playbg': "url('./assets/playscreen_bg.jpg')",
- 'flappybird-mobbg': "url('./assets/playscreen_mobile-bg.png')",
- pipe: "url('./assets/playscreen_obstacle.png')",
- flappybird: "url('./assets/playscreen_bird.png')",
- flappybirdbigeye: "url('./assets/playscreen_bird_big_eye.png')",
- 'flappybird-desk': "url('./assets/homePage_desktopBg.png')",
- 'flappybird-mob': "url('./assets/homePage_mobileBg.png')",
- deskview: "url('./assets/certificate_gamebg.png')",
- phoneview: "url('./assets/certificate_phonebgg.png')",
- },
+ playbg: 'url(./src/assets/playBackground.png)',
+ 'signin-bg': "url('./src/assets/homePage_desktopBg.png')",
+ 'flappybird-playbg': "url('./src/assets/playscreen_bg.jpg')",
+ 'flappybird-mobbg': "url('./src/assets/playscreen_mobile-bg.png')",
+ pipe: "url('./src/assets/playscreen_obstacle.png')",
+ flappybird: "url('./src/assets/playscreen_bird.png')",
+ flappybirdbigeye: "url('./src/assets/playscreen_bird_big_eye.png')",
+ 'flappybird-desk': "url('./src/assets/homePage_desktopBg.png')",
+ 'flappybird-mob': "url('./src/assets/homePage_mobileBg.png')",
+ "background-stuff" : "url('./src/assets/playBackground.png')",
+ },
+
+ // Custom screen sizes for responsive design
screens: {
- 'max-w-600px': { max: '600px' },
- 'min-w-600px': { min: '600px' },
- '927px': '927px',
- '741px':'741px',
- 'custom-xs':'400px',
+ 'max-w-600px': { max: '600px' }, // Maximum width of 600px
+ 'min-w-600px': { min: '600px' }, // Minimum width of 600px
+ '927px': '927px', // Custom screen size at 927px
+ '741px': '741px', // Custom screen size at 741px
+ 'custom-xs': '400px', // Custom screen size at 400px
},
+
+ // Custom border-radius values
borderRadius: {
- custom: '50px',
- 'custom-tl': '15px',
- 'custom-br-tr': '50px',
- 'custom-bl': '50px',
+ custom: '50px', // Custom border-radius of 50px
+ 'custom-tl': '15px', // Custom border-radius for top-left corner
+ 'custom-br-tr': '50px', // Custom border-radius for bottom-right and top-right corners
+ 'custom-bl': '50px', // Custom border-radius for bottom-left corner
},
+ // Custom font sizes
fontSize: {
- 'custom-large': '57px',
- 'custom-30px': '30px',
- 'custom-27px': '27px',
- 'custom-20px': '20px',
- 'custom-22px': '22px',
- 'custom-25px': '25px',
+ 'custom-large': '57px', // Custom large font size
+ 'custom-30px': '30px', // Custom font size of 30px
+ 'custom-27px': '27px', // Custom font size of 27px
+ 'custom-20px': '20px', // Custom font size of 20px
+ 'custom-22px': '22px', // Custom font size of 22px
+ 'custom-25px': '25px', // Custom font size of 25px
},
+ // Custom spacing values
spacing: {
- 16: '65px',
- 'custom-width': '230px',
- 'custom-margin-top': '100px',
- '-45px': '-45px',
- '-110px': '-110px',
- '50px': '50px',
- '200px': '200px',
- '150px': '150px',
- '110px': '110px',
- '80px': '80px',
- '-90px': '-90px',
- '180px': '180px',
- '130px': '130px',
- '30px': '30px',
- '25px': '25px',
- '40px': '40px',
- '90px': '90px',
- '100px': '100px',
+ 16: '65px', // Custom spacing of 65px
+ 'custom-width': '230px', // Custom width of 230px
+ 'custom-margin-top': '100px', // Custom margin-top of 100px
+ '-45px': '-45px', // Custom negative spacing of -45px
+ '-110px': '-110px', // Custom negative spacing of -110px
+ '50px': '50px', // Custom spacing of 50px
+ '200px': '200px', // Custom spacing of 200px
+ '150px': '150px', // Custom spacing of 150px
+ '110px': '110px', // Custom spacing of 110px
+ '80px': '80px', // Custom spacing of 80px
+ '-90px': '-90px', // Custom negative spacing of -90px
+ '180px': '180px', // Custom spacing of 180px
+ '130px': '130px', // Custom spacing of 130px
+ '30px': '30px', // Custom spacing of 30px
+ '25px': '25px', // Custom spacing of 25px
+ '40px': '40px', // Custom spacing of 40px
+ '90px': '90px', // Custom spacing of 90px
+ '100px': '100px', // Custom spacing of 100px
},
+ // Custom letter spacing
letterSpacing: {
- 'custom-spacing': '1px',
+ 'custom-spacing': '1px', // Custom letter spacing of 1px
},
+
+ // Custom height values
height: {
- '95px': '95px',
+ '95px': '95px', // Custom height of 95px
},
},
+
+ // No additional plugins used
plugins: [],
},
};
diff --git a/Server/src/firebase/firebase.js b/Server/src/firebase/firebase.js
index 4bf3c97..a54a92c 100644
--- a/Server/src/firebase/firebase.js
+++ b/Server/src/firebase/firebase.js
@@ -2,15 +2,16 @@ import { initializeApp } from 'firebase/app';
import { getAuth, GoogleAuthProvider,signInWithPopup, signOut } from 'firebase/auth';
const firebaseConfig = {
- apiKey: "AIzaSyDLVc3eY_nDJIN456OtwK-BNzmLZPGV6xI",
- authDomain: "flappy-bird-73f3e.firebaseapp.com",
- projectId: "flappy-bird-73f3e",
- storageBucket: "flappy-bird-73f3e.appspot.com",
- messagingSenderId: "280886096397",
- appId: "1:280886096397:web:d7966ad1c7bd2e52979b44",
- measurementId: "G-Q7LT2VR698"
+ apiKey: "AIzaSyCe9jnQ_hwakzp0xQXXxcp6kdpr5OOY3mk",
+ authDomain: "flappy-bird-codechef.firebaseapp.com",
+ projectId: "flappy-bird-codechef",
+ storageBucket: "flappy-bird-codechef.appspot.com",
+ messagingSenderId: "292086757103",
+ appId: "1:292086757103:web:9b752cc035f33b52810d1a",
+ measurementId: "G-36K0VEV71M"
};
+
const app = initializeApp(firebaseConfig);
const auth = getAuth(app);
const provider = new GoogleAuthProvider();
diff --git a/Server/src/gameUserModel.js b/Server/src/gameUserModel.js
index bc2a10b..22cf6f1 100644
--- a/Server/src/gameUserModel.js
+++ b/Server/src/gameUserModel.js
@@ -3,7 +3,6 @@ import mongoose from 'mongoose';
const gameUserSchema = new mongoose.Schema({
username: { type: String, required: true, unique: true },
score: { type: Number, required: true },
- rank: { type: Number, required: true }
});
const GameUser = mongoose.model('GameUser', gameUserSchema);
diff --git a/Server/src/index.js b/Server/src/index.js
index 245eebb..1702ba1 100644
--- a/Server/src/index.js
+++ b/Server/src/index.js
@@ -1,6 +1,4 @@
import express from 'express';
-import https from 'https';
-import fs from 'fs';
import bodyParser from 'body-parser';
import cors from 'cors';
import mongoose from 'mongoose';
@@ -21,6 +19,7 @@ mongoose.connect(MONGO_URI, {
app.use(cors());
app.use(bodyParser.json());
+
app.use('/api', userRoutes);
if (process.env.NODE_ENV !== 'test') {
diff --git a/Server/src/routes.js b/Server/src/routes.js
index 557b658..b61559d 100644
--- a/Server/src/routes.js
+++ b/Server/src/routes.js
@@ -1,39 +1,30 @@
import express from 'express';
import GameUser from './gameUserModel.js';
-const updateAllRanks = async () => {
- try {
- const users = await GameUser.find().sort({ score: -1 });
- for (let i = 0; i < users.length; i++) {
- users[i].rank = i + 1;
- await users[i].save();
- }
- } catch (error) {
- console.error('Error updating ranks:', error);
- }
-};
const router = express.Router();
router.post('/gameusers', async (req, res) => {
- const { username, score, rank } = req.body;
+ const { username, score } = req.body;
- if (!username || !score || !rank) {
+ if (!username || !score) {
return res.status(400).json({ error: 'All fields are required' });
}
try {
const existingUser = await GameUser.findOne({ username });
if (existingUser) {
- return res.status(400).json({ error: 'User already exists' });
+ if (score > existingUser.score) {
+ await GameUser.updateOne({ username }, { score });
+ return res.status(200).json({ message: 'User score updated successfully' });
+ } else {
+ return res.status(200).json({ message: 'New score is not higher than existing score' });
+ }
+ }else{
+ const newUser = new GameUser({ username, score});
+ await newUser.save();
+ res.status(201).json({ message: 'Game user created successfully' });
}
-
- const newUser = new GameUser({ username, score, rank });
- await newUser.save();
-
- await updateAllRanks();
-
- res.status(201).json({ message: 'Game user created successfully' });
} catch (error) {
console.error('Error creating game user:', error);
res.status(500).json({ error: 'Internal server error' });
@@ -58,7 +49,7 @@ router.delete('/gameusers/:username', async (req, res) => {
router.get('/gameusers', async (_req, res) => {
try {
- const users = await GameUser.find().sort({ rank: 1 });
+ const users = await GameUser.find().sort({ score: -1 }).limit(100);
res.status(200).json(users);
} catch (error) {
console.error('Error fetching game users:', error);
+
+
-
+
+ Login to have your name
+on the leaderboard
+
-
-
-
+
-
-
+ {/* Sign-in and anonymous buttons */}
+
+
+
+
+
+
+
-
-
-
-
+
- );
+