.drone.yml

@@ -5,8 +5,6 @@ name: default
 trigger:
   event:
     - push
-  branch:
-    - master
 
 steps:
   - name: build
@@ -68,9 +66,9 @@ steps:
          from_secret: SECRET_REGISTRY_USERNAME
        password:
          from_secret: SECRET_REGISTRY_PASSWORD
-    when:
+    # when:
-      branch:
+    #   branch:
-        - master
+    #     - master
 
   # container deployment
   - name: deploy-container

Blazor/Blazor/Blazor.csproj

@@ -9,12 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazored.LocalStorage" Version="4.2.0" />
+    <PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
     <PackageReference Include="Blazored.Modal" Version="7.1.0" />
-    <PackageReference Include="Blazorise.Bootstrap" Version="1.1.2" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="1.1.4.1" />
-    <PackageReference Include="Blazorise.DataGrid" Version="1.1.2" />
+    <PackageReference Include="Blazorise.DataGrid" Version="1.1.4.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.2" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
   </ItemGroup>
 
   <ItemGroup>

Blazor/Blazor/Components/InventoryList.razor

@@ -0,0 +1,25 @@
+@using Blazor.Models
+<h3>Inventory Item List</h3>
+
+<DataGrid TItem="Item"
+          Data="@items"
+          TotalItems="@totalItem"
+          PageSize="10"
+          ShowPager
+          Responsive>
+    <DataGridColumn TItem="Item" Field="@nameof(Item.Id)" Caption="#" />
+    <DataGridColumn TItem="Item" Field="@nameof(Item.Id)" Caption="Image">
+    <DisplayTemplate>
+        @if (!string.IsNullOrWhiteSpace(context.ImageBase64))
+        {
+            <img src="data:image/png;base64, @(context.ImageBase64)" class="img-thumbnail" title="@context.DisplayName" alt="@context.DisplayName" style="width: 60px" />
+        }
+        else
+        {
+            <img src="images/default.png" class="img-thumbnail" title="@context.DisplayName" alt="@context.DisplayName" style="width: 60px"/>
+        }
+    </DisplayTemplate>
+</DataGridColumn>
+    <DataGridColumn TItem="Item" Field="@nameof(Item.DisplayName)" Caption="Display name" />
+    <DataGridColumn TItem="Item" Field="@nameof(Item.CreatedDate)" Caption="Created date" DisplayFormat="{0:d}" DisplayFormatProvider="@System.Globalization.CultureInfo.GetCultureInfo("fr-FR")" />
+</DataGrid>

Blazor/Blazor/Components/InventoryList.razor.cs

@@ -0,0 +1,40 @@
+using Blazor.Models;
+using Blazor.Services;
+using Blazored.Modal;
+using Blazored.Modal.Services;
+using Blazorise.DataGrid;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Localization;
+
+namespace Blazor.Components
+{
+        public partial class InventoryList
+        {
+            private List<Item> items;
+
+            private int totalItem;
+
+            [Inject]
+            public IDataService DataService { get; set; }
+
+            [Inject]
+            public IWebHostEnvironment WebHostEnvironment { get; set; }
+
+            [Inject]
+            public NavigationManager NavigationManager { get; set; }
+
+            [CascadingParameter]
+            public IModalService Modal { get; set; }
+
+            [Inject]
+            public IStringLocalizer<InventoryList> Localizer { get; set; }
+
+            protected override async Task OnInitializedAsync()
+            {
+
+                items = await DataService.getAll();
+                totalItem = await DataService.Count();
+                await base.OnInitializedAsync();
+            }
+    }
+}

Blazor/Blazor/Pages/Inventory.razor

@@ -0,0 +1,18 @@
+@page "/inventory"
+@using Blazor.Components
+@using Blazor.Models
+
+<PageTitle>Counter</PageTitle>
+
+<h1>Inventory</h1>
+
+<div id="master">
+    <div class="inventory">
+        <span>Ici c'est l'inventaire</span>
+    </div>
+
+
+    <div class="inventory-list">
+        <InventoryList/>
+    </div>
+</div>

Blazor/Blazor/Pages/Inventory.razor.css

@@ -0,0 +1,14 @@
+.inventory-list {
+    width: 40%;
+}
+
+.inventory {
+    width: 40%;
+}
+
+#master {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    width: 100%;
+}

Blazor/Blazor/Pages/List.razor

@@ -2,8 +2,6 @@
 @using Models
 <h3>@Localizer["Title"]</h3>
 
-...
-
 <h3>List</h3>
 
 <div>

Blazor/Blazor/Pages/_Layout.cshtml

@@ -7,7 +7,8 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <base href="https://codefirst.iut.uca.fr/containers/blazor-web-remiarnal/" />
+    @*<base href="https://codefirst.iut.uca.fr/containers/blazor-web-remiarnal/" />*@
+    <base href="~/" />
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
     <link href="css/site.css" rel="stylesheet" />
     <link href="Blazor.styles.css" rel="stylesheet" />

Blazor/Blazor/Services/DataApiService.cs

@@ -32,6 +32,11 @@ namespace Blazor.Services
             return await _http.GetFromJsonAsync<List<Item>>($"https://codefirst.iut.uca.fr/containers/container-blazor-web-api-julienriboulet/api/Crafting/?currentPage={currentPage}&pageSize={pageSize}");
         }
 
+        public async Task<List<Item>> getAll()
+        {
+            return await _http.GetFromJsonAsync<List<Item>>($"https://codefirst.iut.uca.fr/containers/container-blazor-web-api-julienriboulet/api/Crafting/?currentPage=0&pageSize=100000");
+        }
+
         public async Task<Item> GetById(int id)
         {
             return await _http.GetFromJsonAsync<Item>($"https://codefirst.iut.uca.fr/containers/container-blazor-web-api-julienriboulet/api/Crafting/{id}");

Blazor/Blazor/Services/DataLocalService.cs

@@ -1,145 +0,0 @@
-using Blazor.Components;
-using Blazor.Factories;
-using Blazor.Models;
-using Blazored.LocalStorage;
-using Microsoft.AspNetCore.Components;
-
-namespace Blazor.Services
-{
-    public class DataLocalService : IDataService
-    {
-        private readonly HttpClient _http;
-        private readonly ILocalStorageService _localStorage;
-        private readonly NavigationManager _navigationManager;
-        private readonly IWebHostEnvironment _webHostEnvironment;
-
-        public DataLocalService(
-            ILocalStorageService localStorage,
-            HttpClient http,
-            IWebHostEnvironment webHostEnvironment,
-            NavigationManager navigationManager)
-        {
-            _localStorage = localStorage;
-            _http = http;
-            _webHostEnvironment = webHostEnvironment;
-            _navigationManager = navigationManager;
-        }
-
-        public async Task Add(ItemModel model)
-        {
-            // Get the current data
-            var currentData = await _localStorage.GetItemAsync<List<Item>>("data");
-
-            // Simulate the Id
-            model.Id = currentData.Max(s => s.Id) + 1;
-
-            // Add the item to the current data
-            currentData.Add(ItemFactory.Create(model));
-
-            // Save the data
-            await _localStorage.SetItemAsync("data", currentData);
-        }
-
-        public async Task<int> Count()
-        {
-            return (await _localStorage.GetItemAsync<Item[]>("data")).Length;
-        }
-
-        public async Task<List<Item>> List(int currentPage, int pageSize)
-        {
-            // Load data from the local storage
-            var currentData = await _localStorage.GetItemAsync<Item[]>("data");
-
-            // Check if data exist in the local storage
-            if (currentData == null)
-            {
-                // this code add in the local storage the fake data
-                var originalData = await _http.GetFromJsonAsync<Item[]>($"{_navigationManager.BaseUri}fake-data.json");
-                await _localStorage.SetItemAsync("data", originalData);
-            }
-
-            return (await _localStorage.GetItemAsync<Item[]>("data")).Skip((currentPage - 1) * pageSize).Take(pageSize).ToList();
-        }
-
-        public async Task<Item> GetById(int id)
-        {
-            // Get the current data
-            var currentData = await _localStorage.GetItemAsync<List<Item>>("data");
-
-            // Get the item int the list
-            var item = currentData.FirstOrDefault(w => w.Id == id);
-
-            // Check if item exist
-            if (item == null)
-            {
-                throw new Exception($"Unable to found the item with ID: {id}");
-            }
-
-            return item;
-        }
-
-        public async Task Update(int id, ItemModel model)
-        {
-            // Get the current data
-            var currentData = await _localStorage.GetItemAsync<List<Item>>("data");
-
-            // Get the item int the list
-            var item = currentData.FirstOrDefault(w => w.Id == id);
-
-            // Check if item exist
-            if (item == null)
-            {
-                throw new Exception($"Unable to found the item with ID: {id}");
-            }
-
-            // Modify the content of the item
-            ItemFactory.Update(item, model);
-
-            // Save the data
-            await _localStorage.SetItemAsync("data", currentData);
-        }
-
-        public async Task Delete(int id)
-        {
-            // Get the current data
-            var currentData = await _localStorage.GetItemAsync<List<Item>>("data");
-
-            // Get the item int the list
-            var item = currentData.FirstOrDefault(w => w.Id == id);
-
-            // Delete item in
-            currentData.Remove(item);
-
-            // Delete the image
-            var imagePathInfo = new DirectoryInfo($"{_webHostEnvironment.WebRootPath}/images");
-            var fileName = new FileInfo($"{imagePathInfo}/{item.Name}.png");
-
-            if (fileName.Exists)
-            {
-                File.Delete(fileName.FullName);
-            }
-
-            // Save the data
-            await _localStorage.SetItemAsync("data", currentData);
-        }
-
-        public Task<List<CraftingRecipe>> GetRecipes()
-        {
-            var items = new List<CraftingRecipe>
-        {
-            new CraftingRecipe
-            {
-                Give = new Item { DisplayName = "Diamond", Name = "diamond" },
-                Have = new List<List<string>>
-                {
-                    new List<string> { "dirt", "dirt", "dirt" },
-                    new List<string> { "dirt", null, "dirt" },
-                    new List<string> { "dirt", "dirt", "dirt" }
-                }
-            }
-        };
-
-            return Task.FromResult(items);
-        }
-    }
-}

Blazor/Blazor/Services/IDataService.cs

@@ -11,6 +11,8 @@ namespace Blazor.Services
 
         Task<List<Item>> List(int currentPage, int pageSize);
 
+        Task<List<Item>> getAll();
+
         Task<Item> GetById(int id);
 
         Task Update(int id, ItemModel model);

Blazor/Blazor/Shared/NavMenu.razor

@@ -29,6 +29,11 @@
                 <span class="oi oi-list-rich" aria-hidden="true"></span> List
             </NavLink>
         </div>
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="inventory">
+                <span class="oi oi-box" aria-hidden="true"></span> Inventory
+            </NavLink>
+        </div>
     </nav>
 </div>