conflit fix
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
commit
365742508e
@ -1,9 +1,28 @@
|
|||||||
namespace notus;
|
using Biblioteque_de_Class;
|
||||||
|
|
||||||
public partial class ConnecPage : ContentPage
|
namespace notus;
|
||||||
{
|
|
||||||
public ConnecPage()
|
public partial class ConnecPage : ContentPage
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
string mail = "";
|
||||||
}
|
string MDP = "";
|
||||||
|
|
||||||
|
public ConnecPage()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void Valid_Clicked(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
mail = Mail.Text;
|
||||||
|
MDP = Password.Text;
|
||||||
|
if ((Application.Current as App).db.SearchUser(mail, MDP))
|
||||||
|
{
|
||||||
|
await Navigation.PushAsync(new RecherPage());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ResultSearch.IsVisible = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
@ -1,81 +1,82 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||||
x:Class="notus.InscrPage"
|
x:Class="notus.InscrPage"
|
||||||
Title="InscrPage">
|
Title="InscrPage">
|
||||||
|
|
||||||
<Grid BackgroundColor="#1C1C1C">
|
<Grid BackgroundColor="#1C1C1C">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="1*"/>
|
<ColumnDefinition Width="1*"/>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<ColumnDefinition Width="1*"/>
|
<ColumnDefinition Width="1*"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="1*"/>
|
<RowDefinition Height="1*"/>
|
||||||
<RowDefinition Height="150"/>
|
<RowDefinition Height="150"/>
|
||||||
<RowDefinition Height="150"/>
|
<RowDefinition Height="150"/>
|
||||||
<RowDefinition Height="150"/>
|
<RowDefinition Height="150"/>
|
||||||
<RowDefinition Height="1*"/>
|
<RowDefinition Height="1*"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<Entry
|
<Entry
|
||||||
Placeholder="Pseudo"
|
Placeholder="Pseudo"
|
||||||
HorizontalOptions="Center"
|
HorizontalOptions="Center"
|
||||||
VerticalOptions="Center"
|
VerticalOptions="Center"
|
||||||
WidthRequest="600"
|
WidthRequest="600"
|
||||||
HeightRequest="100"
|
HeightRequest="100"
|
||||||
FontSize="32"
|
FontSize="32"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
TextColor="#74fabd"
|
TextColor="#74fabd"
|
||||||
BackgroundColor="#4A4A4A"
|
BackgroundColor="#4A4A4A"
|
||||||
PlaceholderColor="#74fabd"
|
PlaceholderColor="#74fabd"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Entry
|
<Entry
|
||||||
Placeholder="Mot de passe"
|
Placeholder="Mot de passe"
|
||||||
HorizontalOptions="Center"
|
HorizontalOptions="Center"
|
||||||
VerticalOptions="Center"
|
VerticalOptions="Center"
|
||||||
WidthRequest="600"
|
WidthRequest="600"
|
||||||
HeightRequest="100"
|
HeightRequest="100"
|
||||||
FontSize="32"
|
FontSize="32"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
IsPassword="true"
|
IsPassword="true"
|
||||||
TextColor="#74fabd"
|
TextColor="#74fabd"
|
||||||
BackgroundColor="#4A4A4A"
|
BackgroundColor="#4A4A4A"
|
||||||
PlaceholderColor="#74fabd"
|
PlaceholderColor="#74fabd"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Entry
|
<Entry
|
||||||
Placeholder ="Verif mot de passe"
|
Placeholder ="Verif mot de passe"
|
||||||
HorizontalOptions="Center"
|
HorizontalOptions="Center"
|
||||||
VerticalOptions="Center"
|
VerticalOptions="Center"
|
||||||
WidthRequest="600"
|
WidthRequest="600"
|
||||||
HeightRequest="100"
|
HeightRequest="100"
|
||||||
FontSize="32"
|
FontSize="32"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Grid.Row="3"
|
Grid.Row="3"
|
||||||
IsPassword="true"
|
IsPassword="true"
|
||||||
TextColor="#74fabd"
|
TextColor="#74fabd"
|
||||||
BackgroundColor="#4A4A4A"
|
BackgroundColor="#4A4A4A"
|
||||||
PlaceholderColor="#74fabd"
|
PlaceholderColor="#74fabd"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
Text="Valider"
|
Text="Valider"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Grid.Row="4"
|
Grid.Row="4"
|
||||||
HorizontalOptions="End"
|
HorizontalOptions="End"
|
||||||
VerticalOptions="Center"
|
VerticalOptions="Center"
|
||||||
WidthRequest="110"
|
WidthRequest="110"
|
||||||
HeightRequest="70"
|
HeightRequest="70"
|
||||||
BackgroundColor="#74fabd"
|
BackgroundColor="#74fabd"
|
||||||
TextColor="Black"
|
TextColor="Black"
|
||||||
CornerRadius="10"
|
CornerRadius="10"
|
||||||
/>
|
Clicked="Valid_Clicked"
|
||||||
|
/>
|
||||||
</Grid>
|
|
||||||
|
</Grid>
|
||||||
</ContentPage>
|
|
||||||
|
</ContentPage>
|
||||||
|
@ -0,0 +1,74 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
|
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||||
|
xmlns:toolkit="http://schemas.microsoft.com/dodnet/2022/maui/toolkit"
|
||||||
|
x:Class="notus.ProfilPage"
|
||||||
|
Title="ProfilPage"
|
||||||
|
BackgroundColor="#1C1C1C">
|
||||||
|
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="1.5*"/>
|
||||||
|
<RowDefinition Height="1.5*"/>
|
||||||
|
<RowDefinition Height="1.5*"/>
|
||||||
|
<RowDefinition Height="1.5*"/>
|
||||||
|
<RowDefinition Height="1.5*"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="1*"/>
|
||||||
|
<ColumnDefinition Width="1*"/>
|
||||||
|
<ColumnDefinition Width="1*"/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
Text="Modifier Profil"
|
||||||
|
TextColor="#74fabd"
|
||||||
|
BackgroundColor="#4A4A4A"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.Row="4"
|
||||||
|
VerticalOptions="Center"
|
||||||
|
HeightRequest="80"
|
||||||
|
FontSize="30"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
Text="Modifier Theme"
|
||||||
|
TextColor="#74fabd"
|
||||||
|
BackgroundColor="#4A4A4A"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.Row="5"
|
||||||
|
FontSize="30"
|
||||||
|
VerticalOptions="Start"
|
||||||
|
HeightRequest="80"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Label
|
||||||
|
Text="Profil"
|
||||||
|
FontSize="30"
|
||||||
|
HorizontalTextAlignment="Center"
|
||||||
|
VerticalTextAlignment="Center"
|
||||||
|
TextColor="#74fabd"
|
||||||
|
BackgroundColor="#4A4A4A"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.Row="3"
|
||||||
|
VerticalOptions="End"
|
||||||
|
HeightRequest="80"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
Source="profil.png"
|
||||||
|
Aspect="AspectFit"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.Row="2"
|
||||||
|
WidthRequest="550"
|
||||||
|
HeightRequest="250"
|
||||||
|
BackgroundColor="#6E6E6E"
|
||||||
|
CornerRadius="10"
|
||||||
|
Clicked="ProfilClicked"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
</ContentPage>
|
@ -0,0 +1,17 @@
|
|||||||
|
using Microsoft.Maui.Controls;
|
||||||
|
using Biblioteque_de_Class;
|
||||||
|
using Notus_Persistance;
|
||||||
|
|
||||||
|
namespace notus;
|
||||||
|
|
||||||
|
public partial class ProfilPage : ContentPage
|
||||||
|
{
|
||||||
|
public ProfilPage()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
void ProfilClicked(System.Object sender, System.EventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
@ -1,133 +1,134 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||||
xmlns:toolkit="http://schemas.microsoft.com/dodnet/2022/maui/toolkit"
|
xmlns:toolkit="http://schemas.microsoft.com/dodnet/2022/maui/toolkit"
|
||||||
x:Class="notus.RecherPage"
|
x:Class="notus.RecherPage"
|
||||||
Title="RecherPage"
|
Title="RecherPage"
|
||||||
BackgroundColor="#1C1C1C">
|
BackgroundColor="#1C1C1C">
|
||||||
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="1.5*"/>
|
<RowDefinition Height="1.5*"/>
|
||||||
<RowDefinition Height="1*"/>
|
<RowDefinition Height="1*"/>
|
||||||
<RowDefinition Height="1.8*"/>
|
<RowDefinition Height="1.8*"/>
|
||||||
<RowDefinition Height="1*"/>
|
<RowDefinition Height="1*"/>
|
||||||
<RowDefinition Height="1.8*"/>
|
<RowDefinition Height="1.8*"/>
|
||||||
<RowDefinition Height="1*"/>
|
<RowDefinition Height="1*"/>
|
||||||
<RowDefinition Height="1*"/>
|
<RowDefinition Height="1*"/>
|
||||||
<RowDefinition Height="4*"/>
|
<RowDefinition Height="4*"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<ColumnDefinition Width="1*"/>
|
<ColumnDefinition Width="1*"/>
|
||||||
<ColumnDefinition Width="1*"/>
|
<ColumnDefinition Width="1*"/>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<Border
|
<Border
|
||||||
Background="#6E6E6E"
|
Background="#6E6E6E"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Grid.RowSpan="9"
|
Grid.RowSpan="9"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
Source="profil.png"
|
Source="profl.png"
|
||||||
Aspect="AspectFit"
|
Aspect="AspectFit"
|
||||||
Grid.Column="4"
|
Grid.Column="4"
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
HorizontalOptions="Start"
|
HorizontalOptions="Start"
|
||||||
VerticalOptions="Start"
|
VerticalOptions="Start"
|
||||||
WidthRequest="200"
|
WidthRequest="200"
|
||||||
HeightRequest="120"
|
HeightRequest="120"
|
||||||
BackgroundColor="#6E6E6E"
|
BackgroundColor="#6E6E6E"
|
||||||
CornerRadius="10"
|
CornerRadius="10"
|
||||||
/>
|
Clicked="Profil_Clicked"
|
||||||
|
/>
|
||||||
<ImageButton
|
|
||||||
Source="supp.png"
|
<ImageButton
|
||||||
Aspect="AspectFill"
|
Source="supp.png"
|
||||||
Grid.Column="2"
|
Aspect="AspectFill"
|
||||||
Grid.Row="0"
|
Grid.Column="2"
|
||||||
Margin="20"
|
Grid.Row="0"
|
||||||
HorizontalOptions="End"
|
Margin="20"
|
||||||
VerticalOptions="Start"
|
HorizontalOptions="End"
|
||||||
WidthRequest="50"
|
VerticalOptions="Start"
|
||||||
HeightRequest="50"
|
WidthRequest="50"
|
||||||
BackgroundColor="#4A4A4A"
|
HeightRequest="50"
|
||||||
CornerRadius="50"
|
BackgroundColor="#4A4A4A"
|
||||||
/>
|
CornerRadius="50"
|
||||||
|
/>
|
||||||
<Label
|
|
||||||
Text="Nom de la note"
|
<Label x:Name="NomNote"
|
||||||
Grid.Column="1"
|
Text="{Binding Name}"
|
||||||
Grid.Row="0"
|
Grid.Column="1"
|
||||||
TextColor="#74fabd"
|
Grid.Row="0"
|
||||||
Margin="20"
|
TextColor="#74fabd"
|
||||||
FontSize="34"
|
Margin="20"
|
||||||
BackgroundColor="#4A4A4A"
|
FontSize="34"
|
||||||
WidthRequest="250"
|
BackgroundColor="#4A4A4A"
|
||||||
HeightRequest="50"
|
WidthRequest="250"
|
||||||
HorizontalOptions="Center"
|
HeightRequest="50"
|
||||||
VerticalOptions="Start"
|
HorizontalOptions="Center"
|
||||||
BindingContext="NomDeLaNoteSelected"
|
VerticalOptions="Start"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
Source="edit.png"
|
Source="edit.png"
|
||||||
Aspect="AspectFit"
|
Aspect="AspectFit"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Margin="20"
|
Margin="20"
|
||||||
HorizontalOptions="Start"
|
HorizontalOptions="Start"
|
||||||
VerticalOptions="Start"
|
VerticalOptions="Start"
|
||||||
WidthRequest="50"
|
WidthRequest="50"
|
||||||
HeightRequest="50"
|
HeightRequest="50"
|
||||||
BackgroundColor="#4A4A4A"
|
BackgroundColor="#4A4A4A"
|
||||||
CornerRadius="50"
|
CornerRadius="50"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Entry
|
<Entry
|
||||||
Placeholder="Rechercher"
|
Placeholder="Rechercher"
|
||||||
HorizontalOptions="Start"
|
HorizontalOptions="Start"
|
||||||
Margin="20"
|
Margin="20"
|
||||||
VerticalOptions="Center"
|
VerticalOptions="Center"
|
||||||
WidthRequest="300"
|
WidthRequest="300"
|
||||||
HeightRequest="50"
|
HeightRequest="50"
|
||||||
FontSize="25"
|
FontSize="25"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
TextColor="#74fabd"
|
TextColor="#74fabd"
|
||||||
BackgroundColor="#4A4A4A"
|
BackgroundColor="#4A4A4A"
|
||||||
PlaceholderColor="#74fabd"
|
PlaceholderColor="#74fabd"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<VerticalStackLayout
|
<ListView x:Name="ListNote"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Grid.RowSpan="5"
|
Grid.Row="2"
|
||||||
BindingContext="ARefaire"
|
Grid.RowSpan="5"
|
||||||
/>
|
ItemsSource="{Binding NoteList}"
|
||||||
|
/>
|
||||||
<Editor
|
|
||||||
Placeholder="Texte"
|
<Editor
|
||||||
IsSpellCheckEnabled="True"
|
Placeholder="Texte"
|
||||||
FontSize="20"
|
IsSpellCheckEnabled="True"
|
||||||
HorizontalOptions="Start"
|
FontSize="20"
|
||||||
VerticalOptions="Center"
|
HorizontalOptions="Start"
|
||||||
Margin="20"
|
VerticalOptions="Center"
|
||||||
WidthRequest="800"
|
Margin="20"
|
||||||
HeightRequest="750"
|
WidthRequest="800"
|
||||||
Grid.Column="1"
|
HeightRequest="750"
|
||||||
Grid.ColumnSpan="4"
|
Grid.Column="1"
|
||||||
Grid.Row="4"
|
Grid.ColumnSpan="4"
|
||||||
Grid.RowSpan="3"
|
Grid.Row="4"
|
||||||
TextColor="White"
|
Grid.RowSpan="3"
|
||||||
BackgroundColor="#4A4A4A"
|
TextColor="White"
|
||||||
PlaceholderColor="#74fabd"
|
BackgroundColor="#4A4A4A"
|
||||||
/>
|
PlaceholderColor="#74fabd"
|
||||||
|
/>
|
||||||
</Grid>
|
|
||||||
|
</Grid>
|
||||||
|
|
||||||
</ContentPage>
|
</ContentPage>
|
@ -1,24 +1,23 @@
|
|||||||
namespace notus;
|
using Microsoft.Maui.Controls;
|
||||||
|
using Biblioteque_de_Class;
|
||||||
public partial class RecherPage : ContentPage
|
using Notus_Persistance;
|
||||||
{
|
|
||||||
public RecherPage()
|
|
||||||
{
|
namespace notus;
|
||||||
InitializeComponent();
|
|
||||||
}
|
public partial class RecherPage : ContentPage
|
||||||
|
{
|
||||||
void ProfilClicked()
|
PersistenceManager manager = (Application.Current as App).manager;
|
||||||
|
public RecherPage()
|
||||||
{
|
{
|
||||||
|
manager.LoadDatabaseData();
|
||||||
}
|
InitializeComponent();
|
||||||
|
ListNote.BindingContext = manager;
|
||||||
void EditCLicked()
|
NomNote.BindingContext = manager;
|
||||||
{
|
}
|
||||||
|
|
||||||
}
|
private async void Profil_Clicked(object sender, EventArgs e)
|
||||||
|
{
|
||||||
void SuppClicked()
|
await Navigation.PushAsync(new ProfilPage());
|
||||||
{
|
}
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
Loading…
Reference in new issue