From 37985282b1b0a0fbf42e010333978b9d0cf7758f Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Thu, 11 Apr 2024 11:56:21 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Lunapark/Lunapark/MainWindow.xaml          | 94 +++++++++++++++-------
 Lunapark/Lunapark/MainWindow.xaml.cs       | 12 ++-
 Lunapark/Lunapark/WindowBuyTickets.xaml.cs | 14 +---
 3 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/Lunapark/Lunapark/MainWindow.xaml b/Lunapark/Lunapark/MainWindow.xaml
index 2785f7e..b8c2df3 100644
--- a/Lunapark/Lunapark/MainWindow.xaml
+++ b/Lunapark/Lunapark/MainWindow.xaml
@@ -52,37 +52,81 @@
                 </EventTrigger>
             </Style.Triggers>
         </Style>
-
     </Window.Resources>
+
     <Grid>
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="103*"/>
+            <ColumnDefinition Width="184*"/>
+            <ColumnDefinition Width="194*"/>
+            <ColumnDefinition Width="189*"/>
+            <ColumnDefinition Width="180*"/>
+        </Grid.ColumnDefinitions>
+
+        <Grid.RowDefinitions>
+            <RowDefinition Height="88*"/>
+            <RowDefinition Height="57*"/>
+            <RowDefinition Height="72*"/>
+            <RowDefinition Height="72*"/>
+            <RowDefinition Height="72*"/>
+            <RowDefinition Height="72*"/>
+        </Grid.RowDefinitions>
+
         <Grid.Background>
             <RadialGradientBrush>
                 <GradientStop Color="{StaticResource whiteColor}" Offset="1"/>
                 <GradientStop Color="{StaticResource lightBlueColor}"/>
             </RadialGradientBrush>
         </Grid.Background>
-        <DockPanel LastChildFill="False" Height="50" VerticalAlignment="Top" Margin="100,0,0,0">
-            <DockPanel.Background>
+
+        <StackPanel Name="HorizontalPreviewGradient" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="5" Orientation="Horizontal">
+            <StackPanel.Background>
                 <LinearGradientBrush EndPoint="1,0.5" StartPoint="0.5,0.5">
                     <GradientStop Color="{StaticResource whiteColor}"  Offset="0.8"/>
                     <GradientStop Color="{StaticResource lightGreenColor}" />
                 </LinearGradientBrush>
-            </DockPanel.Background>
-            <ComboBox
+            </StackPanel.Background>
+        </StackPanel>
+
+
+        <StackPanel Name="VerticalPreviewGradient" Grid.Row="0" Grid.Column="0" Grid.RowSpan="6">
+            <StackPanel.Background>
+                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0.5">
+                    <GradientStop Color="White" Offset="0.8"/>
+                    <GradientStop Color="{StaticResource lightGreenColor}" />
+                </LinearGradientBrush>
+            </StackPanel.Background>
+        </StackPanel>
+
+        <Grid Name="CircleLabel" Grid.Row="0" Grid.Column="0">
+            <Ellipse HorizontalAlignment="Center" Height="50" Stroke="Black" VerticalAlignment="Center" Width="100"/>
+            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">Покатушки</TextBlock>
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="4">
+            <Border Background="LightGray">
+                <TextBlock FontSize="20" FontStyle="Oblique" TextAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center">Лучший парк развлечений!</TextBlock>
+            </Border>
+        </Grid>
+
+        <StackPanel Name="HorizontalPreviewInfo" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="4" Orientation="Horizontal">
+            <ComboBox 
                 x:Name="ComboBoxAttractions"
                 Height="24"
                 Width="250"
-                Margin="30, 0, 0, 0" SelectedIndex="0"
+                Margin="30, 0, 0, 0" 
+                SelectedIndex="0"
                 Background="{StaticResource controlSolidBrush}">
-                <ComboBoxItem Content="Выберите аттракцион"/>
+                <ComboBoxItem Content="Выберите атракцион"/>
                 <ComboBoxItem Content="Болид"/>
                 <ComboBoxItem Content="Цепная пила"/>
                 <ComboBoxItem Content="Кораблекрушитель"/>
                 <ComboBoxItem Content="Раскачатель"/>
             </ComboBox>
-            <DatePicker
-                x:Name="DatePicker"
-                Width="120"
+            <DatePicker 
+                x:Name="DatePicker" 
+                Width="120" 
                 Height="24"
                 Margin="30, 0, 0, 0"
                 Background="{StaticResource controlSolidBrush}"/>
@@ -90,8 +134,7 @@
                 Height="24"
                 Content="Количество:"
                 Margin="30, 0, 0, 0"
-                VerticalContentAlignment="Center"
-                />
+                VerticalContentAlignment="Center"/>
             <TextBox
                 x:Name="TextBoxTicketCount"
                 TextWrapping="Wrap"
@@ -99,30 +142,17 @@
                 Height="24"
                 HorizontalContentAlignment="Right"
                 VerticalContentAlignment="Center"
-                Background="{StaticResource controlSolidBrush}"
-                />
+                Background="{StaticResource controlSolidBrush}"/>
             <Button
                 Margin="30, 0, 0, 0"
                 Height="24"
                 Width="100"
                 Content="Купить билеты"
                 Background="{StaticResource controlSolidBrush}"
-                Click="ButtonBuyTicketsClick"
-                />
-        </DockPanel>
-        <DockPanel LastChildFill="False" HorizontalAlignment="Left" Width="100">
-            <DockPanel.Background>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0.5">
-                    <GradientStop Color="White" Offset="0.8"/>
-                    <GradientStop Color="{StaticResource lightGreenColor}" />
-                </LinearGradientBrush>
-            </DockPanel.Background>
-            <Grid>
-                <Label Content="Покатушки" Foreground="Black" Width="100" Height="50" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Top" HorizontalAlignment="Right"/>
-            </Grid>
-        </DockPanel>
-        <Ellipse HorizontalAlignment="Left" Height="50" Stroke="Black" VerticalAlignment="Top" Width="100"/>
-        <ScrollViewer Margin="100,50,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                Click="ButtonBuyTicketsClick"/>
+        </StackPanel>
+
+        <ScrollViewer Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="5" Grid.RowSpan="5">
             <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                 <Grid.RowDefinitions>
                     <RowDefinition></RowDefinition>
@@ -133,12 +163,14 @@
                     <ColumnDefinition></ColumnDefinition>
                     <ColumnDefinition></ColumnDefinition>
                 </Grid.ColumnDefinitions>
-                <Label Grid.Row="0" Grid.ColumnSpan="3" Content="Лучший парк развлечений!" HorizontalContentAlignment="Center" HorizontalAlignment="Stretch" VerticalAlignment="Top" FontSize="20" FontStyle="Oblique"/>
                 <Image Source="static\images\american_gorki.jpg" Grid.Row="1" Grid.Column="0" Style="{StaticResource ScaleOnMouse}" Stretch="Fill"/>
                 <Image Source="static\images\cepnoy.jpg" Grid.Row="1" Grid.Column="1" Style="{StaticResource ScaleOnMouse}" Stretch="Fill"/>
                 <Image Source="static\images\kachel.jpg" Grid.Row="2" Grid.Column="0" Style="{StaticResource ScaleOnMouse}" Stretch="Fill"/>
                 <Image Source="static\images\korable.jpg" Grid.Row="2" Grid.Column="1" Style="{StaticResource ScaleOnMouse}" Stretch="Fill"/>
             </Grid>
+
         </ScrollViewer>
+
     </Grid>
+
 </Window>
diff --git a/Lunapark/Lunapark/MainWindow.xaml.cs b/Lunapark/Lunapark/MainWindow.xaml.cs
index 224a863..f307dd6 100644
--- a/Lunapark/Lunapark/MainWindow.xaml.cs
+++ b/Lunapark/Lunapark/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
 using System.Windows;
+using System.Windows.Controls;
 
 namespace Lunapark
 {
@@ -14,10 +15,13 @@ namespace Lunapark
         private void ButtonBuyTicketsClick(object sender, RoutedEventArgs e)
         {
             WindowBuyTickets windowBuyTickets = new WindowBuyTickets();
-            windowBuyTickets.AttractionName.Content = $"аттаркцион \"{ComboBoxAttractions.Text}\"" ;
-            windowBuyTickets.TicketsCount.Content = $"в количестве {TextBoxTicketCount.Text} штук";
-            windowBuyTickets.LabelDate.Content = $"на {DatePicker.Text}";
-            windowBuyTickets.Show();
+            if (ComboBoxAttractions.Text != "Выберите атракцион" && TextBoxTicketCount.Text != "" && DatePicker.Text != "")
+            {
+                windowBuyTickets.AttractionName.Content = $"атракцион \"{ComboBoxAttractions.Text}\"";
+                windowBuyTickets.TicketsCount.Content = $"в количестве {TextBoxTicketCount.Text} штук";
+                windowBuyTickets.LabelDate.Content = $"на {DatePicker.Text}";
+                windowBuyTickets.Show();
+            }
         }
     }
 }
diff --git a/Lunapark/Lunapark/WindowBuyTickets.xaml.cs b/Lunapark/Lunapark/WindowBuyTickets.xaml.cs
index b8d156c..6d46443 100644
--- a/Lunapark/Lunapark/WindowBuyTickets.xaml.cs
+++ b/Lunapark/Lunapark/WindowBuyTickets.xaml.cs
@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-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.Shapes;
+using System.Windows;
 
 namespace Lunapark
 {