Merge branch 'master' of codefirst.iut.uca.fr:ShopNCook/ShopNCook
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
424e5099d1
@ -1,149 +0,0 @@
|
||||
<?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="ShoopNCook.Pages.ChangePassword"
|
||||
Title="ChangePassword"
|
||||
BackgroundColor="{StaticResource BackgroundPrimary}">
|
||||
|
||||
<ScrollView>
|
||||
<Grid
|
||||
Margin="20"
|
||||
RowDefinitions="Auto, Auto, Auto, *">
|
||||
|
||||
<!-- Change Password label and return button -->
|
||||
<Grid
|
||||
Grid.Row="0"
|
||||
RowDefinitions="Auto, *"
|
||||
ColumnDefinitions="*, 3*"
|
||||
Margin="0, 0, 0, 40">
|
||||
<HorizontalStackLayout>
|
||||
<ImageButton
|
||||
Grid.Column="0"
|
||||
Clicked="OnBackButtonClicked"
|
||||
HeightRequest="50"
|
||||
WidthRequest="50"
|
||||
Source="arrow_back.svg"/>
|
||||
</HorizontalStackLayout>
|
||||
<Label
|
||||
Grid.Column="1"
|
||||
FontSize="24"
|
||||
TextColor="{StaticResource TextColorPrimary}"
|
||||
Text="Change Password"
|
||||
FontFamily="PoppinsBold"
|
||||
VerticalOptions="Center"/>
|
||||
</Grid>
|
||||
|
||||
<!-- User inputs -->
|
||||
<Grid
|
||||
Grid.Row="2"
|
||||
Margin="0, 20, 0, 0"
|
||||
RowDefinitions="Auto, *, Auto, *,Auto,*">
|
||||
<VerticalStackLayout>
|
||||
<Label
|
||||
Grid.Row="0"
|
||||
Text="Old Password Here :"
|
||||
FontFamily="PoppinsBold"
|
||||
TextColor="{StaticResource TextColorSecondary}"/>
|
||||
|
||||
<Border
|
||||
Style="{StaticResource SecondaryBorder}"
|
||||
Margin="0,30,10,20">
|
||||
<Grid
|
||||
Padding="5"
|
||||
BackgroundColor="{StaticResource BackgroundSecondary}"
|
||||
ColumnDefinitions="Auto,Auto,*">
|
||||
|
||||
<Image
|
||||
Grid.Column="1"
|
||||
Source="password_icon.svg">
|
||||
</Image>
|
||||
<Entry
|
||||
Style="{StaticResource UserInput}"
|
||||
Grid.Column="2"
|
||||
Placeholder="Old Password"
|
||||
IsPassword="True"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<Label
|
||||
Grid.Row="0"
|
||||
Text="New Password Here :"
|
||||
FontFamily="PoppinsBold"
|
||||
TextColor="{StaticResource TextColorSecondary}"/>
|
||||
|
||||
<Border
|
||||
Style="{StaticResource SecondaryBorder}"
|
||||
Margin="0,30,0,20">
|
||||
<Grid
|
||||
Padding="5"
|
||||
BackgroundColor="{StaticResource BackgroundSecondary}"
|
||||
ColumnDefinitions="Auto,Auto,*">
|
||||
|
||||
<Image
|
||||
Grid.Column="1"
|
||||
Source="password_icon.svg">
|
||||
</Image>
|
||||
<Entry
|
||||
Style="{StaticResource UserInput}"
|
||||
Grid.Column="2"
|
||||
Placeholder="New Password"
|
||||
IsPassword="True"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<Label
|
||||
Grid.Row="0"
|
||||
Text="Confirm New Password Here :"
|
||||
FontFamily="PoppinsBold"
|
||||
Margin="0,0,0,0"
|
||||
TextColor="{StaticResource TextColorSecondary}"/>
|
||||
|
||||
<Border
|
||||
Style="{StaticResource SecondaryBorder}"
|
||||
Margin="0,30,0,20">
|
||||
<Grid
|
||||
Padding="5"
|
||||
BackgroundColor="{StaticResource BackgroundSecondary}"
|
||||
ColumnDefinitions="Auto,Auto,*">
|
||||
|
||||
<Image
|
||||
Grid.Column="1"
|
||||
Source="password_icon.svg">
|
||||
</Image>
|
||||
<Entry
|
||||
Style="{StaticResource UserInput}"
|
||||
Grid.Column="2"
|
||||
Placeholder="New Password"
|
||||
IsPassword="True"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
</VerticalStackLayout>
|
||||
|
||||
|
||||
|
||||
</Grid>
|
||||
|
||||
|
||||
<!-- Save button -->
|
||||
|
||||
<VerticalStackLayout
|
||||
Grid.Row="3"
|
||||
VerticalOptions="End">
|
||||
<Border
|
||||
Margin="0, 30, 0, 0"
|
||||
Stroke="{StaticResource BackgroundPrimary}"
|
||||
StrokeShape="RoundRectangle 12">
|
||||
<Button
|
||||
HeightRequest="50"
|
||||
Style="{StaticResource UserButton}"
|
||||
BackgroundColor="{StaticResource ActionButton}"
|
||||
Text="SAVE"/>
|
||||
</Border>
|
||||
</VerticalStackLayout>
|
||||
|
||||
|
||||
</Grid>
|
||||
|
||||
</ScrollView>
|
||||
|
||||
</ContentPage>
|
@ -1,13 +0,0 @@
|
||||
namespace ShoopNCook.Pages;
|
||||
|
||||
public partial class ChangePassword : ContentPage
|
||||
{
|
||||
public ChangePassword()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
private async void OnBackButtonClicked(object sender, EventArgs e)
|
||||
{
|
||||
await Navigation.PopAsync();
|
||||
}
|
||||
}
|
@ -1,148 +0,0 @@
|
||||
<?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="ShoopNCook.Pages.ConfirmMail"
|
||||
Title="ConfirmMail"
|
||||
BackgroundColor="{StaticResource BackgroundPrimary}">
|
||||
<ScrollView>
|
||||
<Grid
|
||||
Padding="20"
|
||||
RowDefinitions="Auto, Auto, Auto, *">
|
||||
|
||||
<!-- Profile label and return button -->
|
||||
<Grid
|
||||
Grid.Row="0"
|
||||
RowDefinitions="Auto, *"
|
||||
ColumnDefinitions="*, 1.5*"
|
||||
Margin="0, 0, 0, 40">
|
||||
<HorizontalStackLayout>
|
||||
<ImageButton
|
||||
Grid.Column="0"
|
||||
|
||||
HeightRequest="50"
|
||||
WidthRequest="50"
|
||||
Source="arrow_back.svg"
|
||||
Clicked="OnBackButtonClicked"/>
|
||||
</HorizontalStackLayout>
|
||||
<Label
|
||||
Margin="-40,10,0,0"
|
||||
Grid.Column="1"
|
||||
FontSize="24"
|
||||
TextColor="{StaticResource TextColorPrimary}"
|
||||
Text="Confirm Email"
|
||||
FontFamily="PoppinsBold"
|
||||
VerticalOptions="Start"/>
|
||||
</Grid>
|
||||
|
||||
<!-- Email entry -->
|
||||
<Grid
|
||||
Grid.Row="1"
|
||||
RowDefinitions="*, Auto, Auto">
|
||||
|
||||
<Label
|
||||
Grid.Row="0"
|
||||
FontSize="15"
|
||||
TextColor="{StaticResource TextColorSecondary}"
|
||||
Text="The following email address is yours ?"
|
||||
FontFamily="PoppinsBold"
|
||||
VerticalOptions="Center"/>
|
||||
<Border
|
||||
Grid.Row="1"
|
||||
Style="{StaticResource SecondaryBorder}"
|
||||
Margin="0,30,0,20">
|
||||
<Grid
|
||||
Padding="5"
|
||||
BackgroundColor="{StaticResource BackgroundSecondary}"
|
||||
ColumnDefinitions="Auto,Auto,*">
|
||||
|
||||
<Image
|
||||
Grid.Column="1"
|
||||
Source="email_icon.svg">
|
||||
</Image>
|
||||
<Entry
|
||||
Style="{StaticResource UserInput}"
|
||||
Grid.Column="2"
|
||||
Text="%Profile_Mail%"></Entry>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<VerticalStackLayout
|
||||
Grid.Row="2"
|
||||
VerticalOptions="End">
|
||||
<Border
|
||||
Margin="0, 30, 0, 0"
|
||||
Stroke="{StaticResource BackgroundPrimary}"
|
||||
StrokeShape="RoundRectangle 12">
|
||||
<Button
|
||||
BackgroundColor="{StaticResource ActionButton}"
|
||||
FontFamily="PoppinsMedium"
|
||||
TextColor="White"
|
||||
Text="That's been my email"
|
||||
/>
|
||||
</Border>
|
||||
</VerticalStackLayout>
|
||||
</Grid>
|
||||
<Grid>
|
||||
|
||||
</Grid>
|
||||
<!-- Sendmail grid -->
|
||||
<Grid
|
||||
Grid.Row="2"
|
||||
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto"
|
||||
RowSpacing="10">
|
||||
<Label
|
||||
Grid.Row="0"
|
||||
Margin="20"
|
||||
Text="A recuperation code get send to your email address. Type it here to confirm your email. "
|
||||
FontFamily="PoppinsBold"
|
||||
TextColor="LightGreen"/>
|
||||
<Label
|
||||
Grid.Row="1"
|
||||
Text="Enter the code here"
|
||||
FontFamily="PoppinsBold"
|
||||
TextColor="{StaticResource TextColorSecondary}"/>
|
||||
<Border
|
||||
Grid.Row="2"
|
||||
Style="{StaticResource SecondaryBorder}"
|
||||
>
|
||||
<Grid
|
||||
Padding="5"
|
||||
BackgroundColor="{StaticResource BackgroundSecondary}"
|
||||
ColumnDefinitions="Auto,Auto,*">
|
||||
|
||||
<Image
|
||||
Grid.Column="1"
|
||||
Source="code.png">
|
||||
</Image>
|
||||
<Entry
|
||||
Style="{StaticResource UserInput}"
|
||||
Grid.Column="2"
|
||||
Placeholder="Code"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
</Grid>
|
||||
|
||||
<!-- Confirm button -->
|
||||
|
||||
<VerticalStackLayout
|
||||
Grid.Row="3"
|
||||
VerticalOptions="End">
|
||||
<Border
|
||||
Margin="0, 30, 0, 0"
|
||||
Stroke="{StaticResource BackgroundPrimary}"
|
||||
StrokeShape="RoundRectangle 12">
|
||||
<Button
|
||||
BackgroundColor="{StaticResource ActionButton}"
|
||||
FontFamily="PoppinsMedium"
|
||||
TextColor="White"
|
||||
Text="Confirm my email"
|
||||
Clicked="OnRegiterButtonTapped"/>
|
||||
</Border>
|
||||
</VerticalStackLayout>
|
||||
|
||||
|
||||
</Grid>
|
||||
|
||||
</ScrollView>
|
||||
</ContentPage>
|
@ -1,17 +0,0 @@
|
||||
namespace ShoopNCook.Pages;
|
||||
|
||||
public partial class ConfirmMail : ContentPage
|
||||
{
|
||||
public ConfirmMail()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
private async void OnRegiterButtonTapped(object sender, EventArgs e)
|
||||
{
|
||||
await Shell.Current.GoToAsync("//LoginPage");
|
||||
}
|
||||
private async void OnBackButtonClicked(object sender, EventArgs e)
|
||||
{
|
||||
await Navigation.PopAsync();
|
||||
}
|
||||
}
|
@ -1,173 +0,0 @@
|
||||
<?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="ShoopNCook.Pages.ForgotPassword"
|
||||
Title="ForgotPassword"
|
||||
BackgroundColor="{StaticResource BackgroundPrimary}">
|
||||
<ScrollView>
|
||||
<Grid
|
||||
Padding="20"
|
||||
RowDefinitions="Auto, Auto, Auto, *">
|
||||
|
||||
<!-- Profile label and return button -->
|
||||
<Grid
|
||||
Grid.Row="0"
|
||||
RowDefinitions="Auto, *"
|
||||
ColumnDefinitions="*, 1.5*"
|
||||
Margin="0, 0, 0, 40">
|
||||
<HorizontalStackLayout>
|
||||
<ImageButton
|
||||
Grid.Column="0"
|
||||
|
||||
HeightRequest="50"
|
||||
WidthRequest="50"
|
||||
Source="arrow_back.svg"
|
||||
Clicked="OnBackButtonClicked"/>
|
||||
</HorizontalStackLayout>
|
||||
<Label
|
||||
Margin="-40,10,0,0"
|
||||
Grid.Column="1"
|
||||
FontSize="24"
|
||||
TextColor="{StaticResource TextColorPrimary}"
|
||||
Text="Forgot Password"
|
||||
FontFamily="PoppinsBold"
|
||||
VerticalOptions="Start"/>
|
||||
</Grid>
|
||||
|
||||
<!-- Email entry -->
|
||||
<Grid
|
||||
Grid.Row="1"
|
||||
RowDefinitions="*, Auto, Auto"
|
||||
>
|
||||
|
||||
<Label
|
||||
|
||||
Grid.Row="0"
|
||||
FontSize="15"
|
||||
TextColor="{StaticResource TextColorSecondary}"
|
||||
Text="Enter your email here : "
|
||||
FontFamily="PoppinsBold"
|
||||
VerticalOptions="Center"/>
|
||||
<Border
|
||||
Grid.Row="1"
|
||||
Style="{StaticResource SecondaryBorder}"
|
||||
Margin="0,30,0,20">
|
||||
<Grid
|
||||
Padding="5"
|
||||
BackgroundColor="{StaticResource BackgroundSecondary}"
|
||||
ColumnDefinitions="Auto,Auto,*">
|
||||
|
||||
<Image
|
||||
Grid.Column="1"
|
||||
Source="email_icon.svg">
|
||||
</Image>
|
||||
<Entry
|
||||
Style="{StaticResource UserInput}"
|
||||
Grid.Column="2"
|
||||
Placeholder="User Name"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<VerticalStackLayout
|
||||
Grid.Row="2"
|
||||
VerticalOptions="End">
|
||||
<Border
|
||||
Margin="0, 30, 0, 0"
|
||||
Stroke="{StaticResource BackgroundPrimary}"
|
||||
StrokeShape="RoundRectangle 12">
|
||||
<Button
|
||||
BackgroundColor="{StaticResource ActionButton}"
|
||||
FontFamily="PoppinsMedium"
|
||||
TextColor="White"
|
||||
Text="Recup my Password"/>
|
||||
</Border>
|
||||
</VerticalStackLayout>
|
||||
</Grid>
|
||||
<Grid>
|
||||
|
||||
</Grid>
|
||||
<!-- Sendmail grid -->
|
||||
<Grid
|
||||
Grid.Row="2"
|
||||
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto"
|
||||
RowSpacing="10">
|
||||
<Label
|
||||
Grid.Row="0"
|
||||
Margin="20"
|
||||
Text="A recuperation code as been send to your email address ! "
|
||||
FontFamily="PoppinsBold"
|
||||
TextColor="LightGreen"/>
|
||||
<Label
|
||||
Grid.Row="1"
|
||||
Text="Enter the code here"
|
||||
FontFamily="PoppinsBold"
|
||||
TextColor="{StaticResource TextColorSecondary}"/>
|
||||
<Border
|
||||
Grid.Row="2"
|
||||
Style="{StaticResource SecondaryBorder}"
|
||||
>
|
||||
<Grid
|
||||
Padding="5"
|
||||
BackgroundColor="{StaticResource BackgroundSecondary}"
|
||||
ColumnDefinitions="Auto,Auto,*">
|
||||
|
||||
<Image
|
||||
Grid.Column="1"
|
||||
Source="code.png">
|
||||
</Image>
|
||||
<Entry
|
||||
Style="{StaticResource UserInput}"
|
||||
Grid.Column="2"
|
||||
Placeholder="Code"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Label
|
||||
Grid.Row="3"
|
||||
Text="Enter new Password here"
|
||||
FontFamily="PoppinsBold"
|
||||
TextColor="{StaticResource TextColorSecondary}"/>
|
||||
<Border
|
||||
Grid.Row="4"
|
||||
Style="{StaticResource SecondaryBorderShadow}">
|
||||
<Entry
|
||||
Style="{StaticResource UserInput}"
|
||||
Placeholder="New password"
|
||||
IsPassword="True"/>
|
||||
</Border>
|
||||
<Label
|
||||
Grid.Row="5"
|
||||
Text="Confirm your new Password here"
|
||||
FontFamily="PoppinsBold"
|
||||
TextColor="{StaticResource TextColorSecondary}"/>
|
||||
<Border
|
||||
Grid.Row="6"
|
||||
Style="{StaticResource SecondaryBorderShadow}">
|
||||
<Entry
|
||||
Style="{StaticResource UserInput}"
|
||||
Placeholder="New password"
|
||||
IsPassword="True"/>
|
||||
</Border>
|
||||
</Grid>
|
||||
|
||||
<!-- Save button -->
|
||||
|
||||
<VerticalStackLayout
|
||||
Grid.Row="3"
|
||||
VerticalOptions="End">
|
||||
<Border
|
||||
Margin="0, 30, 0, 0"
|
||||
Stroke="{StaticResource BackgroundPrimary}"
|
||||
StrokeShape="RoundRectangle 12">
|
||||
<Button
|
||||
BackgroundColor="{StaticResource ActionButton}"
|
||||
FontFamily="PoppinsMedium"
|
||||
TextColor="White"
|
||||
Text="Save Change"/>
|
||||
</Border>
|
||||
</VerticalStackLayout>
|
||||
|
||||
|
||||
</Grid>
|
||||
|
||||
</ScrollView>
|
||||
</ContentPage>
|
@ -1,13 +0,0 @@
|
||||
namespace ShoopNCook.Pages;
|
||||
|
||||
public partial class ForgotPassword : ContentPage
|
||||
{
|
||||
public ForgotPassword()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
private async void OnBackButtonClicked(object sender, EventArgs e)
|
||||
{
|
||||
await Navigation.PopAsync();
|
||||
}
|
||||
}
|
@ -1,12 +1,52 @@
|
||||
using Models;
|
||||
using Services;
|
||||
using ShoopNCook.Views;
|
||||
using System.Collections.ObjectModel;
|
||||
|
||||
namespace ShoopNCook.Pages;
|
||||
public partial class SearchPage : ContentPage
|
||||
{
|
||||
public SearchPage()
|
||||
private readonly IRecipesService recipesService;
|
||||
private readonly IAccountRecipesPreferencesService preferences;
|
||||
|
||||
public ObservableCollection<RecipeView> FoundRecipes { get; private init; } = new ObservableCollection<RecipeView>();
|
||||
|
||||
public SearchPage(IRecipesService recipes, IAccountRecipesPreferencesService preferences)
|
||||
{
|
||||
BindingContext = this;
|
||||
this.recipesService = recipes;
|
||||
this.preferences = preferences;
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public void MakeSearch(string prompt)
|
||||
{
|
||||
if (string.IsNullOrEmpty(prompt))
|
||||
{
|
||||
return;
|
||||
}
|
||||
SearchPrompt.Text = prompt;
|
||||
FoundRecipes.Clear();
|
||||
foreach (RecipeInfo info in recipesService.SearchRecipes(prompt))
|
||||
{
|
||||
FoundRecipes.Add(new RecipeView(info, () =>
|
||||
{
|
||||
Recipe recipe = recipesService.GetRecipe(info);
|
||||
if (recipe != null)
|
||||
Shell.Current.Navigation.PushAsync(new RecipePage(recipe, preferences, 1));
|
||||
else
|
||||
UserNotifier.Error("Could not find recipe");
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
private async void OnBackButtonClicked(object sender, EventArgs e)
|
||||
{
|
||||
await Navigation.PopAsync();
|
||||
}
|
||||
|
||||
private void OnSearchClicked(object sender, EventArgs e)
|
||||
{
|
||||
MakeSearch(SearchPrompt.Text);
|
||||
}
|
||||
}
|
Loading…
Reference in new issue