From 81659a9f8457a52c96ad958917c6c6c225bae3b6 Mon Sep 17 00:00:00 2001 From: Jonathan McCaffrey Date: Sun, 10 Apr 2022 19:15:41 -0400 Subject: [PATCH] feat(Localization) Adding localization text. Fixing bugs in toasts --- Components/Display/InfoTooltipComponent.razor | 12 ++-- Components/Feedback/ToastComponent.razor | 44 ++++++++------ Contexts/DatabaseContext.cs | 2 +- IGP/Database.db | Bin 278528 -> 278528 bytes IGP/IGP.csproj | 38 ++++++------ IGP/Index.razor | 11 ++-- IGP/Localizations.Designer.cs | 54 ++++++++++++++++++ IGP/Localizations.resx | 53 +++++++++++++++-- IGP/Pages/Agile/AgilePage.razor | 4 +- .../BuildCalculator/BuildCalculatorPage.razor | 29 ++++++---- .../Parts/EntityClickViewComponent.razor | 23 ++++++-- IGP/Pages/Comparision/ComparisionPage.razor | 5 +- .../MakingOf/Parts/MakingOfColours.razor | 30 +++++++++- IGP/Portals/ToastPortal.razor | 8 +-- IGP/Program.cs | 4 +- IGP/_Imports.razor | 2 +- IGP/wwwroot/css/app.css | 3 + IGP/wwwroot/generated/AgileTaskModels.json | 2 +- IGP/wwwroot/generated/GitChangeModels.json | 2 +- IGP/wwwroot/generated/GitPatchModels.json | 2 +- IGP/wwwroot/index.html | 2 +- Model/Entity/EntityModel.cs | 49 ++++++++-------- Model/Git/CommitType.cs | 2 +- Model/Git/GitChangeModel.cs | 3 +- Model/Git/GitPatchModel.cs | 2 +- Services/Development/GitService.cs | 2 +- Services/IServices.cs | 4 +- Services/Immortal/BuildOrderService.cs | 14 ++++- Services/Website/ToastService.cs | 3 +- 29 files changed, 287 insertions(+), 122 deletions(-) diff --git a/Components/Display/InfoTooltipComponent.razor b/Components/Display/InfoTooltipComponent.razor index 04bbc83..d5b7110 100644 --- a/Components/Display/InfoTooltipComponent.razor +++ b/Components/Display/InfoTooltipComponent.razor @@ -10,8 +10,6 @@ position: relative; display: inline-block; width: 100%; - - } .tooltipContent { @@ -25,17 +23,19 @@ margin-left: -60px; margin-bottom: 36px; - background-color: #363636; - color: #fff; - border-radius: 6px; padding-left: 20px; padding-right: 20px; padding-bottom: 20px; padding-top: 20px; - border: 2px solid black; white-space: break-spaces; z-index: 2147483647; + + background-color: var(--info-secondary); + border: 1px solid var(--info-secondary-border); + border-radius: 2px; + + box-shadow: 0 3px 8px rgba(0,0,0,0.5); } diff --git a/Components/Feedback/ToastComponent.razor b/Components/Feedback/ToastComponent.razor index d90ce3a..dbeb029 100644 --- a/Components/Feedback/ToastComponent.razor +++ b/Components/Feedback/ToastComponent.razor @@ -9,10 +9,10 @@ } else { -
-
- @Toast.Title -
+
+
+ @Toast.Title +
@Toast.Message
@@ -27,9 +27,9 @@ else display: flex; flex-direction: column; justify-items: stretch; - width: 100%; - + width: 250px; opacity: 1; + cursor: pointer; } .fadeout { @@ -37,22 +37,22 @@ else opacity: 0; } - .toastContainer.@SeverityType.Warning.ToLower() { + .@SeverityType.Warning.ToLower() { background-color: var(--severity-warning-color); border-color: var(--severity-warning-border-color); } - .toastContainer.@SeverityType.Error.ToLower() { + .@SeverityType.Error.ToLower() { background-color: var(--severity-error-color); border-color: var(--severity-error-border-color); } - .toastContainer.@SeverityType.Information.ToLower() { + .@SeverityType.Information.ToLower() { background-color: var(--severity-information-color); border-color: var(--severity-information-border-color); } - .toastContainer.@SeverityType.Success.ToLower() { + .@SeverityType.Success.ToLower() { background-color: var(--severity-success-color); border-color: var(--severity-success-border-color); } @@ -64,6 +64,7 @@ else @code { + [Parameter] public ToastModel? Toast { get; set; } = default!; @@ -72,9 +73,7 @@ else private string FadeoutStyle => isFadingOut ? "fadeout" : ""; private int removalTime = 150000; - private int fadeoutTime = 4000; - - //private int fade + private int fadeoutTime = 1000; private Timer removalTimer = null!; private Timer fadeoutTimer = null!; @@ -82,7 +81,7 @@ else protected override void OnInitialized() { #if DEBUG - removalTime = 5000; + removalTime = 8000; #endif removalTimer = new Timer(removalTime); @@ -92,23 +91,34 @@ else fadeoutTimer = new Timer(removalTime - fadeoutTime); fadeoutTimer.Elapsed += OnFadeout!; fadeoutTimer.Enabled = true; + + toastService.Subscribe(StateHasChanged); } void OnFadeout(object source, ElapsedEventArgs eventArgs) { - isFadingOut = true; + // isFadingOut = true; StateHasChanged(); } void OnRemoval(object source, ElapsedEventArgs eventArgs) + { + //toastService.RemoveToast(Toast!); + + StateHasChanged(); + } + + void Dismiss() { toastService.RemoveToast(Toast!); } public void Dispose() { - removalTimer.Dispose(); - fadeoutTimer.Dispose(); + removalTimer.Elapsed -= OnRemoval!; + fadeoutTimer.Elapsed -= OnFadeout!; + + toastService.Unsubscribe(StateHasChanged); } } \ No newline at end of file diff --git a/Contexts/DatabaseContext.cs b/Contexts/DatabaseContext.cs index 2e698d4..3897193 100644 --- a/Contexts/DatabaseContext.cs +++ b/Contexts/DatabaseContext.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore; using Model.Doc; using Model.Notes; using Model.Website; -using Model.Development.Git; +using Model.Git; using Model.Work.Tasks; namespace Contexts; diff --git a/IGP/Database.db b/IGP/Database.db index 3d496a51ef009404dd7bd3ab4b4b4dd90da08eb7..044f34484319878fe3e430d3bd5ff099be09a059 100644 GIT binary patch delta 3479 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 L)4KeX#KXS - - - - + + + +