ITOG

Project_Shilkina1/MainWindow.xaml

@@ -11,7 +11,7 @@
             <ColumnDefinition Width="333*"/>
             <ColumnDefinition Width="67*"/>
         </Grid.ColumnDefinitions>
-        <Grid HorizontalAlignment="Left" Width="790" Grid.ColumnSpan="2" Margin="10,0,0,0" RenderTransformOrigin="0.502,0.896">
+        <Grid HorizontalAlignment="Left" Width="790" Grid.ColumnSpan="2" Margin="10,0,0,126" RenderTransformOrigin="0.502,0.896">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*"/>
                 <RowDefinition Height="289*"/>
@@ -35,7 +35,7 @@
                 </Rectangle.RenderTransform>
             </Rectangle>
             <Rectangle Fill="Bisque" Grid.Row="2" StrokeThickness="0"/>
-            <Frame x:Name="MainFrame" Source="PAGES/Page1.xaml" Grid.Row="1" Navigated="MainFrame_OnNavigated" Margin="10,61,308,118" Grid.ColumnSpan="2"/>
+            <Frame x:Name="MainFrame" Source="PAGES/Page1.xaml" Grid.Row="1" Navigated="MainFrame_OnNavigated" Margin="10,61,312,118" Grid.ColumnSpan="2"/>
 
         </Grid>
     </Grid>

Project_Shilkina1/PAGES/CustomerMenu.xaml

@@ -0,0 +1,17 @@
+<Page x:Class="Project_Shilkina1.PAGES.CustomerMenu"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:Project_Shilkina1.PAGES"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="CustomerMenu">
+
+    <Grid Background="White">
+        <Button Content="Переход 1" Click="ButtonPage1_OnClick" HorizontalAlignment="Left" Height="25" Margin="272,119,0,0" VerticalAlignment="Top" Width="259"/>
+        <Button Content="Переход 2" Click="ButtonPage2_OnClick" HorizontalAlignment="Left" Height="25" Margin="272,149,0,0" VerticalAlignment="Top" Width="259"/>
+        <Button Content="Переход 3" Click="ButtonPage3_OnClick" HorizontalAlignment="Left" Height="25" Margin="272,179,0,0" VerticalAlignment="Top" Width="259"/>
+
+    </Grid>
+</Page>

Project_Shilkina1/PAGES/CustomerMenu.xaml.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Project_Shilkina1.PAGES
+{
+    /// <summary>
+    /// Логика взаимодействия для CustomerMenu.xaml
+    /// </summary>
+    public partial class CustomerMenu : Page
+    {
+        public CustomerMenu()
+        {
+            InitializeComponent();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void ButtonPage1_OnClick(object sender, RoutedEventArgs e)
+        {
+            NavigationService?.Navigate(new Page2());
+        }
+
+        private void ButtonPage2_OnClick(object sender, RoutedEventArgs e)
+        {
+            NavigationService?.Navigate(new Page1());
+        }
+
+        private void ButtonPage3_OnClick(object sender, RoutedEventArgs e)
+        {
+            NavigationService?.Navigate(new Menu());
+        }
+    }
+}

Project_Shilkina1/PAGES/Page1.xaml

@@ -6,27 +6,27 @@
       xmlns:local="clr-namespace:Project_Shilkina1.PAGES"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
-      Title="Page1">
+      Title="">
 
-    <Grid Background="#FFE4C3C3">
+    <Grid Background="White">
         <Grid.RowDefinitions>
             <RowDefinition Height="55*"/>
-            <RowDefinition Height="102*"/>
-            <RowDefinition Height="80*"/>
+            <RowDefinition Height="91*"/>
+            <RowDefinition Height="91*"/>
             <RowDefinition Height="213*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="56*"/>
             <ColumnDefinition Width="92*"/>
             <ColumnDefinition Width="211*"/>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="56*"/>
         </Grid.ColumnDefinitions>
         <Label Content="Логин" Margin="0,0,30,10" Grid.Column="1" Grid.Row="1"/>
         <Label Content="Пароль" Margin="0,33,30,10" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2"/>
-        <TextBox x:Name="TextBoxLogin" Text="" TextWrapping="Wrap" Grid.Column="2" Margin="0,4,10,10" Grid.Row="1"/>
-        <TextBox x:Name="TextBoxPassword" Text="" TextWrapping="Wrap" Grid.Column="2" Margin="0,0,10,8" Grid.Row="2"/>
+        <TextBox x:Name="TextBoxLogin" Text="" TextWrapping="Wrap" Grid.Column="1" Margin="177,4,10,10" Grid.Row="1" Grid.ColumnSpan="2"/>
+        <TextBox x:Name="TextBoxPassword" Text="" TextWrapping="Wrap" Grid.Column="1" Margin="177,0,10,8" Grid.Row="2" Grid.ColumnSpan="2"/>
         <Button Content="Вход" Grid.Column="2" HorizontalAlignment="Left" Margin="59,10,0,0" Grid.Row="3" VerticalAlignment="Top" Click="Button_Click" Height="20" Width="30"/>
-        <Button Content="Регистрация" Grid.Column="2" HorizontalAlignment="Left" Margin="38,35,0,0" Grid.Row="3" VerticalAlignment="Top" Height="20" Width="72"/>
+        <Button Content="Регистрация" Grid.Column="2" HorizontalAlignment="Left" Margin="38,35,0,0" Grid.Row="3" VerticalAlignment="Top" Height="20" Width="72" Click="ButtonRegistration_OnClick"/>
 
     </Grid>
 </Page>

Project_Shilkina1/PAGES/Page1.xaml.cs

@@ -32,7 +32,10 @@ namespace Project_Shilkina1.PAGES
         }
         }
 
-         
-     }
+        private void ButtonRegistration_OnClick(object sender, RoutedEventArgs e)
+        {
+            NavigationService?.Navigate(new CustomerMenu());
+        }
+    }
 }