From f59f6b2f346156dea56d9a34b48ed2f17af45858 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Fri, 25 Oct 2019 00:03:11 -0400
Subject: [PATCH] added profile management

---
 Oqtane.Client/Modules/Admin/Login/Index.razor |   2 +
 Oqtane.Client/Modules/Admin/Logs/Detail.razor |   8 +
 .../Modules/Admin/Profiles/Edit.razor         | 165 ++++++++++++++++++
 .../Modules/Admin/Profiles/Index.razor        |  51 ++++++
 Oqtane.Client/Modules/Admin/Roles/Add.razor   |   2 +-
 .../Modules/Admin/Roles/Delete.razor          |   2 +-
 Oqtane.Client/Modules/Admin/Roles/Edit.razor  |   2 +-
 .../{Profile => UserProfile}/Index.razor      |   2 +-
 .../Modules/Controls/ActionLink.razor         |  19 +-
 Oqtane.Client/Modules/ModuleBase.cs           |   6 +-
 Oqtane.Client/Services/UserService.cs         |   2 +-
 Oqtane.Server/Repository/SiteRepository.cs    |  19 +-
 12 files changed, 262 insertions(+), 18 deletions(-)
 create mode 100644 Oqtane.Client/Modules/Admin/Profiles/Edit.razor
 create mode 100644 Oqtane.Client/Modules/Admin/Profiles/Index.razor
 rename Oqtane.Client/Modules/Admin/{Profile => UserProfile}/Index.razor (98%)

diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index bd0c871a..4af77908 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -56,6 +56,7 @@
             user = await UserService.LoginUserAsync(user, false, false);
             if (user.IsAuthenticated)
             {
+                await logger.LogInformation("Login Successful For Username {Username}", Username);
                 // complete the login on the server so that the cookies are set correctly on SignalR
                 var interop = new Interop(jsRuntime);
                 string antiforgerytoken = await interop.GetElementByName("__RequestVerificationToken");
@@ -78,6 +79,7 @@
             user = await UserService.LoginUserAsync(user, true, Remember);
             if (user.IsAuthenticated)
             {
+                await logger.LogInformation("Login Successful For Username {Username}", Username);
                 authstateprovider.NotifyAuthenticationChanged();
                 NavigationManager.NavigateTo(NavigateUrl(ReturnUrl, Reload.Site));
             }
diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
index 2ab28138..28aa59a8 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
@@ -80,6 +80,14 @@
                 </td>
             </tr>
         }
+        <tr>
+            <td>
+                <label class="control-label">Url: </label>
+            </td>
+            <td>
+                <input class="form-control" @bind="@url" disabled />
+            </td>
+        </tr>
         <tr>
             <td>
                 <label class="control-label">Template: </label>
diff --git a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor
new file mode 100644
index 00000000..a1eaff65
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor
@@ -0,0 +1,165 @@
+@namespace Oqtane.Modules.Admin.Profiles
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IProfileService ProfileService
+
+    <table class="table table-borderless">
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Name: </label>
+            </td>
+            <td>
+                <input class="form-control" @bind="@name" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Title: </label>
+            </td>
+            <td>
+                <input class="form-control" @bind="@title" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Description: </label>
+            </td>
+            <td>
+                <textarea class="form-control" @bind="@description" rows="5" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Category: </label>
+            </td>
+            <td>
+                <input class="form-control" @bind="@category" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Order: </label>
+            </td>
+            <td>
+                <input class="form-control" @bind="@vieworder" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Length: </label>
+            </td>
+            <td>
+                <input class="form-control" @bind="@maxlength" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Default Value: </label>
+            </td>
+            <td>
+                <input class="form-control" @bind="@defaultvalue" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Required? </label>
+            </td>
+            <td>
+                <select class="form-control" @bind="@isrequired">
+                    <option value="True">Yes</option>
+                    <option value="False">No</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Private? </label>
+            </td>
+            <td>
+                <select class="form-control" @bind="@isprivate">
+                    <option value="True">Yes</option>
+                    <option value="False">No</option>
+                </select>
+            </td>
+        </tr>
+    </table>
+<button type="button" class="btn btn-success" @onclick="SaveProfile">Save</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+
+@code {
+    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    public override string Actions { get { return "Add,Edit"; } }
+
+    int profileid = -1;
+    string name = "";
+    string title = "";
+    string description = "";
+    string category = "";
+    string vieworder = "0";
+    string maxlength = "0";
+    string defaultvalue = "";
+    string isrequired = "False";
+    string isprivate = "False";
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            if (PageState.QueryString.ContainsKey("id"))
+            {
+                profileid = Int32.Parse(PageState.QueryString["id"]);
+                Profile profile = await ProfileService.GetProfileAsync(profileid);
+                if (profile != null)
+                {
+                    name = profile.Name;
+                    title = profile.Title;
+                    description = profile.Description;
+                    category = profile.Category;
+                    vieworder = profile.ViewOrder.ToString();
+                    maxlength = profile.MaxLength.ToString();
+                    defaultvalue = profile.DefaultValue;
+                    isrequired = profile.IsRequired.ToString();
+                    isprivate = profile.IsPrivate.ToString();
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Profile {ProfileId} {Error}", profileid, ex.Message);
+            AddModuleMessage("Error Loading Profile", MessageType.Error);
+        }
+    }
+
+    private async Task SaveProfile()
+    {
+        try
+        {
+            Profile profile;
+            if (profileid != -1)
+            {
+                profile = await ProfileService.GetProfileAsync(profileid);
+            }
+            else
+            {
+                profile = new Profile();
+            }
+            profile.Name = name;
+            profile.Title = title;
+            profile.Description = description;
+            profile.Category = category;
+            profile.ViewOrder = int.Parse(vieworder);
+            profile.MaxLength = int.Parse(maxlength);
+            profile.DefaultValue = defaultvalue;
+            profile.IsRequired = (isrequired == null ? false : Boolean.Parse(isrequired));
+            profile.IsPrivate = (isprivate == null ? false : Boolean.Parse(isprivate));
+            profile = await ProfileService.UpdateProfileAsync(profile);
+            await logger.LogInformation("Profile Saved {Profile}", profile);
+            NavigationManager.NavigateTo(NavigateUrl());
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Saving Profile {ProfleId} {Error}", profileid, ex.Message);
+            AddModuleMessage("Error Saving Profile", MessageType.Error);
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
new file mode 100644
index 00000000..f65bded6
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
@@ -0,0 +1,51 @@
+@namespace Oqtane.Modules.Admin.Profiles
+@inherits ModuleBase
+@inject IProfileService ProfileService
+
+@if (Profiles == null)
+{
+    <p><em>Loading...</em></p>
+}
+else
+{
+    <ActionLink Action="Add" Text="Add Profile" Control="Edit" />
+
+    <Pager Items="@Profiles">
+        <Header>
+            <th>&nbsp;</th>
+            <th>&nbsp;</th>
+            <th>Name</th>
+        </Header>
+        <Row>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" /></td>
+            <td><ConfirmationDialog Header="Delete Profile" Message="@("Are You Sure You Wish To Delete " + context.Name + "?")" Action="Delete" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" /></td>
+            <td>@context.Name</td>
+        </Row>
+    </Pager>
+}
+
+@code {
+    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+
+    List<Profile> Profiles;
+
+    protected override async Task OnInitializedAsync()
+    {
+        Profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+    }
+
+    private async Task DeleteProfile(int ProfileId)
+    {
+        try
+        {
+            await ProfileService.DeleteProfileAsync(ProfileId);
+            await logger.LogInformation("Profile Deleted {ProfileId}", ProfileId);
+            AddModuleMessage("Profile Deleted", MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Profile {ProfileId} {Error}", ProfileId, ex.Message);
+            AddModuleMessage("Error Deleting Profile", MessageType.Error);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/Roles/Add.razor b/Oqtane.Client/Modules/Admin/Roles/Add.razor
index 8317cdf7..f4e26aa8 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Add.razor
@@ -22,7 +22,7 @@
     </tr>
     <tr>
         <td>
-            <label for="Name" class="control-label">Auto Assigned: </label>
+            <label for="Name" class="control-label">Auto Assigned? </label>
         </td>
         <td>
             <select class="form-control" @bind="@isautoassigned">
diff --git a/Oqtane.Client/Modules/Admin/Roles/Delete.razor b/Oqtane.Client/Modules/Admin/Roles/Delete.razor
index b7210c7d..9cc002ff 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Delete.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Delete.razor
@@ -22,7 +22,7 @@
     </tr>
     <tr>
         <td>
-            <label for="Name" class="control-label">Auto Assigned: </label>
+            <label for="Name" class="control-label">Auto Assigned? </label>
         </td>
         <td>
             <select class="form-control" @bind="@isautoassigned" readonly>
diff --git a/Oqtane.Client/Modules/Admin/Roles/Edit.razor b/Oqtane.Client/Modules/Admin/Roles/Edit.razor
index acc8c888..3ab20d91 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Edit.razor
@@ -22,7 +22,7 @@
     </tr>
     <tr>
         <td>
-            <label for="Name" class="control-label">Auto Assigned: </label>
+            <label for="Name" class="control-label">Auto Assigned? </label>
         </td>
         <td>
             <select class="form-control" @bind="@isautoassigned">
diff --git a/Oqtane.Client/Modules/Admin/Profile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
similarity index 98%
rename from Oqtane.Client/Modules/Admin/Profile/Index.razor
rename to Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 4760a4f4..a68b1fd5 100644
--- a/Oqtane.Client/Modules/Admin/Profile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Admin.Profile
+@namespace Oqtane.Modules.Admin.UserProfile
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor
index 230c3cff..aebbcb0d 100644
--- a/Oqtane.Client/Modules/Controls/ActionLink.razor
+++ b/Oqtane.Client/Modules/Controls/ActionLink.razor
@@ -12,17 +12,20 @@
     public string Action { get; set; }
 
     [Parameter]
-    public string Text { get; set; } // optional
+    public string Text { get; set; } // optional - defaults to Action if not specified
 
     [Parameter]
-    public string Parameters { get; set; } // optional
+    public string Parameters { get; set; } // optional - querystring parameter should be in the form of "id=x&name=y"
 
     [Parameter]
-    public string Class { get; set; } // optional
+    public string Class { get; set; } // optional - defaults to primary if not specified
 
     [Parameter]
     public string Style { get; set; } // optional
 
+    [Parameter]
+    public string Control { get; set; } // optional - can be used to explicitly link an Action to a Module Control
+
     string text = "";
     string url = "";
     string parameters = "";
@@ -57,7 +60,15 @@
 
         if (PageState.EditMode)
         {
-            string typename = ModuleState.ModuleType.Replace(Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0) + ",", Action + ",");
+            string typename;
+            if (string.IsNullOrEmpty(Control))
+            {
+                typename = ModuleState.ModuleType.Replace(Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0) + ",", Action + ",");
+            }
+            else
+            {
+                typename = ModuleState.ModuleType.Replace(Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0) + ",", Control + ",");
+            }
             Type moduleType = Type.GetType(typename);
             if (moduleType != null)
             {
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 94fa83a0..397daa2b 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -125,7 +125,7 @@ namespace Oqtane.Modules
             ModuleInstance.HideProgressIndicator();
         }
 
-        // logging method
+        // logging methods
         public async Task Log(LogLevel level, Exception exception, string message, params object[] args)
         {
             int PageId = PageState.Page.PageId;
@@ -153,6 +153,10 @@ namespace Oqtane.Modules
                     function = LogFunction.Read;
                     break;
             }
+            if (feature == "Login")
+            {
+                function = LogFunction.Security;
+            }
             await LoggingService.Log(PageId, ModuleId, UserId, category, feature, function, level, exception, message, args);
         }
 
diff --git a/Oqtane.Client/Services/UserService.cs b/Oqtane.Client/Services/UserService.cs
index f503a0bd..a64cb0dc 100644
--- a/Oqtane.Client/Services/UserService.cs
+++ b/Oqtane.Client/Services/UserService.cs
@@ -78,7 +78,7 @@ namespace Oqtane.Services
 
         public async Task<User> LoginUserAsync(User User, bool SetCookie, bool IsPersistent)
         {
-            return await http.PostJsonAsync<User>(apiurl + "/login?setcookie=" + SetCookie.ToString() + "&persistent =" + IsPersistent.ToString(), User);
+            return await http.PostJsonAsync<User>(apiurl + "/login?setcookie=" + SetCookie.ToString() + "&persistent=" + IsPersistent.ToString(), User);
         }
 
         public async Task LogoutUserAsync(User User)
diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
index 555e8d2f..a3a93edb 100644
--- a/Oqtane.Server/Repository/SiteRepository.cs
+++ b/Oqtane.Server/Repository/SiteRepository.cs
@@ -59,18 +59,24 @@ namespace Oqtane.Repository
             SiteTemplate.Add(new PageTemplate { Name = "Page Management", Parent = "Admin", Path = "admin/pages", Icon = "layers", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Pages, Oqtane.Client", Title = "Page Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "File Management", Parent = "Admin", Path = "admin/files", Icon = "file", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Files, Oqtane.Client", Title = "File Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            SiteTemplate.Add(new PageTemplate { Name = "User Management", Parent = "Admin", Path = "admin/users", Icon = "person", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "User Management", Parent = "Admin", Path = "admin/users", Icon = "people", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Users, Oqtane.Client", Title = "User Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
+            SiteTemplate.Add(new PageTemplate { Name = "Profile Management", Parent = "Admin", Path = "admin/profiles", Icon = "person", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Profiles, Oqtane.Client", Title = "Profile Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
+            }});
             SiteTemplate.Add(new PageTemplate { Name = "Role Management", Parent = "Admin", Path = "admin/roles", Icon = "lock-locked", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Roles, Oqtane.Client", Title = "Role Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
             SiteTemplate.Add(new PageTemplate { Name = "Event Log", Parent = "Admin", Path = "admin/log", Icon = "magnifying-glass", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Logs, Oqtane.Client", Title = "Event Log", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
+            SiteTemplate.Add(new PageTemplate { Name = "File Management", Parent = "Admin", Path = "admin/files", Icon = "file", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Files, Oqtane.Client", Title = "File Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
+            }});
+            SiteTemplate.Add(new PageTemplate { Name = "Recycle Bin", Parent = "Admin", Path = "admin/recyclebin", Icon = "trash", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.RecycleBin, Oqtane.Client", Title = "Recycle Bin", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
+            }});
             SiteTemplate.Add(new PageTemplate { Name = "Tenant Management", Parent = "Admin", Path = "admin/tenants", Icon = "list", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Tenants, Oqtane.Client", Title = "Tenant Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
@@ -83,9 +89,6 @@ namespace Oqtane.Repository
             SiteTemplate.Add(new PageTemplate { Name = "Upgrade Service", Parent = "Admin", Path = "admin/upgrade", Icon = "aperture", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Upgrade, Oqtane.Client", Title = "Upgrade Service", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "Recycle Bin", Parent = "Admin", Path = "admin/recyclebin", Icon = "trash", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.RecycleBin, Oqtane.Client", Title = "Recycle Bin", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
             SiteTemplate.Add(new PageTemplate { Name = "Login", Parent = "", Path = "login", Icon = "lock-locked", IsNavigation = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Login, Oqtane.Client", Title = "User Login", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
@@ -93,7 +96,7 @@ namespace Oqtane.Repository
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Register, Oqtane.Client", Title = "User Registration", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
             SiteTemplate.Add(new PageTemplate { Name = "Profile", Parent = "", Path = "profile", Icon = "person", IsNavigation = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Profile, Oqtane.Client", Title = "User Profile", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
+                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.UserProfile, Oqtane.Client", Title = "User Profile", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
         }