vianney.jourdy
/
MapManga
0
8
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

test merge Mathéo master
continuous-integration/drone/push Build is failing Details

Browse Source
DataBinding
Vianney JOURDY 2 years ago
parent 57582f2459
commit 0e694c13f4
6 changed files with 61 additions and 188 deletions
Show Stats Download Patch File Download Diff File

2
MangaMap/App.xaml.cs
Unescape View File

@ -18,7 +18,7 @@ public partial class App : Application
MyManager.Admins.Add(MyAdmin); MyManager.Admins.Add(MyAdmin);
MainPage = new AppShell(); MainPage = new AppShell();
MyManager.Persistance = new DataContract(); //MyManager.Persistance = new DataContract();
MyManager.sauvegarder(); MyManager.sauvegarder();
} }

1
MangaMap/AppShell.xaml.cs
Unescape View File

@ -8,6 +8,7 @@ public partial class AppShell : Shell
{ {
InitializeComponent(); InitializeComponent();
Routing.RegisterRoute("homePageDisconnectdetails", typeof(homePageDisconnect));
Routing.RegisterRoute("homePagedetails", typeof(homePage)); Routing.RegisterRoute("homePagedetails", typeof(homePage));
Routing.RegisterRoute("inscriptionPagedetails", typeof(signUpPage)); Routing.RegisterRoute("inscriptionPagedetails", typeof(signUpPage));
Routing.RegisterRoute("connexionPagedetails", typeof(loginPage)); Routing.RegisterRoute("connexionPagedetails", typeof(loginPage));

195
MangaMap/MangaMap.csproj
Unescape View File

@ -1,111 +1,3 @@
<<<<<<< HEAD
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
<OutputType Condition="'$(TargetFramework)' != 'net7.0'">Exe</OutputType>
<RootNamespace>MangaMap</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<!-- Display name -->
<ApplicationTitle>MangaMap</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.mangamap</ApplicationId>
<ApplicationIdGuid>61196d0c-418f-4fb6-8dc5-c920275e1035</ApplicationIdGuid>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />
<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<AndroidResource Remove="Component\**" />
<Compile Remove="Component\**" />
<EmbeddedResource Remove="Component\**" />
<MauiCss Remove="Component\**" />
<MauiXaml Remove="Component\**" />
<None Remove="Component\**" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\Images\logo.png" />
<None Remove="Resources\Images\settings.png" />
<None Remove="Resources\Images\test.jpg" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Update="CustomHeader.xaml.cs">
<DependentUpon>CustomHeader.xaml</DependentUpon>
</Compile>
<Compile Update="Views\signUpPage.xaml.cs">
<DependentUpon>signUpPage.xaml</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<MauiXaml Update="CustomHeader.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Resources\Theme\DarkTheme.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\Composants\StyleBouton.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\homePage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\listPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\loginPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\settingsPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\signUpPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>
</Project>
=======
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
@ -157,18 +49,18 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidResource Remove="Component\**" /> <AndroidResource Remove="Component\**" />
<Compile Remove="Component\**" /> <Compile Remove="Component\**" />
<EmbeddedResource Remove="Component\**" /> <EmbeddedResource Remove="Component\**" />
<MauiCss Remove="Component\**" /> <MauiCss Remove="Component\**" />
<MauiXaml Remove="Component\**" /> <MauiXaml Remove="Component\**" />
<None Remove="Component\**" /> <None Remove="Component\**" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Remove="Resources\Images\logo.png" /> <None Remove="Resources\Images\logo.png" />
<None Remove="Resources\Images\settings.png" /> <None Remove="Resources\Images\settings.png" />
<None Remove="Resources\Images\test.jpg" /> <None Remove="Resources\Images\test.jpg" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -176,43 +68,42 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="CustomHeader.xaml.cs"> <Compile Update="CustomHeader.xaml.cs">
<DependentUpon>CustomHeader.xaml</DependentUpon> <DependentUpon>CustomHeader.xaml</DependentUpon>
</Compile> </Compile>
<Compile Update="Views\signUpPage.xaml.cs"> <Compile Update="Views\signUpPage.xaml.cs">
<DependentUpon>signUpPage.xaml</DependentUpon> <DependentUpon>signUpPage.xaml</DependentUpon>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MauiXaml Update="CustomHeader.xaml"> <MauiXaml Update="CustomHeader.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Resources\Theme\DarkTheme.xaml"> <MauiXaml Update="Resources\Theme\DarkTheme.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\Composants\StyleBouton.xaml"> <MauiXaml Update="Views\Composants\StyleBouton.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\homePage.xaml"> <MauiXaml Update="Views\homePage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\homePageDisconnect.xaml"> <MauiXaml Update="Views\homePageDisconnect.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\listPage.xaml"> <MauiXaml Update="Views\listPage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\loginPage.xaml"> <MauiXaml Update="Views\loginPage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\settingsPage.xaml"> <MauiXaml Update="Views\settingsPage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\signUpPage.xaml"> <MauiXaml Update="Views\signUpPage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
</ItemGroup> </ItemGroup>
</Project> </Project>
>>>>>>> Mathéo

23
MangaMap/Stub/DataContract.cs
Unescape View File

@ -41,32 +41,17 @@ namespace MangaMap.Stub
var serializer = new DataContractSerializer(typeof(DataToPersist)); var serializer = new DataContractSerializer(typeof(DataToPersist));
DataToPersist data; DataToPersist data;
if (File.Exists(Path.Combine(FilePath, FileName))) /*if (File.Exists(Path.Combine(FilePath, FileName)))
{ {*/
using (Stream s = File.OpenRead(Path.Combine(FilePath, FileName))) using (Stream s = File.OpenRead(Path.Combine(FilePath, FileName)))
{ {
data = serializer.ReadObject(s) as DataToPersist; data = serializer.ReadObject(s) as DataToPersist;
} }/*
} }
else else
{ {
data = new DataToPersist(); data = new DataToPersist();
} }*/
// Vérifier si un utilisateur avec le même nom d'utilisateur existe déjà
var existingUser = data.Utilisateurs.FirstOrDefault(user => user.Pseudo == u.Last().Pseudo);
if (existingUser != null)
{
// Mettre à jour l'utilisateur existant
existingUser.MotDePasse = u.Last().MotDePasse;
existingUser.Email = u.Last().Email;
}
else
{
// Ajouter le nouvel utilisateur à la liste existante
data.Utilisateurs.Add(u.Last());
}
var settings = new XmlWriterSettings() { Indent = true }; var settings = new XmlWriterSettings() { Indent = true };
using (TextWriter tw = File.CreateText(Path.Combine(FilePath, FileName))) using (TextWriter tw = File.CreateText(Path.Combine(FilePath, FileName)))

17
MangaMap/Views/loginPage.xaml.cs
Unescape View File

@ -5,8 +5,9 @@ using MangaMap.Stub;
using MangaMap.Model; using MangaMap.Model;
public partial class loginPage : ContentPage public partial class loginPage : ContentPage
{ {
public Manager my_manager => (App.Current as App).MyManager;
public loginPage() public loginPage()
{ {
InitializeComponent(); InitializeComponent();
@ -32,27 +33,15 @@ public partial class loginPage : ContentPage
return; return;
} }
// Charger les données à partir de la persistance
IPersistanceManager persistanceManager = new DataContract();
(List<Oeuvre> oeuvres, List<Utilisateur> utilisateurs) = persistanceManager.chargeDonne();
// Vérifier que l'utilisateur existe // Vérifier que l'utilisateur existe
Utilisateur utilisateur = utilisateurs.FirstOrDefault(u => u.Email == email && u.MotDePasse == password); Utilisateur utilisateur = my_manager.Utilisateurs.FirstOrDefault(u => u.Email == email && u.MotDePasse == password);
if (utilisateur == null) if (utilisateur == null)
{ {
<<<<<<< HEAD
await DisplayAlert("Erreur", "Le mot de passe entré est incorrect.", "OK"); await DisplayAlert("Erreur", "Le mot de passe entré est incorrect.", "OK");
return; return;
} }
// Redirection vers la page suivante si le mot de passe est correct
=======
await DisplayAlert("Erreur", "L'e-mail ou le mot de passe est incorrect.", "OK");
return;
}
// Rediriger l'utilisateur vers la page principale // Rediriger l'utilisateur vers la page principale
>>>>>>> Mathéo
await Navigation.PushAsync(new homePage()); await Navigation.PushAsync(new homePage());
} }

11
MangaMap/Views/signUpPage.xaml.cs
Unescape View File

@ -2,6 +2,7 @@ namespace MangaMap.Views;
using MangaMap.Model; using MangaMap.Model;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using static System.Runtime.InteropServices.JavaScript.JSType;
public partial class signUpPage : ContentPage public partial class signUpPage : ContentPage
{ {
@ -24,6 +25,14 @@ public partial class signUpPage : ContentPage
string password = passwordEntry.Text; string password = passwordEntry.Text;
string confirmPassword = confirmPasswordEntry.Text; string confirmPassword = confirmPasswordEntry.Text;
foreach (Utilisateur u in my_manager.Utilisateurs)
{
if (u.Email == email ||u.Pseudo==pseudo)
{
await DisplayAlert("Erreur", "L'utilisateur existe déjà.", "OK");
return;
}
}
if (string.IsNullOrWhiteSpace(email) || if (string.IsNullOrWhiteSpace(email) ||
string.IsNullOrWhiteSpace(password) || string.IsNullOrWhiteSpace(confirmPassword)) string.IsNullOrWhiteSpace(password) || string.IsNullOrWhiteSpace(confirmPassword))
@ -66,8 +75,6 @@ public partial class signUpPage : ContentPage
await Navigation.PushAsync(new homePage()); await Navigation.PushAsync(new homePage());
return; return;
} }
} }
bool IsPasswordStrong(string password) bool IsPasswordStrong(string password)

Write Preview
Loading…
Cancel
Save