From 73157e2ded2ea7002dd89e521ed13bca482bc6df Mon Sep 17 00:00:00 2001
From: Danamir <danamir@danamir.site>
Date: Fri, 2 May 2025 00:43:45 +0300
Subject: [PATCH] Add new pages

---
 asugaksharp/App.xaml.cs                       |  2 +-
 asugaksharp/AppShell.xaml                     | 15 ---------
 asugaksharp/AppShell.xaml.cs                  | 10 ------
 asugaksharp/MainPage.xaml                     | 32 ++++---------------
 asugaksharp/MainPage.xaml.cs                  | 18 +++++------
 .../Presentation/Views/GakPersonCard.xaml     | 19 +++++++++++
 .../Presentation/Views/GakPersonCard.xaml.cs  |  9 ++++++
 asugaksharp/Presentation/Views/Page1.xaml     | 13 ++++++++
 asugaksharp/Presentation/Views/Page1.xaml.cs  | 16 ++++++++++
 asugaksharp/Presentation/Views/Page2.xaml     | 12 +++++++
 asugaksharp/Presentation/Views/Page2.xaml.cs  |  9 ++++++
 asugaksharp/asugaksharp.csproj                | 25 +++++++++++++++
 asugaksharp/asugaksharp.csproj.user           |  3 --
 13 files changed, 119 insertions(+), 64 deletions(-)
 delete mode 100644 asugaksharp/AppShell.xaml
 delete mode 100644 asugaksharp/AppShell.xaml.cs
 create mode 100644 asugaksharp/Presentation/Views/GakPersonCard.xaml
 create mode 100644 asugaksharp/Presentation/Views/GakPersonCard.xaml.cs
 create mode 100644 asugaksharp/Presentation/Views/Page1.xaml
 create mode 100644 asugaksharp/Presentation/Views/Page1.xaml.cs
 create mode 100644 asugaksharp/Presentation/Views/Page2.xaml
 create mode 100644 asugaksharp/Presentation/Views/Page2.xaml.cs

diff --git a/asugaksharp/App.xaml.cs b/asugaksharp/App.xaml.cs
index 3f52bf4..619c05d 100644
--- a/asugaksharp/App.xaml.cs
+++ b/asugaksharp/App.xaml.cs
@@ -6,7 +6,7 @@
         {
             InitializeComponent();
 
-            MainPage = new AppShell();
+            MainPage = new NavigationPage(new MainPage());
         }
     }
 }
diff --git a/asugaksharp/AppShell.xaml b/asugaksharp/AppShell.xaml
deleted file mode 100644
index d20e8f2..0000000
--- a/asugaksharp/AppShell.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Shell
-    x:Class="asugaksharp.AppShell"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:asugaksharp"
-    Shell.FlyoutBehavior="Disabled"
-    Title="asugaksharp">
-
-    <ShellContent
-        Title="Home"
-        ContentTemplate="{DataTemplate local:MainPage}"
-        Route="MainPage" />
-
-</Shell>
diff --git a/asugaksharp/AppShell.xaml.cs b/asugaksharp/AppShell.xaml.cs
deleted file mode 100644
index 9b8718d..0000000
--- a/asugaksharp/AppShell.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace asugaksharp
-{
-    public partial class AppShell : Shell
-    {
-        public AppShell()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/asugaksharp/MainPage.xaml b/asugaksharp/MainPage.xaml
index cced42d..772d810 100644
--- a/asugaksharp/MainPage.xaml
+++ b/asugaksharp/MainPage.xaml
@@ -3,34 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="asugaksharp.MainPage">
 
-    <ScrollView>
-        <VerticalStackLayout
-            Padding="30,0"
-            Spacing="25">
-            <Image
-                Source="dotnet_bot.png"
-                HeightRequest="185"
-                Aspect="AspectFit"
-                SemanticProperties.Description="dot net bot in a race car number eight" />
 
-            <Label
-                Text="Hello, World!"
-                Style="{StaticResource Headline}"
-                SemanticProperties.HeadingLevel="Level1" />
+    <VerticalStackLayout Padding="20">
+        <Label Text="Это MainPage" FontSize="24" />
+        <Button Text="Перейти на Page1" Clicked="OnGoToPage1Clicked" />
 
-            <Label
-                Text="Welcome to &#10;.NET Multi-platform App UI"
-                Style="{StaticResource SubHeadline}"
-                SemanticProperties.HeadingLevel="Level2"
-                SemanticProperties.Description="Welcome to dot net Multi platform App U I" />
+        <Label> </Label>
+        <Button Text="Перейти на Perso" Clicked="OnGoToPersonClicked" />
 
-            <Button
-                x:Name="CounterBtn"
-                Text="Click me" 
-                SemanticProperties.Hint="Counts the number of times you click"
-                Clicked="OnCounterClicked"
-                HorizontalOptions="Fill" />
-        </VerticalStackLayout>
-    </ScrollView>
+    </VerticalStackLayout>
 
 </ContentPage>
diff --git a/asugaksharp/MainPage.xaml.cs b/asugaksharp/MainPage.xaml.cs
index a9ca5fb..4a1ec47 100644
--- a/asugaksharp/MainPage.xaml.cs
+++ b/asugaksharp/MainPage.xaml.cs
@@ -1,4 +1,6 @@
-namespace asugaksharp
+using asugaksharp.Presentation.Views;
+
+namespace asugaksharp
 {
     public partial class MainPage : ContentPage
     {
@@ -9,16 +11,14 @@
             InitializeComponent();
         }
 
-        private void OnCounterClicked(object sender, EventArgs e)
+        private async void OnGoToPage1Clicked(object sender, EventArgs e)
         {
-            count++;
+            await Navigation.PushAsync(new Page1());
+        }
 
-            if (count == 1)
-                CounterBtn.Text = $"Clicked {count} time";
-            else
-                CounterBtn.Text = $"Clicked {count} times";
-
-            SemanticScreenReader.Announce(CounterBtn.Text);
+        private async void OnGoToPersonClicked(object sender, EventArgs e)
+        {
+            await Navigation.PushAsync(new GakPersonCard());
         }
     }
 
diff --git a/asugaksharp/Presentation/Views/GakPersonCard.xaml b/asugaksharp/Presentation/Views/GakPersonCard.xaml
new file mode 100644
index 0000000..355d986
--- /dev/null
+++ b/asugaksharp/Presentation/Views/GakPersonCard.xaml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="asugaksharp.Presentation.Views.GakPersonCard"
+             Title="GakPersonCard">
+    <VerticalStackLayout>
+        <Label 
+            Text="Карточка члена ГЭК"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+
+        <StackLayout Orientation="Vertical" Spacing="10">
+            <Label Text="Элемент 1" />
+            <Label Text="Элемент 2" />
+        </StackLayout>
+
+    </VerticalStackLayout>
+    
+</ContentPage>
\ No newline at end of file
diff --git a/asugaksharp/Presentation/Views/GakPersonCard.xaml.cs b/asugaksharp/Presentation/Views/GakPersonCard.xaml.cs
new file mode 100644
index 0000000..2dde16b
--- /dev/null
+++ b/asugaksharp/Presentation/Views/GakPersonCard.xaml.cs
@@ -0,0 +1,9 @@
+namespace asugaksharp.Presentation.Views;
+
+public partial class GakPersonCard : ContentPage
+{
+	public GakPersonCard()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/asugaksharp/Presentation/Views/Page1.xaml b/asugaksharp/Presentation/Views/Page1.xaml
new file mode 100644
index 0000000..e9d1c2f
--- /dev/null
+++ b/asugaksharp/Presentation/Views/Page1.xaml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="asugaksharp.Presentation.Views.Page1"
+             Title="Page1">
+    
+    <VerticalStackLayout Padding="20">
+        <Label Text="Это страница 1" FontSize="20" />
+        <Button Text="Перейти на другую страницу"
+                Clicked="OnNextPageClicked" />
+    </VerticalStackLayout>
+    
+</ContentPage>
\ No newline at end of file
diff --git a/asugaksharp/Presentation/Views/Page1.xaml.cs b/asugaksharp/Presentation/Views/Page1.xaml.cs
new file mode 100644
index 0000000..811e645
--- /dev/null
+++ b/asugaksharp/Presentation/Views/Page1.xaml.cs
@@ -0,0 +1,16 @@
+using asugaksharp.Presentation.Views;
+
+namespace asugaksharp.Presentation.Views;
+
+public partial class Page1 : ContentPage
+{
+	public Page1()
+	{
+        InitializeComponent();
+	}
+
+    private async void OnNextPageClicked(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new Page2()); // ��������������, ��� Page2 ��� �������
+    }
+}
\ No newline at end of file
diff --git a/asugaksharp/Presentation/Views/Page2.xaml b/asugaksharp/Presentation/Views/Page2.xaml
new file mode 100644
index 0000000..b358162
--- /dev/null
+++ b/asugaksharp/Presentation/Views/Page2.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="asugaksharp.Presentation.Views.Page2"
+             Title="NewPage1">
+    <VerticalStackLayout>
+        <Label 
+            Text="Welcome to .NET MAUI!"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/asugaksharp/Presentation/Views/Page2.xaml.cs b/asugaksharp/Presentation/Views/Page2.xaml.cs
new file mode 100644
index 0000000..2a405fa
--- /dev/null
+++ b/asugaksharp/Presentation/Views/Page2.xaml.cs
@@ -0,0 +1,9 @@
+namespace asugaksharp.Presentation.Views;
+
+public partial class Page2 : ContentPage
+{
+	public Page2()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/asugaksharp/asugaksharp.csproj b/asugaksharp/asugaksharp.csproj
index ce7684c..c97d74f 100644
--- a/asugaksharp/asugaksharp.csproj
+++ b/asugaksharp/asugaksharp.csproj
@@ -62,4 +62,29 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="Application\UseCases\" />
+	  <Folder Include="Domain\Entites\" />
+	  <Folder Include="Domain\Interfaces\" />
+	  <Folder Include="Infrastructure\Persistence\Repositories\" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Compile Update="Presentation\Views\Page2.xaml.cs">
+	    <DependentUpon>Page2.xaml</DependentUpon>
+	  </Compile>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <MauiXaml Update="Presentation\Views\GakPersonCard.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Presentation\Views\Page2.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Presentation\Views\Page1.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	</ItemGroup>
+
 </Project>
diff --git a/asugaksharp/asugaksharp.csproj.user b/asugaksharp/asugaksharp.csproj.user
index 891593c..bdfc170 100644
--- a/asugaksharp/asugaksharp.csproj.user
+++ b/asugaksharp/asugaksharp.csproj.user
@@ -9,9 +9,6 @@
     <None Update="App.xaml">
       <SubType>Designer</SubType>
     </None>
-    <None Update="AppShell.xaml">
-      <SubType>Designer</SubType>
-    </None>
     <None Update="MainPage.xaml">
       <SubType>Designer</SubType>
     </None>