Merge remote-tracking branch 'origin/main'

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

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) {