diff --git a/GameAtlas/.vs/GameAtlas/v17/.suo b/GameAtlas/.vs/GameAtlas/v17/.suo index ed9ee51..6996573 100644 Binary files a/GameAtlas/.vs/GameAtlas/v17/.suo and b/GameAtlas/.vs/GameAtlas/v17/.suo differ diff --git a/GameAtlas/GameAtlas/AppShell.xaml b/GameAtlas/GameAtlas/AppShell.xaml index 88db071..4fd90f0 100644 --- a/GameAtlas/GameAtlas/AppShell.xaml +++ b/GameAtlas/GameAtlas/AppShell.xaml @@ -15,6 +15,13 @@ Route="Views/PageConnexion" /> + + + + + + + + + + + + + + + + diff --git a/GameAtlas/GameAtlas/MauiProgram.cs b/GameAtlas/GameAtlas/MauiProgram.cs index be34499..993af59 100644 --- a/GameAtlas/GameAtlas/MauiProgram.cs +++ b/GameAtlas/GameAtlas/MauiProgram.cs @@ -13,13 +13,32 @@ public static class MauiProgram .UseMauiCommunityToolkit() .ConfigureFonts(fonts => { + // Open Sans fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); + + // Aladin fonts.AddFont("Aladin-Regular.ttf", "Aladin"); + + // PT Sans fonts.AddFont("PTSansCaption-Regular.ttf", "PTSansCaption-Regular"); fonts.AddFont("PTSansCaption-Bold.ttf", "PTSansCaption-Bold"); fonts.AddFont("PTSansNarrow-Regular.ttf", "PTSansNarrow-Regular"); fonts.AddFont("PTSansNarrow-Bold.ttf", "PTSansNarrow-Bold"); + + // Roboto + fonts.AddFont("Roboto-Black.ttf", "Roboto-Black"); + fonts.AddFont("Roboto-BlackItalic.ttf", "Roboto-BlackItalic"); + fonts.AddFont("Roboto-Bold.ttf", "Roboto-Bold"); + fonts.AddFont("Roboto-BoldItalic.ttf", "Roboto-BoldItalic"); + fonts.AddFont("Roboto-Italic.ttf", "Roboto-Italic"); + fonts.AddFont("Roboto-Light.ttf", "Roboto-Light"); + fonts.AddFont("Roboto-LightItalic.ttf", "Roboto-LightItalic"); + fonts.AddFont("Roboto-Medium.ttf", "Roboto-Medium"); + fonts.AddFont("Roboto-MediumItalic.ttf", "Roboto-MediumItalic"); + fonts.AddFont("Roboto-Regular.ttf", "Roboto-Regular"); + fonts.AddFont("Roboto-Thin.ttf", "Roboto-Thin"); + fonts.AddFont("Roboto-ThinItalic.ttf", "Roboto-ThinItalic"); }); #if DEBUG diff --git a/GameAtlas/GameAtlas/Models/Utilisateur.cs b/GameAtlas/GameAtlas/Models/Utilisateur.cs index 433e670..b4117a9 100644 --- a/GameAtlas/GameAtlas/Models/Utilisateur.cs +++ b/GameAtlas/GameAtlas/Models/Utilisateur.cs @@ -12,8 +12,8 @@ namespace GameAtlas.Models public string Mail { get; private set; } public string Pseudo { get; private set; } public string Mdp { get; private set; } - public List ListePossedes { get; private set; } - public List ListeFavoris { get; private set; } + //public List ListePossedes { get; private set; } + //public List ListeFavoris { get; private set; } public Utilisateur(string mail, string pseudo, string mdp) { diff --git a/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Black.ttf b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Black.ttf new file mode 100644 index 0000000..96ddf00 Binary files /dev/null and b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Black.ttf differ diff --git a/GameAtlas/GameAtlas/Resources/Fonts/Roboto-BlackItalic.ttf b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-BlackItalic.ttf new file mode 100644 index 0000000..0a034f2 Binary files /dev/null and b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-BlackItalic.ttf differ diff --git a/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Bold.ttf b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Bold.ttf new file mode 100644 index 0000000..7a876e2 Binary files /dev/null and b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Bold.ttf differ diff --git a/GameAtlas/GameAtlas/Resources/Fonts/Roboto-BoldItalic.ttf b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-BoldItalic.ttf new file mode 100644 index 0000000..7fe66d2 Binary files /dev/null and b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-BoldItalic.ttf differ diff --git a/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Italic.ttf b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Italic.ttf new file mode 100644 index 0000000..55f55ec Binary files /dev/null and b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Italic.ttf differ diff --git a/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Light.ttf b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Light.ttf new file mode 100644 index 0000000..46deecf Binary files /dev/null and b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Light.ttf differ diff --git a/GameAtlas/GameAtlas/Resources/Fonts/Roboto-LightItalic.ttf b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-LightItalic.ttf new file mode 100644 index 0000000..ba9aee5 Binary files /dev/null and b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-LightItalic.ttf differ diff --git a/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Medium.ttf b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Medium.ttf new file mode 100644 index 0000000..512af82 Binary files /dev/null and b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Medium.ttf differ diff --git a/GameAtlas/GameAtlas/Resources/Fonts/Roboto-MediumItalic.ttf b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-MediumItalic.ttf new file mode 100644 index 0000000..7e8d21f Binary files /dev/null and b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-MediumItalic.ttf differ diff --git a/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Regular.ttf b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Regular.ttf new file mode 100644 index 0000000..3033308 Binary files /dev/null and b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Regular.ttf differ diff --git a/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Thin.ttf b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Thin.ttf new file mode 100644 index 0000000..5de65ce Binary files /dev/null and b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-Thin.ttf differ diff --git a/GameAtlas/GameAtlas/Resources/Fonts/Roboto-ThinItalic.ttf b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-ThinItalic.ttf new file mode 100644 index 0000000..4f84898 Binary files /dev/null and b/GameAtlas/GameAtlas/Resources/Fonts/Roboto-ThinItalic.ttf differ diff --git a/GameAtlas/GameAtlas/Views/PageAdmin.xaml.cs b/GameAtlas/GameAtlas/Views/PageAdmin.xaml.cs index 561c06c..10cce10 100644 --- a/GameAtlas/GameAtlas/Views/PageAdmin.xaml.cs +++ b/GameAtlas/GameAtlas/Views/PageAdmin.xaml.cs @@ -1,8 +1,8 @@ namespace GameAtlas.Views; -public partial class NewPage1 : ContentPage +public partial class PageAdmin : ContentPage { - public NewPage1() + public PageAdmin() { InitializeComponent(); } diff --git a/GameAtlas/GameAtlas/Views/PageConnexion.xaml b/GameAtlas/GameAtlas/Views/PageConnexion.xaml index 1f63063..e34094a 100644 --- a/GameAtlas/GameAtlas/Views/PageConnexion.xaml +++ b/GameAtlas/GameAtlas/Views/PageConnexion.xaml @@ -4,48 +4,50 @@ xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit" x:Class="GameAtlas.Views.PageConnexion" Title="ECRAN DE CONNEXION" WidthRequest="390" HeightRequest="844" - BackgroundColor="#FAD05D"> + BackgroundColor="Beige"> - +