Pop-up creations

CheckDrive.Web/CheckDrive.Web/CheckDrive.Web.csproj

@@ -31,12 +31,33 @@
     <Compile Include="Controllers\OperatorsController.cs" />
     <Compile Include="Controllers\TechniciansController.cs" />
     <None Include="wwwroot\css\LogOutButtun.css" />
+    <None Include="wwwroot\font-awesome\js\all.js" />
+    <None Include="wwwroot\font-awesome\js\all.min.js" />
+    <None Include="wwwroot\font-awesome\js\brands.js" />
+    <None Include="wwwroot\font-awesome\js\brands.min.js" />
+    <None Include="wwwroot\font-awesome\js\conflict-detection.js" />
+    <None Include="wwwroot\font-awesome\js\conflict-detection.min.js" />
+    <None Include="wwwroot\font-awesome\js\fontawesome.js" />
+    <None Include="wwwroot\font-awesome\js\fontawesome.min.js" />
+    <None Include="wwwroot\font-awesome\js\regular.js" />
+    <None Include="wwwroot\font-awesome\js\regular.min.js" />
+    <None Include="wwwroot\font-awesome\js\solid.js" />
+    <None Include="wwwroot\font-awesome\js\solid.min.js" />
+    <None Include="wwwroot\font-awesome\js\v4-shims.js" />
+    <None Include="wwwroot\font-awesome\js\v4-shims.min.js" />
+    <None Include="wwwroot\font-awesome\sprites\brands.svg" />
+    <None Include="wwwroot\font-awesome\sprites\regular.svg" />
+    <None Include="wwwroot\font-awesome\sprites\solid.svg" />
+    <None Include="wwwroot\font-awesome\webfonts\fa-brands-400.woff2" />
+    <None Include="wwwroot\font-awesome\webfonts\fa-regular-400.woff2" />
+    <None Include="wwwroot\font-awesome\webfonts\fa-solid-900.woff2" />
+    <None Include="wwwroot\font-awesome\webfonts\fa-v4compatibility.woff2" />
     <PackageReference Include="CheckDrive.ApiContracts" Version="1.4.9" />
     <PackageReference Include="CheckDrive.DTOs" Version="1.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.3" />
-    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="25.1.42" />
-    <PackageReference Include="Syncfusion.Licensing" Version="25.2.3" />
+    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="27.1.50" />
+    <PackageReference Include="Syncfusion.Licensing" Version="27.1.50" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.6.0" />
     <PackageReference Include="System.Security.Claims" Version="4.3.0" />
 

CheckDrive.Web/CheckDrive.Web/Constants/Configurations.cs

@@ -3,6 +3,6 @@
     public static class Configurations
     {
         public const string JwtToken = "JwtToken";
-        public const string SynfusionLicenseKey = "Mgo+DSMBMAY9C3t2UFhhQlJBfV5AQmBIYVp/TGpJfl96cVxMZVVBJAtUQF1hTX5UdERiXX1ZcHNXRGFa";
+        public const string SynfusionLicenseKey = "Mgo+DSMBPh8sVXJzS0d+WFlPd11dXmJWd1p/THNYflR1fV9DaUwxOX1dQl9nSXdRc0VkW3pfdX1WQ2E=";
     }
 }

CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml

@@ -10,17 +10,17 @@
     <div class="row">
         <div class="d-flex justify-content-between">
             <!-- Filter -->
-            <div class="col-md-2 mb-4">
-                <div class="input-group">
-                    <select class="form-control" name="roleId">
-                        @foreach (var role in ViewBag.Roles)
-                        {
-                            <option value="@role.Id" selected="@(role.Id == ViewBag.RoleId)">
-                                @role.Name
-                            </option>
-                        }
-                    </select>
-                </div>
+            <div class="col-md-2 mb-4" >
+                <div class="input-group" style="height:38px">                  
+                    <ejs-dropdownlist 
+                                      id="roleDropdown"
+                                      name="roleId" 
+                                      dataSource="@(ViewBag.Roles)" 
+                                      fields="@(new Syncfusion.EJ2.DropDowns.DropDownListFieldSettings { Text = "Name", Value = "Id" })" 
+                                      value="@ViewBag.RoleId" 
+                                      placeholder="Ishchini tanlang" >
+                    </ejs-dropdownlist>
+               </div>
             </div>
             <!-- Search -->
             <div class="col-md-4 ms-lg-3 mb-4">
@@ -35,9 +35,9 @@
             </div>
             <!-- Create -->
             <div class="d-flex col-md mb-4 justify-content-end">
-                  <a class="btn btn-success ml" asp-action="create">
+                <button class="btn btn-success" asp-action="create">
                         <i class="fa fa-plus"></i> Yaratish
-                  </a>
+                 </button>
              </div>
         </div>
     </div>

CheckDrive.Web/CheckDrive.Web/Views/Cars/Create.cshtml

@@ -2,105 +2,83 @@
 
 @{
     ViewData["Title"] = "Create";
-    Layout = "~/Views/Shared/_Layout.cshtml";
+    Layout = null;
 }
-
-<h4>Yangi moshina yaratish oynasi</h4>
-<hr />
-<div class="row">
-    <div class="col-md-6">
-        <form asp-action="Create" onsubmit="return validateForm()">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-
-            <div class="form-group row">
-                <div class="col-md-6 mb-3">
-                    <label asp-for="Model" class="control-label">Model</label>
-                    <input asp-for="Model" class="form-control" />
-                    <span asp-validation-for="Model" class="text-danger"></span>
-                </div>
-                <div class="col-md-6 mb-3">
-                    <label asp-for="Number" class="control-label">Davlat raqami</label>
-                    <input asp-for="Number" class="form-control" />
-                    <span asp-validation-for="Number" class="text-danger"></span>
-                </div>
-            </div>
-
-            <div class="form-group row">
-                <div class="col-md-6 mb-3">
-                    <label asp-for="Color" class="control-label">Rangi</label>
-                    <input asp-for="Color" class="form-control" />
-                    <span asp-validation-for="Color" class="text-danger"></span>
-                </div>
-                <div class="col-md-6 mb-3">
-                    <label asp-for="ManufacturedYear" class="control-label">Ishlab chiqarilgan yili</label>
-                    <input asp-for="ManufacturedYear" class="form-control" />
-                    <span asp-validation-for="ManufacturedYear" class="text-danger"></span>
-                </div>
-
-            </div>
-
-            <div class="form-group row">
-                <div class="col-md-6 mb-3">
-                    <label asp-for="FuelTankCapacity" class="control-label">Yoqilg'i baki sig'imi</label>
-                    <input asp-for="FuelTankCapacity" class="form-control" id="fuelTankCapacity" />
-                    <span asp-validation-for="FuelTankCapacity" class="text-danger"></span>
-                </div>
-                <div class="col-md-6 mb-3">
-                    <label asp-for="RemainingFuel" class="control-label">Avtomobildagi yoqilg'i qoldig'i [litr]</label>
-                    <input asp-for="RemainingFuel" class="form-control" id="remainingFuel" oninput="validateRemainingFuel()" />
-                    <span asp-validation-for="RemainingFuel" class="text-danger"></span>
-                </div>
-            </div>
-
-            <div class="form-group row">
-                <div class="col-md-6 mb-3">
-                    <label asp-for="MeduimFuelConsumption" class="control-label">100 km uchun yoqilg'i me'yori [litr]</label>
-                    <input asp-for="MeduimFuelConsumption" class="form-control" id="meduimFuelConsumption" />
-                    <span asp-validation-for="MeduimFuelConsumption" class="text-danger"></span>
-                </div>
-                <div class="col-md-6 mb-3">
-                    <label asp-for="Mileage" class="control-label">Bosib o'tilgan masofasi [km]</label>
-                    <input asp-for="Mileage" class="form-control" />
-                    <span asp-validation-for="Mileage" class="text-danger"></span>
-                </div>
-            </div>
-
-            <div class="form-group row">
-                <div class="col-md-6 mb-3">
-                    <label asp-for="OneYearMediumDistance" class="control-label">1 yillik bosib o'tish me'yori [km]</label>
-                    <input asp-for="OneYearMediumDistance" class="form-control" id="oneYearMediumDistance" oninput="calculateMonthlyDistance()" />
-                    <span asp-validation-for="OneYearMediumDistance" class="text-danger"></span>
-                </div>
-                <div class="col-md-6 mb-3">
-                    <label for="monthlyDistance" class="control-label">1 oylik bosib o'tish me'yori [km]</label>
-                    <input type="text" id="monthlyDistance" class="form-control" readonly />
-                </div>
-            </div>
-
-            <div class="form-group row">
-                <div class="col-md-6 mb-3">
-                    <label for="yearlyMediumFuel" class="control-label">1 yillik yoqilg'i me'yori [litr]</label>
-                    <input type="text" id="yearlyMediumFuel" class="form-control" readonly />
-                </div>
-                <div class="col-md-6 mb-3">
-                    <label for="monthlyMediumFuel" class="control-label">1 oylik yoqilg'i me'yori [litr]</label>
-                    <input type="text" id="monthlyMediumFuel" class="form-control" readonly />
-                </div>
-            </div>
-
-            <div class="form-group mt-3">
-                <a asp-action="Index" class="btn btn-outline-info">
-                    <i class="fa-solid fa-arrow-left-long"></i>
-                    Orqaga
-                </a>
-                <button class="btn btn-outline-success">
-                    <i class="fa fa-plus"></i> Yaratish
-                </button>
-            </div>
-        </form>
+<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
+<link href="https://fonts.googleapis.com/css2?family=Lato&display=swap" rel="stylesheet">
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.bundle.min.js"></script>
+
+<form asp-action="Create" method="post" id="createCarForm" onsubmit="return validateForm()">
+    @Html.AntiForgeryToken()
+    <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+    <div class="row">
+        <div class=" col-md-6 mb-3">
+            <label asp-for="Model" class="control-label">Model</label>
+            <input asp-for="Model" class="form-control" />
+            <span asp-validation-for="Model" class="text-danger"></span>
+        </div>
+        <div class="col-md-6 mb-3">
+            <label asp-for="Number" class="control-label">Davlat raqami</label>
+            <input asp-for="Number" class="form-control" />
+            <span asp-validation-for="Number" class="text-danger"></span>
+        </div>
+        <div class="col-md-6 mb-3">
+            <label asp-for="Color" class="control-label">Rangi</label>
+            <input asp-for="Color" class="form-control" />
+            <span asp-validation-for="Color" class="text-danger"></span>
+        </div>
+        <div class="col-md-6 mb-3">
+            <label asp-for="ManufacturedYear" class="control-label">Ishlab chiqarilgan yili</label>
+            <input asp-for="ManufacturedYear" class="form-control" />
+            <span asp-validation-for="ManufacturedYear" class="text-danger"></span>
+        </div>
+        <div class="col-md-6 mb-3">
+            <label asp-for="Mileage" class="control-label">Bosib o'tilgan masofasi [km]</label>
+            <input asp-for="Mileage" class="form-control" />
+            <span asp-validation-for="Mileage" class="text-danger"></span>
+        </div>
+        <div class="col-md-6 mb-3">
+            <label asp-for="FuelTankCapacity" class="control-label">Yoqilg'i baki sig'imi</label>
+            <input asp-for="FuelTankCapacity" class="form-control" id="fuelTankCapacity" />
+            <span asp-validation-for="FuelTankCapacity" class="text-danger"></span>
+        </div>
+        <div class="col-md-6 mb-3">
+            <label asp-for="MeduimFuelConsumption" class="control-label">100 km uchun yoqilg'i me'yori [litr]</label>
+            <input asp-for="MeduimFuelConsumption" class="form-control" id="meduimFuelConsumption" />
+            <span asp-validation-for="MeduimFuelConsumption" class="text-danger"></span>
+        </div>
+        <div class="col-md-6 mb-3">
+            <label asp-for="RemainingFuel" class="control-label">Avtomobildagi yoqilg'i qoldig'i [litr]</label>
+            <input asp-for="RemainingFuel" class="form-control" id="remainingFuel" oninput="validateRemainingFuel()" />
+            <span asp-validation-for="RemainingFuel" class="text-danger"></span>
+        </div>
+        <div class="col-md-6 mb-3">
+            <label asp-for="OneYearMediumDistance" class="control-label">1 yillik bosib o'tish me'yori [km]</label>
+            <input asp-for="OneYearMediumDistance" class="form-control" id="oneYearMediumDistance" oninput="calculateMonthlyDistance()" />
+            <span asp-validation-for="OneYearMediumDistance" class="text-danger"></span>
+        </div>
+        <div class="col-md-6 mb-3">
+            <label for="monthlyDistance" class="control-label">1 oylik bosib o'tish me'yori [km]</label>
+            <input type="text" id="monthlyDistance" class="form-control" readonly />
+        </div>
+        <div class="col-md-6 mb-3">
+            <label for="yearlyMediumFuel" class="control-label">1 yillik yoqilg'i me'yori [litr]</label>
+            <input type="text" id="yearlyMediumFuel" class="form-control" readonly />
+        </div>
+        <div class="col-md-6 mb-3">
+            <label for="monthlyMediumFuel" class="control-label">1 oylik yoqilg'i me'yori [litr]</label>
+            <input type="text" id="monthlyMediumFuel" class="form-control" readonly />
+        </div>
+    </div>
+    <div class="modal-footer d-flex justify-content-center ">
+        <button type="submit" class="btn btn-success" style="width:200px" id="saveCarBtn">
+            <i class="fa fa-plus"></i> Yaratish
+        </button>
     </div>
-</div>
+</form>
 
+<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
 @section Scripts {
     <script>
         function validateForm() {

CheckDrive.Web/CheckDrive.Web/Views/Cars/Details.cshtml

@@ -91,15 +91,15 @@
 </div>
 
 <div class="mt-4">
-    <a asp-action="Index" class="btn btn-outline-info">
+    <a asp-action="Index" class="btn btn-info">
         <i class="fa-solid fa-arrow-left"></i>
         Orqaga
     </a>
-    <a asp-action="Edit" asp-route-id="@Model?.Id" class="btn btn-outline-warning">
+    <a asp-action="Edit" asp-route-id="@Model?.Id" class="btn btn-warning">
         <i class="fa-solid fa-pen"></i>
         Tahrirlash
     </a>
-    <a asp-action="Delete" asp-route-id="@Model?.Id" class="btn btn-outline-danger">
+    <a asp-action="Delete" asp-route-id="@Model?.Id" class="btn btn-danger">
         <i class="fa-solid fa-trash"></i>
         O'chirish
     </a>

CheckDrive.Web/CheckDrive.Web/Views/Cars/Edit.cshtml

@@ -88,11 +88,11 @@
             </div>
 
             <div class="form-group mt-3">
-                <a asp-action="Details" asp-route-id="@Model?.Id" class="btn btn-outline-info">
+                <a asp-action="Details" asp-route-id="@Model?.Id" class="btn btn-info">
                     <i class="fa-solid fa-arrow-left-long"></i>
                     Orqaga
                 </a>
-                <button class="btn btn-outline-success">
+                <button class="btn btn-success">
                     <i class="fa fa-pencil"></i> Saqlash
                 </button>
             </div>