diff --git a/AppShell.xaml b/AppShell.xaml
index 47d100b..583bcf4 100644
--- a/AppShell.xaml
+++ b/AppShell.xaml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
+=======
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3
diff --git a/Resources/Images/arrow_back.svg b/Resources/Images/arrow_back.svg
new file mode 100644
index 0000000..a9950c9
--- /dev/null
+++ b/Resources/Images/arrow_back.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Resources/Images/default_profile_picture.png b/Resources/Images/default_profile_picture.png
new file mode 100644
index 0000000..2120267
Binary files /dev/null and b/Resources/Images/default_profile_picture.png differ
diff --git a/Resources/Styles/Colors.xaml b/Resources/Styles/Colors.xaml
index 0121949..00b23e3 100644
--- a/Resources/Styles/Colors.xaml
+++ b/Resources/Styles/Colors.xaml
@@ -41,9 +41,9 @@
#72ACF1
#A7CBF6
-
-
#f0e7e7
+ White
+
Black
#6d6d6d
#ff8988
diff --git a/Resources/Styles/Styles.xaml b/Resources/Styles/Styles.xaml
index dc4a034..0e66b7c 100644
--- a/Resources/Styles/Styles.xaml
+++ b/Resources/Styles/Styles.xaml
@@ -4,6 +4,17 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+
+
+
+
diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj
index a167053..bdc0076 100644
--- a/ShoopNCook.csproj
+++ b/ShoopNCook.csproj
@@ -1,53 +1,53 @@
-
-
-
- net7.0-android;net7.0-ios;net7.0-maccatalyst
- $(TargetFrameworks);net7.0-windows10.0.19041.0
-
-
- Exe
- ShoopNCook
- true
- true
- enable
-
-
- ShoopNCook
-
-
- com.companyname.shoopncook
- bf17e1fe-a722-42f6-a24d-3327d351c924
-
-
- 1.0
- 1
-
- 11.0
- 13.1
- 21.0
- 10.0.17763.0
- 10.0.17763.0
- 6.5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ net7.0-android;net7.0-ios;net7.0-maccatalyst
+ $(TargetFrameworks);net7.0-windows10.0.19041.0
+
+
+ Exe
+ ShoopNCook
+ true
+ true
+ enable
+
+
+ ShoopNCook
+
+
+ com.companyname.shoopncook
+ bf17e1fe-a722-42f6-a24d-3327d351c924
+
+
+ 1.0
+ 1
+
+ 11.0
+ 13.1
+ 21.0
+ 10.0.17763.0
+ 10.0.17763.0
+ 6.5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -55,16 +55,43 @@
+<<<<<<< HEAD
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3
MSBuild:Compile
+<<<<<<< HEAD
+=======
+
+ MSBuild:Compile
+
+
+
+
+>>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3
diff --git a/Views/HomePage.xaml b/Views/HomePage.xaml
index fe4dc31..44b3033 100644
--- a/Views/HomePage.xaml
+++ b/Views/HomePage.xaml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
-
\ No newline at end of file
+
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3
diff --git a/Views/HomePage.xaml.cs b/Views/HomePage.xaml.cs
index bf9671b..bdcff39 100644
--- a/Views/HomePage.xaml.cs
+++ b/Views/HomePage.xaml.cs
@@ -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
}
\ No newline at end of file
diff --git a/Views/LoginPage.xaml b/Views/LoginPage.xaml
index b2f99c0..08c23f2 100644
--- a/Views/LoginPage.xaml
+++ b/Views/LoginPage.xaml
@@ -31,7 +31,7 @@
>
@@ -54,7 +54,7 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Views/ProfilePage.xaml.cs b/Views/ProfilePage.xaml.cs
new file mode 100644
index 0000000..6102df7
--- /dev/null
+++ b/Views/ProfilePage.xaml.cs
@@ -0,0 +1,9 @@
+namespace ShoopNCook.Views;
+
+public partial class ProfilePage : ContentPage
+{
+ public ProfilePage()
+ {
+ InitializeComponent();
+ }
+}
\ No newline at end of file
diff --git a/documentation/Context.odt b/documentation/Context.odt
deleted file mode 100644
index 5e9b5f7..0000000
Binary files a/documentation/Context.odt and /dev/null differ
diff --git a/documentation/Personnas.pdf b/documentation/Personnas.pdf
deleted file mode 100644
index 7e3e4fa..0000000
Binary files a/documentation/Personnas.pdf and /dev/null differ
diff --git a/documentation/Sketchs.pdf b/documentation/Sketchs.pdf
new file mode 100644
index 0000000..f237c1e
Binary files /dev/null and b/documentation/Sketchs.pdf differ