From d35d00cb57f7652f0fbf189b09b7c2ce27194d0a Mon Sep 17 00:00:00 2001
From: Martin Mechtel <mechtelm@user.hu-berlin.de>
Date: Fri, 31 Aug 2018 16:32:32 +0200
Subject: [PATCH] deployment works (build-config)

---
 angular.json                               |  2 +-
 src/app/admin/backend/backend.service.ts   |  4 ++--
 src/app/admin/monitor/monitor.component.ts |  7 +++----
 src/app/admin/myfiles/myfiles.component.ts |  2 +-
 src/environments/environment.build.ts      | 11 ++++-------
 src/environments/environment.prod.ts       |  2 +-
 src/environments/environment.ts            |  4 ++--
 7 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/angular.json b/angular.json
index c2f7c8d9..13b8c092 100644
--- a/angular.json
+++ b/angular.json
@@ -13,7 +13,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/itc-ng-admin",
+            "outputPath": "dist/admin",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
diff --git a/src/app/admin/backend/backend.service.ts b/src/app/admin/backend/backend.service.ts
index 12244452..7769a6eb 100644
--- a/src/app/admin/backend/backend.service.ts
+++ b/src/app/admin/backend/backend.service.ts
@@ -11,7 +11,7 @@ export class BackendService {
     @Inject('SERVER_URL') private serverUrl: string,
     private http: HttpClient) {
       this.serverUrl = this.serverUrl + 'admin/';
-    }
+  }
 
   private errorHandler(error: Error | any): Observable<any> {
     return Observable.throw(error);
@@ -200,4 +200,4 @@ export interface GroupResponse {
   testsTotal: number;
   testsStarted: number;
   responsesGiven: number;
-}
\ No newline at end of file
+}
diff --git a/src/app/admin/monitor/monitor.component.ts b/src/app/admin/monitor/monitor.component.ts
index e9618a0e..62690815 100644
--- a/src/app/admin/monitor/monitor.component.ts
+++ b/src/app/admin/monitor/monitor.component.ts
@@ -1,6 +1,6 @@
 import { BackendService, GroupResponse } from './../backend/backend.service';
 import { MainDatastoreService } from './../maindatastore.service';
-import { Component, OnInit, Inject, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { MatSnackBar, MatSort, MatTableDataSource } from '@angular/material';
 
 
@@ -15,8 +15,7 @@ export class MonitorComponent implements OnInit {
 
   @ViewChild(MatSort) sort: MatSort;
 
-  constructor(@Inject('SERVER_URL') 
-    private serverUrl: string,
+  constructor(
     private bs: BackendService,
     private mds: MainDatastoreService,
     public snackBar: MatSnackBar
@@ -39,5 +38,5 @@ export class MonitorComponent implements OnInit {
     )
 
   }
- 
+
 }
diff --git a/src/app/admin/myfiles/myfiles.component.ts b/src/app/admin/myfiles/myfiles.component.ts
index d845b4ce..668e8ee3 100644
--- a/src/app/admin/myfiles/myfiles.component.ts
+++ b/src/app/admin/myfiles/myfiles.component.ts
@@ -20,7 +20,7 @@ import { IqbFileUploadQueueComponent, IqbFileUploadInputForDirective } from '../
 export class MyfilesComponent implements OnInit {
   public serverfiles: MatTableDataSource<GetFileResponseData>;
   public displayedColumns = ['checked', 'filename', 'typelabel', 'filesize', 'filedatetime'];
-  public uploadUrl = '/uploadFile.php';
+  public uploadUrl = 'uploadFile.php';
   public fileNameAlias = 'fileforopencba';
   public dataLoading = false;
 
diff --git a/src/environments/environment.build.ts b/src/environments/environment.build.ts
index afaa9ef4..451f3c16 100644
--- a/src/environments/environment.build.ts
+++ b/src/environments/environment.build.ts
@@ -1,12 +1,9 @@
-// The file contents for the current environment will overwrite these during build.
-// The build system defaults to the dev environment which uses `environment.ts`, but if you do
-// `ng build --env=prod` then `environment.prod.ts` will be used instead.
-// The list of which env maps to which file can be found in `.angular-cli.json`.
+// ng build --configuration=build --base-href=/admin/
 
 export const environment = {
   production: false,
-  testcenterUrl: '/admin/',
-  appName: 'IQB-Testcenter',
+  testcenterUrl: '/',
+  appName: 'IQB-Testcenter Verwaltung',
   appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen',
-  appVersion: '0.3.1 - 3.6.2018'
+  appVersion: '0.4.0 - 31.8.2018'
 };
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 075ac9fd..3bbc70ad 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
-  testcenterUrl: '/admin/',
+  testcenterUrl: '/',
   appName: 'IQB-Testcenter',
   appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen',
   appVersion: '0 (prod)'
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index c2504f91..ca3e515d 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -6,7 +6,7 @@
 export const environment = {
   production: false,
   testcenterUrl: 'https://ocba2.iqb.hu-berlin.de/',
-  appName: 'IQB-Testcenter',
+  appName: 'IQB-Testcenter Verwaltung',
   appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen',
-  appVersion: '0.2 (dev)'
+  appVersion: '0.4 (dev)'
 };
-- 
GitLab