Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[![GitHub last commit](https://img.shields.io/github/last-commit/softwaremagico/KendoTournamentManager)](https://github.com/softwaremagico/KendoTournamentManager)
[![Issues](https://img.shields.io/github/issues/softwaremagico/KendoTournamentManager.svg)](https://github.com/softwaremagico/KendoTournamentManager/issues)
[![CircleCI](https://circleci.com/gh/softwaremagico/KendoTournamentManager.svg?style=shield)](https://circleci.com/gh/softwaremagico/KendoTournamentManager)
[![Time](https://img.shields.io/badge/development-710.5h-blueviolet.svg)]()
[![Time](https://img.shields.io/badge/development-711.5h-blueviolet.svg)]()

[![Powered by](https://img.shields.io/badge/powered%20by%20java-orange.svg?logo=OpenJDK&logoColor=white)]()
[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=kendo-tournament-backend&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=kendo-tournament-backend)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ private <T> String toJson(T object) throws JsonProcessingException {
* Sends an Element to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #CREATING_MAPPING}.
*
* @param element the element created.
* @return
*/
public void elementCreated(@Payload ElementDTO element, String actor, String session) {
try {
Expand All @@ -87,7 +86,6 @@ public void elementCreated(@Payload ElementDTO element, String actor, String ses
* Sends an Element to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #CREATING_MAPPING}.
*
* @param element the element created.
* @return
*/
public void elementUpdated(@Payload ElementDTO element, String actor, String session) {
try {
Expand All @@ -103,7 +101,6 @@ public void elementUpdated(@Payload ElementDTO element, String actor, String ses
* Sends an Element to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #CREATING_MAPPING}.
*
* @param element the element created.
* @return
*/
public void elementDeleted(@Payload ElementDTO element, String actor, String session) {
try {
Expand All @@ -119,7 +116,6 @@ public void elementDeleted(@Payload ElementDTO element, String actor, String ses
* Sends a fightDTO to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #FIGHTS_MAPPING}.
*
* @param fight the fight to send.
* @return
*/
public void fightUpdated(@Payload FightDTO fight, String actor, String session) {
try {
Expand All @@ -135,7 +131,6 @@ public void fightUpdated(@Payload FightDTO fight, String actor, String session)
* Sends a fightDTO to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #FIGHTS_MAPPING}.
*
* @param fights the fight to send.
* @return
*/
public void fightsCreated(@Payload List<FightDTO> fights, String actor, String session) {
try {
Expand All @@ -152,7 +147,6 @@ public void fightsCreated(@Payload List<FightDTO> fights, String actor, String s
* + {@value #GROUPS_MAPPING}.
*
* @param tournamentDTO the tournament that is modified.
* @return
*/
public void groupsUpdated(@Payload TournamentDTO tournamentDTO, String actor, String session) {
try {
Expand Down
62 changes: 48 additions & 14 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,21 @@

<properties>
<main.basedir>${project.basedir}</main.basedir>
<java.version>17</java.version>
<sonar.organization>softwaremagico</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<java.version>21</java.version>
<maven-scm-provider-gitexe.version>1.9.2</maven-scm-provider-gitexe.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-sources.version>3.3.0</maven-sources.version>
<maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
<checkstyle.version>3.3.0</checkstyle.version>
<spotbugs.version>4.7.3.4</spotbugs.version>
<org.testng.version>7.8.0</org.testng.version>
<springdoc-openapi.version>2.1.0</springdoc-openapi.version>
<springdoc.version>1.7.0</springdoc.version>
<license-maven-plugin.version>2.7.0</license-maven-plugin.version>
<modelmapper.version>2.3.9</modelmapper.version>
<maven-scm-provider-gitexe.version>1.9.2</maven-scm-provider-gitexe.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
<javax-interceptor.version>1.2.2</javax-interceptor.version>
<jjwt.version>0.9.1</jjwt.version>
<openpdf.version>1.3.30</openpdf.version>
Expand All @@ -104,7 +105,6 @@
<javassist.version>3.25.0-GA</javassist.version>
<qr-code.version>0.4.0</qr-code.version>
<apache-batik.version>1.17</apache-batik.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
</properties>

<build>
Expand Down Expand Up @@ -202,6 +202,43 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-sources.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.9.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
</configuration>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -268,13 +305,10 @@
</properties>
<distributionManagement>
<repository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<id>central</id>
<name>Maven Central</name>
<url>https://repo.maven.apache.org/maven2</url>
</repository>
<snapshotRepository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
</profile>
</profiles>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/components/fight/fight.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="fight-container">
<div *ngIf="this.fight?.tournament?.teamSize?this.fight.tournament.teamSize > 1:true" [class.red-ribbon]="!swapColors"
[class.white-ribbon]="swapColors"
[class.white-ribbon]="swapColors" [ngStyle]="{'max-height': this.fight.tournament.teamSize*50+'px' }"
class="left-team">
{{ !swapTeams ? fight.team1.name : fight.team2.name }}
</div>
Expand All @@ -26,7 +26,7 @@
class="duel"></duel>
</div>
<div *ngIf="this.fight?.tournament?.teamSize?this.fight.tournament.teamSize > 1:true" [class.red-ribbon]="swapColors"
[class.white-ribbon]="!swapColors"
[class.white-ribbon]="!swapColors" [ngStyle]="{'max-height': this.fight.tournament.teamSize*50+'px' }"
class="right-team">
{{ !swapTeams ? fight.team2.name : fight.team1.name }}
</div>
Expand Down
41 changes: 26 additions & 15 deletions frontend/src/app/components/fight/fight.component.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.fight {
border-width: 2px;
border-width: 2px 0 2px 0;
border-color: var(--fight-border-color);
border-style: solid;
padding: 5px;
Expand All @@ -18,37 +18,48 @@
transform: rotate(180deg);
text-align: center;
padding: 20px;
border-width: 2px;
border-color: var(--ribbon-border);
border-style: solid;
background-color: var(--ribbon-background);
//background-color: var(--ribbon-background);
text-transform: uppercase;
border-width: 2px 2px 2px 0;
border-color: var(--fight-border-color);
line-height: 25px;
max-width: 56px;
overflow: clip;
}

.red-ribbon {
color: red;
color: var(--ribbon-background);
//To be below the timer
z-index: -1;
background-color: var(--red-team-color);
}

.white-ribbon {
color: var(--ribbon-background);
//To be below the timer
z-index: -1;
background-color: var(--white-team-color);
}

.ribbon-icon {
transform: rotate(0deg);
border-width: 2px 0 2px 2px;
}

.right-team {
writing-mode: vertical-rl;
text-align: center;
padding: 20px;
border-width: 2px;
border-color: var(--ribbon-border);
border-style: solid;
text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
background-color: var(--ribbon-background);
}

.white-ribbon {
color: white;
//To be below the timer
z-index: -1;
//text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
//background-color: var(--ribbon-background);
text-transform: uppercase;
border-width: 2px 2px 2px 0;
border-color: var(--fight-border-color);
line-height: 25px;
max-width: 56px;
overflow: clip;
}

.fight-container {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
max-height: 80vh;
min-height: 50vh;
overflow-y: auto;
padding: 20px;
}

.upper-menu {
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/basic-colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
--link-visited: #012f67;
--link-hover: #8097b3;
--link-active: #012f67;
--red-team-color: #f20d0d;
--white-team-color: #ffffff;
}

:root .dark-mode {
Expand Down Expand Up @@ -68,5 +70,7 @@
--link-visited: #afa5d5;
--link-hover: #9f98b9;
--link-active: #8d7fc3;
--red-team-color: #c20a0a;
--white-team-color: #bbbbbb;
}

Loading