Compare commits
75 commits
master
...
featureall
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b767a80963 | ||
|
|
74daf728dd | ||
|
|
f71c82d9d5 | ||
|
|
c306eaac28 | ||
|
|
4797a3ee53 | ||
|
|
8d7a592b68 | ||
|
|
925705a0e1 | ||
|
|
db352ab6bf | ||
|
|
fe9a7136fe | ||
|
|
39f23a3c80 | ||
|
|
c644a1f2d5 | ||
|
|
1066697eed | ||
|
|
6c1e7491d6 | ||
|
|
81893b0dfe | ||
|
|
b7b7539a79 | ||
|
|
39de6138d6 | ||
|
|
e73b2daaf0 | ||
|
|
c72d6e2b99 | ||
|
|
64beacf844 | ||
|
|
608e0f7680 | ||
|
|
34c54a0079 | ||
|
|
cf2274d49c | ||
|
|
96eaf261be | ||
|
|
5abcc65fc7 | ||
|
|
791cbe79d6 | ||
|
|
aa6228aec0 | ||
|
|
09dbb30611 | ||
|
|
79413081bd | ||
|
|
0b98719753 | ||
|
|
7782d6f50a | ||
|
|
5a73a70e02 | ||
|
|
05157e6d38 | ||
|
|
2ce7bde884 | ||
|
|
d8b7aee6c7 | ||
|
|
643a3ab2e6 | ||
|
|
4d2d6608e7 | ||
|
|
818ac97e5a | ||
|
|
d56d17724a | ||
|
|
549d419bbf | ||
|
|
5a8ea53597 | ||
|
|
b1c1b0d8af | ||
|
|
de63550429 | ||
|
|
6a081fba12 | ||
|
|
809451edf1 | ||
|
|
c689d5ac77 | ||
|
|
50970dde2c | ||
|
|
eaefd42f1d | ||
|
|
83c6b6e504 | ||
|
|
4177bf8c52 | ||
|
|
f61416c4d0 | ||
|
|
f6e1b6b488 | ||
|
|
1d97283343 | ||
|
|
e05f356bee | ||
|
|
b787a13669 | ||
|
|
f4e72e80e4 | ||
|
|
44269bed14 | ||
|
|
542435db99 | ||
|
|
a6cd64dd5d | ||
| 822b77afb5 | |||
|
|
cf9c196053 | ||
|
|
f37b021c7c | ||
|
|
7224ba7d6f | ||
|
|
5bf89dd684 | ||
|
|
7d26b9372c | ||
|
|
33f8be706c | ||
|
|
ed879ed8c2 | ||
|
|
d797c43480 | ||
|
|
a248cdabdc | ||
|
|
3e95cde4d0 | ||
|
|
1bfb3328f2 | ||
|
|
a4e188bff8 | ||
|
|
2f7db91628 | ||
|
|
224aaf94a6 | ||
|
|
da172f04cc | ||
|
|
710a79db52 |
115 changed files with 5057 additions and 354 deletions
16
.idea/gradle.xml
generated
Normal file
16
.idea/gradle.xml
generated
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="GradleMigrationSettings" migrationVersion="1" />
|
||||||
|
<component name="GradleSettings">
|
||||||
|
<option name="linkedExternalProjectsSettings">
|
||||||
|
<GradleProjectSettings>
|
||||||
|
<option name="externalProjectPath" value="$PROJECT_DIR$/FencerJudgeBack" />
|
||||||
|
<option name="modules">
|
||||||
|
<set>
|
||||||
|
<option value="$PROJECT_DIR$/FencerJudgeBack" />
|
||||||
|
</set>
|
||||||
|
</option>
|
||||||
|
</GradleProjectSettings>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
9
.idea/kotlinc.xml
generated
Normal file
9
.idea/kotlinc.xml
generated
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="Kotlin2JvmCompilerArguments">
|
||||||
|
<option name="jvmTarget" value="1.8" />
|
||||||
|
</component>
|
||||||
|
<component name="KotlinJpsPluginSettings">
|
||||||
|
<option name="version" value="1.9.25" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
6
.idea/misc.xml
generated
6
.idea/misc.xml
generated
|
|
@ -1,6 +1,10 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ProjectRootManager">
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
|
<component name="FrameworkDetectionExcludesConfiguration">
|
||||||
|
<file type="web" url="file://$PROJECT_DIR$/FencerJudgeBack" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectRootManager" version="2" project-jdk-name="21" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
1
.idea/modules.xml
generated
1
.idea/modules.xml
generated
|
|
@ -2,7 +2,6 @@
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ProjectModuleManager">
|
<component name="ProjectModuleManager">
|
||||||
<modules>
|
<modules>
|
||||||
<module fileurl="file://$PROJECT_DIR$/FencerJudgeBack/FencerJudgeBack.iml" filepath="$PROJECT_DIR$/FencerJudgeBack/FencerJudgeBack.iml" />
|
|
||||||
<module fileurl="file://$PROJECT_DIR$/jpe-controle.iml" filepath="$PROJECT_DIR$/jpe-controle.iml" />
|
<module fileurl="file://$PROJECT_DIR$/jpe-controle.iml" filepath="$PROJECT_DIR$/jpe-controle.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
||||||
137
FencerJudgeBack/README.md
Normal file
137
FencerJudgeBack/README.md
Normal file
|
|
@ -0,0 +1,137 @@
|
||||||
|
# Entités
|
||||||
|
## MATCHES (MatchBean)
|
||||||
|
- id -> Long
|
||||||
|
- country -> String
|
||||||
|
- city -> String
|
||||||
|
- weapon -> String
|
||||||
|
- player1ID -> Long
|
||||||
|
- player2ID -> Long
|
||||||
|
- refereeID (arbitre) -> Long
|
||||||
|
- score1 (score du joueur 1) -> Integer
|
||||||
|
- score2 (score du joueur 2) -> Integer
|
||||||
|
- date -> Date
|
||||||
|
- state (état du match : en cours, terminé, pas commencé) -> Integer (ENUM)
|
||||||
|
|
||||||
|
## ETATS D'UN MATCH (MatchesStates)
|
||||||
|
- ONGOING -> Integer (1)
|
||||||
|
- OVER -> Integer (2)
|
||||||
|
- NOT STARTED -> Integer (3)
|
||||||
|
|
||||||
|
## ARBITRES (RefereeBean)
|
||||||
|
- id -> Long
|
||||||
|
- name (nom de famille) -> String
|
||||||
|
- firstName (prénom) -> String
|
||||||
|
- qualification -> String
|
||||||
|
|
||||||
|
## JOUEURS (PlayerBean)
|
||||||
|
- id -> Long
|
||||||
|
- name (nom de famille) -> String
|
||||||
|
- firstName (prénom) -> String
|
||||||
|
- club -> String
|
||||||
|
|
||||||
|
# Actions REST sur les entités
|
||||||
|
## matches (MatchRestController, "/matches")
|
||||||
|
- Lister tous les matches -> **GET "/matches/"** -> List<MatchBean>
|
||||||
|
- Lister tous les matches à partir d'une certaine date -> **GET "/matches/date=&date"** -> List<MatchBean>
|
||||||
|
- Lister les matches en cours (état : en cours) -> **GET "/matches/active"** -> List<MatchBean>
|
||||||
|
- Lister les matches terminés (état : terminé) -> **GET "/matches/over"** -> List<MatchBean>
|
||||||
|
- Lister les matches non commencés (état : non commencé) -> **GET "/matches/not-started"** -> List<MatchBean>
|
||||||
|
- Afficher un match par id -> **GET "/matches/id=&id"** -> MatchBean
|
||||||
|
- Mettre à jour les score d'un match récupéré par id -> **POST "/matches/update-match"**
|
||||||
|
{
|
||||||
|
id=$id,
|
||||||
|
score1=$score1,
|
||||||
|
score2=$score2
|
||||||
|
}
|
||||||
|
-> MatchBean
|
||||||
|
- Ajouter un match -> **POST "/matches/add-match"**
|
||||||
|
{
|
||||||
|
date=$date,
|
||||||
|
country=$country
|
||||||
|
city=$city,
|
||||||
|
weapon=$weapon,
|
||||||
|
refereeID=$refereeID,
|
||||||
|
player1ID=$player1ID,
|
||||||
|
player2ID=$player2ID,
|
||||||
|
|
||||||
|
}
|
||||||
|
-> MatchBean
|
||||||
|
- Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) -> **POST "/matches/delete-match"**
|
||||||
|
{
|
||||||
|
id=$id
|
||||||
|
}
|
||||||
|
|
||||||
|
## ARBITRES (RefereeRestController, "/referees") :
|
||||||
|
- Lister tous les arbitres -> **GET "/referees/"** -> List<RefereeBean>
|
||||||
|
- Afficher un arbitre par id -> **GET "/referees/id=$id"** -> RefereeBean
|
||||||
|
- Afficher un arbitre par nom ->**GET "/referees/name=$name"** -> RefereeBean
|
||||||
|
- Ajouter un arbitre ->**POST "/referees/add-referee"**
|
||||||
|
{
|
||||||
|
name=$name,
|
||||||
|
firstName=$firstName,
|
||||||
|
qualification=$qualification
|
||||||
|
}
|
||||||
|
-> RefereeBean
|
||||||
|
- Supprimer un arbitre ->**POST "/referees/delete-referee/"**
|
||||||
|
{
|
||||||
|
id=$id
|
||||||
|
}
|
||||||
|
|
||||||
|
## JOUEURS (PlayerRestController, "/players") :
|
||||||
|
- Lister tous les joueurs ->**GET "/players/"** -> List<PlayerBean>
|
||||||
|
- Afficher un joueur par id ->**GET "/players/id=$id"** -> PlayerBean
|
||||||
|
- Afficher un joueur par nom ->**GET "/players/name=$name"** -> PlayerBean
|
||||||
|
- Ajouter un joueur ->**POST "/players/add-player"**
|
||||||
|
{
|
||||||
|
name=$name,
|
||||||
|
firstName=$firstName,
|
||||||
|
club=$club
|
||||||
|
}
|
||||||
|
-> PlayerBean
|
||||||
|
- Supprimer un joueur ->**POST "/players/delete-player"**
|
||||||
|
{
|
||||||
|
id=$id
|
||||||
|
}
|
||||||
|
|
||||||
|
# Websocket (http://localhost:8080/ws)
|
||||||
|
- Vider le channel
|
||||||
|
- Insérer une donnée dans le channel
|
||||||
|
- Modifier une donnée dans le channel
|
||||||
|
- Supprimer une donnée du channel
|
||||||
|
|
||||||
|
## MATCHES
|
||||||
|
## matches (MatchRestController, "/matches")
|
||||||
|
- Lister tous les matches -> dans le channel Websocket
|
||||||
|
- Lister tous les matches à partir d'une certaine date -> dans le channel Websocket
|
||||||
|
- Lister les matches en cours (état : en cours) -> **GET "/matches/active"** -> List<MatchBean>
|
||||||
|
- Lister les matches terminés (état : terminé) -> **GET "/matches/over"** -> List<MatchBean>
|
||||||
|
- Lister les matches non commencés (état : non commencé) -> **GET "/matches/not-started"** -> List<MatchBean>
|
||||||
|
- Afficher un match par id -> **GET "/matches/id=&id"** -> MatchBean
|
||||||
|
- Mettre à jour les score d'un match récupéré par id -> **POST "/matches/update-match"**
|
||||||
|
{
|
||||||
|
id=$id,
|
||||||
|
score1=$score1,
|
||||||
|
score2=$score2
|
||||||
|
}
|
||||||
|
-> MatchBean
|
||||||
|
- Ajouter un match -> **POST "/matches/add-match"**
|
||||||
|
{
|
||||||
|
date=$date,
|
||||||
|
country=$country
|
||||||
|
city=$city,
|
||||||
|
weapon=$weapon,
|
||||||
|
refereeID=$refereeID,
|
||||||
|
player1ID=$player1ID,
|
||||||
|
player2ID=$player2ID,
|
||||||
|
|
||||||
|
}
|
||||||
|
-> MatchBean
|
||||||
|
- Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) -> **POST "/matches/delete-match"**
|
||||||
|
{
|
||||||
|
id=$id
|
||||||
|
}
|
||||||
|
|
||||||
|
## REFEREES
|
||||||
|
|
||||||
|
|
||||||
|
## PLAYERS
|
||||||
6
FencerJudgeBack/TODO.txt
Normal file
6
FencerJudgeBack/TODO.txt
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
corriger les services - V
|
||||||
|
tester les restcontrollers via des requêtes http - V
|
||||||
|
créer la bdd avec toutes les tables (repositories) - V
|
||||||
|
tester le websocket -
|
||||||
|
prévoir l'utilisation en admin uniquement (spring security)
|
||||||
|
faire le jackarta de l'api
|
||||||
|
|
@ -22,10 +22,21 @@ dependencies {
|
||||||
implementation("org.springframework.boot:spring-boot-starter-web")
|
implementation("org.springframework.boot:spring-boot-starter-web")
|
||||||
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
|
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
|
||||||
implementation("org.jetbrains.kotlin:kotlin-reflect")
|
implementation("org.jetbrains.kotlin:kotlin-reflect")
|
||||||
|
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
|
||||||
developmentOnly("org.springframework.boot:spring-boot-devtools")
|
developmentOnly("org.springframework.boot:spring-boot-devtools")
|
||||||
testImplementation("org.springframework.boot:spring-boot-starter-test")
|
testImplementation("org.springframework.boot:spring-boot-starter-test")
|
||||||
testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
|
testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
|
||||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
||||||
|
implementation("org.springframework.boot:spring-boot-starter-validation")
|
||||||
|
|
||||||
|
// WEBSOCKET
|
||||||
|
implementation("org.springframework.boot:spring-boot-starter-websocket")
|
||||||
|
|
||||||
|
// SECURITY
|
||||||
|
implementation("org.springframework.boot:spring-boot-starter-security")
|
||||||
|
|
||||||
|
// H2 Database
|
||||||
|
runtimeOnly("com.h2database:h2")
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
|
|
|
||||||
269
FencerJudgeBack/conception.txt
Normal file
269
FencerJudgeBack/conception.txt
Normal file
|
|
@ -0,0 +1,269 @@
|
||||||
|
## Websocket
|
||||||
|
// Ouvrir channel websocket sur port 8500 --> DONE
|
||||||
|
function startWebsocket(var integer port) -> Websocket:
|
||||||
|
var Websocket websocket = start Websocket at port [port]
|
||||||
|
return websocket
|
||||||
|
|
||||||
|
## Entités
|
||||||
|
MATCHS -> MatchBean, MatchRepository
|
||||||
|
MatchBean:
|
||||||
|
- id:Long
|
||||||
|
- player1:PlayerBean
|
||||||
|
- player2:PlayerBean
|
||||||
|
- referee:RefereeBean
|
||||||
|
- score1:Int (score du player1)
|
||||||
|
- score2:Int (score du player2)
|
||||||
|
- date:String (date du match)
|
||||||
|
- state:String (état du match : terminé, en cours, pas commencé)
|
||||||
|
|
||||||
|
REFEREES (arbitres) -> RefereeBean, RefereeRepository
|
||||||
|
RefereeBean:
|
||||||
|
- id:Long
|
||||||
|
- name:Long (nom)
|
||||||
|
- firstName:String (prénom)
|
||||||
|
|
||||||
|
PLAYERS -> PlayerBean, PlayerRepository
|
||||||
|
PlayerBean:
|
||||||
|
- id:Long
|
||||||
|
- name:String (nom)
|
||||||
|
- firstName:String (prénom)
|
||||||
|
|
||||||
|
## Services
|
||||||
|
MatchService --> DONE:
|
||||||
|
// Obtenir tous les matchs (public) --> DONE
|
||||||
|
function getAll() -> array<MatchBean> :
|
||||||
|
return MatchRepository.getAll()
|
||||||
|
|
||||||
|
// Obtenir un match par id (public) --> DONE
|
||||||
|
function getById(var long id) -> MatchBean :
|
||||||
|
return MatchRepository.findById(id)
|
||||||
|
|
||||||
|
// Obtenir un ou plusieurs match(s) par joueurs (id) (public) --> DONE
|
||||||
|
function getByPlayers(var long player1ID, var long player2ID) -> array<MatchBean> {
|
||||||
|
return MatchRepository.getAll().filterBy(player1ID or player2ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ajouter un match (admin) --> DONE
|
||||||
|
function createMatch(var MatchBean newMatch) -> MatchBean :
|
||||||
|
MatchRepository.add(newMatch)
|
||||||
|
return newMatch
|
||||||
|
|
||||||
|
// Modifier un match (admin) --> DONE
|
||||||
|
function updateMatch(var long id, var Date date, var long refereeID, var long player1ID, var long player2ID, var integer scorePlayer1, var integer scorePlayer2, var Date date, var string matchState) -> integr (success or not):
|
||||||
|
// Vérifier si le match existe à l'id renseigné
|
||||||
|
if MatchRepository.getById(id) doesn't exist {
|
||||||
|
return FAILED
|
||||||
|
}
|
||||||
|
|
||||||
|
// Créer nouveau MatchBean à l'id renseigné
|
||||||
|
var MatchBean newMatch = new MatchBean(id, player1ID, player2ID, refereeID, score1, score2, date, state)
|
||||||
|
|
||||||
|
// Supprimer le MatchBean à l'id en paramètre
|
||||||
|
MatchRepository.deleteById(id)
|
||||||
|
|
||||||
|
// Insérer le nouveau MatchBean à l'id en paramètre
|
||||||
|
MatchRepository.add(newMatch)
|
||||||
|
|
||||||
|
return SUCCESS
|
||||||
|
|
||||||
|
|
||||||
|
// Supprimer un match (admin) --> DONE
|
||||||
|
function deleteMatch(var long id) -> integer (success or failure) :
|
||||||
|
try:
|
||||||
|
MatchRepository.deleteById(id)
|
||||||
|
catch error:
|
||||||
|
return FAILED
|
||||||
|
|
||||||
|
return SUCCESS
|
||||||
|
|
||||||
|
RefereeService --> DONE:
|
||||||
|
// Obtenir tous les arbitres (public) --> DONE
|
||||||
|
function getAll() -> array<RefereeBean> :
|
||||||
|
return RefereeRepository.getAll()
|
||||||
|
|
||||||
|
// Obtenir un arbitre par id (public) --> DONE
|
||||||
|
function getById(var long id) -> RefereeBean :
|
||||||
|
return RefereeRepository.findById(id)
|
||||||
|
|
||||||
|
// Obtenir un ou plusieurs arbitre(s) par nom (public) --> DONE
|
||||||
|
function getByName(var string name) -> array<RefereeBean> :
|
||||||
|
return RefereeRepository.getAll().filterBy(name)
|
||||||
|
|
||||||
|
// Obtenir un ou plusieurs arbitre(s) par prénom (public)
|
||||||
|
function getByFirstName(var string firstName) -> array<RefereeBean> :
|
||||||
|
return RefereeRepository.getAll().filterBy(firstName)
|
||||||
|
|
||||||
|
// Ajouter un arbitre (admin) --> DONE
|
||||||
|
function createReferee(var RefereeBean newReferee) -> RefereeBean:
|
||||||
|
RefereeRepository.add(newReferee)
|
||||||
|
return newReferee
|
||||||
|
|
||||||
|
// Modifier un arbitre (admin) --> DONE
|
||||||
|
function updateReferee(var long id, var string name, var string firstName) -> integer (success or not):
|
||||||
|
|
||||||
|
// Vérifier si l'arbitre existe à l'id renseigné
|
||||||
|
if RefereeRepository.getById(id) doesn't exist {
|
||||||
|
return FAILED
|
||||||
|
}
|
||||||
|
|
||||||
|
// Créer nouveau RefereeBean à l'id renseigné
|
||||||
|
var RefereeBean newReferee = new RefereeBean(id, name, firstName)
|
||||||
|
|
||||||
|
// Supprimer le RefereeBean à l'id en paramètre
|
||||||
|
RefereeRepository.deleteById(id)
|
||||||
|
|
||||||
|
// Insérer le nouveau RefereeBean à l'id en paramètre
|
||||||
|
RefereeRepository.add(newReferee)
|
||||||
|
|
||||||
|
return SUCCESS
|
||||||
|
|
||||||
|
|
||||||
|
// Supprimer un arbitre (admin) --> DONE
|
||||||
|
function delete(var long id) -> integer (success or failure) :
|
||||||
|
try:
|
||||||
|
RefereeRepository.deleteById(id)
|
||||||
|
catch error:
|
||||||
|
return FAILED
|
||||||
|
|
||||||
|
return SUCCESS
|
||||||
|
|
||||||
|
PlayerService --> DONE:
|
||||||
|
// Obtenir tous les joueurs (public) --> DONE
|
||||||
|
function getAll() -> array<PlayerBean> :
|
||||||
|
return PlayerRepository.getAll()
|
||||||
|
|
||||||
|
// Obtenir un joueur par id (public) --> DONE
|
||||||
|
function getById(var long id) -> PlayerBean :
|
||||||
|
return PlayerRepository.findById(id)
|
||||||
|
|
||||||
|
// Obtenir un ou plusieurs joueur(s) par nom (public) --> DONE
|
||||||
|
function getByName(var string name) -> array<PlayerBean> :
|
||||||
|
return PlayerRepository.getAll().filterBy(name)
|
||||||
|
|
||||||
|
// Obtenir un ou plusieurs joueur(s) par prénom (public) --> DONE
|
||||||
|
function getByFirstName(var string firstName) -> array<PlayerBean> :
|
||||||
|
return PlayerRepository.getAll().filterBy(firstName)
|
||||||
|
|
||||||
|
// Ajouter un joueur (admin) --> DONE
|
||||||
|
function add(var PlayerBean newPlayer) -> PlayerBean:
|
||||||
|
PlayerRepository.add(newPlayer)
|
||||||
|
return newPlayer
|
||||||
|
|
||||||
|
// Modifier un joueur (admin) --> DONE
|
||||||
|
function update(var long id, var string name, var string firstName) -> PlayerBean :
|
||||||
|
// Créer nouveau PlayerBean
|
||||||
|
var PlayerBean newPlayer = new PlayerBean(id, name, firstName)
|
||||||
|
|
||||||
|
// Supprimer le PlayerBean à l'id en paramètre
|
||||||
|
deleteById(id)
|
||||||
|
|
||||||
|
// Insérer le nouveau PlayerBean à l'id en paramètre
|
||||||
|
PlayerRepository.add(newPlayer)
|
||||||
|
|
||||||
|
return newPlayer
|
||||||
|
|
||||||
|
// Supprimer un joueur (admin) --> DONE
|
||||||
|
function delete(var long id) -> integer (success or failure) :
|
||||||
|
try:
|
||||||
|
PlayerRepository.deleteById(id)
|
||||||
|
catch error:
|
||||||
|
return FAILED
|
||||||
|
|
||||||
|
return SUCCESS
|
||||||
|
|
||||||
|
## RestControllers
|
||||||
|
MatchRestController --> TODO:
|
||||||
|
// Lister tous les matchs --> DONE
|
||||||
|
function getAll() -> array<MatchBean> :
|
||||||
|
return MatchService.getAll()
|
||||||
|
|
||||||
|
// Lister tous les matchs à partir d'une certaine date
|
||||||
|
function getAllFromDate(var Date dateToFilter) -> array<MatchBean> :
|
||||||
|
return MatchService.getAll().filter(date == dateToFilter)
|
||||||
|
|
||||||
|
// Lister les matchs en cours (état : en cours)
|
||||||
|
function getAllActive() -> array<MatchBean> :
|
||||||
|
return MatchService.getAll().filter(state == "ONGOING")
|
||||||
|
|
||||||
|
// Lister les matchs terminés (état : terminé)
|
||||||
|
function getAllOver() -> array<MatchBean> :
|
||||||
|
return MatchService.getAll().filter(state == "FINISHED")
|
||||||
|
|
||||||
|
// Lister les matchs non commencés (état : non commencé)
|
||||||
|
function getAllNotStarted() -> array<MatchBean> :
|
||||||
|
// MatchService :
|
||||||
|
return MatchService.getAll().filter(state == "NOT STARTED")
|
||||||
|
|
||||||
|
// Afficher un match par id
|
||||||
|
function get(var long id) -> MatchBean :
|
||||||
|
return MatchService.get(id)
|
||||||
|
|
||||||
|
// Mettre à jour le score1 d'un match récupéré par id --> TODO
|
||||||
|
function updateScore1Of(var long id, var integer newScore) -> integer (success or failure) :
|
||||||
|
return MatchService.update(
|
||||||
|
|
||||||
|
// Mettre à jour le score2 d'un match récupéré par id --> TODO
|
||||||
|
function updateScore2Of(var long id, var integer newScore) -> integer (success or failure) :
|
||||||
|
return MatchService.update(
|
||||||
|
|
||||||
|
// Ajouter un match (créer nouveau MatchBean dans MatchRepository)
|
||||||
|
function add(var MatchBean newMatch) -> integer (success or failure):
|
||||||
|
return MatchService.add(newMatch)
|
||||||
|
|
||||||
|
// Supprimer un match (supprimer élément de MatchRepository en récupérant l'id)
|
||||||
|
function deleteById(var long id) -> integer (success or failure) :
|
||||||
|
return MatchService.deleteById(id)
|
||||||
|
|
||||||
|
RefereeRestController --> DONE:
|
||||||
|
// Lister tous les arbitres
|
||||||
|
function getAll() -> array<RefereeBean> :
|
||||||
|
return RefereeService.getAll()
|
||||||
|
|
||||||
|
// Afficher un arbitre par id
|
||||||
|
function get(var long id) -> RefereeBean :
|
||||||
|
return RefereeService.get(id)
|
||||||
|
|
||||||
|
// Afficher un arbitre par nom
|
||||||
|
function get(var string name) -> RefereeBean:
|
||||||
|
return RefereeService.get(name)
|
||||||
|
|
||||||
|
// Ajouter un arbitre (créer nouveau RefereeBean dans RefereeRepository)
|
||||||
|
function add(var RefereeBean newReferee) -> integer (success or failure) :
|
||||||
|
return RefereeService.add(newReferee)
|
||||||
|
|
||||||
|
// Supprimer un arbitre (supprimer élément de RefereeRepository en récupérant l'id)
|
||||||
|
function deleteById(var long id) -> integer (success or failure) :
|
||||||
|
return RefereeService.deleteById(id)
|
||||||
|
|
||||||
|
PlayerRestController --> DONE:
|
||||||
|
// Lister tous les joueurs
|
||||||
|
function getAll() -> array<PlayerBean> :
|
||||||
|
return PlayerService.getAll()
|
||||||
|
|
||||||
|
// Afficher un joueur par id
|
||||||
|
function get(var long id) -> PlayerBean :
|
||||||
|
return PlayerService.get(id)
|
||||||
|
|
||||||
|
// Afficher un joueur par nom
|
||||||
|
function get(var string name) -> PlayerBean :
|
||||||
|
return PlayerService.get(name)
|
||||||
|
|
||||||
|
// Ajouter un joueur (créer nouveau PlayerBean dans PlayerRepository)
|
||||||
|
function add(var PlayerBean newPlayer) -> integer (success or failure) :
|
||||||
|
return PlayerService.add(newPlayer)
|
||||||
|
|
||||||
|
// Supprimer un joueur (supprimer élément de PlayerRepository en récupérant l'id)
|
||||||
|
function deleteById(var long id) -> integer (success or failure) :
|
||||||
|
return PlayerService.deleteById(id)
|
||||||
|
|
||||||
|
## Pages
|
||||||
|
Page des matchs (publique) :
|
||||||
|
à définir (partie front sur Angular ?)
|
||||||
|
|
||||||
|
Page de connexion à l'administration (publique) :
|
||||||
|
formulaire :
|
||||||
|
- nom d'utilisateur
|
||||||
|
- mot de passe
|
||||||
|
|
||||||
|
Page d'administration (privée) :
|
||||||
|
à définir (partie front sur Angular ?)
|
||||||
|
|
@ -2,8 +2,10 @@ package fr.teamflash.fencerjudgeback
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication
|
import org.springframework.boot.autoconfigure.SpringBootApplication
|
||||||
import org.springframework.boot.runApplication
|
import org.springframework.boot.runApplication
|
||||||
|
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity
|
||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
|
@EnableGlobalMethodSecurity(prePostEnabled = true)
|
||||||
class FencerJudgeBackApplication
|
class FencerJudgeBackApplication
|
||||||
|
|
||||||
fun main(args: Array<String>) {
|
fun main(args: Array<String>) {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,56 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.config
|
||||||
|
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired
|
||||||
|
import org.springframework.context.annotation.Bean
|
||||||
|
import org.springframework.context.annotation.Configuration
|
||||||
|
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder
|
||||||
|
import org.springframework.security.config.annotation.web.builders.HttpSecurity
|
||||||
|
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
|
||||||
|
import org.springframework.security.core.userdetails.User
|
||||||
|
import org.springframework.security.core.userdetails.UserDetailsService
|
||||||
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
|
||||||
|
import org.springframework.security.provisioning.InMemoryUserDetailsManager
|
||||||
|
import org.springframework.security.web.SecurityFilterChain
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
@EnableWebSecurity
|
||||||
|
class SecurityConfig {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
open fun configureGlobal(auth: AuthenticationManagerBuilder) {
|
||||||
|
val encoder = BCryptPasswordEncoder()
|
||||||
|
|
||||||
|
//Créer des utilisateurs fixes
|
||||||
|
auth.inMemoryAuthentication()
|
||||||
|
.passwordEncoder(encoder)
|
||||||
|
.withUser("aaa")
|
||||||
|
.password(encoder.encode("bbb"))
|
||||||
|
.roles("USER")
|
||||||
|
.and()
|
||||||
|
.withUser("Admin")
|
||||||
|
.password(encoder.encode("Admin"))
|
||||||
|
.roles("ADMIN")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
open fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
|
||||||
|
http.authorizeHttpRequests { authorize ->
|
||||||
|
authorize.requestMatchers("/ws/*").authenticated()
|
||||||
|
.anyRequest().permitAll()
|
||||||
|
}
|
||||||
|
.httpBasic { }
|
||||||
|
.formLogin { }
|
||||||
|
.csrf { it.disable() }
|
||||||
|
return http.build()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
fun userDetailsService(): UserDetailsService {
|
||||||
|
val user = User.withUsername("user")
|
||||||
|
.password("{noop}password") // {noop} = pas de hash pour dev
|
||||||
|
.roles("USER")
|
||||||
|
.build()
|
||||||
|
|
||||||
|
return InMemoryUserDetailsManager(user)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.config
|
||||||
|
|
||||||
|
import org.springframework.context.annotation.Configuration
|
||||||
|
import org.springframework.messaging.simp.config.MessageBrokerRegistry
|
||||||
|
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker
|
||||||
|
import org.springframework.web.socket.config.annotation.StompEndpointRegistry
|
||||||
|
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer
|
||||||
|
import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor
|
||||||
|
|
||||||
|
const val CHANNEL_MATCH_NAME: String = "/ws/topic/match"
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
@EnableWebSocketMessageBroker
|
||||||
|
open class MatchWebSocketConfig : WebSocketMessageBrokerConfigurer {
|
||||||
|
|
||||||
|
override fun configureMessageBroker(registry: MessageBrokerRegistry) {
|
||||||
|
// Enable a simple memory-based message broker to send messages to clients
|
||||||
|
// Prefix for messages FROM server TO client
|
||||||
|
registry.enableSimpleBroker(CHANNEL_MATCH_NAME)
|
||||||
|
|
||||||
|
// Prefix for messages FROM client TO server
|
||||||
|
registry.setApplicationDestinationPrefixes("/ws")
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun registerStompEndpoints(registry: StompEndpointRegistry) {
|
||||||
|
// Register the "/ws" endpoint, enabling SockJS fallback options
|
||||||
|
registry.addEndpoint("/ws/matches-app")
|
||||||
|
.addInterceptors(HttpSessionHandshakeInterceptor())
|
||||||
|
.setAllowedOriginPatterns("*") // Allow connections from any origin (adjust for production)
|
||||||
|
.withSockJS()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.entities
|
||||||
|
|
||||||
|
import jakarta.persistence.Entity
|
||||||
|
import jakarta.persistence.GeneratedValue
|
||||||
|
import jakarta.persistence.GenerationType
|
||||||
|
import jakarta.persistence.Id
|
||||||
|
import jakarta.persistence.SequenceGenerator
|
||||||
|
import jakarta.persistence.Table
|
||||||
|
import jakarta.validation.constraints.*
|
||||||
|
import java.util.Date
|
||||||
|
|
||||||
|
enum class MatchState {
|
||||||
|
ONGOING,
|
||||||
|
OVER,
|
||||||
|
NOT_STARTED
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name="matches")
|
||||||
|
data class MatchBean(
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "match_sequence")
|
||||||
|
@SequenceGenerator(name = "match_sequence", sequenceName = "match_seq", allocationSize = 1)
|
||||||
|
var id:Long?=null,
|
||||||
|
val weapon:String?=null,
|
||||||
|
val country:String?=null,
|
||||||
|
val city:String?=null,
|
||||||
|
@field:NotNull(message = "Player 1 ID must not be null")
|
||||||
|
val player1ID:Long?=null,
|
||||||
|
@field:NotNull(message = "Player 2 ID must not be null")
|
||||||
|
val player2ID:Long?=null,
|
||||||
|
val refereeID: Long?=null,
|
||||||
|
@field:Min(value = 0, message = "Score must be at least 0")
|
||||||
|
var score1:Int=0,
|
||||||
|
@field:Min(value = 0, message = "Score must be at least 0")
|
||||||
|
var score2:Int=0,
|
||||||
|
val date: Date?=null,
|
||||||
|
val state: MatchState?=null
|
||||||
|
)
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.entities
|
||||||
|
|
||||||
|
data class MatchUpdateBean(val match: MatchBean?=null, val playerId:Long?=null)
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.entities
|
||||||
|
|
||||||
|
import jakarta.persistence.Entity
|
||||||
|
import jakarta.persistence.GeneratedValue
|
||||||
|
import jakarta.persistence.GenerationType
|
||||||
|
import jakarta.persistence.Id
|
||||||
|
import jakarta.persistence.SequenceGenerator
|
||||||
|
import jakarta.persistence.Table
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name="players")
|
||||||
|
data class PlayerBean(
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "player_sequence")
|
||||||
|
@SequenceGenerator(name = "player_sequence", sequenceName = "player_seq", allocationSize = 1)
|
||||||
|
val id:Long?=null,
|
||||||
|
val name:String?="",
|
||||||
|
val firstName:String?="",
|
||||||
|
val club:String?=""
|
||||||
|
)
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.entities
|
||||||
|
|
||||||
|
import jakarta.persistence.Entity
|
||||||
|
import jakarta.persistence.GeneratedValue
|
||||||
|
import jakarta.persistence.GenerationType
|
||||||
|
import jakarta.persistence.Id
|
||||||
|
import jakarta.persistence.SequenceGenerator
|
||||||
|
import jakarta.persistence.Table
|
||||||
|
|
||||||
|
enum class RefereeLevel {
|
||||||
|
DEPARTMENTAL,
|
||||||
|
REGIONAL,
|
||||||
|
NATIONAL,
|
||||||
|
INTERNATIONAL
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name="referees")
|
||||||
|
data class RefereeBean(
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "referee_sequence")
|
||||||
|
@SequenceGenerator(name = "referee_sequence", sequenceName = "referee_seq", allocationSize = 1)
|
||||||
|
val id:Long?=null,
|
||||||
|
val name:String?=null,
|
||||||
|
val firstName:String?=null,
|
||||||
|
val level:RefereeLevel?=null
|
||||||
|
)
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.repositories
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.MatchBean
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository
|
||||||
|
import org.springframework.stereotype.Repository
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
interface MatchRepository: JpaRepository<MatchBean, Long> {
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.repositories
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.PlayerBean
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository
|
||||||
|
import org.springframework.stereotype.Repository
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
interface PlayerRepository: JpaRepository<PlayerBean, Long> {
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.repositories
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.RefereeBean
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository
|
||||||
|
import org.springframework.stereotype.Repository
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
interface RefereeRepository : JpaRepository<RefereeBean, Long> {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.restControllers
|
||||||
|
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping
|
||||||
|
import org.springframework.web.bind.annotation.RestController
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
class MainController {
|
||||||
|
@GetMapping("/")
|
||||||
|
fun main() {
|
||||||
|
return print("Hello")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,86 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.restControllers
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.MatchBean
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.MatchState
|
||||||
|
import fr.teamflash.fencerjudgeback.services.MatchService
|
||||||
|
import org.springframework.http.ResponseEntity
|
||||||
|
import org.springframework.web.bind.annotation.*
|
||||||
|
import java.util.Date
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@CrossOrigin(origins = ["*"])
|
||||||
|
@RequestMapping("/matches")
|
||||||
|
class MatchRestController(private val matchService: MatchService) {
|
||||||
|
|
||||||
|
// Lister tous les matchs
|
||||||
|
@GetMapping("/")
|
||||||
|
fun getAll(): ResponseEntity<List<MatchBean>?> {
|
||||||
|
return ResponseEntity.ok(matchService.getAll())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lister tous les matchs à partir d'une certaine date
|
||||||
|
@GetMapping("/date/{date}")
|
||||||
|
fun getAllFromDate(@PathVariable date: Date): ResponseEntity<List<MatchBean?>?> {
|
||||||
|
return ResponseEntity.ok(matchService.getAll().filter { it.date == date })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lister tous les matchs par pays
|
||||||
|
@GetMapping("/country/{country}")
|
||||||
|
fun getAllFromCountry(@PathVariable country:String): ResponseEntity<List<MatchBean>?> {
|
||||||
|
return ResponseEntity.ok(matchService.getAll().filter { it.country == country })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lister tous les matchs par ville
|
||||||
|
@GetMapping("/city/{city}")
|
||||||
|
fun getAllFromCity(@PathVariable city:String): ResponseEntity<List<MatchBean>?> {
|
||||||
|
return ResponseEntity.ok(matchService.getAll().filter { it.city == city })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lister tous les matchs par joueurs
|
||||||
|
@GetMapping("/players/{player1ID}/{player2ID}")
|
||||||
|
fun getAllWithPlayers(@PathVariable player1ID: Long?, @PathVariable player2ID: Long?): ResponseEntity<List<MatchBean>?> {
|
||||||
|
return ResponseEntity.ok(matchService.getByPlayers(player1ID, player2ID))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lister les matchs en cours
|
||||||
|
@GetMapping("/active")
|
||||||
|
fun getAllActive(): ResponseEntity<List<MatchBean>?> {
|
||||||
|
return ResponseEntity.ok(matchService.getAll().filter { it.state == MatchState.ONGOING })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lister les matchs terminés
|
||||||
|
@GetMapping("/over")
|
||||||
|
fun getAllFinished(): ResponseEntity<List<MatchBean>?> {
|
||||||
|
return ResponseEntity.ok(matchService.getAll().filter { it.state == MatchState.OVER })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lister les matchs non commencés
|
||||||
|
@GetMapping("/not-started")
|
||||||
|
fun getAllNotStarted(): ResponseEntity<List<MatchBean>?> {
|
||||||
|
return ResponseEntity.ok(matchService.getAll().filter { it.state == MatchState.NOT_STARTED })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Afficher un match par id
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
fun getById(@PathVariable id: Long): ResponseEntity<MatchBean?> {
|
||||||
|
return ResponseEntity.ok(matchService.getById(id))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ajouter un match
|
||||||
|
@PostMapping("/create-match")
|
||||||
|
fun createMatch(@RequestBody match: MatchBean): ResponseEntity<MatchBean> {
|
||||||
|
return ResponseEntity.ok(matchService.createMatch(match))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mettre à jour un match
|
||||||
|
@PutMapping("/update-match/{id}")
|
||||||
|
fun updateMatch(@PathVariable id: Long, @RequestBody match: MatchBean): ResponseEntity<Int> {
|
||||||
|
return ResponseEntity.ok(matchService.updateMatch(id, match))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Supprimer un match
|
||||||
|
@DeleteMapping("/delete-match/{id}")
|
||||||
|
fun deleteMatch(@PathVariable id: Long): ResponseEntity<Int> {
|
||||||
|
return ResponseEntity.ok(matchService.deleteMatchById(id))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,68 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.restControllers
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.PlayerBean
|
||||||
|
import fr.teamflash.fencerjudgeback.services.PlayerService
|
||||||
|
import org.springframework.http.ResponseEntity
|
||||||
|
import org.springframework.web.bind.annotation.CrossOrigin
|
||||||
|
import org.springframework.web.bind.annotation.DeleteMapping
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping
|
||||||
|
import org.springframework.web.bind.annotation.PutMapping
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping
|
||||||
|
import org.springframework.web.bind.annotation.RestController
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@CrossOrigin(origins = ["*"])
|
||||||
|
@RequestMapping("/players")
|
||||||
|
class PlayerRestController(private val playerService: PlayerService) {
|
||||||
|
|
||||||
|
// Lister tous les joueurs
|
||||||
|
@GetMapping("/")
|
||||||
|
fun getAll(): ResponseEntity<List<PlayerBean>> {
|
||||||
|
return ResponseEntity.ok(playerService.getAll())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Afficher un joueur par id
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
fun getById(@PathVariable id: Long): ResponseEntity<PlayerBean?> {
|
||||||
|
return ResponseEntity.ok(playerService.getById(id))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Afficher un ou plusieurs joueur(s) par nom
|
||||||
|
@GetMapping("/name/{name}")
|
||||||
|
fun getByName(@PathVariable name: String): ResponseEntity<List<PlayerBean?>?> {
|
||||||
|
return ResponseEntity.ok(playerService.getByName(name))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Afficher un ou plusieurs joueur(s) par prénom
|
||||||
|
@GetMapping("/firstName/{firstName}")
|
||||||
|
fun getByFirstName(@PathVariable firstName: String): ResponseEntity<List<PlayerBean?>?> {
|
||||||
|
return ResponseEntity.ok(playerService.getByFirstName(firstName))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Afficher un ou plusieurs joueur(s) par club
|
||||||
|
@GetMapping("/club/{club}")
|
||||||
|
fun getByClub(@PathVariable club: String): ResponseEntity<List<PlayerBean?>?> {
|
||||||
|
return ResponseEntity.ok(playerService.getByClub(club))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ajouter un joueur
|
||||||
|
@PostMapping("/create-player")
|
||||||
|
fun createPlayer(@RequestBody player: PlayerBean): ResponseEntity<PlayerBean> {
|
||||||
|
return ResponseEntity.ok(playerService.createPlayer(player))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Modifier un joueur
|
||||||
|
@PutMapping("/update-player/{id}")
|
||||||
|
fun updatePlayer(@PathVariable id: Long, @RequestBody player: PlayerBean): ResponseEntity<Int> {
|
||||||
|
return ResponseEntity.ok(playerService.updatePlayer(id, player))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Supprimer un joueur
|
||||||
|
@DeleteMapping("/delete-player/{id}")
|
||||||
|
fun deletePlayer(@PathVariable id: Long): ResponseEntity<Int> {
|
||||||
|
return ResponseEntity.ok(playerService.deletePlayerById(id))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,71 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.restControllers
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.MatchState
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.RefereeBean
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.RefereeLevel
|
||||||
|
import fr.teamflash.fencerjudgeback.services.RefereeService
|
||||||
|
import org.springframework.http.ResponseEntity
|
||||||
|
import org.springframework.web.bind.annotation.CrossOrigin
|
||||||
|
import org.springframework.web.bind.annotation.DeleteMapping
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping
|
||||||
|
import org.springframework.web.bind.annotation.PutMapping
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping
|
||||||
|
import org.springframework.web.bind.annotation.RestController
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@CrossOrigin(origins = ["*"])
|
||||||
|
@RequestMapping("/referees")
|
||||||
|
class RefereeRestController(private val refereeService: RefereeService) {
|
||||||
|
|
||||||
|
// Lister tous les arbitres
|
||||||
|
@GetMapping("/")
|
||||||
|
fun getAll() : ResponseEntity<List<RefereeBean>> {
|
||||||
|
return ResponseEntity.ok(refereeService.getAll())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Afficher un arbitre par id
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
fun getById(@PathVariable id: Long): ResponseEntity<RefereeBean?> {
|
||||||
|
return ResponseEntity.ok(refereeService.getById(id))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Afficher un ou plusieurs arbitre(s) par nom
|
||||||
|
@GetMapping("/name/{name}")
|
||||||
|
fun getByName(@PathVariable name:String): ResponseEntity<List<RefereeBean?>?> {
|
||||||
|
return ResponseEntity.ok(refereeService.getByName(name))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Afficher un ou plusieurs arbitre(s) par prénom
|
||||||
|
@GetMapping("/firstname/{firstName}")
|
||||||
|
fun getByFirstName(@PathVariable firstName:String): ResponseEntity<List<RefereeBean?>?> {
|
||||||
|
return ResponseEntity.ok(refereeService.getByFirstName(firstName))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Afficher un ou plusieurs arbitre(s) par niveau
|
||||||
|
@GetMapping("/level/{level}")
|
||||||
|
fun getByQualification(@PathVariable level: RefereeLevel): ResponseEntity<List<RefereeBean?>?> {
|
||||||
|
return ResponseEntity.ok(refereeService.getByLevel(level))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ajouter un arbitre
|
||||||
|
@PostMapping("/create-referee")
|
||||||
|
fun createReferee(@RequestBody referee: RefereeBean): ResponseEntity<RefereeBean> {
|
||||||
|
return ResponseEntity.ok(refereeService.createReferee(referee))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Modifier un arbitre
|
||||||
|
@PutMapping("/update-referee/{id}")
|
||||||
|
fun updateReferee(@PathVariable id: Long, @RequestBody referee: RefereeBean) : ResponseEntity<Int> {
|
||||||
|
return ResponseEntity.ok(refereeService.updateReferee(id, referee))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Supprimer un arbitre
|
||||||
|
@DeleteMapping("/delete-referee/{id}")
|
||||||
|
fun deleteReferee(@PathVariable id:Long): ResponseEntity<Int> {
|
||||||
|
return ResponseEntity.ok(refereeService.deleteRefereeById(id))
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,98 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.services
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.MatchBean
|
||||||
|
import fr.teamflash.fencerjudgeback.repositories.MatchRepository
|
||||||
|
import fr.teamflash.fencerjudgeback.websocket.controllers.MatchWebSocketController
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired
|
||||||
|
import org.springframework.context.annotation.Lazy
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize
|
||||||
|
import org.springframework.stereotype.Service
|
||||||
|
|
||||||
|
@Service
|
||||||
|
class MatchService(
|
||||||
|
@Autowired private val matchRepository: MatchRepository,
|
||||||
|
@Lazy private val matchWebSocketController: MatchWebSocketController? = null
|
||||||
|
) {
|
||||||
|
// Obtenir tous les matchs (public)
|
||||||
|
fun getAll() : List<MatchBean> {
|
||||||
|
println("MatchService.getMatchs")
|
||||||
|
return matchRepository.findAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Obtenir un match par id (public)
|
||||||
|
fun getById(id: Long?): MatchBean? {
|
||||||
|
println("MatchService.getMatchById : $id")
|
||||||
|
|
||||||
|
if (id == null) {
|
||||||
|
println("MatchService.getMatchById : Match not found")
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
return matchRepository.findById(id).get()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Obtenir un ou plusieurs match(s) par joueurs (id) (public)
|
||||||
|
fun getByPlayers(player1ID: Long?, player2ID: Long?): List<MatchBean> {
|
||||||
|
println("MatchService.getMatchByPlayers : $player1ID - $player2ID")
|
||||||
|
return matchRepository.findAll().filter { it.player1ID == player1ID && it.player2ID == player2ID }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ajouter un match (admin)
|
||||||
|
@PreAuthorize("hasRole('ADMIN')")
|
||||||
|
fun createMatch(newMatch: MatchBean): MatchBean {
|
||||||
|
println("MatchService.createMatch : $newMatch")
|
||||||
|
val savedMatch = matchRepository.save(newMatch)
|
||||||
|
// Broadcast the new match via WebSocket
|
||||||
|
matchWebSocketController?.broadcastMatchUpdate(savedMatch, fr.teamflash.fencerjudgeback.websocket.models.MatchUpdateMessage.UpdateType.MATCH_START)
|
||||||
|
|
||||||
|
return savedMatch
|
||||||
|
}
|
||||||
|
|
||||||
|
// Modifier un match (admin)
|
||||||
|
@PreAuthorize("hasRole('ADMIN')")
|
||||||
|
fun updateMatch(id: Long?, newMatch: MatchBean): Int {
|
||||||
|
println("MatchService.updateMatch : $newMatch")
|
||||||
|
|
||||||
|
if (getById(id) == null) {
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
|
||||||
|
val updatedMatch = newMatch.copy(id = id)
|
||||||
|
val savedMatch = matchRepository.save(updatedMatch)
|
||||||
|
// Broadcast the updated match via WebSocket
|
||||||
|
matchWebSocketController?.broadcastMatchUpdate(savedMatch, fr.teamflash.fencerjudgeback.websocket.models.MatchUpdateMessage.UpdateType.SCORE_UPDATE)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
// Supprimer un match (admin)
|
||||||
|
@PreAuthorize("hasRole('ADMIN')")
|
||||||
|
fun deleteMatchById(id: Long?) : Int? {
|
||||||
|
println("MatchService.deleteMatchById : $id")
|
||||||
|
|
||||||
|
val match = getById(id)
|
||||||
|
if (match == null) {
|
||||||
|
println("MatchService.deleteMatchById : Match not found")
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
|
||||||
|
// Broadcast the match deletion via WebSocket before deleting
|
||||||
|
matchWebSocketController?.broadcastMatchUpdate(match, fr.teamflash.fencerjudgeback.websocket.models.MatchUpdateMessage.UpdateType.MATCH_CANCEL)
|
||||||
|
|
||||||
|
matchRepository.deleteById(id!!)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getMatchesByCity(city: String): List<MatchBean>? {
|
||||||
|
println("MatchService.getMatchesByCity : $city")
|
||||||
|
|
||||||
|
return matchRepository.findAll()
|
||||||
|
.filter { it.city == city }
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getMatchesByCountry(country: String): List<MatchBean>? {
|
||||||
|
println("MatchService.getMatchesByCountry : $country")
|
||||||
|
|
||||||
|
return matchRepository.findAll()
|
||||||
|
.filter { it.country == country }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,96 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.services
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.PlayerBean
|
||||||
|
import fr.teamflash.fencerjudgeback.repositories.PlayerRepository
|
||||||
|
import fr.teamflash.fencerjudgeback.websocket.controllers.PlayerWebSocketController
|
||||||
|
import fr.teamflash.fencerjudgeback.websocket.models.PlayerUpdateMessage
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired
|
||||||
|
import org.springframework.context.annotation.Lazy
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize
|
||||||
|
import org.springframework.stereotype.Service
|
||||||
|
|
||||||
|
@Service
|
||||||
|
class PlayerService(
|
||||||
|
@Autowired private val playerRepository: PlayerRepository,
|
||||||
|
@Lazy private val playerWebSocketController: PlayerWebSocketController? = null
|
||||||
|
) {
|
||||||
|
// Obtenir tous les joueurs (public)
|
||||||
|
fun getAll(): List<PlayerBean> {
|
||||||
|
println("PlayerService.getAll")
|
||||||
|
return playerRepository.findAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Obtenir un joueur par id (public)
|
||||||
|
fun getById(id:Long?) : PlayerBean? {
|
||||||
|
println("PlayerService.getById : $id")
|
||||||
|
|
||||||
|
if (id == null) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
return playerRepository.findById(id).get()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Obtenir un ou plusieurs joueur(s) par nom (public)
|
||||||
|
fun getByName(name:String): List<PlayerBean?>? {
|
||||||
|
println("PlayerService.getByName : $name")
|
||||||
|
return playerRepository.findAll().filter{ it.name == name }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Obtenir un ou plusieurs joueur(s) par prénom
|
||||||
|
fun getByFirstName(firstName:String): List<PlayerBean?>? {
|
||||||
|
println("PlayerService.getByFirstName : $firstName")
|
||||||
|
return playerRepository.findAll().filter{ it.firstName == firstName }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Obtenir un ou plusieurs joueur(s) par club
|
||||||
|
fun getByClub(club:String): List<PlayerBean?>? {
|
||||||
|
println("PlayerService.getByClub : $club")
|
||||||
|
return playerRepository.findAll().filter{ it.club == club }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ajouter un joueur (admin)
|
||||||
|
// @PreAuthorize("hasRole('ADMIN')")
|
||||||
|
fun createPlayer(player: PlayerBean) : PlayerBean {
|
||||||
|
println("PlayerService.createPlayer : $player")
|
||||||
|
val savedPlayer = playerRepository.save(player)
|
||||||
|
// Broadcast the new player via WebSocket
|
||||||
|
playerWebSocketController?.broadcastPlayerUpdate(savedPlayer, PlayerUpdateMessage.UpdateType.PLAYER_CREATE)
|
||||||
|
return savedPlayer
|
||||||
|
}
|
||||||
|
|
||||||
|
// Modifier un joueur (admin)
|
||||||
|
@PreAuthorize("hasRole('ADMIN')")
|
||||||
|
fun updatePlayer(id:Long, newPlayer: PlayerBean) : Int {
|
||||||
|
// Vérifier si le joueur existe à l'id renseigné
|
||||||
|
if (getById(id) == null) {
|
||||||
|
println("PlayerService.updatePlayer : Player not found")
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
|
||||||
|
val updatedPlayer = newPlayer.copy(id = id)
|
||||||
|
val savedPlayer = playerRepository.save(updatedPlayer)
|
||||||
|
// Broadcast the updated player via WebSocket
|
||||||
|
playerWebSocketController?.broadcastPlayerUpdate(savedPlayer, PlayerUpdateMessage.UpdateType.PLAYER_UPDATE)
|
||||||
|
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
// Supprimer un joueur (admin)
|
||||||
|
@PreAuthorize("hasRole('ADMIN')")
|
||||||
|
fun deletePlayerById(id:Long?): Int {
|
||||||
|
println("PlayerService.deletePlayer : $id")
|
||||||
|
|
||||||
|
val player = getById(id)
|
||||||
|
if (player == null) {
|
||||||
|
println("PlayerService.deletePlayer : Player not found")
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
|
||||||
|
// Broadcast the player deletion via WebSocket before deleting
|
||||||
|
playerWebSocketController?.broadcastPlayerUpdate(player, PlayerUpdateMessage.UpdateType.PLAYER_DELETE)
|
||||||
|
|
||||||
|
playerRepository.deleteById(id!!)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,96 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.services
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.MatchState
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.RefereeBean
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.RefereeLevel
|
||||||
|
import fr.teamflash.fencerjudgeback.repositories.RefereeRepository
|
||||||
|
import fr.teamflash.fencerjudgeback.websocket.controllers.RefereeWebSocketController
|
||||||
|
import fr.teamflash.fencerjudgeback.websocket.models.RefereeUpdateMessage
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired
|
||||||
|
import org.springframework.context.annotation.Lazy
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize
|
||||||
|
import org.springframework.stereotype.Service
|
||||||
|
|
||||||
|
@Service
|
||||||
|
class RefereeService(
|
||||||
|
@Autowired private val refereeRepository: RefereeRepository,
|
||||||
|
@Lazy private val refereeWebSocketController: RefereeWebSocketController? = null
|
||||||
|
) {
|
||||||
|
// Obtenir tous les arbitres (public)
|
||||||
|
fun getAll(): List<RefereeBean> {
|
||||||
|
println("RefereeService.getReferees")
|
||||||
|
return refereeRepository.findAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Obtenir un arbitre par id (public)
|
||||||
|
fun getById(id:Long?) : RefereeBean? {
|
||||||
|
println("RefereeService.getRefereeById : $id")
|
||||||
|
|
||||||
|
if (id == null) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
return refereeRepository.findById(id).get()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Obtenir un ou plusieurs arbitre(s) par nom (public)
|
||||||
|
fun getByName(name:String): List<RefereeBean?>? {
|
||||||
|
println("RefereeService.getRefereeByName : $name")
|
||||||
|
return refereeRepository.findAll().filter{ it.name == name }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Obtenir un ou plusieurs arbitre(s) par prénom
|
||||||
|
fun getByFirstName(firstName:String): List<RefereeBean?>? {
|
||||||
|
println("RefereeService.getRefereeByFirstName : $firstName")
|
||||||
|
return refereeRepository.findAll().filter{ it.firstName == firstName }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Obtenir un ou plusieurs arbitre(s) par niveau
|
||||||
|
fun getByLevel(level: RefereeLevel): List<RefereeBean>? {
|
||||||
|
println("RefereeService.getByLevel : $level")
|
||||||
|
return refereeRepository.findAll().filter{ it.level == level }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ajouter un arbitre (admin)
|
||||||
|
@PreAuthorize("hasRole('ADMIN')")
|
||||||
|
fun createReferee(referee: RefereeBean) : RefereeBean {
|
||||||
|
println("RefereeService.createReferee : $referee")
|
||||||
|
val savedReferee = refereeRepository.save(referee)
|
||||||
|
// Broadcast the new referee via WebSocket
|
||||||
|
refereeWebSocketController?.broadcastRefereeUpdate(savedReferee, RefereeUpdateMessage.UpdateType.REFEREE_CREATE)
|
||||||
|
return savedReferee
|
||||||
|
}
|
||||||
|
|
||||||
|
// Modifier un arbitre (admin)
|
||||||
|
@PreAuthorize("hasRole('ADMIN')")
|
||||||
|
fun updateReferee(id:Long, newReferee: RefereeBean) : Int? {
|
||||||
|
// Vérifier si l'arbitre existe à l'id renseigné
|
||||||
|
if (getById(id) == null) {
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
|
||||||
|
val updatedReferee = newReferee.copy(id = id)
|
||||||
|
val savedReferee = refereeRepository.save(updatedReferee)
|
||||||
|
// Broadcast the updated referee via WebSocket
|
||||||
|
refereeWebSocketController?.broadcastRefereeUpdate(savedReferee, RefereeUpdateMessage.UpdateType.REFEREE_UPDATE)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
// Supprimer un arbitre (admin)
|
||||||
|
@PreAuthorize("hasRole('ADMIN')")
|
||||||
|
fun deleteRefereeById(id:Long): Int {
|
||||||
|
println("RefereeService.deleteReferee : $id")
|
||||||
|
|
||||||
|
val referee = getById(id)
|
||||||
|
if (referee == null) {
|
||||||
|
println("RefereeService.deleteReferee : Referee not found")
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
|
||||||
|
// Broadcast the referee deletion via WebSocket before deleting
|
||||||
|
refereeWebSocketController?.broadcastRefereeUpdate(referee, RefereeUpdateMessage.UpdateType.REFEREE_DELETE)
|
||||||
|
|
||||||
|
refereeRepository.deleteById(id)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,120 @@
|
||||||
|
# WebSocket Implementation for FencerJudge
|
||||||
|
|
||||||
|
This document explains how to use the WebSocket functionality in the FencerJudge application for real-time match updates.
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
The WebSocket implementation allows for real-time updates of match information, including:
|
||||||
|
- Match creation
|
||||||
|
- Score updates
|
||||||
|
- Match completion
|
||||||
|
- Match cancellation
|
||||||
|
|
||||||
|
## WebSocket Endpoints
|
||||||
|
|
||||||
|
### Connection Endpoint
|
||||||
|
```
|
||||||
|
ws://localhost:8080/ws
|
||||||
|
```
|
||||||
|
|
||||||
|
The WebSocket endpoint supports SockJS for fallback in browsers that don't support WebSockets natively.
|
||||||
|
|
||||||
|
## Message Topics
|
||||||
|
|
||||||
|
### Subscribe to Match Updates
|
||||||
|
To receive real-time match updates, subscribe to:
|
||||||
|
```
|
||||||
|
/topic/match.updates
|
||||||
|
```
|
||||||
|
|
||||||
|
### Send Match Updates
|
||||||
|
To send match updates from the client to the server:
|
||||||
|
```
|
||||||
|
/app/match.update
|
||||||
|
```
|
||||||
|
|
||||||
|
## Message Format
|
||||||
|
|
||||||
|
Match update messages use the following JSON format:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"matchId": 1,
|
||||||
|
"player1Id": 101,
|
||||||
|
"player2Id": 102,
|
||||||
|
"refereeId": 201,
|
||||||
|
"score1": 5,
|
||||||
|
"score2": 3,
|
||||||
|
"date": "2023-06-01",
|
||||||
|
"type": "SCORE_UPDATE"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
The `type` field can have the following values:
|
||||||
|
- `SCORE_UPDATE`: When a match score is updated
|
||||||
|
- `MATCH_START`: When a new match is created
|
||||||
|
- `MATCH_END`: When a match is completed
|
||||||
|
- `MATCH_CANCEL`: When a match is cancelled
|
||||||
|
|
||||||
|
## Integration with REST API
|
||||||
|
|
||||||
|
The WebSocket functionality is integrated with the REST API. Any changes made through the REST endpoints will automatically trigger WebSocket messages to all connected clients.
|
||||||
|
|
||||||
|
REST endpoints:
|
||||||
|
- `GET /api/matches`: Get all matches
|
||||||
|
- `GET /api/matches/{id}`: Get a match by ID
|
||||||
|
- `POST /api/matches`: Create a new match (triggers MATCH_START WebSocket message)
|
||||||
|
- `PUT /api/matches/{id}`: Update a match (triggers SCORE_UPDATE WebSocket message)
|
||||||
|
- `PATCH /api/matches/{id}/score`: Update just the score (triggers SCORE_UPDATE WebSocket message)
|
||||||
|
- `DELETE /api/matches/{id}`: Delete a match (triggers MATCH_CANCEL WebSocket message)
|
||||||
|
|
||||||
|
## Client-Side Example (JavaScript)
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
// Using SockJS and STOMP client
|
||||||
|
import SockJS from 'sockjs-client';
|
||||||
|
import { Client } from '@stomp/stompjs';
|
||||||
|
|
||||||
|
// Create a new STOMP client
|
||||||
|
const socket = new SockJS('http://localhost:8080/ws');
|
||||||
|
const stompClient = new Client({
|
||||||
|
webSocketFactory: () => socket,
|
||||||
|
debug: (str) => console.log(str)
|
||||||
|
});
|
||||||
|
|
||||||
|
// Connect to the WebSocket server
|
||||||
|
stompClient.activate();
|
||||||
|
|
||||||
|
// Subscribe to match updates
|
||||||
|
stompClient.onConnect = (frame) => {
|
||||||
|
console.log('Connected to WebSocket');
|
||||||
|
|
||||||
|
// Subscribe to match updates
|
||||||
|
stompClient.subscribe('/topic/match.updates', (message) => {
|
||||||
|
const matchUpdate = JSON.parse(message.body);
|
||||||
|
console.log('Received match update:', matchUpdate);
|
||||||
|
|
||||||
|
// Handle the update in your application
|
||||||
|
// e.g., update UI, play sound, etc.
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
// Send a match update (e.g., when a referee updates a score)
|
||||||
|
function sendMatchUpdate(matchId, score1, score2) {
|
||||||
|
if (stompClient.connected) {
|
||||||
|
stompClient.publish({
|
||||||
|
destination: '/app/match.update',
|
||||||
|
body: JSON.stringify({
|
||||||
|
matchId: matchId,
|
||||||
|
score1: score1,
|
||||||
|
score2: score2,
|
||||||
|
type: 'SCORE_UPDATE'
|
||||||
|
})
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Security Considerations
|
||||||
|
|
||||||
|
The WebSocket endpoint is currently configured to allow connections from any origin (`*`). For production environments, this should be restricted to specific allowed origins.
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.websocket
|
||||||
|
|
||||||
|
import org.springframework.messaging.handler.annotation.MessageMapping
|
||||||
|
import org.springframework.messaging.simp.SimpMessagingTemplate
|
||||||
|
import org.springframework.stereotype.Controller
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping
|
||||||
|
|
||||||
|
data class Data(val id: String, val value: Any)
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
@RequestMapping("/ws")
|
||||||
|
class WebSocketController(private val messagingTemplate: SimpMessagingTemplate) {
|
||||||
|
|
||||||
|
// Insérer une donnée dans le channel
|
||||||
|
@MessageMapping("/insert")
|
||||||
|
fun insertData(data: Data) {
|
||||||
|
// Logique d'insertion
|
||||||
|
messagingTemplate.convertAndSend("/topic/data", data)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Modifier une donnée existente dans le channel
|
||||||
|
@MessageMapping("/modify")
|
||||||
|
fun modifyData(data: Data) {
|
||||||
|
// Logique de modification
|
||||||
|
messagingTemplate.convertAndSend("/topic/data", data)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Supprimer une donnée existante dans le channel
|
||||||
|
@MessageMapping("/delete")
|
||||||
|
fun deleteData(id: String) {
|
||||||
|
// Logique de suppression
|
||||||
|
messagingTemplate.convertAndSend("/topic/data/delete", id)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Vider le channel
|
||||||
|
@MessageMapping("/clear")
|
||||||
|
fun clearChannel() {
|
||||||
|
// Logique pour vider le channel
|
||||||
|
messagingTemplate.convertAndSend("/topic/data/clear", null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,118 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.websocket.controllers
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.config.CHANNEL_MATCH_NAME
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.MatchBean
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.MatchUpdateBean
|
||||||
|
import fr.teamflash.fencerjudgeback.services.MatchService
|
||||||
|
import fr.teamflash.fencerjudgeback.websocket.models.MatchUpdateMessage
|
||||||
|
import org.springframework.context.event.EventListener
|
||||||
|
import org.springframework.messaging.handler.annotation.MessageMapping
|
||||||
|
import org.springframework.messaging.simp.SimpMessagingTemplate
|
||||||
|
import org.springframework.messaging.simp.stomp.StompHeaderAccessor
|
||||||
|
import org.springframework.stereotype.Controller
|
||||||
|
import org.springframework.web.socket.messaging.SessionSubscribeEvent
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
class MatchWebSocketController(
|
||||||
|
private val matchService: MatchService,
|
||||||
|
private val messagingTemplate: SimpMessagingTemplate
|
||||||
|
) {
|
||||||
|
|
||||||
|
private var mainId:Long? = 1
|
||||||
|
private val messageHistory = ArrayList<MatchBean>()
|
||||||
|
|
||||||
|
@MessageMapping("/all")
|
||||||
|
fun receiveMessage(message: MatchBean) {
|
||||||
|
println("/ws/matches $message")
|
||||||
|
messageHistory.add(message)
|
||||||
|
|
||||||
|
// Envoyer la liste des messages sur le channel
|
||||||
|
//Si la variable est dans le même package il faut enlever WebSocketConfig.
|
||||||
|
messagingTemplate.convertAndSend(CHANNEL_MATCH_NAME, messageHistory)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle match update requests from clients
|
||||||
|
* Client sends to: /app/match.update
|
||||||
|
* Server broadcasts to: /topic/match.updates
|
||||||
|
*/
|
||||||
|
@MessageMapping("/update")
|
||||||
|
fun handleMatchUpdate(matchUpdateMessage: MatchUpdateMessage): MatchUpdateMessage {
|
||||||
|
// Create a MatchBean from the update message
|
||||||
|
val matchBean = MatchBean(
|
||||||
|
id = matchUpdateMessage.matchId,
|
||||||
|
player1ID = matchUpdateMessage.player1Id,
|
||||||
|
player2ID = matchUpdateMessage.player2Id,
|
||||||
|
refereeID = matchUpdateMessage.refereeId,
|
||||||
|
score1 = matchUpdateMessage.score1,
|
||||||
|
score2 = matchUpdateMessage.score2,
|
||||||
|
date = matchUpdateMessage.date
|
||||||
|
)
|
||||||
|
|
||||||
|
// Update the match in the database
|
||||||
|
matchService.updateMatch(matchBean.id, matchBean)
|
||||||
|
|
||||||
|
// Return the update message to be broadcast to all subscribers
|
||||||
|
return matchUpdateMessage
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Broadcast a match update to all connected clients
|
||||||
|
* This method can be called from other services
|
||||||
|
*/
|
||||||
|
fun broadcastMatchUpdate(matchBean: MatchBean, type: MatchUpdateMessage.UpdateType = MatchUpdateMessage.UpdateType.SCORE_UPDATE) {
|
||||||
|
val updateMessage = MatchUpdateMessage.fromMatchBean(matchBean, type)
|
||||||
|
messagingTemplate.convertAndSend("/topic/match.updates", updateMessage)
|
||||||
|
}
|
||||||
|
|
||||||
|
//A mettre dans le controller
|
||||||
|
@EventListener
|
||||||
|
fun handleWebSocketSubscribeListener(event: SessionSubscribeEvent) {
|
||||||
|
val headerAccessor = StompHeaderAccessor.wrap(event.message)
|
||||||
|
if (CHANNEL_MATCH_NAME == headerAccessor.destination) {
|
||||||
|
messagingTemplate.convertAndSend(CHANNEL_MATCH_NAME, messageHistory)
|
||||||
|
println("Lancement du WebSocket")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@MessageMapping("/plusPoint")
|
||||||
|
fun addPoint(matchUpdateBean: MatchUpdateBean) {
|
||||||
|
val playerId = matchUpdateBean.playerId
|
||||||
|
val match = matchUpdateBean.match
|
||||||
|
print("plus")
|
||||||
|
if (match != null) {
|
||||||
|
print("minus")
|
||||||
|
when (playerId) {
|
||||||
|
match.player1ID -> if (match.score1 > 0) match.score1 -= 1
|
||||||
|
match.player2ID -> if (match.score2 > 0) match.score2 -= 1
|
||||||
|
}
|
||||||
|
matchService.updateMatch(match.id, match)
|
||||||
|
broadcastMatchUpdate(match)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@MessageMapping("/minusPoint")
|
||||||
|
fun minusPoint(matchUpdateBean: MatchUpdateBean) {
|
||||||
|
val playerId = matchUpdateBean.playerId
|
||||||
|
val match = matchUpdateBean.match
|
||||||
|
print("minus")
|
||||||
|
if (match != null) {
|
||||||
|
when (playerId) {
|
||||||
|
match.player1ID -> if (match.score1 > 0) match.score1 -= 1
|
||||||
|
match.player2ID -> if (match.score2 > 0) match.score2 -= 1
|
||||||
|
}
|
||||||
|
matchService.updateMatch(match.id, match)
|
||||||
|
broadcastMatchUpdate(match)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@MessageMapping("/add")
|
||||||
|
fun addMatchtoMainList(match:MatchBean) {
|
||||||
|
match.id = mainId;
|
||||||
|
matchService.createMatch(match)
|
||||||
|
messageHistory.add(match)
|
||||||
|
broadcastMatchUpdate(match, MatchUpdateMessage.UpdateType.NEW_MATCH)
|
||||||
|
mainId = mainId?.plus(1)
|
||||||
|
println("Ajout du match $match.id en bdd")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,69 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.websocket.controllers
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.PlayerBean
|
||||||
|
import fr.teamflash.fencerjudgeback.services.PlayerService
|
||||||
|
import fr.teamflash.fencerjudgeback.websocket.models.PlayerUpdateMessage
|
||||||
|
import org.springframework.context.event.EventListener
|
||||||
|
import org.springframework.messaging.handler.annotation.MessageMapping
|
||||||
|
import org.springframework.messaging.handler.annotation.SendTo
|
||||||
|
import org.springframework.messaging.simp.SimpMessagingTemplate
|
||||||
|
import org.springframework.messaging.simp.stomp.StompHeaderAccessor
|
||||||
|
import org.springframework.stereotype.Controller
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping
|
||||||
|
import org.springframework.web.socket.messaging.SessionSubscribeEvent
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
@RequestMapping("/ws")
|
||||||
|
class PlayerWebSocketController(
|
||||||
|
private val playerService: PlayerService,
|
||||||
|
private val messagingTemplate: SimpMessagingTemplate
|
||||||
|
) {
|
||||||
|
|
||||||
|
@MessageMapping("/player.update")
|
||||||
|
@SendTo("/topic/player.updates")
|
||||||
|
fun handlePlayerUpdate(playerUpdateMessage: PlayerUpdateMessage): PlayerUpdateMessage {
|
||||||
|
// Create a PlayerBean from the update message
|
||||||
|
val playerBean = PlayerBean(
|
||||||
|
id = playerUpdateMessage.playerId,
|
||||||
|
name = playerUpdateMessage.name,
|
||||||
|
firstName = playerUpdateMessage.firstName,
|
||||||
|
club = playerUpdateMessage.club
|
||||||
|
)
|
||||||
|
|
||||||
|
// Update the player in the database
|
||||||
|
playerService.updatePlayer(playerBean.id ?: 0, playerBean)
|
||||||
|
|
||||||
|
// Return the update message to be broadcast to all subscribers
|
||||||
|
return playerUpdateMessage
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Broadcast a player update to all connected clients
|
||||||
|
* This method can be called from other services
|
||||||
|
*/
|
||||||
|
fun broadcastPlayerUpdate(playerBean: PlayerBean, type: PlayerUpdateMessage.UpdateType = PlayerUpdateMessage.UpdateType.PLAYER_UPDATE) {
|
||||||
|
val updateMessage = PlayerUpdateMessage.fromPlayerBean(playerBean, type)
|
||||||
|
messagingTemplate.convertAndSend("/topic/player.updates", updateMessage)
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventListener
|
||||||
|
fun handleWebSocketSubscribeListener(event: SessionSubscribeEvent) {
|
||||||
|
val headerAccessor = StompHeaderAccessor.wrap(event.message)
|
||||||
|
if ("/topic/player.updates" == headerAccessor.destination) {
|
||||||
|
// When a client subscribes, send them the current players
|
||||||
|
val players = playerService.getAll()
|
||||||
|
players.forEach { player ->
|
||||||
|
messagingTemplate.convertAndSend(
|
||||||
|
"/topic/player.updates",
|
||||||
|
PlayerUpdateMessage.fromPlayerBean(player, PlayerUpdateMessage.UpdateType.PLAYER_UPDATE)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@MessageMapping
|
||||||
|
fun addPlayerToMainList(playerBean: PlayerBean) {
|
||||||
|
playerService.createPlayer(playerBean)
|
||||||
|
broadcastPlayerUpdate(playerBean, PlayerUpdateMessage.UpdateType.PLAYER_CREATE)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,66 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.websocket.controllers
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.config.CHANNEL_MATCH_NAME
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.RefereeBean
|
||||||
|
import fr.teamflash.fencerjudgeback.services.RefereeService
|
||||||
|
import fr.teamflash.fencerjudgeback.websocket.models.RefereeUpdateMessage
|
||||||
|
import org.springframework.context.event.EventListener
|
||||||
|
import org.springframework.messaging.handler.annotation.MessageMapping
|
||||||
|
import org.springframework.messaging.handler.annotation.SendTo
|
||||||
|
import org.springframework.messaging.simp.SimpMessagingTemplate
|
||||||
|
import org.springframework.messaging.simp.stomp.StompHeaderAccessor
|
||||||
|
import org.springframework.stereotype.Controller
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping
|
||||||
|
import org.springframework.web.socket.messaging.SessionSubscribeEvent
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
@RequestMapping("/ws")
|
||||||
|
class RefereeWebSocketController(
|
||||||
|
private val refereeService: RefereeService,
|
||||||
|
private val messagingTemplate: SimpMessagingTemplate
|
||||||
|
) {
|
||||||
|
|
||||||
|
private val messageHistory = ArrayList<RefereeBean>()
|
||||||
|
|
||||||
|
@MessageMapping("/referee.update")
|
||||||
|
@SendTo("/topic/referee.updates")
|
||||||
|
fun handleRefereeUpdate(refereeUpdateMessage: RefereeUpdateMessage): RefereeUpdateMessage {
|
||||||
|
// Create a RefereeBean from the update message
|
||||||
|
val refereeBean = RefereeBean(
|
||||||
|
id = refereeUpdateMessage.refereeId,
|
||||||
|
name = refereeUpdateMessage.name,
|
||||||
|
firstName = refereeUpdateMessage.firstName,
|
||||||
|
level = refereeUpdateMessage.level
|
||||||
|
)
|
||||||
|
|
||||||
|
// Update the referee in the database
|
||||||
|
refereeService.updateReferee(refereeBean.id ?: 0, refereeBean)
|
||||||
|
|
||||||
|
// Return the update message to be broadcast to all subscribers
|
||||||
|
return refereeUpdateMessage
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Broadcast a referee update to all connected clients
|
||||||
|
* This method can be called from other services
|
||||||
|
*/
|
||||||
|
fun broadcastRefereeUpdate(refereeBean: RefereeBean, type: RefereeUpdateMessage.UpdateType = RefereeUpdateMessage.UpdateType.REFEREE_UPDATE) {
|
||||||
|
val updateMessage = RefereeUpdateMessage.fromRefereeBean(refereeBean, type)
|
||||||
|
messagingTemplate.convertAndSend("/topic/referee.updates", updateMessage)
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventListener
|
||||||
|
fun handleWebSocketSubscribeListener(event: SessionSubscribeEvent) {
|
||||||
|
val headerAccessor = StompHeaderAccessor.wrap(event.message)
|
||||||
|
if ("/topic/referee.updates" == headerAccessor.destination) {
|
||||||
|
// When a client subscribes, send them the current referees
|
||||||
|
val referees = refereeService.getAll()
|
||||||
|
referees.forEach { referee ->
|
||||||
|
messagingTemplate.convertAndSend(
|
||||||
|
"/topic/referee.updates",
|
||||||
|
RefereeUpdateMessage.fromRefereeBean(referee, RefereeUpdateMessage.UpdateType.REFEREE_UPDATE)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,44 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.websocket.models
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.MatchBean
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Message model for match updates sent through WebSocket
|
||||||
|
*/
|
||||||
|
data class MatchUpdateMessage(
|
||||||
|
val matchId: Long,
|
||||||
|
val player1Id: Long?,
|
||||||
|
val player2Id: Long?,
|
||||||
|
val refereeId: Long?,
|
||||||
|
val score1: Int,
|
||||||
|
val score2: Int,
|
||||||
|
val date: Date?,
|
||||||
|
val type: UpdateType = UpdateType.SCORE_UPDATE
|
||||||
|
) {
|
||||||
|
enum class UpdateType {
|
||||||
|
SCORE_UPDATE,
|
||||||
|
MATCH_START,
|
||||||
|
MATCH_END,
|
||||||
|
MATCH_CANCEL,
|
||||||
|
NEW_MATCH,
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
/**
|
||||||
|
* Create a MatchUpdateMessage from a MatchBean
|
||||||
|
*/
|
||||||
|
fun fromMatchBean(matchBean: MatchBean, type: UpdateType = UpdateType.SCORE_UPDATE): MatchUpdateMessage {
|
||||||
|
return MatchUpdateMessage(
|
||||||
|
matchId = matchBean.id ?: 0,
|
||||||
|
player1Id = matchBean.player1ID,
|
||||||
|
player2Id = matchBean.player2ID,
|
||||||
|
refereeId = matchBean.refereeID,
|
||||||
|
score1 = matchBean.score1,
|
||||||
|
score2 = matchBean.score2,
|
||||||
|
date = matchBean.date,
|
||||||
|
type = type
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,35 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.websocket.models
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.PlayerBean
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Message model for player updates sent through WebSocket
|
||||||
|
*/
|
||||||
|
data class PlayerUpdateMessage(
|
||||||
|
val playerId: Long,
|
||||||
|
val name: String?,
|
||||||
|
val firstName: String?,
|
||||||
|
val club: String?,
|
||||||
|
val type: UpdateType = UpdateType.PLAYER_UPDATE
|
||||||
|
) {
|
||||||
|
enum class UpdateType {
|
||||||
|
PLAYER_UPDATE,
|
||||||
|
PLAYER_CREATE,
|
||||||
|
PLAYER_DELETE
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
/**
|
||||||
|
* Create a PlayerUpdateMessage from a PlayerBean
|
||||||
|
*/
|
||||||
|
fun fromPlayerBean(playerBean: PlayerBean, type: UpdateType = UpdateType.PLAYER_UPDATE): PlayerUpdateMessage {
|
||||||
|
return PlayerUpdateMessage(
|
||||||
|
playerId = playerBean.id ?: 0,
|
||||||
|
name = playerBean.name,
|
||||||
|
firstName = playerBean.firstName,
|
||||||
|
club = playerBean.club,
|
||||||
|
type = type
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
package fr.teamflash.fencerjudgeback.websocket.models
|
||||||
|
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.RefereeBean
|
||||||
|
import fr.teamflash.fencerjudgeback.entities.RefereeLevel
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Message model for referee updates sent through WebSocket
|
||||||
|
*/
|
||||||
|
data class RefereeUpdateMessage(
|
||||||
|
val refereeId: Long,
|
||||||
|
val name: String?,
|
||||||
|
val firstName: String?,
|
||||||
|
val level: RefereeLevel?,
|
||||||
|
val type: UpdateType = UpdateType.REFEREE_UPDATE
|
||||||
|
) {
|
||||||
|
enum class UpdateType {
|
||||||
|
REFEREE_UPDATE,
|
||||||
|
REFEREE_CREATE,
|
||||||
|
REFEREE_DELETE
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
/**
|
||||||
|
* Create a RefereeUpdateMessage from a RefereeBean
|
||||||
|
*/
|
||||||
|
fun fromRefereeBean(refereeBean: RefereeBean, type: UpdateType = UpdateType.REFEREE_UPDATE): RefereeUpdateMessage {
|
||||||
|
return RefereeUpdateMessage(
|
||||||
|
refereeId = refereeBean.id ?: 0,
|
||||||
|
name = refereeBean.name,
|
||||||
|
firstName = refereeBean.firstName,
|
||||||
|
level = refereeBean.level,
|
||||||
|
type = type
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1 +1,16 @@
|
||||||
spring.application.name=FencerJudgeBack
|
spring.application.name=FencerJudgeBack
|
||||||
|
|
||||||
|
# H2 Database Configuration
|
||||||
|
spring.datasource.url=jdbc:h2:file:./db;AUTO_SERVER=true
|
||||||
|
spring.datasource.driverClassName=org.h2.Driver
|
||||||
|
spring.datasource.username=sa
|
||||||
|
spring.datasource.password=password
|
||||||
|
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
|
||||||
|
|
||||||
|
# Enable H2 Console
|
||||||
|
spring.h2.console.enabled=true
|
||||||
|
spring.h2.console.path=/h2-console
|
||||||
|
|
||||||
|
# Hibernate Configuration
|
||||||
|
spring.jpa.hibernate.ddl-auto=update
|
||||||
|
spring.jpa.show-sql=true
|
||||||
|
|
@ -0,0 +1,87 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="fr">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<title>Test WebSocket Match</title>
|
||||||
|
<style>
|
||||||
|
#messageArea {
|
||||||
|
width: 100%;
|
||||||
|
height: 300px;
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
overflow-y: auto;
|
||||||
|
padding: 10px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
font-family: monospace;
|
||||||
|
}
|
||||||
|
input, button {
|
||||||
|
padding: 8px;
|
||||||
|
margin: 4px;
|
||||||
|
}
|
||||||
|
.input-group {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<h2>Test WebSocket Match</h2>
|
||||||
|
|
||||||
|
<div id="messageArea">Connexion...</div>
|
||||||
|
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="number" id="player1Id" placeholder="Joueur 1 ID" value="2">
|
||||||
|
<input type="number" id="player2Id" placeholder="Joueur 2 ID" value="2">
|
||||||
|
<input type="number" id="refereeId" placeholder="Arbitre ID" value="2">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="number" id="score1" placeholder="Score Joueur 1" value="2">
|
||||||
|
<input type="number" id="score2" placeholder="Score Joueur 2" value="14">
|
||||||
|
<input type="datetime-local" id="matchDate">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button onclick="sendMatch()">Envoyer Match</button>
|
||||||
|
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/sockjs-client/dist/sockjs.min.js"></script>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/stomp.js/2.3.3/stomp.min.js"></script>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
const stompClient = Stomp.over(new SockJS('/ws/matches-app'));
|
||||||
|
const channel = "/ws/topic/match";
|
||||||
|
|
||||||
|
stompClient.connect({}, function () {
|
||||||
|
stompClient.subscribe(channel, function (message) {
|
||||||
|
const msg = JSON.parse(message.body);
|
||||||
|
console.log("Match reçu :", msg);
|
||||||
|
displayMessage(msg);
|
||||||
|
});
|
||||||
|
document.getElementById('messageArea').textContent = 'Connecté au WebSocket';
|
||||||
|
}, function (error) {
|
||||||
|
document.getElementById('messageArea').textContent = 'Erreur WebSocket : ' + error;
|
||||||
|
});
|
||||||
|
|
||||||
|
function sendMatch() {
|
||||||
|
const match = {
|
||||||
|
player1ID: parseInt(document.getElementById("player1Id").value),
|
||||||
|
player2ID: parseInt(document.getElementById("player2Id").value),
|
||||||
|
refereeID: parseInt(document.getElementById("refereeId").value),
|
||||||
|
score1: parseInt(document.getElementById("score1").value),
|
||||||
|
score2: parseInt(document.getElementById("score2").value),
|
||||||
|
date: document.getElementById("matchDate").value
|
||||||
|
};
|
||||||
|
|
||||||
|
stompClient.send("/ws/add", {}, JSON.stringify(match));
|
||||||
|
|
||||||
|
displayMessage(match)
|
||||||
|
}
|
||||||
|
|
||||||
|
function displayMessage(match) {
|
||||||
|
const area = document.getElementById("messageArea");
|
||||||
|
const div = document.createElement("div");
|
||||||
|
div.textContent = `Match ${match.id}: ${match.player1Id} (${match.score1}) vs ${match.player2Id} (${match.score2})`;
|
||||||
|
area.appendChild(div);
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -0,0 +1,91 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="fr">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<title>Test WebSocket Match</title>
|
||||||
|
<style>
|
||||||
|
#messageArea {
|
||||||
|
width: 100%;
|
||||||
|
height: 300px;
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
overflow-y: auto;
|
||||||
|
padding: 10px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
font-family: monospace;
|
||||||
|
}
|
||||||
|
input, button {
|
||||||
|
padding: 8px;
|
||||||
|
margin: 4px;
|
||||||
|
}
|
||||||
|
.input-group {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<h2>Test WebSocket Match</h2>
|
||||||
|
|
||||||
|
<div id="messageArea">Connexion...</div>
|
||||||
|
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="number" id="player1Id" placeholder="Joueur 1 ID" value="2">
|
||||||
|
<input type="number" id="player2Id" placeholder="Joueur 2 ID" value="2">
|
||||||
|
<input type="number" id="refereeId" placeholder="Arbitre ID" value="2">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="number" id="score1" placeholder="Score Joueur 1" value="2">
|
||||||
|
<input type="number" id="score2" placeholder="Score Joueur 2" value="14">
|
||||||
|
<input type="datetime-local" id="matchDate">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button onclick="sendMatch()">Envoyer Match</button>
|
||||||
|
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/sockjs-client/dist/sockjs.min.js"></script>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/stomp.js/2.3.3/stomp.min.js"></script>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
const stompClient = Stomp.over(new SockJS('/ws/matches-app'));
|
||||||
|
const channel = "/ws/topic/match";
|
||||||
|
|
||||||
|
stompClient.connect({}, function () {
|
||||||
|
stompClient.subscribe(channel, function (message) {
|
||||||
|
const msg = JSON.parse(message.body);
|
||||||
|
console.log("Match reçu :", msg);
|
||||||
|
displayMessage(msg);
|
||||||
|
});
|
||||||
|
document.getElementById('messageArea').textContent = 'Connecté au WebSocket';
|
||||||
|
}, function (error) {
|
||||||
|
document.getElementById('messageArea').textContent = 'Erreur WebSocket : ' + error;
|
||||||
|
});
|
||||||
|
|
||||||
|
function sendMatch() {
|
||||||
|
const match = {
|
||||||
|
id: 1,
|
||||||
|
player1ID: parseInt(document.getElementById("player1Id").value),
|
||||||
|
player2ID: parseInt(document.getElementById("player2Id").value),
|
||||||
|
refereeID: parseInt(document.getElementById("refereeId").value),
|
||||||
|
score1: parseInt(document.getElementById("score1").value),
|
||||||
|
score2: parseInt(document.getElementById("score2").value),
|
||||||
|
date: document.getElementById("matchDate").value
|
||||||
|
};
|
||||||
|
|
||||||
|
stompClient.send("/ws/plusPoint", {}, JSON.stringify({
|
||||||
|
match: match,
|
||||||
|
playerId: match.player1Id
|
||||||
|
}));
|
||||||
|
|
||||||
|
displayMessage(match)
|
||||||
|
}
|
||||||
|
|
||||||
|
function displayMessage(match) {
|
||||||
|
const area = document.getElementById("messageArea");
|
||||||
|
const div = document.createElement("div");
|
||||||
|
div.textContent = `Match ${match.id}: ${match.player1Id} (${match.score1}) vs ${match.player2Id} (${match.score2})`;
|
||||||
|
area.appendChild(div);
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
138
FencerJudgeBack/test.http
Normal file
138
FencerJudgeBack/test.http
Normal file
|
|
@ -0,0 +1,138 @@
|
||||||
|
### Get all matches
|
||||||
|
GET http://localhost:8080/matches/
|
||||||
|
|
||||||
|
### Get matches by players
|
||||||
|
GET http://localhost:8080/matches/players/1/2
|
||||||
|
|
||||||
|
### Get matches by date
|
||||||
|
GET http://localhost:8080/matches/date/2025-06-02
|
||||||
|
|
||||||
|
### Get matches by country
|
||||||
|
GET http://localhost:8080/matches/country/France
|
||||||
|
|
||||||
|
### Get matches by city
|
||||||
|
GET http://localhost:8080/matches/city/Paris
|
||||||
|
|
||||||
|
### Get active matches
|
||||||
|
GET http://localhost:8080/matches/active
|
||||||
|
|
||||||
|
### Get finished matches
|
||||||
|
GET http://localhost:8080/matches/over
|
||||||
|
|
||||||
|
### Get not started matches
|
||||||
|
GET http://localhost:8080/matches/not-started
|
||||||
|
|
||||||
|
### Get match by ID
|
||||||
|
GET http://localhost:8080/matches/2
|
||||||
|
|
||||||
|
### Create new match
|
||||||
|
POST http://localhost:8080/matches/create-match
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"weapon": "Épée",
|
||||||
|
"country": "France",
|
||||||
|
"city": "Paris",
|
||||||
|
"player1ID": 1,
|
||||||
|
"player2ID": 2,
|
||||||
|
"refereeID": 1,
|
||||||
|
"score1": 0,
|
||||||
|
"score2": 0,
|
||||||
|
"date": "2025-06-02",
|
||||||
|
"state": 0
|
||||||
|
}
|
||||||
|
|
||||||
|
### Update match
|
||||||
|
PUT http://localhost:8080/matches/update-match/4
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
"weapon": "Épée",
|
||||||
|
"country": "France",
|
||||||
|
"city": "Paris",
|
||||||
|
"player1ID": 1,
|
||||||
|
"player2ID": 2,
|
||||||
|
"refereeID": 1,
|
||||||
|
"score1": 5,
|
||||||
|
"score2": 3,
|
||||||
|
"date": "2025-06-02",
|
||||||
|
"state": 1
|
||||||
|
}
|
||||||
|
|
||||||
|
### Delete match
|
||||||
|
DELETE http://localhost:8080/matches/delete-match/3
|
||||||
|
|
||||||
|
### Get all referees
|
||||||
|
GET http://localhost:8080/referees/
|
||||||
|
|
||||||
|
### Get referee by ID
|
||||||
|
GET http://localhost:8080/referees/1
|
||||||
|
|
||||||
|
### Get referees by name
|
||||||
|
GET http://localhost:8080/referees/name/Smith
|
||||||
|
|
||||||
|
### Get referees by firstname
|
||||||
|
GET http://localhost:8080/referees/firstname/John
|
||||||
|
|
||||||
|
### Get referees by qualification
|
||||||
|
GET http://localhost:8080/referees/qualification/NATIONAL
|
||||||
|
|
||||||
|
### Create new referee
|
||||||
|
POST http://localhost:8080/referees/create-referee
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Smith",
|
||||||
|
"firstName": "John",
|
||||||
|
"level": 1
|
||||||
|
}
|
||||||
|
|
||||||
|
### Update referee
|
||||||
|
PUT http://localhost:8080/referees/update-referee/6
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Smith",
|
||||||
|
"firstName": "John",
|
||||||
|
"level": "INTERNATIONAL"
|
||||||
|
}
|
||||||
|
|
||||||
|
### Delete referee
|
||||||
|
DELETE http://localhost:8080/referees/delete-referee/5
|
||||||
|
|
||||||
|
### Get all players
|
||||||
|
GET http://localhost:8080/players/
|
||||||
|
|
||||||
|
### Get player by ID
|
||||||
|
GET http://localhost:8080/players/10
|
||||||
|
|
||||||
|
### Get players by name
|
||||||
|
GET http://localhost:8080/players/name/Doe
|
||||||
|
|
||||||
|
### Get players by firstname
|
||||||
|
GET http://localhost:8080/players/firstname/Jane
|
||||||
|
|
||||||
|
### Create new player
|
||||||
|
POST http://localhost:8080/players/create-player
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Doe",
|
||||||
|
"firstName": "Jane",
|
||||||
|
"club": "Paris Escrime Club"
|
||||||
|
}
|
||||||
|
|
||||||
|
### Update player
|
||||||
|
PUT http://localhost:8080/players/update-player/10
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Doe",
|
||||||
|
"firstName": "Jane",
|
||||||
|
"club": "Un autre club"
|
||||||
|
}
|
||||||
|
|
||||||
|
### Delete player
|
||||||
|
DELETE http://localhost:8080/players/delete-player/10
|
||||||
|
|
||||||
|
|
@ -10,7 +10,7 @@ To start a local development server, run:
|
||||||
ng serve
|
ng serve
|
||||||
```
|
```
|
||||||
|
|
||||||
Once the server is running, open your browser and navigate to `http://localhost:4200/`. The application will automatically reload whenever you modify any of the source files.
|
Once the server is running, open your browser and navigate to `http://localhost/`. The application will automatically reload whenever you modify any of the source files.
|
||||||
|
|
||||||
## Code scaffolding
|
## Code scaffolding
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,10 +34,13 @@
|
||||||
{
|
{
|
||||||
"glob": "**/*",
|
"glob": "**/*",
|
||||||
"input": "public"
|
"input": "public"
|
||||||
}
|
},
|
||||||
|
"src/assets/"
|
||||||
],
|
],
|
||||||
"styles": [
|
"styles": [
|
||||||
"src/styles.css"
|
"src/styles.css",
|
||||||
|
"node_modules/bootstrap/dist/css/bootstrap.min.css",
|
||||||
|
"node_modules/bootstrap-icons/font/bootstrap-icons.css"
|
||||||
],
|
],
|
||||||
"scripts": []
|
"scripts": []
|
||||||
},
|
},
|
||||||
|
|
@ -66,6 +69,9 @@
|
||||||
"defaultConfiguration": "production"
|
"defaultConfiguration": "production"
|
||||||
},
|
},
|
||||||
"serve": {
|
"serve": {
|
||||||
|
"options": {
|
||||||
|
"port": 80
|
||||||
|
},
|
||||||
"builder": "@angular-devkit/build-angular:dev-server",
|
"builder": "@angular-devkit/build-angular:dev-server",
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"production": {
|
"production": {
|
||||||
|
|
@ -102,5 +108,8 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"cli": {
|
||||||
|
"analytics": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
56
FencerJudgeFront/package-lock.json
generated
56
FencerJudgeFront/package-lock.json
generated
|
|
@ -16,6 +16,9 @@
|
||||||
"@angular/platform-browser": "^19.1.0",
|
"@angular/platform-browser": "^19.1.0",
|
||||||
"@angular/platform-browser-dynamic": "^19.1.0",
|
"@angular/platform-browser-dynamic": "^19.1.0",
|
||||||
"@angular/router": "^19.1.0",
|
"@angular/router": "^19.1.0",
|
||||||
|
"boostrap": "^2.0.0",
|
||||||
|
"bootstrap": "^5.3.5",
|
||||||
|
"bootstrap-icons": "^1.11.3",
|
||||||
"rxjs": "~7.8.0",
|
"rxjs": "~7.8.0",
|
||||||
"tslib": "^2.3.0",
|
"tslib": "^2.3.0",
|
||||||
"zone.js": "~0.15.0"
|
"zone.js": "~0.15.0"
|
||||||
|
|
@ -4530,6 +4533,17 @@
|
||||||
"node": ">=14"
|
"node": ">=14"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@popperjs/core": {
|
||||||
|
"version": "2.11.8",
|
||||||
|
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
|
||||||
|
"integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
|
||||||
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
|
"funding": {
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/popperjs"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@rollup/rollup-android-arm-eabi": {
|
"node_modules/@rollup/rollup-android-arm-eabi": {
|
||||||
"version": "4.34.8",
|
"version": "4.34.8",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.8.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.8.tgz",
|
||||||
|
|
@ -5921,6 +5935,48 @@
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
|
"node_modules/boostrap": {
|
||||||
|
"version": "2.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/boostrap/-/boostrap-2.0.0.tgz",
|
||||||
|
"integrity": "sha512-JEeFMOweKeGXEM9rt95eaVISOkluG9aKcl0jQCETOVH9jynCZxuBZe2oWgcWJpj5wqYWZl625SnW7OgHT2Ineg==",
|
||||||
|
"deprecated": "Package no longer supported. Contact support@npmjs.com for more info.",
|
||||||
|
"license": "ISC"
|
||||||
|
},
|
||||||
|
"node_modules/bootstrap": {
|
||||||
|
"version": "5.3.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.5.tgz",
|
||||||
|
"integrity": "sha512-ct1CHKtiobRimyGzmsSldEtM03E8fcEX4Tb3dGXz1V8faRwM50+vfHwTzOxB3IlKO7m+9vTH3s/3C6T2EAPeTA==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/twbs"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/bootstrap"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"peerDependencies": {
|
||||||
|
"@popperjs/core": "^2.11.8"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/bootstrap-icons": {
|
||||||
|
"version": "1.11.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz",
|
||||||
|
"integrity": "sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/twbs"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/bootstrap"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/brace-expansion": {
|
"node_modules/brace-expansion": {
|
||||||
"version": "1.1.11",
|
"version": "1.1.11",
|
||||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,9 @@
|
||||||
"@angular/platform-browser": "^19.1.0",
|
"@angular/platform-browser": "^19.1.0",
|
||||||
"@angular/platform-browser-dynamic": "^19.1.0",
|
"@angular/platform-browser-dynamic": "^19.1.0",
|
||||||
"@angular/router": "^19.1.0",
|
"@angular/router": "^19.1.0",
|
||||||
|
"boostrap": "^2.0.0",
|
||||||
|
"bootstrap": "^5.3.5",
|
||||||
|
"bootstrap-icons": "^1.11.3",
|
||||||
"rxjs": "~7.8.0",
|
"rxjs": "~7.8.0",
|
||||||
"tslib": "^2.3.0",
|
"tslib": "^2.3.0",
|
||||||
"zone.js": "~0.15.0"
|
"zone.js": "~0.15.0"
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 65 KiB |
|
|
@ -1,10 +1,41 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { RouterModule, Routes } from '@angular/router';
|
import { RouterModule, Routes } from '@angular/router';
|
||||||
|
|
||||||
const routes: Routes = [];
|
import { authGuard } from '@guards/auth.guard';
|
||||||
|
|
||||||
|
import { LoginComponent } from './components/essentials/login/login.component';
|
||||||
|
import { LogoutComponent } from './components/essentials/logout/logout.component';
|
||||||
|
|
||||||
|
import { HomeComponent } from './components/home/home.component';
|
||||||
|
|
||||||
|
import { MatchesComponent } from './components/match/matches/matches.component';
|
||||||
|
import { MatchesIdComponent } from './components/match/matches-id/matches-id.component';
|
||||||
|
import { MatchesAddComponent } from './components/match/matches-add/matches-add.component';
|
||||||
|
import { MatchesDelComponent } from './components/match/matches-del/matches-del.component';
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{ path: 'login', component: LoginComponent },
|
||||||
|
{ path: 'logout', component: LogoutComponent },
|
||||||
|
|
||||||
|
{ path: '', component: HomeComponent },
|
||||||
|
{ path: 'home', component: HomeComponent },
|
||||||
|
|
||||||
|
{ path: 'matches', component: MatchesComponent },
|
||||||
|
{
|
||||||
|
path: 'matches/add',
|
||||||
|
component: MatchesAddComponent,
|
||||||
|
canActivate: [authGuard],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'matches/del/:id',
|
||||||
|
component: MatchesDelComponent,
|
||||||
|
canActivate: [authGuard],
|
||||||
|
},
|
||||||
|
{ path: 'matches/:id', component: MatchesIdComponent },
|
||||||
|
];
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [RouterModule.forRoot(routes)],
|
imports: [RouterModule.forRoot(routes)],
|
||||||
exports: [RouterModule]
|
exports: [RouterModule],
|
||||||
})
|
})
|
||||||
export class AppRoutingModule { }
|
export class AppRoutingModule {}
|
||||||
|
|
|
||||||
|
|
@ -1,336 +1,3 @@
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
<app-header></app-header>
|
||||||
<!-- * * * * * * * * * * * The content below * * * * * * * * * * * -->
|
<router-outlet></router-outlet>
|
||||||
<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
|
<app-footer></app-footer>
|
||||||
<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * Delete the template below * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * to get started with your project! * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
|
|
||||||
<style>
|
|
||||||
:host {
|
|
||||||
--bright-blue: oklch(51.01% 0.274 263.83);
|
|
||||||
--electric-violet: oklch(53.18% 0.28 296.97);
|
|
||||||
--french-violet: oklch(47.66% 0.246 305.88);
|
|
||||||
--vivid-pink: oklch(69.02% 0.277 332.77);
|
|
||||||
--hot-red: oklch(61.42% 0.238 15.34);
|
|
||||||
--orange-red: oklch(63.32% 0.24 31.68);
|
|
||||||
|
|
||||||
--gray-900: oklch(19.37% 0.006 300.98);
|
|
||||||
--gray-700: oklch(36.98% 0.014 302.71);
|
|
||||||
--gray-400: oklch(70.9% 0.015 304.04);
|
|
||||||
|
|
||||||
--red-to-pink-to-purple-vertical-gradient: linear-gradient(
|
|
||||||
180deg,
|
|
||||||
var(--orange-red) 0%,
|
|
||||||
var(--vivid-pink) 50%,
|
|
||||||
var(--electric-violet) 100%
|
|
||||||
);
|
|
||||||
|
|
||||||
--red-to-pink-to-purple-horizontal-gradient: linear-gradient(
|
|
||||||
90deg,
|
|
||||||
var(--orange-red) 0%,
|
|
||||||
var(--vivid-pink) 50%,
|
|
||||||
var(--electric-violet) 100%
|
|
||||||
);
|
|
||||||
|
|
||||||
--pill-accent: var(--bright-blue);
|
|
||||||
|
|
||||||
font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
|
|
||||||
Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
|
|
||||||
"Segoe UI Symbol";
|
|
||||||
box-sizing: border-box;
|
|
||||||
-webkit-font-smoothing: antialiased;
|
|
||||||
-moz-osx-font-smoothing: grayscale;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
font-size: 3.125rem;
|
|
||||||
color: var(--gray-900);
|
|
||||||
font-weight: 500;
|
|
||||||
line-height: 100%;
|
|
||||||
letter-spacing: -0.125rem;
|
|
||||||
margin: 0;
|
|
||||||
font-family: "Inter Tight", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
|
|
||||||
Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
|
|
||||||
"Segoe UI Symbol";
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
|
||||||
margin: 0;
|
|
||||||
color: var(--gray-700);
|
|
||||||
}
|
|
||||||
|
|
||||||
main {
|
|
||||||
width: 100%;
|
|
||||||
min-height: 100%;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
padding: 1rem;
|
|
||||||
box-sizing: inherit;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.angular-logo {
|
|
||||||
max-width: 9.2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-around;
|
|
||||||
width: 100%;
|
|
||||||
max-width: 700px;
|
|
||||||
margin-bottom: 3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content h1 {
|
|
||||||
margin-top: 1.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content p {
|
|
||||||
margin-top: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.divider {
|
|
||||||
width: 1px;
|
|
||||||
background: var(--red-to-pink-to-purple-vertical-gradient);
|
|
||||||
margin-inline: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-group {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: start;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 1.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
--pill-accent: var(--bright-blue);
|
|
||||||
background: color-mix(in srgb, var(--pill-accent) 5%, transparent);
|
|
||||||
color: var(--pill-accent);
|
|
||||||
padding-inline: 0.75rem;
|
|
||||||
padding-block: 0.375rem;
|
|
||||||
border-radius: 2.75rem;
|
|
||||||
border: 0;
|
|
||||||
transition: background 0.3s ease;
|
|
||||||
font-family: var(--inter-font);
|
|
||||||
font-size: 0.875rem;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 500;
|
|
||||||
line-height: 1.4rem;
|
|
||||||
letter-spacing: -0.00875rem;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill:hover {
|
|
||||||
background: color-mix(in srgb, var(--pill-accent) 15%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-group .pill:nth-child(6n + 1) {
|
|
||||||
--pill-accent: var(--bright-blue);
|
|
||||||
}
|
|
||||||
.pill-group .pill:nth-child(6n + 2) {
|
|
||||||
--pill-accent: var(--french-violet);
|
|
||||||
}
|
|
||||||
.pill-group .pill:nth-child(6n + 3),
|
|
||||||
.pill-group .pill:nth-child(6n + 4),
|
|
||||||
.pill-group .pill:nth-child(6n + 5) {
|
|
||||||
--pill-accent: var(--hot-red);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-group svg {
|
|
||||||
margin-inline-start: 0.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.social-links {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.73rem;
|
|
||||||
margin-top: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.social-links path {
|
|
||||||
transition: fill 0.3s ease;
|
|
||||||
fill: var(--gray-400);
|
|
||||||
}
|
|
||||||
|
|
||||||
.social-links a:hover svg path {
|
|
||||||
fill: var(--gray-900);
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (max-width: 650px) {
|
|
||||||
.content {
|
|
||||||
flex-direction: column;
|
|
||||||
width: max-content;
|
|
||||||
}
|
|
||||||
|
|
||||||
.divider {
|
|
||||||
height: 1px;
|
|
||||||
width: 100%;
|
|
||||||
background: var(--red-to-pink-to-purple-horizontal-gradient);
|
|
||||||
margin-block: 1.5rem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<main class="main">
|
|
||||||
<div class="content">
|
|
||||||
<div class="left-side">
|
|
||||||
<svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
viewBox="0 0 982 239"
|
|
||||||
fill="none"
|
|
||||||
class="angular-logo"
|
|
||||||
>
|
|
||||||
<g clip-path="url(#a)">
|
|
||||||
<path
|
|
||||||
fill="url(#b)"
|
|
||||||
d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
|
|
||||||
/>
|
|
||||||
<path
|
|
||||||
fill="url(#c)"
|
|
||||||
d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
|
|
||||||
/>
|
|
||||||
</g>
|
|
||||||
<defs>
|
|
||||||
<radialGradient
|
|
||||||
id="c"
|
|
||||||
cx="0"
|
|
||||||
cy="0"
|
|
||||||
r="1"
|
|
||||||
gradientTransform="rotate(118.122 171.182 60.81) scale(205.794)"
|
|
||||||
gradientUnits="userSpaceOnUse"
|
|
||||||
>
|
|
||||||
<stop stop-color="#FF41F8" />
|
|
||||||
<stop offset=".707" stop-color="#FF41F8" stop-opacity=".5" />
|
|
||||||
<stop offset="1" stop-color="#FF41F8" stop-opacity="0" />
|
|
||||||
</radialGradient>
|
|
||||||
<linearGradient
|
|
||||||
id="b"
|
|
||||||
x1="0"
|
|
||||||
x2="982"
|
|
||||||
y1="192"
|
|
||||||
y2="192"
|
|
||||||
gradientUnits="userSpaceOnUse"
|
|
||||||
>
|
|
||||||
<stop stop-color="#F0060B" />
|
|
||||||
<stop offset="0" stop-color="#F0070C" />
|
|
||||||
<stop offset=".526" stop-color="#CC26D5" />
|
|
||||||
<stop offset="1" stop-color="#7702FF" />
|
|
||||||
</linearGradient>
|
|
||||||
<clipPath id="a"><path fill="#fff" d="M0 0h982v239H0z" /></clipPath>
|
|
||||||
</defs>
|
|
||||||
</svg>
|
|
||||||
<h1>Hello, {{ title }}</h1>
|
|
||||||
<p>Congratulations! Your app is running. 🎉</p>
|
|
||||||
</div>
|
|
||||||
<div class="divider" role="separator" aria-label="Divider"></div>
|
|
||||||
<div class="right-side">
|
|
||||||
<div class="pill-group">
|
|
||||||
@for (item of [
|
|
||||||
{ title: 'Explore the Docs', link: 'https://angular.dev' },
|
|
||||||
{ title: 'Learn with Tutorials', link: 'https://angular.dev/tutorials' },
|
|
||||||
{ title: 'CLI Docs', link: 'https://angular.dev/tools/cli' },
|
|
||||||
{ title: 'Angular Language Service', link: 'https://angular.dev/tools/language-service' },
|
|
||||||
{ title: 'Angular DevTools', link: 'https://angular.dev/tools/devtools' },
|
|
||||||
]; track item.title) {
|
|
||||||
<a
|
|
||||||
class="pill"
|
|
||||||
[href]="item.link"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<span>{{ item.title }}</span>
|
|
||||||
<svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
height="14"
|
|
||||||
viewBox="0 -960 960 960"
|
|
||||||
width="14"
|
|
||||||
fill="currentColor"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h560v-280h80v280q0 33-23.5 56.5T760-120H200Zm188-212-56-56 372-372H560v-80h280v280h-80v-144L388-332Z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
<div class="social-links">
|
|
||||||
<a
|
|
||||||
href="https://github.com/angular/angular"
|
|
||||||
aria-label="Github"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
width="25"
|
|
||||||
height="24"
|
|
||||||
viewBox="0 0 25 24"
|
|
||||||
fill="none"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
alt="Github"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M12.3047 0C5.50634 0 0 5.50942 0 12.3047C0 17.7423 3.52529 22.3535 8.41332 23.9787C9.02856 24.0946 9.25414 23.7142 9.25414 23.3871C9.25414 23.0949 9.24389 22.3207 9.23876 21.2953C5.81601 22.0377 5.09414 19.6444 5.09414 19.6444C4.53427 18.2243 3.72524 17.8449 3.72524 17.8449C2.61064 17.082 3.81137 17.0973 3.81137 17.0973C5.04697 17.1835 5.69604 18.3647 5.69604 18.3647C6.79321 20.2463 8.57636 19.7029 9.27978 19.3881C9.39052 18.5924 9.70736 18.0499 10.0591 17.7423C7.32641 17.4347 4.45429 16.3765 4.45429 11.6618C4.45429 10.3185 4.9311 9.22133 5.72065 8.36C5.58222 8.04931 5.16694 6.79833 5.82831 5.10337C5.82831 5.10337 6.85883 4.77319 9.2121 6.36459C10.1965 6.09082 11.2424 5.95546 12.2883 5.94931C13.3342 5.95546 14.3801 6.09082 15.3644 6.36459C17.7023 4.77319 18.7328 5.10337 18.7328 5.10337C19.3942 6.79833 18.9789 8.04931 18.8559 8.36C19.6403 9.22133 20.1171 10.3185 20.1171 11.6618C20.1171 16.3888 17.2409 17.4296 14.5031 17.7321C14.9338 18.1012 15.3337 18.8559 15.3337 20.0084C15.3337 21.6552 15.3183 22.978 15.3183 23.3779C15.3183 23.7009 15.5336 24.0854 16.1642 23.9623C21.0871 22.3484 24.6094 17.7341 24.6094 12.3047C24.6094 5.50942 19.0999 0 12.3047 0Z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
<a
|
|
||||||
href="https://twitter.com/angular"
|
|
||||||
aria-label="Twitter"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
width="24"
|
|
||||||
height="24"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
fill="none"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
alt="Twitter"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
<a
|
|
||||||
href="https://www.youtube.com/channel/UCbn1OgGei-DV7aSRo_HaAiw"
|
|
||||||
aria-label="Youtube"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
width="29"
|
|
||||||
height="20"
|
|
||||||
viewBox="0 0 29 20"
|
|
||||||
fill="none"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
alt="Youtube"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
fill-rule="evenodd"
|
|
||||||
clip-rule="evenodd"
|
|
||||||
d="M27.4896 1.52422C27.9301 1.96749 28.2463 2.51866 28.4068 3.12258C29.0004 5.35161 29.0004 10 29.0004 10C29.0004 10 29.0004 14.6484 28.4068 16.8774C28.2463 17.4813 27.9301 18.0325 27.4896 18.4758C27.0492 18.9191 26.5 19.2389 25.8972 19.4032C23.6778 20 14.8068 20 14.8068 20C14.8068 20 5.93586 20 3.71651 19.4032C3.11363 19.2389 2.56449 18.9191 2.12405 18.4758C1.68361 18.0325 1.36732 17.4813 1.20683 16.8774C0.613281 14.6484 0.613281 10 0.613281 10C0.613281 10 0.613281 5.35161 1.20683 3.12258C1.36732 2.51866 1.68361 1.96749 2.12405 1.52422C2.56449 1.08095 3.11363 0.76113 3.71651 0.596774C5.93586 0 14.8068 0 14.8068 0C14.8068 0 23.6778 0 25.8972 0.596774C26.5 0.76113 27.0492 1.08095 27.4896 1.52422ZM19.3229 10L11.9036 5.77905V14.221L19.3229 10Z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * The content above * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * End of Placeholder * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
|
|
||||||
|
|
||||||
<router-outlet />
|
|
||||||
|
|
@ -4,7 +4,7 @@ import { Component } from '@angular/core';
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
templateUrl: './app.component.html',
|
templateUrl: './app.component.html',
|
||||||
standalone: false,
|
standalone: false,
|
||||||
styleUrl: './app.component.css'
|
styleUrl: './app.component.css',
|
||||||
})
|
})
|
||||||
export class AppComponent {
|
export class AppComponent {
|
||||||
title = 'FencerJudgeFront';
|
title = 'FencerJudgeFront';
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,37 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { BrowserModule } from '@angular/platform-browser';
|
import { BrowserModule } from '@angular/platform-browser';
|
||||||
|
import { FormsModule } from '@angular/forms';
|
||||||
|
import { HttpClientModule } from '@angular/common/http';
|
||||||
|
|
||||||
import { AppRoutingModule } from './app-routing.module';
|
import { AppRoutingModule } from './app-routing.module';
|
||||||
import { AppComponent } from './app.component';
|
import { AppComponent } from './app.component';
|
||||||
|
import { HeaderComponent } from './components/essentials/header/header.component';
|
||||||
|
import { FooterComponent } from './components/essentials/footer/footer.component';
|
||||||
|
import { HomeComponent } from './components/home/home.component';
|
||||||
|
import { LoginComponent } from './components/essentials/login/login.component';
|
||||||
|
import { LogoutComponent } from './components/essentials/logout/logout.component';
|
||||||
|
import { MatchesComponent } from './components/match/matches/matches.component';
|
||||||
|
import { MatchesIdComponent } from './components/match/matches-id/matches-id.component';
|
||||||
|
import { MatchesAddComponent } from './components/match/matches-add/matches-add.component';
|
||||||
|
import { SponsortComponent } from './templates/sponsort/sponsort.component';
|
||||||
|
import { MatchesDelComponent } from './components/match/matches-del/matches-del.component';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [
|
declarations: [
|
||||||
AppComponent
|
AppComponent,
|
||||||
],
|
HeaderComponent,
|
||||||
imports: [
|
FooterComponent,
|
||||||
BrowserModule,
|
HomeComponent,
|
||||||
AppRoutingModule
|
LoginComponent,
|
||||||
|
LogoutComponent,
|
||||||
|
MatchesComponent,
|
||||||
|
MatchesIdComponent,
|
||||||
|
MatchesAddComponent,
|
||||||
|
SponsortComponent,
|
||||||
|
MatchesDelComponent,
|
||||||
],
|
],
|
||||||
|
imports: [BrowserModule, AppRoutingModule, FormsModule, HttpClientModule],
|
||||||
providers: [],
|
providers: [],
|
||||||
bootstrap: [AppComponent]
|
bootstrap: [AppComponent],
|
||||||
})
|
})
|
||||||
export class AppModule { }
|
export class AppModule {}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
|
||||||
|
.footer-gris {
|
||||||
|
background-color: #2c2c2c; /* Gris foncé personnalisé */
|
||||||
|
}
|
||||||
|
|
||||||
|
.flag-bar {
|
||||||
|
height: 6px; /* épaisseur du trait */
|
||||||
|
width: 100%; /* toute la largeur */
|
||||||
|
background: linear-gradient(
|
||||||
|
to right,
|
||||||
|
#0055a4 0%, /* bleu */
|
||||||
|
#0055a4 33.33%, /* 1/3 */
|
||||||
|
#fff 33.33%, /* blanc */
|
||||||
|
#fff 66.66%, /* 2/3 */
|
||||||
|
#ef4135 66.66%, /* rouge */
|
||||||
|
#ef4135 100%
|
||||||
|
);
|
||||||
|
margin-bottom: 8px;
|
||||||
|
border-radius: 3px; /* optionnel, pour arrondir les bords */
|
||||||
|
box-shadow: 0 1px 3px rgba(0,0,0,0.1);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,48 @@
|
||||||
|
<footer class="footer-gris text-white py-3">
|
||||||
|
<div class="container">
|
||||||
|
<div class="row align-items-center">
|
||||||
|
<div class="col-md-4 d-flex align-items-center text-start">
|
||||||
|
<img
|
||||||
|
src="/assets/Logo/favicon.png"
|
||||||
|
alt="FencerJudge"
|
||||||
|
height="50"
|
||||||
|
class="me-2"
|
||||||
|
/>
|
||||||
|
<span class="fs-4 fw-bold">FencerJudge</span>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="col-md-4 offset-md-4 d-flex justify-content-end align-items-center"
|
||||||
|
>
|
||||||
|
<span class="me-3">Suivez-nous</span>
|
||||||
|
<a
|
||||||
|
href="https://x.com/ffescrime"
|
||||||
|
class="text-white me-2 d-flex align-items-center justify-content-center rounded-circle bg-light p-2"
|
||||||
|
style="width: 40px; height: 40px"
|
||||||
|
><i class="bi bi-twitter-x text-dark"></i
|
||||||
|
></a>
|
||||||
|
<a
|
||||||
|
href="https://www.facebook.com/ffescrime/"
|
||||||
|
class="text-white me-2 d-flex align-items-center justify-content-center rounded-circle bg-light p-2"
|
||||||
|
style="width: 40px; height: 40px"
|
||||||
|
><i class="bi bi-facebook text-dark"></i
|
||||||
|
></a>
|
||||||
|
<a
|
||||||
|
href="https://www.youtube.com/channel/UCSjeeZaP92mdOICSXsaGdiw"
|
||||||
|
class="text-white me-2 d-flex align-items-center justify-content-center rounded-circle bg-light p-2"
|
||||||
|
style="width: 40px; height: 40px"
|
||||||
|
><i class="bi bi-youtube text-dark"></i
|
||||||
|
></a>
|
||||||
|
<a
|
||||||
|
href="https://www.linkedin.com/company/ffescrime/"
|
||||||
|
class="text-white d-flex align-items-center justify-content-center rounded-circle bg-light p-2"
|
||||||
|
style="width: 40px; height: 40px"
|
||||||
|
><i class="bi bi-linkedin text-dark"></i
|
||||||
|
></a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="text-center mt-3">
|
||||||
|
<span>© FencerJudge - Tous droits réservés </span>
|
||||||
|
</div>
|
||||||
|
<div class="flag-bar" title="France"></div>
|
||||||
|
</div>
|
||||||
|
</footer>
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { FooterComponent } from './footer.component';
|
||||||
|
|
||||||
|
describe('FooterComponent', () => {
|
||||||
|
let component: FooterComponent;
|
||||||
|
let fixture: ComponentFixture<FooterComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [FooterComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(FooterComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-footer',
|
||||||
|
standalone: false,
|
||||||
|
templateUrl: './footer.component.html',
|
||||||
|
styleUrl: './footer.component.css'
|
||||||
|
})
|
||||||
|
export class FooterComponent {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
.navbar {
|
||||||
|
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-brand {
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 1.4rem;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-brand img {
|
||||||
|
height: 30px;
|
||||||
|
margin-right: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-link {
|
||||||
|
transition: color 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-link:hover,
|
||||||
|
.active-link {
|
||||||
|
color: #ffcc00 !important;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,52 @@
|
||||||
|
<!-- Navbar Bootstrap -->
|
||||||
|
<nav class="navbar navbar-expand-lg navbar-dark bg-primary-custom">
|
||||||
|
<div class="container">
|
||||||
|
<a class="navbar-brand" routerLink="/">FencerJudge</a>
|
||||||
|
<button
|
||||||
|
class="navbar-toggler"
|
||||||
|
type="button"
|
||||||
|
data-bs-toggle="collapse"
|
||||||
|
data-bs-target="#navbarNav"
|
||||||
|
>
|
||||||
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
</button>
|
||||||
|
<div class="collapse navbar-collapse" id="navbarNav">
|
||||||
|
<ul class="navbar-nav ms-auto">
|
||||||
|
<li class="nav-item">
|
||||||
|
<a
|
||||||
|
class="nav-link"
|
||||||
|
routerLink="/matches"
|
||||||
|
routerLinkActive="active-link"
|
||||||
|
>
|
||||||
|
Matchs
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item" *ngIf="authService.isAuthenticated()">
|
||||||
|
<a
|
||||||
|
class="nav-link"
|
||||||
|
routerLink="/matches/add"
|
||||||
|
routerLinkActive="active-link"
|
||||||
|
>
|
||||||
|
MatchAdd
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li
|
||||||
|
class="nav-item"
|
||||||
|
*ngIf="authService.isAuthenticated(); else notLoggedIn"
|
||||||
|
>
|
||||||
|
<a
|
||||||
|
class="nav-link"
|
||||||
|
routerLink="/logout"
|
||||||
|
routerLinkActive="active-link"
|
||||||
|
>Admin</a
|
||||||
|
>
|
||||||
|
</li>
|
||||||
|
<ng-template #notLoggedIn>
|
||||||
|
<a class="nav-link" routerLink="/login" routerLinkActive="active-link"
|
||||||
|
>Connexion</a
|
||||||
|
>
|
||||||
|
</ng-template>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { HeaderComponent } from './header.component';
|
||||||
|
|
||||||
|
describe('HeaderComponent', () => {
|
||||||
|
let component: HeaderComponent;
|
||||||
|
let fixture: ComponentFixture<HeaderComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [HeaderComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(HeaderComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
import { AuthService } from '@services/auth/auth.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-header',
|
||||||
|
standalone: false,
|
||||||
|
templateUrl: './header.component.html',
|
||||||
|
styleUrl: './header.component.css',
|
||||||
|
})
|
||||||
|
export class HeaderComponent {
|
||||||
|
constructor(private router: Router, public authService: AuthService) {}
|
||||||
|
|
||||||
|
isHomeActive(): boolean {
|
||||||
|
return this.router.url === '/' || this.router.url === '/home';
|
||||||
|
}
|
||||||
|
|
||||||
|
isHomeActiveBool(): boolean {
|
||||||
|
if (this.router.url != '/home') {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,147 @@
|
||||||
|
.login-container {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
min-height: 25vh;
|
||||||
|
padding: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-card {
|
||||||
|
background-color: #fff;
|
||||||
|
border-radius: 12px;
|
||||||
|
overflow: hidden;
|
||||||
|
width: 500px;
|
||||||
|
box-shadow: 0 12px 24px rgba(0, 0, 0, 0.25);
|
||||||
|
color: #333;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-header-img {
|
||||||
|
position: absolute;
|
||||||
|
height: inherit;
|
||||||
|
width: 100%;
|
||||||
|
background-color: rgba(0, 0, 0, 0.25);
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-header {
|
||||||
|
background: url("https://www.lejdd.fr/lmnr/var/jdd/public/media/image/2022/07/19/12/escrime-comment-les-francais-apprivoisent-leurs-armes.jpg?VersionId=Mw31AogdDUwVLuCaVdxMozm9kito7TTP") no-repeat center/cover;
|
||||||
|
position: relative;
|
||||||
|
padding: 4rem 1rem;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
min-height: 300px;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-header::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
background: rgba(0, 0, 0, 0.3);
|
||||||
|
/* voile sombre */
|
||||||
|
-webkit-backdrop-filter: blur(2px);
|
||||||
|
backdrop-filter: blur(2px);
|
||||||
|
/* effet de flou */
|
||||||
|
z-index: 1;
|
||||||
|
border-radius: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-header h1 {
|
||||||
|
position: relative;
|
||||||
|
z-index: 2;
|
||||||
|
padding: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-header h2 {
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-header p {
|
||||||
|
font-size: 0.85rem;
|
||||||
|
line-height: 1.4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-form {
|
||||||
|
padding: 1.5rem;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-group {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
border-radius: 20px;
|
||||||
|
position: relative;
|
||||||
|
background-color: #235d4f;
|
||||||
|
padding: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-group input {
|
||||||
|
width: 100%;
|
||||||
|
padding: 1rem;
|
||||||
|
font-size: 16px;
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
border-bottom: 1px solid white;
|
||||||
|
outline: none;
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-group input:focus~label,
|
||||||
|
.input-group input:valid~label {
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
color: #235d4f;
|
||||||
|
font-size: 12px;
|
||||||
|
padding: .6rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-group input .form-control:focus {
|
||||||
|
border-color: transparent !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-group label {
|
||||||
|
position: absolute;
|
||||||
|
top: 22px;
|
||||||
|
left: 0;
|
||||||
|
font-size: 16px;
|
||||||
|
color: white;
|
||||||
|
pointer-events: none;
|
||||||
|
transition: 0.5s;
|
||||||
|
padding: .6rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-group .icon {
|
||||||
|
color: white;
|
||||||
|
margin-right: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.options {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
color: #555;
|
||||||
|
}
|
||||||
|
|
||||||
|
.options a {
|
||||||
|
color: #235d4f;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-btn {
|
||||||
|
background-color: #235d4f;
|
||||||
|
color: white;
|
||||||
|
padding: 0.6rem;
|
||||||
|
border: none;
|
||||||
|
border-radius: 6px;
|
||||||
|
font-size: 1rem;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background-color 0.3s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-btn:hover {
|
||||||
|
background-color: #1b4b3d;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
<div class="login-container">
|
||||||
|
<div class="login-card">
|
||||||
|
<div class="login-header">
|
||||||
|
<h1>Connexion au compte</h1>
|
||||||
|
</div>
|
||||||
|
<form (ngSubmit)="onSubmit()" class="login-form">
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="email" name="email" [(ngModel)]="email" placeholder="Nom utilisateur" value="user@test.com"
|
||||||
|
required />
|
||||||
|
<label class="icon">👤</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="password" name="password" [(ngModel)]="password" placeholder="Mot de passe" value="password123"
|
||||||
|
required />
|
||||||
|
<label class="icon">🔒</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button type="submit" class="login-btn">Connexion</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { LoginComponent } from './login.component';
|
||||||
|
|
||||||
|
describe('LoginComponent', () => {
|
||||||
|
let component: LoginComponent;
|
||||||
|
let fixture: ComponentFixture<LoginComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [LoginComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(LoginComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
import { AuthService } from '@services/auth/auth.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-login',
|
||||||
|
standalone: false,
|
||||||
|
templateUrl: './login.component.html',
|
||||||
|
styleUrl: './login.component.css',
|
||||||
|
})
|
||||||
|
export class LoginComponent {
|
||||||
|
email = '';
|
||||||
|
password = '';
|
||||||
|
errorMessage = '';
|
||||||
|
|
||||||
|
constructor(private authService: AuthService, private router: Router) {}
|
||||||
|
|
||||||
|
onSubmit() {
|
||||||
|
if (this.authService.login(this.email, this.password)) {
|
||||||
|
this.router.navigate(['/']);
|
||||||
|
} else {
|
||||||
|
this.errorMessage = 'Identifiants incorrects';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
<p>logout works!</p>
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { LogoutComponent } from './logout.component';
|
||||||
|
|
||||||
|
describe('LogoutComponent', () => {
|
||||||
|
let component: LogoutComponent;
|
||||||
|
let fixture: ComponentFixture<LogoutComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [LogoutComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(LogoutComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
import { AuthService } from '@services/auth/auth.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-logout',
|
||||||
|
standalone: false,
|
||||||
|
templateUrl: './logout.component.html',
|
||||||
|
styleUrl: './logout.component.css',
|
||||||
|
})
|
||||||
|
export class LogoutComponent {
|
||||||
|
constructor(private authService: AuthService, private router: Router) {
|
||||||
|
this.authService.logout();
|
||||||
|
this.router.navigate(['/']); // Redirection après déconnexion
|
||||||
|
}
|
||||||
|
}
|
||||||
627
FencerJudgeFront/src/app/components/home/home.component.css
Normal file
627
FencerJudgeFront/src/app/components/home/home.component.css
Normal file
|
|
@ -0,0 +1,627 @@
|
||||||
|
.match-card {
|
||||||
|
background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
|
||||||
|
border: 2px solid #daa520;
|
||||||
|
padding: 24px;
|
||||||
|
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.4),
|
||||||
|
inset 0 1px 0 rgba(255, 255, 255, 0.1);
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
height: 80vh;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.match-card::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
height: 2px;
|
||||||
|
background: linear-gradient(90deg, #daa520, #ffd700, #daa520);
|
||||||
|
background-size: 200% 100%;
|
||||||
|
animation: gradientShift 15s ease infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes gradientShift {
|
||||||
|
0% {
|
||||||
|
background-position: 0% 50%;
|
||||||
|
}
|
||||||
|
|
||||||
|
50% {
|
||||||
|
background-position: 100% 50%;
|
||||||
|
}
|
||||||
|
|
||||||
|
100% {
|
||||||
|
background-position: 0% 50%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.match-card {
|
||||||
|
transform: translateY(-4px);
|
||||||
|
box-shadow: 0 12px 48px rgba(218, 165, 32, 0.2), 0 8px 32px rgba(0, 0, 0, 0.4);
|
||||||
|
}
|
||||||
|
|
||||||
|
.match-background {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
z-index: -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.background-image {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
object-fit: cover;
|
||||||
|
filter: grayscale(30%) brightness(0.4) contrast(1.2);
|
||||||
|
transition: all 0.5s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.match-card:hover .background-image {
|
||||||
|
filter: grayscale(10%) brightness(0.3) contrast(1.4);
|
||||||
|
transform: scale(1.05);
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-overlay {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
background: linear-gradient(
|
||||||
|
135deg,
|
||||||
|
rgba(26, 26, 46, 0.85) 0%,
|
||||||
|
rgba(0, 0, 0, 0.7) 50%,
|
||||||
|
rgba(22, 33, 62, 0.85) 100%
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Header */
|
||||||
|
.match-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.match-weapon {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
color: #daa520;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.weapon-type {
|
||||||
|
font-size: 14px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Status */
|
||||||
|
.match-status {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 6px 12px;
|
||||||
|
border-radius: 20px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 600;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-warning {
|
||||||
|
background: rgba(34, 197, 94, 0.2);
|
||||||
|
color: #22c55e;
|
||||||
|
border: 1px solid #22c55e;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-success {
|
||||||
|
background: rgba(239, 68, 68, 0.2);
|
||||||
|
color: #ef4444;
|
||||||
|
border: 1px solid #ef4444;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-secondary {
|
||||||
|
background: rgba(59, 130, 246, 0.2);
|
||||||
|
color: #3b82f6;
|
||||||
|
border: 1px solid #3b82f6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-dot {
|
||||||
|
width: 8px;
|
||||||
|
height: 8px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: currentColor;
|
||||||
|
animation: pulse 2s infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes pulse {
|
||||||
|
0%,
|
||||||
|
100% {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Versus Section */
|
||||||
|
.match-versus {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin: 24px 0;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fencer {
|
||||||
|
flex: 1;
|
||||||
|
text-align: center;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fencer-name {
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 700;
|
||||||
|
margin-bottom: 4px;
|
||||||
|
color: #daa520;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fencer-club {
|
||||||
|
font-size: 12px;
|
||||||
|
color: #9ca3af;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.score {
|
||||||
|
font-size: 32px;
|
||||||
|
font-weight: 900;
|
||||||
|
color: white;
|
||||||
|
text-shadow: 0 2px 4px rgba(0, 0, 0, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
.vs-divider {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
gap: 4px;
|
||||||
|
margin: 0 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vs-text {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: #6b7280;
|
||||||
|
letter-spacing: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.crossed-swords {
|
||||||
|
font-size: 20px;
|
||||||
|
opacity: 0.7;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Details */
|
||||||
|
.match-details {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 12px;
|
||||||
|
margin-top: 20px;
|
||||||
|
padding-top: 20px;
|
||||||
|
border-top: 1px solid rgba(255, 255, 255, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.detail-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.detail-item .icon {
|
||||||
|
font-size: 16px;
|
||||||
|
width: 20px;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.detail-item .label {
|
||||||
|
color: #9ca3af;
|
||||||
|
font-weight: 500;
|
||||||
|
min-width: 60px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.detail-item .value {
|
||||||
|
color: white;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Responsive */
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.match-card {
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.match-versus {
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vs-divider {
|
||||||
|
transform: rotate(90deg);
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fencer {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.combat-arena {
|
||||||
|
margin-top: 24px;
|
||||||
|
background: linear-gradient(
|
||||||
|
135deg,
|
||||||
|
rgba(220, 38, 38, 0.1) 0%,
|
||||||
|
rgba(0, 0, 0, 0.8) 50%,
|
||||||
|
rgba(255, 215, 0, 0.1) 100%
|
||||||
|
);
|
||||||
|
border: 2px solid;
|
||||||
|
border-image: linear-gradient(45deg, #dc2626, #ffd700, #dc2626) 1;
|
||||||
|
border-radius: 12px;
|
||||||
|
padding: 20px;
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.combat-arena::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
top: -50%;
|
||||||
|
left: -50%;
|
||||||
|
width: 200%;
|
||||||
|
height: 200%;
|
||||||
|
background: repeating-conic-gradient(
|
||||||
|
from 0deg at 50% 50%,
|
||||||
|
transparent 0deg 2deg,
|
||||||
|
rgba(220, 38, 38, 0.05) 2deg 4deg
|
||||||
|
);
|
||||||
|
animation: rotate 20s linear infinite;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes rotate {
|
||||||
|
0% {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Header Arena */
|
||||||
|
.arena-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 12px;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.arena-title {
|
||||||
|
font-family: "Orbitron", monospace;
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 900;
|
||||||
|
color: #ffd700;
|
||||||
|
letter-spacing: 3px;
|
||||||
|
text-shadow: 0 0 10px #ffd700, 0 0 20px #ffd700, 0 0 30px #ffd700;
|
||||||
|
animation: titleGlow 2s ease-in-out infinite alternate;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes titleGlow {
|
||||||
|
from {
|
||||||
|
text-shadow: 0 0 10px #ffd700, 0 0 20px #ffd700, 0 0 30px #ffd700;
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
text-shadow: 0 0 20px #ffd700, 0 0 30px #ffd700, 0 0 40px #ffd700;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.arena-pulse {
|
||||||
|
width: 10px;
|
||||||
|
height: 10px;
|
||||||
|
background: #dc2626;
|
||||||
|
border-radius: 50%;
|
||||||
|
position: relative;
|
||||||
|
animation: pulse-danger 1s infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.arena-pulse::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
top: -5px;
|
||||||
|
left: -5px;
|
||||||
|
right: -5px;
|
||||||
|
bottom: -5px;
|
||||||
|
background: #dc2626;
|
||||||
|
border-radius: 50%;
|
||||||
|
opacity: 0.3;
|
||||||
|
animation: pulse-ring 1s infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes pulse-danger {
|
||||||
|
0%,
|
||||||
|
100% {
|
||||||
|
transform: scale(1);
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
transform: scale(1.2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes pulse-ring {
|
||||||
|
0% {
|
||||||
|
transform: scale(0.8);
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
transform: scale(2);
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Combat Grid */
|
||||||
|
.combat-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.combat-stat {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 16px;
|
||||||
|
padding: 16px;
|
||||||
|
background: linear-gradient(
|
||||||
|
90deg,
|
||||||
|
rgba(0, 0, 0, 0.8) 0%,
|
||||||
|
rgba(26, 26, 46, 0.9) 50%,
|
||||||
|
rgba(0, 0, 0, 0.8) 100%
|
||||||
|
);
|
||||||
|
border: 1px solid rgba(255, 215, 0, 0.3);
|
||||||
|
border-radius: 8px;
|
||||||
|
position: relative;
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.combat-stat:hover {
|
||||||
|
transform: translateX(8px);
|
||||||
|
border-color: #ffd700;
|
||||||
|
box-shadow: 0 4px 20px rgba(255, 215, 0, 0.3),
|
||||||
|
inset 0 1px 0 rgba(255, 215, 0, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Icons animés */
|
||||||
|
.stat-icon {
|
||||||
|
position: relative;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 48px;
|
||||||
|
height: 48px;
|
||||||
|
font-size: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.location-radar {
|
||||||
|
position: absolute;
|
||||||
|
width: 40px;
|
||||||
|
height: 40px;
|
||||||
|
border: 2px solid #10b981;
|
||||||
|
border-radius: 50%;
|
||||||
|
border-top-color: transparent;
|
||||||
|
animation: radar-spin 2s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.referee-badge {
|
||||||
|
position: absolute;
|
||||||
|
width: 35px;
|
||||||
|
height: 35px;
|
||||||
|
background: linear-gradient(45deg, #ffd700, #ffed4a);
|
||||||
|
clip-path: polygon(
|
||||||
|
50% 0%,
|
||||||
|
61% 35%,
|
||||||
|
98% 35%,
|
||||||
|
68% 57%,
|
||||||
|
79% 91%,
|
||||||
|
50% 70%,
|
||||||
|
21% 91%,
|
||||||
|
32% 57%,
|
||||||
|
2% 35%,
|
||||||
|
39% 35%
|
||||||
|
);
|
||||||
|
animation: badge-pulse 3s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.time-ring {
|
||||||
|
position: absolute;
|
||||||
|
width: 36px;
|
||||||
|
height: 36px;
|
||||||
|
border: 3px solid #dc2626;
|
||||||
|
border-radius: 50%;
|
||||||
|
border-left-color: transparent;
|
||||||
|
animation: time-tick 1s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes radar-spin {
|
||||||
|
0% {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes badge-pulse {
|
||||||
|
0%,
|
||||||
|
100% {
|
||||||
|
transform: scale(1) rotate(0deg);
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
transform: scale(1.1) rotate(5deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes time-tick {
|
||||||
|
0% {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Content */
|
||||||
|
.stat-content {
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-label {
|
||||||
|
font-family: "Orbitron", monospace;
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: #6b7280;
|
||||||
|
letter-spacing: 1px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-value {
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: #ffffff;
|
||||||
|
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-sub {
|
||||||
|
font-size: 11px;
|
||||||
|
color: #9ca3af;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Glows spécifiques */
|
||||||
|
.venue .stat-value {
|
||||||
|
color: #10b981;
|
||||||
|
}
|
||||||
|
.referee .stat-value {
|
||||||
|
color: #ffd700;
|
||||||
|
}
|
||||||
|
.timing .stat-value {
|
||||||
|
color: #dc2626;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-glow {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
border-radius: 8px;
|
||||||
|
opacity: 0;
|
||||||
|
transition: opacity 0.3s ease;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.combat-stat:hover .stat-glow {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.venue-glow {
|
||||||
|
box-shadow: inset 0 0 20px rgba(16, 185, 129, 0.2);
|
||||||
|
}
|
||||||
|
.referee-glow {
|
||||||
|
box-shadow: inset 0 0 20px rgba(255, 215, 0, 0.2);
|
||||||
|
}
|
||||||
|
.timing-glow {
|
||||||
|
box-shadow: inset 0 0 20px rgba(220, 38, 38, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Responsive */
|
||||||
|
@media (min-width: 768px) {
|
||||||
|
.combat-grid {
|
||||||
|
grid-template-columns: repeat(3, 1fr);
|
||||||
|
}
|
||||||
|
|
||||||
|
.combat-stat {
|
||||||
|
flex-direction: column;
|
||||||
|
text-align: center;
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.combat-stat:hover {
|
||||||
|
transform: translateY(-4px);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.weapons-container {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 20px;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.weapon-card {
|
||||||
|
position: relative;
|
||||||
|
background-size: cover;
|
||||||
|
background-position: center;
|
||||||
|
border-radius: 12px;
|
||||||
|
box-shadow: 0 4px 12px rgba(0,0,0,0.2);
|
||||||
|
max-width: 300px;
|
||||||
|
height: 400px;
|
||||||
|
color: white;
|
||||||
|
text-align: center;
|
||||||
|
overflow: hidden;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: flex-end;
|
||||||
|
padding: 20px;
|
||||||
|
background-color: #000;
|
||||||
|
}
|
||||||
|
.weapon-card::before {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
background-image: inherit;
|
||||||
|
background-size: cover;
|
||||||
|
background-position: center;
|
||||||
|
filter: blur(10px) brightness(1.1);
|
||||||
|
opacity: 0.7;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
.weapon-card * {
|
||||||
|
position: relative;
|
||||||
|
z-index: 2;
|
||||||
|
text-shadow: 0 2px 4px rgba(0, 0, 0, 0.8);
|
||||||
|
}
|
||||||
|
|
||||||
|
.weapon-card img {
|
||||||
|
width: 100%;
|
||||||
|
height: auto;
|
||||||
|
border-radius: 10px;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.weapon-card h2 {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
font-size: 1.4em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.weapon-card p {
|
||||||
|
color: #ffffff;
|
||||||
|
font-size: 0.95em;
|
||||||
|
}
|
||||||
137
FencerJudgeFront/src/app/components/home/home.component.html
Normal file
137
FencerJudgeFront/src/app/components/home/home.component.html
Normal file
|
|
@ -0,0 +1,137 @@
|
||||||
|
<div class="match-card" *ngIf="latestMatch">
|
||||||
|
<div class="match-background">
|
||||||
|
<img src="./assets/duel.webp" alt="Escrime" class="background-image" />
|
||||||
|
<div class="image-overlay"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="match-header">
|
||||||
|
<div class="match-weapon">
|
||||||
|
<i class="sword-icon">⚔️</i>
|
||||||
|
<span class="weapon-type">{{ latestMatch.weapon }}</span>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="match-status"
|
||||||
|
[ngClass]="'status-' + getMatchStateColor(latestMatch.state)"
|
||||||
|
>
|
||||||
|
<span class="status-dot"></span>
|
||||||
|
{{ getMatchStateLabel(latestMatch.state) }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="match-versus">
|
||||||
|
<div class="fencer fencer-left">
|
||||||
|
<div class="fencer-name">
|
||||||
|
{{ player1?.name }} {{ player1?.firstName }}
|
||||||
|
</div>
|
||||||
|
<div class="fencer-club">{{ player1?.club }}</div>
|
||||||
|
<div class="score">{{ latestMatch.score1 }}</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="vs-divider">
|
||||||
|
<span class="vs-text">VS</span>
|
||||||
|
<div class="crossed-swords">⚔️</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="fencer fencer-right">
|
||||||
|
<div class="fencer-name">
|
||||||
|
{{ player2?.name }} {{ player2?.firstName }}
|
||||||
|
</div>
|
||||||
|
<div class="fencer-club">{{ player2?.club }}</div>
|
||||||
|
<div class="score">{{ latestMatch.score2 }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="combat-arena">
|
||||||
|
<div class="arena-header">
|
||||||
|
<span class="arena-title">ARENA COMBAT</span>
|
||||||
|
<div class="arena-pulse"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="combat-grid">
|
||||||
|
<div class="combat-stat venue">
|
||||||
|
<div class="stat-icon">
|
||||||
|
<div class="location-radar"></div>
|
||||||
|
<span>🏛️</span>
|
||||||
|
</div>
|
||||||
|
<div class="stat-content">
|
||||||
|
<span class="stat-label">BATTLEFIELD</span>
|
||||||
|
<span class="stat-value">{{ latestMatch.city }}</span>
|
||||||
|
<span class="stat-sub">{{ latestMatch.country }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="stat-glow venue-glow"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="combat-stat referee">
|
||||||
|
<div class="stat-icon">
|
||||||
|
<div class="referee-badge"></div>
|
||||||
|
<span>⚖️</span>
|
||||||
|
</div>
|
||||||
|
<div class="stat-content">
|
||||||
|
<span class="stat-label">COMBAT JUDGE</span>
|
||||||
|
<span class="stat-value"
|
||||||
|
>{{ referee?.name }} {{ referee?.firstName }}</span
|
||||||
|
>
|
||||||
|
<span class="stat-sub">OFFICIAL REFEREE</span>
|
||||||
|
</div>
|
||||||
|
<div class="stat-glow referee-glow"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="combat-stat timing"
|
||||||
|
*ngIf="latestMatch?.state === MatchState.NOT_STARTED"
|
||||||
|
>
|
||||||
|
<div class="stat-icon">
|
||||||
|
<div class="time-ring"></div>
|
||||||
|
<span>⚡</span>
|
||||||
|
</div>
|
||||||
|
<div class="stat-content">
|
||||||
|
<span class="stat-label">COMBAT START</span>
|
||||||
|
<span class="stat-value">{{ getTimeUntilMatch() }}</span>
|
||||||
|
<span class="stat-sub">LIVE BATTLE</span>
|
||||||
|
</div>
|
||||||
|
<div class="stat-glow timing-glow"></div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="combat-stat funfact"
|
||||||
|
*ngIf="latestMatch?.state !== MatchState.NOT_STARTED"
|
||||||
|
>
|
||||||
|
<div class="stat-icon">
|
||||||
|
<span>🎯</span>
|
||||||
|
</div>
|
||||||
|
<div class="stat-content">
|
||||||
|
<span class="stat-label">FUN FACT</span>
|
||||||
|
<span class="stat-value">
|
||||||
|
Saviez-vous que l'escrime est l'un des sports les plus anciens aux
|
||||||
|
Jeux Olympiques ?
|
||||||
|
</span>
|
||||||
|
<span class="stat-sub">Inspiration et tradition au rendez-vous</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="weapons-container">
|
||||||
|
<div class="weapon-card" style="background-image: url('./assets/epee_escrime.jpg');">
|
||||||
|
<h2>Épée</h2>
|
||||||
|
<p>Tout le corps est cible valable. Pas de priorité.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="weapon-card" style="background-image: url('./assets/fleuret_escrime.jpg');">
|
||||||
|
<h2>Fleuret</h2>
|
||||||
|
<p>Cible : torse. La priorité s'applique.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="weapon-card" style="background-image: url('./assets/sabre_escrime.jpg');">
|
||||||
|
<h2>Sabre</h2>
|
||||||
|
<p>Cible : haut du corps. Priorité en cas de touche simultanée.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="weapon-card" style="background-image: url('./assets/sabre_laser_escrime.jpg');">
|
||||||
|
<h2>Sabre Laser</h2>
|
||||||
|
<p>Arme moderne d’escrime sportive, inspirée de la science-fiction. Lame lumineuse, règles proches du sabre classique. Discipline visuelle et dynamique.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<app-sponsort></app-sponsort>
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { HomeComponent } from './home.component';
|
||||||
|
|
||||||
|
describe('HomeComponent', () => {
|
||||||
|
let component: HomeComponent;
|
||||||
|
let fixture: ComponentFixture<HomeComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [HomeComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(HomeComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
159
FencerJudgeFront/src/app/components/home/home.component.ts
Normal file
159
FencerJudgeFront/src/app/components/home/home.component.ts
Normal file
|
|
@ -0,0 +1,159 @@
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
|
import { MatchesService } from '@services/matches/matches.service';
|
||||||
|
import { Matches, MatchState } from '@interfaces/matches';
|
||||||
|
|
||||||
|
import { PlayerService } from '@services/player/player.service';
|
||||||
|
import { Player } from '@interfaces/player';
|
||||||
|
|
||||||
|
import { RefereeService } from '@services/referee/referee.service';
|
||||||
|
import { Referee, RefereeLevel } from '@interfaces/referee';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-home',
|
||||||
|
standalone: false,
|
||||||
|
templateUrl: './home.component.html',
|
||||||
|
styleUrl: './home.component.css',
|
||||||
|
})
|
||||||
|
export class HomeComponent {
|
||||||
|
latestMatch?: Matches;
|
||||||
|
player1?: Player;
|
||||||
|
player2?: Player;
|
||||||
|
referee?: Referee;
|
||||||
|
MatchState = MatchState;
|
||||||
|
intervalId?: any;
|
||||||
|
timeUntilMatch: string | null = null;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private matchesService: MatchesService,
|
||||||
|
private playerService: PlayerService,
|
||||||
|
private refereeService: RefereeService
|
||||||
|
) {}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.getLatestMatch();
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
if (this.intervalId) {
|
||||||
|
clearInterval(this.intervalId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private getLatestMatch(): void {
|
||||||
|
this.matchesService.getMatches().subscribe((matches) => {
|
||||||
|
if (matches.length > 0) {
|
||||||
|
this.latestMatch = matches[matches.length - 1];
|
||||||
|
console.log(
|
||||||
|
'[HomeComponent] 🏁 Dernier match ajouté :',
|
||||||
|
this.latestMatch
|
||||||
|
);
|
||||||
|
|
||||||
|
// Récupération des données liées
|
||||||
|
this.loadRelatedEntities(this.latestMatch);
|
||||||
|
|
||||||
|
if (this.latestMatch.state === MatchState.NOT_STARTED) {
|
||||||
|
this.updateTimeUntilMatch(); // initial
|
||||||
|
this.intervalId = setInterval(() => {
|
||||||
|
this.updateTimeUntilMatch();
|
||||||
|
}, 60000); // chaque minute
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.warn('[HomeComponent] Aucun match disponible');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private updateTimeUntilMatch(): void {
|
||||||
|
if (!this.latestMatch) return;
|
||||||
|
|
||||||
|
const now = new Date();
|
||||||
|
const matchDate = new Date(this.latestMatch.date);
|
||||||
|
const diffMs = matchDate.getTime() - now.getTime();
|
||||||
|
|
||||||
|
if (diffMs <= 0) {
|
||||||
|
this.timeUntilMatch = null;
|
||||||
|
clearInterval(this.intervalId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const totalMinutes = Math.floor(diffMs / (1000 * 60));
|
||||||
|
const days = Math.floor(totalMinutes / (60 * 24));
|
||||||
|
const hours = Math.floor((totalMinutes % (60 * 24)) / 60);
|
||||||
|
const minutes = totalMinutes % 60;
|
||||||
|
|
||||||
|
let result = '';
|
||||||
|
if (days > 0) result += `${days}j `;
|
||||||
|
if (hours > 0 || days > 0) result += `${hours}h `;
|
||||||
|
result += `${minutes}min`;
|
||||||
|
|
||||||
|
this.timeUntilMatch = result.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
private loadRelatedEntities(match: Matches): void {
|
||||||
|
this.playerService.getPlayerById(match.player1ID).subscribe((p1) => {
|
||||||
|
this.player1 = p1!;
|
||||||
|
});
|
||||||
|
|
||||||
|
this.playerService.getPlayerById(match.player2ID).subscribe((p2) => {
|
||||||
|
this.player2 = p2!;
|
||||||
|
});
|
||||||
|
|
||||||
|
this.refereeService.getRefereeById(match.refereeID).subscribe((ref) => {
|
||||||
|
this.referee = ref!;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
getMatchStateLabel(state: MatchState): string {
|
||||||
|
switch (state) {
|
||||||
|
case MatchState.NOT_STARTED:
|
||||||
|
return 'À venir';
|
||||||
|
case MatchState.ONGOING:
|
||||||
|
return 'En cours';
|
||||||
|
case MatchState.OVER:
|
||||||
|
return 'Terminé';
|
||||||
|
default:
|
||||||
|
return 'Inconnu';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getMatchStateColor(state: MatchState): string {
|
||||||
|
switch (state) {
|
||||||
|
case MatchState.NOT_STARTED:
|
||||||
|
return 'secondary';
|
||||||
|
case MatchState.ONGOING:
|
||||||
|
return 'warning';
|
||||||
|
case MatchState.OVER:
|
||||||
|
return 'success';
|
||||||
|
default:
|
||||||
|
return 'light';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getTimeUntilMatch(): string | null {
|
||||||
|
if (
|
||||||
|
!this.latestMatch ||
|
||||||
|
this.latestMatch.state !== MatchState.NOT_STARTED
|
||||||
|
) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const now = new Date();
|
||||||
|
const matchDate = new Date(this.latestMatch.date);
|
||||||
|
const diffMs = matchDate.getTime() - now.getTime();
|
||||||
|
|
||||||
|
if (diffMs <= 0) return null;
|
||||||
|
|
||||||
|
const totalMinutes = Math.floor(diffMs / (1000 * 60));
|
||||||
|
const days = Math.floor(totalMinutes / (60 * 24));
|
||||||
|
const hours = Math.floor((totalMinutes % (60 * 24)) / 60);
|
||||||
|
const minutes = totalMinutes % 60;
|
||||||
|
|
||||||
|
let result = '';
|
||||||
|
if (days > 0) result += `${days}j `;
|
||||||
|
if (hours > 0 || days > 0) result += `${hours}h `;
|
||||||
|
result += `${minutes}min`;
|
||||||
|
|
||||||
|
return result.trim();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
form fieldset {
|
||||||
|
background-color: #f8f9fa; /* gris clair */
|
||||||
|
}
|
||||||
|
|
||||||
|
form legend {
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 1.1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
form label {
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
form button {
|
||||||
|
width: 100%;
|
||||||
|
padding: 0.6rem;
|
||||||
|
font-size: 1.1rem;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,171 @@
|
||||||
|
<h2 class="mb-4">Ajouter un match</h2>
|
||||||
|
|
||||||
|
<form (ngSubmit)="onSubmit()" class="needs-validation" novalidate>
|
||||||
|
<fieldset class="border p-3 mb-4 rounded">
|
||||||
|
<legend class="w-auto px-2">Joueur 1</legend>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Prénom :</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
[(ngModel)]="formData.player1FirstName"
|
||||||
|
name="player1FirstName"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Nom :</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
[(ngModel)]="formData.player1Name"
|
||||||
|
name="player1Name"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Club :</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
[(ngModel)]="formData.player1Club"
|
||||||
|
name="player1Club"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
|
||||||
|
<fieldset class="border p-3 mb-4 rounded">
|
||||||
|
<legend class="w-auto px-2">Joueur 2</legend>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Prénom :</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
[(ngModel)]="formData.player2FirstName"
|
||||||
|
name="player2FirstName"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Nom :</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
[(ngModel)]="formData.player2Name"
|
||||||
|
name="player2Name"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Club :</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
[(ngModel)]="formData.player2Club"
|
||||||
|
name="player2Club"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
|
||||||
|
<fieldset class="border p-3 mb-4 rounded">
|
||||||
|
<legend class="w-auto px-2">Arbitre</legend>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Prénom :</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
[(ngModel)]="formData.refereeFirstName"
|
||||||
|
name="refereeFirstName"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Nom :</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
[(ngModel)]="formData.refereeName"
|
||||||
|
name="refereeName"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Niveau :</label>
|
||||||
|
<select
|
||||||
|
class="form-select"
|
||||||
|
[(ngModel)]="formData.refereelevel"
|
||||||
|
name="refereelevel"
|
||||||
|
required
|
||||||
|
>
|
||||||
|
<option [value]="0">Départemental</option>
|
||||||
|
<option [value]="1">Régional</option>
|
||||||
|
<option [value]="2">National</option>
|
||||||
|
<option [value]="3">International</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
|
||||||
|
<fieldset class="border p-3 mb-4 rounded">
|
||||||
|
<legend class="w-auto px-2">Match</legend>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Ville :</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
[(ngModel)]="formData.city"
|
||||||
|
name="city"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Pays :</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
[(ngModel)]="formData.country"
|
||||||
|
name="country"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Arme :</label>
|
||||||
|
<select
|
||||||
|
class="form-select"
|
||||||
|
[(ngModel)]="formData.weapon"
|
||||||
|
name="weapon"
|
||||||
|
required
|
||||||
|
>
|
||||||
|
<option value="Épée">Épée</option>
|
||||||
|
<option value="Sabre">Sabre</option>
|
||||||
|
<option value="Fleuret">Fleuret</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="form-label">Date :</label>
|
||||||
|
<input
|
||||||
|
type="datetime-local"
|
||||||
|
class="form-control"
|
||||||
|
[(ngModel)]="formData.date"
|
||||||
|
name="date"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
|
||||||
|
<button type="submit" class="btn btn-primary">Créer le match</button>
|
||||||
|
</form>
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { MatchesAddComponent } from './matches-add.component';
|
||||||
|
|
||||||
|
describe('MatchesAddComponent', () => {
|
||||||
|
let component: MatchesAddComponent;
|
||||||
|
let fixture: ComponentFixture<MatchesAddComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [MatchesAddComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(MatchesAddComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,97 @@
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
import { FormsModule } from '@angular/forms';
|
||||||
|
|
||||||
|
import { MatchesService } from '@services/matches/matches.service';
|
||||||
|
import { MatchState } from '@interfaces/matches';
|
||||||
|
|
||||||
|
import { PlayerService } from '@services/player/player.service';
|
||||||
|
|
||||||
|
import { RefereeService } from '@services/referee/referee.service';
|
||||||
|
import { Referee, RefereeLevel } from '@interfaces/referee';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-matches-add',
|
||||||
|
standalone: false,
|
||||||
|
templateUrl: './matches-add.component.html',
|
||||||
|
styleUrl: './matches-add.component.css',
|
||||||
|
})
|
||||||
|
export class MatchesAddComponent {
|
||||||
|
formData = {
|
||||||
|
player1Id: 0,
|
||||||
|
player1FirstName: '',
|
||||||
|
player1Name: '',
|
||||||
|
player1Club: '',
|
||||||
|
|
||||||
|
player2Id: 0,
|
||||||
|
player2FirstName: '',
|
||||||
|
player2Name: '',
|
||||||
|
player2Club: '',
|
||||||
|
|
||||||
|
refereeId: 0,
|
||||||
|
refereeFirstName: '',
|
||||||
|
refereeName: '',
|
||||||
|
refereelevel: 0,
|
||||||
|
|
||||||
|
city: '',
|
||||||
|
country: '',
|
||||||
|
weapon: '',
|
||||||
|
date: '',
|
||||||
|
};
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private matchService: MatchesService,
|
||||||
|
private playerService: PlayerService,
|
||||||
|
private refereeService: RefereeService,
|
||||||
|
private router: Router
|
||||||
|
) {}
|
||||||
|
|
||||||
|
onSubmit(): void {
|
||||||
|
this.playerService
|
||||||
|
.getOrCreateByName(
|
||||||
|
this.formData.player1FirstName,
|
||||||
|
this.formData.player1Name,
|
||||||
|
this.formData.player1Club
|
||||||
|
)
|
||||||
|
.subscribe((player1) => {
|
||||||
|
this.formData['player1Id'] = player1.id;
|
||||||
|
|
||||||
|
this.playerService
|
||||||
|
.getOrCreateByName(
|
||||||
|
this.formData.player2FirstName,
|
||||||
|
this.formData.player2Name,
|
||||||
|
this.formData.player2Club
|
||||||
|
)
|
||||||
|
.subscribe((player2) => {
|
||||||
|
this.formData['player2Id'] = player2.id;
|
||||||
|
|
||||||
|
this.refereeService
|
||||||
|
.getOrCreateByName(
|
||||||
|
this.formData.refereeFirstName,
|
||||||
|
this.formData.refereeName,
|
||||||
|
this.formData.refereelevel
|
||||||
|
)
|
||||||
|
.subscribe((referee) => {
|
||||||
|
this.formData['refereeId'] = referee.id;
|
||||||
|
|
||||||
|
const matchPayload = {
|
||||||
|
refereeID: referee.id,
|
||||||
|
player1ID: player1.id,
|
||||||
|
score1: 0,
|
||||||
|
player2ID: player2.id,
|
||||||
|
score2: 0,
|
||||||
|
country: this.formData.country,
|
||||||
|
city: this.formData.city,
|
||||||
|
weapon: this.formData.weapon,
|
||||||
|
date: new Date(this.formData.date),
|
||||||
|
state: MatchState.NOT_STARTED,
|
||||||
|
};
|
||||||
|
|
||||||
|
this.matchService.create(matchPayload).subscribe(() => {
|
||||||
|
this.router.navigate(['/matches']);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
<p>matches-del works!</p>
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { MatchesDelComponent } from './matches-del.component';
|
||||||
|
|
||||||
|
describe('MatchesDelComponent', () => {
|
||||||
|
let component: MatchesDelComponent;
|
||||||
|
let fixture: ComponentFixture<MatchesDelComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [MatchesDelComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(MatchesDelComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
|
||||||
|
import { AuthService } from '@services/auth/auth.service';
|
||||||
|
import { MatchesService } from '@services/matches/matches.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-matches-del',
|
||||||
|
standalone: false,
|
||||||
|
templateUrl: './matches-del.component.html',
|
||||||
|
styleUrl: './matches-del.component.css',
|
||||||
|
})
|
||||||
|
export class MatchesDelComponent {
|
||||||
|
constructor(
|
||||||
|
private route: ActivatedRoute,
|
||||||
|
public authService: AuthService,
|
||||||
|
private router: Router,
|
||||||
|
private matchService: MatchesService
|
||||||
|
) {}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
const id = Number(this.route.snapshot.paramMap.get('id'));
|
||||||
|
|
||||||
|
if (!isNaN(id)) {
|
||||||
|
this.matchService.deleteMatch(id).subscribe({
|
||||||
|
next: () => {
|
||||||
|
console.log(`Match ${id} supprimé`);
|
||||||
|
this.router.navigate(['/matches']); // redirection après suppression
|
||||||
|
},
|
||||||
|
error: (err) => {
|
||||||
|
console.error('Erreur lors de la suppression :', err);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
console.error('ID de match invalide');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
.card {
|
||||||
|
border-left-width: 0.5rem !important;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,96 @@
|
||||||
|
<div class="container my-4" *ngIf="match && player1 && player2">
|
||||||
|
<h2 class="mb-4 text-center">Détail du Match</h2>
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="card shadow border-start-5 border-{{
|
||||||
|
getMatchStateColor(match.state)
|
||||||
|
}}"
|
||||||
|
>
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="d-flex justify-content-between align-items-center mb-2">
|
||||||
|
<h5 class="mb-0">
|
||||||
|
{{ match.city }}, {{ match.country }}
|
||||||
|
<br />
|
||||||
|
<small class="text-muted"
|
||||||
|
>{{ match.date | date : "fullDate" }} -
|
||||||
|
{{ match.date | date : "shortTime" }}</small
|
||||||
|
>
|
||||||
|
</h5>
|
||||||
|
<span class="badge bg-light text-dark">{{ match.weapon }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="d-flex justify-content-between align-items-center mt-3">
|
||||||
|
<div class="text-start">
|
||||||
|
<strong>{{ player1.firstName }} {{ player1.name }}</strong
|
||||||
|
><br />
|
||||||
|
<small class="text-muted">{{ player1.club }}</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="text-center">
|
||||||
|
<ng-container
|
||||||
|
*ngIf="
|
||||||
|
authService.isAuthenticated() && match.state != 2;
|
||||||
|
else displayScores
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="badge bg-primary fs-4"
|
||||||
|
style="cursor: pointer"
|
||||||
|
(click)="incrementScore(1)"
|
||||||
|
>
|
||||||
|
{{ match.score1 }}
|
||||||
|
</span>
|
||||||
|
<span class="text-muted mx-2">vs</span>
|
||||||
|
<span
|
||||||
|
class="badge bg-primary fs-4"
|
||||||
|
style="cursor: pointer"
|
||||||
|
(click)="incrementScore(2)"
|
||||||
|
>
|
||||||
|
{{ match.score2 }}
|
||||||
|
</span>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-template #displayScores>
|
||||||
|
<span class="badge bg-primary fs-4">{{ match.score1 }}</span>
|
||||||
|
<span class="text-muted mx-2">vs</span>
|
||||||
|
<span class="badge bg-primary fs-4">{{ match.score2 }}</span>
|
||||||
|
</ng-template>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="text-end">
|
||||||
|
<strong>{{ player2.firstName }} {{ player2.name }}</strong
|
||||||
|
><br />
|
||||||
|
<small class="text-muted">{{ player2.club }}</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-4">
|
||||||
|
<span class="badge bg-{{ getMatchStateColor(match.state) }} p-2 fs-6">
|
||||||
|
{{ getMatchStateLabel(match.state) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-3">
|
||||||
|
<h5>Arbitre</h5>
|
||||||
|
<div *ngIf="referee">
|
||||||
|
<p class="mb-0">
|
||||||
|
<strong>{{ referee.firstName }} {{ referee.name }}</strong>
|
||||||
|
</p>
|
||||||
|
<p class="text-muted">
|
||||||
|
Niveau : {{ getRefereeLevelLabel(referee.level) }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div *ngIf="!referee">
|
||||||
|
<p class="text-danger">Arbitre non trouvé.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Si erreur ou match introuvable -->
|
||||||
|
<div class="container my-5 text-center text-danger" *ngIf="!match">
|
||||||
|
<p>Match non trouvé.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<a (click)="goToMatchDel()" *ngIf="authService.isAuthenticated()">Delete</a>
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { MatchesIdComponent } from './matches-id.component';
|
||||||
|
|
||||||
|
describe('MatchesIdComponent', () => {
|
||||||
|
let component: MatchesIdComponent;
|
||||||
|
let fixture: ComponentFixture<MatchesIdComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [MatchesIdComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(MatchesIdComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,153 @@
|
||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { Router, ActivatedRoute } from '@angular/router';
|
||||||
|
import { AuthService } from '@services/auth/auth.service';
|
||||||
|
|
||||||
|
import { MatchesService } from '@services/matches/matches.service';
|
||||||
|
import { MatchState, Matches } from '@interfaces/matches';
|
||||||
|
|
||||||
|
import { PlayerService } from '@services/player/player.service';
|
||||||
|
import { Player } from '@interfaces/player';
|
||||||
|
|
||||||
|
import { RefereeService } from '@services/referee/referee.service';
|
||||||
|
import { Referee, RefereeLevel } from '@interfaces/referee';
|
||||||
|
|
||||||
|
import { getMatchStateLabel, getMatchStateColor } from '@utils/getState';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-matches-id',
|
||||||
|
standalone: false,
|
||||||
|
templateUrl: './matches-id.component.html',
|
||||||
|
styleUrl: './matches-id.component.css',
|
||||||
|
})
|
||||||
|
export class MatchesIdComponent implements OnInit {
|
||||||
|
match: Matches | undefined;
|
||||||
|
player1: Player | undefined;
|
||||||
|
player2: Player | undefined;
|
||||||
|
referee: Referee | undefined;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private route: ActivatedRoute,
|
||||||
|
private matchService: MatchesService,
|
||||||
|
private playerService: PlayerService,
|
||||||
|
private refereeService: RefereeService,
|
||||||
|
public authService: AuthService,
|
||||||
|
private router: Router
|
||||||
|
) {}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
const id = Number(this.route.snapshot.paramMap.get('id'));
|
||||||
|
this.matchService.getMatchById(id).subscribe((match) => {
|
||||||
|
if (match) {
|
||||||
|
this.match = match;
|
||||||
|
|
||||||
|
this.playerService
|
||||||
|
.getPlayerById(match.player1ID)
|
||||||
|
.subscribe((p1) => (this.player1 = p1!));
|
||||||
|
this.playerService
|
||||||
|
.getPlayerById(match.player2ID)
|
||||||
|
.subscribe((p2) => (this.player2 = p2!));
|
||||||
|
|
||||||
|
this.refereeService
|
||||||
|
.getRefereeById(match.refereeID)
|
||||||
|
.subscribe((ref) => (this.referee = ref!));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
saveScores(): void {
|
||||||
|
if (this.match) {
|
||||||
|
this.matchService.updateMatch(this.match.id, {
|
||||||
|
score1: this.match.score1,
|
||||||
|
score2: this.match.score2,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getMatchStateLabel(state: MatchState): string {
|
||||||
|
switch (state) {
|
||||||
|
case MatchState.NOT_STARTED:
|
||||||
|
return 'À venir';
|
||||||
|
case MatchState.ONGOING:
|
||||||
|
return 'En cours';
|
||||||
|
case MatchState.OVER:
|
||||||
|
return 'Terminé';
|
||||||
|
default:
|
||||||
|
return 'Inconnu';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getMatchStateColor(state: MatchState): string {
|
||||||
|
switch (state) {
|
||||||
|
case MatchState.NOT_STARTED:
|
||||||
|
return 'secondary';
|
||||||
|
case MatchState.ONGOING:
|
||||||
|
return 'warning';
|
||||||
|
case MatchState.OVER:
|
||||||
|
return 'success';
|
||||||
|
default:
|
||||||
|
return 'light';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getRefereeLevelLabel(level: RefereeLevel): string {
|
||||||
|
switch (level) {
|
||||||
|
case RefereeLevel.NATIONAL:
|
||||||
|
return 'National';
|
||||||
|
case RefereeLevel.REGIONAL:
|
||||||
|
return 'Régional';
|
||||||
|
case RefereeLevel.DEPARTMENTAL:
|
||||||
|
return 'Départemental';
|
||||||
|
default:
|
||||||
|
return 'Inconnu';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
updateScores(): void {
|
||||||
|
if (this.match) {
|
||||||
|
this.matchService.updateMatch(this.match.id, {
|
||||||
|
score1: this.match.score1,
|
||||||
|
score2: this.match.score2,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
incrementScore(player: 1 | 2): void {
|
||||||
|
if (!this.match) return;
|
||||||
|
|
||||||
|
// Incrémente le score du joueur
|
||||||
|
if (player === 1) {
|
||||||
|
this.match.score1 += 1;
|
||||||
|
} else {
|
||||||
|
this.match.score2 += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Change l'état en fonction des scores
|
||||||
|
if (
|
||||||
|
this.match.score1 === 1 &&
|
||||||
|
this.match.score2 === 0 &&
|
||||||
|
this.match.state === MatchState.NOT_STARTED
|
||||||
|
) {
|
||||||
|
this.match.state = MatchState.ONGOING; // passage à l'état 1 (en cours)
|
||||||
|
} else if (
|
||||||
|
this.match.score2 === 1 &&
|
||||||
|
this.match.score1 === 0 &&
|
||||||
|
this.match.state === MatchState.NOT_STARTED
|
||||||
|
) {
|
||||||
|
this.match.state = MatchState.ONGOING;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Si l'un des scores arrive à 15, on considère le match terminé
|
||||||
|
if (this.match.score1 >= 15 || this.match.score2 >= 15) {
|
||||||
|
this.match.state = MatchState.OVER; // passage à l'état 2 (terminé)
|
||||||
|
}
|
||||||
|
|
||||||
|
this.updateScores();
|
||||||
|
}
|
||||||
|
|
||||||
|
goToMatchDel(): void {
|
||||||
|
this.router.navigate([
|
||||||
|
'/matches/del/',
|
||||||
|
this.route.snapshot.paramMap.get('id'),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
.border-start-5 {
|
||||||
|
border-left: 5px solid #ccc;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card:hover {
|
||||||
|
transform: translateY(-2px);
|
||||||
|
transition: 0.2s ease-in-out;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,53 @@
|
||||||
|
<div class="container my-4">
|
||||||
|
<h2 class="mb-4 text-center">Liste des Matchs</h2>
|
||||||
|
|
||||||
|
<div class="row g-4">
|
||||||
|
<div class="col-md-6" *ngFor="let match of matches">
|
||||||
|
<div
|
||||||
|
class="card shadow-sm border-start-5"
|
||||||
|
[ngClass]="getMatchBorderColor(match.state)"
|
||||||
|
style="cursor: pointer"
|
||||||
|
(click)="goToMatchDetail(match.id)"
|
||||||
|
>
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="d-flex justify-content-between align-items-center mb-2">
|
||||||
|
<h5 class="mb-0">
|
||||||
|
{{ match.city }} —
|
||||||
|
<small class="text-muted">{{
|
||||||
|
match.date | date : "longDate"
|
||||||
|
}}</small>
|
||||||
|
</h5>
|
||||||
|
<span class="badge bg-light text-dark">{{ match.weapon }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="d-flex justify-content-between align-items-center">
|
||||||
|
<div class="text-start">
|
||||||
|
<strong>{{ getPlayerName(match.player1ID) }}</strong>
|
||||||
|
<span class="badge bg-primary ms-2">{{ match.score1 }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="text-center text-muted">vs</div>
|
||||||
|
|
||||||
|
<div class="text-end">
|
||||||
|
<strong>{{ getPlayerName(match.player2ID) }}</strong>
|
||||||
|
<span class="badge bg-primary ms-2">{{ match.score2 }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-3">
|
||||||
|
<span
|
||||||
|
class="badge"
|
||||||
|
[ngClass]="{
|
||||||
|
'bg-secondary': match.state === MatchState.NOT_STARTED,
|
||||||
|
'bg-warning text-dark': match.state === MatchState.ONGOING,
|
||||||
|
'bg-success': match.state === MatchState.OVER
|
||||||
|
}"
|
||||||
|
>
|
||||||
|
{{ getMatchStatusLabel(match.state) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { MatchesComponent } from './matches.component';
|
||||||
|
|
||||||
|
describe('MatchesComponent', () => {
|
||||||
|
let component: MatchesComponent;
|
||||||
|
let fixture: ComponentFixture<MatchesComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [MatchesComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(MatchesComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,72 @@
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
|
||||||
|
import { MatchesService } from '@services/matches/matches.service';
|
||||||
|
import { Matches, MatchState } from '@interfaces/matches';
|
||||||
|
|
||||||
|
import { PlayerService } from '@services/player/player.service';
|
||||||
|
import { Player } from '@interfaces/player';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-matches',
|
||||||
|
standalone: false,
|
||||||
|
templateUrl: './matches.component.html',
|
||||||
|
styleUrl: './matches.component.css',
|
||||||
|
})
|
||||||
|
export class MatchesComponent {
|
||||||
|
matches: Matches[] = [];
|
||||||
|
playersMap: Map<number, Player> = new Map();
|
||||||
|
MatchState = MatchState;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private matchesService: MatchesService,
|
||||||
|
private playerService: PlayerService,
|
||||||
|
private router: Router
|
||||||
|
) {}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.playerService.getPlayers().subscribe((players) => {
|
||||||
|
// construire la map ID -> joueur
|
||||||
|
players.forEach((player) => this.playersMap.set(player.id, player));
|
||||||
|
});
|
||||||
|
|
||||||
|
this.matchesService.getMatches().subscribe((data) => {
|
||||||
|
this.matches = data;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
getPlayerName(id: number): string {
|
||||||
|
const player = this.playersMap.get(id);
|
||||||
|
return player ? `${player.firstName} ${player.name}` : 'Joueur inconnu';
|
||||||
|
}
|
||||||
|
|
||||||
|
getMatchBorderColor(state: MatchState): string {
|
||||||
|
switch (state) {
|
||||||
|
case MatchState.NOT_STARTED:
|
||||||
|
return 'border-secondary';
|
||||||
|
case MatchState.ONGOING:
|
||||||
|
return 'border-warning';
|
||||||
|
case MatchState.OVER:
|
||||||
|
return 'border-success';
|
||||||
|
default:
|
||||||
|
return 'border-light';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getMatchStatusLabel(state: MatchState): string {
|
||||||
|
switch (state) {
|
||||||
|
case MatchState.NOT_STARTED:
|
||||||
|
return 'À venir';
|
||||||
|
case MatchState.ONGOING:
|
||||||
|
return 'En cours';
|
||||||
|
case MatchState.OVER:
|
||||||
|
return 'Terminé';
|
||||||
|
default:
|
||||||
|
return 'Inconnu';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
goToMatchDetail(matchId: number): void {
|
||||||
|
this.router.navigate(['/matches', matchId]);
|
||||||
|
}
|
||||||
|
}
|
||||||
17
FencerJudgeFront/src/app/guards/auth.guard.spec.ts
Normal file
17
FencerJudgeFront/src/app/guards/auth.guard.spec.ts
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { CanActivateFn } from '@angular/router';
|
||||||
|
|
||||||
|
import { authGuard } from './auth.guard';
|
||||||
|
|
||||||
|
describe('authGuard', () => {
|
||||||
|
const executeGuard: CanActivateFn = (...guardParameters) =>
|
||||||
|
TestBed.runInInjectionContext(() => authGuard(...guardParameters));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(executeGuard).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
15
FencerJudgeFront/src/app/guards/auth.guard.ts
Normal file
15
FencerJudgeFront/src/app/guards/auth.guard.ts
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
import { inject } from '@angular/core';
|
||||||
|
import { CanActivateFn, Router } from '@angular/router';
|
||||||
|
import { AuthService } from '@services/auth/auth.service';
|
||||||
|
|
||||||
|
export const authGuard: CanActivateFn = (route, state) => {
|
||||||
|
const authService = inject(AuthService);
|
||||||
|
const router = inject(Router);
|
||||||
|
|
||||||
|
if (!authService.isAuthenticated()) {
|
||||||
|
router.navigate(['/login']);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
};
|
||||||
19
FencerJudgeFront/src/app/interfaces/matches.ts
Normal file
19
FencerJudgeFront/src/app/interfaces/matches.ts
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
export enum MatchState {
|
||||||
|
ONGOING = 0,
|
||||||
|
OVER = 1,
|
||||||
|
NOT_STARTED = 2,
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Matches {
|
||||||
|
id: number;
|
||||||
|
refereeID: number;
|
||||||
|
player1ID: number;
|
||||||
|
score1: number;
|
||||||
|
player2ID: number;
|
||||||
|
score2: number;
|
||||||
|
country: String;
|
||||||
|
city: String;
|
||||||
|
weapon: String;
|
||||||
|
date: Date;
|
||||||
|
state: MatchState;
|
||||||
|
}
|
||||||
5
FencerJudgeFront/src/app/interfaces/models/user.model.ts
Normal file
5
FencerJudgeFront/src/app/interfaces/models/user.model.ts
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
export interface UserModel {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
firstName: string;
|
||||||
|
}
|
||||||
5
FencerJudgeFront/src/app/interfaces/player.ts
Normal file
5
FencerJudgeFront/src/app/interfaces/player.ts
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
import { UserModel } from './models/user.model';
|
||||||
|
|
||||||
|
export interface Player extends UserModel {
|
||||||
|
club: string;
|
||||||
|
}
|
||||||
12
FencerJudgeFront/src/app/interfaces/referee.ts
Normal file
12
FencerJudgeFront/src/app/interfaces/referee.ts
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
import { UserModel } from './models/user.model';
|
||||||
|
|
||||||
|
export enum RefereeLevel {
|
||||||
|
DEPARTMENTAL = 0,
|
||||||
|
REGIONAL = 1,
|
||||||
|
NATIONAL = 2,
|
||||||
|
INTERNATIONAL = 3,
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Referee extends UserModel {
|
||||||
|
level: RefereeLevel;
|
||||||
|
}
|
||||||
16
FencerJudgeFront/src/app/services/auth/auth.service.spec.ts
Normal file
16
FencerJudgeFront/src/app/services/auth/auth.service.spec.ts
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { AuthService } from './auth.service';
|
||||||
|
|
||||||
|
describe('AuthService', () => {
|
||||||
|
let service: AuthService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(AuthService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
35
FencerJudgeFront/src/app/services/auth/auth.service.ts
Normal file
35
FencerJudgeFront/src/app/services/auth/auth.service.ts
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root',
|
||||||
|
})
|
||||||
|
export class AuthService {
|
||||||
|
private isLoggedIn = false;
|
||||||
|
private readonly hardcodedUser = {
|
||||||
|
email: 'user@test.com',
|
||||||
|
password: 'password123',
|
||||||
|
};
|
||||||
|
|
||||||
|
constructor(private router: Router) {}
|
||||||
|
|
||||||
|
login(email: string, password: string): boolean {
|
||||||
|
if (
|
||||||
|
email === this.hardcodedUser.email &&
|
||||||
|
password === this.hardcodedUser.password
|
||||||
|
) {
|
||||||
|
this.isLoggedIn = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
logout(): void {
|
||||||
|
this.isLoggedIn = false;
|
||||||
|
this.router.navigate(['/login']);
|
||||||
|
}
|
||||||
|
|
||||||
|
isAuthenticated(): boolean {
|
||||||
|
return this.isLoggedIn;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { MatchesService } from './matches.service';
|
||||||
|
|
||||||
|
describe('MatchesService', () => {
|
||||||
|
let service: MatchesService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(MatchesService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
107
FencerJudgeFront/src/app/services/matches/matches.service.ts
Normal file
107
FencerJudgeFront/src/app/services/matches/matches.service.ts
Normal file
|
|
@ -0,0 +1,107 @@
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Observable, of } from 'rxjs';
|
||||||
|
import { Matches, MatchState } from '@interfaces/matches';
|
||||||
|
|
||||||
|
@Injectable({ providedIn: 'root' })
|
||||||
|
export class MatchesService {
|
||||||
|
private matches: Matches[] = [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
refereeID: 10,
|
||||||
|
player1ID: 1,
|
||||||
|
score1: 15,
|
||||||
|
player2ID: 2,
|
||||||
|
score2: 13,
|
||||||
|
country: 'France',
|
||||||
|
city: 'Paris',
|
||||||
|
weapon: 'Fleuret',
|
||||||
|
date: new Date('2025-06-10T14:00:00'),
|
||||||
|
state: MatchState.OVER,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 2,
|
||||||
|
refereeID: 11,
|
||||||
|
player1ID: 3,
|
||||||
|
score1: 5,
|
||||||
|
player2ID: 4,
|
||||||
|
score2: 7,
|
||||||
|
country: 'France',
|
||||||
|
city: 'Lyon',
|
||||||
|
weapon: 'Épée',
|
||||||
|
date: new Date('2025-06-15T10:00:00'),
|
||||||
|
state: MatchState.ONGOING,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 3,
|
||||||
|
refereeID: 12,
|
||||||
|
player1ID: 5,
|
||||||
|
score1: 0,
|
||||||
|
player2ID: 6,
|
||||||
|
score2: 0,
|
||||||
|
country: 'Belgique',
|
||||||
|
city: 'Bruxelles',
|
||||||
|
weapon: 'Sabre',
|
||||||
|
date: new Date('2025-06-20T16:30:00'),
|
||||||
|
state: MatchState.NOT_STARTED,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
private nextMatchId = Math.max(...this.matches.map((m) => m.id)) + 1;
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
console.log('[MatchesService] Initial matches loaded:', this.matches);
|
||||||
|
}
|
||||||
|
|
||||||
|
getMatches(): Observable<Matches[]> {
|
||||||
|
console.log('[MatchesService] Fetching all matches');
|
||||||
|
return of(this.matches);
|
||||||
|
}
|
||||||
|
|
||||||
|
getMatchById(id: number): Observable<Matches | undefined> {
|
||||||
|
const match = this.matches.find((m) => m.id === id);
|
||||||
|
console.log(`[MatchesService] Fetching match ID: ${id}`, match);
|
||||||
|
return of(match);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Préparation future pour WebSocket
|
||||||
|
connectToMatchUpdatesWebSocket(): void {
|
||||||
|
console.log(
|
||||||
|
'[MatchesService] WebSocket connection placeholder initialized'
|
||||||
|
);
|
||||||
|
// ici tu pourrais plus tard faire : this.socket = new WebSocket('ws://...') etc.
|
||||||
|
}
|
||||||
|
|
||||||
|
updateMatch(id: number, updatedData: Partial<Matches>): void {
|
||||||
|
const match = this.matches.find((m) => m.id === id);
|
||||||
|
if (match) {
|
||||||
|
Object.assign(match, updatedData);
|
||||||
|
console.log(`[MatchesService] Match ${id} mis à jour :`, match);
|
||||||
|
} else {
|
||||||
|
console.warn(`[MatchesService] Match ${id} introuvable`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create(match: Omit<Matches, 'id'>): Observable<Matches> {
|
||||||
|
const newMatch: Matches = {
|
||||||
|
...match,
|
||||||
|
id: this.nextMatchId++,
|
||||||
|
};
|
||||||
|
|
||||||
|
this.matches.push(newMatch);
|
||||||
|
console.log('[MatchesService] Match created:', newMatch);
|
||||||
|
return of(newMatch);
|
||||||
|
}
|
||||||
|
|
||||||
|
deleteMatch(id: number): Observable<boolean> {
|
||||||
|
const index = this.matches.findIndex((m) => m.id === id);
|
||||||
|
|
||||||
|
if (index !== -1) {
|
||||||
|
const deletedMatch = this.matches.splice(index, 1)[0];
|
||||||
|
console.log(`[MatchesService] Match ${id} supprimé :`, deletedMatch);
|
||||||
|
|
||||||
|
return of(true);
|
||||||
|
} else {
|
||||||
|
console.warn(`[MatchesService] Match ${id} introuvable pour suppression`);
|
||||||
|
return of(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { PlayerService } from './player.service';
|
||||||
|
|
||||||
|
describe('PlayerService', () => {
|
||||||
|
let service: PlayerService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(PlayerService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
61
FencerJudgeFront/src/app/services/player/player.service.ts
Normal file
61
FencerJudgeFront/src/app/services/player/player.service.ts
Normal file
|
|
@ -0,0 +1,61 @@
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Observable, of } from 'rxjs';
|
||||||
|
import { Player } from '@interfaces/player';
|
||||||
|
|
||||||
|
@Injectable({ providedIn: 'root' })
|
||||||
|
export class PlayerService {
|
||||||
|
private players: Player[] = [
|
||||||
|
{ id: 1, name: 'Martin', firstName: 'Alex', club: 'Lille Escrime' },
|
||||||
|
{ id: 2, name: 'Nguyen', firstName: 'Sophie', club: 'Paris Epée' },
|
||||||
|
{ id: 3, name: 'Klein', firstName: 'Thomas', club: 'Strasbourg Sabre' },
|
||||||
|
{ id: 4, name: 'Leclerc', firstName: 'Lucie', club: 'Nice Fleuret' },
|
||||||
|
{ id: 5, name: 'Dubois', firstName: 'Hugo', club: 'Lyon Epée' },
|
||||||
|
{ id: 6, name: 'Girard', firstName: 'Manon', club: 'Marseille Club' },
|
||||||
|
];
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
console.log('[PlayerService] Initial players loaded:', this.players);
|
||||||
|
}
|
||||||
|
|
||||||
|
getPlayers(): Observable<Player[]> {
|
||||||
|
console.log('[PlayerService] Fetching all players');
|
||||||
|
return of(this.players);
|
||||||
|
}
|
||||||
|
|
||||||
|
getPlayerById(id: number): Observable<Player | undefined> {
|
||||||
|
const player = this.players.find((p) => p.id === id);
|
||||||
|
console.log(`[PlayerService] Fetching player ID: ${id}`, player);
|
||||||
|
return of(player);
|
||||||
|
}
|
||||||
|
|
||||||
|
getOrCreateByName(
|
||||||
|
firstName: string,
|
||||||
|
name: string,
|
||||||
|
club: string = 'Inconnu'
|
||||||
|
): Observable<Player> {
|
||||||
|
const existing = this.players.find(
|
||||||
|
(p) =>
|
||||||
|
p.firstName.toLowerCase() === firstName.toLowerCase() &&
|
||||||
|
p.name.toLowerCase() === name.toLowerCase()
|
||||||
|
);
|
||||||
|
|
||||||
|
if (existing) {
|
||||||
|
console.log('[PlayerService] Joueur trouvé :', existing);
|
||||||
|
return of(existing);
|
||||||
|
}
|
||||||
|
|
||||||
|
const newPlayer: Player = {
|
||||||
|
id:
|
||||||
|
this.players.length > 0
|
||||||
|
? Math.max(...this.players.map((p) => p.id)) + 1
|
||||||
|
: 1,
|
||||||
|
firstName,
|
||||||
|
name,
|
||||||
|
club,
|
||||||
|
};
|
||||||
|
|
||||||
|
this.players.push(newPlayer);
|
||||||
|
console.log('[PlayerService] Nouveau joueur créé :', newPlayer);
|
||||||
|
return of(newPlayer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { RefereeService } from './referee.service';
|
||||||
|
|
||||||
|
describe('RefereeService', () => {
|
||||||
|
let service: RefereeService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(RefereeService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
73
FencerJudgeFront/src/app/services/referee/referee.service.ts
Normal file
73
FencerJudgeFront/src/app/services/referee/referee.service.ts
Normal file
|
|
@ -0,0 +1,73 @@
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Observable, of } from 'rxjs';
|
||||||
|
import { Referee, RefereeLevel } from '@interfaces/referee';
|
||||||
|
|
||||||
|
@Injectable({ providedIn: 'root' })
|
||||||
|
export class RefereeService {
|
||||||
|
private referees: Referee[] = [
|
||||||
|
{
|
||||||
|
id: 10,
|
||||||
|
name: 'Durand',
|
||||||
|
firstName: 'Pierre',
|
||||||
|
level: RefereeLevel.NATIONAL,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 11,
|
||||||
|
name: 'Lemoine',
|
||||||
|
firstName: 'Anna',
|
||||||
|
level: RefereeLevel.REGIONAL,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 12,
|
||||||
|
name: 'Morel',
|
||||||
|
firstName: 'Lucas',
|
||||||
|
level: RefereeLevel.DEPARTMENTAL,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
console.log('[RefereeService] Initial referees loaded:', this.referees);
|
||||||
|
}
|
||||||
|
|
||||||
|
getReferees(): Observable<Referee[]> {
|
||||||
|
console.log('[RefereeService] Fetching all referees');
|
||||||
|
return of(this.referees);
|
||||||
|
}
|
||||||
|
|
||||||
|
getRefereeById(id: number): Observable<Referee | undefined> {
|
||||||
|
const ref = this.referees.find((r) => r.id === id);
|
||||||
|
console.log(`[RefereeService] Fetching referee ID: ${id}`, ref);
|
||||||
|
return of(ref);
|
||||||
|
}
|
||||||
|
|
||||||
|
getOrCreateByName(
|
||||||
|
firstName: string,
|
||||||
|
name: string,
|
||||||
|
level: RefereeLevel
|
||||||
|
): Observable<Referee> {
|
||||||
|
const existing = this.referees.find(
|
||||||
|
(r) =>
|
||||||
|
r.firstName.toLowerCase() === firstName.toLowerCase() &&
|
||||||
|
r.name.toLowerCase() === name.toLowerCase()
|
||||||
|
);
|
||||||
|
|
||||||
|
if (existing) {
|
||||||
|
console.log('[RefereeService] Arbitre trouvé :', existing);
|
||||||
|
return of(existing);
|
||||||
|
}
|
||||||
|
|
||||||
|
const newPlayer: Referee = {
|
||||||
|
id:
|
||||||
|
this.referees.length > 0
|
||||||
|
? Math.max(...this.referees.map((r) => r.id)) + 1
|
||||||
|
: 1,
|
||||||
|
firstName,
|
||||||
|
name,
|
||||||
|
level,
|
||||||
|
};
|
||||||
|
|
||||||
|
this.referees.push(newPlayer);
|
||||||
|
console.log('[RefereeService] Nouveau arbitre créé :', newPlayer);
|
||||||
|
return of(newPlayer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,56 @@
|
||||||
|
@keyframes slides {
|
||||||
|
from {
|
||||||
|
transform: translateX(0);
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
transform: translateX(-100%);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.logos {
|
||||||
|
overflow: hidden;
|
||||||
|
padding: 30px 0px;
|
||||||
|
white-space: nowrap;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logos:before,
|
||||||
|
.logos:after {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
content: "";
|
||||||
|
width: 250px;
|
||||||
|
height: 100%;
|
||||||
|
z-index: 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logos:before {
|
||||||
|
left: 0;
|
||||||
|
background: linear-gradient(
|
||||||
|
to left,
|
||||||
|
rgba(255, 255, 255, 0),
|
||||||
|
rgb(255, 255, 255)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
.logos:after {
|
||||||
|
right: 0;
|
||||||
|
background: linear-gradient(
|
||||||
|
to right,
|
||||||
|
rgba(255, 255, 255, 0),
|
||||||
|
rgb(255, 255, 255)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo_items {
|
||||||
|
display: inline-block;
|
||||||
|
animation: 35s slides infinite linear;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logos:hover .logo_items {
|
||||||
|
animation-play-state: paused;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo_items img {
|
||||||
|
height: 100px;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,44 @@
|
||||||
|
<div class="logos">
|
||||||
|
<div class="logo_items">
|
||||||
|
<img
|
||||||
|
src="https://upload.wikimedia.org/wikipedia/en/9/93/French_Fencing_Federation_logo.png"
|
||||||
|
/>
|
||||||
|
<img
|
||||||
|
src="https://apollon.de/wp-content/uploads/2022/11/allstar_Logo_red_4c-1.png"
|
||||||
|
/>
|
||||||
|
<img
|
||||||
|
src="https://oca.asia/media/sports/federations/logos/1920px-International_Fencing_Federation_logo.svg.png"
|
||||||
|
/>
|
||||||
|
<img
|
||||||
|
src="https://www.leonpaul.com/media/wysiwyg/logos/Round_Leon-Paul_London-outlines800-W_B.jpg"
|
||||||
|
/>
|
||||||
|
<img src="https://trademarks.justia.com/media/image.php?serial=79024409" />
|
||||||
|
<img
|
||||||
|
src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSKR6GOyFsui_qK69EuxP7iGvrh590QkDTciA&s"
|
||||||
|
/>
|
||||||
|
<img
|
||||||
|
src="https://www.prieur-sports.us/assets/images/prieur-sport-fencing-equipment.png"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="logo_items">
|
||||||
|
<img
|
||||||
|
src="https://upload.wikimedia.org/wikipedia/en/9/93/French_Fencing_Federation_logo.png"
|
||||||
|
/>
|
||||||
|
<img
|
||||||
|
src="https://apollon.de/wp-content/uploads/2022/11/allstar_Logo_red_4c-1.png"
|
||||||
|
/>
|
||||||
|
<img
|
||||||
|
src="https://oca.asia/media/sports/federations/logos/1920px-International_Fencing_Federation_logo.svg.png"
|
||||||
|
/>
|
||||||
|
<img
|
||||||
|
src="https://www.leonpaul.com/media/wysiwyg/logos/Round_Leon-Paul_London-outlines800-W_B.jpg"
|
||||||
|
/>
|
||||||
|
<img src="https://trademarks.justia.com/media/image.php?serial=79024409" />
|
||||||
|
<img
|
||||||
|
src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSKR6GOyFsui_qK69EuxP7iGvrh590QkDTciA&s"
|
||||||
|
/>
|
||||||
|
<img
|
||||||
|
src="https://www.prieur-sports.us/assets/images/prieur-sport-fencing-equipment.png"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { SponsortComponent } from './sponsort.component';
|
||||||
|
|
||||||
|
describe('SponsortComponent', () => {
|
||||||
|
let component: SponsortComponent;
|
||||||
|
let fixture: ComponentFixture<SponsortComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [SponsortComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(SponsortComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-sponsort',
|
||||||
|
standalone: false,
|
||||||
|
templateUrl: './sponsort.component.html',
|
||||||
|
styleUrl: './sponsort.component.css'
|
||||||
|
})
|
||||||
|
export class SponsortComponent {
|
||||||
|
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue