Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/app/services/appointment.service.ts
#	src/app/services/customer.service.ts

src/app/services/appointment.service.ts

@@ -6,9 +6,8 @@ import {Appointment} from '../models/appointment';
   providedIn: 'root',
 })
 export class AppointmentService {
-  baseApi = "http://localhost:8080/api/appointments";
-
-  // baseApi = "https://api.melvanveen.nl/api/appointments";
+  // baseApi = "http://localhost:8080/api/appointments";
+  baseApi = "https://api.melvanveen.nl/api/appointments";
 
   constructor(private http: HttpClient) {
   }

src/app/services/auth.service.ts

@@ -8,8 +8,8 @@ import {jwtDecode} from 'jwt-decode';
   providedIn: 'root',
 })
 export class AuthService {
-  private baseApi = 'http://localhost:8080/api/auth/login';
-  // baseApi = "https://api.melvanveen.nl/api/auth/login";
+  // private baseApi = 'http://localhost:8080/api/auth/login';
+  baseApi = "https://api.melvanveen.nl/api/auth/login";
   jwtHelper = new JwtHelperService();
 
   constructor(private http: HttpClient) {

src/app/services/customer.service.ts

@@ -7,9 +7,8 @@ import {Observable} from 'rxjs';
   providedIn: 'root',
 })
 export class CustomerService {
-  baseApi = "http://localhost:8080/api/customers";
-
-  // baseApi = "https://api.melvanveen.nl/api/customers";
+  // baseApi = "http://localhost:8080/api/customers";
+  baseApi = "https://api.melvanveen.nl/api/customers";
 
 
   constructor(private http: HttpClient) {