From b67d2b3478568cf5328bda7f1c387fbf0dfd1599 Mon Sep 17 00:00:00 2001
From: Maxence Lanone <maxence.lanone@etu.uca.fr>
Date: Wed, 15 Mar 2023 17:55:13 +0100
Subject: [PATCH] :ambulance: application maui

---
 Sources/DbDatamanager/ChampionManager.cs      |  1 +
 Sources/EntityFrameWorkLib/ChampionEntity.cs  |  3 ++-
 .../EntityFrameWorkLib.csproj                 | 11 +++++-----
 Sources/EntityFrameWorkLib/RuneEntity.cs      | 22 +++++++++++++++++++
 .../ContentViews/ChampionClassSelector.xaml   | 14 ++++++------
 .../ChampionClassSelector.xaml.cs             |  1 +
 .../ChampionClassToIconConverter.cs           |  1 +
 Sources/LolApp/ViewModels/AddSkillVM.cs       |  2 +-
 Sources/LolApp/ViewModels/ChampionClassVM.cs  |  1 +
 Sources/LolApp/ViewModels/ChampionsPageVM.cs  |  2 ++
 Sources/Model/Champion.cs                     |  1 +
 Sources/Model/Model.csproj                    |  6 -----
 Sources/Model/Rune.cs                         |  1 +
 Sources/Model/Skill.cs                        |  2 +-
 Sources/Shared/Shared.csproj                  |  6 +++++
 Sources/Shared/enums/ChampionClass.cs         |  2 +-
 Sources/Shared/enums/RuneFamily.cs            |  2 +-
 Sources/Shared/enums/SkillType.cs             |  2 +-
 Sources/StubLib/StubData.Champions.cs         |  1 +
 Sources/StubLib/StubData.Runes.cs             |  1 +
 Sources/Tests/ConsoleDB/ConsoleDB.csproj      |  6 ++---
 Sources/Tests/ConsoleTests/Program.cs         |  1 +
 .../TestUnitaireLOL/TestUnitaireLOL.csproj    |  2 +-
 Sources/ViewModels/ChampionVM.cs              |  1 +
 Sources/ViewModels/ChampionsMgrVM.cs          |  1 +
 Sources/ViewModels/EditableChampionVM.cs      |  1 +
 Sources/ViewModels/SkillVM.cs                 |  1 +
 27 files changed, 66 insertions(+), 29 deletions(-)
 create mode 100644 Sources/EntityFrameWorkLib/RuneEntity.cs

diff --git a/Sources/DbDatamanager/ChampionManager.cs b/Sources/DbDatamanager/ChampionManager.cs
index 5d74e3f..1f97fe9 100644
--- a/Sources/DbDatamanager/ChampionManager.cs
+++ b/Sources/DbDatamanager/ChampionManager.cs
@@ -1,6 +1,7 @@
 using System;
 using EntityFrameWorkLib;
 using Model;
+using Shared;
 
 namespace DbDatamanager
 {
diff --git a/Sources/EntityFrameWorkLib/ChampionEntity.cs b/Sources/EntityFrameWorkLib/ChampionEntity.cs
index fde9d2f..d724f42 100644
--- a/Sources/EntityFrameWorkLib/ChampionEntity.cs
+++ b/Sources/EntityFrameWorkLib/ChampionEntity.cs
@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Shared;
 
 namespace EntityFrameWorkLib
 {
@@ -13,7 +14,7 @@ namespace EntityFrameWorkLib
 		public string Name { get; set; }
         public string Bio { get; set; }
         public string Icon { get; set; }
-        public ChampionClassEntity championClass { get; set; }
+        public ChampionClass championClass { get; set; }
 	}
 }
 
diff --git a/Sources/EntityFrameWorkLib/EntityFrameWorkLib.csproj b/Sources/EntityFrameWorkLib/EntityFrameWorkLib.csproj
index eb89a7d..185b9c5 100644
--- a/Sources/EntityFrameWorkLib/EntityFrameWorkLib.csproj
+++ b/Sources/EntityFrameWorkLib/EntityFrameWorkLib.csproj
@@ -12,21 +12,20 @@
     <None Remove="Microsoft.EntityFrameworkCore.Sqlite" />
     <None Remove="Microsoft.EntityFrameworkCore.Tools" />
     <None Remove="Microsoft.EntityFrameworkCore.Design" />
-    <None Remove="enums\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="enums\" />
+    <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Sources/EntityFrameWorkLib/RuneEntity.cs b/Sources/EntityFrameWorkLib/RuneEntity.cs
new file mode 100644
index 0000000..6fca3d2
--- /dev/null
+++ b/Sources/EntityFrameWorkLib/RuneEntity.cs
@@ -0,0 +1,22 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+using Shared;
+
+namespace EntityFrameWorkLib
+{
+    public class RuneEntity
+    {
+        [Key]
+        [MaxLength(256)]
+        public string Name { get; set; }
+
+        [Required]
+        [MaxLength(500)]
+        public string Description { get; set; }
+
+        [Required]
+        public RuneFamily RuneFamily { get; set; }
+    }
+}
+
diff --git a/Sources/LolApp/ContentViews/ChampionClassSelector.xaml b/Sources/LolApp/ContentViews/ChampionClassSelector.xaml
index 6dc66e4..612c20f 100644
--- a/Sources/LolApp/ContentViews/ChampionClassSelector.xaml
+++ b/Sources/LolApp/ContentViews/ChampionClassSelector.xaml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:model="clr-namespace:Model;assembly=Model" 
+             xmlns:shared="clr-namespace:Shared;assembly=Shared" 
              x:Class="LolApp.ContentViews.ChampionClassSelector"
              x:Name="root">
 
     <ContentView.Resources>
-        <model:ChampionClass x:Key="assassin">Assassin</model:ChampionClass>
-        <model:ChampionClass x:Key="fighter">Fighter</model:ChampionClass>
-        <model:ChampionClass x:Key="mage">Mage</model:ChampionClass>
-        <model:ChampionClass x:Key="marksman">Marksman</model:ChampionClass>
-        <model:ChampionClass x:Key="support">Support</model:ChampionClass>
-        <model:ChampionClass x:Key="tank">Tank</model:ChampionClass>
+        <shared:ChampionClass x:Key="assassin">Assassin</shared:ChampionClass>
+        <shared:ChampionClass x:Key="fighter">Fighter</shared:ChampionClass>
+        <shared:ChampionClass x:Key="mage">Mage</shared:ChampionClass>
+        <shared:ChampionClass x:Key="marksman">Marksman</shared:ChampionClass>
+        <shared:ChampionClass x:Key="support">Support</shared:ChampionClass>
+        <shared:ChampionClass x:Key="tank">Tank</shared:ChampionClass>
 
         <ControlTemplate x:Key="RadioButtonTemplate">
                 <Border Stroke="{StaticResource Transparent}"
diff --git a/Sources/LolApp/ContentViews/ChampionClassSelector.xaml.cs b/Sources/LolApp/ContentViews/ChampionClassSelector.xaml.cs
index 74fb508..92eeabc 100644
--- a/Sources/LolApp/ContentViews/ChampionClassSelector.xaml.cs
+++ b/Sources/LolApp/ContentViews/ChampionClassSelector.xaml.cs
@@ -1,4 +1,5 @@
 using Model;
+using Shared;
 
 namespace LolApp.ContentViews;
 
diff --git a/Sources/LolApp/Resources/Converters/ChampionClassToIconConverter.cs b/Sources/LolApp/Resources/Converters/ChampionClassToIconConverter.cs
index 946b9a6..6146e25 100644
--- a/Sources/LolApp/Resources/Converters/ChampionClassToIconConverter.cs
+++ b/Sources/LolApp/Resources/Converters/ChampionClassToIconConverter.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using Model;
+using Shared;
 
 namespace LolApp.Resources.Converters
 {
diff --git a/Sources/LolApp/ViewModels/AddSkillVM.cs b/Sources/LolApp/ViewModels/AddSkillVM.cs
index ef40e97..c6b0cb8 100644
--- a/Sources/LolApp/ViewModels/AddSkillVM.cs
+++ b/Sources/LolApp/ViewModels/AddSkillVM.cs
@@ -3,8 +3,8 @@ using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Model;
+using Shared;
 using ViewModels;
-
 namespace LolApp.ViewModels
 {
 	public partial class AddSkillVM : ObservableObject
diff --git a/Sources/LolApp/ViewModels/ChampionClassVM.cs b/Sources/LolApp/ViewModels/ChampionClassVM.cs
index 992f45f..adbda28 100644
--- a/Sources/LolApp/ViewModels/ChampionClassVM.cs
+++ b/Sources/LolApp/ViewModels/ChampionClassVM.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Model;
+using Shared;
 
 namespace LolApp.ViewModels
 {
diff --git a/Sources/LolApp/ViewModels/ChampionsPageVM.cs b/Sources/LolApp/ViewModels/ChampionsPageVM.cs
index 906875a..b3be98c 100644
--- a/Sources/LolApp/ViewModels/ChampionsPageVM.cs
+++ b/Sources/LolApp/ViewModels/ChampionsPageVM.cs
@@ -3,8 +3,10 @@ using System.Reflection;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Model;
+using Shared;
 using ViewModels;
 
+
 namespace LolApp.ViewModels
 {
     [ObservableObject]
diff --git a/Sources/Model/Champion.cs b/Sources/Model/Champion.cs
index da85129..0efe01e 100644
--- a/Sources/Model/Champion.cs
+++ b/Sources/Model/Champion.cs
@@ -2,6 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Numerics;
 using System.Text;
+using Shared;
 
 namespace Model;
 public class Champion : IEquatable<Champion>
diff --git a/Sources/Model/Model.csproj b/Sources/Model/Model.csproj
index 1061ec5..7121f9c 100644
--- a/Sources/Model/Model.csproj
+++ b/Sources/Model/Model.csproj
@@ -6,12 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="enums\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="enums\" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
diff --git a/Sources/Model/Rune.cs b/Sources/Model/Rune.cs
index f63ad1c..8b6cdbb 100644
--- a/Sources/Model/Rune.cs
+++ b/Sources/Model/Rune.cs
@@ -1,4 +1,5 @@
 using System;
+using Shared;
 
 namespace Model
 {
diff --git a/Sources/Model/Skill.cs b/Sources/Model/Skill.cs
index 56d63df..4461984 100644
--- a/Sources/Model/Skill.cs
+++ b/Sources/Model/Skill.cs
@@ -1,5 +1,5 @@
 using System;
-
+using Shared;
 namespace Model
 {
 	public class Skill : IEquatable<Skill>
diff --git a/Sources/Shared/Shared.csproj b/Sources/Shared/Shared.csproj
index bafd05b..cdcfd2d 100644
--- a/Sources/Shared/Shared.csproj
+++ b/Sources/Shared/Shared.csproj
@@ -6,4 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="enums\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="enums\" />
+  </ItemGroup>
 </Project>
diff --git a/Sources/Shared/enums/ChampionClass.cs b/Sources/Shared/enums/ChampionClass.cs
index d169512..249ca02 100644
--- a/Sources/Shared/enums/ChampionClass.cs
+++ b/Sources/Shared/enums/ChampionClass.cs
@@ -1,5 +1,5 @@
 using System;
-namespace Model
+namespace Shared
 {
 	public enum ChampionClass
 	{
diff --git a/Sources/Shared/enums/RuneFamily.cs b/Sources/Shared/enums/RuneFamily.cs
index 07a232c..4928100 100644
--- a/Sources/Shared/enums/RuneFamily.cs
+++ b/Sources/Shared/enums/RuneFamily.cs
@@ -1,5 +1,5 @@
 using System;
-namespace Model
+namespace Shared
 {
 	public enum RuneFamily
 	{
diff --git a/Sources/Shared/enums/SkillType.cs b/Sources/Shared/enums/SkillType.cs
index d7fc8da..bad87d3 100644
--- a/Sources/Shared/enums/SkillType.cs
+++ b/Sources/Shared/enums/SkillType.cs
@@ -1,5 +1,5 @@
 using System;
-namespace Model
+namespace Shared
 {
 	public enum SkillType
 	{
diff --git a/Sources/StubLib/StubData.Champions.cs b/Sources/StubLib/StubData.Champions.cs
index ad19275..8ed1220 100644
--- a/Sources/StubLib/StubData.Champions.cs
+++ b/Sources/StubLib/StubData.Champions.cs
@@ -1,5 +1,6 @@
 using System;
 using Model;
+using Shared;
 
 namespace StubLib
 {
diff --git a/Sources/StubLib/StubData.Runes.cs b/Sources/StubLib/StubData.Runes.cs
index f0e8802..32fce54 100644
--- a/Sources/StubLib/StubData.Runes.cs
+++ b/Sources/StubLib/StubData.Runes.cs
@@ -1,5 +1,6 @@
 using System;
 using Model;
+using Shared;
 
 namespace StubLib
 {
diff --git a/Sources/Tests/ConsoleDB/ConsoleDB.csproj b/Sources/Tests/ConsoleDB/ConsoleDB.csproj
index fa2a4bd..f628bc5 100644
--- a/Sources/Tests/ConsoleDB/ConsoleDB.csproj
+++ b/Sources/Tests/ConsoleDB/ConsoleDB.csproj
@@ -14,9 +14,9 @@
     <None Remove="Microsoft.EntityFrameworkCore.Tools" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/Sources/Tests/ConsoleTests/Program.cs b/Sources/Tests/ConsoleTests/Program.cs
index 28dc26b..a886d2c 100644
--- a/Sources/Tests/ConsoleTests/Program.cs
+++ b/Sources/Tests/ConsoleTests/Program.cs
@@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Model;
 using StubLib;
 using static System.Console;
+using Shared;
 
 namespace ConsoleTests
 {
diff --git a/Sources/Tests/TestUnitaireLOL/TestUnitaireLOL.csproj b/Sources/Tests/TestUnitaireLOL/TestUnitaireLOL.csproj
index cb2bdfc..0fc8bb0 100644
--- a/Sources/Tests/TestUnitaireLOL/TestUnitaireLOL.csproj
+++ b/Sources/Tests/TestUnitaireLOL/TestUnitaireLOL.csproj
@@ -19,7 +19,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Sources/ViewModels/ChampionVM.cs b/Sources/ViewModels/ChampionVM.cs
index bdd1e7f..f55d05a 100644
--- a/Sources/ViewModels/ChampionVM.cs
+++ b/Sources/ViewModels/ChampionVM.cs
@@ -3,6 +3,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using Model;
 using Microsoft.Maui.Controls;
 using System.Collections.ObjectModel;
+using Shared;
 
 
 namespace ViewModels
diff --git a/Sources/ViewModels/ChampionsMgrVM.cs b/Sources/ViewModels/ChampionsMgrVM.cs
index 06e5d67..6fb5ae3 100644
--- a/Sources/ViewModels/ChampionsMgrVM.cs
+++ b/Sources/ViewModels/ChampionsMgrVM.cs
@@ -6,6 +6,7 @@ using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.Input;
 using System.Data.SqlTypes;
 using System.Reflection;
+using Shared;
 
 namespace ViewModels;
 
diff --git a/Sources/ViewModels/EditableChampionVM.cs b/Sources/ViewModels/EditableChampionVM.cs
index 2db038b..63b5a17 100644
--- a/Sources/ViewModels/EditableChampionVM.cs
+++ b/Sources/ViewModels/EditableChampionVM.cs
@@ -3,6 +3,7 @@ using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Model;
+using Shared;
 
 namespace ViewModels
 {
diff --git a/Sources/ViewModels/SkillVM.cs b/Sources/ViewModels/SkillVM.cs
index c9c2ca1..1c5c9c9 100644
--- a/Sources/ViewModels/SkillVM.cs
+++ b/Sources/ViewModels/SkillVM.cs
@@ -1,6 +1,7 @@
 using System;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Model;
+using Shared;
 
 namespace ViewModels
 {