Resolveconflicts

src/app/file.service.ts

@@ -9,7 +9,8 @@ import {HttpClient} from '@angular/common/http';
 })
 export class FileService {
 
-  baseApiUrl = 'http://localhost/sfcode/backend/filesave.php';
+  saveUrl = 'http://localhost/sfcode/backend/filesave.php';
+  uploadUrl = 'http://localhost/sfcode/backend/fileupload.php';
 
   constructor(private http: HttpClient) {
   }
@@ -34,7 +35,13 @@ export class FileService {
   }
 
   upload(file): Observable<any> {
-    return this.http.post(this.baseApiUrl, file);
+    return this.http.post(this.saveUrl, file);
+  }
+
+  upload2(file): Observable<any> {
+    const formData = new FormData(); 
+    formData.append("file", file, file.name); 
+    return this.http.post(this.uploadUrl, formData)
   }
 
 }

src/app/file/file.component.ts

@@ -40,7 +40,7 @@ export class FileComponent implements OnInit {
     this.loading = true;
     console.log(this.fileToUpload);
 
-    this.fileService.upload(this.fileToUpload).subscribe(
+    this.fileService.upload2(this.fileToUpload).subscribe(
       (event: any) => {
         if (typeof (event) === 'object') {
           this.fileToUpload = null;