leo.tuaillon
/
ShopNCook
2
2
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

move pages -> views and views -> components
continuous-integration/drone/push Build is failing Details
continuous-integration/drone/pr Build is failing Details

Browse Source
pull/39/head
Leo TUAILLON 2 years ago
parent 0675e731d4
commit 5d66ff129e
47 changed files with 254 additions and 254 deletions
Show Stats Download Patch File Download Diff File

36
ShoopNCook.csproj
Unescape View File

@ -88,64 +88,64 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="Pages\MyListPage.xaml.cs"> <Compile Update="Views\MyListPage.xaml.cs">
<DependentUpon>MyListPage.xaml</DependentUpon> <DependentUpon>MyListPage.xaml</DependentUpon>
</Compile> </Compile>
<Compile Update="Views\IngredientEntry.xaml.cs"> <Compile Update="Views\Components\IngredientEntry.xaml.cs">
<DependentUpon>IngredientEntry.xaml</DependentUpon> <DependentUpon>IngredientEntry.xaml</DependentUpon>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MauiXaml Update="Pages\CreateRecipePage.xaml"> <MauiXaml Update="Views\CreateRecipePage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Pages\Splash.xaml"> <MauiXaml Update="Views\Splash.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\CounterView.xaml"> <MauiXaml Update="Views\Components\CounterView.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\HeadedButton.xaml"> <MauiXaml Update="Views\Components\HeadedButton.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\IngredientEntry.xaml"> <MauiXaml Update="Views\Components\IngredientEntry.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\IngredientView.xaml"> <MauiXaml Update="Views\Components\IngredientView.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Pages\FavoritesPage.xaml"> <MauiXaml Update="Views\FavoritesPage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Pages\MorePage.xaml"> <MauiXaml Update="Views\MorePage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Pages\ProfilePage.xaml"> <MauiXaml Update="Views\ProfilePage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Pages\RecipePage.xaml"> <MauiXaml Update="Views\RecipePage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\RecipeView.xaml"> <MauiXaml Update="Views\Components\RecipeView.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Pages\RegisterPage.xaml"> <MauiXaml Update="Views\RegisterPage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Pages\SearchPage.xaml"> <MauiXaml Update="Views\SearchPage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\RecipeView.xaml"> <MauiXaml Update="Views\Components\RecipeView.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\SearchPage.xaml"> <MauiXaml Update="Views\SearchPage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\StepEntry.xaml"> <MauiXaml Update="Views\Components\StepEntry.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\StoredRecipeView.xaml"> <MauiXaml Update="Views\Components\StoredRecipeView.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
</ItemGroup> </ItemGroup>

0
Pages/ChangePassword.xaml → Views/ChangePassword.xaml
Unescape View File

0
Pages/ChangePassword.xaml.cs → Views/ChangePassword.xaml.cs
Unescape View File

0
Views/CounterView.xaml → Views/Components/CounterView.xaml
Unescape View File

0
Views/CounterView.xaml.cs → Views/Components/CounterView.xaml.cs
Unescape View File

0
Views/HeadedButton.xaml → Views/Components/HeadedButton.xaml
Unescape View File

0
Views/HeadedButton.xaml.cs → Views/Components/HeadedButton.xaml.cs
Unescape View File

0
Views/IngredientEntry.xaml → Views/Components/IngredientEntry.xaml
Unescape View File

0
Views/IngredientEntry.xaml.cs → Views/Components/IngredientEntry.xaml.cs
Unescape View File

0
Views/IngredientView.xaml → Views/Components/IngredientView.xaml
Unescape View File

0
Views/IngredientView.xaml.cs → Views/Components/IngredientView.xaml.cs
Unescape View File

0
Views/OwnedRecipeView.xaml → Views/Components/OwnedRecipeView.xaml
Unescape View File

0
Views/OwnedRecipeView.xaml.cs → Views/Components/OwnedRecipeView.xaml.cs
Unescape View File

0
Views/RecipeView.xaml → Views/Components/RecipeView.xaml
Unescape View File

0
Views/RecipeView.xaml.cs → Views/Components/RecipeView.xaml.cs
Unescape View File

58
Views/StepEntry.xaml → Views/Components/StepEntry.xaml
Unescape View File

@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui" <ContentView 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="ShoopNCook.Views.StepEntry"> x:Class="ShoopNCook.Views.StepEntry">
<VerticalStackLayout> <VerticalStackLayout>
<HorizontalStackLayout> <HorizontalStackLayout>
<Label <Label
Style="{StaticResource h3}" Style="{StaticResource h3}"
Text="Step" Text="Step"
Margin="0, 0, 2, 0"/> Margin="0, 0, 2, 0"/>
<Label <Label
Style="{StaticResource h3}" Style="{StaticResource h3}"
x:Name="OrdinalLabel"/> x:Name="OrdinalLabel"/>
</HorizontalStackLayout> </HorizontalStackLayout>
<Border <Border
StrokeShape="RoundRectangle 5" StrokeShape="RoundRectangle 5"
Stroke="Gray" Stroke="Gray"
BackgroundColor="{StaticResource BackgroundSecondary}"> BackgroundColor="{StaticResource BackgroundSecondary}">
<Editor <Editor
MaxLength="10000" MaxLength="10000"
Style="{StaticResource UserInput}" Style="{StaticResource UserInput}"
AutoSize="TextChanges" AutoSize="TextChanges"
FontSize="15"/> FontSize="15"/>
</Border> </Border>
</VerticalStackLayout> </VerticalStackLayout>
</ContentView> </ContentView>

36
Views/StepEntry.xaml.cs → Views/Components/StepEntry.xaml.cs
Unescape View File

@ -1,19 +1,19 @@
namespace ShoopNCook.Views; namespace ShoopNCook.Views;
public partial class StepEntry : ContentView public partial class StepEntry : ContentView
{ {
public StepEntry(): this(1) public StepEntry(): this(1)
{} {}
public StepEntry(uint ordinal) public StepEntry(uint ordinal)
{ {
InitializeComponent(); InitializeComponent();
Ordinal = ordinal; Ordinal = ordinal;
} }
public uint Ordinal { public uint Ordinal {
get => uint.Parse(OrdinalLabel.Text); get => uint.Parse(OrdinalLabel.Text);
set => OrdinalLabel.Text = value.ToString(); set => OrdinalLabel.Text = value.ToString();
} }
} }

0
Views/StoredRecipeView.xaml → Views/Components/StoredRecipeView.xaml
Unescape View File

0
Views/StoredRecipeView.xaml.cs → Views/Components/StoredRecipeView.xaml.cs
Unescape View File

0
Pages/ConfirmMail.xaml → Views/ConfirmMail.xaml
Unescape View File

0
Pages/ConfirmMail.xaml.cs → Views/ConfirmMail.xaml.cs
Unescape View File

0
Pages/CreateRecipePage.xaml → Views/CreateRecipePage.xaml
Unescape View File

14
Pages/CreateRecipePage.xaml.cs → Views/CreateRecipePage.xaml.cs
Unescape View File

@ -10,16 +10,16 @@ public partial class CreateRecipePage : ContentPage
} }
private void OnAddIngredientTapped(object sender, TappedEventArgs e) private void OnAddIngredientTapped(object sender, TappedEventArgs e)
{ {
IngredientList.Children.Add(new IngredientEntry()); IngredientList.Children.Add(new IngredientEntry());
} }
private void OnAddStepTapped(object sender, TappedEventArgs e) private void OnAddStepTapped(object sender, TappedEventArgs e)
{ {
StepList.Children.Add(new StepEntry((uint) StepList.Children.Count() + 1)); StepList.Children.Add(new StepEntry((uint) StepList.Children.Count() + 1));
} }
private async void OnBackButtonClicked(object sender, EventArgs e) private async void OnBackButtonClicked(object sender, EventArgs e)
{ {
await Navigation.PopAsync(); await Navigation.PopAsync();
} }
} }

0
Pages/FavoritesPage.xaml → Views/FavoritesPage.xaml
Unescape View File

0
Pages/FavoritesPage.xaml.cs → Views/FavoritesPage.xaml.cs
Unescape View File

340
Pages/ForgotPassword.xaml → Views/ForgotPassword.xaml
Unescape View File

@ -1,171 +1,171 @@
<?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="ShoopNCook.Pages.ForgotPassword" x:Class="ShoopNCook.Pages.ForgotPassword"
Title="ForgotPassword" Title="ForgotPassword"
BackgroundColor="{StaticResource BackgroundPrimary}"> BackgroundColor="{StaticResource BackgroundPrimary}">
<ScrollView> <ScrollView>
<Grid <Grid
Padding="20" Padding="20"
RowDefinitions="Auto, Auto, Auto, *"> RowDefinitions="Auto, Auto, Auto, *">
<!-- Profile label and return button --> <!-- Profile label and return button -->
<Grid <Grid
Grid.Row="0" Grid.Row="0"
RowDefinitions="Auto, *" RowDefinitions="Auto, *"
ColumnDefinitions="*, 1.5*" ColumnDefinitions="*, 1.5*"
Margin="0, 0, 0, 40"> Margin="0, 0, 0, 40">
<HorizontalStackLayout> <HorizontalStackLayout>
<ImageButton <ImageButton
Grid.Column="0" Grid.Column="0"
HeightRequest="50" HeightRequest="50"
WidthRequest="50" WidthRequest="50"
Source="arrow_back.svg" Source="arrow_back.svg"
Clicked="OnBackButtonClicked"/> Clicked="OnBackButtonClicked"/>
</HorizontalStackLayout> </HorizontalStackLayout>
<Label <Label
Margin="-40,10,0,0" Margin="-40,10,0,0"
Grid.Column="1" Grid.Column="1"
FontSize="24" FontSize="24"
TextColor="{StaticResource TextColorPrimary}" TextColor="{StaticResource TextColorPrimary}"
Text="Forgot Password" Text="Forgot Password"
FontFamily="PoppinsBold" FontFamily="PoppinsBold"
VerticalOptions="Start"/> VerticalOptions="Start"/>
</Grid> </Grid>
<!-- Email entry --> <!-- Email entry -->
<Grid <Grid
Grid.Row="1" Grid.Row="1"
RowDefinitions="*, Auto, Auto" RowDefinitions="*, Auto, Auto"
> >
<Label <Label
Grid.Row="0" Grid.Row="0"
FontSize="15" FontSize="15"
TextColor="{StaticResource TextColorSecondary}" TextColor="{StaticResource TextColorSecondary}"
Text="Enter your email here : " Text="Enter your email here : "
FontFamily="PoppinsBold" FontFamily="PoppinsBold"
VerticalOptions="Center"/> VerticalOptions="Center"/>
<Border <Border
Grid.Row="1" Grid.Row="1"
Style="{StaticResource SecondaryBorder}" Style="{StaticResource SecondaryBorder}"
Margin="0,30,0,20"> Margin="0,30,0,20">
<Grid <Grid
Padding="5" Padding="5"
BackgroundColor="{StaticResource BackgroundSecondary}" BackgroundColor="{StaticResource BackgroundSecondary}"
ColumnDefinitions="Auto,Auto,*"> ColumnDefinitions="Auto,Auto,*">
<Image <Image
Grid.Column="1" Grid.Column="1"
Source="email_icon.svg"> Source="email_icon.svg">
</Image> </Image>
<Entry <Entry
Style="{StaticResource UserInput}" Style="{StaticResource UserInput}"
Grid.Column="2" Grid.Column="2"
Placeholder="User Name"/> Placeholder="User Name"/>
</Grid> </Grid>
</Border> </Border>
<VerticalStackLayout <VerticalStackLayout
Grid.Row="2" Grid.Row="2"
VerticalOptions="End"> VerticalOptions="End">
<Border <Border
Margin="0, 30, 0, 0" Margin="0, 30, 0, 0"
Stroke="{StaticResource BackgroundPrimary}" Stroke="{StaticResource BackgroundPrimary}"
StrokeShape="RoundRectangle 12"> StrokeShape="RoundRectangle 12">
<Button <Button
BackgroundColor="{StaticResource ActionButton}" BackgroundColor="{StaticResource ActionButton}"
FontFamily="PoppinsMedium" FontFamily="PoppinsMedium"
TextColor="White" TextColor="White"
Text="Recup my Password"/> Text="Recup my Password"/>
</Border> </Border>
</VerticalStackLayout> </VerticalStackLayout>
</Grid> </Grid>
<Grid> <Grid>
</Grid> </Grid>
<!-- Sendmail grid --> <!-- Sendmail grid -->
<Grid <Grid
Grid.Row="2" Grid.Row="2"
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto"
RowSpacing="10"> RowSpacing="10">
<Label <Label
Grid.Row="0" Grid.Row="0"
Margin="20" Margin="20"
Text="A recuperation code as been send to your email address ! " Text="A recuperation code as been send to your email address ! "
FontFamily="PoppinsBold" FontFamily="PoppinsBold"
TextColor="LightGreen"/> TextColor="LightGreen"/>
<Label <Label
Grid.Row="1" Grid.Row="1"
Text="Enter the code here" Text="Enter the code here"
FontFamily="PoppinsBold" FontFamily="PoppinsBold"
TextColor="{StaticResource TextColorSecondary}"/> TextColor="{StaticResource TextColorSecondary}"/>
<Border <Border
Grid.Row="2" Grid.Row="2"
Style="{StaticResource SecondaryBorder}" Style="{StaticResource SecondaryBorder}"
> >
<Grid <Grid
Padding="5" Padding="5"
BackgroundColor="{StaticResource BackgroundSecondary}" BackgroundColor="{StaticResource BackgroundSecondary}"
ColumnDefinitions="Auto,Auto,*"> ColumnDefinitions="Auto,Auto,*">
<Image <Image
Grid.Column="1" Grid.Column="1"
Source="code.png"> Source="code.png">
</Image> </Image>
<Entry <Entry
Style="{StaticResource UserInput}" Style="{StaticResource UserInput}"
Grid.Column="2" Grid.Column="2"
Placeholder="Code"/> Placeholder="Code"/>
</Grid> </Grid>
</Border> </Border>
<Label <Label
Grid.Row="3" Grid.Row="3"
Text="Enter new Password here" Text="Enter new Password here"
FontFamily="PoppinsBold" FontFamily="PoppinsBold"
TextColor="{StaticResource TextColorSecondary}"/> TextColor="{StaticResource TextColorSecondary}"/>
<Border <Border
Grid.Row="4" Grid.Row="4"
Style="{StaticResource SecondaryBorderShadow}"> Style="{StaticResource SecondaryBorderShadow}">
<Entry <Entry
Style="{StaticResource UserInput}" Style="{StaticResource UserInput}"
Placeholder="New password"/> Placeholder="New password"/>
</Border> </Border>
<Label <Label
Grid.Row="5" Grid.Row="5"
Text="Confirm your new Password here" Text="Confirm your new Password here"
FontFamily="PoppinsBold" FontFamily="PoppinsBold"
TextColor="{StaticResource TextColorSecondary}"/> TextColor="{StaticResource TextColorSecondary}"/>
<Border <Border
Grid.Row="6" Grid.Row="6"
Style="{StaticResource SecondaryBorderShadow}"> Style="{StaticResource SecondaryBorderShadow}">
<Entry <Entry
Style="{StaticResource UserInput}" Style="{StaticResource UserInput}"
Placeholder="New password"/> Placeholder="New password"/>
</Border> </Border>
</Grid> </Grid>
<!-- Save button --> <!-- Save button -->
<VerticalStackLayout <VerticalStackLayout
Grid.Row="3" Grid.Row="3"
VerticalOptions="End"> VerticalOptions="End">
<Border <Border
Margin="0, 30, 0, 0" Margin="0, 30, 0, 0"
Stroke="{StaticResource BackgroundPrimary}" Stroke="{StaticResource BackgroundPrimary}"
StrokeShape="RoundRectangle 12"> StrokeShape="RoundRectangle 12">
<Button <Button
BackgroundColor="{StaticResource ActionButton}" BackgroundColor="{StaticResource ActionButton}"
FontFamily="PoppinsMedium" FontFamily="PoppinsMedium"
TextColor="White" TextColor="White"
Text="Save Change"/> Text="Save Change"/>
</Border> </Border>
</VerticalStackLayout> </VerticalStackLayout>
</Grid> </Grid>
</ScrollView> </ScrollView>
</ContentPage> </ContentPage>

24
Pages/ForgotPassword.xaml.cs → Views/ForgotPassword.xaml.cs
Unescape View File

@ -1,13 +1,13 @@
namespace ShoopNCook.Pages; namespace ShoopNCook.Pages;
public partial class ForgotPassword : ContentPage public partial class ForgotPassword : ContentPage
{ {
public ForgotPassword() public ForgotPassword()
{ {
InitializeComponent(); InitializeComponent();
} }
private async void OnBackButtonClicked(object sender, EventArgs e) private async void OnBackButtonClicked(object sender, EventArgs e)
{ {
await Navigation.PopAsync(); await Navigation.PopAsync();
} }
} }

0
Pages/HomePage.xaml → Views/HomePage.xaml
Unescape View File

0
Pages/HomePage.xaml.cs → Views/HomePage.xaml.cs
Unescape View File

0
Pages/LoginPage.xaml → Views/LoginPage.xaml
Unescape View File

0
Pages/LoginPage.xaml.cs → Views/LoginPage.xaml.cs
Unescape View File

0
Pages/MorePage.xaml → Views/MorePage.xaml
Unescape View File

0
Pages/MorePage.xaml.cs → Views/MorePage.xaml.cs
Unescape View File

0
Pages/MyListPage.xaml → Views/MyListPage.xaml
Unescape View File

0
Pages/MyListPage.xaml.cs → Views/MyListPage.xaml.cs
Unescape View File

0
Pages/MyRecipesPage.xaml → Views/MyRecipesPage.xaml
Unescape View File

0
Pages/MyRecipesPage.xaml.cs → Views/MyRecipesPage.xaml.cs
Unescape View File

0
Pages/ProfilePage.xaml → Views/ProfilePage.xaml
Unescape View File

0
Pages/ProfilePage.xaml.cs → Views/ProfilePage.xaml.cs
Unescape View File

0
Pages/RecipePage.xaml → Views/RecipePage.xaml
Unescape View File

0
Pages/RecipePage.xaml.cs → Views/RecipePage.xaml.cs
Unescape View File

0
Pages/RegisterPage.xaml → Views/RegisterPage.xaml
Unescape View File

0
Pages/RegisterPage.xaml.cs → Views/RegisterPage.xaml.cs
Unescape View File

0
Pages/SearchPage.xaml → Views/SearchPage.xaml
Unescape View File

0
Pages/SearchPage.xaml.cs → Views/SearchPage.xaml.cs
Unescape View File

0
Pages/Splash.xaml → Views/Splash.xaml
Unescape View File

0
Pages/Splash.xaml.cs → Views/Splash.xaml.cs
Unescape View File

Write Preview
Loading…
Cancel
Save