tentive correction add api

possiblité d'ajouter du vocabulaire et fix de 2/3 bugitos

.drone.yml

@@ -74,6 +74,7 @@ steps:
         CONTAINERNAME: api-in-english-please
         COMMAND: create
         OVERWRITE: true
+        CODEFIRST_CLIENTDRONE_ENV_BASE_PATH: /containers/antoinejourdain-api-in-english-please/
     depends_on: [ docker-build-api ]
     when:
       branch:
@@ -103,6 +104,7 @@ steps:
         CONTAINERNAME: in-english-please
         COMMAND: create
         OVERWRITE: true
+        CODEFIRST_CLIENTDRONE_ENV_BASE_PATH: /containers/antoinejourdain-in-english-please/
     depends_on: [ docker-build-app ]
     when:
       branch:

Project/adminBlazor/adminBlazor.Api/Controllers/UserController.cs

@@ -34,7 +34,7 @@ namespace Minecraft.Crafting.Api.Controllers
         /// <param name="item">The item.</param>
         /// <returns>The async task.</returns>
         [HttpPost]
-        [Route("")]
+        [Route("add")]
         public Task Add(User item)
         {
             var data = JsonSerializer.Deserialize<List<User>>(System.IO.File.ReadAllText("Data/users.json"), _jsonSerializerOptions);
@@ -46,6 +46,11 @@ namespace Minecraft.Crafting.Api.Controllers
 
             // Simulate the Id
             item.Id = data.Max(s => s.Id) + 1;
+            if(item.ImageBase64 == "string")
+                item.ImageBase64 = null;
+            if (item.Roles.FirstOrDefault() == "string")
+                item.Roles.Add("Student");
+
 
             data.Add(item);
 

Project/adminBlazor/adminBlazor/Factories/TranslationFactory.cs

@@ -0,0 +1,35 @@
+using adminBlazor.Models;
+
+namespace adminBlazor.Factories;
+
+public class TranslationFactory
+{
+    public static Translation Create(TranslationModel model)
+    {
+        return new Translation
+        {
+            Id = model.Id,
+            FirstWord = model.FirstWord,
+            SecondWord = model.SecondWord
+        };
+    }
+    
+    public static TranslationModel ToModel(Translation translation)
+    {
+        return new TranslationModel
+        {
+            Id = translation.Id,
+            FirstWord = translation.FirstWord,
+            SecondWord = translation.SecondWord
+        };
+    }
+    
+    public static void Update(Translation item, TranslationModel model)
+    {
+        if (!string.IsNullOrEmpty(model.FirstWord))
+            item.FirstWord = model.FirstWord;
+
+        if (!string.IsNullOrEmpty(model.SecondWord))
+            item.SecondWord = model.SecondWord;
+    }
+}

Project/adminBlazor/adminBlazor/Factories/VocListFactory.cs

@@ -9,34 +9,73 @@ namespace adminBlazor.Factories
 {
     public static class VocListFactory
     {
-        public static VocabularyListModel ToModel(VocabularyList voc)
+        public static VocabularyListModel ToModel(VocabularyList voc, byte[] imageContent)
         {
-            return new VocabularyListModel
+            VocabularyListModel model = new VocabularyListModel
             {
                 Id = voc.Id,
                 Name = voc.Name,
                 Image = voc.Image,
-                Aut = voc.Aut
+                Aut = voc.Aut,
+                ImageBase64 = string.IsNullOrWhiteSpace(voc.ImageBase64) ? Convert.ToBase64String(imageContent) : voc.ImageBase64
             };
+                model.Translations = new List<TranslationModel>();
+                foreach (var item in voc.Translations)
+                {
+                    model.Translations.Add(new TranslationModel
+                    {
+                        Id = item.Id,
+                        FirstWord = item.FirstWord,
+                        SecondWord = item.SecondWord
+                    });
+            }
+            return model;
         }
 
         public static VocabularyList Create(VocabularyListModel voc)
         {
-            return new VocabularyList
+            VocabularyList model = new VocabularyList
             {
                 Id = voc.Id,
                 Name = voc.Name,
                 Image = voc.Image,
-                Aut = voc.Aut
+                Aut = voc.Aut,
+                ImageBase64 = voc.Image != null ? Convert.ToBase64String(voc.Image) : null
             };
+            model.Translations = new List<Translation>();
+            foreach (var item in voc.Translations)
+            {
+                model.Translations.Add(new Translation
+                {
+                    Id = item.Id,
+                    FirstWord = item.FirstWord,
+                    SecondWord = item.SecondWord
+                });
+            }
+            return model;
         }
         public static void Update(VocabularyList item, VocabularyListModel voc)
         {
             if (!string.IsNullOrEmpty(voc.Name))
                 item.Name = voc.Name;
 
-            if (!string.IsNullOrEmpty(voc.Image))
+            if (voc.ImageBase64 != null && voc.Image != null)
-                item.Image = voc.Image;
+                item.ImageBase64 = Convert.ToBase64String(voc.Image);
+
+            if (voc.Aut != null)
+                item.Aut = voc.Aut;
+
+            if (voc.Translations == null) return;
+            item.Translations = new List<Translation>();
+            foreach (var translation in voc.Translations)
+            {
+                item.Translations.Add(new Translation
+                {
+                    Id = translation.Id,
+                    FirstWord = translation.FirstWord,
+                    SecondWord = translation.SecondWord
+                });
+            }
         }
 
     }

Project/adminBlazor/adminBlazor/Models/Translation.cs

@@ -3,10 +3,9 @@ namespace adminBlazor.Models
 {
 	public class Translation
 	{
-        private int id;
+		public int Id { get; set; }
-		private string word1;
+		public string FirstWord { get; set; }
-		private string word2;
+		public string SecondWord { get; set; }
-		private int listVoc;
 	}
 }
 

Project/adminBlazor/adminBlazor/Models/TranslationModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace adminBlazor.Models
+{
+	public class TranslationModel
+	{
+		public int Id { get; set; }
+		[Required]
+		public string FirstWord { get; set; }
+		[Required]
+		public string SecondWord { get; set; }
+	}
+}
+

Project/adminBlazor/adminBlazor/Models/VocabularyList.cs

@@ -5,8 +5,11 @@ namespace adminBlazor.Models
 	{
 		public int Id { get; set; }
         public string Name { get; set; }
-        public string Image { get; set; }
+        public byte[] Image { get; set; }
         public int? Aut { get; set; }
+        
+        public string? ImageBase64 { get; set; }
+        public List<Translation>? Translations { get; set; }
 	}
 }
 

Project/adminBlazor/adminBlazor/Models/VocabularyListModel.cs

@@ -8,11 +8,16 @@ namespace adminBlazor.Models
         [Required]
         public int Id { get; set; }
 
+        [Required]
+        [StringLength(50, ErrorMessage = "Name length can't be more than 50.")]
         public string Name { get; set; }
 
-        public string Image { get; set; }
+        public byte[] Image { get; set; }
 
         public int? Aut { get; set; }
+        
+        public string ImageBase64 { get; set; }
+        public List<TranslationModel>? Translations { get; set; }
     }
 }
 

Project/adminBlazor/adminBlazor/Pages/AddUser.razor

@@ -1,5 +1,6 @@
-@page "/add"
+@page "/addUser"
 @attribute [Authorize(Roles = "admin")]
+@using adminBlazor.Models
 <h3>Add</h3>
 
 <EditForm Model="@user" OnValidSubmit="@HandleValidSubmit">

Project/adminBlazor/adminBlazor/Pages/AddUser.razor.cs

@@ -7,7 +7,7 @@ using adminBlazor.Services;
 
 namespace adminBlazor.Pages
 {
-    public partial class Add
+    public partial class AddUser
     {
         [Inject]
         public NavigationManager NavigationManager { get; set; }
@@ -26,7 +26,7 @@ namespace adminBlazor.Pages
         /// <summary>
         /// The current user model
         /// </summary>
-        private Models.UserModel user = new Models.UserModel()
+        private UserModel user = new UserModel()
         {
             Roles = new List<string>()
     };

Project/adminBlazor/adminBlazor/Pages/AddVoc.razor

@@ -0,0 +1,44 @@
+@page "/addVoc"
+@attribute [Authorize(Roles = "teacher")]
+@using adminBlazor.Models
+@using Blazorise.Extensions
+<h3>Add Vocabulary List</h3>
+
+<EditForm Model="@voc" OnValidSubmit="@HandleValidSubmit">
+    <DataAnnotationsValidator />
+    <ValidationSummary />
+
+    <p>
+        <label for="name">
+            Name:
+            <InputText id="name" @bind-Value="voc.Name" />
+            <ValidationMessage For="@(() => voc.Name)"/>
+        </label>
+    </p>
+    <h4>Words:</h4>
+                @if (voc.Translations.IsNullOrEmpty() == false)
+                {
+                    foreach (var word in voc.Translations)
+                    {
+                        {
+                            <div class="word-container">
+                                <label>
+                                    First Word:
+                                    <InputText @bind-Value="word.FirstWord"/>
+                                </label>
+                                <label>
+                                    Second Word:
+                                    <InputText @bind-Value="word.SecondWord"/>
+                                </label>
+                            </div>
+                            <button type="button" @onclick="() => RemoveWord(word)">Remove Word</button>
+                        }
+                    }
+                }
+                else
+                {
+                    <p>No words</p>
+                }
+                <button type="button" @onclick="AddWord">Add Word</button>
+                <button type="submit">Submit</button>
+</EditForm>

Project/adminBlazor/adminBlazor/Pages/AddVoc.razor.cs

@@ -0,0 +1,40 @@
+using Blazored.LocalStorage;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components;
+using adminBlazor.Models;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using adminBlazor.Services;
+
+namespace adminBlazor.Pages
+{
+    public partial class AddVoc
+    {
+        [Inject] public NavigationManager NavigationManager { get; set; }
+
+        [Inject] public IVocListService VocService { get; set; }
+
+        private VocabularyListModel voc = new VocabularyListModel();
+
+        private async void HandleValidSubmit()
+        {
+            voc.Translations ??= new List<TranslationModel>();
+            await VocService.Add(voc);
+
+            NavigationManager.NavigateTo("voc");
+        }
+        
+        private void AddWord()
+        {
+            if (voc.Translations == null)
+            {
+                voc.Translations = new List<TranslationModel>();
+            }
+            voc.Translations.Add(new TranslationModel());
+        }
+        
+        private void RemoveWord(TranslationModel word)
+        {
+            voc.Translations.Remove(word);
+        }
+    }
+}

Project/adminBlazor/adminBlazor/Pages/EditUser.razor.cs

@@ -57,7 +57,6 @@ namespace adminBlazor.Pages
             var fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/default.jpeg");
 
             // Set the model with the item
-
             user = UserFactory.ToModel(item,fileContent);
         }
 

Project/adminBlazor/adminBlazor/Pages/EditVoc.razor

@@ -1,11 +1,14 @@
 @page "/editVoc/{Id:int}"
 @attribute [Authorize(Roles = "teacher")]
 @using adminBlazor.Models
+@using Blazorise.Extensions
 
 
 <h3>Edit</h3>
 <h4>Voc id : @Id</h4>
-<EditForm Model="@voc" OnValidSubmit="@HandleValidSubmit">
+@if (voc != null)
+{
+    <EditForm Model="@voc" OnValidSubmit="@HandleValidSubmit">
         <DataAnnotationsValidator />
         <ValidationSummary />
         
@@ -15,15 +18,38 @@
                 <InputText id="name" @bind-Value="voc.Name" />
                 <ValidationMessage For="@(() => voc.Name)" />
             </label>
-    </p>
 
-    <p>
-        <label for="image">
-            Image:
-            <InputText id="image" @bind-Value="voc.Image" />
-            <ValidationMessage For="@(() => voc.Image)" />
-        </label>
         </p>
         
+        <h4>Words:</h4>
+        @if (voc.Translations.IsNullOrEmpty() == false)
+        {
+            foreach (var word in voc.Translations)
+            {
+                {
+                    <div class="word-container">
+                        <label>
+                            First Word:
+                            <InputText @bind-Value="word.FirstWord"/>
+                        </label>
+                        <label>
+                            Second Word:
+                            <InputText @bind-Value="word.SecondWord"/>
+                        </label>
+                    </div>
+                    <button type="button" @onclick="() => RemoveWord(word)">Remove Word</button>
+                }
+            }
+        }
+        else
+        {
+            <p>No words</p>
+        }
+        <button type="button" @onclick="AddWord">Add Word</button>
         <button type="submit">Submit</button>
-</EditForm>
+    </EditForm>
+}
+else
+{
+    <p>Loading...</p>
+}

Project/adminBlazor/adminBlazor/Pages/EditVoc.razor.cs

@@ -3,7 +3,11 @@ using adminBlazor.Models;
 using adminBlazor.Services;
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Hosting;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
 
 
 namespace adminBlazor.Pages
@@ -22,23 +26,46 @@ namespace adminBlazor.Pages
         [Inject]
         public IWebHostEnvironment WebHostEnvironment { get; set; }
 
-        public VocabularyList currVoc;
-
         private VocabularyListModel voc = new VocabularyListModel();
 
         private async void HandleValidSubmit()
         {
             await VocListService.Update(Id, voc);
 
-            NavigationManager.NavigateTo("list");
+            NavigationManager.NavigateTo("voc");
+        }
+        
+        private async Task LoadImage(InputFileChangeEventArgs e)
+        {
+            // Set the content of the image to the model
+            using (var memoryStream = new MemoryStream())
+            {
+                await e.File.OpenReadStream().CopyToAsync(memoryStream);
+                voc.Image = memoryStream.ToArray();
+            }
+        }
+
+        private void AddWord()
+        {
+            if (voc.Translations == null)
+            {
+                voc.Translations = new List<TranslationModel>();
+            }
+            voc.Translations.Add(new TranslationModel());
         }
         
+        private void RemoveWord(TranslationModel word)
+        {
+            voc.Translations.Remove(word);
+        }
 
-        protected async Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {
             var item = await VocListService.GetById(Id);
 
-            voc = VocListFactory.ToModel(item);
+            var fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/default.jpeg");
+            
+            voc = VocListFactory.ToModel(item,fileContent);
         }
     }
 }

Project/adminBlazor/adminBlazor/Pages/List.razor

@@ -11,9 +11,7 @@
 <h3>List</h3>
 
 <div>
-    <NavLink class="btn btn-primary" href="Add" Match="NavLinkMatch.All">
+      <a href="addUser" class="btn btn-primary" > <i class="fa fa-plus"></i> Ajouter </a> 
-        <i class="fa fa-plus"></i> Ajouter
-    </NavLink>
 </div>
 
 <DataGrid TItem="User"

Project/adminBlazor/adminBlazor/Pages/Voc.razor

@@ -10,6 +10,10 @@
 <link href="_content/Blazorise.Bootstrap/blazorise.bootstrap.css" rel="stylesheet" />
 <h3>Vocabulary Lists</h3>
 
+<div>
+      <a href="addVoc" class="btn btn-primary" > <i class="fa fa-plus"></i> Ajouter </a> 
+</div>
+
 <DataGrid TItem="VocabularyList"
           Data="@_vocList"
           ReadData="@OnReadData"
@@ -18,9 +22,20 @@
           ShowPager
           Responsive>
 
+    <DataGridColumn TItem="VocabularyList" Field="@nameof(VocabularyList.Id)" Caption="Image">
+        <DisplayTemplate>
+            @if (!string.IsNullOrWhiteSpace(context.ImageBase64))
+            {
+                <img src="@($"data:image/png;base64, {context.ImageBase64}")" class="img-thumbnail" style="min-width: 50px; max-width: 150px" />
+            }
+            else
+            {
+                <img src="images/words.jpg" class="img-thumbnail" style="max-width: 150px" />
+            }
+        </DisplayTemplate>
+    </DataGridColumn>
     <DataGridColumn TItem="VocabularyList" Field="@nameof(VocabularyList.Id)" Caption="id" />
     <DataGridColumn TItem="VocabularyList" Field="@nameof(VocabularyList.Name)" Caption="Name" />
-    <DataGridColumn TItem="VocabularyList" Field="@nameof(VocabularyList.Image)" Caption="Image" />
     <DataGridColumn TItem="VocabularyList" Field="@nameof(VocabularyList.Aut)" Caption="Author ID">
         <DisplayTemplate>
             @if (context is VocabularyList voc)

Project/adminBlazor/adminBlazor/Pages/_Host.cshtml

@@ -1,5 +1,6 @@
 @page "/"
 @using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Mvc.TagHelpers
 @namespace adminBlazor.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 

Project/adminBlazor/adminBlazor/Program.cs

@@ -25,7 +25,6 @@ builder.Services.AddBlazoredModal();
 builder.Services.AddRazorPages();
     builder.Services.AddServerSideBlazor();
 builder.Services.AddScoped<IDataService, DataLocalService>();
-builder.Services.AddScoped<IDataService, DataApiService>();
 
 
 builder.Services.AddScoped<IVocListService, VocListLocalService>();

Project/adminBlazor/adminBlazor/Properties/launchSettings.json

@@ -1,14 +1,5 @@
 {
   "profiles": {
-    "http": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "http://localhost:5138",
-      "dotnetRunMessages": true
-    },
     "https": {
       "commandName": "Project",
       "launchBrowser": true,

Project/adminBlazor/adminBlazor/Services/AuthService.cs

@@ -20,8 +20,8 @@
         {
             CurrentUser = new List<AppUser>
             {
-                new AppUser { UserName = "Admin", Password = "123456", Roles = new List<string> { "admin" } },
+                new AppUser { UserName = "Admin", Password = "1", Roles = new List<string> { "admin" } },
-                new AppUser{ UserName ="Teacher1", Password = "123456", Roles = new List<string>{ "teacher" } }
+                new AppUser{ UserName = "Teacher", Password = "1", Roles = new List<string>{ "teacher" } }
             };
         }
 

Project/adminBlazor/adminBlazor/Services/DataApiService.cs

@@ -1,6 +1,7 @@
 using adminBlazor.Components;
 using adminBlazor.Factories;
 using adminBlazor.Models;
+using Microsoft.AspNetCore.Http.HttpResults;
 using System.Reflection.Metadata.Ecma335;
 
 namespace adminBlazor.Services
@@ -24,24 +25,24 @@ namespace adminBlazor.Services
             var item = UserFactory.Create(model);
 
             // Save the data
-            await _http.PostAsJsonAsync("https://localhost:7234/api/User/", item);
+            await _http.PostAsJsonAsync("http://host.docker.internal:7234/api/User/add", item);
         }
 
         public async Task<int> Count()
         {
-            return await _http.GetFromJsonAsync<int>("https://localhost:7234/api/User/count");
+            return await _http.GetFromJsonAsync<int>("http://host.docker.internal:7234/api/User/count");
         }
 
         public async Task<List<User>> List(int currentPage, int pageSize)
         {
             _logger.LogInformation("User API : call of method LIST.");
-            return await _http.GetFromJsonAsync<List<User>>($"https://localhost:7234/api/User/?currentPage={currentPage}&pageSize={pageSize}");
+            return await _http.GetFromJsonAsync<List<User>>($"http://host.docker.internal:7234/api/User/?currentPage={currentPage}&pageSize={pageSize}");
         }
 
         public async Task<User> GetById(int id)
         {
             _logger.LogInformation("User API : call of method GetByID.");
-            return await _http.GetFromJsonAsync<User>($"https://localhost:7234/api/User/{id}");
+            return await _http.GetFromJsonAsync<User>($"http://host.docker.internal:7234/api/User/{id}");
         }
 
         public async Task Update(int id, UserModel model)
@@ -51,18 +52,18 @@ namespace adminBlazor.Services
 
             _logger.LogInformation("User API : call of method UPDATE on User ID : {Id}.", id);
 
-             await _http.PutAsJsonAsync($"https://localhost:7234/api/User/{id}", item);
+             await _http.PutAsJsonAsync($"http://host.docker.internal:7234/api/User/{id}", item);
         }
 
         public async Task Delete(int id)
         {
             _logger.LogInformation("User API : call of method DELETE on User ID : {Id}.", id);
-            await _http.DeleteAsync($"https://localhost:7234/api/User/{id}");
+            await _http.DeleteAsync($"http://host.docker.internal:7234/api/User/{id}");
         }
 
          public async Task<List<CraftingRecipe>> GetRecipes()
          {
-            return await _http.GetFromJsonAsync<List<CraftingRecipe>>("https://localhost:7234/api/User/recipe");
+            return await _http.GetFromJsonAsync<List<CraftingRecipe>>("http://host.docker.internal:7234/api/User/recipe");
          }
     }
 }

Project/adminBlazor/adminBlazor/Services/VocListLocalService.cs

@@ -62,6 +62,7 @@ namespace adminBlazor.Services
             {
                 // this code add in the local storage the fake data
                 var originalData = await _http.GetFromJsonAsync<VocabularyList[]>($"{_navigationManager.BaseUri}voc.json");
+                
                 await _localStorage.SetItemAsync("voc", originalData);
             }
 

Project/adminBlazor/adminBlazor/appsettings.json

@@ -1,4 +1,5 @@
 {
+  "https_port": 443,
   "Creators": {
     "Name": [
       "Patrick Brugière",
@@ -10,7 +11,8 @@
   "Logging": {
     "LogLevel": { 
       "Default": "Error", 
-      "Microsoft": "Warning" 
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.AspNetCore.DataProtection": "None"
     },
     "Debug": {
       "LogLevel": {

Project/adminBlazor/adminBlazor/wwwroot/voc.json

@@ -2,13 +2,27 @@
   {
     "id": 1,
     "name": "Entreprise",
-    "image": "link",
+    "image": null,
-    "aut": null
+    "aut": null,
+    "translations" : [{
+      "id": 1,
+      "firstWord" : "pain",
+      "secondWord" : "bread"
+    },
+      {"id": 1,
+        "firstWord" : "vin",
+        "secondWord" : "wine"
+      }]
   },
   {
     "id": 2,
     "name": "Animaux",
-    "image": "link",
+    "image": null,
-    "aut" :  1
+    "aut" :  1,
+    "translations": [{
+      "id": 1,
+      "firstWord" : "baguette",
+      "secondWord" : "pain"
+    }]
   }
 ]