Merge branch 'master' into feature/testing

Author: marc101101

angular.json

@@ -40,6 +40,10 @@
               "serviceWorker": true,
               "ngswConfigPath": "client/ngsw-config.json",
               "fileReplacements": [
+                {
+                  "replace": "client/environments/environment.ts",
+                  "with": "client/environments/environment.prod.ts"
+                }
               ]
             }
           }

client/app/components/home/shared/contact.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { map, catchError } from 'rxjs/operators';
 import { Observable } from 'rxjs';
-import { environment } from '../../../../environments/environment.prod';
+import { environment } from '../../../../environments/environment';
 import { HttpHeaders, HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { AlertService } from '../../../services/alert.service';
 import { of } from 'rxjs';

client/app/components/home/shared/courses.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { map, catchError } from 'rxjs/operators';
 import { Observable } from 'rxjs';
-import { environment } from '../../../../environments/environment.prod';
+import { environment } from '../../../../environments/environment';
 import { HttpHeaders, HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { AlertService } from '../../../services/alert.service';
 import { of } from 'rxjs';

client/app/services/auth.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpErrorResponse } from '../../../node_modules/@angular/common/http';
 import { Observable } from '../../../node_modules/rxjs';
-import { environment } from '../../environments/environement';
+import { environment } from '../../environments/environment';
 import { UserData } from '../models/UserData';
 import { AlertService } from './alert.service';
 import { map, catchError } from 'rxjs/operators';

client/app/services/category.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { map, catchError } from 'rxjs/operators';
 import { Observable } from 'rxjs';
-import { environment } from '../../environments/environment.prod';
+import { environment } from '../../environments/environment';
 import { HttpHeaders, HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { AlertService } from './alert.service';
 import { of } from 'rxjs';

client/app/services/user.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpErrorResponse, HttpHeaders } from '../../../node_modules/@angular/common/http';
 import { Observable } from '../../../node_modules/rxjs';
-import { environment } from '../../environments/environement';
+import { environment } from '../../environments/environment';
 import { AlertService } from './alert.service';
 import { map, catchError } from 'rxjs/operators';
 import { User } from '../models/User';

client/environments/environement.ts

@@ -1,4 +1,4 @@
 export const environment = {
     production: true,
-    apiUrl: 'http://localhost:8080/v1'
+    apiUrl: '/v1'
 };

client/environments/environment.prod.ts

@@ -1,4 +1,5 @@
 export const environment = {
     production: false,
     apiUrl: 'http://localhost:8080/v1'
-};
+  };
+  

client/environments/environment.dev.ts client/environments/environment.tsclient/environments/environment.dev.ts renamed to client/environments/environment.ts

@@ -1,12 +1,16 @@
-import { enableProdMode } from '@angular/core';
+import { enableProdMode, isDevMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app/app.module';
-import { environment } from './environments/environment.dev';
+import { environment } from './environments/environment';
 
-if (environment.production) {
+/*if (environment.production) {
   enableProdMode();
-}
+}*/
+
+enableProdMode();
+
+console.log(isDevMode());
 
 document.addEventListener('DOMContentLoaded', () => {
   platformBrowserDynamic().bootstrapModule(AppModule);