Skip to content

Commit

Permalink
Merge pull request #31 from NimblePros/ShadyNagy/remove_BlazorShared_…
Browse files Browse the repository at this point in the history
…from_Web

remove blazor shared from web
  • Loading branch information
ardalis authored Jun 25, 2024
2 parents eccc73b + e2aa2be commit 8ac0ccc
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace BlazorShared.Authorization;
namespace BlazorAdmin.Authorization;

public class ClaimValue
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace BlazorShared.Authorization;
namespace BlazorAdmin.Authorization;

public class UserInfo
{
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorAdmin/CustomAuthStateProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Net.Http.Json;
using System.Security.Claims;
using System.Threading.Tasks;
using BlazorShared.Authorization;
using BlazorAdmin.Authorization;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.Extensions.Logging;

Expand Down
1 change: 0 additions & 1 deletion src/BlazorAdmin/_Imports.razor
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
@using BlazorAdmin.Shared
@using BlazorAdmin.Services
@using BlazorAdmin.JavaScript
@using BlazorShared.Authorization
@using BlazorShared.Interfaces
@using BlazorInputFile
@using BlazorShared.Models
9 changes: 9 additions & 0 deletions src/Web/Configuration/BaseUrlConfiguration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace Microsoft.eShopWeb.Web.Configuration;

public class BaseUrlConfiguration
{
public const string CONFIG_NAME = "baseUrls";

public string ApiBase { get; set; } = string.Empty;
public string WebBase { get; set; } = string.Empty;
}
2 changes: 1 addition & 1 deletion src/Web/Controllers/UserController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Security.Claims;
using BlazorShared.Authorization;
using BlazorAdmin.Authorization;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authorization;
Expand Down
2 changes: 1 addition & 1 deletion src/Web/HealthChecks/ApiHealthCheck.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using BlazorShared;
using Microsoft.eShopWeb.Web.Configuration;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Options;

Expand Down
2 changes: 1 addition & 1 deletion src/Web/Pages/Admin/EditCatalogItem.cshtml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Microsoft.eShopWeb.Web.Pages.Admin;

[Authorize(Roles = BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS)]
[Authorize(Roles = "Administrators")]
public class EditCatalogItemModel : PageModel
{
private readonly ICatalogItemViewModelService _catalogItemViewModelService;
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Pages/Admin/Index.cshtml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Microsoft.eShopWeb.Web.Pages.Admin;

[Authorize(Roles = BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS)]
[Authorize(Roles = "Administrators")]
public class IndexModel : PageModel
{
public IndexModel()
Expand Down
1 change: 0 additions & 1 deletion src/Web/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using BlazorAdmin;
using BlazorAdmin.Services;
using Blazored.LocalStorage;
using BlazorShared;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.AspNetCore.Identity;
Expand Down
1 change: 0 additions & 1 deletion src/Web/Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<ItemGroup>
<ProjectReference Include="..\ApplicationCore\ApplicationCore.csproj" />
<ProjectReference Include="..\BlazorAdmin\BlazorAdmin.csproj" />
<ProjectReference Include="..\BlazorShared\BlazorShared.csproj" />
<ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
</ItemGroup>
<ItemGroup>
Expand Down

0 comments on commit 8ac0ccc

Please sign in to comment.