master
enjolys 3 years ago
parent d378a0fc7d
commit 841d54e395

@ -77,14 +77,6 @@ namespace Minecraft.Crafting.Api.Controllers
return Task.FromResult(item); return Task.FromResult(item);
} }
[HttpGet]
[Route("image")]
public Task<Musique> GetImage(String nameImage)
{
var image = File.Exists($"{WebHostEnvironment.WebRootPath}/Data/images/{nameImage}");
return null;
}
[HttpGet] [HttpGet]
[Route("recipe")] [Route("recipe")]
public Task<List<Recipe>> GetRecipe() public Task<List<Recipe>> GetRecipe()

@ -5,7 +5,7 @@
"auteur": "breakable", "auteur": "breakable",
"duree": 277, "duree": 277,
"genre": "birch_planks", "genre": "birch_planks",
"image": "Senmei", "image": "default.png",
"date": "1963-07-08T00:00:00" "date": "1963-07-08T00:00:00"
}, },
{ {
@ -14,7 +14,7 @@
"auteur": "digger", "auteur": "digger",
"duree": 55, "duree": 55,
"genre": "oak_planks", "genre": "oak_planks",
"image": "Orbaxter", "image": "default.png",
"date": "2008-07-07T00:00:00" "date": "2008-07-07T00:00:00"
}, },
{ {
@ -23,7 +23,7 @@
"auteur": "vanishable", "auteur": "vanishable",
"duree": 634, "duree": 634,
"genre": "jungle_planks", "genre": "jungle_planks",
"image": "Comvey", "image": "default.png",
"date": "2009-07-19T00:00:00" "date": "2009-07-19T00:00:00"
}, },
{ {
@ -32,7 +32,7 @@
"auteur": "armor_chest", "auteur": "armor_chest",
"duree": 2123, "duree": 2123,
"genre": "warped_planks", "genre": "warped_planks",
"image": "Qimonk", "image": "default.png",
"date": "1965-09-07T00:00:00" "date": "1965-09-07T00:00:00"
}, },
{ {
@ -50,7 +50,7 @@
"auteur": "armor_chest", "auteur": "armor_chest",
"duree": 2325, "duree": 2325,
"genre": "warped_planks", "genre": "warped_planks",
"image": "Exoplode", "image": "default.png",
"date": "1964-04-10T00:00:00" "date": "1964-04-10T00:00:00"
}, },
{ {
@ -59,7 +59,7 @@
"auteur": "armor_chest", "auteur": "armor_chest",
"duree": 1984, "duree": 1984,
"genre": "birch_planks", "genre": "birch_planks",
"image": "Venoflex", "image": "default.png",
"date": "1971-06-12T00:00:00" "date": "1971-06-12T00:00:00"
}, },
{ {
@ -68,7 +68,7 @@
"auteur": "vanishable", "auteur": "vanishable",
"duree": 104, "duree": 104,
"genre": "jungle_planks", "genre": "jungle_planks",
"image": "Vicon", "image": "default.png",
"date": "2015-05-23T00:00:00" "date": "2015-05-23T00:00:00"
}, },
{ {
@ -77,7 +77,7 @@
"auteur": "digger", "auteur": "digger",
"duree": 1390, "duree": 1390,
"genre": "warped_planks", "genre": "warped_planks",
"image": "Marqet", "image": "default.png",
"date": "2010-05-21T00:00:00" "date": "2010-05-21T00:00:00"
}, },
{ {
@ -86,7 +86,7 @@
"auteur": "vanishable", "auteur": "vanishable",
"duree": 242, "duree": 242,
"genre": "oak_planks", "genre": "oak_planks",
"image": "Xeronk", "image": "default.png",
"date": "1950-08-23T00:00:00" "date": "1950-08-23T00:00:00"
}, },
{ {
@ -95,7 +95,7 @@
"auteur": "breakable", "auteur": "breakable",
"duree": 1601, "duree": 1601,
"genre": "warped_planks", "genre": "warped_planks",
"image": "Magnemo", "image": "default.png",
"date": "2020-11-19T00:00:00" "date": "2020-11-19T00:00:00"
}, },
{ {
@ -104,7 +104,7 @@
"auteur": "digger", "auteur": "digger",
"duree": 3443, "duree": 3443,
"genre": "warped_planks", "genre": "warped_planks",
"image": "Artiq", "image": "default.png",
"date": "2003-09-03T00:00:00" "date": "2003-09-03T00:00:00"
}, },
{ {
@ -113,7 +113,7 @@
"auteur": "armor_head", "auteur": "armor_head",
"duree": 2904, "duree": 2904,
"genre": "dark_oak_planks", "genre": "dark_oak_planks",
"image": "Geekko", "image": "default.png",
"date": "1965-10-25T00:00:00" "date": "1965-10-25T00:00:00"
}, },
{ {
@ -122,7 +122,7 @@
"auteur": "digger", "auteur": "digger",
"duree": 502, "duree": 502,
"genre": "oak_planks", "genre": "oak_planks",
"image": "Waab", "image": "default.png",
"date": "1971-08-26T00:00:00" "date": "1971-08-26T00:00:00"
}, },
{ {
@ -131,7 +131,7 @@
"auteur": "armor_head", "auteur": "armor_head",
"duree": 2695, "duree": 2695,
"genre": "birch_planks", "genre": "birch_planks",
"image": "Orbean", "image": "default.png",
"date": "2000-06-22T00:00:00" "date": "2000-06-22T00:00:00"
}, },
{ {
@ -140,7 +140,7 @@
"auteur": "vanishable", "auteur": "vanishable",
"duree": 1013, "duree": 1013,
"genre": "oak_planks", "genre": "oak_planks",
"image": "Xth", "image": "default.png",
"date": "1963-12-15T00:00:00" "date": "1963-12-15T00:00:00"
}, },
{ {
@ -149,7 +149,7 @@
"auteur": "armor_chest", "auteur": "armor_chest",
"duree": 1886, "duree": 1886,
"genre": "birch_planks", "genre": "birch_planks",
"image": "Springbee", "image": "default.png",
"date": "1952-09-27T00:00:00" "date": "1952-09-27T00:00:00"
}, },
{ {
@ -158,7 +158,7 @@
"auteur": "armor_chest", "auteur": "armor_chest",
"duree": 3047, "duree": 3047,
"genre": "spruce_planks", "genre": "spruce_planks",
"image": "Brainclip", "image": "default.png",
"date": "1990-02-03T00:00:00" "date": "1990-02-03T00:00:00"
}, },
{ {
@ -167,7 +167,7 @@
"auteur": "armor_chest", "auteur": "armor_chest",
"duree": 1957, "duree": 1957,
"genre": "birch_planks", "genre": "birch_planks",
"image": "Singavera", "image": "default.png",
"date": "2005-03-19T00:00:00" "date": "2005-03-19T00:00:00"
}, },
{ {
@ -176,7 +176,7 @@
"auteur": "weapon", "auteur": "weapon",
"duree": 287, "duree": 287,
"genre": "warped_planks", "genre": "warped_planks",
"image": "Biohab", "image": "default.png",
"date": "1977-03-11T00:00:00" "date": "1977-03-11T00:00:00"
}, },
{ {
@ -185,7 +185,7 @@
"auteur": "digger", "auteur": "digger",
"duree": 2819, "duree": 2819,
"genre": "warped_planks", "genre": "warped_planks",
"image": "Momentia", "image": "default.png",
"date": "2003-02-22T00:00:00" "date": "2003-02-22T00:00:00"
}, },
{ {
@ -194,7 +194,7 @@
"auteur": "breakable", "auteur": "breakable",
"duree": 114, "duree": 114,
"genre": "spruce_planks", "genre": "spruce_planks",
"image": "Elemantra", "image": "default.png",
"date": "1999-02-26T00:00:00" "date": "1999-02-26T00:00:00"
}, },
{ {
@ -203,7 +203,7 @@
"auteur": "breakable", "auteur": "breakable",
"duree": 1322, "duree": 1322,
"genre": "spruce_planks", "genre": "spruce_planks",
"image": "Quordate", "image": "default.png",
"date": "1956-07-19T00:00:00" "date": "1956-07-19T00:00:00"
}, },
{ {
@ -212,7 +212,7 @@
"auteur": "weapon", "auteur": "weapon",
"duree": 3341, "duree": 3341,
"genre": "warped_planks", "genre": "warped_planks",
"image": "Volax", "image": "default.png",
"date": "1994-11-28T00:00:00" "date": "1994-11-28T00:00:00"
}, },
{ {
@ -221,7 +221,7 @@
"auteur": "weapon", "auteur": "weapon",
"duree": 2761, "duree": 2761,
"genre": "acacia_planks", "genre": "acacia_planks",
"image": "Surelogic", "image": "default.png",
"date": "1981-07-20T00:00:00" "date": "1981-07-20T00:00:00"
}, },
{ {
@ -230,7 +230,7 @@
"auteur": "digger", "auteur": "digger",
"duree": 1522, "duree": 1522,
"genre": "spruce_planks", "genre": "spruce_planks",
"image": "Autograte", "image": "default.png",
"date": "1998-01-29T00:00:00" "date": "1998-01-29T00:00:00"
}, },
{ {
@ -239,7 +239,7 @@
"auteur": "armor", "auteur": "armor",
"duree": 1585, "duree": 1585,
"genre": "birch_planks", "genre": "birch_planks",
"image": "Papricut", "image": "default.png",
"date": "2002-12-04T00:00:00" "date": "2002-12-04T00:00:00"
}, },
{ {
@ -248,7 +248,7 @@
"auteur": "armor", "auteur": "armor",
"duree": 241, "duree": 241,
"genre": "oak_planks", "genre": "oak_planks",
"image": "Freakin", "image": "default.png",
"date": "1957-01-09T00:00:00" "date": "1957-01-09T00:00:00"
}, },
{ {
@ -257,7 +257,7 @@
"auteur": "armor", "auteur": "armor",
"duree": 225, "duree": 225,
"genre": "acacia_planks", "genre": "acacia_planks",
"image": "Isopop", "image": "default.png",
"date": "1959-07-06T00:00:00" "date": "1959-07-06T00:00:00"
}, },
{ {
@ -266,7 +266,7 @@
"auteur": "breakable", "auteur": "breakable",
"duree": 629, "duree": 629,
"genre": "birch_planks", "genre": "birch_planks",
"image": "Xoggle", "image": "default.png",
"date": "1965-04-15T00:00:00" "date": "1965-04-15T00:00:00"
}, },
{ {
@ -275,7 +275,7 @@
"auteur": "weapon", "auteur": "weapon",
"duree": 689, "duree": 689,
"genre": "birch_planks", "genre": "birch_planks",
"image": "Peticular", "image": "default.png",
"date": "1996-11-16T00:00:00" "date": "1996-11-16T00:00:00"
}, },
{ {
@ -284,7 +284,7 @@
"auteur": "armor_chest", "auteur": "armor_chest",
"duree": 2062, "duree": 2062,
"genre": "crimson_planks", "genre": "crimson_planks",
"image": "Colaire", "image": "default.png",
"date": "1979-04-30T00:00:00" "date": "1979-04-30T00:00:00"
}, },
{ {
@ -293,7 +293,7 @@
"auteur": "vanishable", "auteur": "vanishable",
"duree": 2447, "duree": 2447,
"genre": "crimson_planks", "genre": "crimson_planks",
"image": "Reversus", "image": "default.png",
"date": "2018-09-20T00:00:00" "date": "2018-09-20T00:00:00"
}, },
{ {
@ -302,7 +302,7 @@
"auteur": "armor", "auteur": "armor",
"duree": 1580, "duree": 1580,
"genre": "jungle_planks", "genre": "jungle_planks",
"image": "Callflex", "image": "default.png",
"date": "2021-04-27T00:00:00" "date": "2021-04-27T00:00:00"
}, },
{ {
@ -311,7 +311,7 @@
"auteur": "armor", "auteur": "armor",
"duree": 3491, "duree": 3491,
"genre": "crimson_planks", "genre": "crimson_planks",
"image": "Poochies", "image": "default.png",
"date": "1987-11-24T00:00:00" "date": "1987-11-24T00:00:00"
}, },
{ {
@ -320,7 +320,7 @@
"auteur": "armor", "auteur": "armor",
"duree": 3295, "duree": 3295,
"genre": "jungle_planks", "genre": "jungle_planks",
"image": "Xixan", "image": "default.png",
"date": "1989-12-24T00:00:00" "date": "1989-12-24T00:00:00"
}, },
{ {
@ -329,7 +329,7 @@
"auteur": "vanishable", "auteur": "vanishable",
"duree": 1531, "duree": 1531,
"genre": "warped_planks", "genre": "warped_planks",
"image": "Hivedom", "image": "default.png",
"date": "1995-06-17T00:00:00" "date": "1995-06-17T00:00:00"
}, },
{ {
@ -338,7 +338,7 @@
"auteur": "armor_chest", "auteur": "armor_chest",
"duree": 7, "duree": 7,
"genre": "crimson_planks", "genre": "crimson_planks",
"image": "Lingoage", "image": "default.png",
"date": "1972-06-30T00:00:00" "date": "1972-06-30T00:00:00"
}, },
{ {
@ -347,7 +347,7 @@
"auteur": "armor_chest", "auteur": "armor_chest",
"duree": 2048, "duree": 2048,
"genre": "dark_oak_planks", "genre": "dark_oak_planks",
"image": "Pearlesex", "image": "default.png",
"date": "2006-11-22T00:00:00" "date": "2006-11-22T00:00:00"
} }
] ]

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
@ -6,6 +6,17 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Compile Remove="Data\musique\**" />
<Content Remove="Data\musique\**" />
<EmbeddedResource Remove="Data\musique\**" />
<None Remove="Data\musique\**" />
</ItemGroup>
<ItemGroup>
<None Remove="wwwroot\images\default.png" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@ -17,9 +28,4 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Data\image\" />
<Folder Include="Data\musique\" />
</ItemGroup>
</Project> </Project>

@ -22,10 +22,6 @@ app.UseAuthorization();
app.MapControllers(); app.MapControllers();
app.UseStaticFiles(new StaticFileOptions app.UseStaticFiles();
{
RequestPath = "/data",
});
app.Run(); app.Run();

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

@ -42,17 +42,22 @@ namespace ProjetBlazor.Pages
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
var item = await DataService.GetById(Id); var musique = await DataService.GetById(Id);
/*
var fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/default.png"); var fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/default.png");
if (File.Exists($"{WebHostEnvironment.WebRootPath}/images/{musiqueModele.titre}.png")) if (File.Exists($"{WebHostEnvironment.WebRootPath}/images/{musiqueModele.titre}.png"))
{ {
fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/{item.titre}.png"); fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/{item.titre}.png");
}*/
var file = await File.ReadAllBytesAsync("https://localhost:7234/images/default.png");
if (!musique.image.Equals("default.png")){
file = await File.ReadAllBytesAsync("https://localhost:7234/images/{musique.image}");
} }
// Set the model with the item // Set the model with the item
musiqueModele = MusiqueFactory.ToModel(item, fileContent); musiqueModele = MusiqueFactory.ToModel(musique, file);
} }
} }
} }

@ -20,14 +20,7 @@
<DataGridColumn TItem="Musique" Field="@nameof(Musique.id)" Caption="Image"> <DataGridColumn TItem="Musique" Field="@nameof(Musique.id)" Caption="Image">
<DisplayTemplate> <DisplayTemplate>
@if (File.Exists($"{WebHostEnvironment.WebRootPath}/images/{context.image}.png")) <img src="https://localhost:7234/images/@(context.image)"/>
{
<img src="images/@(context.image).png" class="img-thumbnail" />
}
else
{
<img src="images/default.png" class="img-thumbnail"/>
}
</DisplayTemplate> </DisplayTemplate>
</DataGridColumn> </DataGridColumn>
<DataGridColumn TItem="Musique" Field="@nameof(Musique.image)" Caption="Nom image" /> <DataGridColumn TItem="Musique" Field="@nameof(Musique.image)" Caption="Nom image" />

@ -0,0 +1,5 @@
@page "/Play"
<h3>Play</h3>

@ -0,0 +1,8 @@

namespace ProjetBlazor.Pages
{
public partial class Play
{
}
}

@ -10,7 +10,6 @@
<PackageReference Include="Blazorise.Bootstrap" Version="1.1.4.1" /> <PackageReference Include="Blazorise.Bootstrap" Version="1.1.4.1" />
<PackageReference Include="Blazorise.DataGrid" Version="1.1.4.1" /> <PackageReference Include="Blazorise.DataGrid" Version="1.1.4.1" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
<Folder Include="wwwroot\images\" />
</ItemGroup> </ItemGroup>
</Project> </Project>

@ -48,5 +48,6 @@ namespace ProjetBlazor.Services
await _http.PutAsJsonAsync($"https://localhost:7234/api/Crafting/{id}", musique); await _http.PutAsJsonAsync($"https://localhost:7234/api/Crafting/{id}", musique);
} }
} }
} }

@ -15,5 +15,6 @@ namespace ProjetBlazor.Services
Task<Musique> GetById(int id); Task<Musique> GetById(int id);
Task<int> Count(); Task<int> Count();
} }
} }

@ -25,8 +25,8 @@
</NavLink> </NavLink>
</div> </div>
<div class="nav-item px-3"> <div class="nav-item px-3">
<NavLink class="nav-link" href="fetchdata"> <NavLink class="nav-link" href="Play">
<span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data <span class="oi oi-list-rich" aria-hidden="true"></span> Play
</NavLink> </NavLink>
</div> </div>
</nav> </nav>

Loading…
Cancel
Save