conflicts fixed and merge

1 files changed, 17 insertions, 6 deletions

diff --git a/frontend/src/views/Services.js b/frontend/src/views/Services.js
index b95b01c..0de021f 100644
--- a/frontend/src/views/Services.js
+++ b/frontend/src/views/Services.js
@@ -64,12 +64,23 @@ class Services extends Component {
 
     saveService() {
         if (this.state.portValid && this.state.nameValid) {
-            axios.put("/api/services", {
-                name: this.state.name,
-                port: this.state.port,
-                color: this.state.color,
-                notes: this.state.notes
-            });
+			const requestOptions = {
+			method: 'PUT',
+			headers: { 'Content-Type': 'application/json' },
+			body: JSON.stringify({ 
+				color: this.state.color,
+				name: this.state.name,
+				notes: this.state.notes,
+				port: this.state.port,
+				})
+			};
+
+
+			fetch('/api/services', requestOptions)
+				.then(function(response){
+					console.log(response);
+				}
+			);
 
             this.newService();
             this.loadServices();