diff --git a/.gitignore b/.gitignore index a08031d..649d898 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,6 @@ /.nb-gradle/ .mvn -**/node_modules \ No newline at end of file +**/node_modules +src/main/resources/static +log/spring.log \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4b17061..afcd3c0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -11,6 +11,6 @@ spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults = false # *********************************************** # Application custom parameters # *********************************************** -minager.version=0.0.1 +minager.version=1.0.0 minecraft.server.path=/home/minecraft/server minecraft.server.shell.name=minecraft-server.sh \ No newline at end of file diff --git a/src/main/ts/src/app/app.component.scss b/src/main/ts/src/app/app.component.scss index 05393c0..d2fe36e 100644 --- a/src/main/ts/src/app/app.component.scss +++ b/src/main/ts/src/app/app.component.scss @@ -11,4 +11,10 @@ main { font-size: 12px; font-style: italic; box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); +} + +@media screen and (max-width: 600px) { + #versionDiv { + margin-top: -14px; + } } \ No newline at end of file diff --git a/src/main/ts/src/app/header/header.component.html b/src/main/ts/src/app/header/header.component.html index 29824e4..e2c7bb0 100644 --- a/src/main/ts/src/app/header/header.component.html +++ b/src/main/ts/src/app/header/header.component.html @@ -7,22 +7,19 @@ - +
+ + Connexion + + + Déconnexion + +
-
Test
\ No newline at end of file diff --git a/src/main/ts/src/app/header/header.component.ts b/src/main/ts/src/app/header/header.component.ts index e353ebf..71bb193 100644 --- a/src/main/ts/src/app/header/header.component.ts +++ b/src/main/ts/src/app/header/header.component.ts @@ -10,6 +10,10 @@ import { environment } from '../../environments/environment'; width: 50px; height: 50px; } + + a, a:visited { + color: white; + } `] }) export class HeaderComponent { diff --git a/src/main/ts/src/app/login/login.component.html b/src/main/ts/src/app/login/login.component.html index b8bc0ac..14d4c5f 100644 --- a/src/main/ts/src/app/login/login.component.html +++ b/src/main/ts/src/app/login/login.component.html @@ -1,22 +1,47 @@ -
- - -
-
- - -
- -
-
-

{{loginError}}

-
+
+
+

Connexion

+
+
+ + + +
+
+ + + +
+
+
+

{{loginError}}

+
+
+
+ +
+
+
\ No newline at end of file diff --git a/src/main/ts/src/app/server/server.component.html b/src/main/ts/src/app/server/server.component.html index 9c5480a..7617a34 100644 --- a/src/main/ts/src/app/server/server.component.html +++ b/src/main/ts/src/app/server/server.component.html @@ -1,47 +1,69 @@ -
- Status du serveur : - - Vérification - - - {{serverStarted ? 'Démarré' : 'Éteint'}} - -
-
- - -
-
-
-

{{errorMsg}}

-
-
-
-
-

{{warnMsg}}

-
-
-
-
-

{{successMsg}}

+
+
+
+
+

Serveur Minecraft

+
+ Status du serveur : + + Vérification + + + {{serverStarted ? 'Démarré' : 'Éteint'}} + +
+
+ Adresse du serveur de jeu : + + {{serverAddress}} + + +
+
+ + +
+
+

{{errorMsg}}

+
+
+
+
+

{{warnMsg}}

+
+
+
+
+

{{successMsg}}

+
+
+
+
+
\ No newline at end of file diff --git a/src/main/ts/src/app/server/server.component.ts b/src/main/ts/src/app/server/server.component.ts index bca0727..c1806bf 100644 --- a/src/main/ts/src/app/server/server.component.ts +++ b/src/main/ts/src/app/server/server.component.ts @@ -12,9 +12,14 @@ import { AuthService } from '../core/services/auth.service'; transition: max-height 0.5s ease-out; margin: 0; } + #serverAddress { + margin-top: 25px; + cursor: pointer; + } `] }) export class ServerComponent implements OnInit { + serverAddress = '176.188.217.1:54311'; serverStartedChecked = false; serverStarted = false; errorMsg; @@ -82,4 +87,21 @@ export class ServerComponent implements OnInit { }, 550); }, 3000); } + + copyToClipBoard(): void { + document.addEventListener('copy', (e: ClipboardEvent) => { + e.clipboardData.setData('text/plain', (this.serverAddress)); + e.preventDefault(); + document.removeEventListener('copy', null); + this.showCopiedMsg(); + }); + document.execCommand('copy'); + } + + showCopiedMsg(): void { + document.getElementById('copiedMsg').style.display = ''; + setTimeout(() => { + document.getElementById('copiedMsg').style.display = 'none'; + }, 1500); + } } diff --git a/src/main/ts/src/assets/images/background.png b/src/main/ts/src/assets/images/background.png new file mode 100644 index 0000000..c13d5f4 Binary files /dev/null and b/src/main/ts/src/assets/images/background.png differ diff --git a/src/main/ts/src/environments/environment.integ.ts b/src/main/ts/src/environments/environment.integ.ts index 3f5e566..e584a52 100644 --- a/src/main/ts/src/environments/environment.integ.ts +++ b/src/main/ts/src/environments/environment.integ.ts @@ -5,7 +5,7 @@ export const environment = { production: false, apiUrl: 'http://176.188.217.1:54447', - appVersion: '0.0.1', + appVersion: '1.0.1', title: 'INTÉGRATION' }; diff --git a/src/main/ts/src/environments/environment.prod.ts b/src/main/ts/src/environments/environment.prod.ts index 933a0ea..fd03754 100644 --- a/src/main/ts/src/environments/environment.prod.ts +++ b/src/main/ts/src/environments/environment.prod.ts @@ -1,6 +1,6 @@ export const environment = { production: true, apiUrl: 'https://176.188.217.1:54446', - appVersion: '0.0.1', + appVersion: '1.0.1', title: '' }; diff --git a/src/main/ts/src/environments/environment.ts b/src/main/ts/src/environments/environment.ts index c8c637e..fe3ba14 100644 --- a/src/main/ts/src/environments/environment.ts +++ b/src/main/ts/src/environments/environment.ts @@ -5,7 +5,7 @@ export const environment = { production: false, apiUrl: 'http://localhost:8080', - appVersion: '0.0.1', + appVersion: '1.0.1', title: 'LOCAL' }; diff --git a/src/main/ts/src/styles.scss b/src/main/ts/src/styles.scss index dffdefe..fb5ddd6 100644 --- a/src/main/ts/src/styles.scss +++ b/src/main/ts/src/styles.scss @@ -12,8 +12,13 @@ body { flex-direction: column; justify-content:space-between; min-height: 100%; + background-image: url("./assets/images/background.png"); + background-color: #fff; + background-position: center; + background-repeat: no-repeat; + background-size: cover; } -.btn-rounded { +.btn { border-radius: 10em; } \ No newline at end of file