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;
|
||||
|
||||
public partial class ConnecPage : ContentPage
|
||||
{
|
||||
public ConnecPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
using Biblioteque_de_Class;
|
||||
|
||||
namespace notus;
|
||||
|
||||
public partial class ConnecPage : ContentPage
|
||||
{
|
||||
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" ?>
|
||||
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="notus.InscrPage"
|
||||
Title="InscrPage">
|
||||
|
||||
<Grid BackgroundColor="#1C1C1C">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="150"/>
|
||||
<RowDefinition Height="150"/>
|
||||
<RowDefinition Height="150"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Entry
|
||||
Placeholder="Pseudo"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Center"
|
||||
WidthRequest="600"
|
||||
HeightRequest="100"
|
||||
FontSize="32"
|
||||
Grid.Column="1"
|
||||
Grid.Row="1"
|
||||
TextColor="#74fabd"
|
||||
BackgroundColor="#4A4A4A"
|
||||
PlaceholderColor="#74fabd"
|
||||
/>
|
||||
|
||||
<Entry
|
||||
Placeholder="Mot de passe"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Center"
|
||||
WidthRequest="600"
|
||||
HeightRequest="100"
|
||||
FontSize="32"
|
||||
Grid.Column="1"
|
||||
Grid.Row="2"
|
||||
IsPassword="true"
|
||||
TextColor="#74fabd"
|
||||
BackgroundColor="#4A4A4A"
|
||||
PlaceholderColor="#74fabd"
|
||||
/>
|
||||
|
||||
<Entry
|
||||
Placeholder ="Verif mot de passe"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Center"
|
||||
WidthRequest="600"
|
||||
HeightRequest="100"
|
||||
FontSize="32"
|
||||
Grid.Column="1"
|
||||
Grid.Row="3"
|
||||
IsPassword="true"
|
||||
TextColor="#74fabd"
|
||||
BackgroundColor="#4A4A4A"
|
||||
PlaceholderColor="#74fabd"
|
||||
/>
|
||||
|
||||
<Button
|
||||
Text="Valider"
|
||||
Grid.Column="1"
|
||||
Grid.Row="4"
|
||||
HorizontalOptions="End"
|
||||
VerticalOptions="Center"
|
||||
WidthRequest="110"
|
||||
HeightRequest="70"
|
||||
BackgroundColor="#74fabd"
|
||||
TextColor="Black"
|
||||
CornerRadius="10"
|
||||
/>
|
||||
|
||||
</Grid>
|
||||
|
||||
</ContentPage>
|
||||
<?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"
|
||||
x:Class="notus.InscrPage"
|
||||
Title="InscrPage">
|
||||
|
||||
<Grid BackgroundColor="#1C1C1C">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="150"/>
|
||||
<RowDefinition Height="150"/>
|
||||
<RowDefinition Height="150"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Entry
|
||||
Placeholder="Pseudo"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Center"
|
||||
WidthRequest="600"
|
||||
HeightRequest="100"
|
||||
FontSize="32"
|
||||
Grid.Column="1"
|
||||
Grid.Row="1"
|
||||
TextColor="#74fabd"
|
||||
BackgroundColor="#4A4A4A"
|
||||
PlaceholderColor="#74fabd"
|
||||
/>
|
||||
|
||||
<Entry
|
||||
Placeholder="Mot de passe"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Center"
|
||||
WidthRequest="600"
|
||||
HeightRequest="100"
|
||||
FontSize="32"
|
||||
Grid.Column="1"
|
||||
Grid.Row="2"
|
||||
IsPassword="true"
|
||||
TextColor="#74fabd"
|
||||
BackgroundColor="#4A4A4A"
|
||||
PlaceholderColor="#74fabd"
|
||||
/>
|
||||
|
||||
<Entry
|
||||
Placeholder ="Verif mot de passe"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Center"
|
||||
WidthRequest="600"
|
||||
HeightRequest="100"
|
||||
FontSize="32"
|
||||
Grid.Column="1"
|
||||
Grid.Row="3"
|
||||
IsPassword="true"
|
||||
TextColor="#74fabd"
|
||||
BackgroundColor="#4A4A4A"
|
||||
PlaceholderColor="#74fabd"
|
||||
/>
|
||||
|
||||
<Button
|
||||
Text="Valider"
|
||||
Grid.Column="1"
|
||||
Grid.Row="4"
|
||||
HorizontalOptions="End"
|
||||
VerticalOptions="Center"
|
||||
WidthRequest="110"
|
||||
HeightRequest="70"
|
||||
BackgroundColor="#74fabd"
|
||||
TextColor="Black"
|
||||
CornerRadius="10"
|
||||
Clicked="Valid_Clicked"
|
||||
/>
|
||||
|
||||
</Grid>
|
||||
|
||||
</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" ?>
|
||||
<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.RecherPage"
|
||||
Title="RecherPage"
|
||||
BackgroundColor="#1C1C1C">
|
||||
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="1.5*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="1.8*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="1.8*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="4*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border
|
||||
Background="#6E6E6E"
|
||||
Grid.Column="0"
|
||||
Grid.RowSpan="9"
|
||||
/>
|
||||
|
||||
<ImageButton
|
||||
Source="profil.png"
|
||||
Aspect="AspectFit"
|
||||
Grid.Column="4"
|
||||
Grid.Row="0"
|
||||
HorizontalOptions="Start"
|
||||
VerticalOptions="Start"
|
||||
WidthRequest="200"
|
||||
HeightRequest="120"
|
||||
BackgroundColor="#6E6E6E"
|
||||
CornerRadius="10"
|
||||
/>
|
||||
|
||||
<ImageButton
|
||||
Source="supp.png"
|
||||
Aspect="AspectFill"
|
||||
Grid.Column="2"
|
||||
Grid.Row="0"
|
||||
Margin="20"
|
||||
HorizontalOptions="End"
|
||||
VerticalOptions="Start"
|
||||
WidthRequest="50"
|
||||
HeightRequest="50"
|
||||
BackgroundColor="#4A4A4A"
|
||||
CornerRadius="50"
|
||||
/>
|
||||
|
||||
<Label
|
||||
Text="Nom de la note"
|
||||
Grid.Column="1"
|
||||
Grid.Row="0"
|
||||
TextColor="#74fabd"
|
||||
Margin="20"
|
||||
FontSize="34"
|
||||
BackgroundColor="#4A4A4A"
|
||||
WidthRequest="250"
|
||||
HeightRequest="50"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Start"
|
||||
BindingContext="NomDeLaNoteSelected"
|
||||
/>
|
||||
|
||||
<ImageButton
|
||||
Source="edit.png"
|
||||
Aspect="AspectFit"
|
||||
Grid.Column="1"
|
||||
Grid.Row="0"
|
||||
Margin="20"
|
||||
HorizontalOptions="Start"
|
||||
VerticalOptions="Start"
|
||||
WidthRequest="50"
|
||||
HeightRequest="50"
|
||||
BackgroundColor="#4A4A4A"
|
||||
CornerRadius="50"
|
||||
/>
|
||||
|
||||
<Entry
|
||||
Placeholder="Rechercher"
|
||||
HorizontalOptions="Start"
|
||||
Margin="20"
|
||||
VerticalOptions="Center"
|
||||
WidthRequest="300"
|
||||
HeightRequest="50"
|
||||
FontSize="25"
|
||||
Grid.Column="0"
|
||||
Grid.Row="0"
|
||||
TextColor="#74fabd"
|
||||
BackgroundColor="#4A4A4A"
|
||||
PlaceholderColor="#74fabd"
|
||||
/>
|
||||
|
||||
<VerticalStackLayout
|
||||
Grid.Column="0"
|
||||
Grid.RowSpan="5"
|
||||
BindingContext="ARefaire"
|
||||
/>
|
||||
|
||||
<Editor
|
||||
Placeholder="Texte"
|
||||
IsSpellCheckEnabled="True"
|
||||
FontSize="20"
|
||||
HorizontalOptions="Start"
|
||||
VerticalOptions="Center"
|
||||
Margin="20"
|
||||
WidthRequest="800"
|
||||
HeightRequest="750"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="4"
|
||||
Grid.Row="4"
|
||||
Grid.RowSpan="3"
|
||||
TextColor="White"
|
||||
BackgroundColor="#4A4A4A"
|
||||
PlaceholderColor="#74fabd"
|
||||
/>
|
||||
|
||||
</Grid>
|
||||
|
||||
<?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.RecherPage"
|
||||
Title="RecherPage"
|
||||
BackgroundColor="#1C1C1C">
|
||||
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="1.5*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="1.8*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="1.8*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="4*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border
|
||||
Background="#6E6E6E"
|
||||
Grid.Column="0"
|
||||
Grid.RowSpan="9"
|
||||
/>
|
||||
|
||||
<ImageButton
|
||||
Source="profl.png"
|
||||
Aspect="AspectFit"
|
||||
Grid.Column="4"
|
||||
Grid.Row="0"
|
||||
HorizontalOptions="Start"
|
||||
VerticalOptions="Start"
|
||||
WidthRequest="200"
|
||||
HeightRequest="120"
|
||||
BackgroundColor="#6E6E6E"
|
||||
CornerRadius="10"
|
||||
Clicked="Profil_Clicked"
|
||||
/>
|
||||
|
||||
<ImageButton
|
||||
Source="supp.png"
|
||||
Aspect="AspectFill"
|
||||
Grid.Column="2"
|
||||
Grid.Row="0"
|
||||
Margin="20"
|
||||
HorizontalOptions="End"
|
||||
VerticalOptions="Start"
|
||||
WidthRequest="50"
|
||||
HeightRequest="50"
|
||||
BackgroundColor="#4A4A4A"
|
||||
CornerRadius="50"
|
||||
/>
|
||||
|
||||
<Label x:Name="NomNote"
|
||||
Text="{Binding Name}"
|
||||
Grid.Column="1"
|
||||
Grid.Row="0"
|
||||
TextColor="#74fabd"
|
||||
Margin="20"
|
||||
FontSize="34"
|
||||
BackgroundColor="#4A4A4A"
|
||||
WidthRequest="250"
|
||||
HeightRequest="50"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Start"
|
||||
/>
|
||||
|
||||
<ImageButton
|
||||
Source="edit.png"
|
||||
Aspect="AspectFit"
|
||||
Grid.Column="1"
|
||||
Grid.Row="0"
|
||||
Margin="20"
|
||||
HorizontalOptions="Start"
|
||||
VerticalOptions="Start"
|
||||
WidthRequest="50"
|
||||
HeightRequest="50"
|
||||
BackgroundColor="#4A4A4A"
|
||||
CornerRadius="50"
|
||||
/>
|
||||
|
||||
<Entry
|
||||
Placeholder="Rechercher"
|
||||
HorizontalOptions="Start"
|
||||
Margin="20"
|
||||
VerticalOptions="Center"
|
||||
WidthRequest="300"
|
||||
HeightRequest="50"
|
||||
FontSize="25"
|
||||
Grid.Column="0"
|
||||
Grid.Row="0"
|
||||
TextColor="#74fabd"
|
||||
BackgroundColor="#4A4A4A"
|
||||
PlaceholderColor="#74fabd"
|
||||
/>
|
||||
|
||||
<ListView x:Name="ListNote"
|
||||
Grid.Column="0"
|
||||
Grid.Row="2"
|
||||
Grid.RowSpan="5"
|
||||
ItemsSource="{Binding NoteList}"
|
||||
/>
|
||||
|
||||
<Editor
|
||||
Placeholder="Texte"
|
||||
IsSpellCheckEnabled="True"
|
||||
FontSize="20"
|
||||
HorizontalOptions="Start"
|
||||
VerticalOptions="Center"
|
||||
Margin="20"
|
||||
WidthRequest="800"
|
||||
HeightRequest="750"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="4"
|
||||
Grid.Row="4"
|
||||
Grid.RowSpan="3"
|
||||
TextColor="White"
|
||||
BackgroundColor="#4A4A4A"
|
||||
PlaceholderColor="#74fabd"
|
||||
/>
|
||||
|
||||
</Grid>
|
||||
|
||||
</ContentPage>
|
@ -1,24 +1,23 @@
|
||||
namespace notus;
|
||||
|
||||
public partial class RecherPage : ContentPage
|
||||
{
|
||||
public RecherPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
void ProfilClicked()
|
||||
using Microsoft.Maui.Controls;
|
||||
using Biblioteque_de_Class;
|
||||
using Notus_Persistance;
|
||||
|
||||
|
||||
namespace notus;
|
||||
|
||||
public partial class RecherPage : ContentPage
|
||||
{
|
||||
PersistenceManager manager = (Application.Current as App).manager;
|
||||
public RecherPage()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void EditCLicked()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void SuppClicked()
|
||||
{
|
||||
|
||||
}
|
||||
manager.LoadDatabaseData();
|
||||
InitializeComponent();
|
||||
ListNote.BindingContext = manager;
|
||||
NomNote.BindingContext = manager;
|
||||
}
|
||||
|
||||
private async void Profil_Clicked(object sender, EventArgs e)
|
||||
{
|
||||
await Navigation.PushAsync(new ProfilPage());
|
||||
}
|
||||
}
|
Loading…
Reference in new issue