user2 4 년 전
부모
커밋
990109db77
27개의 변경된 파일235개의 추가작업 그리고 15개의 파일을 삭제
  1. 2 3
      MainWindow.xaml
  2. 17 0
      MainWindow.xaml.cs
  3. 12 0
      OgurchenokKarpechin_lessons.csproj.user
  4. 6 0
      Pages/AuthPage.cs
  5. 1 1
      Pages/AuthPage.xaml
  6. 10 0
      Pages/AuthPage.xaml.cs
  7. 17 0
      Pages/CustomerMenu.xaml
  8. 41 0
      Pages/CustomerMenu.xaml.cs
  9. 14 0
      Pages/Page1.xaml
  10. 26 0
      Pages/Page1.xaml.cs
  11. BIN
      bin/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.dll
  12. BIN
      bin/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.pdb
  13. BIN
      obj/Debug/netcoreapp3.1/App.baml
  14. BIN
      obj/Debug/netcoreapp3.1/MainWindow.baml
  15. 18 1
      obj/Debug/netcoreapp3.1/MainWindow.g.cs
  16. 18 1
      obj/Debug/netcoreapp3.1/MainWindow.g.i.cs
  17. 2 0
      obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.csproj.FileListAbsolute.txt
  18. BIN
      obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.csprojAssemblyReference.cache
  19. BIN
      obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.dll
  20. BIN
      obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.g.resources
  21. BIN
      obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.pdb
  22. 4 4
      obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons_MarkupCompile.cache
  23. 3 3
      obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons_MarkupCompile.i.cache
  24. 2 0
      obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons_MarkupCompile.lref
  25. BIN
      obj/Debug/netcoreapp3.1/Pages/AuthPage.baml
  26. 21 1
      obj/Debug/netcoreapp3.1/Pages/AuthPage.g.cs
  27. 21 1
      obj/Debug/netcoreapp3.1/Pages/AuthPage.g.i.cs

+ 2 - 3
MainWindow.xaml

@@ -19,8 +19,7 @@
             <RowDefinition Height="42"/>
         </Grid.RowDefinitions>
         <Rectangle Fill="#FFF4F4F5" Grid.Row="2" StrokeThickness="0" />
-        <Button Content="Назад" HorizontalAlignment="Left" Margin="10,10,0,10" Width="75"/>
-        <Frame Name="MainFrame" Content="Frame" Grid.Row="1" Navigated="MainFrame_Navigated" Grid.ColumnSpan="3" Margin="0,0,0,164" Grid.RowSpan="2" Source="Pages/AuthPage.xaml"/>
-        <Label Content="Label" HorizontalAlignment="Left" Margin="99,37,0,0" Grid.Row="1" VerticalAlignment="Top" Height="23" Width="98" Grid.ColumnSpan="2"/>
+        <Button x:Name="ButtonBack" Click="ButtonBack_OnClick" Content="Назад" HorizontalAlignment="Left" Margin="10,10,0,10" Width="75"/>
+        <Frame x:Name="MainFrame" Grid.Row="1" Navigated="MainFrame_Navigated" Source="Pages/AuthPage.xaml"/>
     </Grid>
 </Window>

+ 17 - 0
MainWindow.xaml.cs

@@ -27,7 +27,24 @@ namespace OgurchenokKarpechin_lissons
 
         private void MainFrame_Navigated(object sender, NavigationEventArgs e)
         {
+            if (!(e.Content is Page page)) return;
+            this.Title = $"LESSON - {page.Title}";
 
+           /* if (page is Pages.AuthPage)
+            {
+                ButtonBack.Visibility = Visibility.Hidden;
+            }
+            else
+            {
+                ButtonBack.Visibility = Visibility.Visible;
+             }*/
+        }
+
+
+
+        private void ButtonBack_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (MainFrame.CanGoBack) MainFrame.GoBack();
         }
     }
 }

+ 12 - 0
OgurchenokKarpechin_lessons.csproj.user

@@ -10,6 +10,12 @@
     <Compile Update="Pages\AuthPage.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Pages\CustomerMenu.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Pages\Page1.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Page Update="Dictionary1.xaml">
@@ -21,5 +27,11 @@
     <Page Update="Pages\AuthPage.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="Pages\CustomerMenu.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Pages\Page1.xaml">
+      <SubType>Designer</SubType>
+    </Page>
   </ItemGroup>
 </Project>

+ 6 - 0
Pages/AuthPage.cs

@@ -0,0 +1,6 @@
+namespace Pages
+{
+    internal class AuthPage
+    {
+    }
+}

+ 1 - 1
Pages/AuthPage.xaml

@@ -25,6 +25,6 @@
         <Label Content="Пароль" Grid.Column="1" Grid.Row="1" VerticalAlignment="Top" Height="25" Margin="0,30,0,0"/>
 <PasswordBox Grid.Column="2" Margin="0,30,0,0" Grid.Row="1" VerticalAlignment="Top" Height="25"/>
     <Button Content="Вход" Grid.Column="2" Margin="0,60,0,0" Grid.Row="1" VerticalAlignment="Top"/>
-        <Button Content="Регистрация" Grid.Column="2" Margin="0,85,0,0" Grid.Row="1" VerticalAlignment="Top"/>
+        <Button x:Name="ButtenReg" Content="Регистрация" Grid.Column="2" Margin="0,85,0,0" Grid.Row="1" VerticalAlignment="Top" Height="20" Click="ButtonRegistration_Click"/>
     </Grid>
 </Window>

+ 10 - 0
Pages/AuthPage.xaml.cs

@@ -21,5 +21,15 @@ namespace OgurchenokKarpechin_lessons.Pages
         {
             InitializeComponent();
         }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void ButtonRegistration_Click(object sender, RoutedEventArgs e)
+        {
+          // NavigationService?.Navigate(new Page1());
+        }
     }
 }

+ 17 - 0
Pages/CustomerMenu.xaml

@@ -0,0 +1,17 @@
+<Page x:Class="OgurchenokKarpechin_lessons.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:OgurchenokKarpechin_lessons.Pages"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="CustomerMenu">
+
+    <Grid>
+        <Button Content="Переход 1" Click="ButtonPage1_OnClick" Grid.Column="1" HorizontalAlignment="Center" Margin="0,171,0,0" VerticalAlignment="Top" Width="242"/>
+        <Button Content="Переход 2" Click="ButtonPage2_OnClick" Grid.Column="1" HorizontalAlignment="Center" Margin="0,201,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.486,0.66" Width="242"/>
+        <Button Content="Переход 3" Click="ButtonPage3_OnClick" Grid.Column="1" HorizontalAlignment="Center" Margin="0,230,0,0" VerticalAlignment="Top" Width="242"/>
+
+    </Grid>
+</Page>

+ 41 - 0
Pages/CustomerMenu.xaml.cs

@@ -0,0 +1,41 @@
+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 OgurchenokKarpechin_lessons.Pages
+{
+    /// <summary>
+    /// Логика взаимодействия для CustomerMenu.xaml
+    /// </summary>
+    public partial class CustomerMenu : Page
+    {
+        public CustomerMenu()
+        {
+            InitializeComponent();
+        }
+
+        private void ButtonPage1_OnClick(object sender, RoutedEventArgs e)
+        {
+            NavigationService?.Navigate(new Page());
+        }
+
+        private void ButtonPage2_OnClick(object sender, RoutedEventArgs e)
+        {
+            NavigationService?.Navigate(new AuthPage());
+        }
+
+        private void ButtonPage3_OnClick(object sender, RoutedEventArgs e)
+        {
+            NavigationService?.Navigate(new Menu());
+        }
+    }
+}

+ 14 - 0
Pages/Page1.xaml

@@ -0,0 +1,14 @@
+<Page x:Class="OgurchenokKarpechin_lessons.Pages.Page1"
+      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:OgurchenokKarpechin_lessons.Pages"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="Page1">
+
+    <Grid>
+        
+    </Grid>
+</Page>

+ 26 - 0
Pages/Page1.xaml.cs

@@ -0,0 +1,26 @@
+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 OgurchenokKarpechin_lessons.Pages
+{
+    /// <summary>
+    /// Логика взаимодействия для Page1.xaml
+    /// </summary>
+    public partial class Page1 : Page
+    {
+        public Page1()
+        {
+            InitializeComponent();
+        }
+    }
+}

BIN
bin/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.dll


BIN
bin/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.pdb


BIN
obj/Debug/netcoreapp3.1/App.baml


BIN
obj/Debug/netcoreapp3.1/MainWindow.baml


+ 18 - 1
obj/Debug/netcoreapp3.1/MainWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "97FE54D00E4F81559838D089668741B3CCDF5F1E"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "72F04F534580F51841601F03F08DEE7B0297B8EF"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -42,6 +42,14 @@ namespace OgurchenokKarpechin_lissons {
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
         
+        #line 22 "..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button ButtonBack;
+        
+        #line default
+        #line hidden
+        
+        
         #line 23 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Frame MainFrame;
@@ -80,6 +88,15 @@ namespace OgurchenokKarpechin_lissons {
             switch (connectionId)
             {
             case 1:
+            this.ButtonBack = ((System.Windows.Controls.Button)(target));
+            
+            #line 22 "..\..\..\MainWindow.xaml"
+            this.ButtonBack.Click += new System.Windows.RoutedEventHandler(this.ButtonBack_OnClick);
+            
+            #line default
+            #line hidden
+            return;
+            case 2:
             this.MainFrame = ((System.Windows.Controls.Frame)(target));
             
             #line 23 "..\..\..\MainWindow.xaml"

+ 18 - 1
obj/Debug/netcoreapp3.1/MainWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "97FE54D00E4F81559838D089668741B3CCDF5F1E"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "72F04F534580F51841601F03F08DEE7B0297B8EF"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -42,6 +42,14 @@ namespace OgurchenokKarpechin_lissons {
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
         
+        #line 22 "..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button ButtonBack;
+        
+        #line default
+        #line hidden
+        
+        
         #line 23 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Frame MainFrame;
@@ -80,6 +88,15 @@ namespace OgurchenokKarpechin_lissons {
             switch (connectionId)
             {
             case 1:
+            this.ButtonBack = ((System.Windows.Controls.Button)(target));
+            
+            #line 22 "..\..\..\MainWindow.xaml"
+            this.ButtonBack.Click += new System.Windows.RoutedEventHandler(this.ButtonBack_OnClick);
+            
+            #line default
+            #line hidden
+            return;
+            case 2:
             this.MainFrame = ((System.Windows.Controls.Frame)(target));
             
             #line 23 "..\..\..\MainWindow.xaml"

+ 2 - 0
obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.csproj.FileListAbsolute.txt

@@ -19,3 +19,5 @@ C:\Users\user2\source\repos\OgurchenokKarpechin_lissons\obj\Debug\netcoreapp3.1\
 C:\Users\user2\source\repos\OgurchenokKarpechin_lissons\obj\Debug\netcoreapp3.1\Pages\AuthPage.g.cs
 C:\Users\user2\source\repos\OgurchenokKarpechin_lissons\obj\Debug\netcoreapp3.1\App.baml
 C:\Users\user2\source\repos\OgurchenokKarpechin_lissons\obj\Debug\netcoreapp3.1\Pages\AuthPage.baml
+C:\Users\user2\source\repos\OgurchenokKarpechin_lissons\obj\Debug\netcoreapp3.1\Pages\Page1.g.cs
+C:\Users\user2\source\repos\OgurchenokKarpechin_lissons\obj\Debug\netcoreapp3.1\Pages\CustomerMenu.g.cs

BIN
obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.csprojAssemblyReference.cache


BIN
obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.dll


BIN
obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.g.resources


BIN
obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons.pdb


+ 4 - 4
obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 TRACE;DEBUG;NETCOREAPP;NETCOREAPP3_1
 C:\Users\user2\source\repos\OgurchenokKarpechin_lissons\App.xaml
-31599395741
+5-149820657
 
-4-1210115339
+8-928926850
 1921654412462
-Dictionary1.xaml;MainWindow.xaml;Pages\AuthPage.xaml;
+Dictionary1.xaml;MainWindow.xaml;Pages\AuthPage.xaml;Pages\CustomerMenu.xaml;Pages\Page1.xaml;
 
-False
+True
 

+ 3 - 3
obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons_MarkupCompile.i.cache

@@ -10,11 +10,11 @@ none
 false
 TRACE;DEBUG;NETCOREAPP;NETCOREAPP3_1
 C:\Users\user2\source\repos\OgurchenokKarpechin_lissons\App.xaml
-31599395741
+5-149820657
 
-5384839057
+841832876
 1921654412462
-Dictionary1.xaml;MainWindow.xaml;Pages\AuthPage.xaml;
+Dictionary1.xaml;MainWindow.xaml;Pages\AuthPage.xaml;Pages\CustomerMenu.xaml;Pages\Page1.xaml;
 
 False
 

+ 2 - 0
obj/Debug/netcoreapp3.1/OgurchenokKarpechin_lessons_MarkupCompile.lref

@@ -2,4 +2,6 @@
 FC:\Users\user2\source\repos\OgurchenokKarpechin_lissons\App.xaml;;
 FC:\Users\user2\source\repos\OgurchenokKarpechin_lissons\MainWindow.xaml;;
 FC:\Users\user2\source\repos\OgurchenokKarpechin_lissons\Pages\AuthPage.xaml;;
+FC:\Users\user2\source\repos\OgurchenokKarpechin_lissons\Pages\Page1.xaml;;
+FC:\Users\user2\source\repos\OgurchenokKarpechin_lissons\Pages\CustomerMenu.xaml;;
 

BIN
obj/Debug/netcoreapp3.1/Pages/AuthPage.baml


+ 21 - 1
obj/Debug/netcoreapp3.1/Pages/AuthPage.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Pages\AuthPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0526F60F7E00F76D4D01941E3A8D3DC93E92EAC9"
+#pragma checksum "..\..\..\..\Pages\AuthPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AB25D718071C65E803726DB012DCEF10DA21C4C4"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -41,6 +41,14 @@ namespace OgurchenokKarpechin_lessons.Pages {
     /// </summary>
     public partial class AuthPage : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
+        
+        #line 28 "..\..\..\..\Pages\AuthPage.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button ButtenReg;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -69,6 +77,18 @@ namespace OgurchenokKarpechin_lessons.Pages {
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
         void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.ButtenReg = ((System.Windows.Controls.Button)(target));
+            
+            #line 28 "..\..\..\..\Pages\AuthPage.xaml"
+            this.ButtenReg.Click += new System.Windows.RoutedEventHandler(this.ButtonRegistration_Click);
+            
+            #line default
+            #line hidden
+            return;
+            }
             this._contentLoaded = true;
         }
     }

+ 21 - 1
obj/Debug/netcoreapp3.1/Pages/AuthPage.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Pages\AuthPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0526F60F7E00F76D4D01941E3A8D3DC93E92EAC9"
+#pragma checksum "..\..\..\..\Pages\AuthPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AB25D718071C65E803726DB012DCEF10DA21C4C4"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -41,6 +41,14 @@ namespace OgurchenokKarpechin_lessons.Pages {
     /// </summary>
     public partial class AuthPage : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
+        
+        #line 28 "..\..\..\..\Pages\AuthPage.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button ButtenReg;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -69,6 +77,18 @@ namespace OgurchenokKarpechin_lessons.Pages {
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
         void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.ButtenReg = ((System.Windows.Controls.Button)(target));
+            
+            #line 28 "..\..\..\..\Pages\AuthPage.xaml"
+            this.ButtenReg.Click += new System.Windows.RoutedEventHandler(this.ButtonRegistration_Click);
+            
+            #line default
+            #line hidden
+            return;
+            }
             this._contentLoaded = true;
         }
     }