Merge pull request #36 from DiyorMarket/Update-SideBar-And-Create-Accounts-Index

Update side bar and create accounts index

Author: SharifovDeveloper

CheckDrive.Web/CheckDrive.Web/Controllers/AccountsController.cs

@@ -15,8 +15,9 @@ public AccountsController(IAccountDataStore accountDataStore)
 
         public async Task<IActionResult> Index()
         {
-            var accounts = await _accountDataStore.GetAccounts(2);
-            return View(accounts);
+            var accounts = await _accountDataStore.GetAccounts();
+            ViewBag.Accounts = accounts.Data;
+            return View();
         }
 
         public async Task<IActionResult> Details(int id)

CheckDrive.Web/CheckDrive.Web/Controllers/DriversController.cs

@@ -21,7 +21,7 @@ public DriversController(IDriverDataStore driverDataStore, IAccountDataStore acc
 
         public async Task<IActionResult> Index()
         {
-            var accounts = await _accountDataStore.GetAccounts(2);
+            var accounts = await _accountDataStore.GetAccounts();
             var roles = await _roleDataStore.GetRoles();
             var drivers = new List<Account>();
 

CheckDrive.Web/CheckDrive.Web/Service/ApiClient.cs

@@ -5,7 +5,7 @@ namespace CheckDrive.Web.Service
 {
     public class ApiClient
     {
-        private const string baseUrl = "https://rtd6g5vp-7111.asse.devtunnels.ms/api";
+        private const string baseUrl = "https://j066xkvj-7111.euw.devtunnels.ms/api";
 
         private readonly HttpClient _client = new();
         private readonly IHttpContextAccessor _contextAccessor;

CheckDrive.Web/CheckDrive.Web/Stores/Accounts/AccountDataStore.cs

@@ -15,16 +15,10 @@ public AccountDataStore(ApiClient apiClient)
             _api = apiClient;
         }
 
-        public async Task<GetAccountResponse> GetAccounts(int roleId)
+        public async Task<GetAccountResponse> GetAccounts()
         {
-            StringBuilder query = new("");
 
-            if (roleId != null)
-            {
-                query.Append($"roleId={roleId}&");
-            }
-
-            var response = _api.Get("accounts?" + query.ToString());
+            var response = _api.Get("accounts");
 
             if (!response.IsSuccessStatusCode)
             {

CheckDrive.Web/CheckDrive.Web/Stores/Accounts/IAccountDataStore.cs

@@ -5,7 +5,7 @@ namespace CheckDrive.Web.Stores.Accounts
 {
     public interface IAccountDataStore
     {
-        Task<GetAccountResponse> GetAccounts(int roleId);
+        Task<GetAccountResponse> GetAccounts();
         Task<Account> GetAccount(int id);
         Task<Account> CreateAccount(Account account);
         Task<Account> UpdateAccount(int id, Account account);

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

@@ -0,0 +1,27 @@
+@model CheckDrive.Web.Models.Account
+
+@{
+    ViewData["Title"] = "Index";
+    Layout = "~/Views/Shared/_Layout.cshtml";
+}
+<h2>Ishchilar</h2>
+
+<div class="row">
+    <div class="col-12">
+        <ejs-grid id="accounts-list"
+                  dataSource="@ViewBag.Accounts"
+                  gridLines="Vertical"
+                  allowSorting="true">
+            <e-grid-columns>
+                <e-grid-column headerText="Id" field="Id" field="Id" typeof="Text"></e-grid-column>
+                <e-grid-column headerText="Email" field="Login" typeof="Text"></e-grid-column>
+                <e-grid-column headerText="Parol" field="Password" typeof="text"></e-grid-column>
+                <e-grid-column headerText="Telefon raqam" field="PhoneNumber" typeof="text"></e-grid-column>
+                <e-grid-column headerText="Ism" field="FirstName" typeof="text"></e-grid-column>
+                <e-grid-column headerText="Familiya" field="LastName" typeof="text"></e-grid-column>
+                <e-grid-column headerText="Tugilgan yil" field="Bithdate" typeof="text"></e-grid-column>
+                <e-grid-column headerText="RoleId" field="RoleId" typeof="text"></e-grid-column>
+            </e-grid-columns>
+        </ejs-grid>
+    </div>
+</div>

CheckDrive.Web/CheckDrive.Web/Views/Shared/_SideBar.cshtml

@@ -13,38 +13,55 @@
 
     menuItems.Add(new
     {
-        text = "Ishchilar",
+        text = "Ishchilar va avtomobillar",
         separator = true,
     });
 
     menuItems.Add(new
     {
-        text = "Haydovchilar",
+        text = "Ishchilar",
+        url = "/accounts",
+        iconCss = "fa-solid fa-user-group"
+    });
+    menuItems.Add(new
+    {
+        text = "Avtomobillar",
         iconCss = "fas fa-car",
         url = "/drivers"
     });
 
     menuItems.Add(new
     {
-        text = "Operatorlar",
+        text = "Xizmat ko'rsatish",
+        separator = true,
+    });
+    menuItems.Add(new
+    {
+        text = "Doctor Ko'riklari",
+        iconCss = "fas fa-user-doctor",
+        url = "/drivers"
+    });
+    menuItems.Add(new
+    {
+        text = "Mechanik (topshirishlari)",
         iconCss = "fa-solid fa-phone-volume",
-        url = "/operators"
+        url = "/operator"
     });
     menuItems.Add(new
     {
-        text = "Shifokorlar",
+        text = "Operator xizmatilari",
         iconCss = "fa-solid fa-user-doctor",
         url = "/doctors"
     });
     menuItems.Add(new
     {
-        text = "Mexaniklar",
+        text = "Despicherlar Xizmati",
         iconCss = "fa-solid fa-user-gear",
         url = "/mechanics"
     });
     menuItems.Add(new
     {
-        text = "Dispetcherlar",
+        text = "Mechanik (qabul qilishlari)",
         iconCss = "fa-solid fa-person-chalkboard",
         url = "/dispatchers"
     });