Skip to content

Commit 678fe7d

Browse files
softwaremagicosoftwaremagico
authored
Merge pull request #647 from softwaremagico/626-make-red-fighters-in-red-background
626 make red fighters in red background
2 parents 3eabf7e + 7d54ab3 commit 678fe7d

File tree

7 files changed

+82
-38
lines changed

7 files changed

+82
-38
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[![GitHub last commit](https://img.shields.io/github/last-commit/softwaremagico/KendoTournamentManager)](https://github.com/softwaremagico/KendoTournamentManager)
1010
[![Issues](https://img.shields.io/github/issues/softwaremagico/KendoTournamentManager.svg)](https://github.com/softwaremagico/KendoTournamentManager/issues)
1111
[![CircleCI](https://circleci.com/gh/softwaremagico/KendoTournamentManager.svg?style=shield)](https://circleci.com/gh/softwaremagico/KendoTournamentManager)
12-
[![Time](https://img.shields.io/badge/development-710.5h-blueviolet.svg)]()
12+
[![Time](https://img.shields.io/badge/development-711.5h-blueviolet.svg)]()
1313

1414
[![Powered by](https://img.shields.io/badge/powered%20by%20java-orange.svg?logo=OpenJDK&logoColor=white)]()
1515
[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=kendo-tournament-backend&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=kendo-tournament-backend)

‎backend/kendo-tournament-rest/src/main/java/com/softwaremagico/kt/websockets/WebSocketController.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ private <T> String toJson(T object) throws JsonProcessingException {
7171
* Sends an Element to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #CREATING_MAPPING}.
7272
*
7373
* @param element the element created.
74-
* @return
7574
*/
7675
public void elementCreated(@Payload ElementDTO element, String actor, String session) {
7776
try {
@@ -87,7 +86,6 @@ public void elementCreated(@Payload ElementDTO element, String actor, String ses
8786
* Sends an Element to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #CREATING_MAPPING}.
8887
*
8988
* @param element the element created.
90-
* @return
9189
*/
9290
public void elementUpdated(@Payload ElementDTO element, String actor, String session) {
9391
try {
@@ -103,7 +101,6 @@ public void elementUpdated(@Payload ElementDTO element, String actor, String ses
103101
* Sends an Element to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #CREATING_MAPPING}.
104102
*
105103
* @param element the element created.
106-
* @return
107104
*/
108105
public void elementDeleted(@Payload ElementDTO element, String actor, String session) {
109106
try {
@@ -119,7 +116,6 @@ public void elementDeleted(@Payload ElementDTO element, String actor, String ses
119116
* Sends a fightDTO to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #FIGHTS_MAPPING}.
120117
*
121118
* @param fight the fight to send.
122-
* @return
123119
*/
124120
public void fightUpdated(@Payload FightDTO fight, String actor, String session) {
125121
try {
@@ -135,7 +131,6 @@ public void fightUpdated(@Payload FightDTO fight, String actor, String session)
135131
* Sends a fightDTO to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #FIGHTS_MAPPING}.
136132
*
137133
* @param fights the fight to send.
138-
* @return
139134
*/
140135
public void fightsCreated(@Payload List<FightDTO> fights, String actor, String session) {
141136
try {
@@ -152,7 +147,6 @@ public void fightsCreated(@Payload List<FightDTO> fights, String actor, String s
152147
* + {@value #GROUPS_MAPPING}.
153148
*
154149
* @param tournamentDTO the tournament that is modified.
155-
* @return
156150
*/
157151
public void groupsUpdated(@Payload TournamentDTO tournamentDTO, String actor, String session) {
158152
try {

‎backend/pom.xml‎

Lines changed: 48 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,21 @@
7878

7979
<properties>
8080
<main.basedir>${project.basedir}</main.basedir>
81-
<java.version>17</java.version>
82-
<sonar.organization>softwaremagico</sonar.organization>
83-
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
81+
<java.version>21</java.version>
82+
<maven-scm-provider-gitexe.version>1.9.2</maven-scm-provider-gitexe.version>
83+
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
84+
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
85+
<maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
86+
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
87+
<maven-sources.version>3.3.0</maven-sources.version>
88+
<maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
8489
<checkstyle.version>3.3.0</checkstyle.version>
8590
<spotbugs.version>4.7.3.4</spotbugs.version>
8691
<org.testng.version>7.8.0</org.testng.version>
8792
<springdoc-openapi.version>2.1.0</springdoc-openapi.version>
8893
<springdoc.version>1.7.0</springdoc.version>
8994
<license-maven-plugin.version>2.7.0</license-maven-plugin.version>
9095
<modelmapper.version>2.3.9</modelmapper.version>
91-
<maven-scm-provider-gitexe.version>1.9.2</maven-scm-provider-gitexe.version>
92-
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
93-
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
94-
<maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
9596
<javax-interceptor.version>1.2.2</javax-interceptor.version>
9697
<jjwt.version>0.9.1</jjwt.version>
9798
<openpdf.version>1.3.30</openpdf.version>
@@ -104,7 +105,6 @@
104105
<javassist.version>3.25.0-GA</javassist.version>
105106
<qr-code.version>0.4.0</qr-code.version>
106107
<apache-batik.version>1.17</apache-batik.version>
107-
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
108108
</properties>
109109

110110
<build>
@@ -202,6 +202,43 @@
202202
</execution>
203203
</executions>
204204
</plugin>
205+
<plugin>
206+
<groupId>org.apache.maven.plugins</groupId>
207+
<artifactId>maven-javadoc-plugin</artifactId>
208+
<version>${maven-javadoc-plugin.version}</version>
209+
<executions>
210+
<execution>
211+
<id>attach-javadocs</id>
212+
<goals>
213+
<goal>jar</goal>
214+
</goals>
215+
</execution>
216+
</executions>
217+
</plugin>
218+
<plugin>
219+
<groupId>org.apache.maven.plugins</groupId>
220+
<artifactId>maven-source-plugin</artifactId>
221+
<version>${maven-sources.version}</version>
222+
<executions>
223+
<execution>
224+
<id>attach-sources</id>
225+
<phase>verify</phase>
226+
<goals>
227+
<goal>jar-no-fork</goal>
228+
</goals>
229+
</execution>
230+
</executions>
231+
</plugin>
232+
<plugin>
233+
<groupId>org.sonatype.central</groupId>
234+
<artifactId>central-publishing-maven-plugin</artifactId>
235+
<version>0.9.0</version>
236+
<extensions>true</extensions>
237+
<configuration>
238+
<publishingServerId>central</publishingServerId>
239+
<autoPublish>true</autoPublish>
240+
</configuration>
241+
</plugin>
205242
</plugins>
206243
</build>
207244

@@ -268,13 +305,10 @@
268305
</properties>
269306
<distributionManagement>
270307
<repository>
271-
<id>ossrh</id>
272-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
308+
<id>central</id>
309+
<name>Maven Central</name>
310+
<url>https://repo.maven.apache.org/maven2</url>
273311
</repository>
274-
<snapshotRepository>
275-
<id>ossrh</id>
276-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
277-
</snapshotRepository>
278312
</distributionManagement>
279313
</profile>
280314
</profiles>

‎frontend/src/app/components/fight/fight.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="fight-container">
22
<div *ngIf="this.fight?.tournament?.teamSize?this.fight.tournament.teamSize > 1:true" [class.red-ribbon]="!swapColors"
3-
[class.white-ribbon]="swapColors"
3+
[class.white-ribbon]="swapColors" [ngStyle]="{'max-height': this.fight.tournament.teamSize*50+'px' }"
44
class="left-team">
55
{{ !swapTeams ? fight.team1.name : fight.team2.name }}
66
</div>
@@ -26,7 +26,7 @@
2626
class="duel"></duel>
2727
</div>
2828
<div *ngIf="this.fight?.tournament?.teamSize?this.fight.tournament.teamSize > 1:true" [class.red-ribbon]="swapColors"
29-
[class.white-ribbon]="!swapColors"
29+
[class.white-ribbon]="!swapColors" [ngStyle]="{'max-height': this.fight.tournament.teamSize*50+'px' }"
3030
class="right-team">
3131
{{ !swapTeams ? fight.team2.name : fight.team1.name }}
3232
</div>

‎frontend/src/app/components/fight/fight.component.scss‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.fight {
2-
border-width: 2px;
2+
border-width: 2px 0 2px 0;
33
border-color: var(--fight-border-color);
44
border-style: solid;
55
padding: 5px;
@@ -18,37 +18,48 @@
1818
transform: rotate(180deg);
1919
text-align: center;
2020
padding: 20px;
21-
border-width: 2px;
22-
border-color: var(--ribbon-border);
2321
border-style: solid;
24-
background-color: var(--ribbon-background);
22+
//background-color: var(--ribbon-background);
23+
text-transform: uppercase;
24+
border-width: 2px 2px 2px 0;
25+
border-color: var(--fight-border-color);
26+
line-height: 25px;
27+
max-width: 56px;
28+
overflow: clip;
2529
}
2630

2731
.red-ribbon {
28-
color: red;
32+
color: var(--ribbon-background);
33+
//To be below the timer
34+
z-index: -1;
35+
background-color: var(--red-team-color);
36+
}
37+
38+
.white-ribbon {
39+
color: var(--ribbon-background);
2940
//To be below the timer
3041
z-index: -1;
42+
background-color: var(--white-team-color);
3143
}
3244

3345
.ribbon-icon {
3446
transform: rotate(0deg);
47+
border-width: 2px 0 2px 2px;
3548
}
3649

3750
.right-team {
3851
writing-mode: vertical-rl;
3952
text-align: center;
4053
padding: 20px;
41-
border-width: 2px;
42-
border-color: var(--ribbon-border);
4354
border-style: solid;
44-
text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
45-
background-color: var(--ribbon-background);
46-
}
47-
48-
.white-ribbon {
49-
color: white;
50-
//To be below the timer
51-
z-index: -1;
55+
//text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
56+
//background-color: var(--ribbon-background);
57+
text-transform: uppercase;
58+
border-width: 2px 2px 2px 0;
59+
border-color: var(--fight-border-color);
60+
line-height: 25px;
61+
max-width: 56px;
62+
overflow: clip;
5263
}
5364

5465
.fight-container {

‎frontend/src/app/views/fight-list/fight-list.component.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
max-height: 80vh;
44
min-height: 50vh;
55
overflow-y: auto;
6+
padding: 20px;
67
}
78

89
.upper-menu {

‎frontend/src/basic-colors.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
--link-visited: #012f67;
3434
--link-hover: #8097b3;
3535
--link-active: #012f67;
36+
--red-team-color: #f20d0d;
37+
--white-team-color: #ffffff;
3638
}
3739

3840
:root .dark-mode {
@@ -68,5 +70,7 @@
6870
--link-visited: #afa5d5;
6971
--link-hover: #9f98b9;
7072
--link-active: #8d7fc3;
73+
--red-team-color: #c20a0a;
74+
--white-team-color: #bbbbbb;
7175
}
7276

0 commit comments

Comments
 (0)