Merge pull request #15 from mechero/1_0_2

#14 Ability to enter the Quboo server URL

.env

@@ -1,2 +1,2 @@
-BACKEND_VERSION=1.0.1
-UI_VERSION=1.0.1
+BACKEND_VERSION=1.0.2
+UI_VERSION=1.0.2

sonar-connector/pom.xml

@@ -57,6 +57,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.1</version>
+                <configuration>
+                    <forkCount>0</forkCount>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

web-client/src/app/app.module.ts

@@ -15,6 +15,8 @@ import {FooterComponent} from "./footer/footer.component";
 import {FooterService} from "./footer/footer.service";
 import {AngularFontAwesomeModule} from "angular-font-awesome";
 import {RetrieverService} from "./retriever/retriever.service";
+import {ServerUrlComponent} from "./settings/server-url.component";
+import {ServerUrlService} from "./settings/server-url.service";
 
 @NgModule({
   declarations: [
@@ -23,7 +25,8 @@ import {RetrieverService} from "./retriever/retriever.service";
     TeamsComponent,
     OrganizerComponent,
     SettingsComponent,
-    FooterComponent
+    FooterComponent,
+    ServerUrlComponent
   ],
   imports: [
     BrowserModule,
@@ -32,7 +35,7 @@ import {RetrieverService} from "./retriever/retriever.service";
     AppRoutingModule,
     AngularFontAwesomeModule
   ],
-  providers: [TeamsService, MemberService, FooterService, RetrieverService],
+  providers: [TeamsService, MemberService, FooterService, RetrieverService, ServerUrlService],
   bootstrap: [AppComponent]
 })
 export class AppModule {

web-client/src/app/footer/footer.service.ts

@@ -1,19 +1,19 @@
 import {Injectable} from '@angular/core';
 import {HttpClient, HttpErrorResponse} from '@angular/common/http';
-import {environment} from "../../environments/environment";
 import {Code} from "./Code";
+import {getStoredServerUrl} from "../settings/Settings";
 
 
 @Injectable()
 export class FooterService {
 
-  private codeUrl = environment.serverUrl + '/code';
+  private codeUrl = '/code';
 
   constructor(private http: HttpClient) {
   }
 
   getCode(): Promise<Code> {
-    return this.http.get(this.codeUrl)
+    return this.http.get(getStoredServerUrl() + this.codeUrl)
       .toPromise()
       .then(response => response as Code)
       .catch(this.handleError);

web-client/src/app/members/member.service.ts

@@ -1,64 +1,64 @@
 import {Injectable} from '@angular/core';
 import {StatsRow} from '../common/StatsRow';
 import {HttpClient, HttpErrorResponse} from '@angular/common/http';
-import {environment} from "../../environments/environment";
 import {User} from "./User";
 import {MessageResponse} from "../common/MessageResponse";
+import {getStoredServerUrl} from "../settings/Settings";
 
 
 @Injectable()
 export class MemberService {
 
-  private memberStatsUrl = environment.serverUrl + '/stats/users';
-  private usersUrl = environment.serverUrl + '/users';
+  private memberStatsUrl = '/stats/users';
+  private usersUrl = '/users';
 
   constructor(private http: HttpClient) {
   }
 
   getMemberStats(): Promise<StatsRow[]> {
-    return this.http.get(this.memberStatsUrl)
+    return this.http.get(getStoredServerUrl() + this.memberStatsUrl)
       .toPromise()
       .then(response => response as StatsRow[])
       .catch(this.handleError);
   }
 
   getUsers(): Promise<User[]> {
-    return this.http.get(this.usersUrl + '?assigned')
+    return this.http.get(getStoredServerUrl() + this.usersUrl + '?assigned')
       .toPromise()
       .then(response => response as User[])
       .catch(this.handleError);
   }
 
   getUnassignedUsers(): Promise<User[]> {
-    return this.http.get(this.usersUrl + '?unassigned')
+    return this.http.get(getStoredServerUrl() + this.usersUrl + '?unassigned')
       .toPromise()
       .then(response => response as User[])
       .catch(this.handleError);
   }
 
   deleteUnassignedUsers(): Promise<MessageResponse> {
-    return this.http.delete(this.usersUrl + '?unassigned')
+    return this.http.delete(getStoredServerUrl() + this.usersUrl + '?unassigned')
       .toPromise()
       .then(response => response as MessageResponse)
       .catch(this.handleError);
   }
 
   updateUser(user: User) {
-    return this.http.put(this.usersUrl + '/' + user.id, user)
+    return this.http.put(getStoredServerUrl() + this.usersUrl + '/' + user.id, user)
       .toPromise()
       .then(response => response as User)
       .catch(this.handleError);
   }
 
   removeAllStats(): Promise<MessageResponse> {
-    return this.http.delete(this.memberStatsUrl)
+    return this.http.delete(getStoredServerUrl() + this.memberStatsUrl)
       .toPromise()
       .then(response => response as MessageResponse)
       .catch(this.handleError);
   }
 
   private handleError(error: any): Promise<any> {
-    console.error('An error occurred accessing ' + environment.serverUrl, error);
+    console.error('An error occurred accessing the server', error);
     if (error instanceof HttpErrorResponse) {
       console.error("Response status: " + error.status + " | Message: " + error.message);
     }

web-client/src/app/members/members.component.ts

@@ -1,32 +1,34 @@
 import {Component} from '@angular/core';
 import {OnInit} from '@angular/core';
-import {User} from './Member';
+import {User} from './User';
 import {MemberService} from './member.service';
 import {StatsRow} from '../common/StatsRow';
+import {ServerUrlService} from "../settings/server-url.service";
 
 @Component({
   moduleId: module.id,
   selector: 'members',
   templateUrl: 'members.component.html'
 })
 export class MembersComponent implements OnInit {
+
   ngOnInit(): void {
-    setInterval(() => this.getMembers(), 20 * 1000);
+    setInterval(() => this.getMembers(), 2 * 60 * 1000);
     this.getMembers();
+    this.serverUrlService.change.subscribe(ignore => this.getMembers());
   }
 
   memberStats: StatsRow[];
   selectedMember: User;
 
-  constructor(private memberService: MemberService) {
+  constructor(private memberService: MemberService, private serverUrlService: ServerUrlService) {
   }
 
   onSelect(member: User): void {
     this.selectedMember = member;
   }
 
   getMembers(): void {
-    console.log('get members');
     this.memberService.getMemberStats().then(memberStats => this.memberStats = memberStats);
   }
 

web-client/src/app/retriever/retriever.service.ts

@@ -1,17 +1,17 @@
 import {Injectable} from '@angular/core';
 import {HttpClient, HttpErrorResponse} from '@angular/common/http';
-import {environment} from "../../environments/environment";
+import {getStoredServerUrl} from "../settings/Settings";
 
 @Injectable()
 export class RetrieverService {
 
-  private forceRetrievalUrl = environment.serverUrl + '/retriever/now';
+  private forceRetrievalUrl = '/retriever/now';
 
   constructor(private http: HttpClient) {
   }
 
   forceRetrieval(): Promise<String> {
-    return this.http.post(this.forceRetrievalUrl, {})
+    return this.http.post(getStoredServerUrl() + this.forceRetrievalUrl, {})
       .toPromise()
       .catch(this.handleError);
   }

web-client/src/app/settings/Settings.ts

@@ -0,0 +1,17 @@
+export const SERVER_URL_KEY = 'QUBOO_SERVER_URL';
+
+export function getStoredServerUrl() : string {
+  return localStorage.getItem(SERVER_URL_KEY);
+}
+
+export function isServerUrlStored() : boolean {
+  return localStorage.getItem(SERVER_URL_KEY) !== null;
+}
+
+export function defaultServerUrl(): string {
+  return window.location.protocol + '//' + window.location.hostname + ':8080';
+}
+
+export function saveServerUrl(url: string) {
+  localStorage.setItem(SERVER_URL_KEY, url);
+}