From 7841d1d1a810b5b0559c2a894895e61ebfa7055c Mon Sep 17 00:00:00 2001 From: Neil Brommer Date: Sun, 5 Dec 2021 15:50:48 -0800 Subject: [PATCH] Add creating bookmark groups --- Start/Client/Components/Bookmark.razor | 20 ++++ .../Client/Components/BookmarkContainer.razor | 69 +++++++++++-- Start/Client/Components/BookmarkGroup.razor | 61 ++++++++---- Start/Client/Components/CreateContainer.razor | 1 + Start/Client/Components/CreateGroup.razor | 82 ++++++++++++++++ Start/Client/Components/Dialog.razor | 6 +- Start/Client/Pages/Index.razor | 38 ++------ Start/Client/Program.cs | 5 + Start/Client/Start.Client.csproj | 2 + .../CreateContainer/CreateContainerEffects.cs | 14 ++- .../CreateContainerReducers.cs | 3 +- .../CreateGroup/CreateGroupActions.cs | 35 +++++++ .../CreateGroup/CreateGroupEffects.cs | 44 +++++++++ .../CreateGroup/CreateGroupFeature.cs | 11 +++ .../CreateGroup/CreateGroupReducers.cs | 54 +++++++++++ .../Features/CreateGroup/CreateGroupState.cs | 25 +++++ .../CurrentContainerActions.cs | 16 ++++ .../CurrentContainerEffects.cs | 7 ++ .../CurrentContainerReducers.cs | 43 ++++++++- .../Store/State/StoreInitializedEffects.cs | 41 ++++++++ Start/Client/wwwroot/css/app.css | 96 +++++++++++++++---- .../Controllers/BookmarkGroupsController.cs | 67 +++++++++++++ .../Server/Controllers/BookmarksController.cs | 5 +- Start/Server/Extensions/BookmarkMaps.cs | 6 +- Start/Shared/Api/IBookmarkGroupsApi.cs | 17 ++++ Start/Shared/Api/IBookmarksApi.cs | 8 +- Start/Shared/BookmarkContainerDto.cs | 3 +- Start/Shared/BookmarkGroupDto.cs | 27 ++++-- 28 files changed, 692 insertions(+), 114 deletions(-) create mode 100644 Start/Client/Components/Bookmark.razor create mode 100644 Start/Client/Components/CreateGroup.razor create mode 100644 Start/Client/Store/Features/CreateGroup/CreateGroupActions.cs create mode 100644 Start/Client/Store/Features/CreateGroup/CreateGroupEffects.cs create mode 100644 Start/Client/Store/Features/CreateGroup/CreateGroupFeature.cs create mode 100644 Start/Client/Store/Features/CreateGroup/CreateGroupReducers.cs create mode 100644 Start/Client/Store/Features/CreateGroup/CreateGroupState.cs create mode 100644 Start/Client/Store/State/StoreInitializedEffects.cs create mode 100644 Start/Server/Controllers/BookmarkGroupsController.cs create mode 100644 Start/Shared/Api/IBookmarkGroupsApi.cs diff --git a/Start/Client/Components/Bookmark.razor b/Start/Client/Components/Bookmark.razor new file mode 100644 index 0000000..193daea --- /dev/null +++ b/Start/Client/Components/Bookmark.razor @@ -0,0 +1,20 @@ +
  • + @if (!String.IsNullOrEmpty(this.Model.Notes)) + { +
    + + @this.Model.Title + + @this.Model.Notes +
    + } + else + { + @this.Model.Title + } +
    • + +@code { + [Parameter] + public BookmarkDto Model { get; set; } = null!; +} diff --git a/Start/Client/Components/BookmarkContainer.razor b/Start/Client/Components/BookmarkContainer.razor index 35aafe4..1c8834f 100644 --- a/Start/Client/Components/BookmarkContainer.razor +++ b/Start/Client/Components/BookmarkContainer.razor @@ -1,5 +1,21 @@ -
    - @if (this.Container == null) +@using Start.Client.Store.State +@using Start.Client.Store.Features.CreateGroup +@using Fluxor + +@inherits Fluxor.Blazor.Web.Components.FluxorComponent + +@inject IDispatcher dispatch +@inject IState state + +
    + @if (this.state.Value.CurrentContainerState.ErrorMessage != null) + { + + @this.state.Value.CurrentContainerState.ErrorMessage + + } + + @if (this.state.Value.CurrentContainerState.IsLoadingCurrentContainer) {
    @@ -7,27 +23,60 @@

    Loading Bookmarks

    -

    Loading Bookmarks

    } - else if (!this.Container.BookmarkGroups?.Any() ?? true) + else if (this.state.Value.CurrentContainerState.Container == null) + { +
    +
    + +
    +

    Failed To Load Container

    +
    + } + else if (this.state.Value.CurrentContainerState.Container.BookmarkGroups == null + || (!(this.state.Value.CurrentContainerState.Container.BookmarkGroups?.Any()) ?? true)) {

    No Bookmark Groups

    +
    + +
    } else { - foreach (BookmarkGroupDto group in this.Container.BookmarkGroups!) - { - - } +
    + @* The compiler doesn't pick up that null has already been checked for, + so the ! is needed *@ + @foreach (BookmarkGroupDto group in this.state.Value.CurrentContainerState.Container.BookmarkGroups!) + { + + } + +
    + +
    +
    }
    @code { - [Parameter] - public BookmarkContainerDto? Container { get; set; } + public void ShowCreateGroupForm() + { + if (this.state.Value.CurrentContainerState.Container == null) + return; + + dispatch.Dispatch(new ShowCreateGroupFormAction( + this.state.Value.CurrentContainerState.Container.BookmarkContainerId, + this.state.Value.CurrentContainerState.Container.Title)); + } } diff --git a/Start/Client/Components/BookmarkGroup.razor b/Start/Client/Components/BookmarkGroup.razor index 64a7381..a644691 100644 --- a/Start/Client/Components/BookmarkGroup.razor +++ b/Start/Client/Components/BookmarkGroup.razor @@ -1,24 +1,47 @@ -

    - @this.Group.Title -

    -
      - @if (this.Group.Bookmarks == null || !this.Group.Bookmarks.Any()) - { -
    • No Bookmarks
      • - } - else - { - foreach (BookmarkDto bookmark in this.Group.Bookmarks!) - { -
    • - @bookmark.Title -
      • - } - } -
    +
    +
    +

    @this.Group.Title

    + +
    +
    +
      + @if (this.Group.Bookmarks == null || !this.Group.Bookmarks.Any()) + { +
    • +
      +
      + +
      +

      No Bookmarks

      +
      + +
      +
      +
      • + } + else + { + foreach (BookmarkDto bookmark in this.Group.Bookmarks) + { + + } + } +
    +
    +
    @code { [Parameter] - public BookmarkGroupDto Group { get; set; } = null!; // [Required] is a .net 6 feature + public BookmarkGroupDto Group { get; set; } = null!; + + protected void OnCreateBookmarkClicked() + { + // Placeholder + } } diff --git a/Start/Client/Components/CreateContainer.razor b/Start/Client/Components/CreateContainer.razor index bf013f6..d9ac20b 100644 --- a/Start/Client/Components/CreateContainer.razor +++ b/Start/Client/Components/CreateContainer.razor @@ -14,6 +14,7 @@ @this.state.Value.CreateContainerErrorMessage } +
    diff --git a/Start/Client/Components/CreateGroup.razor b/Start/Client/Components/CreateGroup.razor new file mode 100644 index 0000000..85be69b --- /dev/null +++ b/Start/Client/Components/CreateGroup.razor @@ -0,0 +1,82 @@ +@using Start.Client.Store.Features.CreateGroup +@using Fluxor + +@inherits Fluxor.Blazor.Web.Components.FluxorComponent + +@inject IActionSubscriber actionSubscriber +@inject IDispatcher dispatch +@inject IState state + + + + + + @if (this.state.Value.CreateGroupErrorMessage != null) + { + + @this.state.Value.CreateGroupErrorMessage + + } + + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    + @if (this.state.Value.IsLoadingCreateGroup) + { + + } + else + { + + } +
    +
    +
    +
    +     +     + +@code { + private BookmarkGroupDto Model { get; set; } = new("", "", 0); + + protected override void OnInitialized() + { + base.OnInitialized(); + + this.Model = new BookmarkGroupDto("", "", state.Value.ContainerId); + + // Keep the model's container ID up to date + actionSubscriber.SubscribeToAction(this, + (a) => this.Model.BookmarkContainerId = a.ContainerId); + } + + protected void OnSubmit() + { + dispatch.Dispatch(new SubmitCreateGroupAction(this.Model)); + } + + protected void OnDialogClose() + { + dispatch.Dispatch(new HideCreateGroupFormAction()); + } +} diff --git a/Start/Client/Components/Dialog.razor b/Start/Client/Components/Dialog.razor index 9ddd797..6b35968 100644 --- a/Start/Client/Components/Dialog.razor +++ b/Start/Client/Components/Dialog.razor @@ -1,4 +1,8 @@ -
    +@using Microsoft.Extensions.Logging + +@inject ILogger logger + +
    diff --git a/Start/Client/Pages/Index.razor b/Start/Client/Pages/Index.razor index a1804ec..d4d1a64 100644 --- a/Start/Client/Pages/Index.razor +++ b/Start/Client/Pages/Index.razor @@ -5,7 +5,6 @@ @using System.Linq @using Start.Client.Components @using Start.Client.Store.State -@using Start.Client.Store.Features.ContainersList @using Start.Client.Store.Features.CurrentContainer @using Start.Client.Store.Features.CreateContainer @using Start.Client.Store.Features.DeleteContainer @@ -52,27 +51,24 @@ else }
  • -
    • - + + + } @code { - protected override async Task OnInitializedAsync() - { - this.dispatch.Dispatch(new LoadContainerListAction()); - this.dispatch.Dispatch(new LoadCurrentContainerAction(await this.GetSelectedContainerId())); - } - protected void OnContainerSelected(int bookmarkContainerId) { dispatch.Dispatch(new LoadCurrentContainerAction(bookmarkContainerId)); @@ -95,26 +91,4 @@ else { dispatch.Dispatch(new ShowCreateContainerFormAction()); } - - // Save the currently selected container in LocalStorage so that the same container remains - // selected between new tabs - - protected async Task GetSelectedContainerId() - { - bool hasValue = await localStorage.ContainKeyAsync("SelectedContainer"); - - if (hasValue) - return await localStorage.GetItemAsync("SelectedContainer"); - - // Default to the first container - int firstContainer = this.state.Value.ContainerListState.Containers - .First().BookmarkContainerId; - await this.SetSelectedContainer(firstContainer); - return firstContainer; - } - - protected async Task SetSelectedContainer(int selectedContainerId) - { - await localStorage.SetItemAsync("SelectedContainer", selectedContainerId); - } } diff --git a/Start/Client/Program.cs b/Start/Client/Program.cs index c80353b..9b2f66d 100644 --- a/Start/Client/Program.cs +++ b/Start/Client/Program.cs @@ -34,6 +34,10 @@ namespace Start.Client { }) .AddHttpMessageHandler(); + builder.Services.AddRefitClient() + .ConfigureHttpClient(c => { c.BaseAddress = new Uri(baseUri, "BookmarkGroups"); }) + .AddHttpMessageHandler(); + builder.Services.AddRefitClient() .ConfigureHttpClient(c => { c.BaseAddress = new Uri(baseUri, "Bookmarks"); }) .AddHttpMessageHandler(); @@ -44,6 +48,7 @@ namespace Start.Client { builder.Services.AddFluxor(opt => { opt.ScanAssemblies(typeof(Program).Assembly); #if DEBUG + Console.WriteLine("Enabling Redux dev tools"); opt.UseReduxDevTools(); #endif }); diff --git a/Start/Client/Start.Client.csproj b/Start/Client/Start.Client.csproj index e8c81b8..ca3aa70 100644 --- a/Start/Client/Start.Client.csproj +++ b/Start/Client/Start.Client.csproj @@ -46,6 +46,7 @@ + @@ -58,5 +59,6 @@ + diff --git a/Start/Client/Store/Features/CreateContainer/CreateContainerEffects.cs b/Start/Client/Store/Features/CreateContainer/CreateContainerEffects.cs index 4e9593f..5fd710b 100644 --- a/Start/Client/Store/Features/CreateContainer/CreateContainerEffects.cs +++ b/Start/Client/Store/Features/CreateContainer/CreateContainerEffects.cs @@ -4,12 +4,11 @@ using Microsoft.AspNetCore.Components.WebAssembly.Authentication; using Refit; using Start.Shared; using Start.Shared.Api; -using Start.Client.Store.Features.CurrentContainer; using Start.Client.Store.Features.ContainersList; namespace Start.Client.Store.Features.CreateContainer { public class CreateContainerEffects { - public IBookmarkContainersApi BookmarkContainersApi { get; set; } + public IBookmarkContainersApi BookmarkContainersApi { get; init; } public CreateContainerEffects(IBookmarkContainersApi bookmarkContainersApi) { this.BookmarkContainersApi = bookmarkContainersApi; @@ -26,15 +25,14 @@ namespace Start.Client.Store.Features.CreateContainer { BookmarkContainerDto? container = apiResponse.Content; - if (container == null) + if (container == null) { dispatch.Dispatch(new ErrorFetchingCreateContainerAction( "Failed to create container")); - else { - dispatch.Dispatch(new AddContainerToListAction(container)); - dispatch.Dispatch(new ReceivedCreateContainerAction()); - dispatch.Dispatch(new LoadCurrentContainerAction( - container.BookmarkContainerId)); + return; } + + dispatch.Dispatch(new AddContainerToListAction(container)); + dispatch.Dispatch(new ReceivedCreateContainerAction()); } catch (AccessTokenNotAvailableException e) { e.Redirect(); } diff --git a/Start/Client/Store/Features/CreateContainer/CreateContainerReducers.cs b/Start/Client/Store/Features/CreateContainer/CreateContainerReducers.cs index 63bc3d5..b6463cf 100644 --- a/Start/Client/Store/Features/CreateContainer/CreateContainerReducers.cs +++ b/Start/Client/Store/Features/CreateContainer/CreateContainerReducers.cs @@ -1,4 +1,5 @@ -using Fluxor; +using System; +using Fluxor; namespace Start.Client.Store.Features.CreateContainer { public static class CreateContainerReducers { diff --git a/Start/Client/Store/Features/CreateGroup/CreateGroupActions.cs b/Start/Client/Store/Features/CreateGroup/CreateGroupActions.cs new file mode 100644 index 0000000..6f72ce6 --- /dev/null +++ b/Start/Client/Store/Features/CreateGroup/CreateGroupActions.cs @@ -0,0 +1,35 @@ +using Start.Shared; + +namespace Start.Client.Store.Features.CreateGroup { + public class ShowCreateGroupFormAction { + public int ContainerId { get; init; } + public string ContainerTitle { get; init; } + + public ShowCreateGroupFormAction(int containerId, string containerTitle) { + this.ContainerId = containerId; + this.ContainerTitle = containerTitle; + } + } + + public class HideCreateGroupFormAction { } + + public class FetchCreateGroupAction { } + + public class RecievedCreateGroupAction { } + + public class ErrorFetchingCreateGroupAction { + public string ErrorMessage { get; init; } + + public ErrorFetchingCreateGroupAction(string errorMessage) { + this.ErrorMessage = errorMessage; + } + } + + public class SubmitCreateGroupAction { + public BookmarkGroupDto NewGroup { get; init; } + + public SubmitCreateGroupAction(BookmarkGroupDto newGroup) { + this.NewGroup = newGroup; + } + } +} diff --git a/Start/Client/Store/Features/CreateGroup/CreateGroupEffects.cs b/Start/Client/Store/Features/CreateGroup/CreateGroupEffects.cs new file mode 100644 index 0000000..ed1ef00 --- /dev/null +++ b/Start/Client/Store/Features/CreateGroup/CreateGroupEffects.cs @@ -0,0 +1,44 @@ +using Start.Shared.Api; +using Fluxor; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components.WebAssembly.Authentication; +using Refit; +using Start.Shared; +using Start.Client.Store.Features.CurrentContainer; +using System; + +namespace Start.Client.Store.Features.CreateGroup { + public class CreateGroupEffects { + public IBookmarkGroupsApi BookmarkGroupsApi { get; init; } + + public CreateGroupEffects(IBookmarkGroupsApi bookmarksApi) { + this.BookmarkGroupsApi = bookmarksApi; + } + + [EffectMethod] + public async Task SubmitCreateBookmarkGroup(SubmitCreateGroupAction action, + IDispatcher dispatch) { + dispatch.Dispatch(new FetchCreateGroupAction()); + + try { + ApiResponse apiResponse = await this.BookmarkGroupsApi + .CreateBookmarkGroup(action.NewGroup.Title, action.NewGroup.Color, + action.NewGroup.BookmarkContainerId); + + Console.WriteLine("Status code: " + apiResponse.StatusCode); + + if (!apiResponse.IsSuccessStatusCode) { + dispatch.Dispatch(new ErrorFetchingCreateGroupAction( + "Error creating bookmark group")); + return; + } + + dispatch.Dispatch(new AddBookmarkGroupAction(action.NewGroup)); + dispatch.Dispatch(new RecievedCreateGroupAction()); + dispatch.Dispatch(new HideCreateGroupFormAction()); + } catch (AccessTokenNotAvailableException e) { + e.Redirect(); + } + } + } +} diff --git a/Start/Client/Store/Features/CreateGroup/CreateGroupFeature.cs b/Start/Client/Store/Features/CreateGroup/CreateGroupFeature.cs new file mode 100644 index 0000000..9421df3 --- /dev/null +++ b/Start/Client/Store/Features/CreateGroup/CreateGroupFeature.cs @@ -0,0 +1,11 @@ +using Fluxor; + +namespace Start.Client.Store.Features.CreateGroup { + public class CreateGroupFeature : Feature { + public override string GetName() => "Create Group"; + + protected override CreateGroupState GetInitialState() { + return new CreateGroupState(); + } + } +} diff --git a/Start/Client/Store/Features/CreateGroup/CreateGroupReducers.cs b/Start/Client/Store/Features/CreateGroup/CreateGroupReducers.cs new file mode 100644 index 0000000..177562b --- /dev/null +++ b/Start/Client/Store/Features/CreateGroup/CreateGroupReducers.cs @@ -0,0 +1,54 @@ +using System; +using Fluxor; + +namespace Start.Client.Store.Features.CreateGroup { + public static class CreateGroupReducers { + [ReducerMethod] + public static CreateGroupState ShowCreateGroupForm(CreateGroupState state, + ShowCreateGroupFormAction action) { + return state with { + ShowCreateGroupForm = true, + ContainerId = action.ContainerId, + ContainerTitle = action.ContainerTitle, + IsLoadingCreateGroup = false, + CreateGroupErrorMessage = null + }; + } + + [ReducerMethod(typeof(HideCreateGroupFormAction))] + public static CreateGroupState HideCreateContainerForm(CreateGroupState state) { + return state with { + ShowCreateGroupForm = false, + IsLoadingCreateGroup = false, + CreateGroupErrorMessage = null, + ContainerId = 0, + ContainerTitle = "" + }; + } + + [ReducerMethod(typeof(FetchCreateGroupAction))] + public static CreateGroupState FetchCreateGroup(CreateGroupState state) { + return state with { + IsLoadingCreateGroup = true, + CreateGroupErrorMessage = null + }; + } + + [ReducerMethod(typeof(RecievedCreateGroupAction))] + public static CreateGroupState RecievedCreateGroup(CreateGroupState state) { + return state with { + IsLoadingCreateGroup = false, + CreateGroupErrorMessage = null + }; + } + + [ReducerMethod] + public static CreateGroupState ErrorFetchingCreateGroup(CreateGroupState state, + ErrorFetchingCreateGroupAction action) { + return state with { + CreateGroupErrorMessage = action.ErrorMessage, + IsLoadingCreateGroup = false + }; + } + } +} diff --git a/Start/Client/Store/Features/CreateGroup/CreateGroupState.cs b/Start/Client/Store/Features/CreateGroup/CreateGroupState.cs new file mode 100644 index 0000000..ba41c01 --- /dev/null +++ b/Start/Client/Store/Features/CreateGroup/CreateGroupState.cs @@ -0,0 +1,25 @@ +using Start.Client.Store.State; + +namespace Start.Client.Store.Features.CreateGroup { + public record CreateGroupState : RootState { + public bool ShowCreateGroupForm { get; init; } + public int ContainerId { get; init; } + public string ContainerTitle { get; init; } + public bool IsLoadingCreateGroup { get; init; } + public string? CreateGroupErrorMessage { get; init; } + + public CreateGroupState() { + this.ContainerTitle = ""; + } + + public CreateGroupState(ContainerListState containerList, + CurrentContainerState currentContainer, bool showCreateGroupForm, string containerTitle, + bool isLoadingCreateGroup, string? createGroupErrorMessage) + : base(containerList, currentContainer) { + this.ShowCreateGroupForm = showCreateGroupForm; + this.ContainerTitle = containerTitle; + this.IsLoadingCreateGroup = isLoadingCreateGroup; + this.CreateGroupErrorMessage = createGroupErrorMessage; + } + } +} diff --git a/Start/Client/Store/Features/CurrentContainer/CurrentContainerActions.cs b/Start/Client/Store/Features/CurrentContainer/CurrentContainerActions.cs index 89069f0..a8a5724 100644 --- a/Start/Client/Store/Features/CurrentContainer/CurrentContainerActions.cs +++ b/Start/Client/Store/Features/CurrentContainer/CurrentContainerActions.cs @@ -28,4 +28,20 @@ namespace Start.Client.Store.Features.CurrentContainer { } public class FixCurrentContainerAction { } + + public class AddBookmarkGroupAction { + public BookmarkGroupDto BookmarkGroup { get; init; } + + public AddBookmarkGroupAction(BookmarkGroupDto bookmarkGroup) { + this.BookmarkGroup = bookmarkGroup; + } + } + + public class RemoveBookmarkGroupAction { + public int BookmarkGroupId { get; init; } + + public RemoveBookmarkGroupAction(int bookmarkGroupId) { + this.BookmarkGroupId = bookmarkGroupId; + } + } } diff --git a/Start/Client/Store/Features/CurrentContainer/CurrentContainerEffects.cs b/Start/Client/Store/Features/CurrentContainer/CurrentContainerEffects.cs index fa7afba..342bcbc 100644 --- a/Start/Client/Store/Features/CurrentContainer/CurrentContainerEffects.cs +++ b/Start/Client/Store/Features/CurrentContainer/CurrentContainerEffects.cs @@ -9,6 +9,7 @@ using Start.Client.Store.State; using Start.Client.Store.Features.CreateContainer; using Start.Shared; using Start.Shared.Api; +using System; namespace Start.Client.Store.Features.CurrentContainer { public class CurrentContainerEffects { @@ -35,11 +36,17 @@ namespace Start.Client.Store.Features.CurrentContainer { BookmarkContainerDto? container = response.Content; if (container == null) { + Console.WriteLine("Error fetching container " + action.BookmarkContainerId); + Console.WriteLine(response); + dispatch.Dispatch(new ErrorFetchingCurrentContainerAction( "Failed to get current bookmark container")); return; } + Console.WriteLine("Recieved container " + action.BookmarkContainerId); + Console.WriteLine(response); + dispatch.Dispatch(new ReceivedCurrentContainerAction(container)); await this.LocalStorage diff --git a/Start/Client/Store/Features/CurrentContainer/CurrentContainerReducers.cs b/Start/Client/Store/Features/CurrentContainer/CurrentContainerReducers.cs index ac15570..f4341c5 100644 --- a/Start/Client/Store/Features/CurrentContainer/CurrentContainerReducers.cs +++ b/Start/Client/Store/Features/CurrentContainer/CurrentContainerReducers.cs @@ -1,5 +1,8 @@ -using Fluxor; +using System.Collections.Generic; +using System.Linq; +using Fluxor; using Start.Client.Store.State; +using Start.Shared; namespace Start.Client.Store.Features.CurrentContainer { public static class CurrentContainerReducers { @@ -37,5 +40,43 @@ namespace Start.Client.Store.Features.CurrentContainer { } }; } + + [ReducerMethod] + public static RootState AddBookmarkGroup(RootState state, AddBookmarkGroupAction action) { + BookmarkContainerDto? container = state.CurrentContainerState.Container; + + if (container == null) + return state; + + if (action.BookmarkGroup.BookmarkContainerId != container.BookmarkContainerId) + return state; + + return state with { + CurrentContainerState = state.CurrentContainerState with { + Container = new BookmarkContainerDto(container.BookmarkContainerId, + container.Title, container.BookmarkGroups? + .Concat(new List { action.BookmarkGroup }) + .ToList()) + } + }; + } + + [ReducerMethod] + public static RootState RemoveBookmarkGroup(RootState state, + RemoveBookmarkGroupAction action) { + BookmarkContainerDto? container = state.CurrentContainerState.Container; + + if (container == null) + return state; + + return state with { + CurrentContainerState = state.CurrentContainerState with { + Container = new BookmarkContainerDto(container.BookmarkContainerId, + container.Title, container.BookmarkGroups? + .Where(g => g.BookmarkGroupId != action.BookmarkGroupId) + .ToList()) + } + }; + } } } diff --git a/Start/Client/Store/State/StoreInitializedEffects.cs b/Start/Client/Store/State/StoreInitializedEffects.cs new file mode 100644 index 0000000..f3a5755 --- /dev/null +++ b/Start/Client/Store/State/StoreInitializedEffects.cs @@ -0,0 +1,41 @@ +using System.Threading.Tasks; +using Fluxor; +using Blazored.LocalStorage; +using Start.Client.Store.Features.ContainersList; +using Start.Client.Store.Features.CurrentContainer; +using System.Linq; + +namespace Start.Client.Store.State { + public class StoreInitializedEffects { + public IState State { get; init; } + public ILocalStorageService LocalStorage { get; init; } + + public StoreInitializedEffects(IState state, ILocalStorageService localStorage) { + this.State = state; + this.LocalStorage = localStorage; + } + + [EffectMethod(typeof(StoreInitializedAction))] + public async Task InitialLoad(IDispatcher dispatch) { + dispatch.Dispatch(new LoadContainerListAction()); + dispatch.Dispatch(new LoadCurrentContainerAction(await GetSelectedContainerId())); + } + + private async Task GetSelectedContainerId() { + bool hasValue = await this.LocalStorage.ContainKeyAsync("SelectedContainer"); + + if (hasValue) + return await this.LocalStorage.GetItemAsync("SelectedContainer"); + + // Default to the first container + int firstContainer = this.State.Value.ContainerListState.Containers + .First().BookmarkContainerId; + await this.SetSelectedContainer(firstContainer); + return firstContainer; + } + + protected async Task SetSelectedContainer(int selectedContainerId) { + await this.LocalStorage.SetItemAsync("SelectedContainer", selectedContainerId); + } + } +} diff --git a/Start/Client/wwwroot/css/app.css b/Start/Client/wwwroot/css/app.css index c6743cc..ef425d1 100644 --- a/Start/Client/wwwroot/css/app.css +++ b/Start/Client/wwwroot/css/app.css @@ -1,23 +1,4 @@ -@import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); - -html, body { - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; -} - -a, .btn-link { - color: #0366d6; -} - -.btn-primary { - color: #fff; - background-color: #1b6ec2; - border-color: #1861ac; -} - -.content { - padding-top: 1.1rem; -} - +/* Validation */ .valid.modified:not([type=checkbox]) { outline: 1px solid #26b050; } @@ -30,6 +11,8 @@ a, .btn-link { color: red; } + +/* Blazor */ #blazor-error-ui { background: lightyellow; bottom: 0; @@ -49,10 +32,13 @@ a, .btn-link { top: 0.5rem; } + +/* Spectre's default is no padding */ .container { padding: 0.4rem; } +/* The splash screen */ .appLoadingContainer { height: 100vh; display: flex; @@ -60,3 +46,73 @@ a, .btn-link { justify-content: center; align-items: center; } + +#bookmarkGroups { + margin-top: 1em; + margin-left: auto; + margin-right: auto; + max-width: 1280px; + display: grid; + grid-column-gap: 1.25rem; + grid-row-gap: 1.25rem; +} + +@media screen and (max-width: 960px) { + #bookmarkGroups { + grid-template-columns: repeat(1, 1fr); + padding: 1em; + } +} + +@media screen and (min-width: 960px) { + #bookmarkGroups { + grid-template-columns: repeat(2, 1fr); + width: 70%; + } +} + +@media screen and (min-width: 1280px) { + #bookmarkGroups { + grid-template-columns: repeat(3, 1fr); + width: 70%; + } +} + +.bookmarkGroup { + width: 100%; +} + +.bookmarkGroup .card-header { + padding-top: 0; +} + +.bookmarkGroup .card-title { + margin-top: 0.5em; +} + +.bookmarkGroup .card-body { + padding: 0; +} + +.bookmarkGroup .card-body:last-child { + padding: 0; +} + +ul.bookmarks { + list-style: none; + margin: 0; +} + +li.noBookmarksItem { + margin-top: 0; +} + +.addBookmarkGroupButton button { + width: 100%; + margin-top: 0.5em; +} + +button.addBookmarkButton { + float: right; + margin-top: 0.5em; +} diff --git a/Start/Server/Controllers/BookmarkGroupsController.cs b/Start/Server/Controllers/BookmarkGroupsController.cs new file mode 100644 index 0000000..db733d7 --- /dev/null +++ b/Start/Server/Controllers/BookmarkGroupsController.cs @@ -0,0 +1,67 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Start.Server.Data.Services.Interfaces; +using Start.Server.Models; +using Start.Server.Extensions; +using Start.Shared; + +namespace Start.Server.Controllers { + [Authorize] + [ApiController] + [Route("[controller]")] + public class BookmarkGroupsController : ControllerBase { + private readonly IBookmarkGroupService bookmarkGroupService; + + public BookmarkGroupsController(IBookmarkGroupService bookmarkGroupService) { + this.bookmarkGroupService = bookmarkGroupService; + } + + [HttpGet] + [Route("{bookmarkGroupId}")] + [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(BookmarkGroupDto))] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task GetBookmarkGroup(int bookmarkGroupId) { + BookmarkGroup? group = await this.bookmarkGroupService + .GetBookmarkGroup(this.GetAuthorizedUserId(), bookmarkGroupId); + + if (group == null) + return NotFound(); + + return Ok(group.MapToDto()); + } + + [HttpPost] + [Route("Create")] + [ProducesResponseType(StatusCodes.Status201Created, Type = typeof(BookmarkGroupDto))] + [ProducesResponseType(StatusCodes.Status400BadRequest)] + public async Task CreateBookmarkGroup(string title, string color, + int bookmarkContainerId) { + BookmarkGroup? newGroup = await this.bookmarkGroupService + .CreateBookmarkGroup(this.GetAuthorizedUserId(), title, color, bookmarkContainerId); + + if (newGroup == null) + return BadRequest(); + + return Created( + Url.Action(nameof(GetBookmarkGroup), + new { bookmarkGroupId = newGroup.BookmarkGroupId }), + newGroup.MapToDto()); + } + + [HttpDelete] + [Route("Delete/{bookmarkGroupId}")] + [ProducesResponseType(StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + public async Task DeleteBookmark(int bookmarkGroupId) { + bool res = await this.bookmarkGroupService + .DeleteBookmarkGroup(this.GetAuthorizedUserId(), bookmarkGroupId); + + if (!res) + return NotFound(); + + return Ok(); + } + } +} diff --git a/Start/Server/Controllers/BookmarksController.cs b/Start/Server/Controllers/BookmarksController.cs index a0ab300..e4c84a1 100644 --- a/Start/Server/Controllers/BookmarksController.cs +++ b/Start/Server/Controllers/BookmarksController.cs @@ -11,12 +11,9 @@ namespace Start.Server.Controllers { [ApiController] [Route("[controller]")] public class BookmarksController : ControllerBase { - private readonly IBookmarkGroupService bookmarkGroupService; private readonly IBookmarkService bookmarkService; - public BookmarksController(IBookmarkGroupService bookmarkGroupService, - IBookmarkService bookmarkService) { - this.bookmarkGroupService = bookmarkGroupService; + public BookmarksController(IBookmarkService bookmarkService) { this.bookmarkService = bookmarkService; } diff --git a/Start/Server/Extensions/BookmarkMaps.cs b/Start/Server/Extensions/BookmarkMaps.cs index 0f88ad1..89860ac 100644 --- a/Start/Server/Extensions/BookmarkMaps.cs +++ b/Start/Server/Extensions/BookmarkMaps.cs @@ -1,5 +1,4 @@ -using System; -using System.Linq; +using System.Linq; using Start.Server.Models; using Start.Shared; @@ -12,7 +11,8 @@ namespace Start.Server.Extensions { public static BookmarkGroupDto MapToDto(this BookmarkGroup bookmarkGroup) { return new BookmarkGroupDto(bookmarkGroup.BookmarkGroupId, bookmarkGroup.Title, - bookmarkGroup.Color, bookmarkGroup.Bookmarks?.Select(b => b.MapToDto()).ToList()); + bookmarkGroup.Color, bookmarkGroup.BookmarkContainerId, + bookmarkGroup.Bookmarks?.Select(b => b.MapToDto()).ToList()); } public static BookmarkContainerDto MapToDto(this BookmarkContainer bookmarkContainer) { diff --git a/Start/Shared/Api/IBookmarkGroupsApi.cs b/Start/Shared/Api/IBookmarkGroupsApi.cs new file mode 100644 index 0000000..3368dba --- /dev/null +++ b/Start/Shared/Api/IBookmarkGroupsApi.cs @@ -0,0 +1,17 @@ +using System.Net.Http; +using System.Threading.Tasks; +using Refit; + +namespace Start.Shared.Api { + public interface IBookmarkGroupsApi { + [Get("/{bookmarkGroupId}")] + Task> GetBookmarkGroup(int bookmarkGroupId); + + [Post("/Create")] + Task> CreateBookmarkGroup(string title, string color, + int bookmarkContainerId); + + [Delete("/Delete/{bookmarkGroupId}")] + Task DeleteBookmarkGroup(int bookmarkGroupId); + } +} diff --git a/Start/Shared/Api/IBookmarksApi.cs b/Start/Shared/Api/IBookmarksApi.cs index b56aa6a..a9d1387 100644 --- a/Start/Shared/Api/IBookmarksApi.cs +++ b/Start/Shared/Api/IBookmarksApi.cs @@ -1,15 +1,17 @@ using System.Threading.Tasks; using Refit; +using System.Net.Http; namespace Start.Shared.Api { public interface IBookmarksApi { [Get("{bookmarkId}")] - Task GetBookmark(int bookmarkId); + Task> GetBookmark(int bookmarkId); [Post("/Create")] - Task CreateBookmark(string title, string url, string? notes, int bookmarkGroupId); + Task> CreateBookmark(string title, string url, string? notes, + int bookmarkGroupId); [Delete("/Delete/{bookmarkId}")] - Task DeleteBookmark(int bookmarkId); + Task DeleteBookmark(int bookmarkId); } } diff --git a/Start/Shared/BookmarkContainerDto.cs b/Start/Shared/BookmarkContainerDto.cs index b729b95..8e7d414 100644 --- a/Start/Shared/BookmarkContainerDto.cs +++ b/Start/Shared/BookmarkContainerDto.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Text.Json.Serialization; diff --git a/Start/Shared/BookmarkGroupDto.cs b/Start/Shared/BookmarkGroupDto.cs index fcdb39e..3a96699 100644 --- a/Start/Shared/BookmarkGroupDto.cs +++ b/Start/Shared/BookmarkGroupDto.cs @@ -1,29 +1,36 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.Text.Json.Serialization; namespace Start.Shared { public class BookmarkGroupDto { public int BookmarkGroupId { get; set; } + [Required(AllowEmptyStrings = false, ErrorMessage = "Title is required")] [StringLength(300)] public string Title { get; set; } - [StringLength(6)] + [Required(AllowEmptyStrings = false, ErrorMessage = "Color is required")] + [StringLength(7)] public string Color { get; set; } + public int BookmarkContainerId { get; set; } public IList? Bookmarks { get; set; } - public BookmarkGroupDto(string title, string color) { + public BookmarkGroupDto(string title, string color, int bookmarkContainerId) { this.Title = title; this.Color = color; - } - - public BookmarkGroupDto(int bookmarkGroupId, string title, string color) - : this(title, color) { - this.BookmarkGroupId = bookmarkGroupId; + this.BookmarkContainerId = bookmarkContainerId; } public BookmarkGroupDto(int bookmarkGroupId, string title, string color, - IList? bookmarks) : this(bookmarkGroupId, title, color) { + int bookmarkContainerId) + : this(title, color, bookmarkContainerId) { + this.BookmarkGroupId = bookmarkGroupId; + } + + [JsonConstructor] + public BookmarkGroupDto(int bookmarkGroupId, string title, string color, + int bookmarkContainerId, IList? bookmarks) + : this(bookmarkGroupId, title, color, bookmarkContainerId) { this.Bookmarks = bookmarks; } }