diff --git a/.gitignore b/.gitignore index 10f0792..55de648 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,10 @@ bin/ obj/ +#locks and backup +.~* + + .nuspec/ .buildtasks/ templatesTest/ diff --git a/AppShell.xaml b/AppShell.xaml index 4b2f94f..7d2a2e1 100644 --- a/AppShell.xaml +++ b/AppShell.xaml @@ -1,21 +1,21 @@ - - - - - - - - - + + + + + + + + + diff --git a/MainPage.cs b/MainPage.cs new file mode 100644 index 0000000..030cb8f --- /dev/null +++ b/MainPage.cs @@ -0,0 +1,15 @@ +namespace ShoopNCook; + +public class MainPage : ContentPage +{ + public MainPage() + { + Content = new VerticalStackLayout + { + Children = { + new Label { HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.Center, Text = "Welcome to .NET MAUI!" + } + } + }; + } +} \ No newline at end of file diff --git a/MauiProgram.cs b/MauiProgram.cs index 0367a8f..760acb4 100644 --- a/MauiProgram.cs +++ b/MauiProgram.cs @@ -13,7 +13,8 @@ public static class MauiProgram { fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); - }); + fonts.AddFont("Poppins-bold.ttf", "PoppinsBold"); + }); #if DEBUG builder.Logging.AddDebug(); diff --git a/Resources/Fonts/Poppins-Bold.ttf b/Resources/Fonts/Poppins-Bold.ttf new file mode 100644 index 0000000..89b46e7 Binary files /dev/null and b/Resources/Fonts/Poppins-Bold.ttf differ diff --git a/Resources/Images/email_icon.svg b/Resources/Images/email_icon.svg new file mode 100644 index 0000000..b33a95f --- /dev/null +++ b/Resources/Images/email_icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Resources/Images/facebook_logo.svg b/Resources/Images/facebook_logo.svg new file mode 100644 index 0000000..7b84fa9 --- /dev/null +++ b/Resources/Images/facebook_logo.svg @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/Resources/Images/google_logo.svg b/Resources/Images/google_logo.svg new file mode 100644 index 0000000..d5616b3 --- /dev/null +++ b/Resources/Images/google_logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Resources/Images/password_icon.svg b/Resources/Images/password_icon.svg new file mode 100644 index 0000000..6c50cb6 --- /dev/null +++ b/Resources/Images/password_icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Resources/Images/visibility_off.svg b/Resources/Images/visibility_off.svg new file mode 100644 index 0000000..b0f015a --- /dev/null +++ b/Resources/Images/visibility_off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Resources/Images/visibility_on.svg b/Resources/Images/visibility_on.svg new file mode 100644 index 0000000..90e9d65 --- /dev/null +++ b/Resources/Images/visibility_on.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Resources/Styles/Colors.xaml b/Resources/Styles/Colors.xaml index 245758b..0121949 100644 --- a/Resources/Styles/Colors.xaml +++ b/Resources/Styles/Colors.xaml @@ -41,4 +41,11 @@ #72ACF1 #A7CBF6 + + + #f0e7e7 + Black + #6d6d6d + #ff8988 + \ No newline at end of file diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj index 7a3f5bb..e2e63d1 100644 --- a/ShoopNCook.csproj +++ b/ShoopNCook.csproj @@ -48,12 +48,21 @@ + + + + + + + + + - - + + diff --git a/Views/LoginPage.xaml b/Views/LoginPage.xaml new file mode 100644 index 0000000..b2f99c0 --- /dev/null +++ b/Views/LoginPage.xaml @@ -0,0 +1,154 @@ + + + + + \ No newline at end of file diff --git a/Views/LoginPage.xaml.cs b/Views/LoginPage.xaml.cs new file mode 100644 index 0000000..bb308e8 --- /dev/null +++ b/Views/LoginPage.xaml.cs @@ -0,0 +1,9 @@ +namespace ShoopNCook.Views; + +public partial class LoginPage : ContentPage +{ + public LoginPage() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/documentation/.~lock.Context.odt# b/documentation/.~lock.Context.odt# deleted file mode 100644 index 9b84fb9..0000000 --- a/documentation/.~lock.Context.odt# +++ /dev/null @@ -1 +0,0 @@ -,maxime,grospc,25.03.2023 11:50,file:///home/maxime/.config/libreoffice/4; \ No newline at end of file diff --git a/documentation/Context.odt b/documentation/Context.odt index 93a5ae5..5e9b5f7 100644 Binary files a/documentation/Context.odt and b/documentation/Context.odt differ diff --git a/documentation/Diagramme_cas_utilisation.md b/documentation/Diagramme_cas_utilisation.md new file mode 100644 index 0000000..8ab59f8 --- /dev/null +++ b/documentation/Diagramme_cas_utilisation.md @@ -0,0 +1,53 @@ +# Diagramme de séquence Shop&Cook + +## Interactions entre Utilisateur, Shop&Cook et API + +```mermaid +sequenceDiagram +participant Utilisateur +participant Shop&Cook +participant API + +Utilisateur->>+Shop&Cook: Ouvre l'application +Shop&Cook->>+Utilisateur: Affiche l'écran de connexion + +Utilisateur->>+Shop&Cook: Se connecte / S'inscrit +Shop&Cook->>+API: Valide les informations de connexion / inscription +API-->>-Shop&Cook: Retourne le résultat de la validation +Shop&Cook-->>-Utilisateur: Affiche l'écran d'accueil ou un message d'erreur + +Utilisateur->>+Shop&Cook: Recherche des recettes avec filtres +Shop&Cook->>+API: Récupère les recettes filtrées +API-->>-Shop&Cook: Retourne les recettes filtrées +Shop&Cook-->>-Utilisateur: Affiche les recettes filtrées + +Utilisateur->>+Shop&Cook: Aime/Ajoute aux favoris une recette +Shop&Cook->>+API: Met à jour le statut de la recette +API-->>-Shop&Cook: Confirme la mise à jour +Shop&Cook-->>-Utilisateur: Met à jour l'affichage de la recette + +Utilisateur->>+Shop&Cook: Accède aux paramètres +Shop&Cook-->>-Utilisateur: Affiche les options de paramètres + +Utilisateur->>+Shop&Cook: Change le thème/le mot de passe +Shop&Cook->>+API: Enregistre les modifications +API-->>-Shop&Cook: Confirme l'enregistrement +Shop&Cook-->>-Utilisateur: Met à jour l'affichage et confirme les modifications + +Utilisateur->>+Shop&Cook: Clique sur une recette +Shop&Cook->>+API: Récupère les détails de la recette +API-->>-Shop&Cook: Retourne les détails de la recette +Shop&Cook-->>-Utilisateur: Affiche les détails de la recette + +Utilisateur->>+Shop&Cook: Choisit le nombre de personnes et ajoute au panier +Shop&Cook-->>-Utilisateur: Met à jour le panier + +Utilisateur->>+Shop&Cook: Planifie un repas pour un jour de la semaine +Shop&Cook-->>-Utilisateur: Met à jour le planning + +Utilisateur->>+Shop&Cook: Génère la liste de courses +Shop&Cook->>+API: Récupère les ingrédients nécessaires +API-->>-Shop&Cook: Retourne la liste des ingrédients +Shop&Cook-->>-Utilisateur: Affiche la liste de courses + +``` diff --git a/documentation/Julien.pdf b/documentation/Julien.pdf deleted file mode 100644 index baaece3..0000000 Binary files a/documentation/Julien.pdf and /dev/null differ diff --git a/documentation/Laura.pdf b/documentation/Laura.pdf deleted file mode 100644 index bf09bd9..0000000 Binary files a/documentation/Laura.pdf and /dev/null differ diff --git a/documentation/Personnas.pdf b/documentation/Personnas.pdf new file mode 100644 index 0000000..7e3e4fa Binary files /dev/null and b/documentation/Personnas.pdf differ diff --git a/documentation/ShopNCookContexte.pdf b/documentation/ShopNCookContexte.pdf new file mode 100644 index 0000000..977218d Binary files /dev/null and b/documentation/ShopNCookContexte.pdf differ diff --git a/documentation/Sophie.pdf b/documentation/Sophie.pdf deleted file mode 100644 index c56227d..0000000 Binary files a/documentation/Sophie.pdf and /dev/null differ diff --git a/sketchs/Favorites.png b/documentation/sketchs/Favorites.png similarity index 100% rename from sketchs/Favorites.png rename to documentation/sketchs/Favorites.png diff --git a/sketchs/Home.png b/documentation/sketchs/Home.png similarity index 100% rename from sketchs/Home.png rename to documentation/sketchs/Home.png diff --git a/sketchs/Login.png b/documentation/sketchs/Login.png similarity index 100% rename from sketchs/Login.png rename to documentation/sketchs/Login.png diff --git a/sketchs/Menu.png b/documentation/sketchs/Menu.png similarity index 100% rename from sketchs/Menu.png rename to documentation/sketchs/Menu.png diff --git a/sketchs/Profile.png b/documentation/sketchs/Profile.png similarity index 100% rename from sketchs/Profile.png rename to documentation/sketchs/Profile.png diff --git a/sketchs/Recipe.png b/documentation/sketchs/Recipe.png similarity index 100% rename from sketchs/Recipe.png rename to documentation/sketchs/Recipe.png diff --git a/sketchs/Search.png b/documentation/sketchs/Search.png similarity index 100% rename from sketchs/Search.png rename to documentation/sketchs/Search.png diff --git a/sketchs/SearchFilter.png b/documentation/sketchs/SearchFilter.png similarity index 100% rename from sketchs/SearchFilter.png rename to documentation/sketchs/SearchFilter.png diff --git a/sketchs/ShopNCooKDebutSketch.png b/documentation/sketchs/ShopNCooKDebutSketch.png similarity index 100% rename from sketchs/ShopNCooKDebutSketch.png rename to documentation/sketchs/ShopNCooKDebutSketch.png diff --git a/sketchs/SignUp.png b/documentation/sketchs/SignUp.png similarity index 100% rename from sketchs/SignUp.png rename to documentation/sketchs/SignUp.png diff --git a/sketchs/Splash.png b/documentation/sketchs/Splash.png similarity index 100% rename from sketchs/Splash.png rename to documentation/sketchs/Splash.png diff --git a/sketchs/sketchs.md b/documentation/sketchs/sketchs.md similarity index 100% rename from sketchs/sketchs.md rename to documentation/sketchs/sketchs.md