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

v1 homepage

Browse Source
pull/29/head
Leo TUAILLON 2 years ago
parent 32ae93a56c 461f50d02d
commit cf2de7947e
14 changed files with 341 additions and 55 deletions
Show Stats Download Patch File Download Diff File

30
AppShell.xaml
Unescape View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8" ?>
<Shell
x:Class="ShoopNCook.AppShell"
@ -22,3 +23,32 @@
Route="HomePage" />
</TabBar>
</Shell>
=======
<?xml version="1.0" encoding="UTF-8" ?>
<Shell
x:Class="ShoopNCook.AppShell"
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:ShoopNCook"
xmlns:views="clr-namespace:ShoopNCook.Views"
Shell.FlyoutBehavior="Disabled"
Shell.NavBarIsVisible="False">
<TabBar>
<ShellContent
Title="Home"
ContentTemplate="{DataTemplate views:HomePage}"
Route="MainPage" />
<ShellContent
Title="Login Page"
ContentTemplate="{DataTemplate views:LoginPage}"
Route="LoginPage" />
<ShellContent
Title="Profile Page"
ContentTemplate="{DataTemplate views:ProfilePage}"
Route="Profile" />
</TabBar>
</Shell>
>>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3

1
Resources/Images/arrow_back.svg
Unescape View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="M373 956 18 601q-5-5-8-11.5T7 575q0-7 3-13.5t8-11.5l355-355q13-13 32-13t32 13q14 14 14 33t-14 33L123 575l315 315q13 14 13 33t-13 32q-14 14-33.5 14T373 956Z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 259 B

BIN
Resources/Images/default_profile_picture.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

4
Resources/Styles/Colors.xaml
Unescape View File

@ -41,9 +41,9 @@
<Color x:Key="Blue200Accent">#72ACF1</Color>
<Color x:Key="Blue300Accent">#A7CBF6</Color>
<Color x:Key="BackgroundPrimary">#f0e7e7</Color>
<Color x:Key="BackgroundSecondary">White</Color>
<Color x:Key="TextColorPrimary">Black</Color>
<Color x:Key="TextColorSecondary">#6d6d6d</Color>
<Color x:Key="ActionButton">#ff8988</Color>

11
Resources/Styles/Styles.xaml
Unescape View File

@ -4,6 +4,17 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
<Border
x:Key="UserInput"
Grid.Row="3"
StrokeShape="RoundRectangle 15"
Stroke="{StaticResource BackgroundSecondary}">
<Entry
TextColor="{StaticResource TextColorPrimary}"
PlaceholderColor="{StaticResource TextColorSecondary}"
BackgroundColor="{StaticResource BackgroundSecondary}"/>
</Border>
<Style TargetType="ActivityIndicator">
<Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
</Style>

27
ShoopNCook.csproj
Unescape View File

@ -55,16 +55,43 @@
<None Remove="Resources\Images\password_icon.svg" />
<None Remove="Resources\Images\visibility_off.svg" />
<None Remove="Resources\Images\visibility_on.svg" />
<<<<<<< HEAD
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
</ItemGroup>
=======
</ItemGroup>
<ItemGroup>
<None Remove="Resources\Fonts\arrow_back_ios_FILL0_wght400_GRAD200_opsz48.svg" />
<None Remove="Resources\Images\default_profile_picture.png" />
</ItemGroup>
<ItemGroup>
<MauiFont Include="Resources\Images\arrow_back.svg" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
</ItemGroup>
>>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3
<ItemGroup>
<MauiXaml Update="Views\HomePage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<<<<<<< HEAD
</ItemGroup>
</Project>
=======
<MauiXaml Update="Views\ProfilePage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>
</Project>
>>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3

56
Views/HomePage.xaml
Unescape View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
<?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"
@ -179,3 +180,58 @@
</StackLayout>
</ScrollView>
</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="ShoopNCook.Views.HomePage"
Title="HomePage">
<ScrollView>
<Grid x:Name="RecipesGrid"
RowSpacing="10"
ColumnSpacing="10"
Padding="10">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<!-- Recette 1 -->
<Frame Grid.Row="0" Grid.Column="0" Padding="0" Margin="5" CornerRadius="10" BackgroundColor="Aqua">
<Grid Padding="10">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Image Grid.Row="0" Source="facebook_logo.png" Aspect="AspectFill" Margin="0,0,0,10" />
<Label Grid.Row="1" Text="Titre Recette 1" FontAttributes="Bold" FontSize="Large" />
<Label Grid.Row="2" Text="Temps de préparation : 30 min" FontSize="Small" />
</Grid>
</Frame>
<!-- Recette 2 -->
<Frame Grid.Row="0" Grid.Column="1" Padding="0" Margin="5" CornerRadius="10" BackgroundColor="Aqua">
<Grid Padding="10">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Image Grid.Row="0" Source="facebook_logo.png" Aspect="AspectFill" Margin="0,0,0,10" />
<Label Grid.Row="1" Text="Titre Recette 2" FontAttributes="Bold" FontSize="Large" />
<Label Grid.Row="2" Text="Temps de préparation : 45 min" FontSize="Small" />
</Grid>
</Frame>
</Grid>
</ScrollView>
</ContentPage>
>>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3

11
Views/HomePage.xaml.cs
Unescape View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
namespace ShoopNCook.Views;
public partial class HomePage : ContentPage
@ -6,4 +7,14 @@ public partial class HomePage : ContentPage
{
InitializeComponent();
}
=======
namespace ShoopNCook.Views;
public partial class HomePage : ContentPage
{
public HomePage()
{
InitializeComponent();
}
>>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3
}

4
Views/LoginPage.xaml
Unescape View File

@ -31,7 +31,7 @@
>
<Grid
Padding="5"
BackgroundColor="White"
BackgroundColor="{StaticResource BackgroundSecondary}"
ColumnDefinitions="Auto,Auto,*"
>
@ -54,7 +54,7 @@
>
<Grid
Padding="5"
BackgroundColor="White"
BackgroundColor="{StaticResource BackgroundSecondary}"
ColumnDefinitions="Auto,Auto,*,Auto">
<Image

141
Views/ProfilePage.xaml
Unescape View File

@ -0,0 +1,141 @@
<?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.Views.ProfilePage"
Title="ProfilePage"
BackgroundColor="{StaticResource BackgroundPrimary}">
<ScrollView>
<Grid
Margin="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"/>
</HorizontalStackLayout>
<Label
Grid.Column="1"
FontSize="24"
TextColor="{StaticResource TextColorPrimary}"
Text="Profile"
FontFamily="PoppinsBold"
VerticalOptions="Center"/>
</Grid>
<!-- Profile picture and name -->
<Grid
Grid.Row="1"
RowDefinitions="*, Auto, Auto">
<Border
Grid.Row="0"
StrokeShape="RoundRectangle 10000"
MaximumHeightRequest="150"
MaximumWidthRequest="150"
HorizontalOptions="Center"
Stroke="{StaticResource BackgroundPrimary}"
BackgroundColor="{StaticResource BackgroundSecondary}">
<ImageButton
Grid.Row="0"
Source="default_profile_picture.png"/>
</Border>
<Label
Grid.Row="1"
FontSize="30"
HorizontalOptions="Center"
TextColor="{StaticResource TextColorPrimary}"
Text="%Profile_Name%"
FontFamily="PoppinsBold"/>
<Label
Grid.Row="2"
FontSize="16"
HorizontalOptions="Center"
TextColor="{StaticResource TextColorSecondary}"
Text="Profile settings"
FontFamily="PoppinsBold"/>
</Grid>
<!-- User inputs -->
<Grid
Grid.Row="2"
Margin="0, 20, 0, 0"
RowDefinitions="Auto, *, Auto, *">
<Label
Grid.Row="0"
Text="Name"
FontFamily="PoppinsBold"
TextColor="{StaticResource TextColorSecondary}"/>
<Border
Grid.Row="1"
StrokeShape="RoundRectangle 12"
Stroke="{StaticResource BackgroundSecondary}">
<Entry
TextColor="{StaticResource TextColorPrimary}"
PlaceholderColor="{StaticResource TextColorSecondary}"
BackgroundColor="{StaticResource BackgroundSecondary}"
Text="%Profile_Name%"
Placeholder="Place your name here"/>
</Border>
<Label
Grid.Row="2"
Text="Your Email"
FontFamily="PoppinsBold"
TextColor="{StaticResource TextColorSecondary}"/>
<Border
Grid.Row="3"
StrokeShape="RoundRectangle 12"
Stroke="{StaticResource BackgroundSecondary}">
<Entry
TextColor="{StaticResource TextColorPrimary}"
PlaceholderColor="{StaticResource TextColorSecondary}"
BackgroundColor="{StaticResource BackgroundSecondary}"
Text="%Profile_Mail%"
FontFamily="PoppinsBold"
Placeholder="Place your mail address here"/>
</Border>
</Grid>
<!-- Save button -->
<VerticalStackLayout
Grid.Row="3"
VerticalOptions="End">
<Border
Margin="0, 30, 0, 0"
Stroke="{StaticResource BackgroundPrimary}"
StrokeShape="RoundRectangle 12">
<Label
HeightRequest="50"
BackgroundColor="{StaticResource ActionButton}"
HorizontalTextAlignment="Center"
VerticalTextAlignment="Center"
FontFamily="PoppinsBold"
Text="SAVE"/>
</Border>
</VerticalStackLayout>
</Grid>
</ScrollView>
</ContentPage>

9
Views/ProfilePage.xaml.cs
Unescape View File

@ -0,0 +1,9 @@
namespace ShoopNCook.Views;
public partial class ProfilePage : ContentPage
{
public ProfilePage()
{
InitializeComponent();
}
}

BIN
documentation/Context.odt
View File

Binary file not shown.

BIN
documentation/Personnas.pdf
View File

Binary file not shown.

BIN
documentation/Sketchs.pdf
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save