modif sur l'api

blazor
Patrick BRUGIERE 1 year ago
parent 03c4df537e
commit 3bce5e8065

@ -35,9 +35,9 @@ namespace Minecraft.Crafting.Api.Controllers
/// <returns>The async task.</returns> /// <returns>The async task.</returns>
[HttpPost] [HttpPost]
[Route("")] [Route("")]
public Task Add(Item item) public Task Add(User item)
{ {
var data = JsonSerializer.Deserialize<List<Item>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions); var data = JsonSerializer.Deserialize<List<User>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions);
if (data == null) if (data == null)
{ {
@ -60,9 +60,9 @@ namespace Minecraft.Crafting.Api.Controllers
/// <returns>All items.</returns> /// <returns>All items.</returns>
[HttpGet] [HttpGet]
[Route("all")] [Route("all")]
public Task<List<Item>> All() public Task<List<User>> All()
{ {
var data = JsonSerializer.Deserialize<List<Item>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions); var data = JsonSerializer.Deserialize<List<User>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions);
if (data == null) if (data == null)
{ {
@ -80,7 +80,7 @@ namespace Minecraft.Crafting.Api.Controllers
[Route("count")] [Route("count")]
public Task<int> Count() public Task<int> Count()
{ {
var data = JsonSerializer.Deserialize<List<Item>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions); var data = JsonSerializer.Deserialize<List<User>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions);
if (data == null) if (data == null)
{ {
@ -99,7 +99,7 @@ namespace Minecraft.Crafting.Api.Controllers
[Route("{id}")] [Route("{id}")]
public Task Delete(int id) public Task Delete(int id)
{ {
var data = JsonSerializer.Deserialize<List<Item>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions); var data = JsonSerializer.Deserialize<List<User>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions);
if (data == null) if (data == null)
{ {
@ -127,9 +127,9 @@ namespace Minecraft.Crafting.Api.Controllers
/// <returns>The item.</returns> /// <returns>The item.</returns>
[HttpGet] [HttpGet]
[Route("{id}")] [Route("{id}")]
public Task<Item> GetById(int id) public Task<User> GetById(int id)
{ {
var data = JsonSerializer.Deserialize<List<Item>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions); var data = JsonSerializer.Deserialize<List<User>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions);
if (data == null) if (data == null)
{ {
@ -155,9 +155,9 @@ namespace Minecraft.Crafting.Api.Controllers
/// </returns> /// </returns>
[HttpGet] [HttpGet]
[Route("by-name/{name}")] [Route("by-name/{name}")]
public Task<Item> GetByName(string name) public Task<User> GetByName(string name)
{ {
var data = JsonSerializer.Deserialize<List<Item>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions); var data = JsonSerializer.Deserialize<List<User>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions);
if (data == null) if (data == null)
{ {
@ -205,9 +205,9 @@ namespace Minecraft.Crafting.Api.Controllers
/// <returns>The items.</returns> /// <returns>The items.</returns>
[HttpGet] [HttpGet]
[Route("")] [Route("")]
public Task<List<Item>> List(int currentPage, int pageSize) public Task<List<User>> List(int currentPage, int pageSize)
{ {
var data = JsonSerializer.Deserialize<List<Item>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions); var data = JsonSerializer.Deserialize<List<User>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions);
if (data == null) if (data == null)
{ {
@ -230,7 +230,7 @@ namespace Minecraft.Crafting.Api.Controllers
System.IO.File.Delete("Data/items.json"); System.IO.File.Delete("Data/items.json");
} }
var data = JsonSerializer.Deserialize<List<Item>>(System.IO.File.ReadAllText("Data/items-original.json"), _jsonSerializerOptions); var data = JsonSerializer.Deserialize<List<User>>(System.IO.File.ReadAllText("Data/items-original.json"), _jsonSerializerOptions);
if (data == null) if (data == null)
{ {
@ -277,9 +277,9 @@ namespace Minecraft.Crafting.Api.Controllers
imageFilepath = Convert.ToBase64String(System.IO.File.ReadAllBytes($"Images/oak_{item.Name}.png")); imageFilepath = Convert.ToBase64String(System.IO.File.ReadAllBytes($"Images/oak_{item.Name}.png"));
} }
if (imageFilepath == defaultImage && System.IO.File.Exists($"Images/{item.DisplayName.ToLower().Replace(" ", "_")}.png")) if (imageFilepath == defaultImage && System.IO.File.Exists($"Images/{item.Name.ToLower().Replace(" ", "_")}.png"))
{ {
imageFilepath = Convert.ToBase64String(System.IO.File.ReadAllBytes($"Images/{item.DisplayName.ToLower().Replace(" ", "_")}.png")); imageFilepath = Convert.ToBase64String(System.IO.File.ReadAllBytes($"Images/{item.Name.ToLower().Replace(" ", "_")}.png"));
} }
if (imageFilepath == defaultImage && imageTranslation.ContainsKey(item.Name)) if (imageFilepath == defaultImage && imageTranslation.ContainsKey(item.Name))
@ -321,9 +321,9 @@ namespace Minecraft.Crafting.Api.Controllers
/// <returns>The async task.</returns> /// <returns>The async task.</returns>
[HttpPut] [HttpPut]
[Route("{id}")] [Route("{id}")]
public Task Update(int id, Item item) public Task Update(int id, User item)
{ {
var data = JsonSerializer.Deserialize<List<Item>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions); var data = JsonSerializer.Deserialize<List<User>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions);
var itemOriginal = data?.FirstOrDefault(w => w.Id == id); var itemOriginal = data?.FirstOrDefault(w => w.Id == id);
@ -334,13 +334,13 @@ namespace Minecraft.Crafting.Api.Controllers
itemOriginal.Id = item.Id; itemOriginal.Id = item.Id;
itemOriginal.Name = item.Name; itemOriginal.Name = item.Name;
itemOriginal.CreatedDate = item.CreatedDate; itemOriginal.Surname = item.Surname;
itemOriginal.DisplayName = item.DisplayName; itemOriginal.Nickname = item.Nickname;
itemOriginal.EnchantCategories = item.EnchantCategories; itemOriginal.Email = item.Email;
itemOriginal.MaxDurability = item.MaxDurability; itemOriginal.ExtraTime = item.ExtraTime;
itemOriginal.RepairWith = item.RepairWith; itemOriginal.Password = item.Password;
itemOriginal.StackSize = item.StackSize; itemOriginal.Roles = item.Roles;
itemOriginal.UpdatedDate = item.UpdatedDate; itemOriginal.Group = item.Group;
itemOriginal.ImageBase64 = item.ImageBase64; itemOriginal.ImageBase64 = item.ImageBase64;
System.IO.File.WriteAllText("Data/items.json", JsonSerializer.Serialize(data, _jsonSerializerOptions)); System.IO.File.WriteAllText("Data/items.json", JsonSerializer.Serialize(data, _jsonSerializerOptions));
@ -356,7 +356,7 @@ namespace Minecraft.Crafting.Api.Controllers
/// <param name="line">The line.</param> /// <param name="line">The line.</param>
/// <param name="row">The row.</param> /// <param name="row">The row.</param>
/// <returns>The name of the item.</returns> /// <returns>The name of the item.</returns>
private static string GetItemName(List<Item> items, InShape[][] inShape, int line, int row) private static string GetItemName(List<User> items, InShape[][] inShape, int line, int row)
{ {
if (inShape.Length < line + 1) if (inShape.Length < line + 1)
{ {
@ -384,7 +384,7 @@ namespace Minecraft.Crafting.Api.Controllers
/// <param name="items">The items.</param> /// <param name="items">The items.</param>
/// <param name="id">The identifier.</param> /// <param name="id">The identifier.</param>
/// <returns>The name of the item.</returns> /// <returns>The name of the item.</returns>
private static string GetItemName(List<Item> items, long id) private static string GetItemName(List<User> items, long id)
{ {
var item = items.FirstOrDefault(w => w.Id == id); var item = items.FirstOrDefault(w => w.Id == id);
return item?.Name; return item?.Name;
@ -395,7 +395,7 @@ namespace Minecraft.Crafting.Api.Controllers
/// </summary> /// </summary>
private void ConvertRecipes() private void ConvertRecipes()
{ {
var data = JsonSerializer.Deserialize<List<Item>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions); var data = JsonSerializer.Deserialize<List<User>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions);
if (data == null) if (data == null)
{ {

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 343 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 259 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 206 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 298 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 260 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 236 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 235 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 270 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 157 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 256 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 149 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 171 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 358 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 397 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 231 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 298 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 268 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 480 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 349 B

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save