diff --git a/.vs/SummerBestWebForm2/v17/.suo b/.vs/SummerBestWebForm2/v17/.suo index 768a156..ed94b1a 100644 Binary files a/.vs/SummerBestWebForm2/v17/.suo and b/.vs/SummerBestWebForm2/v17/.suo differ diff --git a/.vs/SummerBestWebForm2/v17/DocumentLayout.backup.json b/.vs/SummerBestWebForm2/v17/DocumentLayout.backup.json index b6193da..3b64f0f 100644 --- a/.vs/SummerBestWebForm2/v17/DocumentLayout.backup.json +++ b/.vs/SummerBestWebForm2/v17/DocumentLayout.backup.json @@ -5,10 +5,6 @@ { "AbsoluteMoniker": "D:0:0:{10E16044-8880-42A4-866B-B0461C450A71}|SummerBestWebForm2.csproj|c:\\repos\\summerbestwebform2\\components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}", "RelativeMoniker": "D:0:0:{10E16044-8880-42A4-866B-B0461C450A71}|SummerBestWebForm2.csproj|solutionrelative:components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}" - }, - { - "AbsoluteMoniker": "D:0:0:{10E16044-8880-42A4-866B-B0461C450A71}|SummerBestWebForm2.csproj|c:\\repos\\summerbestwebform2\\components\\pages\\home.razor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{10E16044-8880-42A4-866B-B0461C450A71}|SummerBestWebForm2.csproj|solutionrelative:components\\pages\\home.razor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -72,22 +68,9 @@ "RelativeDocumentMoniker": "Components\\Pages\\Home.razor", "ToolTip": "C:\\Repos\\SummerBestWebForm2\\Components\\Pages\\Home.razor", "RelativeToolTip": "Components\\Pages\\Home.razor", - "ViewState": "AgIAAHgAAAAAAAAAAAAAAL4AAAAdAAAAAAAAAA==", + "ViewState": "AgIAAAwBAAAAAAAAAAAAACcBAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-05-22T09:45:36.931Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 1, - "Title": "Home.razor.cs", - "DocumentMoniker": "C:\\Repos\\SummerBestWebForm2\\Components\\Pages\\Home.razor.cs", - "RelativeDocumentMoniker": "Components\\Pages\\Home.razor.cs", - "ToolTip": "C:\\Repos\\SummerBestWebForm2\\Components\\Pages\\Home.razor.cs", - "RelativeToolTip": "Components\\Pages\\Home.razor.cs", - "ViewState": "AgIAAEABAAAAAAAAAAAAAFQBAAAjAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-22T09:57:08.621Z", + "WhenOpened": "2025-05-29T13:04:23.98Z", "EditorCaption": "" } ] diff --git a/.vs/SummerBestWebForm2/v17/DocumentLayout.json b/.vs/SummerBestWebForm2/v17/DocumentLayout.json index 65341e7..3b64f0f 100644 --- a/.vs/SummerBestWebForm2/v17/DocumentLayout.json +++ b/.vs/SummerBestWebForm2/v17/DocumentLayout.json @@ -5,10 +5,6 @@ { "AbsoluteMoniker": "D:0:0:{10E16044-8880-42A4-866B-B0461C450A71}|SummerBestWebForm2.csproj|c:\\repos\\summerbestwebform2\\components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}", "RelativeMoniker": "D:0:0:{10E16044-8880-42A4-866B-B0461C450A71}|SummerBestWebForm2.csproj|solutionrelative:components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}" - }, - { - "AbsoluteMoniker": "D:0:0:{10E16044-8880-42A4-866B-B0461C450A71}|SummerBestWebForm2.csproj|c:\\repos\\summerbestwebform2\\components\\pages\\home.razor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{10E16044-8880-42A4-866B-B0461C450A71}|SummerBestWebForm2.csproj|solutionrelative:components\\pages\\home.razor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -72,22 +68,9 @@ "RelativeDocumentMoniker": "Components\\Pages\\Home.razor", "ToolTip": "C:\\Repos\\SummerBestWebForm2\\Components\\Pages\\Home.razor", "RelativeToolTip": "Components\\Pages\\Home.razor", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAA0AAAAvAAAAAAAAAA==", + "ViewState": "AgIAAAwBAAAAAAAAAAAAACcBAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-05-22T09:45:36.931Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 1, - "Title": "Home.razor.cs", - "DocumentMoniker": "C:\\Repos\\SummerBestWebForm2\\Components\\Pages\\Home.razor.cs", - "RelativeDocumentMoniker": "Components\\Pages\\Home.razor.cs", - "ToolTip": "C:\\Repos\\SummerBestWebForm2\\Components\\Pages\\Home.razor.cs", - "RelativeToolTip": "Components\\Pages\\Home.razor.cs", - "ViewState": "AgIAAEABAAAAAAAAAAAAAFQBAAAjAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-22T09:57:08.621Z", + "WhenOpened": "2025-05-29T13:04:23.98Z", "EditorCaption": "" } ] diff --git a/Components/Layout/MainLayout.razor b/Components/Layout/MainLayout.razor index beb7438..c0aa00b 100644 --- a/Components/Layout/MainLayout.razor +++ b/Components/Layout/MainLayout.razor @@ -1,5 +1,5 @@ @inherits LayoutComponentBase - @Body + @Body diff --git a/Components/Pages/Home.razor b/Components/Pages/Home.razor index f54b698..4ba02ab 100644 --- a/Components/Pages/Home.razor +++ b/Components/Pages/Home.razor @@ -1,444 +1,475 @@ @page "/" +@using Telerik.Blazor +@using Telerik.Blazor.Components +@using Telerik.SvgIcons @using System.ComponentModel.DataAnnotations -@using kmCommonLibsCore; Welcome @if (ShowWizard) { -
-
-
+
+
+
- - - - - - - + + + @* Need this here to avoid addition of random submit button *@ - - - - + + + + @* *@ @* Step 1 - plastic card vs postcard *@ @* *@ - - - - - - + + + @* Need this here to avoid addition of random submit button *@ - - - - + + + + @* *@ @* Step 2 - selecting card design *@ @* *@ - - - - - - - - - + + + + + + @* *@ @* Step 3 - For postcards, choose a verse and a signature *@ @* *@ - - - - - - - - - - - - - - + + + + + + + + + + + + @* *@ @* Step 4 - Logo Selection *@ @* *@ - - - - - - + + + + + + + @* *@ @* Step 5 - Offer selection for Plastic cards *@ @* *@ - - - - - - + + - + - - - - + + + + @* *@ @* Step 6 - Location information *@ @* *@ - - - - - - - + + + + + + + @* *@ @* Step 7 - Payment *@ @* *@ - - - - - - - -

- - - -
- + + + + + + + +

+ + + +
+ - -
-
-
-
-
+ + + + + + +
-
} diff --git a/Components/Pages/Home.razor.cs b/Components/Pages/Home.razor.cs index 91789e6..901c680 100644 --- a/Components/Pages/Home.razor.cs +++ b/Components/Pages/Home.razor.cs @@ -1,9 +1,9 @@ -using kmCommonLibsCore; -using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components; using System.ComponentModel.DataAnnotations; -using Telerik.Blazor.Components; using Telerik.Blazor; +using Telerik.Blazor.Components; using Telerik.SvgIcons; +using kmCommonLibsCore; namespace SummerBestWebForm2.Components.Pages; @@ -208,17 +208,18 @@ public partial class Home await Console.Out.WriteLineAsync("ERROR: " + e.Message); } ShowWizard = false; - await Dialog.AlertAsync("The Registration was submitted successfully", "Done"); + await Dialogs.AlertAsync("The Registration was submitted successfully", "Done"); } } + #region "User Selections - Model" public bool? IsAudienceChoiceValid { get; set; } = false; public bool? IsCardChoiceValid { get; set; } = false; public bool? IsDesignChoiceValid { get; set; } = false; [CascadingParameter] - public DialogFactory Dialog { get; set; } + public DialogFactory Dialogs { get; set; } public bool ShowWizard { get; set; } = true; @@ -247,6 +248,7 @@ public partial class Home public bool designOne = true; public bool designTwo = false; public bool designThree = false; + public bool designCustom = false; // Variables for selecting messaging (postcards only) public TelerikForm messagingForm { get; set; } = new(); @@ -302,6 +304,7 @@ public partial class Home public bool callWithInfo = false; public bool check = false; + #endregion public void ToggleCardType() { @@ -364,7 +367,7 @@ public partial class Home if (!isOfferSelectionValid) { args.IsCancelled = true; - await Dialog.AlertAsync("Please select the proper amount of offers.", "You cannot proceed"); + await Dialogs.AlertAsync("Please select the proper amount of offers.", "You cannot proceed"); } } } @@ -385,7 +388,7 @@ public partial class Home if (!isLocationInfoValid) { args.IsCancelled = true; - await Dialog.AlertAsync("Please fill out all required fields.", "You cannot proceed"); + await Dialogs.AlertAsync("Please fill out all required fields.", "You cannot proceed"); } } diff --git a/Components/Routes.razor b/Components/Routes.razor index f756e19..3b4a0a0 100644 --- a/Components/Routes.razor +++ b/Components/Routes.razor @@ -1,6 +1,6 @@  - - - - + + + + diff --git a/SummerBestWebForm2.csproj b/SummerBestWebForm2.csproj index 82c419f..ae51751 100644 --- a/SummerBestWebForm2.csproj +++ b/SummerBestWebForm2.csproj @@ -12,7 +12,7 @@ - + diff --git a/SummerBestWebForm2.sln b/SummerBestWebForm2.sln index 64f2cac..c261f8c 100644 --- a/SummerBestWebForm2.sln +++ b/SummerBestWebForm2.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.13.36105.23 d17.13 +VisualStudioVersion = 17.13.36105.23 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SummerBestWebForm2", "SummerBestWebForm2.csproj", "{10E16044-8880-42A4-866B-B0461C450A71}" EndProject diff --git a/obj/Debug/net8.0/SummerBestWebForm2.AssemblyInfo.cs b/obj/Debug/net8.0/SummerBestWebForm2.AssemblyInfo.cs index b94f8c6..4dbea95 100644 --- a/obj/Debug/net8.0/SummerBestWebForm2.AssemblyInfo.cs +++ b/obj/Debug/net8.0/SummerBestWebForm2.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("SummerBestWebForm2")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d92f990b09614494d51cc3b93e4acabedb32f235")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9b28bf7d24722f5c55cef7bd645e913fd9f0cc1a")] [assembly: System.Reflection.AssemblyProductAttribute("SummerBestWebForm2")] [assembly: System.Reflection.AssemblyTitleAttribute("SummerBestWebForm2")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net8.0/SummerBestWebForm2.AssemblyInfoInputs.cache b/obj/Debug/net8.0/SummerBestWebForm2.AssemblyInfoInputs.cache index 1703d22..6c12221 100644 --- a/obj/Debug/net8.0/SummerBestWebForm2.AssemblyInfoInputs.cache +++ b/obj/Debug/net8.0/SummerBestWebForm2.AssemblyInfoInputs.cache @@ -1 +1 @@ -4d9f1f0b4ebbbb88ed0d5e48d4e075cc6af174dcfc64d4934e995ae1d4553706 +9c3a26a0e221101541511b134daa7b1793f7b9eaab9d602f81659455684bf9c0 diff --git a/obj/Debug/net8.0/SummerBestWebForm2.assets.cache b/obj/Debug/net8.0/SummerBestWebForm2.assets.cache index a7cece8..956d130 100644 Binary files a/obj/Debug/net8.0/SummerBestWebForm2.assets.cache and b/obj/Debug/net8.0/SummerBestWebForm2.assets.cache differ diff --git a/obj/SummerBestWebForm2.csproj.nuget.dgspec.json b/obj/SummerBestWebForm2.csproj.nuget.dgspec.json index 0acb1ea..b4e1386 100644 --- a/obj/SummerBestWebForm2.csproj.nuget.dgspec.json +++ b/obj/SummerBestWebForm2.csproj.nuget.dgspec.json @@ -55,7 +55,7 @@ "dependencies": { "Telerik.SvgIcons": { "target": "Package", - "version": "[4.3.0, )" + "version": "[4.2.0, )" }, "Telerik.UI.for.Blazor": { "target": "Package", diff --git a/obj/project.assets.json b/obj/project.assets.json index fa89076..8b51857 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -2029,7 +2029,7 @@ "lib/netstandard2.0/Telerik.Recurrence.dll": {} } }, - "Telerik.SvgIcons/4.3.0": { + "Telerik.SvgIcons/4.2.0": { "type": "package", "compile": { "lib/netstandard2.0/Telerik.SvgIcons.dll": {} @@ -6294,16 +6294,16 @@ "telerik.recurrence.nuspec" ] }, - "Telerik.SvgIcons/4.3.0": { - "sha512": "HTNvouqTE0mRgP1br0Dz4bf/tyQVDPQtvp5Rgel05DgVJFyowiU+SNHhEIUm2id33shqTtVIUjTqidg+85EkTw==", + "Telerik.SvgIcons/4.2.0": { + "sha512": "6vQWZOT5xRmkUaYh5mDv4jlp2vzLRv1PpWzscgfPm7LpYdYnLqAnOVqUnrwhuNtkpSly01nwNFtyQGneZgjO9A==", "type": "package", - "path": "telerik.svgicons/4.3.0", + "path": "telerik.svgicons/4.2.0", "files": [ ".nupkg.metadata", ".signature.p7s", "README.md", "lib/netstandard2.0/Telerik.SvgIcons.dll", - "telerik.svgicons.4.3.0.nupkg.sha512", + "telerik.svgicons.4.2.0.nupkg.sha512", "telerik.svgicons.nuspec" ] }, @@ -6368,7 +6368,7 @@ }, "projectFileDependencyGroups": { "net8.0": [ - "Telerik.SvgIcons >= 4.3.0", + "Telerik.SvgIcons >= 4.2.0", "Telerik.UI.for.Blazor >= 8.1.1", "kmCommonLibsCore >= 2.0.0.129" ] @@ -6428,7 +6428,7 @@ "dependencies": { "Telerik.SvgIcons": { "target": "Package", - "version": "[4.3.0, )" + "version": "[4.2.0, )" }, "Telerik.UI.for.Blazor": { "target": "Package", diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index 62918dd..628a003 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "4AnT3wU+ifk=", + "dgSpecHash": "WcTVtBRMuFk=", "success": true, "projectFilePath": "C:\\Repos\\SummerBestWebForm2\\SummerBestWebForm2.csproj", "expectedPackageFiles": [ @@ -126,7 +126,7 @@ "C:\\Users\\RDeck.KEYMTV\\.nuget\\packages\\telerik.pivot.core\\0.1.3\\telerik.pivot.core.0.1.3.nupkg.sha512", "C:\\Users\\RDeck.KEYMTV\\.nuget\\packages\\telerik.pivot.dataproviders.xmla\\0.1.3\\telerik.pivot.dataproviders.xmla.0.1.3.nupkg.sha512", "C:\\Users\\RDeck.KEYMTV\\.nuget\\packages\\telerik.recurrence\\0.2.3\\telerik.recurrence.0.2.3.nupkg.sha512", - "C:\\Users\\RDeck.KEYMTV\\.nuget\\packages\\telerik.svgicons\\4.3.0\\telerik.svgicons.4.3.0.nupkg.sha512", + "C:\\Users\\RDeck.KEYMTV\\.nuget\\packages\\telerik.svgicons\\4.2.0\\telerik.svgicons.4.2.0.nupkg.sha512", "C:\\Users\\RDeck.KEYMTV\\.nuget\\packages\\telerik.ui.for.blazor\\8.1.1\\telerik.ui.for.blazor.8.1.1.nupkg.sha512", "C:\\Users\\RDeck.KEYMTV\\.nuget\\packages\\telerik.zip\\2025.1.205\\telerik.zip.2025.1.205.nupkg.sha512", "C:\\Users\\RDeck.KEYMTV\\.nuget\\packages\\xact.core.pcl\\0.0.5014\\xact.core.pcl.0.0.5014.nupkg.sha512" diff --git a/wwwroot/img/a41f648d-6b39-41f1-bbe5-084fb8a71a30.png b/wwwroot/img/a41f648d-6b39-41f1-bbe5-084fb8a71a30.png new file mode 100644 index 0000000..eaf0c2b Binary files /dev/null and b/wwwroot/img/a41f648d-6b39-41f1-bbe5-084fb8a71a30.png differ diff --git a/wwwroot/img/cfeb51c5-5373-44b5-be19-dadea452cc41.png b/wwwroot/img/cfeb51c5-5373-44b5-be19-dadea452cc41.png new file mode 100644 index 0000000..06e4c18 Binary files /dev/null and b/wwwroot/img/cfeb51c5-5373-44b5-be19-dadea452cc41.png differ