diff --git a/src/main/java/org/minager/info/InfoController.java b/src/main/java/org/minager/info/InfoController.java new file mode 100644 index 0000000..bd92a48 --- /dev/null +++ b/src/main/java/org/minager/info/InfoController.java @@ -0,0 +1,19 @@ +package org.minager.info; + +import org.minager.core.utils.StringUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api") +public class InfoController { + @Value("${minager.version}") + private String version; + + @GetMapping("/version") + public String getVersion() { + return StringUtils.concat("\"", version, "\""); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 06bb90a..4b17061 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -11,5 +11,6 @@ spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults = false # *********************************************** # Application custom parameters # *********************************************** +minager.version=0.0.1 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/package.json b/src/main/ts/package.json index 91d2773..95676f4 100644 --- a/src/main/ts/package.json +++ b/src/main/ts/package.json @@ -20,7 +20,6 @@ "@angular/platform-browser": "^6.1.0", "@angular/platform-browser-dynamic": "^6.1.0", "@angular/router": "^6.1.0", - "@ngtools/webpack": "^1.2.4", "@types/chart.js": "^2.7.36", "angular-bootstrap-md": "^6.2.4", "angular5-csv": "^0.2.10", diff --git a/src/main/ts/src/app/app.component.html b/src/main/ts/src/app/app.component.html index f35249f..3de4523 100644 --- a/src/main/ts/src/app/app.component.html +++ b/src/main/ts/src/app/app.component.html @@ -1,6 +1,13 @@ -
+
+
+

Vous n'êtes pas connecté au serveur.

+ Veuillez contacter votre administrateur ou réessayer plus tard. +
+
+

Chargement...

+
diff --git a/src/main/ts/src/app/app.component.ts b/src/main/ts/src/app/app.component.ts index 7d943bc..948fd0b 100644 --- a/src/main/ts/src/app/app.component.ts +++ b/src/main/ts/src/app/app.component.ts @@ -1,10 +1,29 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; +import { environment } from '../environments/environment'; @Component({ selector: 'app-root', templateUrl: './app.component.html', styleUrls: ['./app.component.scss'] }) -export class AppComponent { +export class AppComponent implements OnInit { title = 'app'; + loading = true; + apiVersion; + connectedToApi = false; + + constructor( + private http: HttpClient + ) {} + + ngOnInit(): void { + this.http.get(`${environment.apiUrl}/api/version`).subscribe(pApiVersion => { + this.apiVersion = pApiVersion; + this.connectedToApi = true; + this.loading = false; + }, error => { + this.loading = false; + }); + } } diff --git a/src/main/ts/src/app/server/server.component.html b/src/main/ts/src/app/server/server.component.html index e1c3814..9c5480a 100644 --- a/src/main/ts/src/app/server/server.component.html +++ b/src/main/ts/src/app/server/server.component.html @@ -12,20 +12,21 @@ diff --git a/src/main/ts/src/styles.scss b/src/main/ts/src/styles.scss index 90d4ee0..2ceab3b 100644 --- a/src/main/ts/src/styles.scss +++ b/src/main/ts/src/styles.scss @@ -1 +1,4 @@ /* You can add global styles to this file, and also import other style files */ +.btn-rounded { + border-radius: 10em; +} \ No newline at end of file