Browse Source

delete broken tests

Lera 5 months ago
parent
commit
5db0658f39
47 changed files with 0 additions and 1887 deletions
  1. 0 15
      FoodLogProject/App.axaml
  2. 0 29
      FoodLogProject/App.axaml.cs
  3. BIN
      FoodLogProject/Assets/FoodLogLogo.png
  4. BIN
      FoodLogProject/Assets/avalonia-logo.ico
  5. 0 32
      FoodLogProject/FoodLogProject.csproj
  6. 0 260
      FoodLogProject/GaruaevContext.cs
  7. 0 27
      FoodLogProject/Models/Customer.cs
  8. 0 15
      FoodLogProject/Models/CustomersIngredient.cs
  9. 0 11
      FoodLogProject/Models/Ingredient.cs
  10. 0 19
      FoodLogProject/Models/Order.cs
  11. 0 13
      FoodLogProject/Models/Recipe.cs
  12. 0 17
      FoodLogProject/Models/RecipesIngredient.cs
  13. 0 15
      FoodLogProject/Models/RecipesOrder.cs
  14. 0 15
      FoodLogProject/Models/Supplier.cs
  15. 0 35
      FoodLogProject/Program.cs
  16. 0 34
      FoodLogProject/ViewLocator.cs
  17. 0 76
      FoodLogProject/ViewModels/MainWindowViewModel.cs
  18. 0 20
      FoodLogProject/ViewModels/Page2ViewModel.cs
  19. 0 29
      FoodLogProject/ViewModels/Page3ViewModel.cs
  20. 0 47
      FoodLogProject/ViewModels/Page6ViewModel.cs
  21. 0 8
      FoodLogProject/ViewModels/ViewModelBase.cs
  22. 0 23
      FoodLogProject/Views/MainWindow.axaml
  23. 0 15
      FoodLogProject/Views/MainWindow.axaml.cs
  24. 0 30
      FoodLogProject/Views/Page1.axaml
  25. 0 14
      FoodLogProject/Views/Page1.axaml.cs
  26. 0 36
      FoodLogProject/Views/Page2.axaml
  27. 0 15
      FoodLogProject/Views/Page2.axaml.cs
  28. 0 275
      FoodLogProject/Views/Page3.axaml
  29. 0 39
      FoodLogProject/Views/Page3.axaml.cs
  30. 0 79
      FoodLogProject/Views/Page4.axaml
  31. 0 13
      FoodLogProject/Views/Page4.axaml.cs
  32. 0 224
      FoodLogProject/Views/Page5.axaml
  33. 0 13
      FoodLogProject/Views/Page5.axaml.cs
  34. 0 84
      FoodLogProject/Views/Page6.axaml
  35. 0 13
      FoodLogProject/Views/Page6.axaml.cs
  36. 0 68
      FoodLogProject/Views/Page7.axaml
  37. 0 13
      FoodLogProject/Views/Page7.axaml.cs
  38. 0 18
      FoodLogProject/app.manifest
  39. 0 23
      FoodLogTesting/FoodLogTesting.csproj
  40. 0 2
      FoodLogTesting/GlobalUsings.cs
  41. 0 91
      FoodLogTesting/UnitTest1.cs
  42. 0 24
      FoodLogTests/FoodLogTests.csproj
  43. 0 1
      FoodLogTests/GlobalUsings.cs
  44. 0 16
      FoodLogTests/UnitTest1.cs
  45. 0 1
      TestProject1/GlobalUsings.cs
  46. 0 29
      TestProject1/TestProject1.csproj
  47. 0 11
      TestProject1/UnitTest1.cs

+ 0 - 15
FoodLogProject/App.axaml

@@ -1,15 +0,0 @@
-<Application xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="FoodLogProject.App"
-             xmlns:local="using:FoodLogProject"
-             RequestedThemeVariant="Default">
-             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
-
-    <Application.DataTemplates>
-        <local:ViewLocator/>
-    </Application.DataTemplates>
-  
-    <Application.Styles>
-        <FluentTheme />
-    </Application.Styles>
-</Application>

+ 0 - 29
FoodLogProject/App.axaml.cs

@@ -1,29 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
-using FoodLogProject.ViewModels;
-using FoodLogProject.Views;
-
-namespace FoodLogProject
-{
-    public partial class App : Application
-    {
-        public override void Initialize()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        public override void OnFrameworkInitializationCompleted()
-        {
-            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-            {
-                desktop.MainWindow = new MainWindow
-                {
-                    DataContext = new MainWindowViewModel(),
-                };
-            }
-
-            base.OnFrameworkInitializationCompleted();
-        }
-    }
-}

BIN
FoodLogProject/Assets/FoodLogLogo.png


BIN
FoodLogProject/Assets/avalonia-logo.ico


+ 0 - 32
FoodLogProject/FoodLogProject.csproj

@@ -1,32 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <AvaloniaResource Include="Assets\**" />
-  </ItemGroup>
-
-  
-
-  <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.10" />
-    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.10" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.14">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
-  </ItemGroup>
-</Project>

+ 0 - 260
FoodLogProject/GaruaevContext.cs

@@ -1,260 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using Microsoft.EntityFrameworkCore;
-
-namespace FoodLogProject;
-
-public partial class GaruaevContext : DbContext
-{
-    public bool CheckRegNumber(string numberInput)
-    {
-
-        Regex number = new Regex("^8\\(\\d{3}\\)\\d{3}-\\d{2}-\\d{2}$");
-        if (number.IsMatch(numberInput))
-        {
-            //ShowMessageNumber.Text = "Номер введен некоректно";
-            return true;
-        }
-        return false;
-    }
-
-    public bool CheckRegName(string numberInput)
-    {
-
-        Regex number = new Regex("^[А-Я]{1}[а-я]{1,}$");
-        if (number.IsMatch(numberInput))
-        {
-            //ShowMessageNumber.Text = "Номер введен некоректно";
-            return true;
-        }
-        return false;
-    }
-
-    public bool CheckRegHeight(string numberInput)
-    {
-
-        Regex number = new Regex("^\\d+$");
-        if (number.IsMatch(numberInput))
-        {
-            //ShowMessageNumber.Text = "Номер введен некоректно";
-            return true;
-        }
-        return false;
-    }
-
-    public bool CheckRegWeight(string numberInput)
-    {
-
-        Regex number = new Regex("^\\d+$");
-        if (number.IsMatch(numberInput))
-        {
-            //ShowMessageNumber.Text = "Номер введен некоректно";
-            return true;
-        }
-        return false;
-    }
-
-    public bool CheckRegPassword(string numberInput)
-    {
-
-        Regex number = new Regex("\\S");
-        if (number.IsMatch(numberInput))
-        {
-            //ShowMessageNumber.Text = "Номер введен некоректно";
-            return true;
-        }
-        return false;
-    }
-    public GaruaevContext()
-    {
-    }
-
-    public GaruaevContext(DbContextOptions<GaruaevContext> options)
-        : base(options)
-    {
-    }
-
-    public virtual DbSet<Customer> Customers { get; set; }
-
-    public virtual DbSet<CustomersIngredient> CustomersIngredients { get; set; }
-
-    public virtual DbSet<Ingredient> Ingredients { get; set; }
-
-    public virtual DbSet<Order> Orders { get; set; }
-
-    public virtual DbSet<Recipe> Recipes { get; set; }
-
-    public virtual DbSet<RecipesIngredient> RecipesIngredients { get; set; }
-
-    public virtual DbSet<RecipesOrder> RecipesOrders { get; set; }
-
-    public virtual DbSet<Supplier> Suppliers { get; set; }
-
-    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263.
-        => optionsBuilder.UseNpgsql("Host=edu.pg.ngknn.ru;Port=5442;Database=Garuaev;Username=33P;Password=12345");
-
-    protected override void OnModelCreating(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<Customer>(entity =>
-        {
-            entity.HasKey(e => e.CustomerId).HasName("customer_id_pk");
-
-            entity.ToTable("customers");
-
-            entity.HasIndex(e => e.CustomerPhone, "customer_phone_key").IsUnique();
-
-            entity.Property(e => e.CustomerId).HasColumnName("customer_id");
-            entity.Property(e => e.CustomerAdress)
-                .HasMaxLength(20)
-                .HasColumnName("customer_adress");
-            entity.Property(e => e.CustomerBirthdate).HasColumnName("customer_birthdate");
-            entity.Property(e => e.CustomerGender).HasColumnName("customer_gender");
-            entity.Property(e => e.CustomerHeight).HasColumnName("customer_height");
-            entity.Property(e => e.CustomerNickname)
-                .HasMaxLength(20)
-                .HasColumnName("customer_nickname");
-            entity.Property(e => e.CustomerPassword)
-                .HasMaxLength(20)
-                .HasColumnName("customer_password");
-            entity.Property(e => e.CustomerPhone)
-                .HasMaxLength(20)
-                .HasColumnName("customer_phone");
-            entity.Property(e => e.CustomerWeight).HasColumnName("customer_weight");
-        });
-
-        modelBuilder.Entity<CustomersIngredient>(entity =>
-        {
-            entity
-                .HasNoKey()
-                .ToTable("customers_ingredients");
-
-            entity.Property(e => e.CustomerId).HasColumnName("customer_id");
-            entity.Property(e => e.IngredientId).HasColumnName("ingredient_id");
-
-            entity.HasOne(d => d.Customer).WithMany()
-                .HasForeignKey(d => d.CustomerId)
-                .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("customers_ingredients_customer_id_fkey");
-
-            entity.HasOne(d => d.Ingredient).WithMany()
-                .HasForeignKey(d => d.IngredientId)
-                .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("customers_ingredients_ingredient_id_fkey");
-        });
-
-        modelBuilder.Entity<Ingredient>(entity =>
-        {
-            entity.HasKey(e => e.IngredientId).HasName("ingredient_id_pk");
-
-            entity.ToTable("ingredients");
-
-            entity.Property(e => e.IngredientId).HasColumnName("ingredient_id");
-            entity.Property(e => e.IngredientName)
-                .HasMaxLength(20)
-                .HasColumnName("ingredient_name");
-        });
-
-        modelBuilder.Entity<Order>(entity =>
-        {
-            entity.HasKey(e => e.OrderId).HasName("order_id_pk");
-
-            entity.ToTable("orders");
-
-            entity.Property(e => e.OrderId).HasColumnName("order_id");
-            entity.Property(e => e.CustomerId).HasColumnName("customer_id");
-            entity.Property(e => e.OrderDate).HasColumnName("order_date");
-            entity.Property(e => e.SupplierId).HasColumnName("supplier_id");
-
-            entity.HasOne(d => d.Customer).WithMany(p => p.Orders)
-                .HasForeignKey(d => d.CustomerId)
-                .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("orders_customer_id_fkey");
-
-            entity.HasOne(d => d.Supplier).WithMany(p => p.Orders)
-                .HasForeignKey(d => d.SupplierId)
-                .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("orders_supplier_id_fkey");
-        });
-
-        modelBuilder.Entity<Recipe>(entity =>
-        {
-            entity.HasKey(e => e.RecipeId).HasName("recipe_id_pk");
-
-            entity.ToTable("recipes");
-
-            entity.Property(e => e.RecipeId).HasColumnName("recipe_id");
-            entity.Property(e => e.RecipeDescription)
-                .HasMaxLength(2000)
-                .HasColumnName("recipe_description");
-            entity.Property(e => e.RecipeName)
-                .HasMaxLength(20)
-                .HasColumnName("recipe_name");
-        });
-
-        modelBuilder.Entity<RecipesIngredient>(entity =>
-        {
-            entity
-                .HasNoKey()
-                .ToTable("recipes_ingredients");
-
-            entity.Property(e => e.IngredientId).HasColumnName("ingredient_id");
-            entity.Property(e => e.RecipeId).HasColumnName("recipe_id");
-            entity.Property(e => e.Weight)
-                .HasMaxLength(50)
-                .HasColumnName("weight");
-
-            entity.HasOne(d => d.Ingredient).WithMany()
-                .HasForeignKey(d => d.IngredientId)
-                .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("recipes_ingredients_ingredient_id_fkey");
-
-            entity.HasOne(d => d.Recipe).WithMany()
-                .HasForeignKey(d => d.RecipeId)
-                .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("recipes_ingredients_recipe_id_fkey");
-        });
-
-        modelBuilder.Entity<RecipesOrder>(entity =>
-        {
-            entity
-                .HasNoKey()
-                .ToTable("recipes_orders");
-
-            entity.Property(e => e.OrderId).HasColumnName("order_id");
-            entity.Property(e => e.RecipeId).HasColumnName("recipe_id");
-
-            entity.HasOne(d => d.Order).WithMany()
-                .HasForeignKey(d => d.OrderId)
-                .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("recipes_orders_order_id_fkey");
-
-            entity.HasOne(d => d.Recipe).WithMany()
-                .HasForeignKey(d => d.RecipeId)
-                .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("recipes_orders_recipe_id_fkey");
-        });
-
-        modelBuilder.Entity<Supplier>(entity =>
-        {
-            entity.HasKey(e => e.SupplierId).HasName("supplier_id_pk");
-
-            entity.ToTable("suppliers");
-
-            entity.HasIndex(e => e.SupplierPhone, "supplier_phone_key").IsUnique();
-
-            entity.Property(e => e.SupplierId).HasColumnName("supplier_id");
-            entity.Property(e => e.SupplierName)
-                .HasMaxLength(20)
-                .HasColumnName("supplier_name");
-            entity.Property(e => e.SupplierPhone)
-                .HasMaxLength(20)
-                .HasColumnName("supplier_phone");
-        });
-
-        OnModelCreatingPartial(modelBuilder);
-    }
-
-    partial void OnModelCreatingPartial(ModelBuilder modelBuilder);
-}

+ 0 - 27
FoodLogProject/Models/Customer.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace FoodLogProject;
-
-public partial class Customer
-{
-    public int CustomerId { get; set; }
-
-    public string CustomerNickname { get; set; } = null!;
-
-    public string? CustomerAdress { get; set; }
-
-    public string CustomerPhone { get; set; } = null!;
-
-    public float? CustomerWeight { get; set; }
-
-    public float? CustomerHeight { get; set; }
-
-    public DateTime CustomerBirthdate { get; set; }
-
-    public bool CustomerGender { get; set; }
-
-    public string CustomerPassword { get; set; } = null!;
-
-    public virtual ICollection<Order> Orders { get; set; } = new List<Order>();
-}

+ 0 - 15
FoodLogProject/Models/CustomersIngredient.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace FoodLogProject;
-
-public partial class CustomersIngredient
-{
-    public int CustomerId { get; set; }
-
-    public int IngredientId { get; set; }
-
-    public virtual Customer Customer { get; set; } = null!;
-
-    public virtual Ingredient Ingredient { get; set; } = null!;
-}

+ 0 - 11
FoodLogProject/Models/Ingredient.cs

@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace FoodLogProject;
-
-public partial class Ingredient
-{
-    public int IngredientId { get; set; }
-
-    public string IngredientName { get; set; } = null!;
-}

+ 0 - 19
FoodLogProject/Models/Order.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace FoodLogProject;
-
-public partial class Order
-{
-    public int OrderId { get; set; }
-
-    public int CustomerId { get; set; }
-
-    public int SupplierId { get; set; }
-
-    public DateOnly OrderDate { get; set; }
-
-    public virtual Customer Customer { get; set; } = null!;
-
-    public virtual Supplier Supplier { get; set; } = null!;
-}

+ 0 - 13
FoodLogProject/Models/Recipe.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace FoodLogProject;
-
-public partial class Recipe
-{
-    public int RecipeId { get; set; }
-
-    public string RecipeName { get; set; } = null!;
-
-    public string RecipeDescription { get; set; } = null!;
-}

+ 0 - 17
FoodLogProject/Models/RecipesIngredient.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace FoodLogProject;
-
-public partial class RecipesIngredient
-{
-    public int RecipeId { get; set; }
-
-    public int IngredientId { get; set; }
-
-    public string Weight { get; set; } = null!;
-
-    public virtual Ingredient Ingredient { get; set; } = null!;
-
-    public virtual Recipe Recipe { get; set; } = null!;
-}

+ 0 - 15
FoodLogProject/Models/RecipesOrder.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace FoodLogProject;
-
-public partial class RecipesOrder
-{
-    public int RecipeId { get; set; }
-
-    public int OrderId { get; set; }
-
-    public virtual Order Order { get; set; } = null!;
-
-    public virtual Recipe Recipe { get; set; } = null!;
-}

+ 0 - 15
FoodLogProject/Models/Supplier.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace FoodLogProject;
-
-public partial class Supplier
-{
-    public int SupplierId { get; set; }
-
-    public string SupplierName { get; set; } = null!;
-
-    public string SupplierPhone { get; set; } = null!;
-
-    public virtual ICollection<Order> Orders { get; set; } = new List<Order>();
-}

+ 0 - 35
FoodLogProject/Program.cs

@@ -1,35 +0,0 @@
-using Avalonia;
-using Avalonia.ReactiveUI;
-using System;
-using System.Text.RegularExpressions;
-
-namespace FoodLogProject
-{
-    internal sealed class Program
-    {
-        // Initialization code. Don't use any Avalonia, third-party APIs or any
-        // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
-        // yet and stuff might break.
-
-
-        
-
-        [STAThread]
-        public static void Main(string[] args)
-        {
-            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
-            BuildAvaloniaApp()
-            .StartWithClassicDesktopLifetime(args);
-        }
-        // Avalonia configuration, don't remove; also used by visual designer.
-        public static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure<App>()
-                .UsePlatformDetect()
-                .WithInterFont()
-                .LogToTrace()
-                .UseReactiveUI();
-
-        
-
-    }
-}

+ 0 - 34
FoodLogProject/ViewLocator.cs

@@ -1,34 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Controls.Templates;
-using FoodLogProject.ViewModels;
-using System;
-
-namespace FoodLogProject
-{
-    public class ViewLocator : IDataTemplate
-    {
-
-        public Control? Build(object? data)
-        {
-            if (data is null)
-                return null;
-
-            var name = data.GetType().FullName!.Replace("ViewModel", "View", StringComparison.Ordinal);
-            var type = Type.GetType(name);
-
-            if (type != null)
-            {
-                var control = (Control)Activator.CreateInstance(type)!;
-                control.DataContext = data;
-                return control;
-            }
-
-            return new TextBlock { Text = "Not Found: " + name };
-        }
-
-        public bool Match(object? data)
-        {
-            return data is ViewModelBase;
-        }
-    }
-}

+ 0 - 76
FoodLogProject/ViewModels/MainWindowViewModel.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls;
-using FoodLogProject.Views;
-using Microsoft.EntityFrameworkCore;
-using ReactiveUI;
-
-namespace FoodLogProject.ViewModels
-{
-
-    public class MainWindowViewModel : ViewModelBase
-    {
-
-#pragma warning disable CA1822 // Mark members as static
-        public static GaruaevContext myConnection = new GaruaevContext();
-        public UserControl UC { get => uc; set => this.RaiseAndSetIfChanged(ref uc, value); }
-        public Page2ViewModel Page2VM { get => page2VM; set => page2VM = value; }
-
-        public Page3ViewModel Page3VM { get => page3VM; set => page3VM = value; }
-        public Page6ViewModel Page6VM { get => page6VM; set => page6VM = value; }
-        public List<Recipe> ListRecipes { get => listRecipes; set => listRecipes = value; }
-        public List<RecipesIngredient> ListIngridient { get => listIngridient; set => listIngridient = value; }
-
-        private UserControl uc = new Page1();
-        public void LoadPage2() => UC = new Page2();
-
-        public void LoadPage2Create()
-        {
-            Page3VM.CreateUser();
-            UC = new Page2();
-        }
-
-        Page3ViewModel page3VM;
-        public void LoadPage3()
-        {
-            page3VM = new Page3ViewModel(myConnection,uc);
-            UC = new Page3();
-        }
-
-
-        Page2ViewModel page2VM = new Page2ViewModel();
-
-        Page6ViewModel page6VM;
-        public void LoadPage4()
-        {
-            Customer? currentUser = myConnection.Customers.FirstOrDefault(x => x.CustomerPhone == Page2VM.Phone && x.CustomerPassword == Page2VM.Password);
-            if (currentUser == null)
-            {
-                Page2VM.Message = "Пользователь с таким номером не зарегистрирован";
-            }
-            else
-            {
-                page6VM = new Page6ViewModel(currentUser, myConnection);
-                UC = new Page4();
-            }
-        }
-
-        public void LoadPage5() => UC = new Page5();
-        public void LoadPage6() => UC = new Page6();
-        public void LoadPage7()
-        {            
-            UC = new Page7();
-        }
-        private List<RecipesIngredient> listIngridient;
-        private List<Recipe> listRecipes = myConnection.Recipes.ToList();
-
-        public void LookRecipe(int Id)
-        {
-            listIngridient = myConnection.RecipesIngredients.Include(x => x.Ingredient).Where(x => x.RecipeId == Id).ToList();
-            UC = new Page7();
-        }
-
-#pragma warning restore CA1822 // Mark members as static
-    }
-}

+ 0 - 20
FoodLogProject/ViewModels/Page2ViewModel.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using ReactiveUI;
-using FoodLogProject.Views;
-using Avalonia.Controls;
-
-namespace FoodLogProject.ViewModels
-{
-	public class Page2ViewModel : ReactiveObject
-	{
-        string phone = "";
-        string password = "";
-        string message = "";
-
-        public string Phone { get => phone; set => phone = value; }
-        public string Password { get => password; set => password = value; }
-        public string Message { get => message; set => this.RaiseAndSetIfChanged(ref message, value); }
-        //public void LoadPage2() => Globals.MainFrame.Content = new Page2();
-    }
-}

+ 0 - 29
FoodLogProject/ViewModels/Page3ViewModel.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Controls;
-using FoodLogProject.Views;
-using ReactiveUI;
-
-namespace FoodLogProject.ViewModels
-{
-	public class Page3ViewModel : ReactiveObject
-	{
-        Customer? currentUser;
-        GaruaevContext myConnection;
-
-        public Page3ViewModel(GaruaevContext myConnection, UserControl UC)
-        {
-            CurrentUser = new Customer();
-            this.myConnection = myConnection;
-        }
-        public Customer? CurrentUser { get => currentUser; set => currentUser = value; }
-        public string Birthday { get => currentUser.CustomerBirthdate.ToString(); set => currentUser.CustomerBirthdate = Convert.ToDateTime(value); }
-
-        public void CreateUser()
-        {
-            myConnection.Add(currentUser);
-            myConnection.SaveChanges();
-
-        }
-    }
-}

+ 0 - 47
FoodLogProject/ViewModels/Page6ViewModel.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using ReactiveUI;
-using Tmds.DBus.Protocol;
-
-namespace FoodLogProject.ViewModels
-{
-	public class Page6ViewModel : ReactiveObject
-	{
-        Customer? currentUser;
-        GaruaevContext myConnection;
-        string oldPassowrd;
-        public Page6ViewModel(Customer? currentUser, GaruaevContext myConnection)
-        {
-            this.CurrentUser = currentUser;
-            this.myConnection = myConnection;
-            oldPassowrd = currentUser.CustomerPassword;
-        }
-        public Customer? CurrentUser { get => currentUser; set => currentUser = value; }
-
-        public string Birthday { get => currentUser.CustomerBirthdate.ToString(); set => currentUser.CustomerBirthdate = Convert.ToDateTime(value); }
-        public string ConfirmPassowrd { get => confirmPassowrd; set => confirmPassowrd = value; }
-        public string Message { get => message; set => this.RaiseAndSetIfChanged(ref message, value); }
-        public bool ChangePassword { get => changePassword; set => this.RaiseAndSetIfChanged(ref changePassword, value); }
-
-        string confirmPassowrd;
-
-        string message;
-
-        bool changePassword;
-
-        public void SaveData()
-        {
-            if (currentUser.CustomerPassword == null || currentUser.CustomerPassword == "") currentUser.CustomerPassword = oldPassowrd;
-            if (ChangePassword == (currentUser.CustomerPassword == confirmPassowrd))
-            {
-                Message = "Ñîõðàíåíî óñïåøíî";
-                myConnection.SaveChanges();
-            }
-            else
-            {
-                Message = "Ïàðîëè íå ñîâïàäàþò";
-            }
-        }
-    }
-
-}

+ 0 - 8
FoodLogProject/ViewModels/ViewModelBase.cs

@@ -1,8 +0,0 @@
-using ReactiveUI;
-
-namespace FoodLogProject.ViewModels
-{
-    public class ViewModelBase : ReactiveObject
-    {
-    }
-}

+ 0 - 23
FoodLogProject/Views/MainWindow.axaml

@@ -1,23 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="using:FoodLogProject.ViewModels"
-		xmlns:v="using:TestFoodBlog.Views"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="FoodLogProject.Views.MainWindow"
-        x:DataType="vm:MainWindowViewModel"
-        Icon="/Assets/FoodLogLogo.png"
-        Title="FoodLogProject">
-
-	<Design.DataContext>
-		<!-- This only sets the DataContext for the previewer in an IDE,
-             to set the actual DataContext for runtime, set the DataContext property in code (look at App.axaml.cs) -->
-		<vm:MainWindowViewModel/>
-	</Design.DataContext>
-	<Border Background="Beige">
-		<ScrollViewer >
-			<ContentControl Content="{Binding UC}"/>
-		</ScrollViewer>
-	</Border>
-</Window>

+ 0 - 15
FoodLogProject/Views/MainWindow.axaml.cs

@@ -1,15 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-
-namespace FoodLogProject.Views
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-
-        
-        }
-}

+ 0 - 30
FoodLogProject/Views/Page1.axaml

@@ -1,30 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-			 xmlns:vm="using:FoodLogProject.ViewModels"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="FoodLogProject.Views.Page1">
-	<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" >
-		<StackPanel Name="Choose">
-			<Border Background="White"
-			BorderBrush="LightGray"
-			BorderThickness="2"
-			CornerRadius="16"
-			Padding="30" Margin="0,0,0,0"
-				>
-				<StackPanel  >
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,10">
-						Если вы хотите получить свой первый план
-					</TextBlock>
-					<Button Margin="0,0,0,10" HorizontalAlignment="Center" Foreground="White" Background="Green" Content="Зарегистрироваться" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).LoadPage3}"/>
-					<TextBlock HorizontalAlignment="Center" FontSize="16" Foreground="DarkGreen" FontWeight="Bold" >
-						Если у вас уже есть профиль
-					</TextBlock>
-					<Button HorizontalAlignment="Center" Margin="0,10,0,0" Foreground="White" Background="Green" Content="Авторизоваться" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).LoadPage2}"/>
-				</StackPanel >
-			</Border>
-		</StackPanel>
-	</StackPanel>
-</UserControl>

+ 0 - 14
FoodLogProject/Views/Page1.axaml.cs

@@ -1,14 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using FoodLogProject.ViewModels;
-
-namespace FoodLogProject.Views;
-
-public partial class Page1 : UserControl
-{
-    public Page1()
-    {
-        InitializeComponent();
-    }
-}

+ 0 - 36
FoodLogProject/Views/Page2.axaml

@@ -1,36 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-			 xmlns:vm="using:FoodLogProject.ViewModels" 
-			 x:DataType="vm:MainWindowViewModel"
-			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="FoodLogProject.Views.Page2">
-	<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" >
-		<StackPanel Name="Login">
-			<Border Background="White"
-				BorderBrush="LightGray"
-				BorderThickness="2"
-				CornerRadius="16"
-				Padding="40">
-				<StackPanel >
-					<StackPanel HorizontalAlignment="Center">
-						<TextBlock FontSize="20" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,40,20" >
-							Авторизация
-						</TextBlock>
-					</StackPanel>
-					<StackPanel >
-						<TextBlock>Номер телефона</TextBlock>
-						<TextBox Text="{Binding Page2VM.Phone}" Watermark="+7***********"></TextBox>
-						<TextBlock Name="ShowMessageNumberLogin" Foreground="Red"></TextBlock>
-						<TextBlock >Пароль:</TextBlock>
-						<TextBox Text="{Binding Page2VM.Password}" PasswordChar="*" Watermark="Введите пароль"/>
-						<TextBlock Name="ShowMessageParolLogin" Foreground="Red"></TextBlock>
-						<Button Foreground="White" Background="Green" HorizontalAlignment="Center" Content="Войти" Command="{Binding LoadPage4}" IsDefault="True"/>
-						<TextBlock Text="{Binding Page2VM.Message}"/>
-					</StackPanel>
-				</StackPanel>
-			</Border>
-		</StackPanel>
-	</StackPanel>
-</UserControl>

+ 0 - 15
FoodLogProject/Views/Page2.axaml.cs

@@ -1,15 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using FoodLogProject.ViewModels;
-
-namespace FoodLogProject.Views;
-
-public partial class Page2 : UserControl
-{
-    public Page2()
-    {
-        InitializeComponent();
-        //DataContext = new Page2ViewModel();
-    }
-}

+ 0 - 275
FoodLogProject/Views/Page3.axaml

@@ -1,275 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-			 xmlns:vm="using:FoodLogProject.ViewModels"
-			 x:DataType="vm:MainWindowViewModel"
-			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="FoodLogProject.Views.Page3">
-	<ScrollViewer >
-	<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" >
-		<StackPanel Name="Registration">
-			<StackPanel>
-				<StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
-					<Image  Height="62" Width="62"
-						Source="/Assets/FoodLogLogo.png"/>
-					<TextBlock FontSize="40" Foreground="DarkGreen" FontWeight="Bold" Margin="14,25,0,0">
-						FoodLog
-					</TextBlock>
-				</StackPanel>
-				<TextBlock FontSize="24" Foreground="DarkGreen" FontWeight="Bold" Margin="0,10,0,0">Здравствуйте!</TextBlock>
-				<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,10,0,0">
-					Ответьте на несколько вопросов, чтобы мы могли
-				</TextBlock>
-				<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,20">
-					составить для вас идеальный план питания
-				</TextBlock>
-			</StackPanel>
-			<Border Background="White"
-	BorderBrush="LightGray"
-	BorderThickness="2"
-	CornerRadius="16"
-	Padding="40">
-				<StackPanel >
-					<StackPanel >
-						<TextBlock FontSize="20" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,20">
-							Данные для вашего плана
-						</TextBlock>
-						<TextBlock>Никнейм</TextBlock>
-						<TextBox Name="Name" Text="{Binding Page3VM.CurrentUser.CustomerNickname}" Watermark="Введите никнейм"></TextBox>
-						<TextBlock Name="ShowMessageName" Foreground="Red"></TextBlock>
-
-					</StackPanel>
-
-					<StackPanel >
-
-						<TextBlock>Номер телефона</TextBlock>
-						<TextBox Name="Number" Text="{Binding Page3VM.CurrentUser.CustomerPhone}" Watermark="8***********"></TextBox>
-						<TextBlock Name="ShowMessageNumber" Foreground="Red"></TextBlock>
-							<TextBlock >Пароль:</TextBlock>
-							<TextBox Text="{Binding Page3VM.CurrentUser.CustomerPassword}" PasswordChar="*" Watermark="Введите пароль"/>
-							<TextBlock Name="ShowMessageParol" Foreground="Red"></TextBlock>
-
-						<TextBlock Margin="0,10,0,0" FontSize="16">Пол</TextBlock>
-					</StackPanel>
-					<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-
-						<RadioButton Name="rbM" FontSize ="16" Margin="0,0,30,0" IsChecked="{Binding !Page3VM.CurrentUser.CustomerGender}">Мужской</RadioButton>
-						<RadioButton Name="rbF" FontSize ="16" Margin="0,0,30,0" IsChecked="{Binding Page3VM.CurrentUser.CustomerGender}">Женский</RadioButton>
-					</StackPanel>
-					<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
-						<StackPanel >
-							<TextBlock>Рост,см</TextBlock>
-							<TextBox Text="{Binding Page3VM.CurrentUser.CustomerHeight}" Margin="0,0,30,0"></TextBox>
-							<TextBlock Name="ShowMessageHeight" Foreground="Red"></TextBlock>
-						</StackPanel>
-						<StackPanel >
-							<TextBlock >Вес, кг</TextBlock>
-							<TextBox Text="{Binding Page3VM.CurrentUser.CustomerWeight}" Margin="0,0,30,0"></TextBox>
-							<TextBlock Name="ShowMessageWeight" Foreground="Red"></TextBlock>
-						</StackPanel>
-						<StackPanel >
-							<TextBlock >Дата рождения</TextBlock>
-							<DatePicker SelectedDate="{Binding Page3VM.Birthday}" Margin="0,0,30,0"/>
-						</StackPanel>
-					</StackPanel>
-				</StackPanel>
-			</Border>
-			<Border Background="White"
-	BorderBrush="LightGray"
-	BorderThickness="2"
-	CornerRadius="16"
-	Padding="40" Margin="0,50,0,0"
-				>
-				<StackPanel >
-					<TextBlock FontSize="20" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,20">
-						Ваши предпочтения в еде
-					</TextBlock>
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,15">
-						Какие гарниры и крупы вы любите?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Рис белый</CheckBox>
-								<CheckBox>Гречка</CheckBox>
-								<CheckBox>Макароны</CheckBox>
-								<CheckBox>Картофель</CheckBox>
-								<CheckBox>Овсянка</CheckBox>
-								<CheckBox>Рис бурый</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какое мясо или птица есть в вашем рационе?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Курица</CheckBox>
-								<CheckBox>Свинина</CheckBox>
-								<CheckBox>Говядина</CheckBox>
-								<CheckBox>Индейка</CheckBox>
-								<CheckBox>Кролик</CheckBox>
-								<CheckBox>Баранина</CheckBox>
-								<CheckBox>Гусь</CheckBox>
-								<CheckBox>Утка</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие морепродукты вы обычно едите?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Сёмга</CheckBox>
-								<CheckBox>Тунец</CheckBox>
-								<CheckBox>Лосось</CheckBox>
-								<CheckBox>Красная рыба с/с</CheckBox>
-								<CheckBox>Форель</CheckBox>
-								<CheckBox>Креветки</CheckBox>
-								<CheckBox>Горбуша</CheckBox>
-								<CheckBox>Морская капуста</CheckBox>
-								<CheckBox>Кальмар</CheckBox>
-								<CheckBox>Осьминог</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,0">
-						Какие молочные и кисломолочные продукты
-					</TextBlock>
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,15">
-						есть в вашем рационе?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Молоко</CheckBox>
-								<CheckBox>Молоко безлактозное</CheckBox>
-								<CheckBox>Твердые сыры</CheckBox>
-								<CheckBox>Сливки</CheckBox>
-								<CheckBox>Сыр творожный</CheckBox>
-								<CheckBox>Сметана</CheckBox>
-								<CheckBox>Кефир</CheckBox>
-								<CheckBox>Творог</CheckBox>
-								<CheckBox>Греческий йогурт</CheckBox>
-								<CheckBox>Йогурт</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие фрукты и ягоды вы обычно едите?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Банан</CheckBox>
-								<CheckBox>Яблоко</CheckBox>
-								<CheckBox>Апельсин</CheckBox>
-								<CheckBox>Мандарин</CheckBox>
-								<CheckBox>Лимон</CheckBox>
-								<CheckBox>Авокадо</CheckBox>
-								<CheckBox>Груша</CheckBox>
-								<CheckBox>Вишня</CheckBox>
-								<CheckBox>Виноград</CheckBox>
-								<CheckBox>Клубника</CheckBox>
-								<CheckBox>Манго</CheckBox>
-								<CheckBox>Сливы</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие овощи вы обычно едите?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Огурец</CheckBox>
-								<CheckBox>Помидор</CheckBox>
-								<CheckBox>Лук</CheckBox>
-								<CheckBox>Чеснок</CheckBox>
-								<CheckBox>Морковь</CheckBox>
-								<CheckBox>Свекла</CheckBox>
-								<CheckBox>Капуста</CheckBox>
-								<CheckBox>Пекинская капуста</CheckBox>
-								<CheckBox>Брокколи</CheckBox>
-								<CheckBox>Салат</CheckBox>
-								<CheckBox>Перец</CheckBox>
-								<CheckBox>Кабачок</CheckBox>
-								<CheckBox>Баклажан</CheckBox>
-								<CheckBox>Редиска</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие масла вы используете?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Масло подсолнечное</CheckBox>
-								<CheckBox>Масло оливковое</CheckBox>
-								<CheckBox>Масло льняное</CheckBox>
-								<CheckBox>Масло сливочное</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие бобовые вы едите?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Кукуруза</CheckBox>
-								<CheckBox>Горошек</CheckBox>
-								<CheckBox>Фасоль</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие соусы вы обычно используете?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Соус Цезарь</CheckBox>
-								<CheckBox>Соевый соус</CheckBox>
-								<CheckBox>Тартар</CheckBox>
-								<CheckBox>Кетчуп</CheckBox>
-								<CheckBox>Майонез</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие мучные изделия есть в вашем рационе?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Хлеб ржаной</CheckBox>
-								<CheckBox>Хлеб пшеничныйс</CheckBox>
-								<CheckBox>Лаваш</CheckBox>
-								<CheckBox>Тортилья</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-				</StackPanel>
-			</Border>
-			<Button Foreground="White" Background="Green" HorizontalAlignment="Center" Margin="40" Content="Составить индивидуальный план питания" Click="CheckRegName"/>
-		</StackPanel>	
-	</StackPanel>
-		</ScrollViewer>
-</UserControl>

+ 0 - 39
FoodLogProject/Views/Page3.axaml.cs

@@ -1,39 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using System;
-using System.Text.RegularExpressions;
-
-namespace FoodLogProject.Views;
-
-public partial class Page3 : UserControl
-{
-    public Page3()
-    {
-        InitializeComponent();
-        
-    }
-
-    public void CheckRegNumber(object sender, RoutedEventArgs e)
-    {
-        bool check1;
-        Regex number = new Regex("^8\\(\\d{3}\\)\\d{3}-\\d{2}-\\d{2}$");
-        if (!number.IsMatch(Number.Text))
-        {
-            ShowMessageNumber.Text = "Íîìåð ââåäåí íåêîðåêòíî";
-            check1 = false;
-        }
-    }
-
-    public void CheckRegName(object sender, RoutedEventArgs e)
-    {
-        bool check2;
-        Regex number = new Regex("^[À-ß]{1}[à-ÿ]{1,}$");
-        if (!number.IsMatch(Name.Text))
-        {
-            ShowMessageName.Text = "Íèêíåéì ââåäåí íåêîðåêòíî";
-            check2 = false;
-        }
-    }
-}

+ 0 - 79
FoodLogProject/Views/Page4.axaml

@@ -1,79 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-			 xmlns:vm="using:FoodLogProject.ViewModels"               
-			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="FoodLogProject.Views.Page4">
-	<ScrollViewer >
-	<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" >
-		
-	<StackPanel Name="UserProfile" IsVisible="True">
-		<StackPanel>
-			<StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
-				<Image  Height="62" Width="62"
-					Source="/Assets/FoodLogLogo.png"/>
-				<TextBlock FontSize="40" Foreground="DarkGreen" FontWeight="Bold" Margin="14,25,0,0">
-					FoodLog
-				</TextBlock>
-			</StackPanel>
-			<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,10,0,0">
-				Ниже подготовлен ваш индивидуальный план питания
-			</TextBlock>
-			
-			<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,20">
-				Также можно ознакомиться со списком необходимых покупок
-			</TextBlock>
-		</StackPanel>
-		<Border Background="White"
-BorderBrush="LightGray"
-BorderThickness="2"
-CornerRadius="16"
-Padding="40" >
-			<StackPanel >
-				<StackPanel >
-					<TextBlock FontSize="20" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,20" HorizontalAlignment="Center">
-						Меню
-					</TextBlock>
-					<TextBlock FontSize="16"  FontWeight="Bold" Margin="0,0,0,10">
-						1 День
-					</TextBlock>
-
-					<TextBlock FontWeight="Bold" Margin="0,0,0,10">Завтрак</TextBlock>
-					<TextBlock Name="Breakfast">место для завтрака</TextBlock>
-
-					<TextBlock FontWeight="Bold" Margin="0,10,0,10">Обед</TextBlock>
-					<TextBlock Name="Lunch">место для обеда</TextBlock>
-
-					<TextBlock FontWeight="Bold" Margin="0,10,0,10">Ужин</TextBlock>
-					<TextBlock Name="Dinner">место для ужин</TextBlock>
-				</StackPanel>
-			</StackPanel>
-		</Border>
-		<Border Background="White"
-BorderBrush="LightGray"
-BorderThickness="2"
-CornerRadius="16"
-Padding="40" Margin="0,50,0,0">
-			<StackPanel >
-				<StackPanel >
-					<TextBlock FontSize="20" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,20" HorizontalAlignment="Center">
-						Список покупок
-					</TextBlock>
-					<StackPanel Name="ListIngridience">
-						<CheckBox>Место для покупки</CheckBox>
-					</StackPanel>
-
-				</StackPanel>
-			</StackPanel>
-		</Border>
-	</StackPanel>
-		
-		<Button Foreground="White" Background="Green" HorizontalAlignment="Center" Margin="40" Content="Изменить мои предпочтения" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).LoadPage5}"/>
-		<Button Foreground="White" Background="Green" HorizontalAlignment="Center" Content="Мой профиль" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).LoadPage6}"/>
-		<Button Foreground="White" Background="Green" HorizontalAlignment="Center" Margin="40" Content="Каталог рецептов" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).LoadPage7}"/>
-		
-			
-		</StackPanel>
-</ScrollViewer>
-</UserControl>

+ 0 - 13
FoodLogProject/Views/Page4.axaml.cs

@@ -1,13 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace FoodLogProject.Views;
-
-public partial class Page4 : UserControl
-{
-    public Page4()
-    {
-        InitializeComponent();
-    }
-}

+ 0 - 224
FoodLogProject/Views/Page5.axaml

@@ -1,224 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-			 			 xmlns:vm="using:FoodLogProject.ViewModels" 
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="FoodLogProject.Views.Page5">
-	<ScrollViewer>
-	<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" >
-		<StackPanel Name="Registration">
-			<StackPanel>
-				<StackPanel HorizontalAlignment="Left" Orientation="Horizontal" >
-					<Image  Height="62" Width="62"
-						Source="/Assets/FoodLogLogo.png"/>
-					<TextBlock FontSize="40" Foreground="DarkGreen" FontWeight="Bold" Margin="14,25,0,0">
-						FoodLog
-					</TextBlock>
-				</StackPanel>
-				
-			</StackPanel>
-		
-					
-			<Border Background="White"
-	BorderBrush="LightGray"
-	BorderThickness="2"
-	CornerRadius="16"
-	Padding="40" Margin="0,50,0,0"
-				>
-				<StackPanel >
-					<TextBlock FontSize="20" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,20">
-						Ваши предпочтения в еде
-					</TextBlock>
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,15">
-						Какие гарниры и крупы вы любите?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Рис белый</CheckBox>
-								<CheckBox>Гречка</CheckBox>
-								<CheckBox>Макароны</CheckBox>
-								<CheckBox>Картофель</CheckBox>
-								<CheckBox>Овсянка</CheckBox>
-								<CheckBox>Рис бурый</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какое мясо или птица есть в вашем рационе?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Курица</CheckBox>
-								<CheckBox>Свинина</CheckBox>
-								<CheckBox>Говядина</CheckBox>
-								<CheckBox>Индейка</CheckBox>
-								<CheckBox>Кролик</CheckBox>
-								<CheckBox>Баранина</CheckBox>
-								<CheckBox>Гусь</CheckBox>
-								<CheckBox>Утка</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие морепродукты вы обычно едите?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Сёмга</CheckBox>
-								<CheckBox>Тунец</CheckBox>
-								<CheckBox>Лосось</CheckBox>
-								<CheckBox>Красная рыба с/с</CheckBox>
-								<CheckBox>Форель</CheckBox>
-								<CheckBox>Креветки</CheckBox>
-								<CheckBox>Горбуша</CheckBox>
-								<CheckBox>Морская капуста</CheckBox>
-								<CheckBox>Кальмар</CheckBox>
-								<CheckBox>Осьминог</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,0">
-						Какие молочные и кисломолочные продукты
-					</TextBlock>
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,15">
-						есть в вашем рационе?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Молоко</CheckBox>
-								<CheckBox>Молоко безлактозное</CheckBox>
-								<CheckBox>Твердые сыры</CheckBox>
-								<CheckBox>Сливки</CheckBox>
-								<CheckBox>Сыр творожный</CheckBox>
-								<CheckBox>Сметана</CheckBox>
-								<CheckBox>Кефир</CheckBox>
-								<CheckBox>Творог</CheckBox>
-								<CheckBox>Греческий йогурт</CheckBox>
-								<CheckBox>Йогурт</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие фрукты и ягоды вы обычно едите?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Банан</CheckBox>
-								<CheckBox>Яблоко</CheckBox>
-								<CheckBox>Апельсин</CheckBox>
-								<CheckBox>Мандарин</CheckBox>
-								<CheckBox>Лимон</CheckBox>
-								<CheckBox>Авокадо</CheckBox>
-								<CheckBox>Груша</CheckBox>
-								<CheckBox>Вишня</CheckBox>
-								<CheckBox>Виноград</CheckBox>
-								<CheckBox>Клубника</CheckBox>
-								<CheckBox>Манго</CheckBox>
-								<CheckBox>Сливы</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие овощи вы обычно едите?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Огурец</CheckBox>
-								<CheckBox>Помидор</CheckBox>
-								<CheckBox>Лук</CheckBox>
-								<CheckBox>Чеснок</CheckBox>
-								<CheckBox>Морковь</CheckBox>
-								<CheckBox>Свекла</CheckBox>
-								<CheckBox>Капуста</CheckBox>
-								<CheckBox>Пекинская капуста</CheckBox>
-								<CheckBox>Брокколи</CheckBox>
-								<CheckBox>Салат</CheckBox>
-								<CheckBox>Перец</CheckBox>
-								<CheckBox>Кабачок</CheckBox>
-								<CheckBox>Баклажан</CheckBox>
-								<CheckBox>Редиска</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие масла вы используете?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Масло подсолнечное</CheckBox>
-								<CheckBox>Масло оливковое</CheckBox>
-								<CheckBox>Масло льняное</CheckBox>
-								<CheckBox>Масло сливочное</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие бобовые вы едите?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Кукуруза</CheckBox>
-								<CheckBox>Горошек</CheckBox>
-								<CheckBox>Фасоль</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие соусы вы обычно используете?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Соус Цезарь</CheckBox>
-								<CheckBox>Соевый соус</CheckBox>
-								<CheckBox>Тартар</CheckBox>
-								<CheckBox>Кетчуп</CheckBox>
-								<CheckBox>Майонез</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-
-
-					<TextBlock FontSize="16" Foreground="DarkGreen" FontWeight="Bold" Margin="0,15,0,15">
-						Какие мучные изделия есть в вашем рационе?
-					</TextBlock>
-					<Border  Height="100">
-						<ScrollViewer >
-							<StackPanel >
-								<CheckBox>Хлеб ржаной</CheckBox>
-								<CheckBox>Хлеб пшеничныйс</CheckBox>
-								<CheckBox>Лаваш</CheckBox>
-								<CheckBox>Тортилья</CheckBox>
-							</StackPanel>
-						</ScrollViewer>
-					</Border>
-
-				</StackPanel>
-			</Border>
-			<Button Foreground="White" Background="Green" HorizontalAlignment="Center" Margin="40" Content="Сохранить изменения и составить новый план" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).LoadPage4}"/>
-		</StackPanel>
-
-
-
-
-	</StackPanel>
-	</ScrollViewer>
-</UserControl>

+ 0 - 13
FoodLogProject/Views/Page5.axaml.cs

@@ -1,13 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace FoodLogProject.Views;
-
-public partial class Page5 : UserControl
-{
-    public Page5()
-    {
-        InitializeComponent();
-    }
-}

+ 0 - 84
FoodLogProject/Views/Page6.axaml

@@ -1,84 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-			 xmlns:vm="using:FoodLogProject.ViewModels"
-			 x:DataType="vm:MainWindowViewModel"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="FoodLogProject.Views.Page6">
-	
-	<ScrollViewer>
-	<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" >
-		<StackPanel Name="Registration">
-			<StackPanel>
-				<StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Margin="0,0,0,30">
-					<Image  Height="62" Width="62"
-						Source="/Assets/FoodLogLogo.png"/>
-					<TextBlock FontSize="40" Foreground="DarkGreen" FontWeight="Bold" Margin="14,25,0,0">
-						FoodLog
-					</TextBlock>
-				</StackPanel>
-				
-			</StackPanel>
-			<Border Background="White"
-	BorderBrush="LightGray"
-	BorderThickness="2"
-	CornerRadius="16"
-	Padding="40">
-				<StackPanel >
-					<StackPanel >
-						<TextBlock FontSize="20" Foreground="DarkGreen" FontWeight="Bold" Margin="0,0,0,20">
-							Мои данные
-						</TextBlock>
-						<TextBlock>Никнейм</TextBlock>
-						<TextBox Text="{Binding Page6VM.CurrentUser.CustomerNickname}" Watermark="Введите никнейм"></TextBox>
-						<TextBlock Name="ShowMessageName" Foreground="Red"></TextBlock>
-
-					</StackPanel>
-
-					<StackPanel >
-
-						<TextBlock>Номер телефона</TextBlock>
-						<TextBox Text="{Binding Page6VM.CurrentUser.CustomerPhone}" Watermark="+7***********"></TextBox>
-						<TextBlock Name="ShowMessageNumber" Foreground="Red"></TextBlock>
-						<CheckBox Content="Изменить пароль" IsChecked="{Binding Page6VM.ChangePassword}"/>
-						<StackPanel IsVisible="{Binding Page6VM.ChangePassword}">
-						<TextBlock >Пароль:</TextBlock>
-						<TextBox Text="{Binding Page6VM.CurrentUser.CustomerPassword, Mode=OneWayToSource}" PasswordChar="*" Watermark="Введите пароль"/>
-						<TextBlock Name="ShowMessageParol" Foreground="Red"></TextBlock>
-						<TextBlock >Повторите пароль:</TextBlock>
-						<TextBox Text="{Binding Page6VM.ConfirmPassowrd}" PasswordChar="*" Watermark="Введите пароль"/>
-						<TextBlock Name="ShowMessageConfirmParol" Foreground="Red"></TextBlock>
-						<TextBlock Text="{Binding Page6VM.Message}"/>
-						</StackPanel>
-						<TextBlock Margin="0,10,0,0" FontSize="16">Пол</TextBlock>
-					</StackPanel>
-					<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-
-						<RadioButton Name="rbM" FontSize ="16" Margin="0,0,30,0" IsChecked="{Binding !Page6VM.CurrentUser.CustomerGender}">Мужской</RadioButton>
-						<RadioButton Name="rbF" FontSize ="16" Margin="0,0,30,0" IsChecked="{Binding Page6VM.CurrentUser.CustomerGender}">Женский</RadioButton>
-					</StackPanel>
-					<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
-						<StackPanel >
-							<TextBlock>Рост,см</TextBlock>
-							<TextBox Text="{Binding Page6VM.CurrentUser.CustomerHeight}" Margin="0,0,30,0"></TextBox>
-							<TextBlock Name="ShowMessageHeight" Foreground="Red"></TextBlock>
-						</StackPanel>
-						<StackPanel >
-							<TextBlock >Вес, кг</TextBlock>
-							<TextBox Text="{Binding Page6VM.CurrentUser.CustomerWeight}" Margin="0,0,30,0"></TextBox>
-							<TextBlock Name="ShowMessageWeight" Foreground="Red"></TextBlock>
-						</StackPanel>
-						<StackPanel >
-							<TextBlock >Дата рождения</TextBlock>
-							<DatePicker SelectedDate="{Binding Page6VM.Birthday}" Margin="0,0,30,0"/>			
-						</StackPanel>
-					</StackPanel>
-				</StackPanel>
-			</Border>
-	</StackPanel>
-		<Button Foreground="White" Background="Green" HorizontalAlignment="Center" Margin="40" Content="Сохранить изменения" Command="{Binding Page6VM.SaveData}"/>
-		<Button Foreground="White" Background="Green" HorizontalAlignment="Center" Margin="40" Content="На главную" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).LoadPage4}"/>
-	</StackPanel>
-	</ScrollViewer>
-</UserControl>

+ 0 - 13
FoodLogProject/Views/Page6.axaml.cs

@@ -1,13 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace FoodLogProject.Views;
-
-public partial class Page6 : UserControl
-{
-    public Page6()
-    {
-        InitializeComponent();
-    }
-}

+ 0 - 68
FoodLogProject/Views/Page7.axaml

@@ -1,68 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 xmlns:vm="using:FoodLogProject.ViewModels"
-			 x:DataType="vm:MainWindowViewModel"             
-			 mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="FoodLogProject.Views.Page7">
-	
-	<ScrollViewer >
-		<StackPanel HorizontalAlignment="Center"  >
-
-			<StackPanel Name="UserProfile" IsVisible="True">
-				<StackPanel>
-					<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-						<Image  Height="62" Width="62"
-							Source="/Assets/FoodLogLogo.png"/>
-						<TextBlock FontSize="40" Foreground="DarkGreen" FontWeight="Bold" Margin="14,25,0,0">
-							FoodLog
-						</TextBlock>
-					</StackPanel>
-					<TextBlock FontSize="24" Foreground="DarkGreen" FontWeight="Bold" Margin="0,10,0,0" HorizontalAlignment="Center">
-						Каталог Рецептов
-					</TextBlock>
-				</StackPanel>
-				<Button Foreground="White" Background="Green" HorizontalAlignment="Center" Margin="20" Content="На главную" 
-						Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).LoadPage4}"/>
-				<Border Background="White"
-		BorderBrush="LightGray"
-		BorderThickness="2"
-		CornerRadius="16"
-		Padding="40"
-						>
-					<ListBox ItemsSource="{Binding ListRecipes}" MaxWidth="450" Background="White">
-						<ListBox.ItemTemplate>
-							<DataTemplate>
-					<StackPanel >
-						<StackPanel >
-							<TextBlock Text="{Binding RecipeName}" FontSize="20" Foreground="DarkGreen" 
-									   FontWeight="Bold" Margin="0,0,0,20" HorizontalAlignment="Center" Name="NameOfRec"/>
-							<Button Foreground="White" Background="Green" HorizontalAlignment="Center" Margin="10" Content="Посмотреть ингридиенты" 
-									Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).LookRecipe}" CommandParameter="{Binding RecipeId}"/>
-							<TextBlock FontWeight="Bold" Margin="0,0,0,10">Ингредиенты</TextBlock>
-							<ListBox ItemsSource="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).ListIngridient}">
-								<ListBox.ItemTemplate>
-									<DataTemplate>
-										<StackPanel >
-
-											<TextBlock Text="{Binding Ingredient.IngredientName}"/>
-											<TextBlock Text="{Binding Weight}"/>
-										</StackPanel>
-											</DataTemplate>
-								</ListBox.ItemTemplate>
-							</ListBox>
-
-							<TextBlock FontWeight="Bold" Margin="0,10,0,10">Рецепт</TextBlock>
-							<TextBox AcceptsReturn="True" BorderBrush="White" IsReadOnly="True" TextWrapping="Wrap" Text="{Binding RecipeDescription}"/>
-
-						</StackPanel>
-					</StackPanel>
-							</DataTemplate>
-						</ListBox.ItemTemplate>
-					</ListBox>
-				</Border>
-			</StackPanel>
-		</StackPanel>
-	</ScrollViewer>
-</UserControl>

+ 0 - 13
FoodLogProject/Views/Page7.axaml.cs

@@ -1,13 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace FoodLogProject.Views;
-
-public partial class Page7 : UserControl
-{
-    public Page7()
-    {
-        InitializeComponent();
-    }
-}

+ 0 - 18
FoodLogProject/app.manifest

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <!-- This manifest is used on Windows only.
-       Don't remove it as it might cause problems with window transparency and embedded controls.
-       For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
-  <assemblyIdentity version="1.0.0.0" name="FoodLogProject.Desktop"/>
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- A list of the Windows versions that this application has been tested on
-           and is designed to work with. Uncomment the appropriate elements
-           and Windows will automatically select the most compatible environment. -->
-
-      <!-- Windows 10 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-</assembly>

+ 0 - 23
FoodLogTesting/FoodLogTesting.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="coverlet.collector" Version="3.2.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FoodLogProject\FoodLogProject.csproj" />
-  </ItemGroup>
-
-</Project>

+ 0 - 2
FoodLogTesting/GlobalUsings.cs

@@ -1,2 +0,0 @@
-global using Microsoft.VisualStudio.TestTools.UnitTesting;
-using FoodLogProject;

+ 0 - 91
FoodLogTesting/UnitTest1.cs

@@ -1,91 +0,0 @@
-
-namespace FoodLogTesting
-{
-    [TestClass]
-    public class UnitTest1
-    {
-        
-            [TestMethod]
-            public void UserNumber_AreEqual()
-            {
-            
-            
-            
-            }
-
-        [TestMethod]
-        public void UserNumber_AreNotEqual()
-        {
-
-
-
-        }
-
-        [TestMethod]
-        public void UserPassword_AreEqual()
-        {
-
-
-
-        }
-
-        [TestMethod]
-        public void UserPassword_AreNotEqual()
-        {
-
-
-
-        }
-
-        [TestMethod]
-        public void UserNick_AreEqual()
-        {
-
-
-
-        }
-
-        [TestMethod]
-        public void UserNick_AreNotEqual()
-        {
-
-
-
-        }
-
-
-        [TestMethod]
-        public void UserHeight_AreEqual()
-        {
-
-
-
-        }
-
-        [TestMethod]
-        public void UserHeight_AreNotEqual()
-        {
-
-
-
-        }
-
-
-        [TestMethod]
-        public void UserWeight_AreEqual()
-        {
-
-
-
-        }
-
-        [TestMethod]
-        public void UserWeight_AreNotEqual()
-        {
-
-
-
-        }
-
-    }
-}

+ 0 - 24
FoodLogTests/FoodLogTests.csproj

@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1" />
-    <PackageReference Include="coverlet.collector" Version="3.2.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FoodLogProject\FoodLogProject.csproj" />
-  </ItemGroup>
-
-</Project>

+ 0 - 1
FoodLogTests/GlobalUsings.cs

@@ -1 +0,0 @@
-global using NUnit.Framework;

+ 0 - 16
FoodLogTests/UnitTest1.cs

@@ -1,16 +0,0 @@
-namespace FoodLogTests
-{
-    public class Tests
-    {
-        [SetUp]
-        public void Setup()
-        {
-        }
-
-        [Test]
-        public void Test1()
-        {
-            Assert.Pass();
-        }
-    }
-}

+ 0 - 1
TestProject1/GlobalUsings.cs

@@ -1 +0,0 @@
-global using Xunit;

+ 0 - 29
TestProject1/TestProject1.csproj

@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FoodLogProject\FoodLogProject.csproj" />
-  </ItemGroup>
-
-</Project>

+ 0 - 11
TestProject1/UnitTest1.cs

@@ -1,11 +0,0 @@
-namespace TestProject1
-{
-    public class UnitTest1
-    {
-        [Fact]
-        public void Test1()
-        {
-            
-        }
-    }
-}