From 4836e2f4cc3e1eb53f415d26771c76c84d29c280 Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Tue, 19 Jan 2021 13:13:03 +0200
Subject: Configured launch.json to be workspace wide; Fixed GetFriend to
 GetUser

---
 src/DevHive.Web/Controllers/RoleController.cs  |  2 +-
 src/DevHive.Web/Controllers/UserController.cs  |  6 +--
 src/DevHive.Web/Properties/launchSettings.json | 59 ++++++++++++--------------
 src/DevHive.Web/appsettings.json               | 30 ++++++-------
 4 files changed, 47 insertions(+), 50 deletions(-)

(limited to 'src/DevHive.Web')

diff --git a/src/DevHive.Web/Controllers/RoleController.cs b/src/DevHive.Web/Controllers/RoleController.cs
index 5b3dca5..f173ea4 100644
--- a/src/DevHive.Web/Controllers/RoleController.cs
+++ b/src/DevHive.Web/Controllers/RoleController.cs
@@ -8,7 +8,7 @@ using DevHive.Services.Models.Identity.Role;
 
 namespace DevHive.Web.Controllers
 {
-    [ApiController]
+	[ApiController]
 	[Route("/api/[controller]")]
 	//[Authorize(Roles = "Admin")]
 	public class RoleController
diff --git a/src/DevHive.Web/Controllers/UserController.cs b/src/DevHive.Web/Controllers/UserController.cs
index a306007..dc27cbf 100644
--- a/src/DevHive.Web/Controllers/UserController.cs
+++ b/src/DevHive.Web/Controllers/UserController.cs
@@ -72,11 +72,11 @@ namespace DevHive.Web.Controllers
 		}
 
 		[HttpGet]
-		[Route("GetFriend")]
+		[Route("GetUser")]
 		[AllowAnonymous]
-		public async Task<IActionResult> GetAFriend(string username)
+		public async Task<IActionResult> GetUser(string username)
 		{
-			UserServiceModel friendServiceModel = await this._userService.GetFriend(username);
+			UserServiceModel friendServiceModel = await this._userService.GetUserByUsername(username);
 			UserWebModel friend = this._userMapper.Map<UserWebModel>(friendServiceModel);
 
 			return new OkObjectResult(friend);
diff --git a/src/DevHive.Web/Properties/launchSettings.json b/src/DevHive.Web/Properties/launchSettings.json
index 44d86fc..5deaadb 100644
--- a/src/DevHive.Web/Properties/launchSettings.json
+++ b/src/DevHive.Web/Properties/launchSettings.json
@@ -1,31 +1,28 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:1955",
-      "sslPort": 44326
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "DevHive.Web": {
-      "commandName": "Project",
-      "dotnetRunMessages": "true",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5000",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:1955",
+      "sslPort": 44326
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": false,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "DevHive.Web": {
+      "commandName": "Project",
+      "dotnetRunMessages": "true",
+      "launchBrowser": false,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/src/DevHive.Web/appsettings.json b/src/DevHive.Web/appsettings.json
index a460532..83932a7 100644
--- a/src/DevHive.Web/appsettings.json
+++ b/src/DevHive.Web/appsettings.json
@@ -1,15 +1,15 @@
-{
- "AppSettings": {
-  	"Secret": "gXfQlU6qpDleFWyimscjYcT3tgFsQg3yoFjcvSLxG56n1Vu2yptdIUq254wlJWjm"
-  },
-  "ConnectionStrings": {
-		"DEV": "Server=localhost;Port=5432;Database=API;User Id=postgres;Password=;"
-	},
-  "Logging" : {
-    "LogLevel" : {
-      "Default" : "Information",
-      "Microsoft" : "Warning",
-      "Microsoft.Hosting.Lifetime" : "Information"
-    }
-  }
-}
+{
+	"AppSettings": {
+		"Secret": "gXfQlU6qpDleFWyimscjYcT3tgFsQg3yoFjcvSLxG56n1Vu2yptdIUq254wlJWjm"
+	},
+	"ConnectionStrings": {
+		"DEV": "Server=localhost;Port=5432;Database=API;User Id=postgres;Password=;"
+	},
+	"Logging": {
+		"LogLevel": {
+			"Default": "Information",
+			"Microsoft": "Warning",
+			"Microsoft.Hosting.Lifetime": "Information"
+		}
+	}
+}
-- 
cgit v1.2.3