From 7db84ad9322212656c02dd216cdd1216d33e7474 Mon Sep 17 00:00:00 2001
From: "leo.tuaillon" <leo.TUAILLON@etu.uca.fr>
Date: Mon, 24 Apr 2023 17:09:49 +0200
Subject: [PATCH] ajout des entry de confirmation du mail + un appicon

---
 Pages/ForgotPassword.xaml    | 263 +++++++++++++++++++++--------------
 Resources/Images/code.png    | Bin 0 -> 920 bytes
 Resources/Styles/Colors.xaml |   2 +
 ShoopNCook.csproj            |   1 +
 4 files changed, 165 insertions(+), 101 deletions(-)
 create mode 100644 Resources/Images/code.png

diff --git a/Pages/ForgotPassword.xaml b/Pages/ForgotPassword.xaml
index 2f55462..f6227f4 100644
--- a/Pages/ForgotPassword.xaml
+++ b/Pages/ForgotPassword.xaml
@@ -4,106 +4,167 @@
              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"/>
-                </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 
-                    Margin="10,20,0,0"
-                    Grid.Column="1"
-                    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>
-
-          
-
-            <!-- 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>
+        <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"/>
+                </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"/>
+                </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"/>
+                </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>
\ No newline at end of file
diff --git a/Resources/Images/code.png b/Resources/Images/code.png
new file mode 100644
index 0000000000000000000000000000000000000000..5936923902a189d373d4ab87c33cc1ddca7fd513
GIT binary patch
literal 920
zcmV;J184k+P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&Qb|NXRA@u(Sle+FK@8MI0z?9i1RRMW66{DI6PrlvYHFM6(@7)k-mrJBy8ZEE
zXC<}Ndd<P!`Ez*Z_S+4>r6V{y0zb{{TLJ2~ncd9-J{!QZnSCsbdoi<5*9zdZVc69I
zfaehbJdb8}@4);rvoFj4Kp{}+>}Mv0z<uOE20-&;R{-!V!d^Y!&Fo=0^ux^Xw?5VT
zN`Cmh69I%CAYc@z5j}Vh50fIGk3Wldkc9^h8Oa0Kugke%#i{@(EvWcOyz31oxQHSO
zfad@NXYmuVpbv&?B^%PM0+5wOC`1xQHD8U=Xk}nWvgow5?2Z6<@55kHB%%>1QRPeK
zX_d){@PAQG{e3qApf#NWpd5*+o`*7Uer;KVEan#tg$(FobXnE1sHOn?NZ^6ei=WRN
z3n+)BSEJ_vM!h8jpbZIvql&Vr<Zbv!X&gp6qL6k>=uG)n7)0+vF%xwy2G4|(K`;WK
z4M(|&NK^@m^HI5sO7I9wRI%C-fZ!;>I?3vzmsKm@rS)9o0C+xh;HV0b0vr#j4(b&H
zFq+<nB`VsSvb^%8yQFZ{$Vdrrkp_g-z|6Gl`ZL}c*+{MQ?L@r26KgV6b57P@Jg=h>
zK_k%G+&U3}LDei@jnd?JHIXU}cLh)xMgUbLcZonnq0!2y!yyJVUzWR({8zO)6!O(2
zYHXdhUyUa)O3zd~LpjXhK-AQ_C6L|s&x#qp+CNVEN)~~3Cv*}cz+P#UoLLj);&UV~
z0uVKmN~sFP_h^3peyCN~7eQGQ)on1P(2QY@#v_05I~=ffUx+B&8s@HboCcti=9lGw
zuLgc6)wM9>W^-=lhKEGQ_~FZ{mfiM3!)cVaZ1|fW&s-^^;SUr6&+*e2gwWaDrJkPg
ziAhJZWKwxG>od`_bAG8$x58?i*2^kYw&hv{-)Gk}h;Vi-KfDaCI&n7Rb0L{=vBevW
z|8lX#Nfg3QYOsXFH=iivenHQ!79k6c!wnrPPfE!u0!--6E?iBd)%#}QIzH9`&=st7
zi%MQKN_X{?qr@gbOUGsDjYbdc@X;u}N$<=E_zpfYXqw(>f);B#*DAxZxHb%z0Fd2k
uthGIzMmGt%)JL-;use<$fZbj06utr9rwBm)s0OJ30000<MNUMnLSTY}3#oko

literal 0
HcmV?d00001

diff --git a/Resources/Styles/Colors.xaml b/Resources/Styles/Colors.xaml
index 9f2c70e..daac8a8 100644
--- a/Resources/Styles/Colors.xaml
+++ b/Resources/Styles/Colors.xaml
@@ -17,6 +17,7 @@
     <Color x:Key="Gray600">#404040</Color>
     <Color x:Key="Gray900">#212121</Color>
     <Color x:Key="Gray950">#141414</Color>
+    <Color x:Key="ValidationColor">#2ADE0A</Color>
     <SolidColorBrush x:Key="PrimaryBrush" Color="{StaticResource Primary}"/>
     <SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource Secondary}"/>
     <SolidColorBrush x:Key="TertiaryBrush" Color="{StaticResource Tertiary}"/>
@@ -31,6 +32,7 @@
     <SolidColorBrush x:Key="Gray900Brush" Color="{StaticResource Gray900}"/>
     <SolidColorBrush x:Key="Gray950Brush" Color="{StaticResource Gray950}"/>
 
+
     <Color x:Key="Yellow100Accent">#F7B548</Color>
     <Color x:Key="Yellow200Accent">#FFD590</Color>
     <Color x:Key="Yellow300Accent">#FFE5B9</Color>
diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj
index 7a5d64c..1f415c7 100644
--- a/ShoopNCook.csproj
+++ b/ShoopNCook.csproj
@@ -51,6 +51,7 @@
 	  <None Remove="Resources\Fonts\Poppins-Bold.ttf" />
 	  <None Remove="Resources\Fonts\Poppins-Medium.ttf" />
 	  <None Remove="Resources\Fonts\Poppins-Regular.ttf" />
+	  <None Remove="Resources\Images\code.png" />
 	  <None Remove="Resources\Images\cookie.svg" />
 	  <None Remove="Resources\Images\email_icon.svg" />
 	  <None Remove="Resources\Images\facebook_logo.svg" />