kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39 from oqtane/master

Browse Source 
sync
This commit is contained in:
Shaun Walker 2020-06-19 17:30:38 -04:00 committed by GitHub
commit ff23865711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 80 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Files/Index.razor
View File

@ -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>

8
Oqtane.Client/Modules/Admin/Jobs/Index.razor
View File

@ -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>

2
Oqtane.Client/Modules/Admin/Logs/Index.razor
View File

@ -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>

2
Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
View File

@ -16,7 +16,7 @@
<Header>
<th>Name</th>
<th>Version</th>
<th></th>
<th style="width: 1px"></th>
</Header>
<Row>
<td>@context.Name</td>

6
Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
View File

@ -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>

4
Oqtane.Client/Modules/Admin/Pages/Index.razor
View File

@ -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>

4
Oqtane.Client/Modules/Admin/Profiles/Index.razor
View File

@ -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>

8
Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
View File

@ -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>

6
Oqtane.Client/Modules/Admin/Roles/Index.razor
View File

@ -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>

4
Oqtane.Client/Modules/Admin/Sites/Index.razor
View File

@ -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>

4
Oqtane.Client/Modules/Admin/Tenants/Index.razor
View File

@ -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>

2
Oqtane.Client/Modules/Admin/Themes/Add.razor
View File

@ -16,7 +16,7 @@
<Header>
<th>Name</th>
<th>Version</th>
<th></th>
<th style="width: 1px;"></th>
</Header>
<Row>
<td>@context.Name</td>

9
Oqtane.Client/Modules/Admin/Themes/Index.razor
View File

@ -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>
}

1
Oqtane.Client/Modules/Admin/UserProfile/Add.razor
View File

@ -66,6 +66,7 @@
notification.CreatedOn = DateTime.UtcNow;
notification.IsDelivered = false;
notification.DeliveredOn = null;
notification.SendOn = DateTime.UtcNow;
notification = await NotificationService.AddNotificationAsync(notification);
await logger.LogInformation("Notification Created {Notification}", notification);
NavigationManager.NavigateTo(NavigateUrl());

8
Oqtane.Client/Modules/Admin/UserProfile/Index.razor
View File

@ -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>
@ -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>

1
Oqtane.Client/Modules/Admin/UserProfile/View.razor
View File

@ -192,6 +192,7 @@
notification.CreatedOn = DateTime.UtcNow;
notification.IsDelivered = false;
notification.DeliveredOn = null;
notification.SendOn = DateTime.UtcNow;
notification = await NotificationService.AddNotificationAsync(notification);
await logger.LogInformation("Notification Created {Notification}", notification);
NavigationManager.NavigateTo(NavigateUrl());

6
Oqtane.Client/Modules/Admin/Users/Index.razor
View File

@ -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>

17
Oqtane.Client/Modules/Controls/PermissionGrid.razor
View File

@ -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>
@ -52,7 +52,7 @@
@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>

4
Oqtane.Server/Controllers/UserController.cs
View File

@ -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);
@ -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);
}

4
Oqtane.Server/Oqtane.Server.csproj
View File

@ -22,10 +22,14 @@
<Content Remove="wwwroot\Modules\Templates\**" />
<EmbeddedResource Remove="wwwroot\Modules\Templates\**" />
</ItemGroup>
<ItemGroup>
<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\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" />

1
Oqtane.Server/Repository/NotificationRepository.cs
View File

@ -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();
}

12
Oqtane.Server/Scripts/Tenant.01.00.01.01.sql Normal file
View File

@ -0,0 +1,12 @@
/*
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

1
Oqtane.Shared/Models/Notification.cs
View File

@ -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; }
}
}