Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added tournament #313

Merged
merged 43 commits into from
Apr 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
3fa3913
home page translations
zstenger93 Mar 25, 2024
8d90ecc
Starting to work on tournoment
kvebers Mar 25, 2024
6835396
Made Basic Layout of the canvas, changes In PongAI Center
kvebers Mar 29, 2024
7650afa
Setup Functional Work Enviroment For Tournoment
kvebers Mar 29, 2024
64a64f6
Added Input fields to add players to the game
kvebers Mar 30, 2024
180c158
Added Button On Click Events
kvebers Mar 30, 2024
e0786fc
Adding players to the tournoment
kvebers Mar 31, 2024
73273cb
Player Managment Before Tournoment
kvebers Mar 31, 2024
9702173
Display name next to buttons
kvebers Mar 31, 2024
7d0a8a6
Adding Tournoment Class, for tracking Tournoment Progress
kvebers Mar 31, 2024
4d14545
Updated the tournoment class
kvebers Apr 1, 2024
b53fb5c
Updated Player Icons Added Rules For Starting Tournoment Page
kvebers Apr 1, 2024
01ea272
translations
zstenger93 Mar 30, 2024
1809fd0
translations
zstenger93 Mar 31, 2024
e9a1cdb
Added LeaderBoard
kvebers Apr 1, 2024
0859a6c
Fix Grammer Change Look Of Tournoment Dash Board
kvebers Apr 1, 2024
64a002c
tournament rendering of players done with correct class
kvebers Apr 1, 2024
e5b7170
Added A list of matches To Play
kvebers Apr 1, 2024
535db8d
Display Next Match
kvebers Apr 1, 2024
4cb0f86
The Start Of the Pong Arch
kvebers Apr 3, 2024
e1deb7a
Added Arrow and W S keys
kvebers Apr 3, 2024
fedd17d
translations
zstenger93 Apr 4, 2024
d353e38
Everything is setup for the game to work
kvebers Apr 4, 2024
b42305a
translation done
zstenger93 Apr 9, 2024
5772238
Added KeyHooks that seem to be working
kvebers Apr 12, 2024
1575f66
Added 2 paddles running in real time
kvebers Apr 12, 2024
9c1857b
Fixed complains of code, refactored paddle
kvebers Apr 13, 2024
57b4c03
there is a game of pong now
kvebers Apr 13, 2024
666202f
Merge pull request #311 from zstenger93/api_new
zstenger93 Apr 13, 2024
398dafe
Player scores are added in tournoment.
kvebers Apr 13, 2024
6cc75de
Bade Tournoment Done, Needs some smoothiening
kvebers Apr 13, 2024
abe2b66
Added Result Page
kvebers Apr 13, 2024
80fb8ab
Adding Logic For Updating Paddles in Case Of AI BOTS, as well as Points
kvebers Apr 13, 2024
f450106
Add Medium Bot to Tournament
kvebers Apr 13, 2024
126535a
Baby Bot Works
kvebers Apr 13, 2024
3122034
Bots can play each other now
kvebers Apr 13, 2024
df0881a
Increase Ball Speed, to make the games faster.
kvebers Apr 14, 2024
67e268d
replace let to var to reduce unexpected behavior
kvebers Apr 14, 2024
af9f5d7
Nested if statment with the same logic
kvebers Apr 14, 2024
b4ea593
Removed health changed it to random nbr gen
kvebers Apr 14, 2024
0996e41
BallDirY set to 0, to ease the game
kvebers Apr 14, 2024
2a96313
Removed unused variables
kvebers Apr 14, 2024
e97673c
Merge pull request #312 from zstenger93/tournoment
zstenger93 Apr 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions frontend/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,7 @@ function App() {
path="tournament"
element={
<PageWrapper image={Background} redirectUri={REDIRECT_URI}>
<StartScreen
Game={Tournament}
backgroundImage={backgroundimage}
WelcomeButtonStyle={WelcomeButtonStyle}
BackButton={BackButton}
/>
<Tournament />
</PageWrapper>
}
/>
Expand Down
249 changes: 114 additions & 135 deletions frontend/src/components/home/Readme.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions frontend/src/components/profile/UserSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function UserSettings({ setProfilePicture, redirectUri }) {
if (password === confirmPassword) {
changePassword({ redirectUri, password });
} else {
alert("Passwords do not match");
alert(t("Passwords do not match"));
}
};

Expand Down Expand Up @@ -125,7 +125,7 @@ function UserSettings({ setProfilePicture, redirectUri }) {
/>
</div>
<button className={`mx-auto block mb-2 ${ButtonStyle}`} type="submit">
Submit
{t("Submit")}
</button>
</form>
)}
Expand Down
Binary file added frontend/src/images/tournament/baby.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/images/tournament/balanced.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/images/tournament/eliminate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/images/tournament/insane.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/images/tournament/player.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/images/tournament/pong.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
67 changes: 67 additions & 0 deletions frontend/src/locales/de/translation.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,71 @@
{
"Private": "Privat",
"Delete Account": "Konto löschen",
"Are you sure you want to delete your account?": "Sind Sie sicher, dass Sie Ihr Konto löschen möchten?",
"Submit": "Absenden",
"New Password": "Neues Passwort",
"Confirm New Password": "Neues Passwort bestätigen",
"2 Factor Authentication": "Zwei-Faktor-Authentifizierung",
"Settings": "Einstellungen",
"Passwords do not match": "Passwörter stimmen nicht überein",
"Tournament": "Turnier",
"The Project": "Das Projekt",
"16 Major & 11 Minor modules": "16 Haupt- und 11 Nebenmodule",
"Web": "Web",
"Use a framework as backend": "Verwenden Sie ein Framework als Backend",
"Use a front-end framework or toolkit": "Verwenden Sie ein Front-End-Framework oder -Toolkit",
"Use a database for the backend": "Verwenden Sie eine Datenbank für das Backend",
"Store the score of a tournament in the Blockchain": "Speichern Sie die Punktzahl eines Turniers in der Blockchain",
"User Management": "Benutzerverwaltung",
"Standard user management, authentication, users across tournaments": "Standard-Benutzerverwaltung, Authentifizierung, Benutzer über Turniere hinweg",
"Implementing a remote authentication": "Implementierung einer Remote-Authentifizierung",
"Gameplay and User Experience": "Spielmechanik und Benutzererfahrung",
"Remote players": "Fernspieler",
"Multiplayer (more than 2)": "Mehrspieler (mehr als 2)",
"Add Another Game with User History and Matchmaking": "Ein weiteres Spiel mit Benutzerhistorie und Matchmaking hinzufügen",
"Game customization options": "Spielanpassungsoptionen",
"Live chat": "Live-Chat",
"AI-Algo": "KI-Algorithmus",
"Introduce an AI opponent": "Einführung eines KI-Gegners",
"User and game stats dashboard": "Benutzer- und Spielstatistik-Dashboard",
"Cybersecurity": "Cybersicherheit",
"Implement WAF/ModSecurity with Hardened Configuration and HashiCorp Vault for Secrets Management": "Implementieren von WAF/ModSecurity mit gehärteter Konfiguration und HashiCorp Vault zur Verwaltung von Geheimnissen",
"GDPR Compliance Options with User Anonymization, Local Data Management, and Account Deletion": "GDPR-Compliance-Optionen mit Benutzeranonymisierung, lokaler Datenverwaltung und Kontolöschung",
"Implement Two-Factor Authentication (2FA) and JWT": "Implementierung von Zwei-Faktor-Authentifizierung (2FA) und JWT",
"Devops": "DevOps",
"Infrastructure Setup for Log Management": "Infrastrukturaufbau für das Log-Management",
"Monitoring system": "Überwachungssystem",
"Designing the Backend as Microservices": "Entwerfen des Backends als Microservices",
"Graphics": "Grafiken",
"Use advanced 3D techniques": "Verwenden Sie fortgeschrittene 3D-Techniken",
"Accessibility": "Barrierefreiheit",
"Support on all devices": "Unterstützung auf allen Geräten",
"Expanding browser compatibility": "Erweiterung der Browserkompatibilität",
"Multiple language support": "Unterstützung mehrerer Sprachen",
"Add accessibility for visually impaired users": "Barrierefreiheit für sehbehinderte Benutzer hinzufügen",
"Server-side rendering (SSR) integration": "Integration von serverseitigem Rendering (SSR)",
"Object Oriented": "Objektorientiert",
"Replacing Basic Pong with Server-Side Pong and Implementing an API": "Ersetzen von Basic Pong durch Server-Side Pong und Implementierung einer API",
"Enabling Pong Gameplay via CLI against Web Users with API Integration": "Aktivierung des Pong-Spielablaufs über CLI gegen Webbenutzer mit API-Integration",
"Games": "Spiele",
"Implementation of the orignal": "Implementierung des Originals",
"Pong game, released by Atari in 1972,": "Pong-Spiel, veröffentlicht von Atari im Jahr 1972,",
"is one of the earliest arcade video games.": "ist eines der frühesten Arcade-Videospiele.",
"It's a 2D simulation of table tennis where": "Es handelt sich um eine 2D-Simulation von Tischtennis, bei der",
"each playercontrols a paddle on the screen.": "jeder Spieler eine Schläger auf dem Bildschirm steuert.",
"The game, created by Allan Alcorn,": "Das Spiel, erstellt von Allan Alcorn,",
"established the video game industry": "gründete die Videospielindustrie",
"due to its commercial success.": "aufgrund seines kommerziellen Erfolgs.",
"AI Pong": "KI-Pong",
"You are against the mighty & challanging AI!": "Du bist gegen die mächtige & herausfordernde KI!",
"Where you controll only one paddle": "Wo du nur einen Schläger kontrollierst",
"The other is taken by the AI!": "Der andere wird von der KI übernommen!",
"Can you be the terminator and beat it?": "Kannst du der Terminator sein und ihn besiegen?",
"Now the the challange is to survive the": "Jetzt ist die Herausforderung, zu überleben das",
"Blackhole!": "Schwarzes Loch!",
"You lose a ball, you lose a planet!": "Du verlierst einen Ball, du verlierst einen Planeten!",
"Can you navigate thru the asteroid fields?": "Kannst du durch die Asteroidenfelder navigieren?",
"Contributors": "Mitwirkende",
"How to play": "Wie man spielt",
"The classic game of Pong.": "Das klassische Spiel Pong.",
"Hit the ball back and forth": "Schlagen Sie den Ball hin und her",
Expand Down
74 changes: 74 additions & 0 deletions frontend/src/locales/en/translation.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,78 @@
{
"Delete Account": "Delete Account",
"Are you sure you want to delete your account?" : "Are you sure you want to delete your account?",
"Submit": "Submit",
"New Password ": "New Password ",
"Confirm New Password ": "Confirm New Password ",
"2 Factor Authentication": "2 Factor Authentication",
"Settings": "Settings",
"Passwords do not match": "Passwords do not match",
"Tournament": "Tournament",

"Private": "Private",
"Expanding browser compatibility": "Expanding browser compatibility",

"The Project": "The Project",
"16 Major & 11 Minor modules": "16 Major & 11 Minor modules",
"Web": "Web",
"Use a framework as backend": "Use a framework as backend",
"Use a front-end framework or toolkit": "Use a front-end framework or toolkit",
"Use a database for the backend": "Use a database for the backend",
"Store the score of a tournament in the Blockchain": "Store the score of a tournament in the Blockchain",
"User Management": "User Management",
"Standard user management, authentication, users across tournaments": "Standard user management, authentication, users across tournaments",
"Implementing a remote authentication": "Implementing a remote authentication",
"Gameplay and User Experience": "Gameplay and User Experience",
"Remote players": "Remote players",
"Multiplayer (more than 2)": "Multiplayer (more than 2)",
"Add Another Game with User History and Matchmaking": "Add Another Game with User History and Matchmaking",
"Game customization options": "Game customization options",
"Live chat": "Live chat",
"AI-Algo": "AI-Algo",
"Introduce an AI opponent": "Introduce an AI opponent",
"User and game stats dashboard": "User and game stats dashboard",
"Cybersecurity": "Cybersecurity",
"Implement WAF/ModSecurity with Hardened Configuration and HashiCorp Vault for Secrets Management": "Implement WAF/ModSecurity with Hardened Configuration and HashiCorp Vault for Secrets Management",
"GDPR Compliance Options with User Anonymization, Local Data Management, and Account Deletion": "GDPR Compliance Options with User Anonymization, Local Data Management, and Account Deletion",
"Implement Two-Factor Authentication (2FA) and JWT": "Implement Two-Factor Authentication (2FA) and JWT",
"Devops": "Devops",
"Infrastructure Setup for Log Management": "Infrastructure Setup for Log Management",
"Monitoring system": "Monitoring system",
"Designing the Backend as Microservices": "Designing the Backend as Microservices",
"Graphics": "Graphics",
"Use advanced 3D techniques": "Use advanced 3D techniques",
"Accessibility": "Accessibility",
"Support on all devices": "Support on all devices",
"Multiple language support": "Multiple language support",
"Add accessibility for visually impaired users": "Add accessibility for visually impaired users",
"Server-side rendering (SSR) integration": "Server-side rendering (SSR) integration",
"Object Oriented": "Object Oriented",
"Replacing Basic Pong with Server-Side Pong and Implementing an API": "Replacing Basic Pong with Server-Side Pong and Implementing an API",
"Enabling Pong Gameplay via CLI against Web Users with API Integration": "Enabling Pong Gameplay via CLI against Web Users with API Integration",
"Games": "Games",
"Implementation of the orignal": "Implementation of the orignal",
"Pong game, released by Atari in 1972,": "Pong game, released by Atari in 1972,",
"is one of the earliest arcade video games.": "is one of the earliest arcade video games.",
"It's a 2D simulation of table tennis where": "It's a 2D simulation of table tennis where",
"each playercontrols a paddle on the screen.": "each playercontrols a paddle on the screen.",
"The game, created by Allan Alcorn,": "The game, created by Allan Alcorn,",
"established the video game industry": "established the video game industry",
"due to its commercial success.": "due to its commercial success.",
"AI Pong": "AI Pong",
"You are against the mighty & challanging AI!": "You are against the mighty & challanging AI!",
"Where you controll only one paddle": "Where you controll only one paddle",
"The other is taken by the AI!": "The other is taken by the AI!",
"Can you be the terminator and beat it?": "Can you be the terminator and beat it?",
"Now the the challange is to survive the": "Now the the challange is to survive the",
"Blackhole!": "Blackhole!",
"You lose a ball, you lose a planet!": "You lose a ball, you lose a planet!",
"Can you navigate thru the asteroid fields?": "Can you navigate thru the asteroid fields?",
"Contributors": "Contributors",





"How to play": "How to play",
"The classic game of Pong.": "The classic game of Pong.",
"Hit the ball back and forth": "Hit the ball back and forth",
Expand Down
67 changes: 67 additions & 0 deletions frontend/src/locales/fr/translation.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,71 @@
{
"Private": "Privé",
"Delete Account": "Supprimer le compte",
"Are you sure you want to delete your account?": "Êtes-vous sûr de vouloir supprimer votre compte ?",
"Submit": "Soumettre",
"New Password": "Nouveau mot de passe",
"Confirm New Password": "Confirmer le nouveau mot de passe",
"2 Factor Authentication": "Authentification à deux facteurs",
"Settings": "Paramètres",
"Passwords do not match": "Les mots de passe ne correspondent pas",
"Tournament": "Tournoi",
"The Project": "Le Projet",
"16 Major & 11 Minor modules": "16 Modules Majeurs & 11 Modules Mineurs",
"Web": "Web",
"Use a framework as backend": "Utiliser un framework en tant que backend",
"Use a front-end framework or toolkit": "Utiliser un framework ou une boîte à outils en front-end",
"Use a database for the backend": "Utiliser une base de données pour le backend",
"Store the score of a tournament in the Blockchain": "Stockez le score d'un tournoi dans la Blockchain",
"User Management": "Gestion des utilisateurs",
"Standard user management, authentication, users across tournaments": "Gestion standard des utilisateurs, authentification, utilisateurs à travers les tournois",
"Implementing a remote authentication": "Implémentation d'une authentification à distance",
"Gameplay and User Experience": "Gameplay et Expérience Utilisateur",
"Remote players": "Joueurs à distance",
"Multiplayer (more than 2)": "Multijoueur (plus de 2)",
"Add Another Game with User History and Matchmaking": "Ajouter un autre jeu avec historique des utilisateurs et matchmaking",
"Game customization options": "Options de personnalisation du jeu",
"Live chat": "Chat en direct",
"AI-Algo": "IA-Algo",
"Introduce an AI opponent": "Introduire un adversaire IA",
"User and game stats dashboard": "Tableau de bord des statistiques des utilisateurs et du jeu",
"Cybersecurity": "Cybersécurité",
"Implement WAF/ModSecurity with Hardened Configuration and HashiCorp Vault for Secrets Management": "Implémenter WAF/ModSecurity avec une configuration renforcée et HashiCorp Vault pour la gestion des secrets",
"GDPR Compliance Options with User Anonymization, Local Data Management, and Account Deletion": "Options de conformité GDPR avec anonymisation des utilisateurs, gestion des données locales et suppression de compte",
"Implement Two-Factor Authentication (2FA) and JWT": "Implémenter l'authentification à deux facteurs (2FA) et JWT",
"Devops": "Devops",
"Infrastructure Setup for Log Management": "Configuration de l'infrastructure pour la gestion des journaux",
"Monitoring system": "Système de surveillance",
"Designing the Backend as Microservices": "Conception du Backend sous forme de Microservices",
"Graphics": "Graphiques",
"Use advanced 3D techniques": "Utiliser des techniques avancées de 3D",
"Accessibility": "Accessibilité",
"Support on all devices": "Support sur tous les appareils",
"Expanding browser compatibility": "Extension de la compatibilité du navigateur",
"Multiple language support": "Support de plusieurs langues",
"Add accessibility for visually impaired users": "Ajouter l'accessibilité pour les utilisateurs malvoyants",
"Server-side rendering (SSR) integration": "Intégration du rendu côté serveur (SSR)",
"Object Oriented": "Orienté Objet",
"Replacing Basic Pong with Server-Side Pong and Implementing an API": "Remplacement de Pong de base par Pong côté serveur et implémentation d'une API",
"Enabling Pong Gameplay via CLI against Web Users with API Integration": "Activation du gameplay de Pong via CLI contre les utilisateurs Web avec intégration API",
"Games": "Jeux",
"Implementation of the orignal": "Implémentation de l'original",
"Pong game, released by Atari in 1972,": "Jeu de Pong, publié par Atari en 1972,",
"is one of the earliest arcade video games.": "est l'un des premiers jeux vidéo d'arcade.",
"It's a 2D simulation of table tennis where": "C'est une simulation 2D de tennis de table où",
"each playercontrols a paddle on the screen.": "chaque joueur contrôle une raquette à l'écran.",
"The game, created by Allan Alcorn,": "Le jeu, créé par Allan Alcorn,",
"established the video game industry": "a établi l'industrie du jeu vidéo",
"due to its commercial success.": "en raison de son succès commercial.",
"AI Pong": "IA Pong",
"You are against the mighty & challanging AI!": "Vous êtes contre la puissante et stimulante IA !",
"Where you controll only one paddle": "Où vous contrôlez seulement une raquette",
"The other is taken by the AI!": "L'autre est pris par l'IA !",
"Can you be the terminator and beat it?": "Pouvez-vous être le terminator et le battre ?",
"Now the the challange is to survive the": "Maintenant le défi est de survivre à",
"Blackhole!": "Trou noir !",
"You lose a ball, you lose a planet!": "Vous perdez une balle, vous perdez une planète !",
"Can you navigate thru the asteroid fields?": "Pouvez-vous naviguer à travers les champs d'astéroïdes ?",
"Contributors": "Contributeurs",
"How to play": "Comment jouer",
"The classic game of Pong.": "Le jeu classique de Pong.",
"Hit the ball back and forth": "Frapper la balle d'avant en arrière",
Expand Down
Loading