fix: #89 get last changes and solve conflict

src/app/modules/customer-management/components/projects/components/create-project/create-project.component.html

@@ -1,27 +1,14 @@
-<div class="container mb-1">
-  <form style="width: 600px;">
-    <div class="form-group">
-      <input type="text" class="form-control form-control-sm" id="projectName" placeholder="Project name" />
-      <textarea
-        class="form-control form-control-sm mt-2"
-        id="exampleFormControlTextarea1"
-        rows="3"
-        placeholder="Description"
-      ></textarea>
-      <select class="form-group custom-select custom-select-sm mt-2">
-        <option selected>Select project type</option>
-        <option value="1">a..</option>
-        <option value="2">b..</option>
-      </select>
-      <button type="submit" class="btn btn-sm btn-primary">Save</button>
-      <button type="submit" class="btn btn-sm btn-secondary mb-2 ml-2 mt-2">Cancel</button>
-    </div>
-  </form>
-  <hr />
-  <div class="row text-right">
-    <hr />
-    <div class="col-5 text-right">
-      <app-search-project></app-search-project>
+<form style="width: 600px;" [formGroup]="projectForm" (ngSubmit)="onSubmit(projectForm.value)">
+  <div class="form-group">
+    <input
+      type="text"
+      class="form-control form-control-sm"
+      placeholder="Project name"
+      formControlName="name"
+      [class.is-invalid]="name.invalid && name.touched"
+    />
+    <div class="text-danger" *ngIf="(name.dirty || name.touched) && name.invalid && name.errors.required">
+      Project name is required.
     </div>
   </div>
   <textarea