Compare commits

..

2 Commits

@ -0,0 +1,29 @@
@page "/formwizard"
@using Connected.Classes.FormWizard;
@using Connected.Components;
@using Connected.Enums;
@using Connected.Models.Modal;
@using Connected.Models;
@using Connected.Services;
@using Connected.Utilities;
<h1 style="text-align:center;">FORM WIZARD EXAMPLE</h1>
<FormWizard Options="@options">
<FormWizardStep>
Step 1
</FormWizardStep>
<FormWizardStep>
Step2
</FormWizardStep>
<FormWizardStep>
Step3
</FormWizardStep>
<FormWizardStep>
Step4
</FormWizardStep>
</FormWizard>
@code {
FormWizardOptions options = new(false, "Naslednji", "Prejšnji", "Končaj", "Prekliči");
}

@ -38,7 +38,7 @@
*
*/
@<div>
<div>Change the number input aand watch the value variable behind the modal change</div>
<div>Change the number input and watch the value variable behind the modal change</div>
<NumberInput @bind-Value=@value></NumberInput>
</div>,

@ -0,0 +1,25 @@
@page "/toggleglyph"
@using Connected.Components;
@using Connected.Enums;
@using Connected.Models.Modal;
@using Connected.Models;
@using Connected.Services;
@using Connected.Utilities;
@inject ModalDialogService modalDialog;
<h1 style="text-align:center;">DATE PICKER EXAMPLE</h1>
<ToggleGlyphButton Glyph="@Icons.Material.Filled.Close" ToggledGlyph="@Icons.Material.Filled.Check" @bind-Toggled=toggle>
TGB
</ToggleGlyphButton>
<h4>Toggled: @toggle</h4>
@code {
bool toggle = false;
}

@ -10,10 +10,12 @@
<h1 style="text-align:center;">Component Example page</h1>
<ul>
<li><Link Class="m-1" Url="modal" Text="Modal dialog" Target="Target.Self" /></li>
<li><Link Class="m-1" Url="button" Text="Button" Target="Target.Self" /></li>
<li><Link Class="m-1" Url="datepicker" Text="Date picker" Target="Target.Self" /></li>
<li><Link Class="m-1" Url="modal" Text="Modal dialog" Target="Target.Self" /></li>
<li><Link Class="m-1" Url="button" Text="Button" Target="Target.Self" /></li>
<li><Link Class="m-1" Url="datepicker" Text="Date picker" Target="Target.Self" /></li>
<li><Link Class="m-1" Url="datagrid" Text="Data Grid" Target="Target.Self" /></li>
<li><Link Class="m-1" Url="toggleglyph" Text="Toggle Glyph Button" Target="Target.Self" /></li>
<li><Link Class="m-1" Url="formwizard" Text="Form wizzard" Target="Target.Self" /></li>
</ul>
} else
{

@ -14,6 +14,7 @@ internal class Program
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
builder.Services.AddModalDialogService();
builder.Services.AddStateManagementService();
await builder.Build().RunAsync();
}

@ -0,0 +1,33 @@
namespace Connected.Classes.FormWizard;
public class FormWizardOptions
{
public bool DisableNavigationOnFinish { get; set; } = false;
public string NextButtonText { get; set; } = "Next";
public string PreviousButtonText { get; set; } = "Previous";
public string FinishButtonText { get; set; } = "Finish";
public string CancelButtonText { get; set; } = "Cancel";
public FormWizardOptions(
bool DisableNavigationOnFinish=false,
string NextButtonText = "Next",
string PreviousButtonText = "Previous",
string FinishButtonText="Finish",
string CancelButtonText="Cancel")
{
this.DisableNavigationOnFinish = DisableNavigationOnFinish;
this.NextButtonText = NextButtonText;
this.PreviousButtonText = PreviousButtonText;
this.FinishButtonText = FinishButtonText;
this.CancelButtonText = CancelButtonText;
}
public FormWizardOptions(FormWizardOptions options)
{
DisableNavigationOnFinish = options.DisableNavigationOnFinish;
NextButtonText = options.NextButtonText;
PreviousButtonText = options.PreviousButtonText;
FinishButtonText = options.FinishButtonText;
CancelButtonText = options.CancelButtonText;
}
}

@ -1,8 +1,9 @@
using Connected.Utilities;
using Connected.Components;
using Connected.Utilities;
using Microsoft.AspNetCore.Components;
namespace Connected.Models;
public class InputBase : ComponentBase
public class InputBase : Base
{
[Parameter]
public string Class { get; set; } = string.Empty;
@ -72,7 +73,7 @@ public class InputBase : ComponentBase
/// Fired when the text value changes.
/// </summary>
[Parameter] public EventCallback<string> TextChanged { get; set; }
public string Text { get; set; }
public string Text { get; set; } = string.Empty;
protected virtual async Task SetTextAsync(string text)
{

@ -10,7 +10,7 @@ public class ModalOptions
public ModalType Type { get; set; } = ModalType.Default;
public ModalOptions()
{
{
}
public ModalOptions(ModalOptions options)
@ -21,7 +21,7 @@ public class ModalOptions
Type = options.Type;
}
public ModalOptions(bool disableEscKey=false, bool disableBackdropClick=false, bool noHeader=false, ModalType type=ModalType.Default)
public ModalOptions(bool disableEscKey = false, bool disableBackdropClick = false, bool noHeader = false, ModalType type = ModalType.Default)
{
DisableEscKey = disableEscKey;
DisableBackdropClick = disableBackdropClick;

@ -0,0 +1,18 @@
using Microsoft.AspNetCore.Components;
namespace Connected.Classes
{
public class State
{
public Type? ComponentType { get; set; }
public string Id { get; set; }
public Dictionary<string, object>? Values { get; set; }
public State()
{
ComponentType = null;
Id=string.Empty;
Values = new();
}
}
}

@ -0,0 +1,5 @@
@inherits ComponentBase
@*Base class for all components
It contains unique ID for the component used in
saving state of the component*@

@ -0,0 +1,20 @@
using Microsoft.AspNetCore.Components;
namespace Connected.Components
{
public partial class Base : ComponentBase
{
/// <summary>
/// Unique ID for the component used in state management
/// Every component should inherit from Base class
/// </summary>
[Parameter, EditorRequired]
public string Id { get; set; } = Guid.NewGuid().ToString();
protected override void OnInitialized()
{
if (string.IsNullOrEmpty(Id))
Id = Guid.NewGuid().ToString();
}
}
}

@ -1,4 +1,6 @@
<button type="button"
@inherits Base
<button type="button"
@onclick="@OnClick"
disabled=@Disabled
style="@StyleList"

@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
namespace Connected.Components;
public partial class Button
public partial class Button : Base
{
#region Parameters

@ -3,7 +3,7 @@
@inherits InputBase;
<label class="checkbox-group"
for="@Id">
for="@base.Id">
<input class="@ClassList"
style="@StyleList"
id="@Id"

@ -13,13 +13,6 @@ public partial class CheckBox : InputBase
[Parameter]
public bool Checked { get; set; } = false;
/// <summary>
/// ID for the CheckBox
/// </summary>
[Parameter, EditorRequired]
public string? Id { get; set; }
/// <summary>
/// Event when the checked is changed
/// </summary>

@ -1,4 +1,6 @@
<h3>Chip</h3>
@inherits Base
<h3>Chip</h3>
@code {

@ -1,7 +1,5 @@
using Microsoft.AspNetCore.Components;
namespace Connected.Components;
namespace Connected.Components;
public partial class Chip
public partial class Chip: Base
{
}

@ -1,5 +1,7 @@
@using System.Globalization;
@inherits Base
@if (loaded)
{
<div id="picker">

@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Components;
namespace Connected.Components;
public partial class DatePicker
public partial class DatePicker: Base
{
private bool loaded = false;

@ -1,5 +1,7 @@
@typeparam T;
@inherits Connected.Models.InputBase;
@using Connected.Models
@typeparam T;
@inherits InputBase;
<div class="@InputFieldClassList">
<select type="textarea" @onfocus="(()=> Open())" @onblur="(()=> Close())">

@ -1,7 +1,6 @@
using Microsoft.AspNetCore.Components;
using System.Collections.ObjectModel;
using Connected.Models;
using System.Collections.Immutable;
namespace Connected.Components;

@ -1,22 +1,29 @@
<CascadingValue Value="this">
<section id="@Id" class="@ClassList" style="@StyleList">
<div class="form-outer ">
@ChildContent
</div>
@inherits Base
<div class="btn-content justify-space-between">
<button type="button" href="#" class="btn btn-secondary" aria-pressed="true" disabled="@WizardFinished" @onclick="CancelClick">Cancel</button>
<div class="btn-group">
<button type="button" @onclick="PreviousSlide" class="btn btn-core mr-2" aria-pressed="true" disabled="@WizardFinished"><i class='bx bx-chevron-left'></i>@PreviousBtnText</button>
<button type="button" @onclick="NextSlide" class="btn btn-core mr-2" aria-pressed="true" disabled="@WizardFinished">@NextBtnText<i class='bx bx-chevron-right'></i></button>
@if (loaded)
{
<CascadingValue Value="this">
<section id="@Id" class="@ClassList" style="@StyleList">
<div class="form-outer ">
@ChildContent
</div>
</div>
<div class="dots d-flex justify-center gap-3">
@foreach (var step in Steps)
{
<div class="dot @step.DotClass"></div>
}
</div>
<div class="btn-content justify-space-between">
<button type="button" href="#" class="btn btn-secondary" aria-pressed="true" disabled="@NavigationDisabled" @onclick="CancelClick">@Options.CancelButtonText</button>
<div class="btn-group">
<button type="button" @onclick="PreviousSlide" class="btn btn-core mr-2" aria-pressed="true" disabled="@NavigationDisabled"><i class='bx bx-chevron-left'></i>@Options.PreviousButtonText</button>
<button type="button" @onclick="NextSlide" class="btn btn-core mr-2" aria-pressed="true" disabled="@NavigationDisabled">@NextBtnText<i class='bx bx-chevron-right'></i></button>
</div>
</div>
<div class="dots d-flex justify-center gap-3">
@foreach (var step in Steps)
{
<div class="dot @step.DotClass"></div>
}
</div>
</section>
</CascadingValue>
</CascadingValue>
} else {
<p>@LoadingText</p>
}

@ -1,10 +1,11 @@
using Connected.Enums;
using Connected.Classes.FormWizard;
using Connected.Enums;
using Connected.Utilities;
using Microsoft.AspNetCore.Components;
using System.Reflection.Metadata;
namespace Connected.Components;
public partial class FormWizard
public partial class FormWizard: Base
{
/// <summary>
@ -21,6 +22,18 @@ public partial class FormWizard
[Parameter]
public List<FormWizardStep> Steps { get; set; } = new();
/// <summary>
/// Steps of type FormWizardStep
/// </summary>
[Parameter]
public string LoadingText { get; set; } = "Loading wizard...";
/// <summary>
/// Steps of type FormWizardStep
/// </summary>
[Parameter]
public bool DisableNavigationOnFinish { get; set; } = false;
/// <summary>
/// EventCallback for 'Finish' button click
/// </summary>
@ -33,16 +46,20 @@ public partial class FormWizard
[Parameter]
public EventCallback OnCancelClick { get; set; }
/// <summary>
/// Text shown inside the button
/// Options: any string variable
/// Default: string.Empty
/// </summary>
[Parameter]
public string Id { get; set; } = Guid.NewGuid().ToString();
public FormWizardOptions Options { get; set; } = new();
private string NextBtnText = "Next";
private string PreviousBtnText = "Previous";
private bool WizardFinished { get; set; } = false;
private bool NavigationDisabled { get; set; } = false;
private FinishedState FinishedState { get; set; } = FinishedState.Unfinished;
private string NextBtnText { get; set; } = "Next";
[Parameter]
public int ActiveIndex
{
@ -101,7 +118,7 @@ public partial class FormWizard
{
FinishedState = FinishedState.Finished;
Steps[ActiveIndex].Completed = true;
WizardFinished = true;
if (DisableNavigationOnFinish) NavigationDisabled = true;
await OnFinishedClick.InvokeAsync();
}
if (FinishedState.Equals(FinishedState.Unfinished))
@ -116,9 +133,9 @@ public partial class FormWizard
Steps[PreviousIndex].IsPrevious = true;
if (ActiveIndex == NextIndex)
NextBtnText = "Finish";
NextBtnText = Options.FinishButtonText;
else
NextBtnText = "Next";
NextBtnText = Options.NextButtonText;
}
}
@ -135,9 +152,9 @@ public partial class FormWizard
Steps[PreviousIndex].IsPrevious = true;
if (ActiveIndex == NextIndex)
NextBtnText = "Finish";
NextBtnText = Options.FinishButtonText;
else
NextBtnText = "Next";
NextBtnText = Options.NextButtonText;
}
if (ActiveIndex == 0)
{
@ -148,6 +165,9 @@ public partial class FormWizard
private async Task CancelClick()
{
ResetAllChildren(true);
ActiveIndex = 0;
Steps[0].Active = true;
await OnCancelClick.InvokeAsync();
}
@ -184,13 +204,14 @@ public partial class FormWizard
Steps[ChildIndex].IsPrevious = false;
}
private void ResetAllChildren()
private void ResetAllChildren(bool reset_finished = false)
{
foreach (var step in Steps)
{
step.Active = false;
step.IsNext = false;
step.IsPrevious = false;
if (reset_finished) step.Completed = false;
}
}
@ -216,11 +237,23 @@ public partial class FormWizard
await base.OnParametersSetAsync();
}*/
private bool loaded = false;
protected override async Task OnInitializedAsync()
{
loaded = true;
await Task.Run(StateHasChanged);
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
{
InitializeSteps();
if (ActiveIndex == NextIndex)
NextBtnText = Options.FinishButtonText;
else
NextBtnText = Options.NextButtonText;
}
await base.OnAfterRenderAsync(firstRender);
}

@ -1,3 +1,5 @@
<div class="@ClassList" style="@StyleList">
@inherits Base
<div class="@ClassList" style="@StyleList">
@ChildContent
</div>

@ -2,19 +2,13 @@
using Microsoft.AspNetCore.Components;
namespace Connected.Components;
public partial class FormWizardStep
public partial class FormWizardStep: Base
{
#region Parameters
[CascadingParameter]
public FormWizard Parent { get; set; }
/// <summary>
/// Unique name of the step (used for properly identifying steps)
/// </summary>
[Parameter]
public string? Id { get; set; } = Guid.NewGuid().ToString();
/// <summary>
/// Text shown inside the button
/// Options: any string variable
@ -57,7 +51,6 @@ public partial class FormWizardStep
#endregion
#region Styling
public string StyleList
@ -71,7 +64,6 @@ public partial class FormWizardStep
}
}
/// <summary>
/// Generated class list for button based on user parameters
/// </summary>

@ -1,3 +1,5 @@
<svg viewBox="0 0 24 24" class="@GlyphClassList" @onclick="@OnClick">
@inherits Base
<svg viewBox="0 0 24 24" class="@GlyphClassList" @onclick="@OnClick">
@((MarkupString)SVG)
</svg>

@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Components.Web;
namespace Connected.Components;
public partial class Glyph
public partial class Glyph: Base
{
/// <summary>
/// SVG markup string for glyph

@ -1,6 +1,8 @@
@attribute [CascadingTypeParameter(nameof(DataType))]
@typeparam DataType
@inherits Base
<CascadingValue Value="this">
<div class="@GridClassList.ToString()">
@foreach (var Item in ItemsToShow)

@ -1,11 +1,10 @@
using Connected.Classes.Grid;
using Connected.Utilities;
using Microsoft.AspNetCore.Components;
using Microsoft.Extensions.Options;
using System.Collections.ObjectModel;
namespace Connected.Components;
public partial class Grid<DataType> : ComponentBase
public partial class Grid<DataType> : Base
{
[Parameter]

@ -1,5 +1,7 @@
@typeparam DataType
@inherits Base
<CascadingValue Value="this">
<div class="@GridRowClass.ToString()" id="@Guid.NewGuid()">
<div class="data-grid-select">

@ -2,7 +2,7 @@
using Microsoft.AspNetCore.Components;
namespace Connected.Components;
public partial class GridRow<DataType> : ComponentBase
public partial class GridRow<DataType> : Base
{
[CascadingParameter]

@ -1,4 +1,6 @@
<a class="@LinkClassList"
@inherits Base
<a class="@LinkClassList"
style="@LinkStyleList"
href="@Url"
target="@_target">

@ -1,10 +1,9 @@
using Connected.Enums;
using Connected.Utilities;
using Microsoft.AspNetCore.Components;
using static Connected.Colors;
namespace Connected.Components;
public partial class Link
public partial class Link: Base
{
/// <summary>
/// URL of the link

@ -1,4 +1,7 @@
@using Connected.Models.Modal;
@inherits Base
@if (IsVisible)
{
<div class="@ClassList" @onclick="@CloseIfEnabled" @onkeydown="@(e => CheckEscape(e))" tabindex="-1" @ref="@root">

@ -4,10 +4,9 @@ using Connected.Services;
using Connected.Utilities;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using System.Reflection;
namespace Connected.Components;
public partial class ModalDialog : IDisposable
public partial class ModalDialog : Base, IDisposable
{
[Inject] ModalDialogService? ModalService { get; set; }

@ -1,5 +1,7 @@
@typeparam NumberType
@inherits Base
<div class="form-group-alt">
<div class="input-group-content">
<div class="input-cta-icon" @onclick="StepDown">

@ -4,7 +4,7 @@ using System.Numerics;
namespace Connected.Components
{
public partial class NumberStepper<NumberType> where NumberType : INumber<NumberType>
public partial class NumberStepper<NumberType> where NumberType : Base, INumber<NumberType>
{
[Parameter]

@ -12,9 +12,6 @@ public partial class Radio : InputBase
[Parameter]
public bool Checked { get; set; } = false;
[Parameter, EditorRequired]
public string? Id { get; set; }
#endregion
#region Events

@ -1,5 +1,7 @@
@using Connected.Models;
@inherits Base
<CascadingValue Value="this">
<div>
@if (!string.IsNullOrEmpty(Name))

@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Components;
namespace Connected.Components;
public partial class RadioGroup
public partial class RadioGroup: Base
{
#region Parameters

@ -1,21 +1,12 @@
@inherits Button
@inherits GlyphButton
<button type="button"
@onclick="@Clicked"
disabled=@Disabled
style="@StyleList"
class="@ClassList">
<div class="@ContentClassList">
<div style="align-items:center">
@if (GlyphPosition == Position.Top)
{
<Glyph SVG="@_ShownGlyph" Color="@GlyphColor" />
}
<div class="@ContentClassList">
<Glyph SVG="@_ShownGlyph" Color="@GlyphColor" />
@ChildContent
@if (GlyphPosition == Position.Bottom)
{
<Glyph SVG="@_ShownGlyph" Color="@GlyphColor" />
}
</div>
</div>
</button>

@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
namespace Connected.Components;
public partial class ToggleGlyphButton: Button
public partial class ToggleGlyphButton: GlyphButton
{
#region Parameters
@ -15,13 +15,6 @@ public partial class ToggleGlyphButton: Button
[Parameter]
public bool Toggled { get; set; } = false;
/// <summary>
/// Glyph (Icon) inside the button.
/// Options: SVG string --> Icons
/// Default: string.Empty
/// </summary>
[Parameter, EditorRequired]
public string Glyph { get; set; } = string.Empty;
/// <summary>
/// Glyph (Icon) inside the button when tge .
@ -31,29 +24,25 @@ public partial class ToggleGlyphButton: Button
[Parameter, EditorRequired]
public string ToggledGlyph { get; set; } = string.Empty;
/// <summary>
/// Position of the glyph relative to button Text parameter. If Glyph parameter == string.Empty this parameter is ignored
/// Options: Position.[left,top,right,bottom]
/// Default: Position.left
/// </summary>
[Parameter]
public Position GlyphPosition { get; set; } = Position.Left;
/// <summary>
/// Color for the glyph. If Glyph parameter is empty this parameter is ignored
/// Options: Color.[Core,Primary,Secondary,Success,Info,Warning,Danger,White,Light,Dark]
/// Default: Color.Dark
/// </summary>
[Parameter]
public Color GlyphColor { get; set; } = Color.Dark;
public Color ToggledGlyphColor { get; set; } = Color.Dark;
/// <summary>
/// Color for the glyph. If Glyph parameter is empty this parameter is ignored
/// Options: Color.[Core,Primary,Secondary,Success,Info,Warning,Danger,White,Light,Dark]
/// Default: Color.Dark
/// </summary>
[Parameter]
public Color ToggledGlyphColor { get; set; } = Color.Dark;
public Color ToggledButtonColor { get; set; } = Color.Success;
private Color _ButtonColor
{
get
{
if (Toggled) return ToggledButtonColor;
return base.Color;
}
}
private string _ShownGlyph
{
@ -61,7 +50,7 @@ public partial class ToggleGlyphButton: Button
{
if (Toggled)
return ToggledGlyph;
return Glyph;
return base.Glyph;
}
}
@ -94,8 +83,9 @@ public partial class ToggleGlyphButton: Button
{
return new CssBuilder("btn")
.AddClass("btn-" + Helper.GetEnumDescription<Size>(base.Size))
.AddClass("btn-" + Helper.GetEnumDescription<Color>(base.Color),!base.Outlined)
.AddClass("btn-outline-" + Helper.GetEnumDescription<Color>(base.Color), base.Outlined)
.AddClass("btn-" + Helper.GetEnumDescription<Color>(_ButtonColor),!base.Outlined)
.AddClass("btn-outline-" + Helper.GetEnumDescription<Color>(_ButtonColor), base.Outlined)
.AddClass("wrap")
.AddClass(base.Class)
.Build();
}

@ -13,9 +13,6 @@ public partial class ToggleInput: InputBase
set => _checked= (bool)value;
}
[Parameter, EditorRequired]
public string Id { get; set; }
[Parameter]
public EventCallback<bool> CheckedChanged { get; set; }

@ -6,4 +6,7 @@ public static class ServiceCollectionExtensions
{
public static IServiceCollection AddModalDialogService(this IServiceCollection services)
=> services.AddScoped<ModalDialogService>();
public static IServiceCollection AddStateManagementService(this IServiceCollection services)
=> services.AddSingleton<StateManagerService>();
}

@ -0,0 +1,71 @@
using Connected.Classes;
using Connected.Components;
using System.Collections.ObjectModel;
namespace Connected.Services;
public class StateManagerService
{
public void SaveOrUpdateComponentState(Base Component)
{
var current_state = new State();
var properties = Component.GetType().GetProperties();
current_state.Id = Component.Id;
current_state.ComponentType = Component.GetType();
if (current_state.Values is null) current_state.Values = new Dictionary<string, object>();
foreach (var property in properties)
{
var value = property.GetValue(Component);
if (value is not null)
current_state.Values.Add(property.Name, value);
}
if (SavedStates is null) SavedStates = new ObservableCollection<State>();
SavedStates.Add(current_state);
}
public State? LoadComponentState(string ComponentId)
{
if (string.IsNullOrEmpty(ComponentId)) return null;
if (SavedStates is not null)
{
var Component = SavedStates.Where(state => state.Id == ComponentId).FirstOrDefault();
return Component;
}
return null;
}
public bool RemoveComponentState(string ComponentId)
{
bool result = false;
try
{
if (SavedStates is not null)
{
return SavedStates.Remove(SavedStates.FirstOrDefault(state => state.Id == ComponentId));
}
} catch (Exception ex)
{
result = false;
}
return result;
}
public bool ClearComponentStates()
{
bool result = false;
try
{
if (SavedStates is not null)
{
SavedStates.Clear();
result = true;
}
} catch
{
result = false;
}
return result;
}
private ObservableCollection<State>? SavedStates { get; set; } = new();
}
Loading…
Cancel
Save