From ab8a1e7324e26a9ec42339d160c5312acfed4b55 Mon Sep 17 00:00:00 2001
From: Mike Casas <mike.casas.public@gmail.com>
Date: Thu, 18 Jun 2020 06:13:15 -0400
Subject: [PATCH 01/11] Step 1.

---
 Oqtane.Server/Controllers/UserController.cs        | 2 ++
 Oqtane.Server/Oqtane.Server.csproj                 | 4 ++++
 Oqtane.Server/Scripts/Notification.01.00.01.00.sql | 9 +++++++++
 Oqtane.Shared/Models/Notification.cs               | 1 +
 4 files changed, 16 insertions(+)
 create mode 100644 Oqtane.Server/Scripts/Notification.01.00.01.00.sql

diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
index 6fb3c93b..d850f9ae 100644
--- a/Oqtane.Server/Controllers/UserController.cs
+++ b/Oqtane.Server/Controllers/UserController.cs
@@ -157,6 +157,7 @@ namespace Oqtane.Controllers
                             notification.CreatedOn = DateTime.UtcNow;
                             notification.IsDelivered = false;
                             notification.DeliveredOn = null;
+                            notification.SendOn = DateTime.UtcNow;
                             _notifications.AddNotification(notification);
                         }
 
@@ -385,6 +386,7 @@ namespace Oqtane.Controllers
                     notification.CreatedOn = DateTime.UtcNow;
                     notification.IsDelivered = false;
                     notification.DeliveredOn = null;
+                    notification.SendOn = DateTime.UtcNow;
                     _notifications.AddNotification(notification);
                     _logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset Notification Sent For {Username}", user.Username);
                 }
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 0db9ece5..6c2af753 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -22,10 +22,14 @@
     <Content Remove="wwwroot\Modules\Templates\**" />
     <EmbeddedResource Remove="wwwroot\Modules\Templates\**" />
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="Scripts\Notification.01.00.01.00.sql" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Scripts\Master.00.00.00.00.sql" />
     <EmbeddedResource Include="Scripts\Master.00.09.00.00.sql" />
     <EmbeddedResource Include="Scripts\Master.01.00.01.00.sql" />
+    <EmbeddedResource Include="Scripts\Notification.01.00.01.00.sql" />
     <EmbeddedResource Include="Scripts\Tenant.00.00.00.00.sql" />
     <EmbeddedResource Include="Scripts\Tenant.00.09.00.00.sql" />
     <EmbeddedResource Include="Scripts\Tenant.00.09.01.00.sql" />
diff --git a/Oqtane.Server/Scripts/Notification.01.00.01.00.sql b/Oqtane.Server/Scripts/Notification.01.00.01.00.sql
new file mode 100644
index 00000000..3acdbf29
--- /dev/null
+++ b/Oqtane.Server/Scripts/Notification.01.00.01.00.sql
@@ -0,0 +1,9 @@
+/*  
+
+Version 1.0.1 Notification migration script
+
+*/
+
+ALTER TABLE [dbo].[Notification] ADD
+	[SendOn] [datetime] NULL
+GO
\ No newline at end of file
diff --git a/Oqtane.Shared/Models/Notification.cs b/Oqtane.Shared/Models/Notification.cs
index aeb7235d..7ccdbd9d 100644
--- a/Oqtane.Shared/Models/Notification.cs
+++ b/Oqtane.Shared/Models/Notification.cs
@@ -22,6 +22,7 @@ namespace Oqtane.Models
         public string DeletedBy { get; set; }
         public DateTime? DeletedOn { get; set; }
         public bool IsDeleted { get; set; }
+        public DateTime? SendOn { get; set; }
     }
 
 }

From ee5553ad8a3d908bccafb81c8a7316639e351a4d Mon Sep 17 00:00:00 2001
From: Mike Casas <mike.casas.public@gmail.com>
Date: Thu, 18 Jun 2020 07:35:40 -0400
Subject: [PATCH 02/11] Step 2.

---
 Oqtane.Client/Modules/Admin/UserProfile/Add.razor  | 3 ++-
 Oqtane.Client/Modules/Admin/UserProfile/View.razor | 3 ++-
 Oqtane.Server/Repository/NotificationRepository.cs | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
index c413ec91..b19bae1d 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
@@ -65,7 +65,8 @@
                 notification.ParentId = null;
                 notification.CreatedOn = DateTime.UtcNow;
                 notification.IsDelivered = false;
-                notification.DeliveredOn = null;
+                notification.DeliveredOn = null;
+                notification.SendOn = DateTime.UtcNow;
                 notification = await NotificationService.AddNotificationAsync(notification);
                 await logger.LogInformation("Notification Created {Notification}", notification);
                 NavigationManager.NavigateTo(NavigateUrl());
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 2e48fcb1..32dde145 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -191,7 +191,8 @@
                 notification.ParentId = notificationid;
                 notification.CreatedOn = DateTime.UtcNow;
                 notification.IsDelivered = false;
-                notification.DeliveredOn = null;
+                notification.DeliveredOn = null;
+                notification.SendOn = DateTime.UtcNow;
                 notification = await NotificationService.AddNotificationAsync(notification);
                 await logger.LogInformation("Notification Created {Notification}", notification);
                 NavigationManager.NavigateTo(NavigateUrl());
diff --git a/Oqtane.Server/Repository/NotificationRepository.cs b/Oqtane.Server/Repository/NotificationRepository.cs
index 4e6550d2..45730d84 100644
--- a/Oqtane.Server/Repository/NotificationRepository.cs
+++ b/Oqtane.Server/Repository/NotificationRepository.cs
@@ -21,6 +21,7 @@ namespace Oqtane.Repository
                 return _db.Notification
                     .Where(item => item.SiteId == siteId)
                     .Where(item => item.IsDelivered == false)
+                    .Where(item => item.SendOn < System.DateTime.UtcNow)
                     .ToList();
             }
 

From 40571bfb6eb937d8188f0171bf7b4b341b0b8477 Mon Sep 17 00:00:00 2001
From: Mike Casas <mike.casas.public@gmail.com>
Date: Thu, 18 Jun 2020 08:40:43 -0400
Subject: [PATCH 03/11] Bug Fix.

Not sure why the email address was not being added to the notification.
---
 Oqtane.Server/Controllers/UserController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
index d850f9ae..d27694b4 100644
--- a/Oqtane.Server/Controllers/UserController.cs
+++ b/Oqtane.Server/Controllers/UserController.cs
@@ -148,7 +148,7 @@ namespace Oqtane.Controllers
                             notification.SiteId = user.SiteId;
                             notification.FromUserId = null;
                             notification.ToUserId = newUser.UserId;
-                            notification.ToEmail = "";
+                            notification.ToEmail = newUser.Email;
                             notification.Subject = "User Account Verification";
                             string token = await _identityUserManager.GenerateEmailConfirmationTokenAsync(identityuser);
                             string url = HttpContext.Request.Scheme + "://" + _tenants.GetAlias().Name + "/login?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);

From 7d896709305249a688831cbdef75ef65b5a1e00c Mon Sep 17 00:00:00 2001
From: Mike Casas <mike.casas.public@gmail.com>
Date: Thu, 18 Jun 2020 12:58:30 -0400
Subject: [PATCH 04/11] Fixed the sql script file name and added update for
 null values.

---
 .../{Notification.01.00.01.00.sql => Tenant.01.00.01.01.sql}   | 3 +++
 1 file changed, 3 insertions(+)
 rename Oqtane.Server/Scripts/{Notification.01.00.01.00.sql => Tenant.01.00.01.01.sql} (61%)

diff --git a/Oqtane.Server/Scripts/Notification.01.00.01.00.sql b/Oqtane.Server/Scripts/Tenant.01.00.01.01.sql
similarity index 61%
rename from Oqtane.Server/Scripts/Notification.01.00.01.00.sql
rename to Oqtane.Server/Scripts/Tenant.01.00.01.01.sql
index 3acdbf29..76af104c 100644
--- a/Oqtane.Server/Scripts/Notification.01.00.01.00.sql
+++ b/Oqtane.Server/Scripts/Tenant.01.00.01.01.sql
@@ -6,4 +6,7 @@ Version 1.0.1 Notification migration script
 
 ALTER TABLE [dbo].[Notification] ADD
 	[SendOn] [datetime] NULL
+GO
+
+UPDATE [dbo].[Notification] SET SendOn = CreatedOn WHERE SendOn IS NULL
 GO
\ No newline at end of file

From 20b83c88090e55e472a26f750b332293db359f04 Mon Sep 17 00:00:00 2001
From: Mike Casas <mike.casas.public@gmail.com>
Date: Thu, 18 Jun 2020 13:09:57 -0400
Subject: [PATCH 05/11] Updated csproj.

---
 Oqtane.Server/Oqtane.Server.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 6c2af753..7ae38416 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -23,13 +23,13 @@
     <EmbeddedResource Remove="wwwroot\Modules\Templates\**" />
   </ItemGroup>
   <ItemGroup>
-    <None Remove="Scripts\Notification.01.00.01.00.sql" />
+    <None Remove="Scripts\Tenant.01.00.01.01.sql" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Scripts\Master.00.00.00.00.sql" />
     <EmbeddedResource Include="Scripts\Master.00.09.00.00.sql" />
     <EmbeddedResource Include="Scripts\Master.01.00.01.00.sql" />
-    <EmbeddedResource Include="Scripts\Notification.01.00.01.00.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.01.00.01.01.sql" />
     <EmbeddedResource Include="Scripts\Tenant.00.00.00.00.sql" />
     <EmbeddedResource Include="Scripts\Tenant.00.09.00.00.sql" />
     <EmbeddedResource Include="Scripts\Tenant.00.09.01.00.sql" />

From 882412b8ffe68fd4e98c25e396dd0ff72bc49a0f Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Thu, 18 Jun 2020 22:22:16 -0700
Subject: [PATCH 06/11] button/input columns style="width: 1px"

---
 Oqtane.Client/Modules/Admin/Files/Index.razor |  2 +-
 Oqtane.Client/Modules/Admin/Jobs/Index.razor  |  8 ++++----
 Oqtane.Client/Modules/Admin/Logs/Index.razor  |  2 +-
 .../Modules/Admin/ModuleDefinitions/Add.razor |  2 +-
 .../Admin/ModuleDefinitions/Index.razor       |  6 +++---
 Oqtane.Client/Modules/Admin/Pages/Index.razor |  4 ++--
 .../Modules/Admin/Profiles/Index.razor        |  4 ++--
 .../Modules/Admin/RecycleBin/Index.razor      |  8 ++++----
 Oqtane.Client/Modules/Admin/Roles/Index.razor |  6 +++---
 Oqtane.Client/Modules/Admin/Sites/Index.razor |  4 ++--
 .../Modules/Admin/Tenants/Index.razor         |  4 ++--
 Oqtane.Client/Modules/Admin/Themes/Add.razor  |  2 +-
 .../Modules/Admin/Themes/Index.razor          |  9 +++++----
 .../Modules/Admin/UserProfile/Index.razor     |  4 ++--
 .../Modules/Admin/UserProfile/View.razor      |  8 ++++----
 Oqtane.Client/Modules/Admin/Users/Index.razor |  6 +++---
 .../Modules/Controls/PermissionGrid.razor     | 19 ++++++++++---------
 17 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor
index d92e0994..1c5f5783 100644
--- a/Oqtane.Client/Modules/Admin/Files/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Index.razor
@@ -28,7 +28,7 @@
     </table>
     <Pager Items="@_files">
         <Header>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
             <th>Modified</th>
             <th>Type</th>
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
index f15c50df..6ba8c69b 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
@@ -15,14 +15,14 @@ else
 
     <Pager Items="@_jobs">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
             <th>Status</th>
             <th>Frequency</th>
             <th>Next Execution</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.JobId.ToString())" /></td>
diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 730c6d13..3fcb0fb5 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -49,7 +49,7 @@ else
     {
         <Pager Items="@_logs">
             <Header>
-                <th>&nbsp;</th>
+                <th style="width: 1px;">&nbsp;</th>
                 <th>Date</th>
                 <th>Level</th>
                 <th>Feature</th>
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index 4d13338e..72dde55c 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -16,7 +16,7 @@
                     <Header>
                         <th>Name</th>
                         <th>Version</th>
-                        <th></th>
+                        <th style="width: 1px"></th>
                     </Header>
                     <Row>
                         <td>@context.Name</td>
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
index 88590d5e..fab64a64 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -14,11 +14,11 @@ else
 
     <Pager Items="@_moduleDefinitions">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
             <th>Version</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ModuleDefinitionId.ToString())" /></td>
diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor
index b53f3811..02d1d14c 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor
@@ -9,8 +9,8 @@
 
     <Pager Items="@PageState.Pages.Where(item => !item.IsDeleted)">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
index e3cefdaa..36df1731 100644
--- a/Oqtane.Client/Modules/Admin/Profiles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
@@ -12,8 +12,8 @@ else
 
     <Pager Items="@_profiles">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
index d3955307..220f5ffe 100644
--- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
@@ -16,8 +16,8 @@
         {
             <Pager Items="@_pages">
                 <Header>
-                    <th>&nbsp;</th>
-                    <th>&nbsp;</th>
+                    <th style="width: 1px;">&nbsp;</th>
+                    <th style="width: 1px;">&nbsp;</th>
                     <th>Name</th>
                     <th>Deleted By</th>
                     <th>Deleted On</th>
@@ -42,8 +42,8 @@
         {
             <Pager Items="@_modules">
                 <Header>
-                    <th>&nbsp;</th>
-                    <th>&nbsp;</th>
+                    <th style="width: 1px;">&nbsp;</th>
+                    <th style="width: 1px;">&nbsp;</th>
                     <th>Page</th>
                     <th>Module</th>
                     <th>Deleted By</th>
diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor
index 881a9348..a41998d4 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor
@@ -12,9 +12,9 @@ else
 
     <Pager Items="@_roles">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor
index d8b79632..8d82492d 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor
@@ -14,8 +14,8 @@ else
 
     <Pager Items="@_sites">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
diff --git a/Oqtane.Client/Modules/Admin/Tenants/Index.razor b/Oqtane.Client/Modules/Admin/Tenants/Index.razor
index ead272dc..1ce7c686 100644
--- a/Oqtane.Client/Modules/Admin/Tenants/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Tenants/Index.razor
@@ -11,8 +11,8 @@ else
 {
     <Pager Items="@tenants">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index 327a7d3a..bc280dff 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -16,7 +16,7 @@
                     <Header>
                         <th>Name</th>
                         <th>Version</th>
-                        <th></th>
+                        <th style="width: 1px;"></th>
                     </Header>
                     <Row>
                         <td>@context.Name</td>
diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
index d2e6b2e9..f3945afb 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -15,10 +15,10 @@ else
 
     <Pager Items="@_themes">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>Name</th>
-            <th>Version</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th scope="col">Name</th>
+            <th scope="col">Version</th>
             <th>&nbsp;</th>
         </Header>
         <Row>
@@ -37,6 +37,7 @@ else
                     <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.ThemeName, context.Version))>Upgrade</button>
                     }
             </td>
+            <td></td>
         </Row>
     </Pager>
 }
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 82ff8309..9823ad6a 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -111,8 +111,8 @@ else
             {
                 <Pager Items="@notifications">
                     <Header>
-                        <th>&nbsp;</th>
-                        <th>&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
                         <th>From</th>
                         <th>Subject</th>
                         <th>Received</th>
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 2e48fcb1..ea3382f2 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -33,7 +33,7 @@
                 <td>
                     <input class="form-control" @bind="@subject" readonly />
                 </td>
-}
+            }
             @if (title == "To")
             {
                 <td>
@@ -51,7 +51,7 @@
                     <input class="form-control" @bind="@createdon" readonly />
                 </td>
             </tr>
-}
+        }
         @if (title == "From")
         {
             <tr>
@@ -62,7 +62,7 @@
                     <textarea class="form-control" @bind="@body" rows="5" readonly />
                 </td>
             </tr>
-}
+        }
         @if (title == "To")
         {
             <tr>
@@ -73,7 +73,7 @@
                     <textarea class="form-control" @bind="@body" rows="5" />
                 </td>
             </tr>
-}
+        }
     </table>
 
 
diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index 4abc278a..682e2d3b 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -20,9 +20,9 @@ else
 
     <Pager Items="@userroles">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
index 90954bbe..951f0502 100644
--- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor
+++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
@@ -10,10 +10,10 @@
     <table class="table" style="width: 50%; min-width: 250px;">
         <tbody>
             <tr>
-                <th>Role</th>
+                <th scope="col">Role</th>
                 @foreach (PermissionString permission in _permissions)
                 {
-                    <th style="text-align: center;">@permission.PermissionName</th>
+                    <th style="text-align: center; width: 1px;">@permission.PermissionName</th>
                 }
             </tr>
             @foreach (Role role in _roles)
@@ -36,10 +36,10 @@
         <table class="table" style="width: 50%; min-width: 250px;">
             <thead>
                 <tr>
-                    <th>User</th>
+                    <th scope="col">User</th>
                     @foreach (PermissionString permission in _permissions)
                     {
-                        <th style="text-align: center;">@permission.PermissionName</th>
+                <th style="text-align: center; width: 1px;">@permission.PermissionName</th>
                     }
                 </tr>
             </thead>
@@ -48,11 +48,11 @@
                 {
                     string userid = "[" + user.UserId.ToString() + "]";
                     <tr>
-                        <td>@user.DisplayName</td>
+                        <td >@user.DisplayName</td>
                         @foreach (PermissionString permission in _permissions)
                         {
                             var p = permission;
-                            <td style="text-align: center;">
+                            <td style="text-align: center; width: 1px;">
                                 <TriStateCheckBox Value=@GetPermissionValue(p.Permissions, userid) Disabled=false OnChange="@(e => PermissionChanged(e, p.PermissionName, userid))" />
                             </td>
                         }
@@ -64,9 +64,10 @@
     <table class="table" style="width: 50%; min-width: 250px;">
         <tbody>
             <tr>
-                <td style="text-align: right;"><label for="Username" class="control-label">User: </label></td>
-                <td><input type="text" name="Username" class="form-control" placeholder="Enter Username" @bind="@_username" /></td>
-                <td style="text-align: left;"><button type="button" class="btn btn-primary" @onclick="AddUser">Add</button></td>
+                <td class="input-group">
+                    <input type="text" name="Username" class="form-control" placeholder="Enter Username" @bind="@_username" />
+                    <button type="button" class="btn btn-primary" @onclick="AddUser">Add</button>
+                </td>
             </tr>
         </tbody>
     </table>

From 5dced08f7abd13c8b5b349e91668d6106298d2b4 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Thu, 18 Jun 2020 22:47:41 -0700
Subject: [PATCH 07/11] removes password autofill autocomplete="new-password"

---
 Oqtane.Client/Modules/Admin/UserProfile/Index.razor | 4 ++--
 Oqtane.Server/appsettings.json                      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 9823ad6a..0c40987a 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -32,7 +32,7 @@ else
                         <label for="Name" class="control-label">Password: </label>
                     </td>
                     <td>
-                        <input type="password" class="form-control" @bind="@password" />
+                        <input type="password" class="form-control" @bind="@password" autocomplete="new-password" />
                     </td>
                 </tr>
                 <tr>
@@ -40,7 +40,7 @@ else
                         <label for="Name" class="control-label">Confirm Password: </label>
                     </td>
                     <td>
-                        <input type="password" class="form-control" @bind="@confirm" />
+                        <input type="password" class="form-control" @bind="@confirm" autocomplete="new-password" />
                     </td>
                 </tr>
                 <tr>
diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json
index cad2785c..e56b6a0f 100644
--- a/Oqtane.Server/appsettings.json
+++ b/Oqtane.Server/appsettings.json
@@ -1,8 +1,8 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": ""
+    "DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\\Oqtane-202006190523.mdf;Initial Catalog=Oqtane-202006190523;Integrated Security=SSPI;"
   },
-  "Runtime" : "Server",
+  "Runtime": "Server",
   "Installation": {
     "DefaultAlias": "",
     "HostPassword": "",
@@ -12,4 +12,4 @@
     "DefaultLayout": "",
     "DefaultContainer": ""
   }
-}
+}
\ No newline at end of file

From f4ca525bb525fa723543a10e596b85af86c8271b Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Thu, 18 Jun 2020 22:50:14 -0700
Subject: [PATCH 08/11] Delete appsettings.json

---
 Oqtane.Server/appsettings.json | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 Oqtane.Server/appsettings.json

diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json
deleted file mode 100644
index e56b6a0f..00000000
--- a/Oqtane.Server/appsettings.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "ConnectionStrings": {
-    "DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\\Oqtane-202006190523.mdf;Initial Catalog=Oqtane-202006190523;Integrated Security=SSPI;"
-  },
-  "Runtime": "Server",
-  "Installation": {
-    "DefaultAlias": "",
-    "HostPassword": "",
-    "HostEmail": "",
-    "SiteTemplate": "",
-    "DefaultTheme": "",
-    "DefaultLayout": "",
-    "DefaultContainer": ""
-  }
-}
\ No newline at end of file

From 120066fce1d74a85b7fa4373154f75d0984a33fa Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Thu, 18 Jun 2020 23:01:59 -0700
Subject: [PATCH 09/11] default

---
 Oqtane.Server/Properties/launchSettings.json | 38 +++++++-------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/Oqtane.Server/Properties/launchSettings.json b/Oqtane.Server/Properties/launchSettings.json
index fcddfc65..cad2785c 100644
--- a/Oqtane.Server/Properties/launchSettings.json
+++ b/Oqtane.Server/Properties/launchSettings.json
@@ -1,29 +1,15 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:44357/",
-      "sslPort": 0
-    }
+  "ConnectionStrings": {
+    "DefaultConnection": ""
   },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Oqtane.Server": {
-      "commandName": "Project",
-      "launchBrowser": true,
-       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "http://localhost:44357/"
-    }
+  "Runtime" : "Server",
+  "Installation": {
+    "DefaultAlias": "",
+    "HostPassword": "",
+    "HostEmail": "",
+    "SiteTemplate": "",
+    "DefaultTheme": "",
+    "DefaultLayout": "",
+    "DefaultContainer": ""
   }
-}
\ No newline at end of file
+}

From 0f814bfefe9fad3b65be642cb4b0c55be223280f Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Thu, 18 Jun 2020 23:06:33 -0700
Subject: [PATCH 10/11] Update launchSettings.json

---
 Oqtane.Server/Properties/launchSettings.json | 36 ++++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/Oqtane.Server/Properties/launchSettings.json b/Oqtane.Server/Properties/launchSettings.json
index cad2785c..d33ad7b2 100644
--- a/Oqtane.Server/Properties/launchSettings.json
+++ b/Oqtane.Server/Properties/launchSettings.json
@@ -1,15 +1,29 @@
 {
-  "ConnectionStrings": {
-    "DefaultConnection": ""
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:44357/",
+      "sslPort": 0
+    }
   },
-  "Runtime" : "Server",
-  "Installation": {
-    "DefaultAlias": "",
-    "HostPassword": "",
-    "HostEmail": "",
-    "SiteTemplate": "",
-    "DefaultTheme": "",
-    "DefaultLayout": "",
-    "DefaultContainer": ""
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Oqtane.Server": {
+      "commandName": "Project",
+      "launchBrowser": true,
+       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:44357/"
+    }
   }
 }

From 2febd81b4aa2e0bd16ef866c2e46b893816f6a13 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Thu, 18 Jun 2020 23:14:21 -0700
Subject: [PATCH 11/11] default connection

---
 Oqtane.Server/appsettings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json
index e56b6a0f..0ab499f0 100644
--- a/Oqtane.Server/appsettings.json
+++ b/Oqtane.Server/appsettings.json
@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\\Oqtane-202006190523.mdf;Initial Catalog=Oqtane-202006190523;Integrated Security=SSPI;"
+    "DefaultConnection": ""
   },
   "Runtime": "Server",
   "Installation": {