Upgrade styles

liguori · Jul 31, 2024 · bc79428 · bc79428
1 parent 902668d
commit bc79428
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 40 deletions.
diff --git a/src/Savings.SPA/Pages/ConfigurationEdit.razor b/src/Savings.SPA/Pages/ConfigurationEdit.razor
@@ -9,23 +9,23 @@ else
 {
     <EditForm Model="@Configuration" OnValidSubmit="@OnValidSubmit">
         <DataAnnotationsValidator />
-        <div class="form-row">
-            <div class="form-group col-3">
+        <div class="row">
+            <div class="col-3">
                 <label>Date :</label><br />
                 <RadzenDatePicker @bind-Value="LastMaterializedDate" DateFormat="dd/MM/yyyy" />
                 <ValidationMessage For="@(() => LastMaterializedDate)" />
             </div>
-            <div class="form-group col-3">
+            <div class="col-3">
                 <label>Amount:</label>
                 <InputNumber @bind-Value="@LastMaterializedAmount" @bind-Value:format="F2" class="form-control" />
                 <ValidationMessage For="@(() => LastMaterializedAmount)" />
             </div>
-             <div class="form-group col-3">
+             <div class="col-3">
                 <label>Interval:</label>
                 <InputNumber @bind-Value="@Configuration.EndPeriodRecurrencyInterval" class="form-control" />
                 <ValidationMessage For="@(() => Configuration.EndPeriodRecurrencyInterval)" />
             </div>
-            <div class="form-group col-3">
+            <div class="col-3">
                 <label>Recurrency:</label>
                 <InputSelect @bind-Value="@Configuration.EndPeriodRecurrencyType" class="form-control">
                     @foreach (var value in Enum.GetValues(typeof(Savings.Model.RecurrencyType)))
@@ -38,7 +38,7 @@ else
 
         </div>
 
-        <div class="form-group">
+        <div>
             <label>Cash withdrawal category:</label>
             <InputSelectNumber @bind-Value="@Configuration.CashWithdrawalCategoryID" class="form-control">
                 <option value=""></option>

diff --git a/src/Savings.SPA/Pages/FixedItemEdit.razor b/src/Savings.SPA/Pages/FixedItemEdit.razor
@@ -1,58 +1,58 @@
 @attribute [Authorize]
 <EditForm Model="@fixedItemToEdit" OnValidSubmit="@OnValidSubmit">
     <DataAnnotationsValidator />
-    <div class="form-row">
+    <div class="row">
         @if (!Credit)
         {
-            <div class="form-group col-5">
+            <div class="col-5">
                 <label>Date :</label><br />
                 <RadzenDatePicker @bind-Value="fixedItemToEdit.Date" DateFormat="dd/MM/yyyy" />
                 <ValidationMessage For="@(() => fixedItemToEdit.Date)" />
             </div>
         }
-        <div class="form-group col-4">
+        <div class="col-4">
             <label>Amount:</label>
             <InputNumber @bind-Value="@fixedItemToEdit.Amount" @bind-Value:format="F2" class="form-control" @ref="amountInputNumber" />
             <ValidationMessage For="@(() => fixedItemToEdit.Amount)" />
         </div>
         @if (isNew)
         {
-            <div class="form-group col-3">
+            <div class="col-3">
                 <label>💳Credit</label><br>
                 <RadzenSwitch @bind-Value="@Credit" />
             </div>
         }
     </div>
     @if (!Credit)
     {
-        <div class="form-row">
-            <div class="form-group col-3">
+        <div class="row">
+            <div class="col-3">
                 <label>🧾Accu.</label><br>
                 <RadzenSwitch @bind-Value="@fixedItemToEdit.AccumulateForBudget" />
                 <ValidationMessage For="@(() => fixedItemToEdit.AccumulateForBudget)" />
             </div>
-            <div class="form-group col-3">
+            <div class="col-3">
                 <label>💵Cash</label><br>
                 <RadzenSwitch @bind-Value="@fixedItemToEdit.Cash" />
             </div>
-            <div class="form-group col-3">
+            <div class="col-3">
                 <label>💰Income</label><br>
                 <RadzenSwitch @bind-Value="@Incoming" />
             </div>
 
-            <div class="form-group col-3">
+            <div class="col-3">
                 <label>Weight:</label>
                 <InputNumber @bind-Value="@fixedItemToEdit.TimelineWeight" class="form-control" />
                 <ValidationMessage For="@(() => fixedItemToEdit.TimelineWeight)" />
             </div>
         </div>
     }
-    <div class="form-group">
+    <div>
         <label>Note:</label>
         <InputText @bind-Value="@fixedItemToEdit.Note" class="form-control" />
         <ValidationMessage For="@(() => fixedItemToEdit.Note)" />
     </div>
-    <div class="form-group">
+    <div>
         <label>Category:</label>
         <InputSelectNumber @bind-Value="@fixedItemToEdit.CategoryID" class="form-control">
             <option value=""></option>

diff --git a/src/Savings.SPA/Pages/FixedItems.razor b/src/Savings.SPA/Pages/FixedItems.razor
@@ -8,7 +8,7 @@
 }
 else
 {
-    <div class="form-row">
+    <div class="row">
         <div class="col-md-2 col">
             <span>From:</span><br />
             <RadzenDatePicker @bind-Value="FilterDateFrom" DateFormat="dd/MM/yyyy" Change="@(args => Change(args, nameof(FilterDateFrom)))" />

diff --git a/src/Savings.SPA/Pages/History.razor b/src/Savings.SPA/Pages/History.razor
@@ -7,7 +7,7 @@
 }
 else
 {
-    <div class="form-row">
+    <div class="row">
         <div class="col-md-2 col">
             <span>From:</span><br />
             <RadzenDatePicker @bind-Value="FilterDateFrom" DateFormat="dd/MM/yyyy" Change="@(args => Change(args, nameof(FilterDateFrom)))" />

diff --git a/src/Savings.SPA/Pages/Projection.razor b/src/Savings.SPA/Pages/Projection.razor
@@ -7,7 +7,7 @@
 }
 else
 {
-    <div class="form-row">
+    <div class="row">
 
         <div class="col-md-2 col-5">
             <span>To:</span><br />

diff --git a/src/Savings.SPA/Pages/RecurrencyAdjustment.razor b/src/Savings.SPA/Pages/RecurrencyAdjustment.razor
@@ -1,7 +1,7 @@
 @attribute [Authorize]
 <EditForm Model="@adjustement" OnValidSubmit="@OnValidSubmit">
     <DataAnnotationsValidator />
-    <div class="form-group row">
+    <div class="row">
         <div class="col">
             <label>New date :</label>
             <RadzenDatePicker @bind-Value="adjustement.RecurrencyNewDate" DateFormat="dd/MM/yyyy" />
@@ -10,7 +10,7 @@
         <div class="col">
         </div>
     </div>
-    <div class="form-group row">
+    <div class="row">
         <div class="col">
             <label>New amount:</label>
             <InputNumber @bind-Value="@adjustement.RecurrencyNewAmount" @bind-Value:format="F2" class="form-control" />

diff --git a/src/Savings.SPA/Pages/RecurrentItemEdit.razor b/src/Savings.SPA/Pages/RecurrentItemEdit.razor
@@ -1,44 +1,44 @@
 @attribute [Authorize]
 <EditForm Model="@recurrentItemToEdit" OnValidSubmit="@OnValidSubmit">
     <DataAnnotationsValidator />
-    <div class="form-row">
-        <div class="form-group col">
+    <div class="row">
+        <div class="col">
             <label>Start date :</label><br />
             <RadzenDatePicker @bind-Value="recurrentItemToEdit.StartDate" DateFormat="dd/MM/yyyy" />
             <ValidationMessage For="@(() => recurrentItemToEdit.StartDate)" />
         </div>
-        <div class="form-group col">
+        <div class="col">
             <label>End date :</label><br />
             <RadzenDatePicker @bind-Value="recurrentItemToEdit.EndDate" DateFormat="dd/MM/yyyy" />
             <ValidationMessage For="@(() => recurrentItemToEdit.EndDate)" />
         </div>
     </div>
-    <div class="form-row">
-        <div class="form-group col">
+    <div class="row">
+        <div class="col">
             <label>Amount:</label>
             <InputNumber @bind-Value="@recurrentItemToEdit.Amount" @bind-Value:format="F2" class="form-control" @ref="amountInputNumber" />
             <ValidationMessage For="@(() => recurrentItemToEdit.Amount)" />
         </div>
-        <div class="form-group col">
+        <div class="col">
             <label>Weight:</label>
             <InputNumber @bind-Value="@recurrentItemToEdit.TimelineWeight" class="form-control" />
             <ValidationMessage For="@(() => recurrentItemToEdit.TimelineWeight)" />
         </div>
         @if (!parentItemID.HasValue)
         {
-            <div class="form-group col">
+            <div class="col">
                 <label>Default credit</label><br>
                 <RadzenSwitch @bind-Value="@recurrentItemToEdit.DefaultCredit" />
             </div>
         }
     </div>
-    <div class="form-group ">
+    <div class=" ">
         <label>Note:</label>
         <InputText @bind-Value="@recurrentItemToEdit.Note" class="form-control" />
         <ValidationMessage For="@(() => recurrentItemToEdit.Note)" />
     </div>
-    <div class="form-row">
-        <div class="form-group col-md-4 col">
+    <div class="row">
+        <div class="col-md-4 col">
             <label>Recurrency:</label>
             <InputSelect @bind-Value="recurrentItemToEdit.RecurrencyType" class="form-control">
                 @foreach (var value in Enum.GetValues(typeof(Savings.Model.RecurrencyType)))
@@ -48,12 +48,12 @@
             </InputSelect>
             <ValidationMessage For="@(() => recurrentItemToEdit.RecurrencyType)" />
         </div>
-        <div class="form-group col-md-3 col">
+        <div class="col-md-3 col">
             <label>Interval:</label>
             <InputNumber @bind-Value="@recurrentItemToEdit.RecurrencyInterval" class="form-control" />
             <ValidationMessage For="@(() => recurrentItemToEdit.RecurrencyInterval)" />
         </div>
-        <div class="form-group col-md-5 col-sm-12">
+        <div class="col-md-5 col-sm-12">
             <label>Type:</label>
             <InputSelect @bind-Value="recurrentItemToEdit.Type" class="form-control">
                 @foreach (var value in Enum.GetValues(typeof(Savings.Model.MoneyType)))
@@ -64,7 +64,7 @@
             <ValidationMessage For="@(() => recurrentItemToEdit.Type)" />
         </div>
     </div>
-    <div class="form-group">
+    <div class="">
         <label>Category:</label>
         <InputSelectNumber @bind-Value="@recurrentItemToEdit.CategoryID" class="form-control">
             <option value=""></option>

diff --git a/src/Savings.SPA/Pages/RecurrentItems.razor b/src/Savings.SPA/Pages/RecurrentItems.razor
@@ -11,7 +11,7 @@
 }
 else
 {
-    <div class="form-row">
+    <div class="row">
         <div class="col-md-2 col">
             Active<br>
             <RadzenSwitch @bind-Value="@ShowOnlyActive" Change="ShowOnlyActiveOnChange" />

diff --git a/src/Savings.SPA/Pages/Reports.razor b/src/Savings.SPA/Pages/Reports.razor
@@ -8,7 +8,7 @@
 else
 {
     <h2>Categories</h2>
-    <div class="form-row">
+    <div class="row">
         <div class="col-md-3 col">
             <label>From:</label><br />
             <RadzenDatePicker @bind-Value="FilterDateFrom" DateFormat="dd/MM/yyyy" Change="@(args => DateTimeDateChanged(args, nameof(FilterDateFrom)))" />

diff --git a/src/Savings.SPA/Program.cs b/src/Savings.SPA/Program.cs
@@ -16,6 +16,7 @@
 builder.Services.AddScoped<DialogService>();
 builder.Services.AddScoped<NotificationService>();
 builder.Services.AddScoped<CustomAuthorizationMessageHandler>();
+builder.Services.AddRadzenComponents();
 
 var configuredAuthentication = builder.Configuration["AuthenticationToUse"];
 

diff --git a/src/Savings.SPA/Shared/MainLayout.razor b/src/Savings.SPA/Shared/MainLayout.razor
@@ -2,8 +2,7 @@
 @inherits LayoutComponentBase
 @inject IJSRuntime JS
 
-<RadzenDialog />
-<RadzenNotification />
+<RadzenComponents />
 <div class="page">
     <div class="sidebar">
         <NavMenu />

diff --git a/src/Savings.SPA/wwwroot/index.html b/src/Savings.SPA/wwwroot/index.html
@@ -5,12 +5,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <title>Savings</title>
     <base href="/" />
+    <link rel="stylesheet" href="_content/Radzen.Blazor/css/default-base.css">
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <link href="css/app.css" rel="stylesheet" />
     <link rel="icon" type="image/png" href="favicon.png" />
     <link href="Savings.SPA.styles.css" rel="stylesheet" />
     <link href="css/savings.css" rel="stylesheet" />
-    <link rel="stylesheet" href="_content/Radzen.Blazor/css/default.css">
+
     <link href="manifest.json" rel="manifest" />
     <link rel="apple-touch-icon" sizes="512x512" href="icon-512.png" />
 </head>