From 09d3c28ba4366077dfa570fe9464393069bfb964 Mon Sep 17 00:00:00 2001 From: Vianney JOURDY Date: Fri, 28 Apr 2023 17:06:15 +0200 Subject: [PATCH 1/3] test du prof --- MangaMap/CustomHeader.xaml | 3 +- MangaMap/CustomHeader.xaml.cs | 22 +-- MangaMap/Model/Admin.cs | 36 ++--- MangaMap/Model/Manager.cs | 12 ++ MangaMap/Model/Personne.cs | 15 +- MangaMap/Views/listPage.xaml | 251 +++++++++++++++++----------------- 6 files changed, 178 insertions(+), 161 deletions(-) create mode 100644 MangaMap/Model/Manager.cs diff --git a/MangaMap/CustomHeader.xaml b/MangaMap/CustomHeader.xaml index b9827b1..ff0bfe8 100644 --- a/MangaMap/CustomHeader.xaml +++ b/MangaMap/CustomHeader.xaml @@ -7,6 +7,7 @@ + VerticalOptions="Center" + Clicked="ImageButton_Clicked"/> \ No newline at end of file diff --git a/MangaMap/CustomHeader.xaml.cs b/MangaMap/CustomHeader.xaml.cs index b34c7fb..3c3d567 100644 --- a/MangaMap/CustomHeader.xaml.cs +++ b/MangaMap/CustomHeader.xaml.cs @@ -1,9 +1,15 @@ -namespace MangaMap; - -public partial class NewContent1 : ContentView -{ - public NewContent1() - { - InitializeComponent(); - } +using MangaMap.Views; +namespace MangaMap; + +public partial class NewContent1 : ContentView +{ + public NewContent1() + { + InitializeComponent(); + } + + void ImageButton_Clicked(System.Object sender, System.EventArgs e) + { + Navigation.PushAsync(new homePage()); + } } \ No newline at end of file diff --git a/MangaMap/Model/Admin.cs b/MangaMap/Model/Admin.cs index 1ba1fe6..9905621 100644 --- a/MangaMap/Model/Admin.cs +++ b/MangaMap/Model/Admin.cs @@ -1,24 +1,24 @@ using MangaMap.Views; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MangaMap.Model -{ - public class Admin : Personne +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MangaMap.Model +{ + public class Admin : Personne { public Admin(string mdp, string email, string pseudo) : base(mdp, email, pseudo) { } - public int Id { get; private set; } - - - - public void ajouterAnime() { } - - public void supprimerAnime() { } - } -} + public int Id { get; private set; } + + + + public void ajouterAnime() { } + + public void supprimerAnime() { } + } +} diff --git a/MangaMap/Model/Manager.cs b/MangaMap/Model/Manager.cs new file mode 100644 index 0000000..48c1d72 --- /dev/null +++ b/MangaMap/Model/Manager.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MangaMap.Model +{ + internal class Manager + { + } +} diff --git a/MangaMap/Model/Personne.cs b/MangaMap/Model/Personne.cs index 0a4652c..b044450 100644 --- a/MangaMap/Model/Personne.cs +++ b/MangaMap/Model/Personne.cs @@ -8,18 +8,9 @@ namespace MangaMap.Model { public class Personne { - public string MotDePasse { get; private set; } - public string Email { get; private set; } - public string Pseudo { get; private set; } - - /*public Liste[] Listes { get; private set; }*/ - - public Personne(string mdp, string email, string pseudo) - { - Email = email; - Pseudo = pseudo; - MotDePasse = mdp; - } + public string MotDePasse { get; set; } + public string Email { get; set; } + public string Pseudo { get; set; } public bool MofifierMotDePasse(string MotDePasse) { diff --git a/MangaMap/Views/listPage.xaml b/MangaMap/Views/listPage.xaml index 933ecdb..14ba381 100644 --- a/MangaMap/Views/listPage.xaml +++ b/MangaMap/Views/listPage.xaml @@ -1,171 +1,178 @@ - - - - - - - - - - - - - - - - + - + \ No newline at end of file From f8ba032476501777ec0919ef9cc7d1e01748615c Mon Sep 17 00:00:00 2001 From: Vianney JOURDY Date: Fri, 28 Apr 2023 17:08:30 +0200 Subject: [PATCH 2/3] =?UTF-8?q?je=20me=20suis=20tromp=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MangaMap/App.xaml.cs | 5 ++++- MangaMap/Model/Manager.cs | 24 +++++++++++++++++++++++- MangaMap/Model/Oeuvre.cs | 2 +- MangaMap/Model/Utilisateur.cs | 9 ++++++++- MangaMap/Views/signUpPage.xaml.cs | 8 ++++++++ 5 files changed, 44 insertions(+), 4 deletions(-) diff --git a/MangaMap/App.xaml.cs b/MangaMap/App.xaml.cs index 74ca949..96e485a 100644 --- a/MangaMap/App.xaml.cs +++ b/MangaMap/App.xaml.cs @@ -1,9 +1,12 @@ -using MangaMap.Views; +using MangaMap.Model; +using MangaMap.Views; namespace MangaMap; public partial class App : Application { + + public Manager MyManager { get; private set; } = new Manager(); public App() { InitializeComponent(); diff --git a/MangaMap/Model/Manager.cs b/MangaMap/Model/Manager.cs index 48c1d72..dd9511d 100644 --- a/MangaMap/Model/Manager.cs +++ b/MangaMap/Model/Manager.cs @@ -6,7 +6,29 @@ using System.Threading.Tasks; namespace MangaMap.Model { - internal class Manager + public class Manager { + + public List Admins { get; private set; } + public List Utilisateurs { get; private set; } + + public List Oeuvres { get; private set; } + + + + + public Manager() { + Admins = new List(); + Utilisateurs = new List(); + Oeuvres = new List(); + } + + public void ajouterUtilisateur(Utilisateur u) + { + Utilisateurs.Add(u); + } + + + } } diff --git a/MangaMap/Model/Oeuvre.cs b/MangaMap/Model/Oeuvre.cs index f506883..c8465b1 100644 --- a/MangaMap/Model/Oeuvre.cs +++ b/MangaMap/Model/Oeuvre.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace MangaMap.Model { - class Oeuvre + public class Oeuvre { public string Nom { get; private set; } public List Genre { get; private set; } diff --git a/MangaMap/Model/Utilisateur.cs b/MangaMap/Model/Utilisateur.cs index cd03369..6564567 100644 --- a/MangaMap/Model/Utilisateur.cs +++ b/MangaMap/Model/Utilisateur.cs @@ -6,14 +6,21 @@ using System.Threading.Tasks; namespace MangaMap.Model { - public class Utilisateur + public class Utilisateur : Personne { public string nom { get; private set; } public string prenom { get; private set; } public int age { get; private set; } + public List ListeOeuvreEnVisionnage { get; private set; } + public List ListeOeuvreDejaVu { get; private set; } + public List ListeOeuvrePourPlusTard { get; private set; } + public List ListeOeuvreFavorites { get; private set; } public Utilisateur(string nom, string prenom, int age) { + this.Email = "rr"; + this.Pseudo = "55"; + this.MotDePasse = "45"; this.nom = nom; this.prenom = prenom; this.age = age; diff --git a/MangaMap/Views/signUpPage.xaml.cs b/MangaMap/Views/signUpPage.xaml.cs index fc6731a..e3ba14a 100644 --- a/MangaMap/Views/signUpPage.xaml.cs +++ b/MangaMap/Views/signUpPage.xaml.cs @@ -1,8 +1,13 @@ namespace MangaMap.Views; + +using MangaMap.Model; using System.Text.RegularExpressions; public partial class signUpPage : ContentPage { + + public Manager my_manager => (App.Current as App).MyManager; + public signUpPage() { InitializeComponent(); @@ -47,6 +52,9 @@ public partial class signUpPage : ContentPage await Navigation.PushAsync(new homePage()); } + Utilisateur util = new Utilisateur("Ryan", "Garcia", 12); + my_manager.ajouterUtilisateur(util); + } bool IsPasswordStrong(string password) From 7125f7499194ec274c9914a079194c131ea33613 Mon Sep 17 00:00:00 2001 From: V J Date: Wed, 3 May 2023 11:31:34 +0200 Subject: [PATCH 3/3] =?UTF-8?q?manager=20r=C3=A9ussi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MangaMap/App.xaml.cs | 2 +- MangaMap/Model/Admin.cs | 5 ++++- MangaMap/Model/Manager.cs | 7 ------- MangaMap/Model/Personne.cs | 4 ---- MangaMap/Model/Utilisateur.cs | 8 ++++---- MangaMap/Views/signUpPage.xaml | 6 ++++++ MangaMap/Views/signUpPage.xaml.cs | 6 +++++- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/MangaMap/App.xaml.cs b/MangaMap/App.xaml.cs index 96e485a..24756ad 100644 --- a/MangaMap/App.xaml.cs +++ b/MangaMap/App.xaml.cs @@ -5,8 +5,8 @@ namespace MangaMap; public partial class App : Application { - public Manager MyManager { get; private set; } = new Manager(); + public App() { InitializeComponent(); diff --git a/MangaMap/Model/Admin.cs b/MangaMap/Model/Admin.cs index 9905621..9ae0a3a 100644 --- a/MangaMap/Model/Admin.cs +++ b/MangaMap/Model/Admin.cs @@ -9,8 +9,11 @@ namespace MangaMap.Model { public class Admin : Personne { - public Admin(string mdp, string email, string pseudo) : base(mdp, email, pseudo) + public Admin(string motDePasse, string email, string pseudo) { + MotDePasse = motDePasse; + Email = email; + Pseudo = pseudo; } public int Id { get; private set; } diff --git a/MangaMap/Model/Manager.cs b/MangaMap/Model/Manager.cs index dd9511d..db9593a 100644 --- a/MangaMap/Model/Manager.cs +++ b/MangaMap/Model/Manager.cs @@ -11,12 +11,8 @@ namespace MangaMap.Model public List Admins { get; private set; } public List Utilisateurs { get; private set; } - public List Oeuvres { get; private set; } - - - public Manager() { Admins = new List(); Utilisateurs = new List(); @@ -27,8 +23,5 @@ namespace MangaMap.Model { Utilisateurs.Add(u); } - - - } } diff --git a/MangaMap/Model/Personne.cs b/MangaMap/Model/Personne.cs index b044450..313fcfa 100644 --- a/MangaMap/Model/Personne.cs +++ b/MangaMap/Model/Personne.cs @@ -53,9 +53,5 @@ namespace MangaMap.Model return false; } - - - - } } diff --git a/MangaMap/Model/Utilisateur.cs b/MangaMap/Model/Utilisateur.cs index 6564567..c86579f 100644 --- a/MangaMap/Model/Utilisateur.cs +++ b/MangaMap/Model/Utilisateur.cs @@ -16,11 +16,11 @@ namespace MangaMap.Model public List ListeOeuvrePourPlusTard { get; private set; } public List ListeOeuvreFavorites { get; private set; } - public Utilisateur(string nom, string prenom, int age) + public Utilisateur(string email, string pseudo, string mdp, string nom, string prenom, int age) { - this.Email = "rr"; - this.Pseudo = "55"; - this.MotDePasse = "45"; + Email = email; + Pseudo = pseudo; + MotDePasse = mdp; this.nom = nom; this.prenom = prenom; this.age = age; diff --git a/MangaMap/Views/signUpPage.xaml b/MangaMap/Views/signUpPage.xaml index cf42d95..4808c1a 100644 --- a/MangaMap/Views/signUpPage.xaml +++ b/MangaMap/Views/signUpPage.xaml @@ -10,6 +10,12 @@