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

Merge remote-tracking branch 'oqtane/dev' into dev

Browse Source
This commit is contained in:
Leigh Pointer 2023-07-15 12:34:10 +02:00
commit 4071b285ce
10 changed files with 71 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ else
<th>@Localizer["Default"]</th>
@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{
<th style="width: 1px;">@Localizer["Translation"]</th>
<th style="width: 1px;">@Localizer["Translation"]</th>
<th style="width: 1px;">&nbsp;</th>
}
</Header>
@ -33,7 +33,7 @@ else
<td><TriStateCheckBox Value="@(context.IsDefault)" Disabled="true"></TriStateCheckBox></td>
@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{
<td>@((string.IsNullOrEmpty(context.Version)) ? "---" : context.Version)</td>
<td>@((string.IsNullOrEmpty(context.Version)) ? "---" : context.Version)</td>
<td>
@{
var translation = TranslationAvailable(context.Code, context.Version);
@ -114,8 +114,8 @@ else
_packages = await PackageService.GetPackagesAsync("translation");
}
}
private async Task GetLanguages()
private async Task GetLanguages()
{
_languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId, Constants.ClientId);
}

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

@ -45,6 +45,7 @@ else
<th>@SharedLocalizer["Version"]</th>
<th>@Localizer["Enabled"]</th>
<th>@Localizer["InUse"]</th>
<th>@SharedLocalizer["Support"]</th>
<th>@SharedLocalizer["Expires"]</th>
<th style="width: 1px;">&nbsp;</th>
</Header>
@ -78,6 +79,9 @@ else
<span>@SharedLocalizer["No"]</span>
}
</td>
<td>
@((MarkupString)SupportLink(context.PackageName))
</td>
<td>
@((MarkupString)PurchaseLink(context.PackageName))
</td>
@ -130,7 +134,7 @@ else
{
if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
{
link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span><br />";
if (!string.IsNullOrEmpty(package.PaymentUrl))
{
link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>";
@ -141,6 +145,20 @@ else
return link;
}
private string SupportLink(string packagename)
{
string link = "";
if (!string.IsNullOrEmpty(packagename) && _packages != null)
{
var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
if (package != null && !string.IsNullOrEmpty(package.SupportUrl))
{
link += "<a class=\"btn btn-success\" style=\"text-decoration: none !important\" href=\"" + package.SupportUrl + "\" target=\"_new\">" + SharedLocalizer["Help"] + "</a>";
}
}
return link;
}
private string UpgradeAvailable(string packagename, string version)
{
if (!string.IsNullOrEmpty(packagename) && _packages != null)

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

@ -24,6 +24,7 @@ else
<th>@SharedLocalizer["Name"]</th>
<th>@SharedLocalizer["Version"]</th>
<th>@Localizer["Enabled"]</th>
<th>@SharedLocalizer["Support"]</th>
<th>@SharedLocalizer["Expires"]</th>
<th>&nbsp;</th>
</Header>
@ -47,6 +48,9 @@ else
<span>@SharedLocalizer["No"]</span>
}
</td>
<td>
@((MarkupString)SupportLink(context.PackageName))
</td>
<td>
@((MarkupString)PurchaseLink(context.PackageName))
</td>
@ -97,7 +101,7 @@ else
{
if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
{
link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span><br />";
if (!string.IsNullOrEmpty(package.PaymentUrl))
{
link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>";
@ -108,6 +112,20 @@ else
return link;
}
private string SupportLink(string packagename)
{
string link = "";
if (!string.IsNullOrEmpty(packagename) && _packages != null)
{
var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
if (package != null && !string.IsNullOrEmpty(package.SupportUrl))
{
link += "<a class=\"btn btn-success\" style=\"text-decoration: none !important\" href=\"" + package.SupportUrl + "\" target=\"_new\">" + SharedLocalizer["Help"] + "</a>";
}
}
return link;
}
private string UpgradeAvailable(string packagename, string version)
{
if (!string.IsNullOrEmpty(packagename) && _packages != null)

1
Oqtane.Client/Modules/Controls/FileManager.razor
View File

@ -177,7 +177,6 @@
if (file != null)
{
FolderId = file.FolderId;
await OnSelect.InvokeAsync(FileId);
}
else
{

10
Oqtane.Client/Resources/SharedResources.resx
View File

@ -343,7 +343,7 @@
<value>Please note that third party extensions are registered in the &lt;a href="https://www.oqtane.net" target="_new"&gt;Oqtane Marketplace&lt;/a&gt; which enables them to be seamlessly downloaded and installed into the framework.</value>
</data>
<data name="Home" xml:space="preserve">
<value>Home</value>
<value>Home</value>
</data>
<data name="Close" xml:space="preserve">
<value>Close</value>
@ -384,4 +384,10 @@
<data name="Confirm" xml:space="preserve">
<value>Confirm</value>
</data>
</root>
<data name="Help" xml:space="preserve">
<value>Help</value>
</data>
<data name="Support" xml:space="preserve">
<value>Support</value>
</data>
</root>

16
Oqtane.Server/Controllers/PackageController.cs
View File

@ -45,6 +45,15 @@ namespace Oqtane.Controllers
client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
packages = await GetJson<List<Package>>(client, Constants.PackageRegistryUrl + $"/api/registry/packages/?id={_configManager.GetInstallationId()}&type={type.ToLower()}&version={Constants.Version}&search={search}&price={price}&package={package}&sort={sort}");
if (packages != null)
{
var installationid = _configManager.GetInstallationId();
foreach (var _package in packages)
{
_package.PaymentUrl = _package.PaymentUrl.Replace("{InstallationId}", installationid);
_package.SupportUrl = _package.SupportUrl.Replace("{InstallationId}", installationid);
}
}
}
}
return packages;
@ -64,6 +73,13 @@ namespace Oqtane.Controllers
client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
package = await GetJson<Package>(client, Constants.PackageRegistryUrl + $"/api/registry/package/?id={_configManager.GetInstallationId()}&package={packageid}&version={version}&download={download}");
if (package != null)
{
var installationid = _configManager.GetInstallationId();
package.PaymentUrl = package.PaymentUrl.Replace("{InstallationId}", installationid);
package.SupportUrl = package.SupportUrl.Replace("{InstallationId}", installationid);
}
}
if (package != null)

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

@ -14,6 +14,7 @@ using Oqtane.Infrastructure;
using Oqtane.Repository;
using Oqtane.Security;
using Oqtane.Extensions;
using Oqtane.Managers;
namespace Oqtane.Controllers
{

1
Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
View File

@ -19,6 +19,7 @@ using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.OpenApi.Models;
using Oqtane.Infrastructure;
using Oqtane.Managers;
using Oqtane.Models;
using Oqtane.Modules;
using Oqtane.Repository;

2
Oqtane.Server/Infrastructure/Interfaces/IUserManager.cs → Oqtane.Server/Managers/Interfaces/IUserManager.cs
View File

@ -1,7 +1,7 @@
using System.Threading.Tasks;
using Oqtane.Models;
namespace Oqtane.Infrastructure
namespace Oqtane.Managers
{
public interface IUserManager
{

6
Oqtane.Server/Infrastructure/UserManager.cs → Oqtane.Server/Managers/UserManager.cs
View File

@ -4,16 +4,14 @@ using System.IO;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using Oqtane.Enums;
using Oqtane.Infrastructure;
using Oqtane.Models;
using Oqtane.Modules.Admin.Roles;
using Oqtane.Repository;
using Oqtane.Shared;
namespace Oqtane.Infrastructure
namespace Oqtane.Managers
{
public class UserManager : IUserManager
{