PunkPC 8 달 전
부모
커밋
768a02d48b
5개의 변경된 파일6개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 1
      TourSK2/Models/UpSkakunovContext.cs
  2. 1 0
      TourSK2/Views/ListAddRedact.axaml
  3. 1 0
      TourSK2/Views/ListHotels.axaml
  4. 1 1
      TourSK2/Views/ListTours.axaml
  5. 1 0
      TourSK2/Views/MainWindow.axaml

+ 2 - 1
TourSK2/Models/UpSkakunovContext.cs

@@ -33,7 +33,8 @@ public partial class UpSkakunovContext : DbContext
 
     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=Postgreessql-edu.ngknn.ru;Port=5442;Database=UP_Skakunov;Username=43P;Password=444444");
+        => optionsBuilder.UseNpgsql("Host=edu.pg.ngknn.local;Port=5432;Database=UP_Skakunov; Username=43P;Password=444444");
+        //=> optionsBuilder.UseNpgsql("Host=Postgreessql-edu.ngknn.ru;Port=5442;Database=UP_Skakunov;Username=43P;Password=444444");
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {

+ 1 - 0
TourSK2/Views/ListAddRedact.axaml

@@ -5,6 +5,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="TourSK2.ListAddRedact"
 			 xmlns:vm="using:TourSK2.ViewModels"
+			 FontFamily="Comic Sans MS"
 		  	 x:DataType="vm:MainWindowViewModel">
 
 	<StackPanel Margin="10">

+ 1 - 0
TourSK2/Views/ListHotels.axaml

@@ -5,6 +5,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="TourSK2.Views.ListHotels"
 			 x:DataType="vm:MainWindowViewModel"
+			 FontFamily="Comic Sans MS"
 			 xmlns:vm="using:TourSK2.ViewModels" >
 
 	<Grid>

+ 1 - 1
TourSK2/Views/ListTours.axaml

@@ -25,7 +25,7 @@
 			<TextBlock HorizontalAlignment="Right" Margin="0 15 10 0" FontSize="16">Отсортировать: </TextBlock>
 		</StackPanel>
 		<StackPanel Margin="0 20 0 0" Grid.Row="0" Grid.Column="1" Orientation="Vertical" HorizontalAlignment="Left">
-			<TextBox Text="{Binding TourVM.FindTour}" Margin="0,0,0,0" Width="250"/>
+			<TextBox Text="{Binding TourVM.FindTour}" Watermark="Введите название или описание" Margin="0,0,0,0" Width="250"/>
 			<ComboBox SelectedIndex="0" SelectedItem="{Binding TourVM.SelectedItem}" ItemsSource="{Binding TourVM.Types}" Margin="0,5,0,0" Width="250"/>
 			<ComboBox SelectedIndex="0" SelectedItem="{Binding TourVM.SelectedSort}" ItemsSource="{Binding TourVM.Sort}" Margin="0,5,0,0" Width="250"/>
 			<CheckBox IsChecked="{Binding TourVM.CheckOrNot}" HorizontalAlignment="Right" Margin="0,5,0,0" FontSize="16">только актуальные туры</CheckBox>

+ 1 - 0
TourSK2/Views/MainWindow.axaml

@@ -7,6 +7,7 @@
         x:Class="TourSK2.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
         Icon="/Assets/Logo2.png"
+		FontFamily="Comic Sans MS"
         Title="Путешествуя по России">
 
 	<Design.DataContext>