From cb2606fed1e3d26d887cdb32c4f96680adfca7f6 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 23 Sep 2019 21:09:38 +0000
Subject: [PATCH]

---
 .vscode/launch.json              | 36 ++++++++++++++++++--------------
 Controllers/QBridgeController.cs |  6 +++++-
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7521fb0..5300785 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -13,26 +13,30 @@
             "program": "${workspaceFolder}/bin/Debug/netcoreapp2.2/qbridge.dll",
             "args": [],
             "cwd": "${workspaceFolder}",
-            "launchBrowser": {
-                "enabled": true,
-                //"args": "${auto-detect-url}/auth/",
-                "windows": {
-                  "command": "cmd.exe",
-                  //"args": "/C start http://localhost:7575/api/v8/"
-                  "args": "/C start ${auto-detect-url}/qbridge/",
-                },
-                "osx": {
-                  "command": "open"
-                },
-                "linux": {
-                  "command": "xdg-open"
-                }
-              },
+            //Launch browser is deprecated, this was copied from RAVEN but is no longer how it's done.
+            // "launchBrowser": {
+            //     "enabled": true,
+            //     //"args": "${auto-detect-url}/auth/",
+            //     "windows": {
+            //       "command": "cmd.exe",
+            //       //"args": "/C start http://localhost:7575/api/v8/"
+            //       "args": "/C start ${auto-detect-url}/qbridge/",
+            //     },
+            //     "osx": {
+            //       "command": "open"
+            //     },
+            //     "linux": {
+            //       "command": "xdg-open"
+            //     }
+            //   },
             "stopAtEntry": false,
             // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
             "serverReadyAction": {
                 "action": "openExternally",
-                "pattern": "^\\s*Now listening on:\\s+(https?://\\S+)"                
+                //"pattern": "^\\s*Now listening on:\\s+(https?://\\S+)",  
+                //https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#specifying-the-browsers-url
+                "pattern": "^\\s*Now listening on:\\s+http://\\S+:([0-9]+)", 
+                "uriFormat": "http://localhost:%s/qbridge/"             
             },
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/Controllers/QBridgeController.cs b/Controllers/QBridgeController.cs
index 3a04f4e..4da661a 100644
--- a/Controllers/QBridgeController.cs
+++ b/Controllers/QBridgeController.cs
@@ -44,11 +44,15 @@ namespace qbridge.Controllers
                     <label for=""uname""><b>User name</b></label>
                     <input type=""text"" placeholder=""Enter Username"" id=""uname"" name=""uname"" required>
                 </div>
+                <br/>
                 <div>
                     <label for=""pwd""><b>Password</b></label>
                     <input type=""password"" placeholder=""Enter Password"" id=""pwd"" name=""pwd"" required>
                 </div>
+                 <br/>
+                <div>
                 <button type=""submit"">Login</button>               
+                </div>
             </div>        
             </form>                       
 
@@ -70,7 +74,7 @@ namespace qbridge.Controllers
         [HttpPost]
         public IActionResult Index([FromForm]string uname,[FromForm]string pwd)
         {
-            return Content($"Hello {uname}, password: {pwd}");
+            return Content($"Uname: {uname}, Password: {pwd}");
         }