Merge remote-tracking branch 'origin/AqueductBranch' into AqueductBranch

frontend/lib/src/view/components/appointment_new_component.dart

@@ -21,7 +21,6 @@ class AppointmentNewComponent implements OnActivate {
 
   AppointmentNewComponent(this._appointmentService, this._location, this._router);
 
-  //Später löschen
   Appointment appointment = Appointment.zero();
   final Location _location;
   final AppointmentService _appointmentService;

frontend/lib/src/view/components/contact_list_component.css

@@ -53,7 +53,7 @@ table tr{
     cursor: default;
 }
 
-#con {
+#delete {
     color: red;
 }
 

frontend/lib/src/view/components/login_component.dart

 import 'package:angular/angular.dart';
 import 'package:angular_forms/angular_forms.dart';
 import 'package:angular_router/angular_router.dart';
-import 'package:demo/src/view/components/mock_users.dart';
 import 'package:demo/src/view/services/person_service.dart';
 
 import '../../model/person.dart';

frontend/lib/src/view/components/mock_users.dart

-import 'package:demo/src/model/person.dart';
-
-  ///Mock Termine
-  final mockUsers = <User>[
-    User(-1,'CC1', "Admin", "Ad", "Min", "admin@mock.com", "mockAdmin1", ""),
-    User(-2,'CC2',"User", "Us", "Er", "user@mock.com", "mockUser1", "")
-  ];
\ No newline at end of file

frontend/lib/src/view/components/register_component.dart

@@ -2,7 +2,6 @@ import 'package:angular/angular.dart';
 import 'package:angular_forms/angular_forms.dart';
 import 'package:angular_router/angular_router.dart';
 import 'package:demo/src/view/components/login_component.dart';
-import 'package:demo/src/view/components/mock_users.dart';
 import 'package:demo/src/view/services/person_service.dart';
 
 import '../../model/person.dart';