@Body diff --git a/src/Client/Core/Shared/MainLayout.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MainLayout.razor.cs similarity index 52% rename from src/Client/Core/Shared/MainLayout.razor.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MainLayout.razor.cs index 3739112..4246e25 100644 --- a/src/Client/Core/Shared/MainLayout.razor.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MainLayout.razor.cs @@ -1,19 +1,19 @@ using Microsoft.AspNetCore.Components.Web; -namespace Bit.TemplatePlayground.Client.Core.Shared; +namespace Bit.TemplatePlayground.Client.Core.Components.Layout; public partial class MainLayout : IDisposable { - private bool _disposed; - private bool _isMenuOpen; - private bool _isUserAuthenticated; - private ErrorBoundary ErrorBoundaryRef = default!; + private bool disposed; + private bool isMenuOpen; + private bool isUserAuthenticated; + private ErrorBoundary errorBoundaryRef = default!; - [AutoInject] private IPrerenderStateService _prerenderStateService = default!; + [AutoInject] private IPrerenderStateService prerenderStateService = default!; - [AutoInject] private IExceptionHandler _exceptionHandler = default!; + [AutoInject] private IExceptionHandler exceptionHandler = default!; - [AutoInject] private AppAuthenticationStateProvider _authStateProvider = default!; + [AutoInject] private AuthenticationManager authManager = default!; [CascadingParameter] public Task AuthenticationStateTask { get; set; } = default!; @@ -30,15 +30,15 @@ protected override async Task OnInitializedAsync() { try { - _authStateProvider.AuthenticationStateChanged += VerifyUserIsAuthenticatedOrNot; + authManager.AuthenticationStateChanged += VerifyUserIsAuthenticatedOrNot; - _isUserAuthenticated = await _prerenderStateService.GetValue($"{nameof(MainLayout)}-isUserAuthenticated", async () => (await AuthenticationStateTask).User.IsAuthenticated()); + isUserAuthenticated = await prerenderStateService.GetValue($"{nameof(MainLayout)}-isUserAuthenticated", async () => (await AuthenticationStateTask).User.IsAuthenticated()); await base.OnInitializedAsync(); } catch (Exception exp) { - _exceptionHandler.Handle(exp); + exceptionHandler.Handle(exp); } } @@ -46,11 +46,11 @@ async void VerifyUserIsAuthenticatedOrNot(Task task) { try { - _isUserAuthenticated = (await task).User.IsAuthenticated(); + isUserAuthenticated = (await task).User.IsAuthenticated(); } catch (Exception ex) { - _exceptionHandler.Handle(ex); + exceptionHandler.Handle(ex); } finally { @@ -60,7 +60,7 @@ async void VerifyUserIsAuthenticatedOrNot(Task task) private void ToggleMenuHandler() { - _isMenuOpen = !_isMenuOpen; + isMenuOpen = !isMenuOpen; } public void Dispose() @@ -71,10 +71,10 @@ public void Dispose() protected virtual void Dispose(bool disposing) { - if (_disposed) return; + if (disposed) return; - _authStateProvider.AuthenticationStateChanged -= VerifyUserIsAuthenticatedOrNot; + authManager.AuthenticationStateChanged -= VerifyUserIsAuthenticatedOrNot; - _disposed = true; + disposed = true; } } diff --git a/src/Client/Core/Shared/MainLayout.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MainLayout.razor.scss similarity index 92% rename from src/Client/Core/Shared/MainLayout.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MainLayout.razor.scss index beea1a5..71491c4 100644 --- a/src/Client/Core/Shared/MainLayout.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MainLayout.razor.scss @@ -1,7 +1,7 @@ -@import '../Styles/abstracts/_vars.scss'; -@import '../Styles/abstracts/_functions.scss'; -@import '../Styles/abstracts/_media-queries.scss'; -@import '../Styles/abstracts/_bit-css-variables.scss'; +@import '../../Styles/abstracts/_vars.scss'; +@import '../../Styles/abstracts/_functions.scss'; +@import '../../Styles/abstracts/_media-queries.scss'; +@import '../../Styles/abstracts/_bit-css-variables.scss'; .main { width: 100%; @@ -32,6 +32,8 @@ .main-content { flex-grow: 1; display: flex; + padding: 1rem; + flex-flow: column; align-items: center; justify-content: center; } diff --git a/src/Client/Core/Shared/MessageBox.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MessageBox.razor similarity index 77% rename from src/Client/Core/Shared/MessageBox.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MessageBox.razor index 00e5aa1..2630a8b 100644 --- a/src/Client/Core/Shared/MessageBox.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MessageBox.razor @@ -1,13 +1,13 @@ @inherits AppComponentBase - +
- @_title + @title
- @_body + @body
OK diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MessageBox.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MessageBox.razor.cs new file mode 100644 index 0000000..6df17c1 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MessageBox.razor.cs @@ -0,0 +1,73 @@ +namespace Bit.TemplatePlayground.Client.Core.Components.Layout; + +public partial class MessageBox : IDisposable +{ + private bool isOpen; + private string? title; + private string? body; + + private TaskCompletionSource? tcs; + + private async Task OnCloseClick() + { + isOpen = false; + await JSRuntime.SetBodyOverflow(false); + tcs?.SetResult(null); + tcs = null; + } + + private async Task OnOkClick() + { + isOpen = false; + await JSRuntime.SetBodyOverflow(false); + tcs?.SetResult(null); + tcs = null; + } + + Action? dispose; + bool disposed = false; + + protected override Task OnInitAsync() + { + dispose = PubSubService.Subscribe(PubSubMessages.SHOW_MESSAGE, async args => + { + (var message, string title, TaskCompletionSource tcs) = ((string message, string title, TaskCompletionSource tcs))args!; + await (this.tcs?.Task ?? Task.CompletedTask); + this.tcs = tcs; + await ShowMessageBox(message, title); + }); + + return base.OnInitAsync(); + } + + private async Task ShowMessageBox(string message, string title = "") + { + await InvokeAsync(() => + { + _ = JSRuntime.SetBodyOverflow(true); + + isOpen = true; + this.title = title; + body = message; + + StateHasChanged(); + }); + } + + public override void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } + + protected virtual void Dispose(bool disposing) + { + if (disposed || disposing is false) return; + + tcs?.TrySetResult(null); + tcs = null; + dispose?.Invoke(); + + disposed = true; + } +} diff --git a/src/Client/Core/Shared/MessageBox.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MessageBox.razor.scss similarity index 77% rename from src/Client/Core/Shared/MessageBox.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MessageBox.razor.scss index bbf208c..6077b51 100644 --- a/src/Client/Core/Shared/MessageBox.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/MessageBox.razor.scss @@ -1,5 +1,5 @@ -@import '../Styles/abstracts/_functions.scss'; -@import '../Styles/abstracts/_media-queries.scss'; +@import '../../Styles/abstracts/_functions.scss'; +@import '../../Styles/abstracts/_media-queries.scss'; .main { flex-grow: 1; diff --git a/src/Client/Core/Shared/NavMenu.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/NavMenu.razor similarity index 74% rename from src/Client/Core/Shared/NavMenu.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/NavMenu.razor index 461a3d6..51350d8 100644 --- a/src/Client/Core/Shared/NavMenu.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/NavMenu.razor @@ -8,10 +8,10 @@
@@ -23,11 +23,11 @@ @Localizer[nameof(AppStrings.SignOut)]
-
- \ No newline at end of file + \ No newline at end of file diff --git a/src/Client/Core/Shared/NavMenu.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/NavMenu.razor.cs similarity index 68% rename from src/Client/Core/Shared/NavMenu.razor.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/NavMenu.razor.cs index f6f01a8..eed0491 100644 --- a/src/Client/Core/Shared/NavMenu.razor.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/NavMenu.razor.cs @@ -1,18 +1,18 @@ using Bit.TemplatePlayground.Shared.Dtos.Identity; -namespace Bit.TemplatePlayground.Client.Core.Shared; +namespace Bit.TemplatePlayground.Client.Core.Components.Layout; public partial class NavMenu : IDisposable { - private bool _disposed; - private bool _isSignOutModalOpen; - private string? _profileImageUrl; - private string? _profileImageUrlBase; - private UserDto _user = new(); - private List _navItems = []; - private Action _unsubscribe = default!; + private bool disposed; + private bool isSignOutModalOpen; + private string? profileImageUrl; + private string? profileImageUrlBase; + private UserDto user = new(); + private List navItems = []; + private Action unsubscribe = default!; - [AutoInject] private NavigationManager _navManager = default!; + [AutoInject] private NavigationManager navManager = default!; [Parameter] public bool IsMenuOpen { get; set; } @@ -20,7 +20,7 @@ public partial class NavMenu : IDisposable protected override async Task OnInitAsync() { - _navItems = + navItems = [ new BitNavItem { @@ -63,34 +63,34 @@ protected override async Task OnInitAsync() } ]; - _unsubscribe = PubSubService.Subscribe(PubSubMessages.PROFILE_UPDATED, async payload => + unsubscribe = PubSubService.Subscribe(PubSubMessages.PROFILE_UPDATED, async payload => { if (payload is null) return; - _user = (UserDto)payload; + user = (UserDto)payload; SetProfileImageUrl(); StateHasChanged(); }); - _user = await PrerenderStateService.GetValue($"{nameof(NavMenu)}-{nameof(_user)}", async () => - await HttpClient.GetFromJsonAsync("User/GetCurrentUser", AppJsonContext.Default.UserDto)) ?? new(); + user = await PrerenderStateService.GetValue($"{nameof(NavMenu)}-{nameof(user)}", async () => + await HttpClient.GetFromJsonAsync("User/GetCurrentUser", AppJsonContext.Default.UserDto, CurrentCancellationToken)) ?? new(); var access_token = await PrerenderStateService.GetValue($"{nameof(NavMenu)}-access_token", AuthTokenProvider.GetAccessTokenAsync); - _profileImageUrlBase = $"{Configuration.GetApiServerAddress()}Attachment/GetProfileImage?access_token={access_token}&file="; + profileImageUrlBase = $"{Configuration.GetApiServerAddress()}Attachment/GetProfileImage?access_token={access_token}&file="; SetProfileImageUrl(); } private void SetProfileImageUrl() { - _profileImageUrl = _user.ProfileImageName is not null ? _profileImageUrlBase + _user.ProfileImageName : null; + profileImageUrl = user.ProfileImageName is not null ? profileImageUrlBase + user.ProfileImageName : null; } private async Task DoSignOut() { - _isSignOutModalOpen = true; + isSignOutModalOpen = true; await CloseMenu(); } @@ -98,7 +98,7 @@ private async Task DoSignOut() private async Task GoToEditProfile() { await CloseMenu(); - _navManager.NavigateTo("edit-profile"); + navManager.NavigateTo("edit-profile"); } private async Task CloseMenu() @@ -107,7 +107,7 @@ private async Task CloseMenu() await IsMenuOpenChanged.InvokeAsync(false); } - public void Dispose() + public override void Dispose() { Dispose(true); GC.SuppressFinalize(this); @@ -115,10 +115,10 @@ public void Dispose() protected virtual void Dispose(bool disposing) { - if (_disposed || disposing is false) return; + if (disposed || disposing is false) return; - _unsubscribe?.Invoke(); + unsubscribe?.Invoke(); - _disposed = true; + disposed = true; } } diff --git a/src/Client/Core/Shared/NavMenu.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/NavMenu.razor.scss similarity index 84% rename from src/Client/Core/Shared/NavMenu.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/NavMenu.razor.scss index 5f488af..234a0f2 100644 --- a/src/Client/Core/Shared/NavMenu.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/NavMenu.razor.scss @@ -1,7 +1,7 @@ -@import '../Styles/abstracts/_vars.scss'; -@import '../Styles/abstracts/_functions.scss'; -@import '../Styles/abstracts/_media-queries.scss'; -@import '../Styles/abstracts/_bit-css-variables.scss'; +@import '../../Styles/abstracts/_vars.scss'; +@import '../../Styles/abstracts/_functions.scss'; +@import '../../Styles/abstracts/_media-queries.scss'; +@import '../../Styles/abstracts/_bit-css-variables.scss'; .main-container { left: 0; diff --git a/src/Client/Core/Shared/SignOutConfirmModal.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/SignOutConfirmModal.razor similarity index 100% rename from src/Client/Core/Shared/SignOutConfirmModal.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/SignOutConfirmModal.razor diff --git a/src/Client/Core/Shared/SignOutConfirmModal.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/SignOutConfirmModal.razor.cs similarity index 66% rename from src/Client/Core/Shared/SignOutConfirmModal.razor.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/SignOutConfirmModal.razor.cs index 8e3c898..fadcbc6 100644 --- a/src/Client/Core/Shared/SignOutConfirmModal.razor.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/SignOutConfirmModal.razor.cs @@ -1,4 +1,4 @@ -namespace Bit.TemplatePlayground.Client.Core.Shared; +namespace Bit.TemplatePlayground.Client.Core.Components.Layout; public partial class SignOutConfirmModal { @@ -15,9 +15,7 @@ private async Task CloseModal() private async Task SignOut() { - await JSRuntime.RemoveAuthTokens(); - - await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged(); + await AuthenticationManager.SignOut(); await CloseModal(); } diff --git a/src/Client/Core/Shared/SignOutConfirmModal.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/SignOutConfirmModal.razor.scss similarity index 84% rename from src/Client/Core/Shared/SignOutConfirmModal.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/SignOutConfirmModal.razor.scss index 69a89d3..0a9eddf 100644 --- a/src/Client/Core/Shared/SignOutConfirmModal.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Layout/SignOutConfirmModal.razor.scss @@ -1,5 +1,5 @@ -@import '../Styles/abstracts/_functions.scss'; -@import '../Styles/abstracts/_media-queries.scss'; +@import '../../Styles/abstracts/_functions.scss'; +@import '../../Styles/abstracts/_media-queries.scss'; .modal-body { display: flex; diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/AddOrEditCategoryPage.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/AddOrEditCategoryPage.razor new file mode 100644 index 0000000..f37216e --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/AddOrEditCategoryPage.razor @@ -0,0 +1,98 @@ +@page "/add-edit-category/{Id:int?}" + +@inherits AppComponentBase + + + @if (category.Id == 0) + { + @Localizer[nameof(AppStrings.AddCategory)] + } + else + { + @Localizer[nameof(AppStrings.EditCategory)] + } + + +
+
+ +

+ @if (category.Id == 0) + { + @Localizer[nameof(AppStrings.AddCategory)] + } + else + { + @Localizer[nameof(AppStrings.EditCategory)] + } +

+
+ + + + @if (isLoading) + { +
+ +
+ } + + @if (string.IsNullOrEmpty(saveMessage) is false) + { + @saveMessage + } + +
+ + +
+ +
+ @Localizer[nameof(AppStrings.Color)] +
+
+ @foreach (var color in new[] { "#FFCD56", "#FF6384", "#4BC0C0", "#FF9124", "#2B88D8", "#C7E0F4" }) + { +
+
+ +
+
+ @Localizer[(nameof(AppStrings.CustomColor))] +
+ +
+ @if (isColorPickerOpen) + { +
+ + @Localizer[nameof(AppStrings.DefaultColorPicker)] + +
+ } +
+ +
+ + + @Localizer[nameof(AppStrings.Save)] + + + +
+ diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/AddOrEditCategoryPage.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/AddOrEditCategoryPage.razor.cs new file mode 100644 index 0000000..8ab79d4 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/AddOrEditCategoryPage.razor.cs @@ -0,0 +1,83 @@ +using Bit.TemplatePlayground.Shared.Dtos.Categories; + +namespace Bit.TemplatePlayground.Client.Core.Components.Pages.Categories; + +[Authorize] +public partial class AddOrEditCategoryPage +{ + [Parameter] public int? Id { get; set; } + + private bool isLoading; + private bool isSaving; + private string? saveMessage; + private bool isColorPickerOpen; + private BitMessageBarType saveMessageType; + private CategoryDto category = new(); + + protected override async Task OnInitAsync() + { + await LoadCategory(); + } + + private async Task LoadCategory() + { + if (Id is null) return; + + isLoading = true; + + try + { + category = await HttpClient.GetFromJsonAsync($"Category/Get/{Id}", AppJsonContext.Default.CategoryDto, CurrentCancellationToken) ?? new(); + } + finally + { + isLoading = false; + } + } + + private void SetCategoryColor(string color) + { + category.Color = color; + } + + private void ToggleColorPicker() + { + isColorPickerOpen = !isColorPickerOpen; + } + + private async Task Save() + { + if (isSaving) return; + + isSaving = true; + + try + { + if (category.Id == 0) + { + await HttpClient.PostAsJsonAsync("Category/Create", category, AppJsonContext.Default.CategoryDto, CurrentCancellationToken); + } + else + { + await HttpClient.PutAsJsonAsync("Category/Update", category, AppJsonContext.Default.CategoryDto, CurrentCancellationToken); + } + + NavigationManager.NavigateTo("categories"); + } + catch (ResourceValidationException e) + { + saveMessageType = BitMessageBarType.Error; + + saveMessage = string.Join(Environment.NewLine, e.Payload.Details.SelectMany(d => d.Errors).Select(e => e.Message)); + } + catch (KnownException e) + { + saveMessage = e.Message; + saveMessageType = BitMessageBarType.Error; + } + finally + { + isSaving = false; + } + } +} diff --git a/src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/AddOrEditCategoryPage.razor.scss similarity index 88% rename from src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/AddOrEditCategoryPage.razor.scss index 5525116..267235d 100644 --- a/src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/AddOrEditCategoryPage.razor.scss @@ -1,10 +1,11 @@ -@import '../../Styles/abstracts/_functions.scss'; -@import '../../Styles/abstracts/_media-queries.scss'; -@import '../../Styles/abstracts/_bit-css-variables.scss'; +@import '../../../Styles/abstracts/_functions.scss'; +@import '../../../Styles/abstracts/_media-queries.scss'; +@import '../../../Styles/abstracts/_bit-css-variables.scss'; .page-container { width: 100%; height: 100%; + flex-grow: 1; display: flex; align-items: flex-start; flex-flow: column nowrap; @@ -58,9 +59,10 @@ } .color-container { + gap: 1rem; display: flex; - flex-flow: row wrap; align-items: center; + flex-flow: column wrap; justify-content: flex-start; } diff --git a/src/Client/Core/Pages/Categories/CategoriesPage.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/CategoriesPage.razor similarity index 89% rename from src/Client/Core/Pages/Categories/CategoriesPage.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/CategoriesPage.razor index 706e2d5..9e277eb 100644 --- a/src/Client/Core/Pages/Categories/CategoriesPage.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/CategoriesPage.razor @@ -5,7 +5,7 @@ @Localizer[nameof(AppStrings.CategoriesPageTitle)]
- @if (_isLoading) + @if (isLoading) {
@@ -18,7 +18,7 @@
- + @@ -38,8 +38,8 @@ OnClick="WrapHandled(() => DeleteCategory(category!))" /> - +
- + diff --git a/src/Client/Core/Pages/Categories/CategoriesPage.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/CategoriesPage.razor.cs similarity index 65% rename from src/Client/Core/Pages/Categories/CategoriesPage.razor.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/CategoriesPage.razor.cs index aec534b..f87426e 100644 --- a/src/Client/Core/Pages/Categories/CategoriesPage.razor.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/CategoriesPage.razor.cs @@ -1,24 +1,24 @@ using Bit.TemplatePlayground.Shared.Dtos.Categories; -namespace Bit.TemplatePlayground.Client.Core.Pages.Categories; +namespace Bit.TemplatePlayground.Client.Core.Components.Pages.Categories; [Authorize] public partial class CategoriesPage { - private bool _isLoading; - private string _categoryNameFilter = string.Empty; + private bool isLoading; + private string categoryNameFilter = string.Empty; - private ConfirmMessageBox _confirmMessageBox = default!; - private BitDataGrid? _dataGrid; - private BitDataGridItemsProvider _categoriesProvider = default!; - private BitDataGridPaginationState _pagination = new() { ItemsPerPage = 10 }; + private ConfirmMessageBox confirmMessageBox = default!; + private BitDataGrid? dataGrid; + private BitDataGridItemsProvider categoriesProvider = default!; + private BitDataGridPaginationState pagination = new() { ItemsPerPage = 10 }; private string CategoryNameFilter { - get => _categoryNameFilter; + get => categoryNameFilter; set { - _categoryNameFilter = value; + categoryNameFilter = value; _ = RefreshData(); } } @@ -32,9 +32,9 @@ protected override async Task OnInitAsync() private void PrepareGridDataProvider() { - _categoriesProvider = async req => + categoriesProvider = async req => { - _isLoading = true; + isLoading = true; try { @@ -45,9 +45,9 @@ private void PrepareGridDataProvider() { "$skip", req.StartIndex } }; - if (string.IsNullOrEmpty(_categoryNameFilter) is false) + if (string.IsNullOrEmpty(categoryNameFilter) is false) { - query.Add("$filter", $"contains(Name,'{_categoryNameFilter}')"); + query.Add("$filter", $"contains(Name,'{categoryNameFilter}')"); } if (req.GetSortByProperties().Any()) @@ -57,9 +57,9 @@ private void PrepareGridDataProvider() var url = NavigationManager.GetUriWithQueryParameters("Category/GetCategories", query); - var data = await HttpClient.GetFromJsonAsync(url, AppJsonContext.Default.PagedResultCategoryDto) ?? new(); + var data = await HttpClient.GetFromJsonAsync(url, AppJsonContext.Default.PagedResultCategoryDto, CurrentCancellationToken) ?? new(); - return BitDataGridItemsProviderResult.From(await data.Items!.ToListAsync()!, (int)data.TotalCount); + return BitDataGridItemsProviderResult.From(await data.Items!.ToListAsync(CurrentCancellationToken)!, (int)data.TotalCount); } catch (Exception exp) { @@ -68,7 +68,7 @@ private void PrepareGridDataProvider() } finally { - _isLoading = false; + isLoading = false; StateHasChanged(); } @@ -77,7 +77,7 @@ private void PrepareGridDataProvider() private async Task RefreshData() { - await _dataGrid!.RefreshDataAsync(); + await dataGrid!.RefreshDataAsync(); } private void CreateCategory() @@ -92,12 +92,12 @@ private void EditCategory(CategoryDto category) private async Task DeleteCategory(CategoryDto category) { - var confirmed = await _confirmMessageBox.Show(Localizer.GetString(nameof(AppStrings.AreYouSureWannaDeleteCategory), category.Name ?? string.Empty), + var confirmed = await confirmMessageBox.Show(Localizer.GetString(nameof(AppStrings.AreYouSureWannaDeleteCategory), category.Name ?? string.Empty), Localizer[nameof(AppStrings.DeleteCategory)]); if (confirmed) { - await HttpClient.DeleteAsync($"Category/Delete/{category.Id}"); + await HttpClient.DeleteAsync($"Category/Delete/{category.Id}", CurrentCancellationToken); await RefreshData(); } diff --git a/src/Client/Core/Pages/Categories/CategoriesPage.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/CategoriesPage.razor.scss similarity index 92% rename from src/Client/Core/Pages/Categories/CategoriesPage.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/CategoriesPage.razor.scss index a7df945..9466d0a 100644 --- a/src/Client/Core/Pages/Categories/CategoriesPage.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Categories/CategoriesPage.razor.scss @@ -1,10 +1,11 @@ -@import '../../Styles/abstracts/_functions.scss'; -@import '../../Styles/abstracts/_media-queries.scss'; -@import '../../Styles/abstracts/_bit-css-variables.scss'; +@import '../../../Styles/abstracts/_functions.scss'; +@import '../../../Styles/abstracts/_media-queries.scss'; +@import '../../../Styles/abstracts/_bit-css-variables.scss'; .page-container { width: 100%; height: 100%; + flex-grow: 1; display: flex; align-items: flex-start; flex-flow: column nowrap; diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/DashboardPage.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/DashboardPage.razor new file mode 100644 index 0000000..a42a5dc --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/DashboardPage.razor @@ -0,0 +1,22 @@ +@page "/dashboard" +@inherits AppComponentBase + +@if (isLoadingAssemblies) +{ + +} +else +{ +
+ + +
+ + +
+ +
+ +
+
+} diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/DashboardPage.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/DashboardPage.razor.cs new file mode 100644 index 0000000..30082ee --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/DashboardPage.razor.cs @@ -0,0 +1,28 @@ +using Microsoft.AspNetCore.Components.WebAssembly.Services; + +namespace Bit.TemplatePlayground.Client.Core.Components.Pages.Dashboard; + +[Authorize] +public partial class DashboardPage +{ + [AutoInject] LazyAssemblyLoader lazyAssemblyLoader = default!; + + private bool isLoadingAssemblies = true; + + protected async override Task OnInitAsync() + { + try + { + if (OperatingSystem.IsBrowser()) + { + await lazyAssemblyLoader.LoadAssembliesAsync(["Newtonsoft.Json.wasm", "System.Private.Xml.wasm", "System.Data.Common.wasm"]); + } + } + finally + { + isLoadingAssemblies = false; + } + + await base.OnInitAsync(); + } +} diff --git a/src/Client/Core/Pages/Dashboard/DashboardPage.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/DashboardPage.razor.scss similarity index 82% rename from src/Client/Core/Pages/Dashboard/DashboardPage.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/DashboardPage.razor.scss index 99d089f..8bd1fef 100644 --- a/src/Client/Core/Pages/Dashboard/DashboardPage.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/DashboardPage.razor.scss @@ -1,4 +1,4 @@ -@import '../../Styles/abstracts/_functions.scss'; +@import '../../../Styles/abstracts/_functions.scss'; .page-container { width: 100%; diff --git a/src/Client/Core/Pages/Dashboard/OverallStatsWidget.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/OverallStatsWidget.razor similarity index 68% rename from src/Client/Core/Pages/Dashboard/OverallStatsWidget.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/OverallStatsWidget.razor index 220ee30..793b648 100644 --- a/src/Client/Core/Pages/Dashboard/OverallStatsWidget.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/OverallStatsWidget.razor @@ -2,53 +2,53 @@
-
- @if (_isLoading) +
+ @if (isLoading) { } else { - @_data.Last30DaysProductCount + @data.Last30DaysProductCount }
@Localizer[nameof(AppStrings.Last30DaysProductCount)]
-
- @if (_isLoading) +
+ @if (isLoading) { } else { - @_data.TotalProducts + @data.TotalProducts }
@Localizer[nameof(AppStrings.TotalProducts)]
-
- @if (_isLoading) +
+ @if (isLoading) { } else { - @_data.TotalCategories + @data.TotalCategories }
@Localizer[nameof(AppStrings.Last30DaysCategoryCount)]
-
- @if (_isLoading) +
+ @if (isLoading) { } else { - @_data.TotalCategories + @data.TotalCategories }
@Localizer[nameof(AppStrings.TotalCategories)]
diff --git a/src/Client/Core/Pages/Dashboard/OverallStatsWidget.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/OverallStatsWidget.razor.cs similarity index 54% rename from src/Client/Core/Pages/Dashboard/OverallStatsWidget.razor.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/OverallStatsWidget.razor.cs index 27cf3a1..0dfcbee 100644 --- a/src/Client/Core/Pages/Dashboard/OverallStatsWidget.razor.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/OverallStatsWidget.razor.cs @@ -1,11 +1,11 @@ using Bit.TemplatePlayground.Shared.Dtos.Dashboard; -namespace Bit.TemplatePlayground.Client.Core.Pages.Dashboard; +namespace Bit.TemplatePlayground.Client.Core.Components.Pages.Dashboard; public partial class OverallStatsWidget { - private bool _isLoading; - private OverallAnalyticsStatsDataDto _data = new(); + private bool isLoading; + private OverallAnalyticsStatsDataResponseDto data = new(); protected override async Task OnInitAsync() { @@ -14,17 +14,17 @@ protected override async Task OnInitAsync() private async Task GetData() { - _isLoading = true; + isLoading = true; try { - _data = await PrerenderStateService.GetValue($"{nameof(DashboardPage)}-{nameof(OverallStatsWidget)}", + data = await PrerenderStateService.GetValue($"{nameof(DashboardPage)}-{nameof(OverallStatsWidget)}", async () => await HttpClient.GetFromJsonAsync($"Dashboard/GetOverallAnalyticsStatsData", - AppJsonContext.Default.OverallAnalyticsStatsDataDto)) ?? new(); + AppJsonContext.Default.OverallAnalyticsStatsDataResponseDto, CurrentCancellationToken)) ?? new(); } finally { - _isLoading = false; + isLoading = false; } } } diff --git a/src/Client/Core/Pages/Dashboard/OverallStatsWidget.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/OverallStatsWidget.razor.scss similarity index 93% rename from src/Client/Core/Pages/Dashboard/OverallStatsWidget.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/OverallStatsWidget.razor.scss index 454f435..84c8f1c 100644 --- a/src/Client/Core/Pages/Dashboard/OverallStatsWidget.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/OverallStatsWidget.razor.scss @@ -1,6 +1,6 @@ -@import "../../Styles/abstracts/_functions.scss"; -@import "../../Styles/abstracts/_media-queries.scss"; -@import "../../Styles/abstracts/_bit-css-variables.scss"; +@import "../../../Styles/abstracts/_functions.scss"; +@import "../../../Styles/abstracts/_media-queries.scss"; +@import "../../../Styles/abstracts/_bit-css-variables.scss"; .card-container { width: 100%; diff --git a/src/Client/Core/Pages/Dashboard/ProductsCountPerCategotyWidget.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsCountPerCategotyWidget.razor similarity index 84% rename from src/Client/Core/Pages/Dashboard/ProductsCountPerCategotyWidget.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsCountPerCategotyWidget.razor index 295675c..0bd727e 100644 --- a/src/Client/Core/Pages/Dashboard/ProductsCountPerCategotyWidget.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsCountPerCategotyWidget.razor @@ -6,13 +6,13 @@
@Localizer[nameof(AppStrings.ProductsCountPerCategoryChartText)]
- @if (_isLoading) + @if (isLoading) { } else { - + }
diff --git a/src/Client/Core/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.cs similarity index 67% rename from src/Client/Core/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.cs index 43a7aa5..4dd0fbe 100644 --- a/src/Client/Core/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.cs @@ -1,15 +1,15 @@ -namespace Bit.TemplatePlayground.Client.Core.Pages.Dashboard; +namespace Bit.TemplatePlayground.Client.Core.Components.Pages.Dashboard; public partial class ProductsCountPerCategotyWidget { - private bool _isLoading; - private BitChart? _chart; - private BitChartBarConfig _config = default!; + private bool isLoading; + private BitChart? chart; + private BitChartBarConfig config = default!; protected override async Task OnInitAsync() { - _config = new BitChartBarConfig + config = new BitChartBarConfig { Options = new BitChartBarOptions { @@ -28,20 +28,20 @@ private async Task GetData() { try { - _isLoading = true; + isLoading = true; var data = await PrerenderStateService.GetValue($"{nameof(DashboardPage)}-{nameof(ProductsCountPerCategotyWidget)}", async () => await HttpClient.GetFromJsonAsync($"Dashboard/GetProductsCountPerCategotyStats", - AppJsonContext.Default.ListProductsCountPerCategoryDto)) ?? []; + AppJsonContext.Default.ListProductsCountPerCategoryResponseDto, CurrentCancellationToken)) ?? []; BitChartBarDataset chartDataSet = [.. data.Select(d => d.ProductCount)]; chartDataSet.BackgroundColor = data.Select(d => d.CategoryColor ?? string.Empty).ToArray(); - _config.Data.Datasets.Add(chartDataSet); - _config.Data.Labels.AddRange(data.Select(d => d.CategoryName ?? string.Empty)); + config.Data.Datasets.Add(chartDataSet); + config.Data.Labels.AddRange(data.Select(d => d.CategoryName ?? string.Empty)); } finally { - _isLoading = false; + isLoading = false; } } diff --git a/src/Client/Core/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.scss similarity index 91% rename from src/Client/Core/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.scss index b6b7bdd..1c7f8b8 100644 --- a/src/Client/Core/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.scss @@ -1,6 +1,6 @@ -@import "../../Styles/abstracts/_functions.scss"; -@import "../../Styles/abstracts/_media-queries.scss"; -@import "../../Styles/abstracts/_bit-css-variables.scss"; +@import "../../../Styles/abstracts/_functions.scss"; +@import "../../../Styles/abstracts/_media-queries.scss"; +@import "../../../Styles/abstracts/_bit-css-variables.scss"; .card { display: flex; diff --git a/src/Client/Core/Pages/Dashboard/ProductsPercentageWidget.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsPercentageWidget.razor similarity index 87% rename from src/Client/Core/Pages/Dashboard/ProductsPercentageWidget.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsPercentageWidget.razor index 311a812..bf16e3e 100644 --- a/src/Client/Core/Pages/Dashboard/ProductsPercentageWidget.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsPercentageWidget.razor @@ -8,13 +8,13 @@
@Localizer[nameof(AppStrings.ProductsPercentagePerCategoryText)]
- @if (_isLoading) + @if (isLoading) { } else { - + }
\ No newline at end of file diff --git a/src/Client/Core/Pages/Dashboard/ProductsPercentageWidget.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsPercentageWidget.razor.cs similarity index 65% rename from src/Client/Core/Pages/Dashboard/ProductsPercentageWidget.razor.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsPercentageWidget.razor.cs index f8a16d8..a2a3735 100644 --- a/src/Client/Core/Pages/Dashboard/ProductsPercentageWidget.razor.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsPercentageWidget.razor.cs @@ -1,13 +1,13 @@ -namespace Bit.TemplatePlayground.Client.Core.Pages.Dashboard; +namespace Bit.TemplatePlayground.Client.Core.Components.Pages.Dashboard; public partial class ProductsPercentageWidget { - private bool _isLoading; - private BitChartPieConfig _config = default!; + private bool isLoading; + private BitChartPieConfig config = default!; protected override async Task OnInitAsync() { - _config = new BitChartPieConfig + config = new BitChartPieConfig { Options = new BitChartPieOptions { @@ -20,22 +20,22 @@ protected override async Task OnInitAsync() private async Task GetData() { - _isLoading = true; + isLoading = true; try { var data = await PrerenderStateService.GetValue($"{nameof(DashboardPage)}-{nameof(ProductsPercentageWidget)}", async () => await HttpClient.GetFromJsonAsync($"Dashboard/GetProductsPercentagePerCategoryStats", - AppJsonContext.Default.ListProductPercentagePerCategoryDto)) ?? []; + AppJsonContext.Default.ListProductPercentagePerCategoryResponseDto, CurrentCancellationToken)) ?? []; BitChartPieDataset chartDataSet = [.. data!.Select(d => d.ProductPercentage)]; chartDataSet.BackgroundColor = data.Select(d => d.CategoryColor ?? string.Empty).ToArray(); - _config.Data.Datasets.Add(chartDataSet); - _config.Data.Labels.AddRange(data.Select(d => d.CategoryName ?? string.Empty)); + config.Data.Datasets.Add(chartDataSet); + config.Data.Labels.AddRange(data.Select(d => d.CategoryName ?? string.Empty)); } finally { - _isLoading = false; + isLoading = false; } } } diff --git a/src/Client/Core/Pages/Dashboard/ProductsPercentageWidget.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsPercentageWidget.razor.scss similarity index 91% rename from src/Client/Core/Pages/Dashboard/ProductsPercentageWidget.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsPercentageWidget.razor.scss index c0c0a2a..20a75dd 100644 --- a/src/Client/Core/Pages/Dashboard/ProductsPercentageWidget.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsPercentageWidget.razor.scss @@ -1,6 +1,6 @@ -@import "../../Styles/abstracts/_functions.scss"; -@import "../../Styles/abstracts/_media-queries.scss"; -@import "../../Styles/abstracts/_bit-css-variables.scss"; +@import "../../../Styles/abstracts/_functions.scss"; +@import "../../../Styles/abstracts/_media-queries.scss"; +@import "../../../Styles/abstracts/_bit-css-variables.scss"; .card { display: flex; diff --git a/src/Client/Core/Pages/Dashboard/ProductsSalesWidget.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsSalesWidget.razor similarity index 84% rename from src/Client/Core/Pages/Dashboard/ProductsSalesWidget.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsSalesWidget.razor index 1569b47..170d01f 100644 --- a/src/Client/Core/Pages/Dashboard/ProductsSalesWidget.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsSalesWidget.razor @@ -8,13 +8,13 @@
@Localizer[nameof(AppStrings.ProductSalesText)]
- @if (_isLoading) + @if (isLoading) { } else { - + }
diff --git a/src/Client/Core/Pages/Dashboard/ProductsSalesWidget.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsSalesWidget.razor.cs similarity index 67% rename from src/Client/Core/Pages/Dashboard/ProductsSalesWidget.razor.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsSalesWidget.razor.cs index 53624fa..a4dfcae 100644 --- a/src/Client/Core/Pages/Dashboard/ProductsSalesWidget.razor.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsSalesWidget.razor.cs @@ -1,14 +1,14 @@ -namespace Bit.TemplatePlayground.Client.Core.Pages.Dashboard; +namespace Bit.TemplatePlayground.Client.Core.Components.Pages.Dashboard; public partial class ProductsSalesWidget { - private bool _isLoading; - private BitChart? _chart; - private BitChartBarConfig _config = default!; + private bool isLoading; + private BitChart? chart; + private BitChartBarConfig config = default!; protected override async Task OnInitAsync() { - _config = new BitChartBarConfig + config = new BitChartBarConfig { Options = new BitChartBarOptions { @@ -27,20 +27,20 @@ private async Task GetData() { try { - _isLoading = true; + isLoading = true; var data = await PrerenderStateService.GetValue($"{nameof(DashboardPage)}-{nameof(ProductsSalesWidget)}", async () => await HttpClient.GetFromJsonAsync($"Dashboard/GetProductsSalesStats", - AppJsonContext.Default.ListProductSaleStatDto)) ?? []; + AppJsonContext.Default.ListProductSaleStatResponseDto, CurrentCancellationToken)) ?? []; BitChartBarDataset chartDataSet = [.. data.Select(d => d.SaleAmount)]; chartDataSet.BackgroundColor = data.Select(d => d.CategoryColor ?? string.Empty).ToArray(); - _config.Data.Datasets.Add(chartDataSet); - _config.Data.Labels.AddRange(data.Select(d => d.ProductName ?? string.Empty)); + config.Data.Datasets.Add(chartDataSet); + config.Data.Labels.AddRange(data.Select(d => d.ProductName ?? string.Empty)); } finally { - _isLoading = false; + isLoading = false; } } } diff --git a/src/Client/Core/Pages/Dashboard/ProductsSalesWidget.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsSalesWidget.razor.scss similarity index 90% rename from src/Client/Core/Pages/Dashboard/ProductsSalesWidget.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsSalesWidget.razor.scss index a8bd376..3ea02d1 100644 --- a/src/Client/Core/Pages/Dashboard/ProductsSalesWidget.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Dashboard/ProductsSalesWidget.razor.scss @@ -1,6 +1,6 @@ -@import "../../Styles/abstracts/_functions.scss"; -@import "../../Styles/abstracts/_media-queries.scss"; -@import "../../Styles/abstracts/_bit-css-variables.scss"; +@import "../../../Styles/abstracts/_functions.scss"; +@import "../../../Styles/abstracts/_media-queries.scss"; +@import "../../../Styles/abstracts/_bit-css-variables.scss"; .card { width: 100%; diff --git a/src/Client/Core/Pages/HomePage.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/HomePage.razor similarity index 100% rename from src/Client/Core/Pages/HomePage.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/HomePage.razor diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/HomePage.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/HomePage.razor.cs new file mode 100644 index 0000000..728b79d --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/HomePage.razor.cs @@ -0,0 +1,5 @@ +namespace Bit.TemplatePlayground.Client.Core.Components.Pages; + +public partial class HomePage +{ +} diff --git a/src/Client/Core/Pages/HomePage.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/HomePage.razor.scss similarity index 93% rename from src/Client/Core/Pages/HomePage.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/HomePage.razor.scss index 7f3fe08..425edb7 100644 --- a/src/Client/Core/Pages/HomePage.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/HomePage.razor.scss @@ -1,5 +1,5 @@ -@import '../Styles/abstracts/_functions.scss'; -@import '../Styles/abstracts/_media-queries.scss'; +@import '../../Styles/abstracts/_functions.scss'; +@import '../../Styles/abstracts/_media-queries.scss'; .page-container { width: 100%; diff --git a/src/Client/Core/Pages/Identity/DeleteAccountConfirmModal.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/DeleteAccountConfirmModal.razor similarity index 100% rename from src/Client/Core/Pages/Identity/DeleteAccountConfirmModal.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/DeleteAccountConfirmModal.razor diff --git a/src/Client/Core/Pages/Identity/DeleteAccountConfirmModal.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/DeleteAccountConfirmModal.razor.cs similarity index 60% rename from src/Client/Core/Pages/Identity/DeleteAccountConfirmModal.razor.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/DeleteAccountConfirmModal.razor.cs index 25ad781..0206aca 100644 --- a/src/Client/Core/Pages/Identity/DeleteAccountConfirmModal.razor.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/DeleteAccountConfirmModal.razor.cs @@ -1,4 +1,4 @@ -namespace Bit.TemplatePlayground.Client.Core.Pages.Identity; +namespace Bit.TemplatePlayground.Client.Core.Components.Pages.Identity; public partial class DeleteAccountConfirmModal { @@ -15,11 +15,9 @@ private async Task CloseModal() private async Task DeleteAccount() { - await HttpClient.DeleteAsync("User/Delete"); + await HttpClient.DeleteAsync("User/Delete", CurrentCancellationToken); - await JSRuntime.RemoveAuthTokens(); - - await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged(); + await AuthenticationManager.SignOut(); await CloseModal(); } diff --git a/src/Client/Core/Pages/Identity/DeleteAccountConfirmModal.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/DeleteAccountConfirmModal.razor.scss similarity index 83% rename from src/Client/Core/Pages/Identity/DeleteAccountConfirmModal.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/DeleteAccountConfirmModal.razor.scss index daac041..f7bab1e 100644 --- a/src/Client/Core/Pages/Identity/DeleteAccountConfirmModal.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/DeleteAccountConfirmModal.razor.scss @@ -1,5 +1,5 @@ -@import '../../Styles/abstracts/_functions.scss'; -@import '../../Styles/abstracts/_media-queries.scss'; +@import '../../../Styles/abstracts/_functions.scss'; +@import '../../../Styles/abstracts/_media-queries.scss'; .modal-body { display: flex; diff --git a/src/Client/Core/Pages/Identity/EditProfilePage.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/EditProfilePage.razor similarity index 74% rename from src/Client/Core/Pages/Identity/EditProfilePage.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/EditProfilePage.razor index e934cf2..2561ea8 100644 --- a/src/Client/Core/Pages/Identity/EditProfilePage.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/EditProfilePage.razor @@ -5,12 +5,12 @@
- @if (string.IsNullOrEmpty(_editProfileMessage) is false) + @if (string.IsNullOrEmpty(editProfileMessage) is false) { - @_editProfileMessage + MessageBarType="@editProfileMessageType" + OnDismiss="() => editProfileMessage = null"> + @editProfileMessage } @@ -18,7 +18,7 @@ @Localizer[nameof(AppStrings.EditProfileTitle)] - @if (_isLoading) + @if (isLoading) {
@@ -27,17 +27,17 @@ else {
-
- @if (_user.ProfileImageName is not null) + @if (user.ProfileImageName is not null) { - @Localizer[nameof(AppStrings.Remove)] @@ -45,38 +45,38 @@ } @Localizer[nameof(AppStrings.ProfileImage)] - -
@_profileImageError
+
@profileImageError
- +
- - +
- - +
- @@ -92,7 +92,7 @@
- + OnClick="() => isDeleteAccountConfirmModalOpen = true"> @Localizer[nameof(AppStrings.DeleteAccount)]
- + diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/EditProfilePage.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/EditProfilePage.razor.cs new file mode 100644 index 0000000..5b401cf --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/EditProfilePage.razor.cs @@ -0,0 +1,121 @@ +using Bit.TemplatePlayground.Shared.Dtos.Identity; + +namespace Bit.TemplatePlayground.Client.Core.Components.Pages.Identity; + +[Authorize] +public partial class EditProfilePage +{ + private bool isSaving; + private bool isRemoving; + private bool isLoading; + private string? profileImageUrl; + private string? profileImageError; + private string? editProfileMessage; + private string? profileImageUploadUrl; + private string? profileImageRemoveUrl; + private BitMessageBarType editProfileMessageType; + private UserDto user = new(); + private readonly EditUserDto userToEdit = new(); + private bool isDeleteAccountConfirmModalOpen; + + protected override async Task OnInitAsync() + { + isLoading = true; + + try + { + await LoadEditProfileData(); + + var access_token = await PrerenderStateService.GetValue($"{nameof(EditProfilePage)}-access_token", AuthTokenProvider.GetAccessTokenAsync); + + profileImageUploadUrl = $"{Configuration.GetApiServerAddress()}Attachment/UploadProfileImage?access_token={access_token}"; + profileImageUrl = $"{Configuration.GetApiServerAddress()}Attachment/GetProfileImage?access_token={access_token}"; + profileImageRemoveUrl = $"Attachment/RemoveProfileImage?access_token={access_token}"; + } + finally + { + isLoading = false; + } + + await base.OnInitAsync(); + } + + private async Task LoadEditProfileData() + { + user = await GetCurrentUser() ?? new(); + + UpdateEditProfileData(); + } + + private async Task RefreshProfileData() + { + await LoadEditProfileData(); + + PubSubService.Publish(PubSubMessages.PROFILE_UPDATED, user); + } + + private void UpdateEditProfileData() + { + userToEdit.Gender = user.Gender; + userToEdit.FullName = user.FullName; + userToEdit.BirthDate = user.BirthDate; + } + + private Task GetCurrentUser() => PrerenderStateService.GetValue($"{nameof(EditProfilePage)}-{nameof(user)}", () => HttpClient.GetFromJsonAsync("User/GetCurrentUser", AppJsonContext.Default.UserDto)); + + private async Task DoSave() + { + if (isSaving) return; + + isSaving = true; + editProfileMessage = null; + + try + { + user.FullName = userToEdit.FullName; + user.BirthDate = userToEdit.BirthDate; + user.Gender = userToEdit.Gender; + + (await (await HttpClient.PutAsJsonAsync("User/Update", userToEdit, AppJsonContext.Default.EditUserDto, CurrentCancellationToken)) + .Content.ReadFromJsonAsync(AppJsonContext.Default.UserDto, CurrentCancellationToken))!.Patch(user); + + PubSubService.Publish(PubSubMessages.PROFILE_UPDATED, user); + + editProfileMessageType = BitMessageBarType.Success; + editProfileMessage = Localizer[nameof(AppStrings.ProfileUpdatedSuccessfullyMessage)]; + } + catch (KnownException e) + { + editProfileMessageType = BitMessageBarType.Error; + + editProfileMessage = e.Message; + } + finally + { + isSaving = false; + } + } + + private async Task RemoveProfileImage() + { + if (isRemoving) return; + + isRemoving = true; + + try + { + await HttpClient.DeleteAsync(profileImageRemoveUrl, CurrentCancellationToken); + + await RefreshProfileData(); + } + catch (KnownException e) + { + editProfileMessage = e.Message; + editProfileMessageType = BitMessageBarType.Error; + } + finally + { + isRemoving = false; + } + } +} diff --git a/src/Client/Core/Pages/Identity/EditProfilePage.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/EditProfilePage.razor.scss similarity index 93% rename from src/Client/Core/Pages/Identity/EditProfilePage.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/EditProfilePage.razor.scss index 9357be9..51f09f7 100644 --- a/src/Client/Core/Pages/Identity/EditProfilePage.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/EditProfilePage.razor.scss @@ -1,6 +1,6 @@ -@import '../../Styles/abstracts/_functions.scss'; -@import '../../Styles/abstracts/_media-queries.scss'; -@import '../../Styles/abstracts/_bit-css-variables.scss'; +@import '../../../Styles/abstracts/_functions.scss'; +@import '../../../Styles/abstracts/_media-queries.scss'; +@import '../../../Styles/abstracts/_bit-css-variables.scss'; .page-container { width: 100%; diff --git a/src/Client/Core/Pages/Identity/EmailConfirmationPage.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/EmailConfirmationPage.razor similarity index 83% rename from src/Client/Core/Pages/Identity/EmailConfirmationPage.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/EmailConfirmationPage.razor index 3931621..81bce3e 100644 --- a/src/Client/Core/Pages/Identity/EmailConfirmationPage.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/EmailConfirmationPage.razor @@ -5,12 +5,12 @@
- @if (string.IsNullOrEmpty(_resendLinkErrors ?? Errors) is false) + @if (string.IsNullOrEmpty(resendLinkErrors ?? Errors) is false) { - @(_resendLinkErrors ?? Errors) + MessageBarType="@emailConfirmationMessageType" + OnDismiss="() => resendLinkErrors = Errors = null"> + @(resendLinkErrors ?? Errors) } @@ -37,7 +37,7 @@ @Localizer[nameof(AppStrings.InvalidConfirmationLinkMessage)]
- @Localizer[nameof(AppStrings.ForgetPasswordTitle)]
- + - @if (string.IsNullOrEmpty(_forgotPasswordMessage) is false) + @if (string.IsNullOrEmpty(forgotPasswordMessage) is false) { - @_forgotPasswordMessage + MessageBarType="@forgotPasswordMessageType" + OnDismiss="() => forgotPasswordMessage = null"> + @forgotPasswordMessage } @@ -23,14 +23,14 @@
- - +
- @Localizer[nameof(AppStrings.ResetPasswordTitle)]
- + - @if (string.IsNullOrEmpty(_resetPasswordMessage) is false) + @if (string.IsNullOrEmpty(resetPasswordMessage) is false) { - @_resetPasswordMessage + MessageBarType="@resetPasswordMessageType" + OnDismiss="() => resetPasswordMessage = null"> + @resetPasswordMessage }

@Localizer[nameof(AppStrings.ResetPasswordTitle)]

- - +
- - +
- @Localizer[nameof(AppStrings.SignInTitle)]
- + - @if (string.IsNullOrEmpty(_signInMessage) is false) + @if (string.IsNullOrEmpty(signInMessage) is false) { - @_signInMessage + MessageBarType="@signInMessageType" + OnDismiss="() => signInMessage = null"> + @signInMessage }

@Localizer[nameof(AppStrings.SignInTitle)]

- - +
- - +
- +
- @Localizer[nameof(AppStrings.SingUpTitle)]
- + - @if (string.IsNullOrEmpty(_signUpMessage) is false) + @if (string.IsNullOrEmpty(signUpMessage) is false) { - @_signUpMessage + MessageBarType="@signUpMessageType" + OnDismiss="() => signUpMessage = null"> + @signUpMessage } - @if (_isSignedUp) + @if (isSignedUp) {

@Localizer[nameof(AppStrings.ConfirmEmailTitle)] @@ -35,7 +35,7 @@
- @Localizer[nameof(AppStrings.Or)] -

-
- - +
- - +
- + @Localizer[nameof(AppStrings.TermsMessage)] @Localizer[nameof(AppStrings.TermsTitle)] - +
- d.Errors).Select(e => e.Message)); + } + catch (KnownException e) + { + signUpMessage = e.Message; + signUpMessageType = BitMessageBarType.Error; + } + finally + { + isLoading = false; + } + } + + private async Task DoResendLink() + { + if (isLoading) return; + + isLoading = true; + signUpMessage = null; + + try + { + await HttpClient.PostAsJsonAsync("Identity/SendConfirmationEmail", new() { Email = signUpModel.Email }, AppJsonContext.Default.SendConfirmationEmailRequestDto, CurrentCancellationToken); + + signUpMessageType = BitMessageBarType.Success; + signUpMessage = Localizer[nameof(AppStrings.ResendConfirmationLinkMessage)]; + } + catch (KnownException e) + { + signUpMessage = e.Message; + signUpMessageType = BitMessageBarType.Error; + } + finally + { + isLoading = false; + } + } +} diff --git a/src/Client/Core/Pages/Identity/SignUpPage.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/SignUpPage.razor.scss similarity index 88% rename from src/Client/Core/Pages/Identity/SignUpPage.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/SignUpPage.razor.scss index 65b7a6f..5167bad 100644 --- a/src/Client/Core/Pages/Identity/SignUpPage.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Identity/SignUpPage.razor.scss @@ -1,5 +1,5 @@ -@import '../../Styles/abstracts/_functions.scss'; -@import '../../Styles/abstracts/_media-queries.scss'; +@import '../../../Styles/abstracts/_functions.scss'; +@import '../../../Styles/abstracts/_media-queries.scss'; .page-container { width: 100%; diff --git a/src/Client/Core/Shared/NotAuthorizedComponent.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotAuthorizedPage.razor similarity index 55% rename from src/Client/Core/Shared/NotAuthorizedComponent.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotAuthorizedPage.razor index 7623057..3ef68a5 100644 --- a/src/Client/Core/Shared/NotAuthorizedComponent.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotAuthorizedPage.razor @@ -1,14 +1,14 @@ -@inherits AppComponentBase +@page "/not-authorized" - +@inherits AppComponentBase
-
+

@Localizer[nameof(AppStrings.ForbiddenException)]

-

@Localizer[nameof(AppStrings.YouAreSignInAs)] @_user.GetUserName()

+

@Localizer[nameof(AppStrings.YouAreSignInAs)] @user.GetUserName()

@Localizer[nameof(AppStrings.SignInAsDifferentUser)]
- + \ No newline at end of file diff --git a/src/Client/Core/Shared/NotAuthorizedComponent.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotAuthorizedPage.razor.cs similarity index 66% rename from src/Client/Core/Shared/NotAuthorizedComponent.razor.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotAuthorizedPage.razor.cs index 94bc51f..5e1b544 100644 --- a/src/Client/Core/Shared/NotAuthorizedComponent.razor.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotAuthorizedPage.razor.cs @@ -1,22 +1,21 @@ -namespace Bit.TemplatePlayground.Client.Core.Shared; +namespace Bit.TemplatePlayground.Client.Core.Components.Pages; -public partial class NotAuthorizedComponent +public partial class NotAuthorizedPage { - private ClaimsPrincipal _user = default!; + private ClaimsPrincipal user = default!; - [CascadingParameter] public Task AuthenticationState { get; set; } = default!; [SupplyParameterFromQuery(Name = "redirect-url"), Parameter] public string? RedirectUrl { get; set; } protected override async Task OnParamsSetAsync() { - _user = (await AuthenticationState).User; + user = (await AuthenticationStateTask).User; await base.OnParamsSetAsync(); } protected override async Task OnAfterFirstRenderAsync() { - string? refresh_token = await JSRuntime.GetLocalStorage("refresh_token"); + string? refresh_token = await StorageService.GetItem("refresh_token"); // Let's update the access token by refreshing it when a refresh token is available. // Following this procedure, the newly acquired access token may now include the necessary roles or claims. @@ -24,10 +23,7 @@ protected override async Task OnAfterFirstRenderAsync() if (string.IsNullOrEmpty(refresh_token) is false && RedirectUrl?.Contains("refresh_token=false", StringComparison.InvariantCulture) is null or false) { - // In the AuthenticationStateProvider, the access_token is refreshed using the refresh_token (if available). - // To ensure this process, consider removing the access_token, prompting the AuthenticationStateProvider to initiate a refresh automatically. - await JSRuntime.RemoveCookie("access_token"); - await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged(); + await AuthenticationManager.RefreshToken(); if ((await AuthenticationStateTask).User.IsAuthenticated()) { @@ -50,9 +46,7 @@ protected override async Task OnAfterFirstRenderAsync() private async Task SignIn() { - await JSRuntime.RemoveAuthTokens(); - - await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged(); + await AuthenticationManager.SignOut(); RedirectToSignInPage(); } diff --git a/src/Client/Core/Shared/NotAuthorizedComponent.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotAuthorizedPage.razor.scss similarity index 79% rename from src/Client/Core/Shared/NotAuthorizedComponent.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotAuthorizedPage.razor.scss index d49cb47..c0f2c12 100644 --- a/src/Client/Core/Shared/NotAuthorizedComponent.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotAuthorizedPage.razor.scss @@ -1,5 +1,5 @@ -@import '../Styles/abstracts/_functions.scss'; -@import '../Styles/abstracts/_bit-css-variables.scss'; +@import '../../Styles/abstracts/_functions.scss'; +@import '../../Styles/abstracts/_bit-css-variables.scss'; .main { width: 100%; diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotFoundPage.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotFoundPage.razor new file mode 100644 index 0000000..ff2a8b0 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotFoundPage.razor @@ -0,0 +1,8 @@ +@page "/not-found" + +@inherits AppComponentBase + +
+

404

+
There is nothing here.
+
\ No newline at end of file diff --git a/src/Client/Core/Shared/PageNotFound.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotFoundPage.razor.scss similarity index 80% rename from src/Client/Core/Shared/PageNotFound.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotFoundPage.razor.scss index daa9f7e..52bf68d 100644 --- a/src/Client/Core/Shared/PageNotFound.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/NotFoundPage.razor.scss @@ -1,5 +1,5 @@ -@import '../Styles/abstracts/_functions.scss'; -@import '../Styles/abstracts/_media-queries.scss'; +@import '../../Styles/abstracts/_functions.scss'; +@import '../../Styles/abstracts/_media-queries.scss'; .main { display: flex; diff --git a/src/Client/Core/Pages/Products/AddOrEditProductModal.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/AddOrEditProductModal.razor similarity index 65% rename from src/Client/Core/Pages/Products/AddOrEditProductModal.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/AddOrEditProductModal.razor index 9a55d7e..b75d167 100644 --- a/src/Client/Core/Pages/Products/AddOrEditProductModal.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/AddOrEditProductModal.razor @@ -1,10 +1,10 @@ @inherits AppComponentBase - +
- @if (_product.Id != 0) + @if (product.Id != 0) { @Localizer[nameof(AppStrings.EditProduct)] } @@ -15,45 +15,45 @@
- +
- - +
- - +
- - +
- - +
- + @Localizer[nameof(AppStrings.Save)] diff --git a/src/Client/Core/Pages/Products/AddOrEditProductModal.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/AddOrEditProductModal.razor.cs similarity index 59% rename from src/Client/Core/Pages/Products/AddOrEditProductModal.razor.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/AddOrEditProductModal.razor.cs index 634daf7..6d09900 100644 --- a/src/Client/Core/Pages/Products/AddOrEditProductModal.razor.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/AddOrEditProductModal.razor.cs @@ -1,16 +1,16 @@ using Bit.TemplatePlayground.Shared.Dtos.Products; -namespace Bit.TemplatePlayground.Client.Core.Pages.Products; +namespace Bit.TemplatePlayground.Client.Core.Components.Pages.Products; public partial class AddOrEditProductModal { - private bool _isOpen; - private bool _isLoading; - private bool _isSaving; - private ProductDto _product = new(); - private List> _allCategoryList = []; - private string _selectedCategoyId = string.Empty; + private bool isOpen; + private bool isLoading; + private bool isSaving; + private ProductDto product = new(); + private List> allCategoryList = []; + private string selectedCategoyId = string.Empty; [Parameter] public EventCallback OnSave { get; set; } @@ -19,15 +19,15 @@ protected override async Task OnInitAsync() await LoadAllCategoriesAsync(); } - public async Task ShowModal(ProductDto product) + public async Task ShowModal(ProductDto productToShow) { await InvokeAsync(() => { _ = JSRuntime.SetBodyOverflow(true); - _isOpen = true; - _product = product; - _selectedCategoyId = (_product.CategoryId ?? 0).ToString(); + isOpen = true; + product = productToShow; + selectedCategoyId = (product.CategoryId ?? 0).ToString(); StateHasChanged(); }); @@ -35,15 +35,15 @@ await InvokeAsync(() => private async Task LoadAllCategoriesAsync() { - _isLoading = true; + isLoading = true; try { var categoryList = await PrerenderStateService.GetValue($"{nameof(ProductsPage)}-AllCategoryList", async () => await HttpClient.GetFromJsonAsync("Category/Get", - AppJsonContext.Default.ListCategoryDto)) ?? []; + AppJsonContext.Default.ListCategoryDto, CurrentCancellationToken)) ?? []; - _allCategoryList = categoryList.Select(c => new BitDropdownItem() + allCategoryList = categoryList.Select(c => new BitDropdownItem() { ItemType = BitDropdownItemType.Normal, Text = c.Name ?? string.Empty, @@ -52,34 +52,34 @@ private async Task LoadAllCategoriesAsync() } finally { - _isLoading = false; + isLoading = false; } } private async Task Save() { - if (_isLoading) return; + if (isLoading) return; - _isSaving = true; + isSaving = true; try { - if (_product.Id == 0) + if (product.Id == 0) { - await HttpClient.PostAsJsonAsync("Product/Create", _product, AppJsonContext.Default.ProductDto); + await HttpClient.PostAsJsonAsync("Product/Create", product, AppJsonContext.Default.ProductDto, CurrentCancellationToken); } else { - await HttpClient.PutAsJsonAsync("Product/Update", _product, AppJsonContext.Default.ProductDto); + await HttpClient.PutAsJsonAsync("Product/Update", product, AppJsonContext.Default.ProductDto, CurrentCancellationToken); } - _isOpen = false; + isOpen = false; await JSRuntime.SetBodyOverflow(false); } finally { - _isSaving = false; + isSaving = false; await OnSave.InvokeAsync(); } @@ -87,7 +87,7 @@ private async Task Save() private async Task OnCloseClick() { - _isOpen = false; + isOpen = false; await JSRuntime.SetBodyOverflow(false); } diff --git a/src/Client/Core/Pages/Products/AddOrEditProductModal.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/AddOrEditProductModal.razor.scss similarity index 84% rename from src/Client/Core/Pages/Products/AddOrEditProductModal.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/AddOrEditProductModal.razor.scss index a14bef4..1d6e450 100644 --- a/src/Client/Core/Pages/Products/AddOrEditProductModal.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/AddOrEditProductModal.razor.scss @@ -1,6 +1,6 @@ -@import '../../Styles/abstracts/_functions.scss'; -@import '../../Styles/abstracts/_media-queries.scss'; -@import '../../Styles/abstracts/_bit-css-variables.scss'; +@import '../../../Styles/abstracts/_functions.scss'; +@import '../../../Styles/abstracts/_media-queries.scss'; +@import '../../../Styles/abstracts/_bit-css-variables.scss'; .main-container { display: flex; diff --git a/src/Client/Core/Pages/Products/ProductsPage.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/ProductsPage.razor similarity index 86% rename from src/Client/Core/Pages/Products/ProductsPage.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/ProductsPage.razor index 825036e..3adda7e 100644 --- a/src/Client/Core/Pages/Products/ProductsPage.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/ProductsPage.razor @@ -5,7 +5,7 @@ @Localizer[nameof(AppStrings.ProductsPageTitle)]
- @if (_isLoading) + @if (isLoading) {
@@ -18,7 +18,7 @@
- + @@ -35,9 +35,9 @@ - +
- - \ No newline at end of file + + \ No newline at end of file diff --git a/src/Client/Core/Pages/Products/ProductsPage.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/ProductsPage.razor.cs similarity index 64% rename from src/Client/Core/Pages/Products/ProductsPage.razor.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/ProductsPage.razor.cs index 3ee443f..ad47716 100644 --- a/src/Client/Core/Pages/Products/ProductsPage.razor.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/ProductsPage.razor.cs @@ -1,25 +1,25 @@ using Bit.TemplatePlayground.Shared.Dtos.Products; -namespace Bit.TemplatePlayground.Client.Core.Pages.Products; +namespace Bit.TemplatePlayground.Client.Core.Components.Pages.Products; [Authorize] public partial class ProductsPage { - private bool _isLoading; - private AddOrEditProductModal? _modal; - private string _productNameFilter = string.Empty; + private bool isLoading; + private AddOrEditProductModal? modal; + private string productNameFilter = string.Empty; - private ConfirmMessageBox _confirmMessageBox = default!; - private BitDataGrid? _dataGrid; - private BitDataGridItemsProvider _productsProvider = default!; - private BitDataGridPaginationState _pagination = new() { ItemsPerPage = 10 }; + private ConfirmMessageBox confirmMessageBox = default!; + private BitDataGrid? dataGrid; + private BitDataGridItemsProvider productsProvider = default!; + private BitDataGridPaginationState pagination = new() { ItemsPerPage = 10 }; string ProductNameFilter { - get => _productNameFilter; + get => productNameFilter; set { - _productNameFilter = value; + productNameFilter = value; _ = RefreshData(); } } @@ -33,9 +33,9 @@ protected override async Task OnInitAsync() private void PrepareGridDataProvider() { - _productsProvider = async req => + productsProvider = async req => { - _isLoading = true; + isLoading = true; try { @@ -46,9 +46,9 @@ private void PrepareGridDataProvider() { "$skip", req.StartIndex } }; - if (string.IsNullOrEmpty(_productNameFilter) is false) + if (string.IsNullOrEmpty(productNameFilter) is false) { - query.Add("$filter", $"contains(Name,'{_productNameFilter}')"); + query.Add("$filter", $"contains(Name,'{productNameFilter}')"); } if (req.GetSortByProperties().Any()) @@ -58,7 +58,7 @@ private void PrepareGridDataProvider() var url = NavigationManager.GetUriWithQueryParameters("Product/GetProducts", query); - var data = await HttpClient.GetFromJsonAsync(url, AppJsonContext.Default.PagedResultProductDto); + var data = await HttpClient.GetFromJsonAsync(url, AppJsonContext.Default.PagedResultProductDto, CurrentCancellationToken); return BitDataGridItemsProviderResult.From(await data!.Items!.ToListAsync(), (int)data!.TotalCount); } @@ -69,7 +69,7 @@ private void PrepareGridDataProvider() } finally { - _isLoading = false; + isLoading = false; StateHasChanged(); } @@ -78,27 +78,27 @@ private void PrepareGridDataProvider() private async Task RefreshData() { - await _dataGrid!.RefreshDataAsync(); + await dataGrid!.RefreshDataAsync(); } private async Task CreateProduct() { - await _modal!.ShowModal(new ProductDto()); + await modal!.ShowModal(new ProductDto()); } private async Task EditProduct(ProductDto product) { - await _modal!.ShowModal(product); + await modal!.ShowModal(product); } private async Task DeleteProduct(ProductDto product) { - var confirmed = await _confirmMessageBox.Show(Localizer.GetString(nameof(AppStrings.AreYouSureWannaDeleteProduct), product.Name ?? string.Empty), + var confirmed = await confirmMessageBox.Show(Localizer.GetString(nameof(AppStrings.AreYouSureWannaDeleteProduct), product.Name ?? string.Empty), Localizer[nameof(AppStrings.DeleteProduct)]); if (confirmed) { - await HttpClient.DeleteAsync($"Product/Delete/{product.Id}"); + await HttpClient.DeleteAsync($"Product/Delete/{product.Id}", CurrentCancellationToken); await RefreshData(); } diff --git a/src/Client/Core/Pages/Products/ProductsPage.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/ProductsPage.razor.scss similarity index 92% rename from src/Client/Core/Pages/Products/ProductsPage.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/ProductsPage.razor.scss index 5bb49bd..24479a9 100644 --- a/src/Client/Core/Pages/Products/ProductsPage.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/Products/ProductsPage.razor.scss @@ -1,10 +1,11 @@ -@import '../../Styles/abstracts/_functions.scss'; -@import '../../Styles/abstracts/_media-queries.scss'; -@import '../../Styles/abstracts/_bit-css-variables.scss'; +@import '../../../Styles/abstracts/_functions.scss'; +@import '../../../Styles/abstracts/_media-queries.scss'; +@import '../../../Styles/abstracts/_bit-css-variables.scss'; .page-container { width: 100%; height: 100%; + flex-grow: 1; display: flex; align-items: flex-start; flex-flow: column nowrap; diff --git a/src/Client/Core/Pages/TermsPage.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/TermsPage.razor similarity index 100% rename from src/Client/Core/Pages/TermsPage.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/TermsPage.razor diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/TermsPage.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/TermsPage.razor.cs new file mode 100644 index 0000000..939a1d4 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/TermsPage.razor.cs @@ -0,0 +1,5 @@ +namespace Bit.TemplatePlayground.Client.Core.Components.Pages; + +public partial class TermsPage +{ +} diff --git a/src/Client/Core/Pages/TermsPage.razor.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/TermsPage.razor.scss similarity index 85% rename from src/Client/Core/Pages/TermsPage.razor.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/TermsPage.razor.scss index 07be99b..c5eb271 100644 --- a/src/Client/Core/Pages/TermsPage.razor.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Components/Pages/TermsPage.razor.scss @@ -1,5 +1,5 @@ -@import '../Styles/abstracts/_functions.scss'; -@import '../Styles/abstracts/_media-queries.scss'; +@import '../../Styles/abstracts/_functions.scss'; +@import '../../Styles/abstracts/_media-queries.scss'; .page-container { width: 100%; @@ -8,19 +8,6 @@ align-self: flex-start; flex-flow: column nowrap; justify-content: flex-start; - padding: rem2(88px) rem2(32px); - - @include lg { - padding: rem2(72px) rem2(32px); - } - - @include md { - padding: rem2(64px) rem2(32px); - } - - @include sm { - padding: rem2(40px) rem2(32px); - } } .page-content { diff --git a/src/Client/Core/Extensions/ICollectionExtensions.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Extensions/ICollectionExtensions.cs similarity index 100% rename from src/Client/Core/Extensions/ICollectionExtensions.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Extensions/ICollectionExtensions.cs diff --git a/src/Client/Core/Extensions/IConfigurationBuilderExtensions.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Extensions/IConfigurationBuilderExtensions.cs similarity index 100% rename from src/Client/Core/Extensions/IConfigurationBuilderExtensions.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Extensions/IConfigurationBuilderExtensions.cs diff --git a/src/Client/Core/Extensions/IConfigurationExtensions.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Extensions/IConfigurationExtensions.cs similarity index 100% rename from src/Client/Core/Extensions/IConfigurationExtensions.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Extensions/IConfigurationExtensions.cs diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Extensions/IJSRuntimeExtensions.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Extensions/IJSRuntimeExtensions.cs new file mode 100644 index 0000000..a7b92f7 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Extensions/IJSRuntimeExtensions.cs @@ -0,0 +1,34 @@ +namespace Microsoft.JSInterop; + +public static class IJSRuntimeExtensions +{ + /// + /// To disable the scrollbar of the body when showing the modal, so the modal can be always shown in the viewport without being scrolled out. + /// + public static async Task SetBodyOverflow(this IJSRuntime jsRuntime, bool hidden) + { + await jsRuntime.InvokeVoidAsync("App.setBodyOverflow", hidden); + } + + public static async Task GoBack(this IJSRuntime jsRuntime) + { + await jsRuntime.InvokeVoidAsync("App.goBack"); + } + + public static async Task ApplyBodyElementClasses(this IJSRuntime jsRuntime, List cssClasses, Dictionary cssVariables) + { + await jsRuntime.InvokeVoidAsync("App.applyBodyElementClasses", cssClasses, cssVariables); + } + + public static async Task SetCookie(this IJSRuntime jsRuntime, string key, string value, long expiresIn, bool rememberMe) + { + bool secure = BuildConfiguration.IsRelease(); + + await jsRuntime.InvokeVoidAsync("App.setCookie", key, value, expiresIn, rememberMe, secure); + } + + public static async Task RemoveCookie(this IJSRuntime jsRuntime, string key) + { + await jsRuntime.InvokeVoidAsync("App.removeCookie", key); + } +} diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Extensions/IServiceCollectionExtensions.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Extensions/IServiceCollectionExtensions.cs new file mode 100644 index 0000000..47675e7 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Extensions/IServiceCollectionExtensions.cs @@ -0,0 +1,73 @@ + +using Bit.TemplatePlayground.Client.Core.Services.HttpMessageHandlers; +using Microsoft.AspNetCore.Components.WebAssembly.Services; + +namespace Microsoft.Extensions.DependencyInjection; + +public static class IServiceCollectionExtensions +{ + public static IServiceCollection AddClientSharedServices(this IServiceCollection services) + { + // Services registered in this class can be injected in client side (Web, Android, iOS, Windows, macOS) + + services.TryAddTransient(); + + services.TryAddSessioned(); + services.TryAddTransient(); + services.TryAddTransient(); + + services.TryAddTransient(); + services.TryAddTransient(); + services.TryAddTransient(); + services.TryAddTransient(); + services.TryAddTransient(); + + services.AddScoped(); + services.AddScoped(sp => (AuthenticationManager)sp.GetRequiredService()); + + services.TryAddTransient(); + services.TryAddTransient(); + + services.AddBitBlazorUIServices(); + services.AddSharedServices(); + + return services; + } + + /// + /// Utilizing the AddSessioned method seamlessly configures the service to function as a singleton in BlazorHybrid, and BlazorWebAssembly + /// environments. Simultaneously, it employs per-scope registration for pre-rendering and BlazorServer scenarios + /// + public static IServiceCollection AddSessioned(this IServiceCollection services) + where TImplementation : class, TService + where TService : class + { + if (AppRenderMode.IsHybrid() || OperatingSystem.IsBrowser()) + { + return services.AddSingleton(); + } + else + { + return services.AddScoped(); + } + } + + /// + /// + /// + public static IServiceCollection TryAddSessioned(this IServiceCollection services) + where TImplementation : class, TService + where TService : class + { + if (AppRenderMode.IsHybrid() || OperatingSystem.IsBrowser()) + { + services.TryAddSingleton(); + } + else + { + services.TryAddScoped(); + } + + return services; + } +} diff --git a/src/Client/Core/App.razor b/src/Client/Bit.TemplatePlayground.Client.Core/Routes.razor similarity index 69% rename from src/Client/Core/App.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/Routes.razor index f8dd19f..45be701 100644 --- a/src/Client/Core/App.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Routes.razor @@ -1,20 +1,19 @@  + AdditionalAssemblies="@(AssemblyLoadContext.Default.Assemblies.Where(asm => asm.GetName().Name?.Contains("Bit.TemplatePlayground") is true))"> - - - + + + - + diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Routes.razor.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Routes.razor.cs new file mode 100644 index 0000000..f586a7f --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Routes.razor.cs @@ -0,0 +1,6 @@ +namespace Bit.TemplatePlayground.Client.Core; + +public partial class Routes +{ + +} diff --git a/src/Client/Core/Scripts/app.ts b/src/Client/Bit.TemplatePlayground.Client.Core/Scripts/app.ts similarity index 87% rename from src/Client/Core/Scripts/app.ts rename to src/Client/Bit.TemplatePlayground.Client.Core/Scripts/app.ts index bcf2925..b03d3ba 100644 --- a/src/Client/Core/Scripts/app.ts +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Scripts/app.ts @@ -1,19 +1,17 @@ class App { - public static setCookie(name: string, value: string, seconds: number, remeber: boolean) { + public static setCookie(name: string, value: string, seconds: number, remeber: boolean, secure: boolean) { const date = new Date(); date.setSeconds(date.getSeconds() + seconds); let cookie = `${name}=${value};path=/;samesite=strict;`; if (remeber == true) { cookie = cookie += `expires=${date.toUTCString()};`; } + if (secure == true) { + cookie = `${cookie};secure`; + } document.cookie = cookie; } - public static getCookie(name: string): string | null { - // https://stackoverflow.com/a/25490531/2720104 - return document.cookie.match('(^|;)\\s*' + name + '\\s*=\\s*([^;]+)')?.pop() || null; - } - public static removeCookie(name: string): void { document.cookie = `${name}=; Max-Age=0`; } diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Services/AppRenderMode.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/AppRenderMode.cs new file mode 100644 index 0000000..9e4fe2f --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Services/AppRenderMode.cs @@ -0,0 +1,26 @@ +using Microsoft.AspNetCore.Components.Web; +using OS = System.OperatingSystem; + +namespace Bit.TemplatePlayground.Client.Core.Services; + +public static class AppRenderMode +{ + public static readonly bool PrerenderEnabled = false; + + private static IComponentRenderMode Auto { get; } = new InteractiveAutoRenderMode(PrerenderEnabled); + private static IComponentRenderMode BlazorWebAssembly { get; } = new InteractiveWebAssemblyRenderMode(PrerenderEnabled); + private static IComponentRenderMode BlazorServer { get; } = new InteractiveServerRenderMode(PrerenderEnabled); + public static IComponentRenderMode NoPrerenderBlazorWebAssembly => new InteractiveWebAssemblyRenderMode(prerender: false); + + public static IComponentRenderMode Current => + BuildConfiguration.IsDebug() ? BlazorServer /*For better development experience*/ : Auto; + + public static bool PwaEnabled { get; } = +#if PwaEnabled + true; +#else + false; +#endif + + public static bool IsHybrid() => OS.IsAndroid() || OS.IsIOS() || OS.IsMacCatalyst() || OS.IsMacOS() || OS.IsWindows(); +} diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Services/AuthenticationManager.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/AuthenticationManager.cs new file mode 100644 index 0000000..5d36a9b --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Services/AuthenticationManager.cs @@ -0,0 +1,146 @@ +using System.Text; +using System.Text.Json; +using Bit.TemplatePlayground.Shared.Dtos.Identity; + +namespace Bit.TemplatePlayground.Client.Core.Services; + +public partial class AuthenticationManager : AuthenticationStateProvider +{ + [AutoInject] private IAuthTokenProvider tokenProvider = default!; + [AutoInject] private IStorageService storageService = default!; + [AutoInject] private IJSRuntime jsRuntime = default!; + [AutoInject] private HttpClient httpClient = default; + [AutoInject] private IStringLocalizer localizer = default!; + + public async Task SignIn(SignInRequestDto signInModel, CancellationToken cancellationToken) + { + var result = await (await httpClient.PostAsJsonAsync("Identity/SignIn", signInModel, AppJsonContext.Default.SignInRequestDto, cancellationToken)) + .Content.ReadFromJsonAsync(AppJsonContext.Default.TokenResponseDto, cancellationToken); + + await StoreToken(result!, signInModel.RememberMe); + + NotifyAuthenticationStateChanged(Task.FromResult(await GetAuthenticationStateAsync())); + } + + public async Task SignOut() + { + await storageService.RemoveItem("access_token"); + await storageService.RemoveItem("refresh_token"); + if (AppRenderMode.PrerenderEnabled && AppRenderMode.IsHybrid() is false) + { + await jsRuntime.RemoveCookie("access_token"); + } + NotifyAuthenticationStateChanged(Task.FromResult(await GetAuthenticationStateAsync())); + } + + public async Task RefreshToken() + { + if (AppRenderMode.PrerenderEnabled && AppRenderMode.IsHybrid() is false) + { + await jsRuntime.RemoveCookie("access_token"); + } + await storageService.RemoveItem("access_token"); + NotifyAuthenticationStateChanged(Task.FromResult(await GetAuthenticationStateAsync())); + } + + public override async Task GetAuthenticationStateAsync() + { + var access_token = await tokenProvider.GetAccessTokenAsync(); + + if (string.IsNullOrEmpty(access_token) && tokenProvider.IsInitialized) + { + string? refresh_token = await storageService.GetItem("refresh_token"); + + if (string.IsNullOrEmpty(refresh_token) is false) + { + // We refresh the access_token to ensure a seamless user experience, preventing unnecessary 'NotAuthorized' page redirects and improving overall UX. + // This method is triggered after 401 and 403 server responses in AuthDelegationHandler, + // as well as when accessing pages without the required permissions in NotAuthorizedPage, ensuring that any recent claims granted to the user are promptly reflected. + + try + { + var refreshTokenResponse = await (await httpClient.PostAsJsonAsync("Identity/Refresh", new() { RefreshToken = refresh_token }, AppJsonContext.Default.RefreshRequestDto)) + .Content.ReadFromJsonAsync(AppJsonContext.Default.TokenResponseDto); + + await StoreToken(refreshTokenResponse!); + access_token = refreshTokenResponse!.AccessToken; + } + catch (ResourceValidationException exp) // refresh_token in invalid or expired + { + await storageService.RemoveItem("refresh_token"); + throw new UnauthorizedException(localizer[nameof(AppStrings.YouNeedToSignIn)], exp); + } + } + } + + if (string.IsNullOrEmpty(access_token)) + { + return NotSignedIn(); + } + + var identity = new ClaimsIdentity(claims: ParseTokenClaims(access_token), authenticationType: "Bearer", nameType: "name", roleType: "role"); + + return new AuthenticationState(new ClaimsPrincipal(identity)); + } + + private async Task StoreToken(TokenResponseDto tokenResponseDto, bool? rememberMe = null) + { + if (rememberMe is null) + { + rememberMe = await storageService.IsPersistent("refresh_token"); + } + await storageService.SetItem("access_token", tokenResponseDto!.AccessToken, rememberMe is true); + await storageService.SetItem("refresh_token", tokenResponseDto!.RefreshToken, rememberMe is true); + if (AppRenderMode.PrerenderEnabled && AppRenderMode.IsHybrid() is false) + { + await jsRuntime.SetCookie("access_token", tokenResponseDto.AccessToken!, tokenResponseDto.ExpiresIn, rememberMe is true); + } + } + + private static AuthenticationState NotSignedIn() + { + return new AuthenticationState(new ClaimsPrincipal(new ClaimsIdentity())); + } + + private static IEnumerable ParseTokenClaims(string access_token) + { + return ParseJwt(access_token) + .Select(keyValue => new Claim(keyValue.Key, keyValue.Value.ToString() ?? string.Empty)) + .ToArray(); + } + + private static Dictionary ParseJwt(string access_token) + { + // Split the token to get the payload + string base64UrlPayload = access_token.Split('.')[1]; + + // Convert the payload from Base64Url format to Base64 + string base64Payload = ConvertBase64UrlToBase64(base64UrlPayload); + + // Decode the Base64 string to get a JSON string + string jsonPayload = Encoding.UTF8.GetString(Convert.FromBase64String(base64Payload)); + + // Deserialize the JSON string to a dictionary + var claims = JsonSerializer.Deserialize(jsonPayload, AppJsonContext.Default.DictionaryStringObject)!; + + return claims; + } + + private static string ConvertBase64UrlToBase64(string base64Url) + { + base64Url = base64Url.Replace('-', '+').Replace('_', '/'); + + // Adjust base64Url string length for padding + switch (base64Url.Length % 4) + { + case 2: + base64Url += "=="; + break; + case 3: + base64Url += "="; + break; + } + + return base64Url; + } +} diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Services/BrowserStorageService.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/BrowserStorageService.cs new file mode 100644 index 0000000..2d003d5 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Services/BrowserStorageService.cs @@ -0,0 +1,28 @@ +namespace Bit.TemplatePlayground.Client.Core.Services; + +public partial class BrowserStorageService : IStorageService +{ + [AutoInject] private IJSRuntime jsRuntime; + + public async ValueTask GetItem(string key) + { + return await jsRuntime.InvokeAsync("window.localStorage.getItem", key) ?? + await jsRuntime.InvokeAsync("window.sessionStorage.getItem", key); + } + + public async ValueTask RemoveItem(string key) + { + await jsRuntime.InvokeAsync("window.localStorage.removeItem", key); + await jsRuntime.InvokeAsync("window.sessionStorage.removeItem", key); + } + + public async ValueTask SetItem(string key, string? value, bool persistent = true) + { + await jsRuntime.InvokeAsync($"window.{(persistent ? "localStorage" : "sessionStorage")}.setItem", key, value); + } + + public async ValueTask IsPersistent(string key) + { + return (await jsRuntime.InvokeAsync("window.localStorage.getItem", key)) is not null; + } +} diff --git a/src/Client/Core/Services/ClientSideAuthTokenProvider.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/ClientSideAuthTokenProvider.cs similarity index 64% rename from src/Client/Core/Services/ClientSideAuthTokenProvider.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Services/ClientSideAuthTokenProvider.cs index 0b4ed7d..eac4804 100644 --- a/src/Client/Core/Services/ClientSideAuthTokenProvider.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Services/ClientSideAuthTokenProvider.cs @@ -2,12 +2,12 @@ public partial class ClientSideAuthTokenProvider : IAuthTokenProvider { - [AutoInject] private IJSRuntime _jsRuntime = default!; + [AutoInject] private IStorageService storageService = default!; public bool IsInitialized => true; public async Task GetAccessTokenAsync() { - return await _jsRuntime.GetCookie("access_token"); + return await storageService.GetItem("access_token"); } } diff --git a/src/Client/Core/Services/Contracts/IBitDeviceCoordinator.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/Contracts/IBitDeviceCoordinator.cs similarity index 100% rename from src/Client/Core/Services/Contracts/IBitDeviceCoordinator.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Services/Contracts/IBitDeviceCoordinator.cs diff --git a/src/Client/Core/Services/Contracts/IExceptionHandler.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/Contracts/IExceptionHandler.cs similarity index 100% rename from src/Client/Core/Services/Contracts/IExceptionHandler.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Services/Contracts/IExceptionHandler.cs diff --git a/src/Client/Core/Services/Contracts/IPrerenderStateService.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/Contracts/IPrerenderStateService.cs similarity index 100% rename from src/Client/Core/Services/Contracts/IPrerenderStateService.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Services/Contracts/IPrerenderStateService.cs diff --git a/src/Client/Core/Services/Contracts/IPubSubService.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/Contracts/IPubSubService.cs similarity index 100% rename from src/Client/Core/Services/Contracts/IPubSubService.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Services/Contracts/IPubSubService.cs diff --git a/src/Client/Core/Services/ExceptionHandlerBase.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/ExceptionHandlerBase.cs similarity index 68% rename from src/Client/Core/Services/ExceptionHandlerBase.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Services/ExceptionHandlerBase.cs index b90b9fe..83afabd 100644 --- a/src/Client/Core/Services/ExceptionHandlerBase.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Services/ExceptionHandlerBase.cs @@ -9,18 +9,17 @@ public abstract partial class ExceptionHandlerBase : IExceptionHandler public virtual void Handle(Exception exception, IDictionary? parameters = null) { + var isDebug = BuildConfiguration.IsDebug(); + string exceptionMessage = (exception as KnownException)?.Message ?? -#if DEBUG - exception.ToString(); -#else - Localizer[nameof(AppStrings.UnknownException)]; -#endif + (isDebug ? exception.ToString() : Localizer[nameof(AppStrings.UnknownException)]); - _ = MessageBoxService.Show(exceptionMessage, Localizer[nameof(AppStrings.Error)]); + if (isDebug) + { + _ = Console.Out.WriteLineAsync(exceptionMessage); + Debugger.Break(); + } -#if DEBUG - _ = Console.Out.WriteLineAsync(exceptionMessage); - Debugger.Break(); -#endif + _ = MessageBoxService.Show(exceptionMessage, Localizer[nameof(AppStrings.Error)]); } } diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs new file mode 100644 index 0000000..732495a --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs @@ -0,0 +1,48 @@ +using System.Net.Http.Headers; + +namespace Bit.TemplatePlayground.Client.Core.Services.HttpMessageHandlers; + +public class AuthDelegatingHandler(IAuthTokenProvider tokenProvider, IServiceProvider serviceProvider, IStorageService storageService, RetryDelegatingHandler handler) + : DelegatingHandler(handler) +{ + protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) + { + if (request.Headers.Authorization is null) + { + var access_token = await tokenProvider.GetAccessTokenAsync(); + if (access_token is not null) + { + request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", access_token); + } + } + + try + { + return await base.SendAsync(request, cancellationToken); + } + catch (Exception _) when ((_ is ForbiddenException or UnauthorizedException) && tokenProvider.IsInitialized) + { + // Let's update the access token by refreshing it when a refresh token is available. + // Following this procedure, the newly acquired access token may now include the necessary roles or claims. + + var authManager = serviceProvider.GetRequiredService(); + var refresh_token = await storageService.GetItem("refresh_token"); + + if (refresh_token is not null) + { + // In the AuthenticationStateProvider, the access_token is refreshed using the refresh_token (if available). + await authManager.RefreshToken(); + + request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await tokenProvider.GetAccessTokenAsync()); + + return await base.SendAsync(request, cancellationToken); + } + else + { + await authManager.SignOut(); + } + + throw; + } + } +} diff --git a/src/Client/Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs similarity index 88% rename from src/Client/Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs index 51fb70b..78518a2 100644 --- a/src/Client/Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs @@ -2,7 +2,7 @@ namespace Bit.TemplatePlayground.Client.Core.Services.HttpMessageHandlers; -public class ExceptionDelegatingHandler(HttpClientHandler httpClientHandler) +public class ExceptionDelegatingHandler(IStringLocalizer localizer, HttpClientHandler httpClientHandler) : DelegatingHandler(httpClientHandler) { protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) @@ -38,11 +38,11 @@ protected override async Task SendAsync(HttpRequestMessage if (response.StatusCode is HttpStatusCode.Unauthorized) { - throw new UnauthorizedException(AppStrings.YouNeedToSignIn); + throw new UnauthorizedException(localizer[AppStrings.YouNeedToSignIn]); } if (response.StatusCode is HttpStatusCode.Forbidden) { - throw new ForbiddenException(AppStrings.ForbiddenException); + throw new ForbiddenException(localizer[AppStrings.ForbiddenException]); } response.EnsureSuccessStatusCode(); diff --git a/src/Client/Core/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs similarity index 89% rename from src/Client/Core/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs index 67f9297..6b46ed5 100644 --- a/src/Client/Core/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs @@ -1,7 +1,5 @@ using System.Net.Http.Headers; -#if BlazorWebAssembly using Microsoft.AspNetCore.Components.WebAssembly.Http; -#endif namespace Bit.TemplatePlayground.Client.Core.Services.HttpMessageHandlers; @@ -10,9 +8,8 @@ public class RequestHeadersDelegationHandler(AuthDelegatingHandler handler) { protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) { -#if BlazorWebAssembly + request.SetBrowserRequestCredentials(BrowserRequestCredentials.Omit); request.SetBrowserResponseStreamingEnabled(true); -#endif #if MultilingualEnabled request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(CultureInfo.CurrentCulture.Name)); diff --git a/src/Client/Core/Services/HttpMessageHandlers/RetryDelegatingHandler.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/HttpMessageHandlers/RetryDelegatingHandler.cs similarity index 100% rename from src/Client/Core/Services/HttpMessageHandlers/RetryDelegatingHandler.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Services/HttpMessageHandlers/RetryDelegatingHandler.cs diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Services/MessageBoxService.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/MessageBoxService.cs new file mode 100644 index 0000000..a093dc6 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Services/MessageBoxService.cs @@ -0,0 +1,12 @@ +namespace Bit.TemplatePlayground.Client.Core.Services; +public partial class MessageBoxService +{ + [AutoInject] private IPubSubService pubSubService = default!; + + public async Task Show(string message, string title = "") + { + TaskCompletionSource tcs = new(); + pubSubService.Publish(PubSubMessages.SHOW_MESSAGE, (message, title, tcs)); + await tcs.Task; + } +} diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Services/PrerenderStateService.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/PrerenderStateService.cs new file mode 100644 index 0000000..8152497 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Services/PrerenderStateService.cs @@ -0,0 +1,55 @@ + +namespace Bit.TemplatePlayground.Client.Core.Services; + +/// +/// For more information docs. +/// +public class PrerenderStateService : IPrerenderStateService, IAsyncDisposable +{ + private PersistingComponentStateSubscription? subscription; + private readonly PersistentComponentState? persistentComponentState; + private readonly ConcurrentDictionary values = new(); + + public PrerenderStateService(PersistentComponentState? persistentComponentState = null) + { + subscription = persistentComponentState?.RegisterOnPersisting(PersistAsJson, AppRenderMode.Current); + this.persistentComponentState = persistentComponentState; + } + + public async Task GetValue(string key, Func> factory) + { + if (AppRenderMode.PrerenderEnabled is false) + return await factory(); + + if (persistentComponentState!.TryTakeFromJson(key, out T? value)) return value; + + var result = await factory(); + Persist(key, result); + return result; + } + + void Persist(string key, T value) + { + if (AppRenderMode.PrerenderEnabled is false) + return; + + values.TryRemove(key, out object? _); + values.TryAdd(key, value); + } + + async Task PersistAsJson() + { + foreach (var item in values) + { + persistentComponentState!.PersistAsJson(item.Key, item.Value); + } + } + + public async ValueTask DisposeAsync() + { + if (AppRenderMode.PrerenderEnabled is false) + return; + + subscription?.Dispose(); + } +} diff --git a/src/Client/Core/Services/PubSubMessages.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/PubSubMessages.cs similarity index 100% rename from src/Client/Core/Services/PubSubMessages.cs rename to src/Client/Bit.TemplatePlayground.Client.Core/Services/PubSubMessages.cs diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Services/PubSubService.cs b/src/Client/Bit.TemplatePlayground.Client.Core/Services/PubSubService.cs new file mode 100644 index 0000000..04d4112 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Services/PubSubService.cs @@ -0,0 +1,34 @@ +namespace Bit.TemplatePlayground.Client.Core.Services; + +/// +/// For more information docs. +/// +public partial class PubSubService : IPubSubService +{ + [AutoInject] private IServiceProvider serviceProvider = default!; + + private readonly ConcurrentDictionary>> handlers = new(); + + public void Publish(string message, object? payload) + { + if (handlers.TryGetValue(message, out var messageHandlers)) + { + foreach (var handler in messageHandlers) + { + handler(payload) + .ContinueWith(t => serviceProvider.GetRequiredService().Handle(t.Exception!), TaskContinuationOptions.OnlyOnFaulted); + } + } + } + + public Action Subscribe(string message, Func handler) + { + var messageHandlers = handlers.ContainsKey(message) + ? handlers[message] + : handlers[message] = []; + + messageHandlers.Add(handler); + + return () => messageHandlers.Remove(handler); + } +} diff --git a/src/Client/Core/Styles/abstracts/_bit-css-variables.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Styles/abstracts/_bit-css-variables.scss similarity index 100% rename from src/Client/Core/Styles/abstracts/_bit-css-variables.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Styles/abstracts/_bit-css-variables.scss diff --git a/src/Client/Core/Styles/abstracts/_colors.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Styles/abstracts/_colors.scss similarity index 100% rename from src/Client/Core/Styles/abstracts/_colors.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Styles/abstracts/_colors.scss diff --git a/src/Client/Core/Styles/abstracts/_functions.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Styles/abstracts/_functions.scss similarity index 100% rename from src/Client/Core/Styles/abstracts/_functions.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Styles/abstracts/_functions.scss diff --git a/src/Client/Core/Styles/abstracts/_media-queries.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Styles/abstracts/_media-queries.scss similarity index 100% rename from src/Client/Core/Styles/abstracts/_media-queries.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Styles/abstracts/_media-queries.scss diff --git a/src/Client/Core/Styles/abstracts/_vars.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Styles/abstracts/_vars.scss similarity index 100% rename from src/Client/Core/Styles/abstracts/_vars.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Styles/abstracts/_vars.scss diff --git a/src/Client/Core/Styles/app.scss b/src/Client/Bit.TemplatePlayground.Client.Core/Styles/app.scss similarity index 94% rename from src/Client/Core/Styles/app.scss rename to src/Client/Bit.TemplatePlayground.Client.Core/Styles/app.scss index 54c6366..f45a2ac 100644 --- a/src/Client/Core/Styles/app.scss +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Styles/app.scss @@ -9,7 +9,7 @@ font-family: "Segoe UI", "Segoe UI Web (West European)", "Segoe UI", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif; } -.bit-blazor-hybrid, .bit-blazor-electron { +.bit-blazor-hybrid { *:not(input) { -webkit-user-select: none; user-select: none; diff --git a/src/Client/Core/_Imports.razor b/src/Client/Bit.TemplatePlayground.Client.Core/_Imports.razor similarity index 83% rename from src/Client/Core/_Imports.razor rename to src/Client/Bit.TemplatePlayground.Client.Core/_Imports.razor index 35dbcea..be7e16d 100644 --- a/src/Client/Core/_Imports.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Core/_Imports.razor @@ -1,4 +1,5 @@ @using System.Reflection +@using System.Runtime.Loader @using System.Globalization @using Microsoft.JSInterop @using Microsoft.Extensions.Logging @@ -14,7 +15,7 @@ @using Bit.TemplatePlayground @using Bit.TemplatePlayground.Shared.Enums @using Bit.TemplatePlayground.Client.Core -@using Bit.TemplatePlayground.Client.Core.Shared -@using Bit.TemplatePlayground.Client.Core.Pages +@using Bit.TemplatePlayground.Client.Core.Components.Layout +@using Bit.TemplatePlayground.Client.Core.Components.Pages @using Bit.TemplatePlayground.Client.Core.Services.Contracts @using Bit.TemplatePlayground.Client.Core.Services \ No newline at end of file diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/appsettings.json b/src/Client/Bit.TemplatePlayground.Client.Core/appsettings.json new file mode 100644 index 0000000..1205647 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/appsettings.json @@ -0,0 +1,3 @@ +{ + "ApiServerAddress": "http://localhost:5030/api/" // You can also use relative urls such as api/ for Blazor Server and WebAssembly +} diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/compilerconfig.json b/src/Client/Bit.TemplatePlayground.Client.Core/compilerconfig.json new file mode 100644 index 0000000..d127f6a --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Core/compilerconfig.json @@ -0,0 +1,176 @@ +[ + { + "outputFile": "wwwroot/styles/app.css", + "inputFile": "Styles/app.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Layout/AppErrorBoundary.razor.css", + "inputFile": "Components/Layout/AppErrorBoundary.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Layout/ConfirmMessageBox.razor.css", + "inputFile": "Components/Layout/ConfirmMessageBox.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Layout/Footer.razor.css", + "inputFile": "Components/Layout/Footer.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Layout/Header.razor.css", + "inputFile": "Components/Layout/Header.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Layout/MainLayout.razor.css", + "inputFile": "Components/Layout/MainLayout.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Layout/MessageBox.razor.css", + "inputFile": "Components/Layout/MessageBox.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Layout/NavMenu.razor.css", + "inputFile": "Components/Layout/NavMenu.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Layout/SignOutConfirmModal.razor.css", + "inputFile": "Components/Layout/SignOutConfirmModal.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/HomePage.razor.css", + "inputFile": "Components/Pages/HomePage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/NotAuthorizedPage.razor.css", + "inputFile": "Components/Pages/NotAuthorizedPage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/NotFoundPage.razor.css", + "inputFile": "Components/Pages/NotFoundPage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/TermsPage.razor.css", + "inputFile": "Components/Pages/TermsPage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Identity/DeleteAccountConfirmModal.razor.css", + "inputFile": "Components/Pages/Identity/DeleteAccountConfirmModal.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Identity/EditProfilePage.razor.css", + "inputFile": "Components/Pages/Identity/EditProfilePage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Identity/EmailConfirmationPage.razor.css", + "inputFile": "Components/Pages/Identity/EmailConfirmationPage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Identity/ForgotPasswordPage.razor.css", + "inputFile": "Components/Pages/Identity/ForgotPasswordPage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Identity/ResetPasswordPage.razor.css", + "inputFile": "Components/Pages/Identity/ResetPasswordPage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Identity/SignInPage.razor.css", + "inputFile": "Components/Pages/Identity/SignInPage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Identity/SignUpPage.razor.css", + "inputFile": "Components/Pages/Identity/SignUpPage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Categories/AddOrEditCategoryPage.razor.css", + "inputFile": "Components/Pages/Categories/AddOrEditCategoryPage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Categories/CategoriesPage.razor.css", + "inputFile": "Components/Pages/Categories/CategoriesPage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Dashboard/DashboardPage.razor.css", + "inputFile": "Components/Pages/Dashboard/DashboardPage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Dashboard/OverallStatsWidget.razor.css", + "inputFile": "Components/Pages/Dashboard/OverallStatsWidget.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.css", + "inputFile": "Components/Pages/Dashboard/ProductsCountPerCategotyWidget.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Dashboard/ProductsPercentageWidget.razor.css", + "inputFile": "Components/Pages/Dashboard/ProductsPercentageWidget.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Dashboard/ProductsSalesWidget.razor.css", + "inputFile": "Components/Pages/Dashboard/ProductsSalesWidget.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Products/AddOrEditProductModal.razor.css", + "inputFile": "Components/Pages/Products/AddOrEditProductModal.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + }, + { + "outputFile": "Components/Pages/Products/ProductsPage.razor.css", + "inputFile": "Components/Pages/Products/ProductsPage.razor.scss", + "minify": { "enabled": false }, + "options": { "sourceMap": false } + } +] \ No newline at end of file diff --git a/src/Client/Core/tsconfig.json b/src/Client/Bit.TemplatePlayground.Client.Core/tsconfig.json similarity index 100% rename from src/Client/Core/tsconfig.json rename to src/Client/Bit.TemplatePlayground.Client.Core/tsconfig.json diff --git a/src/Client/Core/wwwroot/images/backgrounds/empty-todo-list-bg.svg b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/backgrounds/empty-todo-list-bg.svg similarity index 100% rename from src/Client/Core/wwwroot/images/backgrounds/empty-todo-list-bg.svg rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/backgrounds/empty-todo-list-bg.svg diff --git a/src/Client/Core/wwwroot/images/bit-logo.svg b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/bit-logo.svg similarity index 100% rename from src/Client/Core/wwwroot/images/bit-logo.svg rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/bit-logo.svg diff --git a/src/Client/Core/wwwroot/images/bit-white-logo.svg b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/bit-white-logo.svg similarity index 100% rename from src/Client/Core/wwwroot/images/bit-white-logo.svg rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/bit-white-logo.svg diff --git a/src/Client/Core/wwwroot/images/icons/checkmark-icon.svg b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/checkmark-icon.svg similarity index 100% rename from src/Client/Core/wwwroot/images/icons/checkmark-icon.svg rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/checkmark-icon.svg diff --git a/src/Client/Core/wwwroot/images/icons/chevron-bottom-icon.svg b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/chevron-bottom-icon.svg similarity index 100% rename from src/Client/Core/wwwroot/images/icons/chevron-bottom-icon.svg rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/chevron-bottom-icon.svg diff --git a/src/Client/Core/wwwroot/images/icons/error-triangle.svg b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/error-triangle.svg similarity index 100% rename from src/Client/Core/wwwroot/images/icons/error-triangle.svg rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/error-triangle.svg diff --git a/src/Client/Core/wwwroot/images/icons/github-icon.svg b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/github-icon.svg similarity index 100% rename from src/Client/Core/wwwroot/images/icons/github-icon.svg rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/github-icon.svg diff --git a/src/Client/Core/wwwroot/images/icons/linkedin-icon.svg b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/linkedin-icon.svg similarity index 100% rename from src/Client/Core/wwwroot/images/icons/linkedin-icon.svg rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/linkedin-icon.svg diff --git a/src/Client/Core/wwwroot/images/icons/twitter-icon.svg b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/twitter-icon.svg similarity index 100% rename from src/Client/Core/wwwroot/images/icons/twitter-icon.svg rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/twitter-icon.svg diff --git a/src/Client/Core/wwwroot/images/icons/youtube-icon.svg b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/youtube-icon.svg similarity index 100% rename from src/Client/Core/wwwroot/images/icons/youtube-icon.svg rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/icons/youtube-icon.svg diff --git a/src/Client/Core/wwwroot/images/menu-banner.webp b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/menu-banner.webp similarity index 100% rename from src/Client/Core/wwwroot/images/menu-banner.webp rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/menu-banner.webp diff --git a/src/Client/Core/wwwroot/images/sign-in-up-bg.webp b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/sign-in-up-bg.webp similarity index 100% rename from src/Client/Core/wwwroot/images/sign-in-up-bg.webp rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/sign-in-up-bg.webp diff --git a/src/Client/Core/wwwroot/images/stat-card-bg-hover.svg b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/stat-card-bg-hover.svg similarity index 100% rename from src/Client/Core/wwwroot/images/stat-card-bg-hover.svg rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/stat-card-bg-hover.svg diff --git a/src/Client/Core/wwwroot/images/stat-card-bg.svg b/src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/stat-card-bg.svg similarity index 100% rename from src/Client/Core/wwwroot/images/stat-card-bg.svg rename to src/Client/Bit.TemplatePlayground.Client.Core/wwwroot/images/stat-card-bg.svg diff --git a/src/Client/App/App.xaml b/src/Client/Bit.TemplatePlayground.Client.Maui/App.xaml similarity index 87% rename from src/Client/App/App.xaml rename to src/Client/Bit.TemplatePlayground.Client.Maui/App.xaml index ff760f2..ee53cd3 100644 --- a/src/Client/App/App.xaml +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/App.xaml @@ -1,9 +1,9 @@  diff --git a/src/Client/App/App.xaml.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/App.xaml.cs similarity index 82% rename from src/Client/App/App.xaml.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/App.xaml.cs index f140d2c..35946f8 100644 --- a/src/Client/App/App.xaml.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/App.xaml.cs @@ -1,6 +1,6 @@ [assembly: XamlCompilation(XamlCompilationOptions.Compile)] -namespace Bit.TemplatePlayground.Client.App; +namespace Bit.TemplatePlayground.Client.Maui; public partial class App { diff --git a/src/Client/App/Bit.TemplatePlayground.Client.App.csproj b/src/Client/Bit.TemplatePlayground.Client.Maui/Bit.TemplatePlayground.Client.Maui.csproj similarity index 93% rename from src/Client/App/Bit.TemplatePlayground.Client.App.csproj rename to src/Client/Bit.TemplatePlayground.Client.Maui/Bit.TemplatePlayground.Client.Maui.csproj index 0f9e737..7f72d5f 100644 --- a/src/Client/App/Bit.TemplatePlayground.Client.App.csproj +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Bit.TemplatePlayground.Client.Maui.csproj @@ -16,7 +16,7 @@ com.bitplatform.BP.Template - 11F05C30-B7FE-415E-AABC-21FF361FB5FE + 1950F26F-830A-4E57-B91A-386E4BA38F43 1.0 @@ -45,7 +45,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -82,14 +82,14 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -97,7 +97,7 @@ - + diff --git a/src/Client/App/Extensions/IServiceCollectionExtensions.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Extensions/IServiceCollectionExtensions.cs similarity index 51% rename from src/Client/App/Extensions/IServiceCollectionExtensions.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Extensions/IServiceCollectionExtensions.cs index e1c8922..6d07f64 100644 --- a/src/Client/App/Extensions/IServiceCollectionExtensions.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Extensions/IServiceCollectionExtensions.cs @@ -1,14 +1,18 @@ -using Bit.TemplatePlayground.Client.App; -using Bit.TemplatePlayground.Client.App.Services; +using Bit.TemplatePlayground.Client.Maui; +using Bit.TemplatePlayground.Client.Maui.Services; namespace Microsoft.Extensions.DependencyInjection; public static class IServiceCollectionExtensions { - public static IServiceCollection AddClientAppServices(this IServiceCollection services) + public static IServiceCollection AddClientMauiServices(this IServiceCollection services) { // Services registered in this class can be injected in Android, iOS, Windows, and macOS. + services.TryAddTransient(); + services.TryAddSingleton(); + services.TryAddTransient(); + #if ANDROID services.AddClientAndroidServices(); #elif iOS @@ -19,9 +23,7 @@ public static IServiceCollection AddClientAppServices(this IServiceCollection se services.AddClientWindowsServices(); #endif - services.AddTransient(); - services.AddSingleton(); - services.AddTransient(); + services.AddClientSharedServices(); return services; } diff --git a/src/Client/App/MainPage.xaml b/src/Client/Bit.TemplatePlayground.Client.Maui/MainPage.xaml similarity index 88% rename from src/Client/App/MainPage.xaml rename to src/Client/Bit.TemplatePlayground.Client.Maui/MainPage.xaml index 7ff7776..3f3b7ba 100644 --- a/src/Client/App/MainPage.xaml +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/MainPage.xaml @@ -1,5 +1,5 @@ - + diff --git a/src/Client/App/MainPage.xaml.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/MainPage.xaml.cs similarity index 57% rename from src/Client/App/MainPage.xaml.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/MainPage.xaml.cs index 0c73107..8b44390 100644 --- a/src/Client/App/MainPage.xaml.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/MainPage.xaml.cs @@ -1,14 +1,14 @@ -namespace Bit.TemplatePlayground.Client.App; +namespace Bit.TemplatePlayground.Client.Maui; public partial class MainPage { - private readonly IExceptionHandler _exceptionHandler; - private readonly IBitDeviceCoordinator _deviceCoordinator; + private readonly IExceptionHandler exceptionHandler; + private readonly IBitDeviceCoordinator deviceCoordinator; public MainPage(IExceptionHandler exceptionHandler, IBitDeviceCoordinator deviceCoordinator) { - _exceptionHandler = exceptionHandler; - _deviceCoordinator = deviceCoordinator; + this.exceptionHandler = exceptionHandler; + this.deviceCoordinator = deviceCoordinator; InitializeComponent(); @@ -32,13 +32,14 @@ private void SetupBlazorWebView() handler.PlatformView.BackgroundColor = UIKit.UIColor.Clear; handler.PlatformView.Opaque = false; -#if DEBUG - if ((DeviceInfo.Current.Platform == DevicePlatform.MacCatalyst && DeviceInfo.Current.Version >= new Version(13, 3)) - || (DeviceInfo.Current.Platform == DevicePlatform.iOS && DeviceInfo.Current.Version >= new Version(16, 4))) + if (BuildConfiguration.IsDebug()) { - handler.PlatformView.SetValueForKey(Foundation.NSObject.FromObject(true), new Foundation.NSString("inspectable")); + if ((DeviceInfo.Current.Platform == DevicePlatform.MacCatalyst && DeviceInfo.Current.Version >= new Version(13, 3)) + || (DeviceInfo.Current.Platform == DevicePlatform.iOS && DeviceInfo.Current.Version >= new Version(16, 4))) + { + handler.PlatformView.SetValueForKey(Foundation.NSObject.FromObject(true), new Foundation.NSString("inspectable")); + } } -#endif #elif ANDROID handler.PlatformView.SetBackgroundColor(Android.Graphics.Color.Transparent); @@ -54,9 +55,10 @@ private void SetupBlazorWebView() settings.JavaScriptCanOpenWindowsAutomatically = settings.DomStorageEnabled = true; -#if DEBUG - settings.MixedContentMode = Android.Webkit.MixedContentHandling.AlwaysAllow; -#endif + if (BuildConfiguration.IsDebug()) + { + settings.MixedContentMode = Android.Webkit.MixedContentHandling.AlwaysAllow; + } settings.BlockNetworkLoads = settings.BlockNetworkImage = false; @@ -67,18 +69,20 @@ private void SetupBlazorWebView() { try { -#if WINDOWS && RELEASE - var webView2 = (Microsoft.UI.Xaml.Controls.WebView2)blazorWebView.Handler!.PlatformView!; - await webView2.EnsureCoreWebView2Async(); - - var settings = webView2.CoreWebView2.Settings; - settings.IsZoomControlEnabled = false; - settings.AreBrowserAcceleratorKeysEnabled = false; +#if WINDOWS + if (BuildConfiguration.IsRelease()) + { + var webView2 = (Microsoft.UI.Xaml.Controls.WebView2)blazorWebView.Handler!.PlatformView!; + await webView2.EnsureCoreWebView2Async(); + var settings = webView2.CoreWebView2.Settings; + settings.IsZoomControlEnabled = false; + settings.AreBrowserAcceleratorKeysEnabled = false; + } #endif } catch (Exception exp) { - _exceptionHandler.Handle(exp); + exceptionHandler.Handle(exp); } }; } @@ -89,11 +93,11 @@ private void SetupStatusBar() { try { - await _deviceCoordinator.ApplyTheme(AppInfo.Current.RequestedTheme is AppTheme.Dark); + await deviceCoordinator.ApplyTheme(AppInfo.Current.RequestedTheme is AppTheme.Dark); } catch (Exception exp) { - _exceptionHandler.Handle(exp); + exceptionHandler.Handle(exp); } }); } diff --git a/src/Client/App/MauiProgram.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/MauiProgram.cs similarity index 64% rename from src/Client/App/MauiProgram.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/MauiProgram.cs index 0c1f715..1a718b1 100644 --- a/src/Client/App/MauiProgram.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/MauiProgram.cs @@ -1,18 +1,14 @@  using System.Reflection; using Bit.TemplatePlayground.Client.Core.Services.HttpMessageHandlers; -using Microsoft.Extensions.FileProviders; +using Bit.TemplatePlayground.Client.Maui.Services; -namespace Bit.TemplatePlayground.Client.App; +namespace Bit.TemplatePlayground.Client.Maui; public static class MauiProgram { public static MauiApp CreateMauiApp() { -#if !BlazorHybrid - throw new InvalidOperationException("Please switch to blazor hybrid as described in https://bitplatform.dev/templates/hosting-models"); -#endif - var builder = MauiApp.CreateBuilder(); var assembly = typeof(MainLayout).GetTypeInfo().Assembly; @@ -23,9 +19,11 @@ public static MauiApp CreateMauiApp() var services = builder.Services; services.AddMauiBlazorWebView(); -#if DEBUG - services.AddBlazorWebViewDeveloperTools(); -#endif + + if (BuildConfiguration.IsDebug()) + { + services.AddBlazorWebViewDeveloperTools(); + } Uri.TryCreate(builder.Configuration.GetApiServerAddress(), UriKind.Absolute, out var apiServerAddress); @@ -39,11 +37,9 @@ public static MauiApp CreateMauiApp() return httpClient; }); + services.AddTransient(); - services.AddTransient(); - services.AddSharedServices(); - services.AddClientSharedServices(); - services.AddClientAppServices(); + services.AddClientMauiServices(); var mauiApp = builder.Build(); diff --git a/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/AndroidManifest.xml b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/AndroidManifest.xml new file mode 100644 index 0000000..458e80e --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Client/App/Platforms/Android/Extensions/IServiceCollectionExtensions.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from src/Client/App/Platforms/Android/Extensions/IServiceCollectionExtensions.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/Extensions/IServiceCollectionExtensions.cs diff --git a/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/MainActivity.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/MainActivity.cs new file mode 100644 index 0000000..68f7b96 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/MainActivity.cs @@ -0,0 +1,10 @@ +using Android.App; +using Android.Content.PM; + +namespace Bit.TemplatePlayground.Client.Maui.Platforms.Android; + +[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, + ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] +public class MainActivity : MauiAppCompatActivity +{ +} diff --git a/src/Client/App/Platforms/Android/MainApplication.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/MainApplication.cs similarity index 76% rename from src/Client/App/Platforms/Android/MainApplication.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/MainApplication.cs index 7170478..32f29e8 100644 --- a/src/Client/App/Platforms/Android/MainApplication.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/MainApplication.cs @@ -4,12 +4,14 @@ [assembly: UsesPermission(Android.Manifest.Permission.Internet)] [assembly: UsesPermission(Android.Manifest.Permission.AccessNetworkState)] -namespace Bit.TemplatePlayground.Client.App.Platforms.Android; +namespace Bit.TemplatePlayground.Client.Maui.Platforms.Android; [Application( #if DEBUG - UsesCleartextTraffic = true + UsesCleartextTraffic = true, #endif + AllowBackup = true, + SupportsRtl = true )] public class MainApplication : MauiApplication { diff --git a/src/Client/App/Platforms/Android/Resources/values/colors.xml b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/Resources/values/colors.xml similarity index 100% rename from src/Client/App/Platforms/Android/Resources/values/colors.xml rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Android/Resources/values/colors.xml diff --git a/src/Client/App/Platforms/MacCatalyst/AppDelegate.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/AppDelegate.cs similarity index 73% rename from src/Client/App/Platforms/MacCatalyst/AppDelegate.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/AppDelegate.cs index ee52a05..98f85e5 100644 --- a/src/Client/App/Platforms/MacCatalyst/AppDelegate.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/AppDelegate.cs @@ -1,6 +1,6 @@ using Foundation; -namespace Bit.TemplatePlayground.Client.App.Platforms.MacCatalyst; +namespace Bit.TemplatePlayground.Client.Maui.Platforms.MacCatalyst; [Register(nameof(AppDelegate))] public class AppDelegate : MauiUIApplicationDelegate diff --git a/src/Client/App/Platforms/MacCatalyst/Entitlements.Debug.plist b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/Entitlements.Debug.plist similarity index 100% rename from src/Client/App/Platforms/MacCatalyst/Entitlements.Debug.plist rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/Entitlements.Debug.plist diff --git a/src/Client/App/Platforms/MacCatalyst/Entitlements.Release.plist b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/Entitlements.Release.plist similarity index 100% rename from src/Client/App/Platforms/MacCatalyst/Entitlements.Release.plist rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/Entitlements.Release.plist diff --git a/src/Client/App/Platforms/MacCatalyst/Extensions/IServiceCollectionExtensions.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from src/Client/App/Platforms/MacCatalyst/Extensions/IServiceCollectionExtensions.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/Extensions/IServiceCollectionExtensions.cs diff --git a/src/Client/App/Platforms/MacCatalyst/Info.plist b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/Info.plist similarity index 100% rename from src/Client/App/Platforms/MacCatalyst/Info.plist rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/Info.plist diff --git a/src/Client/App/Platforms/MacCatalyst/Program.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/Program.cs similarity index 69% rename from src/Client/App/Platforms/MacCatalyst/Program.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/Program.cs index f3deff4..42acd0c 100644 --- a/src/Client/App/Platforms/MacCatalyst/Program.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/MacCatalyst/Program.cs @@ -1,6 +1,6 @@ using UIKit; -namespace Bit.TemplatePlayground.Client.App.Platforms.MacCatalyst; +namespace Bit.TemplatePlayground.Client.Maui.Platforms.MacCatalyst; public class Program { diff --git a/src/Client/App/Platforms/Tizen/Main.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Tizen/Main.cs similarity index 80% rename from src/Client/App/Platforms/Tizen/Main.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Tizen/Main.cs index 25b4d5d..b2a0b7e 100644 --- a/src/Client/App/Platforms/Tizen/Main.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Tizen/Main.cs @@ -1,4 +1,4 @@ -namespace Bit.TemplatePlayground.Client.App; +namespace Bit.TemplatePlayground.Client.Maui; class Program : MauiApplication { diff --git a/src/Client/App/Platforms/Tizen/tizen-manifest.xml b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Tizen/tizen-manifest.xml similarity index 76% rename from src/Client/App/Platforms/Tizen/tizen-manifest.xml rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Tizen/tizen-manifest.xml index 33205ee..e6f8861 100644 --- a/src/Client/App/Platforms/Tizen/tizen-manifest.xml +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Tizen/tizen-manifest.xml @@ -1,8 +1,8 @@  - - + + appicon.xhigh.png diff --git a/src/Client/App/Platforms/Windows/App.xaml b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Windows/App.xaml similarity index 73% rename from src/Client/App/Platforms/Windows/App.xaml rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Windows/App.xaml index 87ce9da..4f816c9 100644 --- a/src/Client/App/Platforms/Windows/App.xaml +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Windows/App.xaml @@ -1,5 +1,5 @@  diff --git a/src/Client/App/Platforms/Windows/App.xaml.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Windows/App.xaml.cs similarity index 71% rename from src/Client/App/Platforms/Windows/App.xaml.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Windows/App.xaml.cs index d15fec3..46c96f2 100644 --- a/src/Client/App/Platforms/Windows/App.xaml.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Windows/App.xaml.cs @@ -1,4 +1,4 @@ -namespace Bit.TemplatePlayground.Client.App.Platforms.Windows; +namespace Bit.TemplatePlayground.Client.Maui.Platforms.Windows; public partial class App { diff --git a/src/Client/App/Platforms/Windows/Extensions/IServiceCollectionExtensions.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Windows/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from src/Client/App/Platforms/Windows/Extensions/IServiceCollectionExtensions.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Windows/Extensions/IServiceCollectionExtensions.cs diff --git a/src/Client/App/Platforms/Windows/Package.appxmanifest b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Windows/Package.appxmanifest similarity index 100% rename from src/Client/App/Platforms/Windows/Package.appxmanifest rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Windows/Package.appxmanifest diff --git a/src/Client/App/Platforms/Windows/app.manifest b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Windows/app.manifest similarity index 100% rename from src/Client/App/Platforms/Windows/app.manifest rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/Windows/app.manifest diff --git a/src/Client/App/Platforms/iOS/AppDelegate.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/iOS/AppDelegate.cs similarity index 76% rename from src/Client/App/Platforms/iOS/AppDelegate.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/iOS/AppDelegate.cs index 7829a0d..16f2898 100644 --- a/src/Client/App/Platforms/iOS/AppDelegate.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/iOS/AppDelegate.cs @@ -1,6 +1,6 @@ using Foundation; -namespace Bit.TemplatePlayground.Client.App.Platforms.iOS; +namespace Bit.TemplatePlayground.Client.Maui.Platforms.iOS; [Register(nameof(AppDelegate))] public class AppDelegate : MauiUIApplicationDelegate diff --git a/src/Client/App/Platforms/iOS/Extensions/IServiceCollectionExtensions.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/iOS/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from src/Client/App/Platforms/iOS/Extensions/IServiceCollectionExtensions.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/iOS/Extensions/IServiceCollectionExtensions.cs diff --git a/src/Client/App/Platforms/iOS/Info.plist b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/iOS/Info.plist similarity index 100% rename from src/Client/App/Platforms/iOS/Info.plist rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/iOS/Info.plist diff --git a/src/Client/App/Platforms/iOS/Program.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/iOS/Program.cs similarity index 71% rename from src/Client/App/Platforms/iOS/Program.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/iOS/Program.cs index e325020..0719741 100644 --- a/src/Client/App/Platforms/iOS/Program.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Platforms/iOS/Program.cs @@ -1,6 +1,6 @@ using UIKit; -namespace Bit.TemplatePlayground.Client.App.Platforms.iOS; +namespace Bit.TemplatePlayground.Client.Maui.Platforms.iOS; public class Program { diff --git a/src/Client/App/Properties/launchSettings.json b/src/Client/Bit.TemplatePlayground.Client.Maui/Properties/launchSettings.json similarity index 100% rename from src/Client/App/Properties/launchSettings.json rename to src/Client/Bit.TemplatePlayground.Client.Maui/Properties/launchSettings.json diff --git a/src/Client/App/Resources/AppIcon/appicon.svg b/src/Client/Bit.TemplatePlayground.Client.Maui/Resources/AppIcon/appicon.svg similarity index 100% rename from src/Client/App/Resources/AppIcon/appicon.svg rename to src/Client/Bit.TemplatePlayground.Client.Maui/Resources/AppIcon/appicon.svg diff --git a/src/Client/App/Resources/Raw/AboutAssets.txt b/src/Client/Bit.TemplatePlayground.Client.Maui/Resources/Raw/AboutAssets.txt similarity index 100% rename from src/Client/App/Resources/Raw/AboutAssets.txt rename to src/Client/Bit.TemplatePlayground.Client.Maui/Resources/Raw/AboutAssets.txt diff --git a/src/Client/App/Resources/Splash/splash.svg b/src/Client/Bit.TemplatePlayground.Client.Maui/Resources/Splash/splash.svg similarity index 100% rename from src/Client/App/Resources/Splash/splash.svg rename to src/Client/Bit.TemplatePlayground.Client.Maui/Resources/Splash/splash.svg diff --git a/src/Client/App/Services/AppDeviceCoordinator.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Services/MauiDeviceCoordinator.cs similarity index 94% rename from src/Client/App/Services/AppDeviceCoordinator.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Services/MauiDeviceCoordinator.cs index 1a41bdd..99d45ca 100644 --- a/src/Client/App/Services/AppDeviceCoordinator.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Services/MauiDeviceCoordinator.cs @@ -1,9 +1,9 @@ -namespace Bit.TemplatePlayground.Client.App.Services; +namespace Bit.TemplatePlayground.Client.Maui.Services; /// /// More info at /// -public class AppDeviceCoordinator : IBitDeviceCoordinator +public class MauiDeviceCoordinator : IBitDeviceCoordinator { public double GetStatusBarHeight() { diff --git a/src/Client/App/Services/AppExceptionHandler.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Services/MauiExceptionHandler.cs similarity index 56% rename from src/Client/App/Services/AppExceptionHandler.cs rename to src/Client/Bit.TemplatePlayground.Client.Maui/Services/MauiExceptionHandler.cs index 771a7a6..0f41c4a 100644 --- a/src/Client/App/Services/AppExceptionHandler.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Services/MauiExceptionHandler.cs @@ -1,13 +1,18 @@ -namespace Bit.TemplatePlayground.Client.App.Services; +namespace Bit.TemplatePlayground.Client.Maui.Services; /// -/// You can easily install AppCenter, Firebase Crashlytics, and other exception tracking libraries in your Client.App project. +/// You can easily install AppCenter, Firebase Crashlytics, and other exception tracking libraries in your Client.Maui project. /// Then, you can use their APIs to monitor all exceptions across Android, iOS, Windows, and macOS. /// -public partial class AppExceptionHandler : ExceptionHandlerBase +public partial class MauiExceptionHandler : ExceptionHandlerBase { public override void Handle(Exception exception, IDictionary? parameters = null) { + if (exception is TaskCanceledException) + { + return; + } + base.Handle(exception, parameters); } } diff --git a/src/Client/Bit.TemplatePlayground.Client.Maui/Services/MauiStorageService.cs b/src/Client/Bit.TemplatePlayground.Client.Maui/Services/MauiStorageService.cs new file mode 100644 index 0000000..e010e13 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Services/MauiStorageService.cs @@ -0,0 +1,38 @@ +namespace Bit.TemplatePlayground.Client.Maui.Services; + +public class MauiStorageService : IStorageService +{ + private readonly Dictionary tempStorage = []; + + public async ValueTask GetItem(string key) + { + tempStorage.TryGetValue(key, out string? value); + return Preferences.Get(key, value); + } + + public async ValueTask IsPersistent(string key) + { + return Preferences.ContainsKey(key); + } + + public async ValueTask RemoveItem(string key) + { + Preferences.Remove(key); + tempStorage.Remove(key); + } + + public async ValueTask SetItem(string key, string? value, bool persistent = true) + { + if (persistent) + { + Preferences.Set(key, value); + } + else + { + if (tempStorage.TryAdd(key, value) is false) + { + tempStorage[key] = value; + } + } + } +} diff --git a/src/Client/App/wwwroot/index.html b/src/Client/Bit.TemplatePlayground.Client.Maui/wwwroot/index.html similarity index 100% rename from src/Client/App/wwwroot/index.html rename to src/Client/Bit.TemplatePlayground.Client.Maui/wwwroot/index.html diff --git a/src/Client/Bit.TemplatePlayground.Client.Web/Bit.TemplatePlayground.Client.Web.csproj b/src/Client/Bit.TemplatePlayground.Client.Web/Bit.TemplatePlayground.Client.Web.csproj new file mode 100644 index 0000000..965fb61 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Web/Bit.TemplatePlayground.Client.Web.csproj @@ -0,0 +1,56 @@ + + + + net8.0 + + true + false + + true + true + true + + false + service-worker-assets.js + false + true + Default + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + diff --git a/src/Client/Web/Pages/AppBswupProgressBar.razor b/src/Client/Bit.TemplatePlayground.Client.Web/Components/AppBswupProgressBar.razor similarity index 95% rename from src/Client/Web/Pages/AppBswupProgressBar.razor rename to src/Client/Bit.TemplatePlayground.Client.Web/Components/AppBswupProgressBar.razor index c07bf70..5e1ec3f 100644 --- a/src/Client/Web/Pages/AppBswupProgressBar.razor +++ b/src/Client/Bit.TemplatePlayground.Client.Web/Components/AppBswupProgressBar.razor @@ -1,5 +1,6 @@ @using Bit.Bswup @using Bit.BlazorUI +@using Bit.TemplatePlayground.Client.Core.Components @inherits AppComponentBase @@ -14,14 +15,12 @@ transform: translateX(-50%); font-family: "Segoe UI", "Segoe UI Web (West European)", "Segoe UI", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif; } - #bit-bswup .bswup-container { width: 3rem; height: 3rem; display: block; position: relative; } - #bit-bswup .bswup-container circle { fill: none; stroke: #e0e0e0; @@ -29,13 +28,11 @@ transform-origin: 50% 50%; transform: rotate(-90deg); } - #bit-bswup .bswup-container circle:last-child { stroke: #1b6ec2; transition: stroke-dasharray 0.05s ease-in-out; stroke-dasharray: calc(3.141 * var(--bit-bswup-percent, 0%) * 0.8), 500%; } - #bit-bswup .bswup-progress-text { top: 50%; left: 50%; @@ -45,15 +42,13 @@ font-weight: normal; transform: translate(-50%, -50%); } - #bit-bswup .bswup-progress-text::after { content: var(--bit-bswup-percent-text, ""); } - /* If you want the update to be applied after the user approves the new Pwa version and not automatically, set AutoReload parameter of BswupProgress to true and uncomment the commented codes in this file: */ - - /* #bit-bswup-reload { + /* + #bit-bswup-reload { top: 38px; left: 50%; display: none; @@ -63,7 +58,8 @@ z-index: 999999999; border-radius: 2px; transform: translateX(-50%); - } */ + } + */
diff --git a/src/Client/Web/Extensions/IServiceCollectionExtensions.cs b/src/Client/Bit.TemplatePlayground.Client.Web/Extensions/IServiceCollectionExtensions.cs similarity index 92% rename from src/Client/Web/Extensions/IServiceCollectionExtensions.cs rename to src/Client/Bit.TemplatePlayground.Client.Web/Extensions/IServiceCollectionExtensions.cs index 32fa422..e4d970a 100644 --- a/src/Client/Web/Extensions/IServiceCollectionExtensions.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Web/Extensions/IServiceCollectionExtensions.cs @@ -7,9 +7,12 @@ public static class IServiceCollectionExtensions public static IServiceCollection AddClientWebServices(this IServiceCollection services) { // Services being registered here can get injected in web (blazor web assembly & blazor server) + services.AddTransient(); services.AddTransient(); + services.AddClientSharedServices(); + return services; } } diff --git a/src/Client/Bit.TemplatePlayground.Client.Web/Program.cs b/src/Client/Bit.TemplatePlayground.Client.Web/Program.cs new file mode 100644 index 0000000..d1fb620 --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Web/Program.cs @@ -0,0 +1,26 @@ +using Bit.TemplatePlayground.Client.Core.Services.HttpMessageHandlers; +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; + +var builder = WebAssemblyHostBuilder.CreateDefault(args); + +builder.Configuration.AddClientConfigurations(); + +Uri.TryCreate(builder.Configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress); + +if (apiServerAddress!.IsAbsoluteUri is false) +{ + apiServerAddress = new Uri($"{builder.HostEnvironment.BaseAddress}{apiServerAddress}"); +} + +builder.Services.AddTransient(sp => new HttpClient(sp.GetRequiredService()) { BaseAddress = apiServerAddress }); + +builder.Services.AddClientWebServices(); + +var host = builder.Build(); + +#if MultilingualEnabled +var culture = await host.Services.GetRequiredService().GetItem("Culture"); +CultureInfoManager.SetCurrentCulture(culture); +#endif + +await host.RunAsync(); diff --git a/src/Client/Web/Services/WebDeviceCoordinator.cs b/src/Client/Bit.TemplatePlayground.Client.Web/Services/WebDeviceCoordinator.cs similarity index 100% rename from src/Client/Web/Services/WebDeviceCoordinator.cs rename to src/Client/Bit.TemplatePlayground.Client.Web/Services/WebDeviceCoordinator.cs diff --git a/src/Client/Web/Services/WebExceptionHandler.cs b/src/Client/Bit.TemplatePlayground.Client.Web/Services/WebExceptionHandler.cs similarity index 76% rename from src/Client/Web/Services/WebExceptionHandler.cs rename to src/Client/Bit.TemplatePlayground.Client.Web/Services/WebExceptionHandler.cs index 03d3ceb..6ce4677 100644 --- a/src/Client/Web/Services/WebExceptionHandler.cs +++ b/src/Client/Bit.TemplatePlayground.Client.Web/Services/WebExceptionHandler.cs @@ -4,6 +4,11 @@ public partial class WebExceptionHandler : ExceptionHandlerBase { public override void Handle(Exception exception, IDictionary? parameters = null) { + if (exception is TaskCanceledException) + { + return; + } + base.Handle(exception, parameters); } } diff --git a/src/Client/Web/wwwroot/favicon.ico b/src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/favicon.ico similarity index 100% rename from src/Client/Web/wwwroot/favicon.ico rename to src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/favicon.ico diff --git a/src/Client/Web/wwwroot/images/icons/bit-icon-512.png b/src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/images/icons/bit-icon-512.png similarity index 100% rename from src/Client/Web/wwwroot/images/icons/bit-icon-512.png rename to src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/images/icons/bit-icon-512.png diff --git a/src/Client/Web/wwwroot/manifest.json b/src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/manifest.json similarity index 86% rename from src/Client/Web/wwwroot/manifest.json rename to src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/manifest.json index 626f656..2be2142 100644 --- a/src/Client/Web/wwwroot/manifest.json +++ b/src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/manifest.json @@ -34,17 +34,9 @@ "name": "Terms", "url": "/terms" }, - { - "name": "Categories", - "url": "/categories" - }, - { - "name": "Products", - "url": "/products" - }, { "name": "EditProfile", "url": "/edit-profile" } ] -} +} \ No newline at end of file diff --git a/src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/service-worker.js b/src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/service-worker.js new file mode 100644 index 0000000..0c4fa6b --- /dev/null +++ b/src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/service-worker.js @@ -0,0 +1,4 @@ +// In development, always fetch from the network and do not enable offline support. +// This is because caching would make development more difficult (changes would not +// be reflected on the first load after each change). +self.addEventListener('fetch', () => { }); \ No newline at end of file diff --git a/src/Client/Web/wwwroot/service-worker.published.js b/src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/service-worker.published.js similarity index 72% rename from src/Client/Web/wwwroot/service-worker.published.js rename to src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/service-worker.published.js index 61e8568..379d333 100644 --- a/src/Client/Web/wwwroot/service-worker.published.js +++ b/src/Client/Bit.TemplatePlayground.Client.Web/wwwroot/service-worker.published.js @@ -1,4 +1,4 @@ -// bit version: 8.1.0 +// bit version: 8.2.0 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup self.assetsInclude = []; @@ -6,11 +6,15 @@ self.assetsExclude = [ /bit\.blazorui\.fluent\.css$/, /bit\.blazorui\.fluent-dark\.css$/, /bit\.blazorui\.fluent-light\.css$/, + /Bit.TemplatePlayground\.Client\.Web\.styles\.css$/ ]; self.externalAssets = [ { "url": "/" }, + { + "url": "_framework\/blazor.web.js" + } ]; self.serverHandledUrls = [ @@ -28,5 +32,6 @@ self.isPassive = true; self.defaultUrl = "/"; self.caseInsensitiveUrl = true; self.noPrerenderQuery = 'no-prerender=true'; +self.disablePassiveFirstBoot = true; -self.importScripts('_content/Bit.Bswup/bit-bswup.sw.js'); +self.importScripts('_content/Bit.Bswup/bit-bswup.sw.js'); \ No newline at end of file diff --git a/src/Client/Core/App.razor.cs b/src/Client/Core/App.razor.cs deleted file mode 100644 index 6e11e77..0000000 --- a/src/Client/Core/App.razor.cs +++ /dev/null @@ -1,121 +0,0 @@ -using Microsoft.AspNetCore.Components.Routing; - -namespace Bit.TemplatePlayground.Client.Core; - -public partial class App -{ -#if BlazorWebAssembly && !BlazorHybrid - private List _lazyLoadedAssemblies = new(); - [AutoInject] private Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader _assemblyLoader = default!; - [AutoInject] private AuthenticationStateProvider _authenticationStateProvider = default!; -#endif - - [AutoInject] private IJSRuntime _jsRuntime = default!; - [AutoInject] private IBitDeviceCoordinator _bitDeviceCoordinator = default!; - -#if BlazorHybrid && MultilingualEnabled - private bool _cultureHasNotBeenSet = true; -#endif - -#if BlazorHybrid - protected override async Task OnInitializedAsync() - { - await SetupBodyClasses(); - await base.OnInitializedAsync(); - } -#else - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) - { - await SetupBodyClasses(); - } - - await base.OnAfterRenderAsync(firstRender); - } -#endif - - private async Task SetupBodyClasses() - { - var cssClasses = new List(); - - if (BlazorModeDetector.Current.IsBlazorWebAssembly()) - { - cssClasses.Add("bit-blazor-wasm"); - } - else if (BlazorModeDetector.Current.IsBlazorServer()) - { - cssClasses.Add("bit-blazor-server"); - } - else if (BlazorModeDetector.Current.IsBlazorHybrid()) - { - cssClasses.Add("bit-blazor-hybrid"); - - if (OperatingSystem.IsWindows()) - { - cssClasses.Add("bit-windows"); - } - else if (OperatingSystem.IsLinux()) - { - cssClasses.Add("bit-linux"); - } - else if (OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst()) - { - cssClasses.Add("bit-macos"); - } - else if (OperatingSystem.IsIOS() && OperatingSystem.IsMacCatalyst() is false) - { - cssClasses.Add("bit-ios"); - } - else if (OperatingSystem.IsAndroid()) - { - cssClasses.Add("bit-android"); - } - } - else if (BlazorModeDetector.Current.IsBlazorElectron()) - { - cssClasses.Add("bit-blazor-electron"); - } - - var cssVariables = new Dictionary(); - var statusBarHeight = _bitDeviceCoordinator.GetStatusBarHeight(); - - if (OperatingSystem.IsMacCatalyst() is false) - { - //For iOS this is handled in css using safe-area env() variables - //For Android there's an issue with keyboard in fullscreen mode. more info: https://github.com/bitfoundation/bitplatform/issues/5626 - //For Windows there's an issue with TitleBar. more info: https://github.com/bitfoundation/bitplatform/issues/5695 - statusBarHeight = 0; - } - - cssVariables.Add("--bit-status-bar-height", $"{statusBarHeight.ToString("F3", CultureInfo.InvariantCulture)}px"); - await _jsRuntime.ApplyBodyElementClasses(cssClasses, cssVariables); - } - - private async Task OnNavigateAsync(NavigationContext args) - { - // Blazor Server & Pre Rendering use created cultures in UseRequestLocalization middleware - // Android, windows and iOS have to set culture programmatically. - // Browser's culture is handled in the Web project's Program.BlazorWebAssembly.cs -#if BlazorHybrid && MultilingualEnabled - if (_cultureHasNotBeenSet) - { - _cultureHasNotBeenSet = false; - var preferredCultureCookie = Preferences.Get(".AspNetCore.Culture", null); - CultureInfoManager.SetCurrentCulture(preferredCultureCookie); - } -#endif - -#if BlazorWebAssembly && !BlazorHybrid - if ((args.Path is "dashboard") && _lazyLoadedAssemblies.Any(asm => asm.GetName().Name == "Newtonsoft.Json") is false) - { - var isAuthenticated = (await _authenticationStateProvider.GetAuthenticationStateAsync()).User?.Identity?.IsAuthenticated is true; - if (isAuthenticated) - { - var assemblies = await _assemblyLoader.LoadAssembliesAsync(["Newtonsoft.Json.wasm", "System.Private.Xml.wasm", "System.Data.Common.wasm"]); - _lazyLoadedAssemblies.AddRange(assemblies); - } - } -#endif - } -} diff --git a/src/Client/Core/Extensions/IJSRuntimeExtensions.Hybrid.cs b/src/Client/Core/Extensions/IJSRuntimeExtensions.Hybrid.cs deleted file mode 100644 index 43ad32f..0000000 --- a/src/Client/Core/Extensions/IJSRuntimeExtensions.Hybrid.cs +++ /dev/null @@ -1,60 +0,0 @@ -using Bit.TemplatePlayground.Shared.Dtos.Identity; - -namespace Microsoft.JSInterop; - -// In Blazor Hybrid, we employ Preferences along with an in-memory dictionary to emulate the functionality of cookies, localStorage, and sessionStorage. -public static class IJSRuntimeHybridExtensions -{ -#if BlazorHybrid - private static readonly Dictionary _sessionStorage = []; - - public static async Task SetCookie(this IJSRuntime jsRuntime, string key, string value, long expiresIn, bool rememberMe) - { - if (rememberMe) - { - Preferences.Set(key, value); - } - else - { - _sessionStorage[key] = value; - } - } - - public static async Task RemoveCookie(this IJSRuntime jsRuntime, string key) - { - _sessionStorage.Remove(key); - Preferences.Remove(key); - } - - public static async Task GetCookie(this IJSRuntime jsRuntime, string key) - { - return _sessionStorage.TryGetValue(key, out string? value) ? value : Preferences.Get(key, null); - } - - public static async Task SetLocalStorage(this IJSRuntime jsRuntime, string key, string value, bool rememberMe) - { - await jsRuntime.SetCookie(key, value, default, rememberMe); - } - - public static async Task RemoveLocalStorage(this IJSRuntime jsRuntime, string key) - { - await jsRuntime.RemoveCookie(key); - } - - public static async Task GetLocalStorage(this IJSRuntime jsRuntime, string key) - { - return await jsRuntime.GetCookie(key); - } - - public static async Task StoreAuthToken(this IJSRuntime jsRuntime, TokenResponseDto tokenResponse, bool? rememberMe = null) - { - if (rememberMe is null) - { - rememberMe = Preferences.Get("refresh_token", null) is null; - } - - await jsRuntime.SetCookie("access_token", tokenResponse.AccessToken!, tokenResponse.ExpiresIn, rememberMe is true); - await jsRuntime.SetLocalStorage("refresh_token", tokenResponse.RefreshToken!, rememberMe is true); - } -#endif -} diff --git a/src/Client/Core/Extensions/IJSRuntimeExtensions.cs b/src/Client/Core/Extensions/IJSRuntimeExtensions.cs deleted file mode 100644 index 2f34542..0000000 --- a/src/Client/Core/Extensions/IJSRuntimeExtensions.cs +++ /dev/null @@ -1,76 +0,0 @@ -using Bit.TemplatePlayground.Shared.Dtos.Identity; - -namespace Microsoft.JSInterop; - -public static class IJSRuntimeExtensions -{ - /// - /// To disable the scrollbar of the body when showing the modal, so the modal can be always shown in the viewport without being scrolled out. - /// - public static async Task SetBodyOverflow(this IJSRuntime jsRuntime, bool hidden) - { - await jsRuntime.InvokeVoidAsync("App.setBodyOverflow", hidden); - } - - public static async Task GoBack(this IJSRuntime jsRuntime) - { - await jsRuntime.InvokeVoidAsync("App.goBack"); - } - - public static async Task ApplyBodyElementClasses(this IJSRuntime jsRuntime, List cssClasses, Dictionary cssVariables) - { - await jsRuntime.InvokeVoidAsync("App.applyBodyElementClasses", cssClasses, cssVariables); - } - - public static async Task RemoveAuthTokens(this IJSRuntime jsRuntime) - { - await jsRuntime.RemoveCookie("access_token"); - await jsRuntime.RemoveLocalStorage("refresh_token"); - } - -#if !BlazorHybrid - - public static async Task SetCookie(this IJSRuntime jsRuntime, string key, string value, long expiresIn, bool rememberMe) - { - await jsRuntime.InvokeVoidAsync("App.setCookie", key, value, expiresIn, rememberMe); - } - - public static async Task RemoveCookie(this IJSRuntime jsRuntime, string key) - { - await jsRuntime.InvokeVoidAsync("App.removeCookie", key); - } - - public static async Task GetCookie(this IJSRuntime jsRuntime, string key) - { - return await jsRuntime.InvokeAsync("App.getCookie", key); - } - - public static async Task SetLocalStorage(this IJSRuntime jsRuntime, string key, string value, bool rememberMe) - { - await jsRuntime.InvokeVoidAsync($"window.{(rememberMe ? "localStorage" : "sessionStorage")}.setItem", key, value); - } - - public static async Task RemoveLocalStorage(this IJSRuntime jsRuntime, string key) - { - await jsRuntime.InvokeVoidAsync("window.sessionStorage.removeItem", key); - await jsRuntime.InvokeVoidAsync("window.localStorage.removeItem", key); - } - - public static async Task GetLocalStorage(this IJSRuntime jsRuntime, string key) - { - return (await jsRuntime.InvokeAsync("window.localStorage.getItem", key)) ?? - (await jsRuntime.InvokeAsync("window.sessionStorage.getItem", key)); - } - - public static async Task StoreAuthToken(this IJSRuntime jsRuntime, TokenResponseDto tokenResponse, bool? rememberMe = null) - { - if (rememberMe is null) - { - rememberMe = string.IsNullOrEmpty(await jsRuntime.InvokeAsync("window.localStorage.getItem", "refresh_token")) is false; - } - - await jsRuntime.SetCookie("access_token", tokenResponse.AccessToken!, tokenResponse.ExpiresIn, rememberMe is true); - await jsRuntime.SetLocalStorage("refresh_token", tokenResponse.RefreshToken!, rememberMe is true); - } -#endif -} diff --git a/src/Client/Core/Extensions/IServiceCollectionExtensions.cs b/src/Client/Core/Extensions/IServiceCollectionExtensions.cs deleted file mode 100644 index e5b005d..0000000 --- a/src/Client/Core/Extensions/IServiceCollectionExtensions.cs +++ /dev/null @@ -1,63 +0,0 @@ - -using Bit.TemplatePlayground.Client.Core.Services.HttpMessageHandlers; - -namespace Microsoft.Extensions.DependencyInjection; - -public static class IServiceCollectionExtensions -{ - public static IServiceCollection AddClientSharedServices(this IServiceCollection services) - { - // Services registered in this class can be injected in client side (Web, Android, iOS, Windows, macOS and Linux) - - services.AddTransient(); - services.AddSessioned(); - services.AddBitBlazorUIServices(); - - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - - services.AddSessioned(); - services.AddSessioned(sp => (AppAuthenticationStateProvider)sp.GetRequiredService()); - - services.AddTransient(); - - return services; - } - - /// - /// Utilizing the AddSessioned method seamlessly configures the service to function as a singleton in BlazorHybrid, BlazorWebAssembly, - /// and BlazorElectron environments. Simultaneously, it employs per-scope registration for pre-rendering and BlazorServer scenarios - /// - public static IServiceCollection AddSessioned(this IServiceCollection services) - where TImplementation : class, TService - where TService : class - { - if (BlazorModeDetector.Current.IsBlazorElectron() || BlazorModeDetector.Current.IsBlazorHybrid() || OperatingSystem.IsBrowser()) - { - return services.AddSingleton(); - } - else - { - return services.AddScoped(); - } - } - - /// - /// - /// - public static IServiceCollection AddSessioned(this IServiceCollection services, Func implementationFactory) - where TService : class - { - if (BlazorModeDetector.Current.IsBlazorElectron() || BlazorModeDetector.Current.IsBlazorHybrid() || OperatingSystem.IsBrowser()) - { - return services.AddSingleton(implementationFactory); - } - else - { - return services.AddScoped(implementationFactory); - } - } -} diff --git a/src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor b/src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor deleted file mode 100644 index 741e223..0000000 --- a/src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor +++ /dev/null @@ -1,94 +0,0 @@ -@page "/add-edit-category/{Id:int?}" - -@inherits AppComponentBase - - - @if (_category.Id == 0) - { - @Localizer[nameof(AppStrings.AddCategory)] - } - else - { - @Localizer[nameof(AppStrings.EditCategory)] - } - - -
-
- -

- @if (_category.Id == 0) - { - @Localizer[nameof(AppStrings.AddCategory)] - } - else - { - @Localizer[nameof(AppStrings.EditCategory)] - } -

-
- - - - @if (_isLoading) - { -
- -
- } - - @if (string.IsNullOrEmpty(_saveMessage) is false) - { - @_saveMessage - } - -
- - -
- -
- @Localizer[nameof(AppStrings.Color)] -
- @foreach (var color in new[] { "#FFCD56", "#FF6384", "#4BC0C0", "#FF9124", "#2B88D8", "#C7E0F4" }) - { -
- @if (_isColorPickerOpen) - { -
- - @Localizer[nameof(AppStrings.DefaultColorPicker)] - -
- } - -
- - - @Localizer[nameof(AppStrings.Save)] - - - -
- diff --git a/src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor.cs b/src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor.cs deleted file mode 100644 index 4548673..0000000 --- a/src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor.cs +++ /dev/null @@ -1,83 +0,0 @@ -using Bit.TemplatePlayground.Shared.Dtos.Categories; - -namespace Bit.TemplatePlayground.Client.Core.Pages.Categories; - -[Authorize] -public partial class AddOrEditCategoryPage -{ - [Parameter] public int? Id { get; set; } - - private bool _isLoading; - private bool _isSaving; - private string? _saveMessage; - private bool _isColorPickerOpen; - private BitMessageBarType _saveMessageType; - private CategoryDto _category = new(); - - protected override async Task OnInitAsync() - { - await LoadCategory(); - } - - private async Task LoadCategory() - { - if (Id is null) return; - - _isLoading = true; - - try - { - _category = await HttpClient.GetFromJsonAsync($"Category/Get/{Id}", AppJsonContext.Default.CategoryDto) ?? new(); - } - finally - { - _isLoading = false; - } - } - - private void SetCategoryColor(string color) - { - _category.Color = color; - } - - private void ToggleColorPicker() - { - _isColorPickerOpen = !_isColorPickerOpen; - } - - private async Task Save() - { - if (_isSaving) return; - - _isSaving = true; - - try - { - if (_category.Id == 0) - { - await HttpClient.PostAsJsonAsync("Category/Create", _category, AppJsonContext.Default.CategoryDto); - } - else - { - await HttpClient.PutAsJsonAsync("Category/Update", _category, AppJsonContext.Default.CategoryDto); - } - - NavigationManager.NavigateTo("categories"); - } - catch (ResourceValidationException e) - { - _saveMessageType = BitMessageBarType.Error; - - _saveMessage = string.Join(Environment.NewLine, e.Payload.Details.SelectMany(d => d.Errors).Select(e => e.Message)); - } - catch (KnownException e) - { - _saveMessage = e.Message; - _saveMessageType = BitMessageBarType.Error; - } - finally - { - _isSaving = false; - } - } -} diff --git a/src/Client/Core/Pages/Dashboard/DashboardPage.razor b/src/Client/Core/Pages/Dashboard/DashboardPage.razor deleted file mode 100644 index 6f30d8f..0000000 --- a/src/Client/Core/Pages/Dashboard/DashboardPage.razor +++ /dev/null @@ -1,15 +0,0 @@ -@page "/dashboard" -@inherits AppComponentBase - -
- - -
- - -
- -
- -
-
\ No newline at end of file diff --git a/src/Client/Core/Pages/Dashboard/DashboardPage.razor.cs b/src/Client/Core/Pages/Dashboard/DashboardPage.razor.cs deleted file mode 100644 index acbfaeb..0000000 --- a/src/Client/Core/Pages/Dashboard/DashboardPage.razor.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Bit.TemplatePlayground.Client.Core.Pages.Dashboard; - -[Authorize] -public partial class DashboardPage -{ -} diff --git a/src/Client/Core/Pages/HomePage.razor.cs b/src/Client/Core/Pages/HomePage.razor.cs deleted file mode 100644 index fc18fb2..0000000 --- a/src/Client/Core/Pages/HomePage.razor.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace Bit.TemplatePlayground.Client.Core.Pages; - -public partial class HomePage -{ -} diff --git a/src/Client/Core/Pages/Identity/EditProfilePage.razor.cs b/src/Client/Core/Pages/Identity/EditProfilePage.razor.cs deleted file mode 100644 index 58f8787..0000000 --- a/src/Client/Core/Pages/Identity/EditProfilePage.razor.cs +++ /dev/null @@ -1,121 +0,0 @@ -using Bit.TemplatePlayground.Shared.Dtos.Identity; - -namespace Bit.TemplatePlayground.Client.Core.Pages.Identity; - -[Authorize] -public partial class EditProfilePage -{ - private bool _isSaving; - private bool _isRemoving; - private bool _isLoading; - private string? _profileImageUrl; - private string? _profileImageError; - private string? _editProfileMessage; - private string? _profileImageUploadUrl; - private string? _profileImageRemoveUrl; - private BitMessageBarType _editProfileMessageType; - private UserDto _user = new(); - private readonly EditUserDto _userToEdit = new(); - private bool _isDeleteAccountConfirmModalOpen; - - protected override async Task OnInitAsync() - { - _isLoading = true; - - try - { - await LoadEditProfileData(); - - var access_token = await PrerenderStateService.GetValue($"{nameof(EditProfilePage)}-access_token", AuthTokenProvider.GetAccessTokenAsync); - - _profileImageUploadUrl = $"{Configuration.GetApiServerAddress()}Attachment/UploadProfileImage?access_token={access_token}"; - _profileImageUrl = $"{Configuration.GetApiServerAddress()}Attachment/GetProfileImage?access_token={access_token}"; - _profileImageRemoveUrl = $"Attachment/RemoveProfileImage?access_token={access_token}"; - } - finally - { - _isLoading = false; - } - - await base.OnInitAsync(); - } - - private async Task LoadEditProfileData() - { - _user = await GetCurrentUser() ?? new(); - - UpdateEditProfileData(); - } - - private async Task RefreshProfileData() - { - await LoadEditProfileData(); - - PubSubService.Publish(PubSubMessages.PROFILE_UPDATED, _user); - } - - private void UpdateEditProfileData() - { - _userToEdit.Gender = _user.Gender; - _userToEdit.FullName = _user.FullName; - _userToEdit.BirthDate = _user.BirthDate; - } - - private Task GetCurrentUser() => PrerenderStateService.GetValue($"{nameof(EditProfilePage)}-{nameof(_user)}", () => HttpClient.GetFromJsonAsync("User/GetCurrentUser", AppJsonContext.Default.UserDto)); - - private async Task DoSave() - { - if (_isSaving) return; - - _isSaving = true; - _editProfileMessage = null; - - try - { - _user.FullName = _userToEdit.FullName; - _user.BirthDate = _userToEdit.BirthDate; - _user.Gender = _userToEdit.Gender; - - (await (await HttpClient.PutAsJsonAsync("User/Update", _userToEdit, AppJsonContext.Default.EditUserDto)) - .Content.ReadFromJsonAsync(AppJsonContext.Default.UserDto))!.Patch(_user); - - PubSubService.Publish(PubSubMessages.PROFILE_UPDATED, _user); - - _editProfileMessageType = BitMessageBarType.Success; - _editProfileMessage = Localizer[nameof(AppStrings.ProfileUpdatedSuccessfullyMessage)]; - } - catch (KnownException e) - { - _editProfileMessageType = BitMessageBarType.Error; - - _editProfileMessage = e.Message; - } - finally - { - _isSaving = false; - } - } - - private async Task RemoveProfileImage() - { - if (_isRemoving) return; - - _isRemoving = true; - - try - { - await HttpClient.DeleteAsync(_profileImageRemoveUrl); - - await RefreshProfileData(); - } - catch (KnownException e) - { - _editProfileMessage = e.Message; - _editProfileMessageType = BitMessageBarType.Error; - } - finally - { - _isRemoving = false; - } - } -} diff --git a/src/Client/Core/Pages/Identity/ForgotPasswordPage.razor.cs b/src/Client/Core/Pages/Identity/ForgotPasswordPage.razor.cs deleted file mode 100644 index 7eee7f6..0000000 --- a/src/Client/Core/Pages/Identity/ForgotPasswordPage.razor.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Bit.TemplatePlayground.Shared.Dtos.Identity; - -namespace Bit.TemplatePlayground.Client.Core.Pages.Identity; - -public partial class ForgotPasswordPage -{ - private bool _isLoading; - private string? _forgotPasswordMessage; - private BitMessageBarType _forgotPasswordMessageType; - private SendResetPasswordEmailRequestDto _forgotPasswordModel = new(); - - private async Task DoSubmit() - { - if (_isLoading) return; - - _isLoading = true; - _forgotPasswordMessage = null; - - try - { - await HttpClient.PostAsJsonAsync("Identity/SendResetPasswordEmail", _forgotPasswordModel, AppJsonContext.Default.SendResetPasswordEmailRequestDto); - - _forgotPasswordMessageType = BitMessageBarType.Success; - - _forgotPasswordMessage = Localizer[nameof(AppStrings.ResetPasswordLinkSentMessage)]; - } - catch (KnownException e) - { - _forgotPasswordMessageType = BitMessageBarType.Error; - - _forgotPasswordMessage = e.Message; - } - finally - { - _isLoading = false; - } - } -} diff --git a/src/Client/Core/Pages/Identity/ResetPasswordPage.razor.cs b/src/Client/Core/Pages/Identity/ResetPasswordPage.razor.cs deleted file mode 100644 index b85ef50..0000000 --- a/src/Client/Core/Pages/Identity/ResetPasswordPage.razor.cs +++ /dev/null @@ -1,60 +0,0 @@ -using Bit.TemplatePlayground.Shared.Dtos.Identity; - -namespace Bit.TemplatePlayground.Client.Core.Pages.Identity; - -public partial class ResetPasswordPage -{ - private bool _isLoading; - private string? _resetPasswordMessage; - private BitMessageBarType _resetPasswordMessageType; - private ResetPasswordRequestDto _resetPasswordModel = new(); - - [Parameter][SupplyParameterFromQuery] public string? Email { get; set; } - - [Parameter][SupplyParameterFromQuery] public string? Token { get; set; } - - protected override async Task OnInitAsync() - { - _resetPasswordModel.Email = Email; - _resetPasswordModel.Token = Token; - - await base.OnInitAsync(); - } - - protected override async Task OnAfterFirstRenderAsync() - { - await base.OnAfterFirstRenderAsync(); - - if ((await AuthenticationStateTask).User.IsAuthenticated()) - { - NavigationManager.NavigateTo("/"); - } - } - - private async Task DoSubmit() - { - if (_isLoading) return; - - _isLoading = true; - _resetPasswordMessage = null; - - try - { - await HttpClient.PostAsJsonAsync("Identity/ResetPassword", _resetPasswordModel, AppJsonContext.Default.ResetPasswordRequestDto); - - _resetPasswordMessageType = BitMessageBarType.Success; - - _resetPasswordMessage = Localizer[nameof(AppStrings.PasswordChangedSuccessfullyMessage)]; - } - catch (KnownException e) - { - _resetPasswordMessageType = BitMessageBarType.Error; - - _resetPasswordMessage = e.Message; - } - finally - { - _isLoading = false; - } - } -} diff --git a/src/Client/Core/Pages/Identity/SignInPage.razor.cs b/src/Client/Core/Pages/Identity/SignInPage.razor.cs deleted file mode 100644 index 8296e73..0000000 --- a/src/Client/Core/Pages/Identity/SignInPage.razor.cs +++ /dev/null @@ -1,54 +0,0 @@ -using Bit.TemplatePlayground.Shared.Dtos.Identity; - -namespace Bit.TemplatePlayground.Client.Core.Pages.Identity; - -public partial class SignInPage -{ - private bool _isLoading; - private string? _signInMessage; - private BitMessageBarType _signInMessageType; - private SignInRequestDto _signInModel = new(); - - [SupplyParameterFromQuery(Name = "redirect-url"), Parameter] public string? RedirectUrl { get; set; } - - protected override async Task OnAfterFirstRenderAsync() - { - await base.OnAfterFirstRenderAsync(); - - if ((await AuthenticationStateTask).User.IsAuthenticated()) - { - NavigationManager.NavigateTo("/"); - } - } - - private async Task DoSignIn() - { - if (_isLoading) return; - - _isLoading = true; - _signInMessage = null; - - try - { - var result = await (await HttpClient.PostAsJsonAsync("Identity/SignIn", _signInModel, AppJsonContext.Default.SignInRequestDto)) - .Content.ReadFromJsonAsync(AppJsonContext.Default.TokenResponseDto); - - await JSRuntime.StoreAuthToken(result!, _signInModel.RememberMe); - - await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged(); - - NavigationManager.NavigateTo(RedirectUrl ?? "/"); - } - catch (KnownException e) - { - _signInMessageType = BitMessageBarType.Error; - - _signInMessage = e.Message; - } - finally - { - _isLoading = false; - } - } -} - diff --git a/src/Client/Core/Pages/Identity/SignUpPage.razor.cs b/src/Client/Core/Pages/Identity/SignUpPage.razor.cs deleted file mode 100644 index d893c69..0000000 --- a/src/Client/Core/Pages/Identity/SignUpPage.razor.cs +++ /dev/null @@ -1,77 +0,0 @@ -using Bit.TemplatePlayground.Shared.Dtos.Identity; - -namespace Bit.TemplatePlayground.Client.Core.Pages.Identity; - -public partial class SignUpPage -{ - private bool _isLoading; - private bool _isSignedUp; - private string? _signUpMessage; - private BitMessageBarType _signUpMessageType; - private SignUpRequestDto _signUpModel = new(); - - - protected override async Task OnAfterFirstRenderAsync() - { - await base.OnAfterFirstRenderAsync(); - - if ((await AuthenticationStateTask).User.IsAuthenticated()) - { - NavigationManager.NavigateTo("/"); - } - } - - private async Task DoSignUp() - { - if (_isLoading) return; - - _isLoading = true; - _signUpMessage = null; - - try - { - await HttpClient.PostAsJsonAsync("Identity/SignUp", _signUpModel, AppJsonContext.Default.SignUpRequestDto); - - _isSignedUp = true; - } - catch (ResourceValidationException e) - { - _signUpMessageType = BitMessageBarType.Error; - _signUpMessage = string.Join(Environment.NewLine, e.Payload.Details.SelectMany(d => d.Errors).Select(e => e.Message)); - } - catch (KnownException e) - { - _signUpMessage = e.Message; - _signUpMessageType = BitMessageBarType.Error; - } - finally - { - _isLoading = false; - } - } - - private async Task DoResendLink() - { - if (_isLoading) return; - - _isLoading = true; - _signUpMessage = null; - - try - { - await HttpClient.PostAsJsonAsync("Identity/SendConfirmationEmail", new() { Email = _signUpModel.Email }, AppJsonContext.Default.SendConfirmationEmailRequestDto); - - _signUpMessageType = BitMessageBarType.Success; - _signUpMessage = Localizer[nameof(AppStrings.ResendConfirmationLinkMessage)]; - } - catch (KnownException e) - { - _signUpMessage = e.Message; - _signUpMessageType = BitMessageBarType.Error; - } - finally - { - _isLoading = false; - } - } -} diff --git a/src/Client/Core/Pages/TermsPage.razor.cs b/src/Client/Core/Pages/TermsPage.razor.cs deleted file mode 100644 index 4508dd0..0000000 --- a/src/Client/Core/Pages/TermsPage.razor.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace Bit.TemplatePlayground.Client.Core.Pages; - -public partial class TermsPage -{ -} diff --git a/src/Client/Core/Services/AppAuthenticationStateProvider.cs b/src/Client/Core/Services/AppAuthenticationStateProvider.cs deleted file mode 100644 index 73bcdce..0000000 --- a/src/Client/Core/Services/AppAuthenticationStateProvider.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System.Text; -using System.Text.Json; - -namespace Bit.TemplatePlayground.Client.Core.Services; - -public partial class AppAuthenticationStateProvider : AuthenticationStateProvider -{ - [AutoInject] private IAuthTokenProvider _tokenProvider = default!; - [AutoInject] private HttpClient _httpClient = default; - [AutoInject] private IJSRuntime _jsRuntime = default!; - - public async Task RaiseAuthenticationStateHasChanged() - { - NotifyAuthenticationStateChanged(Task.FromResult(await GetAuthenticationStateAsync())); - } - - public override async Task GetAuthenticationStateAsync() - { - var access_token = await _tokenProvider.GetAccessTokenAsync(); - - if (string.IsNullOrEmpty(access_token) && _tokenProvider.IsInitialized) - { - string? refresh_token = await _jsRuntime.GetLocalStorage("refresh_token"); - - if (string.IsNullOrEmpty(refresh_token) is false) - { - var refreshTokenResponse = await (await _httpClient.PostAsJsonAsync("Identity/Refresh", new() { RefreshToken = refresh_token }, AppJsonContext.Default.RefreshRequestDto)) - .Content.ReadFromJsonAsync(AppJsonContext.Default.TokenResponseDto); - - await _jsRuntime.StoreAuthToken(refreshTokenResponse!); - - access_token = refreshTokenResponse!.AccessToken; - } - } - - if (string.IsNullOrEmpty(access_token)) - { - return NotSignedIn(); - } - - var identity = new ClaimsIdentity(claims: ParseTokenClaims(access_token), authenticationType: "Bearer", nameType: "name", roleType: "role"); - - return new AuthenticationState(new ClaimsPrincipal(identity)); - } - - private static AuthenticationState NotSignedIn() - { - return new AuthenticationState(new ClaimsPrincipal(new ClaimsIdentity())); - } - - private static IEnumerable ParseTokenClaims(string access_token) - { - return ParseJwt(access_token) - .Select(keyValue => new Claim(keyValue.Key, keyValue.Value.ToString() ?? string.Empty)) - .ToArray(); - } - - private static Dictionary ParseJwt(string access_token) - { - // Split the token to get the payload - string base64UrlPayload = access_token.Split('.')[1]; - - // Convert the payload from Base64Url format to Base64 - string base64Payload = ConvertBase64UrlToBase64(base64UrlPayload); - - // Decode the Base64 string to get a JSON string - string jsonPayload = Encoding.UTF8.GetString(Convert.FromBase64String(base64Payload)); - - // Deserialize the JSON string to a dictionary - var claims = JsonSerializer.Deserialize(jsonPayload, AppJsonContext.Default.DictionaryStringObject)!; - - return claims; - } - - private static string ConvertBase64UrlToBase64(string base64Url) - { - base64Url = base64Url.Replace('-', '+').Replace('_', '/'); - - // Adjust base64Url string length for padding - switch (base64Url.Length % 4) - { - case 2: - base64Url += "=="; - break; - case 3: - base64Url += "="; - break; - } - - return base64Url; - } -} diff --git a/src/Client/Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs b/src/Client/Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs deleted file mode 100644 index 62df8de..0000000 --- a/src/Client/Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System.Net.Http.Headers; -using Bit.TemplatePlayground.Shared.Dtos.Identity; - -namespace Bit.TemplatePlayground.Client.Core.Services.HttpMessageHandlers; - -public class AuthDelegatingHandler(IAuthTokenProvider tokenProvider, IServiceProvider serviceProvider, IJSRuntime jsRuntime, RetryDelegatingHandler handler) - : DelegatingHandler(handler) -{ - protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) - { - if (request.Headers.Authorization is null) - { - if (OperatingSystem.IsBrowser() is false) - { - // Browsers automatically send cookies, yet we still require access_token for pre-rendering purposes. - var access_token = await tokenProvider.GetAccessTokenAsync(); - if (access_token is not null) - { - request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", access_token); - } - } - } - - try - { - return await base.SendAsync(request, cancellationToken); - } - catch (Exception _) when ((_ is ForbiddenException or UnauthorizedException) && tokenProvider.IsInitialized) - { - // Notes about ForbiddenException: - // Let's update the access token by refreshing it when a refresh token is available. - // Following this procedure, the newly acquired access token may now include the necessary roles or claims. - - var refresh_token = await jsRuntime.GetLocalStorage("refresh_token"); - - if (refresh_token is not null) - { - var httpClient = serviceProvider.GetRequiredService(); - var appAuthStateProvider = serviceProvider.GetRequiredService(); - - try - { - var refreshTokenResponse = await (await httpClient.PostAsJsonAsync("Identity/Refresh", new RefreshRequestDto { RefreshToken = refresh_token }, AppJsonContext.Default.RefreshRequestDto, cancellationToken)) - .Content.ReadFromJsonAsync(AppJsonContext.Default.TokenResponseDto, cancellationToken); - - await jsRuntime.StoreAuthToken(refreshTokenResponse!); - - request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", refreshTokenResponse!.AccessToken); - } - catch (ResourceValidationException exp) /* refresh_token is expired */ - { - await jsRuntime.RemoveAuthTokens(); - throw new UnauthorizedException(nameof(AppStrings.YouNeedToSignIn), exp); - } - finally - { - await appAuthStateProvider.RaiseAuthenticationStateHasChanged(); - } - - return await base.SendAsync(request, cancellationToken); - } - - throw; - } - } -} diff --git a/src/Client/Core/Services/MessageBoxService.cs b/src/Client/Core/Services/MessageBoxService.cs deleted file mode 100644 index 35263ef..0000000 --- a/src/Client/Core/Services/MessageBoxService.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Bit.TemplatePlayground.Client.Core.Services; -public partial class MessageBoxService -{ - [AutoInject] IPubSubService _pubSubService = default!; - - public async Task Show(string message, string title = "") - { - TaskCompletionSource tsc = new(); - _pubSubService.Publish(PubSubMessages.SHOW_MESSAGE, (message, title, tsc)); - await tsc.Task; - } -} diff --git a/src/Client/Core/Services/PrerenderStateService.cs b/src/Client/Core/Services/PrerenderStateService.cs deleted file mode 100644 index a36c215..0000000 --- a/src/Client/Core/Services/PrerenderStateService.cs +++ /dev/null @@ -1,56 +0,0 @@ - -namespace Bit.TemplatePlayground.Client.Core.Services; - -/// -/// For more information docs. -/// -#if (BlazorWebAssembly || BlazorServer) && (SpaPrerendered || PwaPrerendered) -public class PrerenderStateService : IPrerenderStateService, IAsyncDisposable -{ - private PersistingComponentStateSubscription? _subscription; - private readonly PersistentComponentState _applicationState; - private readonly ConcurrentDictionary _values = new(); - - public PrerenderStateService(PersistentComponentState applicationState) - { - _applicationState = applicationState; - _subscription = applicationState.RegisterOnPersisting(PersistAsJson); - } - - public async Task GetValue(string key, Func> factory) - { - if (_applicationState.TryTakeFromJson(key, out T? value)) return value; - - var result = await factory(); - Persist(key, result); - return result; - } - - void Persist(string key, T value) - { - _values.TryRemove(key, out object? _); - _values.TryAdd(key, value); - } - - async Task PersistAsJson() - { - foreach (var item in _values) - { - _applicationState.PersistAsJson(item.Key, item.Value); - } - } - - public async ValueTask DisposeAsync() - { - _subscription?.Dispose(); - } -} -#else -public class PrerenderStateService : IPrerenderStateService -{ - public Task GetValue(string key, Func> factory) - { - return factory(); - } -} -#endif diff --git a/src/Client/Core/Services/PubSubService.cs b/src/Client/Core/Services/PubSubService.cs deleted file mode 100644 index 07879dc..0000000 --- a/src/Client/Core/Services/PubSubService.cs +++ /dev/null @@ -1,34 +0,0 @@ -namespace Bit.TemplatePlayground.Client.Core.Services; - -/// -/// For more information docs. -/// -public partial class PubSubService : IPubSubService -{ - [AutoInject] private IServiceProvider _serviceProvider = default!; - - private readonly ConcurrentDictionary>> _handlers = new(); - - public void Publish(string message, object? payload) - { - if (_handlers.TryGetValue(message, out var handlers)) - { - foreach (var handler in handlers) - { - handler(payload) - .ContinueWith(t => _serviceProvider.GetRequiredService().Handle(t.Exception!), TaskContinuationOptions.OnlyOnFaulted); - } - } - } - - public Action Subscribe(string message, Func handler) - { - var handlers = _handlers.ContainsKey(message) - ? _handlers[message] - : _handlers[message] = []; - - handlers.Add(handler); - - return () => handlers.Remove(handler); - } -} diff --git a/src/Client/Core/Shared/AppErrorBoundary.razor.cs b/src/Client/Core/Shared/AppErrorBoundary.razor.cs deleted file mode 100644 index 772e947..0000000 --- a/src/Client/Core/Shared/AppErrorBoundary.razor.cs +++ /dev/null @@ -1,36 +0,0 @@ - -namespace Bit.TemplatePlayground.Client.Core.Shared; - -/// -/// https://learn.microsoft.com/en-us/aspnet/core/blazor/fundamentals/handle-errors -/// -public partial class AppErrorBoundary -{ - private bool _showException; - - [AutoInject] private IExceptionHandler _exceptionHandler = default!; - - [AutoInject] private NavigationManager _navigationManager = default!; - -#if DEBUG - protected override void OnInitialized() - { - _showException = true; - } -#endif - - protected override async Task OnErrorAsync(Exception exception) - { - _exceptionHandler.Handle(exception); - } - - private void Refresh() - { - _navigationManager.Refresh(forceReload: true); - } - - private void GoHome() - { - _navigationManager.NavigateTo("/", true); - } -} diff --git a/src/Client/Core/Shared/ChangePrerenderResponseStatusCode.cs b/src/Client/Core/Shared/ChangePrerenderResponseStatusCode.cs deleted file mode 100644 index b1dc7eb..0000000 --- a/src/Client/Core/Shared/ChangePrerenderResponseStatusCode.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Net; - -namespace Bit.TemplatePlayground.Client.Core.Shared; - -/// -/// This component is used during prerendering to determine the value of the StatusCode parameter for the returned HTTP response. -/// -public partial class ChangePrerenderResponseStatusCode : AppComponentBase -{ - [Parameter] public HttpStatusCode StatusCode { get; set; } - - private static readonly Type? _httpContextAccessorType = Type.GetType("Microsoft.AspNetCore.Http.IHttpContextAccessor, Microsoft.AspNetCore.Http.Abstractions"); - - [AutoInject] public IServiceProvider _serviceProvider = default!; - - protected override Task OnInitAsync() - { - if (_httpContextAccessorType is not null && BlazorModeDetector.Current.IsBlazorWebAssembly()) - { - var httpContextAccessor = _serviceProvider.GetService(_httpContextAccessorType); - - var httpContextProperty = _httpContextAccessorType.GetProperty("HttpContext")!; - - var httpContext = httpContextProperty.GetValue(httpContextAccessor)!; - - var response = httpContext.GetType().GetProperty("Response")!.GetValue(httpContext)!; - - response.GetType().GetProperty("StatusCode")!.SetValue(response, (int)StatusCode); - } - - return base.OnInitAsync(); - } -} diff --git a/src/Client/Core/Shared/ConfirmMessageBox.razor.cs b/src/Client/Core/Shared/ConfirmMessageBox.razor.cs deleted file mode 100644 index 2f6b18f..0000000 --- a/src/Client/Core/Shared/ConfirmMessageBox.razor.cs +++ /dev/null @@ -1,38 +0,0 @@ -namespace Bit.TemplatePlayground.Client.Core.Shared; - -public partial class ConfirmMessageBox -{ - private bool _isOpen; - private string? _title; - private string? _message; - - public async Task Show(string message, string title) - { - if (_tsc is not null) - await _tsc.Task; - - _tsc = new TaskCompletionSource(); - - await InvokeAsync(() => - { - _ = JSRuntime.SetBodyOverflow(true); - - _isOpen = true; - _title = title; - _message = message; - - StateHasChanged(); - }); - - return await _tsc.Task; - } - - private TaskCompletionSource? _tsc; - - public async Task Confirm(bool value) - { - _isOpen = false; - await JSRuntime.SetBodyOverflow(false); - _tsc?.SetResult(value); - } -} diff --git a/src/Client/Core/Shared/Footer.razor.cs b/src/Client/Core/Shared/Footer.razor.cs deleted file mode 100644 index 47c9e04..0000000 --- a/src/Client/Core/Shared/Footer.razor.cs +++ /dev/null @@ -1,54 +0,0 @@ -namespace Bit.TemplatePlayground.Client.Core.Shared; - -public partial class Footer -{ - [AutoInject] private BitThemeManager _bitThemeManager = default!; - [AutoInject] private IBitDeviceCoordinator _bitDeviceCoordinator { get; set; } = default!; - - private BitDropdownItem[] _cultures = default!; - - protected override Task OnInitAsync() - { - _cultures = CultureInfoManager.SupportedCultures - .Select(sc => new BitDropdownItem { Value = sc.code, Text = sc.name }) - .ToArray(); - return base.OnInitAsync(); - } - - -#if MultilingualEnabled - protected override async Task OnAfterFirstRenderAsync() - { -#if BlazorHybrid - var preferredCultureCookie = Preferences.Get(".AspNetCore.Culture", null); -#else - var preferredCultureCookie = await JSRuntime.GetCookie(".AspNetCore.Culture"); -#endif - SelectedCulture = CultureInfoManager.GetCurrentCulture(preferredCultureCookie); - - StateHasChanged(); - - await base.OnAfterFirstRenderAsync(); - } -#endif - - private string? SelectedCulture; - - private async Task OnCultureChanged() - { - var cultureCookie = $"c={SelectedCulture}|uic={SelectedCulture}"; - -#if BlazorHybrid - Preferences.Set(".AspNetCore.Culture", cultureCookie); -#else - await JSRuntime.SetCookie(".AspNetCore.Culture", cultureCookie, 30 * 24 * 3600, rememberMe: true); -#endif - - NavigationManager.Refresh(forceReload: true); - } - - private async Task ToggleTheme() - { - await _bitDeviceCoordinator.ApplyTheme(await _bitThemeManager.ToggleDarkLightAsync() == "dark"); - } -} diff --git a/src/Client/Core/Shared/MessageBox.razor.cs b/src/Client/Core/Shared/MessageBox.razor.cs deleted file mode 100644 index 7e97df3..0000000 --- a/src/Client/Core/Shared/MessageBox.razor.cs +++ /dev/null @@ -1,73 +0,0 @@ -namespace Bit.TemplatePlayground.Client.Core.Shared; - -public partial class MessageBox : IDisposable -{ - private bool _isOpen; - private string? _title; - private string? _body; - - private TaskCompletionSource? _tsc; - - private async Task OnCloseClick() - { - _isOpen = false; - await JSRuntime.SetBodyOverflow(false); - _tsc?.SetResult(null); - _tsc = null; - } - - private async Task OnOkClick() - { - _isOpen = false; - await JSRuntime.SetBodyOverflow(false); - _tsc?.SetResult(null); - _tsc = null; - } - - Action? _dispose; - bool _disposed = false; - - protected override Task OnInitAsync() - { - _dispose = PubSubService.Subscribe(PubSubMessages.SHOW_MESSAGE, async args => - { - (var message, string title, TaskCompletionSource tsc) = ((string message, string title, TaskCompletionSource tsc))args!; - await (_tsc?.Task ?? Task.CompletedTask); - _tsc = tsc; - await ShowMessageBox(message, title); - }); - - return base.OnInitAsync(); - } - - private async Task ShowMessageBox(string message, string title = "") - { - await InvokeAsync(() => - { - _ = JSRuntime.SetBodyOverflow(true); - - _isOpen = true; - _title = title; - _body = message; - - StateHasChanged(); - }); - } - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - protected virtual void Dispose(bool disposing) - { - if (_disposed || disposing is false) return; - - _tsc?.TrySetResult(null); - _tsc = null; - _dispose?.Invoke(); - - _disposed = true; - } -} diff --git a/src/Client/Core/Shared/PageNotFound.razor b/src/Client/Core/Shared/PageNotFound.razor deleted file mode 100644 index 7fb5199..0000000 --- a/src/Client/Core/Shared/PageNotFound.razor +++ /dev/null @@ -1,8 +0,0 @@ -@inherits AppComponentBase - - - -
-

404

-
@Localizer[nameof(AppStrings.ResourceNotFoundException)]
-
\ No newline at end of file diff --git a/src/Client/Core/appsettings.json b/src/Client/Core/appsettings.json deleted file mode 100644 index 163a500..0000000 --- a/src/Client/Core/appsettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "DetailedErrors": true, - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*", - "ApiServerAddress": "http://localhost:5030/api/" -} diff --git a/src/Client/Core/compilerconfig.json b/src/Client/Core/compilerconfig.json deleted file mode 100644 index 3649d9d..0000000 --- a/src/Client/Core/compilerconfig.json +++ /dev/null @@ -1,176 +0,0 @@ -[ - { - "outputFile": "wwwroot/styles/app.css", - "inputFile": "Styles/app.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Shared/AppErrorBoundary.razor.css", - "inputFile": "Shared/AppErrorBoundary.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Shared/ConfirmMessageBox.razor.css", - "inputFile": "Shared/ConfirmMessageBox.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Shared/Footer.razor.css", - "inputFile": "Shared/Footer.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Shared/Header.razor.css", - "inputFile": "Shared/Header.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Shared/MainLayout.razor.css", - "inputFile": "Shared/MainLayout.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Shared/MessageBox.razor.css", - "inputFile": "Shared/MessageBox.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Shared/NavMenu.razor.css", - "inputFile": "Shared/NavMenu.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Shared/SignOutConfirmModal.razor.css", - "inputFile": "Shared/SignOutConfirmModal.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/HomePage.razor.css", - "inputFile": "Pages/HomePage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/NotAuthorizedPage.razor.css", - "inputFile": "Pages/NotAuthorizedPage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/NotFoundPage.razor.css", - "inputFile": "Pages/NotFoundPage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/TermsPage.razor.css", - "inputFile": "Pages/TermsPage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Identity/DeleteAccountConfirmModal.razor.css", - "inputFile": "Pages/Identity/DeleteAccountConfirmModal.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Identity/EditProfilePage.razor.css", - "inputFile": "Pages/Identity/EditProfilePage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Identity/EmailConfirmationPage.razor.css", - "inputFile": "Pages/Identity/EmailConfirmationPage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Identity/ForgotPasswordPage.razor.css", - "inputFile": "Pages/Identity/ForgotPasswordPage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Identity/ResetPasswordPage.razor.css", - "inputFile": "Pages/Identity/ResetPasswordPage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Identity/SignInPage.razor.css", - "inputFile": "Pages/Identity/SignInPage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Identity/SignUpPage.razor.css", - "inputFile": "Pages/Identity/SignUpPage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Categories/AddOrEditCategoryPage.razor.css", - "inputFile": "Pages/Categories/AddOrEditCategoryPage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Categories/CategoriesPage.razor.css", - "inputFile": "Pages/Categories/CategoriesPage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Dashboard/DashboardPage.razor.css", - "inputFile": "Pages/Dashboard/DashboardPage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Dashboard/OverallStatsWidget.razor.css", - "inputFile": "Pages/Dashboard/OverallStatsWidget.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Dashboard/ProductsCountPerCategotyWidget.razor.css", - "inputFile": "Pages/Dashboard/ProductsCountPerCategotyWidget.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Dashboard/ProductsPercentageWidget.razor.css", - "inputFile": "Pages/Dashboard/ProductsPercentageWidget.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Dashboard/ProductsSalesWidget.razor.css", - "inputFile": "Pages/Dashboard/ProductsSalesWidget.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Products/AddOrEditProductModal.razor.css", - "inputFile": "Pages/Products/AddOrEditProductModal.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - }, - { - "outputFile": "Pages/Products/ProductsPage.razor.css", - "inputFile": "Pages/Products/ProductsPage.razor.scss", - "minify": { "enabled": false }, - "options": { "sourceMap": false } - } -] \ No newline at end of file diff --git a/src/Client/Web/.config/dotnet-tools.json b/src/Client/Web/.config/dotnet-tools.json deleted file mode 100644 index 5bd5ffb..0000000 --- a/src/Client/Web/.config/dotnet-tools.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "isRoot": true, - "tools": { - "electronnet.cli": { - "version": "23.6.1", - "commands": [ - "electronize" - ] - } - } -} \ No newline at end of file diff --git a/src/Client/Web/Bit.TemplatePlayground.Client.Web.csproj b/src/Client/Web/Bit.TemplatePlayground.Client.Web.csproj deleted file mode 100644 index 939058a..0000000 --- a/src/Client/Web/Bit.TemplatePlayground.Client.Web.csproj +++ /dev/null @@ -1,88 +0,0 @@ - - - - net8.0 - - true - false - service-worker-assets.js - false - - true - true - true - true - - false - - BeforeBuildTasks; - $(ResolveStaticWebAssetsInputsDependsOn) - - - - - - - - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - - - - - - - - - - - - - - - - - diff --git a/src/Client/Web/Extensions/HttpRequestExtensions.cs b/src/Client/Web/Extensions/HttpRequestExtensions.cs deleted file mode 100644 index b8d735e..0000000 --- a/src/Client/Web/Extensions/HttpRequestExtensions.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Microsoft.Net.Http.Headers; - -namespace Microsoft.AspNetCore.Http; - -public static class HttpRequestExtensions -{ - /// - /// https://blog.elmah.io/how-to-get-base-url-in-asp-net-core/ - /// - public static string GetBaseUrl(this HttpRequest req) - { - var uriBuilder = new UriBuilder(req.Scheme, req.Host.Host, req.Host.Port ?? -1); - if (uriBuilder.Uri.IsDefaultPort) - { - uriBuilder.Port = -1; - } - - return uriBuilder.Uri.AbsoluteUri; - } - - public static bool ShouldRenderStaticMode(this HttpRequest request) - { - var agent = GetLoweredUserAgent(request); - - if (agent.Contains("google")) return true; - - if (agent.Contains("bing")) return true; - - if (agent.Contains("lighthouse")) return true; - - return false; - } - - private static string GetLoweredUserAgent(HttpRequest request) - { - var userAgent = request.Headers[HeaderNames.UserAgent].ToString(); - - if (string.IsNullOrEmpty(userAgent)) return string.Empty; - - return userAgent.ToLowerInvariant(); - } -} diff --git a/src/Client/Web/Pages/AppBupProgressBar.razor b/src/Client/Web/Pages/AppBupProgressBar.razor deleted file mode 100644 index 93cf628..0000000 --- a/src/Client/Web/Pages/AppBupProgressBar.razor +++ /dev/null @@ -1,52 +0,0 @@ -@using Bit.Bup -@using Bit.BlazorUI - - - -@code { - private bool _showLoading = true; - - protected override void OnAfterRender(bool firstRender) - { - base.OnAfterRender(firstRender); - if (firstRender is false) return; - - _showLoading = false; - StateHasChanged(); - } -} - -@if (_showLoading) -{ -
- -
- - -
-} \ No newline at end of file diff --git a/src/Client/Web/Pages/_Host.cshtml b/src/Client/Web/Pages/_Host.cshtml deleted file mode 100644 index b4ee460..0000000 --- a/src/Client/Web/Pages/_Host.cshtml +++ /dev/null @@ -1,33 +0,0 @@ -@page "/" -@using Bit.TemplatePlayground.Client.Core -@using Bit.TemplatePlayground.Shared.Infra; -@namespace Bit.TemplatePlayground.Client.Web.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - -@{ - Layout = "_Layout"; - var isBlazorServer = BlazorModeDetector.Current.IsBlazorServer(); - var isSpa = WebAppDeploymentTypeDetector.Current.IsSpa(); - var isPwa = WebAppDeploymentTypeDetector.Current.IsPwa(); - var isSpaPrerendered = WebAppDeploymentTypeDetector.Current.IsSpaPrerendered(); - var isPwaPrerendered = WebAppDeploymentTypeDetector.Current.IsPwaPrerendered(); - var isPrerenderedOnly = WebAppDeploymentTypeDetector.Current.IsPrerenderedOnly(); - - var noPrerender = Request.Query["no-prerender"].Count > 0; - - RenderMode renderMode = RenderMode.Static; - - if (isPrerenderedOnly is false) - { - if (isBlazorServer) - { - renderMode = isSpa || isPwa || noPrerender ? RenderMode.Server : RenderMode.ServerPrerendered; - } - else - { - renderMode = isSpa || isPwa || noPrerender ? RenderMode.WebAssembly : RenderMode.WebAssemblyPrerendered; - } - } -} - - diff --git a/src/Client/Web/Pages/_Layout.cshtml b/src/Client/Web/Pages/_Layout.cshtml deleted file mode 100644 index 5433eba..0000000 --- a/src/Client/Web/Pages/_Layout.cshtml +++ /dev/null @@ -1,134 +0,0 @@ -@using Bit.BlazorUI -@using Bit.TemplatePlayground.Shared.Infra -@using Microsoft.AspNetCore.Components.Web -@using RenderMode = Microsoft.AspNetCore.Mvc.Rendering.RenderMode - -@namespace Bit.TemplatePlayground.Client.Web.Pages -@inject IHttpContextAccessor ContextAccessor -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - -@{ - var isElectron = BlazorModeDetector.Current.IsBlazorElectron(); - var isBlazorServer = BlazorModeDetector.Current.IsBlazorServer(); - var isSpa = WebAppDeploymentTypeDetector.Current.IsSpa(); - var isPwa = WebAppDeploymentTypeDetector.Current.IsPwa(); - var isSpaPrerendered = WebAppDeploymentTypeDetector.Current.IsSpaPrerendered(); - var isPwaPrerendered = WebAppDeploymentTypeDetector.Current.IsPwaPrerendered(); - var isPrerenderedOnly = WebAppDeploymentTypeDetector.Current.IsPrerenderedOnly(); - - var request = ContextAccessor?.HttpContext?.Request; - var noPrerender = (request?.Query["no-prerender"].Count ?? 0) > 0; - - RenderMode renderMode = RenderMode.Static; - if (isPrerenderedOnly is false) - { - if (isBlazorServer) - { - renderMode = isSpa || isPwa || noPrerender ? RenderMode.Server : RenderMode.ServerPrerendered; - } - else - { - renderMode = isSpa || isPwa || noPrerender ? RenderMode.WebAssembly : RenderMode.WebAssemblyPrerendered; - } - } - - if (renderMode is RenderMode.ServerPrerendered or RenderMode.WebAssemblyPrerendered) - { - if (request?.ShouldRenderStaticMode() is true) - { - renderMode = RenderMode.Static; - isPrerenderedOnly = true; - } - } -} - - - - - - - - - - - - - @if (isPwa || isPwaPrerendered) - { - - } - - -
- @if (isSpa || isPwa || noPrerender) - { - - } - - - - - - @RenderBody() - -
- - @if (isPrerenderedOnly is false) - { - @if (isBlazorServer) - { - - } - else - { - - @if (isPwa || isPwaPrerendered) - { - - - - @if (isPwaPrerendered) - { - - } - else - { - - - } - } - else if (isSpa || isSpaPrerendered) - { - - - @if (isSpaPrerendered) - { - - } - else - { - - - } - } - } - - - - } - - - - @if ((isSpaPrerendered || isPwaPrerendered) && !noPrerender) - { - - } - - \ No newline at end of file diff --git a/src/Client/Web/Program.BlazorElectron.cs b/src/Client/Web/Program.BlazorElectron.cs deleted file mode 100644 index 81853e2..0000000 --- a/src/Client/Web/Program.BlazorElectron.cs +++ /dev/null @@ -1,50 +0,0 @@ -#if BlazorElectron -using ElectronNET.API; -using ElectronNET.API.Entities; -#endif - -namespace Bit.TemplatePlayground.Client.Web; - -public partial class Program -{ -#if BlazorElectron - public static WebApplication CreateHostBuilder(string[] args) - { - var builder = WebApplication.CreateBuilder(args); - - builder.Configuration.AddClientConfigurations(); - - builder.WebHost.UseElectron(args); - builder.Services.AddElectron(); - - builder.WebHost.UseUrls("http://localhost:8001"); - - Startup.Services.Add(builder.Services, builder.Configuration); - - var app = builder.Build(); - - Startup.Middlewares.Use(app, builder.Environment); - - Task.Run(async () => - { - var window = await Electron.WindowManager.CreateWindowAsync(new BrowserWindowOptions - { - AutoHideMenuBar = true, - BackgroundColor = "#0D2960", - WebPreferences = new WebPreferences - { - NodeIntegration = false - } - }, "http://localhost:8001"); - - window.OnClosed += delegate - { - app.Services.GetRequiredService().StopApplication(); - Electron.App.Quit(); - }; - }); - - return app; - } -#endif -} diff --git a/src/Client/Web/Program.BlazorServer.cs b/src/Client/Web/Program.BlazorServer.cs deleted file mode 100644 index 345cca3..0000000 --- a/src/Client/Web/Program.BlazorServer.cs +++ /dev/null @@ -1,34 +0,0 @@ - -namespace Bit.TemplatePlayground.Client.Web; - -public partial class Program -{ -#if BlazorServer && !BlazorElectron - public static WebApplication CreateHostBuilder(string[] args) - { - var builder = WebApplication.CreateBuilder(args); - - builder.Configuration.AddClientConfigurations(); - -#if DEBUG - if (OperatingSystem.IsWindows()) - { - // The following line (using the * in the URL), allows the emulators and mobile devices to access the app using the host IP address. - builder.WebHost.UseUrls("https://localhost:4031", "http://localhost:4030", "https://*:4031", "http://*:4030"); - } - else - { - builder.WebHost.UseUrls("https://localhost:4031", "http://localhost:4030"); - } -#endif - - Startup.Services.Add(builder.Services, builder.Configuration); - - var app = builder.Build(); - - Startup.Middlewares.Use(app, builder.Environment); - - return app; - } -#endif -} diff --git a/src/Client/Web/Program.BlazorWebAssembly.cs b/src/Client/Web/Program.BlazorWebAssembly.cs deleted file mode 100644 index c8bbd8e..0000000 --- a/src/Client/Web/Program.BlazorWebAssembly.cs +++ /dev/null @@ -1,51 +0,0 @@ -#if BlazorWebAssembly -using Bit.TemplatePlayground.Client.Core.Services.HttpMessageHandlers; -using Microsoft.AspNetCore.Components.WebAssembly.Hosting; -using Microsoft.AspNetCore.Components.WebAssembly.Services; -#endif - -namespace Bit.TemplatePlayground.Client.Web; - -public partial class Program -{ -#if BlazorWebAssembly - public static WebAssemblyHost CreateHostBuilder(string[] args) - { - var builder = WebAssemblyHostBuilder.CreateDefault(); - - builder.Configuration.AddClientConfigurations(); - - Uri.TryCreate(builder.Configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress); - - if (apiServerAddress!.IsAbsoluteUri is false) - { - apiServerAddress = new Uri($"{builder.HostEnvironment.BaseAddress}{apiServerAddress}"); - } - - builder.Services.AddTransient(sp => - { - var handler = sp.GetRequiredService(); - HttpClient httpClient = new(handler) - { - BaseAddress = apiServerAddress - }; - return httpClient; - }); - builder.Services.AddTransient(); - builder.Services.AddTransient(); - - builder.Services.AddSharedServices(); - builder.Services.AddClientSharedServices(); - builder.Services.AddClientWebServices(); - - var host = builder.Build(); - -#if MultilingualEnabled - var preferredCultureCookie = ((IJSInProcessRuntime)host.Services.GetRequiredService()).Invoke("window.App.getCookie", ".AspNetCore.Culture"); - CultureInfoManager.SetCurrentCulture(preferredCultureCookie); -#endif - - return host; - } -#endif -} diff --git a/src/Client/Web/Program.cs b/src/Client/Web/Program.cs deleted file mode 100644 index 215ba2f..0000000 --- a/src/Client/Web/Program.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace Bit.TemplatePlayground.Client.Web; - -public partial class Program -{ - public static async Task Main(string[] args) - { -#if !BlazorWebAssembly && !BlazorServer - throw new InvalidOperationException("Please switch to either blazor web assembly or server as described in https://bitplatform.dev/templates/hosting-models"); -#else - await CreateHostBuilder(args) - .RunAsync(); -#endif - } -} diff --git a/src/Client/Web/Properties/launchSettings.json b/src/Client/Web/Properties/launchSettings.json deleted file mode 100644 index 852c2bb..0000000 --- a/src/Client/Web/Properties/launchSettings.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "profiles": { - "Bit.TemplatePlayground.Client.Web": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:4031;http://localhost:4030" - }, - "Bit.TemplatePlayground.Client.Web.Electron": { - "commandName": "Executable", - "executablePath": "dotnet", - "commandLineArgs": "electronize start", - "workingDirectory": "." - } - } -} \ No newline at end of file diff --git a/src/Client/Web/Services/ServerSideAuthTokenProvider.cs b/src/Client/Web/Services/ServerSideAuthTokenProvider.cs deleted file mode 100644 index 094338e..0000000 --- a/src/Client/Web/Services/ServerSideAuthTokenProvider.cs +++ /dev/null @@ -1,51 +0,0 @@ -#if BlazorServer -using System.Reflection; -#endif - -namespace Bit.TemplatePlayground.Client.Web.Services; - -/// -/// The reads the token from the cookie, -/// but during prerendering, there is no access to localStorage or the stored cookies. -/// However, the cookies are sent automatically in http request and The provides that token to the application. -/// -#if BlazorServer -public partial class ServerSideAuthTokenProvider : IAuthTokenProvider -{ - [AutoInject] private IHttpContextAccessor _httpContextAccessor = default!; - [AutoInject] private IJSRuntime _jsRuntime = default!; - - private static readonly PropertyInfo IsInitializedProp = Assembly.Load("Microsoft.AspNetCore.Components.Server")! - .GetType("Microsoft.AspNetCore.Components.Server.Circuits.RemoteJSRuntime")! - .GetProperty("IsInitialized")!; - - public bool IsInitialized => (bool)IsInitializedProp.GetValue(_jsRuntime)!; - - public async Task GetAccessTokenAsync() - { - if (IsInitialized) - { - return await _jsRuntime.GetCookie("access_token"); - } - - return _httpContextAccessor.HttpContext?.Request.Cookies["access_token"]; - } -} -#else -public class ServerSideAuthTokenProvider : IAuthTokenProvider -{ - private readonly IHttpContextAccessor _httpContextAccessor; - - public ServerSideAuthTokenProvider(IHttpContextAccessor httpContextAccessor) - { - _httpContextAccessor = httpContextAccessor; - } - - public bool IsInitialized => false; - - public async Task GetAccessTokenAsync() - { - return _httpContextAccessor.HttpContext?.Request.Cookies["access_token"]; - } -} -#endif diff --git a/src/Client/Web/Startup/Middlewares.cs b/src/Client/Web/Startup/Middlewares.cs deleted file mode 100644 index 422d70b..0000000 --- a/src/Client/Web/Startup/Middlewares.cs +++ /dev/null @@ -1,39 +0,0 @@ -#if BlazorServer - -namespace Bit.TemplatePlayground.Client.Web.Startup; - -public class Middlewares -{ - public static void Use(WebApplication app, IHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - else - { - app.UseExceptionHandler("/Error"); - } - - if (env.IsDevelopment() is false) - { - app.UseHttpsRedirection(); - app.UseResponseCompression(); - } - app.UseStaticFiles(); - -#if MultilingualEnabled - var supportedCultures = CultureInfoManager.SupportedCultures.Select(sc => CultureInfoManager.CreateCultureInfo(sc.code)).ToArray(); - app.UseRequestLocalization(new RequestLocalizationOptions - { - SupportedCultures = supportedCultures, - SupportedUICultures = supportedCultures, - ApplyCurrentCultureToResponseHeaders = true - }.SetDefaultCulture(CultureInfoManager.DefaultCulture.code)); -#endif - - app.MapBlazorHub(); - app.MapFallbackToPage("/_Host"); - } -} -#endif diff --git a/src/Client/Web/Startup/Services.cs b/src/Client/Web/Startup/Services.cs deleted file mode 100644 index 1f51c5a..0000000 --- a/src/Client/Web/Startup/Services.cs +++ /dev/null @@ -1,44 +0,0 @@ -#if BlazorServer -using System.IO.Compression; -using Bit.TemplatePlayground.Client.Core.Services.HttpMessageHandlers; -using Bit.TemplatePlayground.Client.Web.Services; -using Microsoft.AspNetCore.ResponseCompression; - -namespace Bit.TemplatePlayground.Client.Web.Startup; - -public static class Services -{ - public static void Add(IServiceCollection services, IConfiguration configuration) - { - services.AddTransient(sp => - { - Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.Absolute, out var apiServerAddress); - var handler = sp.GetRequiredService(); - HttpClient httpClient = new(handler) - { - BaseAddress = apiServerAddress - }; - - return httpClient; - }); - - services.AddHttpContextAccessor(); - services.AddRazorPages(); - services.AddServerSideBlazor(); - services.AddResponseCompression(opts => - { - opts.EnableForHttps = true; - opts.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(["application/octet-stream"]).ToArray(); - opts.Providers.Add(); - opts.Providers.Add(); - }) - .Configure(opt => opt.Level = CompressionLevel.Fastest) - .Configure(opt => opt.Level = CompressionLevel.Fastest); - services.AddTransient(); - - services.AddSharedServices(); - services.AddClientSharedServices(); - services.AddClientWebServices(); - } -} -#endif diff --git a/src/Client/Web/electron.manifest.json b/src/Client/Web/electron.manifest.json deleted file mode 100644 index 5edf63f..0000000 --- a/src/Client/Web/electron.manifest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "executable": "Bit.TemplatePlayground.Client.Web", - "splashscreen": { - "imageFile": "" - }, - "name": "Bit.TemplatePlayground", - "author": "", - "singleInstance": true, - "environment": "Production", - "build": { - "appId": "com.Bit.TemplatePlayground.Client.Web.app", - "productName": "Bit.TemplatePlayground.Client.Web", - "copyright": "Copyright © 2023", - "buildVersion": "1.0.0", - "compression": "maximum", - "directories": { - "output": "../../../bin/Desktop" - }, - "extraResources": [ - { - "from": "./bin", - "to": "bin", - "filter": [ "**/*" ] - } - ], - "files": [ - { - "from": "./ElectronHostHook/node_modules", - "to": "ElectronHostHook/node_modules", - "filter": [ "**/*" ] - }, - "**/*" - ] - } -} \ No newline at end of file diff --git a/src/Client/Web/wwwroot/service-worker.js b/src/Client/Web/wwwroot/service-worker.js deleted file mode 100644 index 2a8350b..0000000 --- a/src/Client/Web/wwwroot/service-worker.js +++ /dev/null @@ -1,34 +0,0 @@ -// bit version: 8.1.0 -// https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup - -// Make sure to apply all changes you make here to the service-worker.published.js file too (if required). - -self.assetsInclude = []; -self.assetsExclude = [ - /bit\.blazorui\.fluent\.css$/, - /bit\.blazorui\.fluent-dark\.css$/, - /bit\.blazorui\.fluent-light\.css$/, -]; -self.externalAssets = [ - { - "url": "/" - }, -]; - -self.serverHandledUrls = [ - /\/api\//, - /\/odata\//, - /\/jobs\//, - /\/core\//, - /\/signalr\//, - /\/healthchecks-ui/, - /\/healthz/, - /\/swagger/ -]; - -self.isPassive = true; -self.defaultUrl = "/"; -self.caseInsensitiveUrl = true; -self.noPrerenderQuery = 'no-prerender=true'; - -self.importScripts('_content/Bit.Bswup/bit-bswup.sw.js'); diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 135d3fd..01b8a6d 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,51 +1,32 @@ - + - - BlazorServer - - - - Spa - - - - true - $(DefineConstants);BlazorElectron - Spa - BlazorServer - - $(DefineConstants);BlazorWebAssembly - $(DefineConstants);BlazorServer - $(DefineConstants);BlazorHybrid - $(DefineConstants);Spa - $(DefineConstants);Pwa - $(DefineConstants);SpaPrerendered - $(DefineConstants);PwaPrerendered - $(DefineConstants);PrerenderedOnly - $(DefineConstants);Android - $(DefineConstants);iOS - $(DefineConstants);Windows - $(DefineConstants);Mac - 12.0 enable enable true $(NoWarn);CS1998;CS1591 - - en + $(WarningsAsErrors);CS0114 + + en-US true $(DefineConstants);MultilingualEnabled - 14.2 + false + $(DefineConstants);PwaEnabled + + 14.0 14.0 24.0 10.0.17763.0 10.0.17763.0 6.5 + $(DefineConstants);Android + $(DefineConstants);iOS + $(DefineConstants);Windows + $(DefineConstants);Mac - + @@ -57,6 +38,7 @@ + @@ -65,5 +47,5 @@ - + diff --git a/src/Server/Api/Data/Configurations/Category/CategoryConfiguration.cs b/src/Server/Api/Data/Configurations/Category/CategoryConfiguration.cs deleted file mode 100644 index 89b1deb..0000000 --- a/src/Server/Api/Data/Configurations/Category/CategoryConfiguration.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Bit.TemplatePlayground.Server.Api.Models.Categories; - -namespace Bit.TemplatePlayground.Server.Api.Data.Configurations.Identity; - -public class CategoryConfiguration : IEntityTypeConfiguration -{ - public void Configure(EntityTypeBuilder builder) - { - builder.HasData( - new Category() { Id = 1, Name = "Ford", Color = "#FFCD56" }, - new Category() { Id = 2, Name = "Nissan", Color = "#FF6384" }, - new Category() { Id = 3, Name = "Benz", Color = "#4BC0C0" }, - new Category() { Id = 4, Name = "BMW", Color = "#FF9124" }, - new Category() { Id = 5, Name = "Tesla", Color = "#2B88D8" }); - } -} - diff --git a/src/Server/Api/Data/Configurations/Product/ProductConfiguration.cs b/src/Server/Api/Data/Configurations/Product/ProductConfiguration.cs deleted file mode 100644 index 0405fba..0000000 --- a/src/Server/Api/Data/Configurations/Product/ProductConfiguration.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Bit.TemplatePlayground.Server.Api.Models.Products; - -namespace Bit.TemplatePlayground.Server.Api.Data.Configurations.Identity; - -public class ProductConfiguration : IEntityTypeConfiguration -{ - public void Configure(EntityTypeBuilder builder) - { - DateTime baseDate = DateTime.Parse("2023-11-22"); - - builder.HasData( - new Product() { Id = 1, Name = "Mustang", Price = 27155, Description = "The Ford Mustang is ranked #1 in Sports Cars", CreatedOn = baseDate.AddDays(-10), CategoryId = 1 }, - new Product() { Id = 2, Name = "GT", Price = 500000, Description = "The Ford GT is a mid-engine two-seater sports car manufactured and marketed by American automobile manufacturer", CreatedOn = baseDate.AddDays(-15), CategoryId = 1 }, - new Product() { Id = 3, Name = "Ranger", Price = 25000, Description = "Ford Ranger is a nameplate that has been used on multiple model lines of pickup trucks sold by Ford worldwide.", CreatedOn = baseDate.AddDays(-25), CategoryId = 1 }, - new Product() { Id = 4, Name = "Raptor", Price = 53205, Description = "Raptor is a SCORE off-road trophy truck living in a asphalt world", CreatedOn = baseDate.AddDays(-30), CategoryId = 1 }, - new Product() { Id = 5, Name = "Maverick", Price = 22470, Description = "The Ford Maverick is a compact pickup truck produced by Ford Motor Company.", CreatedOn = baseDate.AddDays(-35), CategoryId = 1 }, - - new Product() { Id = 6, Name = "Roadster", Price = 42800, Description = "A powerful convertible sports car", CreatedOn = baseDate.AddDays(-10), CategoryId = 2 }, - new Product() { Id = 7, Name = "Altima", Price = 24550, Description = "A perfectly adequate family sedan with sharp looks", CreatedOn = baseDate.AddDays(-15), CategoryId = 2 }, - new Product() { Id = 8, Name = "GT-R", Price = 113540, Description = "Legendary supercar with AWD, 4 seats, a powerful V6 engine and the latest tech", CreatedOn = baseDate.AddDays(-25), CategoryId = 2 }, - new Product() { Id = 9, Name = "Juke", Price = 28100, Description = "A new smart SUV", CreatedOn = baseDate.AddDays(-35), CategoryId = 2 }, - - new Product() { Id = 10, Name = "H247", Price = 54950, Description = "", CreatedOn = baseDate.AddDays(-10), CategoryId = 3 }, - new Product() { Id = 11, Name = "V297", Price = 103360, Description = "", CreatedOn = baseDate.AddDays(-15), CategoryId = 3 }, - new Product() { Id = 12, Name = "R50", Price = 2000000, Description = "", CreatedOn = baseDate.AddDays(-35), CategoryId = 3 }, - - new Product() { Id = 13, Name = "M550i", Price = 77790, Description = "", CreatedOn = baseDate.AddDays(-10), CategoryId = 4 }, - new Product() { Id = 14, Name = "540i", Price = 60945, Description = "", CreatedOn = baseDate.AddDays(-15), CategoryId = 4 }, - new Product() { Id = 15, Name = "530e", Price = 56545, Description = "", CreatedOn = baseDate.AddDays(-20), CategoryId = 4 }, - new Product() { Id = 16, Name = "530i", Price = 55195, Description = "", CreatedOn = baseDate.AddDays(-25), CategoryId = 4 }, - new Product() { Id = 17, Name = "M850i", Price = 100045, Description = "", CreatedOn = baseDate.AddDays(-30), CategoryId = 4 }, - new Product() { Id = 18, Name = "X7", Price = 77980, Description = "", CreatedOn = baseDate.AddDays(-35), CategoryId = 4 }, - new Product() { Id = 19, Name = "IX", Price = 87000, Description = "", CreatedOn = baseDate.AddDays(-40), CategoryId = 4 }, - - new Product() { Id = 20, Name = "Model 3", Price = 61990, Description = "rapid acceleration and dynamic handling", CreatedOn = baseDate.AddDays(-10), CategoryId = 5 }, - new Product() { Id = 21, Name = "Model S", Price = 135000, Description = "finishes near the top of our luxury electric car rankings.", CreatedOn = baseDate.AddDays(-15), CategoryId = 5 }, - new Product() { Id = 22, Name = "Model X", Price = 138890, Description = "Heart-pumping acceleration, long drive range", CreatedOn = baseDate.AddDays(-20), CategoryId = 5 }, - new Product() { Id = 23, Name = "Model Y", Price = 67790, Description = "extensive driving range, lots of standard safety features", CreatedOn = baseDate.AddDays(-35), CategoryId = 5 } - ); - } -} - diff --git a/src/Server/Api/Data/Migrations/20231122175600_InitialMigration.cs b/src/Server/Api/Data/Migrations/20231122175600_InitialMigration.cs deleted file mode 100644 index 130db33..0000000 --- a/src/Server/Api/Data/Migrations/20231122175600_InitialMigration.cs +++ /dev/null @@ -1,343 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional - -namespace Bit.TemplatePlayground.Server.Api.Data.Migrations -{ - /// - public partial class InitialMigration : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Categories", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - Name = table.Column(type: "TEXT", maxLength: 64, nullable: false), - Color = table.Column(type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Categories", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "DataProtectionKeys", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - FriendlyName = table.Column(type: "TEXT", nullable: true), - Xml = table.Column(type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_DataProtectionKeys", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Roles", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - Name = table.Column(type: "TEXT", maxLength: 50, nullable: true), - NormalizedName = table.Column(type: "TEXT", maxLength: 256, nullable: true), - ConcurrencyStamp = table.Column(type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Roles", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Users", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - FullName = table.Column(type: "TEXT", nullable: true), - Gender = table.Column(type: "INTEGER", nullable: true), - BirthDate = table.Column(type: "INTEGER", nullable: true), - ProfileImageName = table.Column(type: "TEXT", nullable: true), - ConfirmationEmailRequestedOn = table.Column(type: "INTEGER", nullable: true), - ResetPasswordEmailRequestedOn = table.Column(type: "INTEGER", nullable: true), - UserName = table.Column(type: "TEXT", maxLength: 256, nullable: true), - NormalizedUserName = table.Column(type: "TEXT", maxLength: 256, nullable: true), - Email = table.Column(type: "TEXT", maxLength: 256, nullable: true), - NormalizedEmail = table.Column(type: "TEXT", maxLength: 256, nullable: true), - EmailConfirmed = table.Column(type: "INTEGER", nullable: false), - PasswordHash = table.Column(type: "TEXT", nullable: true), - SecurityStamp = table.Column(type: "TEXT", nullable: true), - ConcurrencyStamp = table.Column(type: "TEXT", nullable: true), - PhoneNumber = table.Column(type: "TEXT", nullable: true), - PhoneNumberConfirmed = table.Column(type: "INTEGER", nullable: false), - TwoFactorEnabled = table.Column(type: "INTEGER", nullable: false), - LockoutEnd = table.Column(type: "INTEGER", nullable: true), - LockoutEnabled = table.Column(type: "INTEGER", nullable: false), - AccessFailedCount = table.Column(type: "INTEGER", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Users", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Products", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - Name = table.Column(type: "TEXT", maxLength: 64, nullable: false), - Price = table.Column(type: "money", nullable: false), - Description = table.Column(type: "TEXT", maxLength: 512, nullable: true), - CreatedOn = table.Column(type: "INTEGER", nullable: false), - CategoryId = table.Column(type: "INTEGER", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Products", x => x.Id); - table.ForeignKey( - name: "FK_Products_Categories_CategoryId", - column: x => x.CategoryId, - principalTable: "Categories", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "RoleClaims", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - RoleId = table.Column(type: "INTEGER", nullable: false), - ClaimType = table.Column(type: "TEXT", nullable: true), - ClaimValue = table.Column(type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_RoleClaims", x => x.Id); - table.ForeignKey( - name: "FK_RoleClaims_Roles_RoleId", - column: x => x.RoleId, - principalTable: "Roles", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "UserClaims", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - UserId = table.Column(type: "INTEGER", nullable: false), - ClaimType = table.Column(type: "TEXT", nullable: true), - ClaimValue = table.Column(type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_UserClaims", x => x.Id); - table.ForeignKey( - name: "FK_UserClaims_Users_UserId", - column: x => x.UserId, - principalTable: "Users", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "UserLogins", - columns: table => new - { - LoginProvider = table.Column(type: "TEXT", nullable: false), - ProviderKey = table.Column(type: "TEXT", nullable: false), - ProviderDisplayName = table.Column(type: "TEXT", nullable: true), - UserId = table.Column(type: "INTEGER", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_UserLogins", x => new { x.LoginProvider, x.ProviderKey }); - table.ForeignKey( - name: "FK_UserLogins_Users_UserId", - column: x => x.UserId, - principalTable: "Users", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "UserRoles", - columns: table => new - { - UserId = table.Column(type: "INTEGER", nullable: false), - RoleId = table.Column(type: "INTEGER", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_UserRoles", x => new { x.UserId, x.RoleId }); - table.ForeignKey( - name: "FK_UserRoles_Roles_RoleId", - column: x => x.RoleId, - principalTable: "Roles", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_UserRoles_Users_UserId", - column: x => x.UserId, - principalTable: "Users", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "UserTokens", - columns: table => new - { - UserId = table.Column(type: "INTEGER", nullable: false), - LoginProvider = table.Column(type: "TEXT", nullable: false), - Name = table.Column(type: "TEXT", nullable: false), - Value = table.Column(type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_UserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); - table.ForeignKey( - name: "FK_UserTokens_Users_UserId", - column: x => x.UserId, - principalTable: "Users", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.InsertData( - table: "Categories", - columns: new[] { "Id", "Color", "Name" }, - values: new object[,] - { - { 1, "#FFCD56", "Ford" }, - { 2, "#FF6384", "Nissan" }, - { 3, "#4BC0C0", "Benz" }, - { 4, "#FF9124", "BMW" }, - { 5, "#2B88D8", "Tesla" } - }); - - migrationBuilder.InsertData( - table: "Users", - columns: new[] { "Id", "AccessFailedCount", "BirthDate", "ConcurrencyStamp", "ConfirmationEmailRequestedOn", "Email", "EmailConfirmed", "FullName", "Gender", "LockoutEnabled", "LockoutEnd", "NormalizedEmail", "NormalizedUserName", "PasswordHash", "PhoneNumber", "PhoneNumberConfirmed", "ProfileImageName", "ResetPasswordEmailRequestedOn", "SecurityStamp", "TwoFactorEnabled", "UserName" }, - values: new object[] { 1, 0, 1306790461440000060L, "ae209e4e-1401-4e10-b8c7-cdd62871f181", null, "test@bitplatform.dev", true, "Bit.TemplatePlayground test account", 2, true, null, "TEST@BITPLATFORM.DEV", "TEST@BITPLATFORM.DEV", "AQAAAAIAAYagAAAAEAfqQ2WWaMftx62DMUSGQy52CRg3R5ZjjhpwsEYW8HxWt7SfzSWbA1m/C510G828DQ==", null, false, null, null, "9cd0a3f1-7be9-42d4-bed2-6397a91b948d", false, "test@bitplatform.dev" }); - - migrationBuilder.InsertData( - table: "Products", - columns: new[] { "Id", "CategoryId", "CreatedOn", "Description", "Name", "Price" }, - values: new object[,] - { - { 1, 1, 1307347845120000060L, "The Ford Mustang is ranked #1 in Sports Cars", "Mustang", 27155m }, - { 2, 1, 1307338997760000060L, "The Ford GT is a mid-engine two-seater sports car manufactured and marketed by American automobile manufacturer", "GT", 500000m }, - { 3, 1, 1307321303040000120L, "Ford Ranger is a nameplate that has been used on multiple model lines of pickup trucks sold by Ford worldwide.", "Ranger", 25000m }, - { 4, 1, 1307312455680000120L, "Raptor is a SCORE off-road trophy truck living in a asphalt world", "Raptor", 53205m }, - { 5, 1, 1307303608320000120L, "The Ford Maverick is a compact pickup truck produced by Ford Motor Company.", "Maverick", 22470m }, - { 6, 2, 1307347845120000060L, "A powerful convertible sports car", "Roadster", 42800m }, - { 7, 2, 1307338997760000060L, "A perfectly adequate family sedan with sharp looks", "Altima", 24550m }, - { 8, 2, 1307321303040000120L, "Legendary supercar with AWD, 4 seats, a powerful V6 engine and the latest tech", "GT-R", 113540m }, - { 9, 2, 1307303608320000120L, "A new smart SUV", "Juke", 28100m }, - { 10, 3, 1307347845120000060L, "", "H247", 54950m }, - { 11, 3, 1307338997760000060L, "", "V297", 103360m }, - { 12, 3, 1307303608320000120L, "", "R50", 2000000m }, - { 13, 4, 1307347845120000060L, "", "M550i", 77790m }, - { 14, 4, 1307338997760000060L, "", "540i", 60945m }, - { 15, 4, 1307330150400000060L, "", "530e", 56545m }, - { 16, 4, 1307321303040000120L, "", "530i", 55195m }, - { 17, 4, 1307312455680000120L, "", "M850i", 100045m }, - { 18, 4, 1307303608320000120L, "", "X7", 77980m }, - { 19, 4, 1307294760960000120L, "", "IX", 87000m }, - { 20, 5, 1307347845120000060L, "rapid acceleration and dynamic handling", "Model 3", 61990m }, - { 21, 5, 1307338997760000060L, "finishes near the top of our luxury electric car rankings.", "Model S", 135000m }, - { 22, 5, 1307330150400000060L, "Heart-pumping acceleration, long drive range", "Model X", 138890m }, - { 23, 5, 1307303608320000120L, "extensive driving range, lots of standard safety features", "Model Y", 67790m } - }); - - migrationBuilder.CreateIndex( - name: "IX_Products_CategoryId", - table: "Products", - column: "CategoryId"); - - migrationBuilder.CreateIndex( - name: "IX_RoleClaims_RoleId", - table: "RoleClaims", - column: "RoleId"); - - migrationBuilder.CreateIndex( - name: "RoleNameIndex", - table: "Roles", - column: "NormalizedName", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_UserClaims_UserId", - table: "UserClaims", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_UserLogins_UserId", - table: "UserLogins", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_UserRoles_RoleId", - table: "UserRoles", - column: "RoleId"); - - migrationBuilder.CreateIndex( - name: "EmailIndex", - table: "Users", - column: "NormalizedEmail"); - - migrationBuilder.CreateIndex( - name: "UserNameIndex", - table: "Users", - column: "NormalizedUserName", - unique: true); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "DataProtectionKeys"); - - migrationBuilder.DropTable( - name: "Products"); - - migrationBuilder.DropTable( - name: "RoleClaims"); - - migrationBuilder.DropTable( - name: "UserClaims"); - - migrationBuilder.DropTable( - name: "UserLogins"); - - migrationBuilder.DropTable( - name: "UserRoles"); - - migrationBuilder.DropTable( - name: "UserTokens"); - - migrationBuilder.DropTable( - name: "Categories"); - - migrationBuilder.DropTable( - name: "Roles"); - - migrationBuilder.DropTable( - name: "Users"); - } - } -} diff --git a/src/Server/Api/Models/Emailing/EmailConfirmationModel.cs b/src/Server/Api/Models/Emailing/EmailConfirmationModel.cs deleted file mode 100644 index 18759f8..0000000 --- a/src/Server/Api/Models/Emailing/EmailConfirmationModel.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Bit.TemplatePlayground.Server.Api.Models.Emailing; - -public class EmailConfirmationModel -{ - public string? ConfirmationLink { get; set; } - - public Uri? HostUri { get; set; } -} diff --git a/src/Server/Api/Models/Emailing/ResetPasswordModel.cs b/src/Server/Api/Models/Emailing/ResetPasswordModel.cs deleted file mode 100644 index e0e9fe6..0000000 --- a/src/Server/Api/Models/Emailing/ResetPasswordModel.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Bit.TemplatePlayground.Server.Api.Models.Emailing; - -public class ResetPasswordModel -{ - public string? DisplayName { get; set; } - - public string? ResetPasswordLink { get; set; } - - public Uri? HostUri { get; set; } -} diff --git a/src/Server/Api/Models/Identity/Role.cs b/src/Server/Api/Models/Identity/Role.cs deleted file mode 100644 index dece8e8..0000000 --- a/src/Server/Api/Models/Identity/Role.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Bit.TemplatePlayground.Server.Api.Models.Identity; - -public class Role : IdentityRole -{ -} - diff --git a/src/Server/Api/Program.cs b/src/Server/Api/Program.cs deleted file mode 100644 index 241a915..0000000 --- a/src/Server/Api/Program.cs +++ /dev/null @@ -1,25 +0,0 @@ -var builder = WebApplication.CreateBuilder(args); - -#if BlazorWebAssembly -builder.Configuration.AddClientConfigurations(); -#endif - -#if DEBUG -// The following line (using the * in the URL), allows the emulators and mobile devices to access the app using the host IP address. -if (OperatingSystem.IsWindows()) -{ - builder.WebHost.UseUrls("https://localhost:5031", "http://localhost:5030", "https://*:5031", "http://*:5030"); -} -else -{ - builder.WebHost.UseUrls("https://localhost:5031", "http://localhost:5030"); -} -#endif - -Bit.TemplatePlayground.Server.Api.Startup.Services.Add(builder.Services, builder.Environment, builder.Configuration); - -var app = builder.Build(); - -Bit.TemplatePlayground.Server.Api.Startup.Middlewares.Use(app, builder.Environment, builder.Configuration); - -app.Run(); diff --git a/src/Server/Api/Startup/Middlewares.cs b/src/Server/Api/Startup/Middlewares.cs deleted file mode 100644 index ba03458..0000000 --- a/src/Server/Api/Startup/Middlewares.cs +++ /dev/null @@ -1,91 +0,0 @@ -using HealthChecks.UI.Client; -using Microsoft.AspNetCore.Diagnostics.HealthChecks; -using Microsoft.Net.Http.Headers; - -namespace Bit.TemplatePlayground.Server.Api.Startup; - -public class Middlewares -{ - public static void Use(WebApplication app, IHostEnvironment env, IConfiguration configuration) - { - app.UseForwardedHeaders(); - - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - -#if BlazorWebAssembly - app.UseWebAssemblyDebugging(); -#endif - } - -#if BlazorWebAssembly - app.UseBlazorFrameworkFiles(); -#endif - - if (env.IsDevelopment() is false) - { - app.UseHttpsRedirection(); - app.UseResponseCompression(); - } - - app.UseStaticFiles(new StaticFileOptions - { - OnPrepareResponse = ctx => - { - // https://bitplatform.dev/templates/cache-mechanism - ctx.Context.Response.GetTypedHeaders().CacheControl = new CacheControlHeaderValue() - { - MaxAge = TimeSpan.FromDays(7), - Public = true - }; - } - }); - - app.UseCors(options => options.WithOrigins("https://localhost:4031" /*BlazorServer*/, "http://localhost:8001" /*BlazorElectron*/, "https://0.0.0.0" /*BlazorHybrid*/, "app://0.0.0.0" /*BlazorHybrid*/) - .AllowAnyHeader().AllowAnyMethod()); - - app.UseResponseCaching(); - app.UseAuthentication(); - app.UseAuthorization(); - -#if MultilingualEnabled - var supportedCultures = CultureInfoManager.SupportedCultures.Select(sc => CultureInfoManager.CreateCultureInfo(sc.code)).ToArray(); - app.UseRequestLocalization(new RequestLocalizationOptions - { - SupportedCultures = supportedCultures, - SupportedUICultures = supportedCultures, - ApplyCurrentCultureToResponseHeaders = true - }.SetDefaultCulture(CultureInfoManager.DefaultCulture.code)); -#endif - - app.UseExceptionHandler("/", createScopeForErrors: true); - - app.UseSwagger(); - - app.UseSwaggerUI(options => - { - options.InjectJavascript($"/swagger/swagger-utils.js?v={Environment.TickCount64}"); - }); - - app.MapControllers().RequireAuthorization(); - - var appSettings = configuration.GetSection(nameof(AppSettings)).Get()!; - - var healthCheckSettings = appSettings.HealthCheckSettings; - - if (healthCheckSettings.EnableHealthChecks) - { - app.MapHealthChecks("/healthz", new HealthCheckOptions - { - ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse - }); - - app.MapHealthChecksUI(); - } - -#if BlazorWebAssembly - app.MapFallbackToPage("/_Host"); -#endif - } -} diff --git a/src/Server/Api/appsettings.Development.json b/src/Server/Api/appsettings.Development.json deleted file mode 100644 index 984e984..0000000 --- a/src/Server/Api/appsettings.Development.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "AppSettings": { - "WebServerAddress": "https://localhost:4031/" - } -} \ No newline at end of file diff --git a/src/Shared/Attributes/AutoInjectAttribute.cs b/src/Shared/Attributes/AutoInjectAttribute.cs deleted file mode 100644 index 3d0d2d2..0000000 --- a/src/Shared/Attributes/AutoInjectAttribute.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Microsoft.Extensions.DependencyInjection; - -/// -/// This attribute can be applied on either fields or properties to generate the rest of the required codes using Bit.SourceGenerators. -/// The Bit.SourceGenerators for this attribute generates an appropriate property with the [Inject] attribute for Blazor components and constructor injection for other classes. -/// -[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, Inherited = false, AllowMultiple = false)] -public sealed class AutoInjectAttribute : Attribute -{ -} diff --git a/src/Shared/Dtos/Identity/RoleDto.cs b/src/Shared/Dtos/Identity/RoleDto.cs deleted file mode 100644 index 58dedf9..0000000 --- a/src/Shared/Dtos/Identity/RoleDto.cs +++ /dev/null @@ -1,10 +0,0 @@ - -namespace Bit.TemplatePlayground.Shared.Dtos.Identity; - -[DtoResourceType(typeof(AppStrings))] -public class RoleDto -{ - public int Id { get; set; } - - public string? Name { get; set; } -} diff --git a/src/Shared/Extensions/IServiceCollectionExtensions.cs b/src/Shared/Extensions/IServiceCollectionExtensions.cs deleted file mode 100644 index 45d880a..0000000 --- a/src/Shared/Extensions/IServiceCollectionExtensions.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Bit.TemplatePlayground.Shared.Services; - -namespace Microsoft.Extensions.DependencyInjection; - -public static class IServiceCollectionExtensions -{ - public static IServiceCollection AddSharedServices(this IServiceCollection services) - { - // Services being registered here can get injected everywhere (Api, Web, Android, iOS, Windows, macOS and Linux) - - services.AddTransient(); - - services.AddAuthorizationCore(); - - services.AddLocalization(); - - return services; - } -} diff --git a/src/Shared/Infra/BlazorMode.cs b/src/Shared/Infra/BlazorMode.cs deleted file mode 100644 index ba49de7..0000000 --- a/src/Shared/Infra/BlazorMode.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Bit.TemplatePlayground.Shared.Infra; - -public enum BlazorMode -{ - BlazorServer = 0, - BlazorWebAssembly = 1, - BlazorHybrid = 2, -#if BlazorElectron - BlazorElectron = 0, -#else - BlazorElectron = 3 -#endif -} diff --git a/src/Shared/Infra/BlazorModeDetector.cs b/src/Shared/Infra/BlazorModeDetector.cs deleted file mode 100644 index 50804f0..0000000 --- a/src/Shared/Infra/BlazorModeDetector.cs +++ /dev/null @@ -1,45 +0,0 @@ -namespace Bit.TemplatePlayground.Shared.Infra; - -/// -/// https://bitplatform.dev/templates/hosting-models -/// -public class BlazorModeDetector -{ - public static BlazorModeDetector Current { get; set; } = new BlazorModeDetector(); - - public virtual bool IsBlazorServer() - { - return Mode == BlazorMode.BlazorServer; - } - - public virtual bool IsBlazorWebAssembly() - { - return Mode == BlazorMode.BlazorWebAssembly; - } - - public virtual bool IsBlazorHybrid() - { - return Mode == BlazorMode.BlazorHybrid; - } - - public virtual bool IsBlazorElectron() - { - return Mode == BlazorMode.BlazorElectron; - } - - public virtual BlazorMode Mode - { - get - { -#if BlazorElectron - return BlazorMode.BlazorElectron; -#elif BlazorWebAssembly - return BlazorMode.BlazorWebAssembly; -#elif BlazorHybrid - return BlazorMode.BlazorHybrid; -#else - return BlazorMode.BlazorServer; -#endif - } - } -} diff --git a/src/Shared/Infra/BuildConfigurationMode.cs b/src/Shared/Infra/BuildConfigurationMode.cs deleted file mode 100644 index c25f522..0000000 --- a/src/Shared/Infra/BuildConfigurationMode.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Bit.TemplatePlayground.Shared.Infra; - -public enum BuildConfigurationMode -{ - Debug, - Release -} diff --git a/src/Shared/Infra/BuildConfigurationModeDetector.cs b/src/Shared/Infra/BuildConfigurationModeDetector.cs deleted file mode 100644 index 5629024..0000000 --- a/src/Shared/Infra/BuildConfigurationModeDetector.cs +++ /dev/null @@ -1,31 +0,0 @@ -namespace Bit.TemplatePlayground.Shared.Infra; - -public class BuildConfigurationModeDetector -{ - public static BuildConfigurationModeDetector Current { get; set; } = new BuildConfigurationModeDetector(); - - public virtual bool IsDebug() - { - return Mode == BuildConfigurationMode.Debug; - } - - - public virtual bool Release() - { - return Mode == BuildConfigurationMode.Release; - } - - - public virtual BuildConfigurationMode Mode - { - get - { -#if DEBUG - return BuildConfigurationMode.Debug; -#else - return BuildConfigurationMode.Release; -#endif - - } - } -} diff --git a/src/Shared/Infra/WebAppDeploymentType.cs b/src/Shared/Infra/WebAppDeploymentType.cs deleted file mode 100644 index 30b521f..0000000 --- a/src/Shared/Infra/WebAppDeploymentType.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Bit.TemplatePlayground.Shared.Infra; - -public enum WebAppDeploymentType -{ - Spa, - Pwa, - SpaPrerendered, - PwaPrerendered, - PrerenderedOnly, -} diff --git a/src/Shared/Infra/WebAppDeploymentTypeDetector.cs b/src/Shared/Infra/WebAppDeploymentTypeDetector.cs deleted file mode 100644 index 27b2e96..0000000 --- a/src/Shared/Infra/WebAppDeploymentTypeDetector.cs +++ /dev/null @@ -1,52 +0,0 @@ -namespace Bit.TemplatePlayground.Shared.Infra; - -/// -/// https://bitplatform.dev/templates/hosting-models -/// -public class WebAppDeploymentTypeDetector -{ - public static WebAppDeploymentTypeDetector Current { get; set; } = new WebAppDeploymentTypeDetector(); - - public virtual bool IsPrerenderedOnly() - { - return Mode == WebAppDeploymentType.PrerenderedOnly; - } - - public virtual bool IsSpa() - { - return Mode == WebAppDeploymentType.Spa; - } - - public virtual bool IsPwa() - { - return Mode == WebAppDeploymentType.Pwa; - } - - public virtual bool IsSpaPrerendered() - { - return Mode == WebAppDeploymentType.SpaPrerendered; - } - - public virtual bool IsPwaPrerendered() - { - return Mode == WebAppDeploymentType.PwaPrerendered; - } - - public virtual WebAppDeploymentType Mode - { - get - { -#if PrerenderedOnly - return WebAppDeploymentType.PrerenderedOnly; -#elif Spa - return WebAppDeploymentType.Spa; -#elif Pwa - return WebAppDeploymentType.Pwa; -#elif SpaPrerendered - return WebAppDeploymentType.SpaPrerendered; -#elif PwaPrerendered - return WebAppDeploymentType.PwaPrerendered; -#endif - } - } -}