Rhomaios 3 years ago
parent
commit
ebecd04663

BIN
.vs/MyMoviesWPF/v17/.suo


+ 0 - 13
MyMoviesWPF/MVVM/View/Catalog.xaml

@@ -1,13 +0,0 @@
-<Window x:Class="MyMoviesWPF.MVVM.View.Catalog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:MyMoviesWPF.MVVM.View" 
-        mc:Ignorable="d"
-        Title="Каталог" Height="900" Width="1600"        
-        WindowStartupLocation="CenterScreen">
-    <Grid>
-
-    </Grid>
-</Window>

+ 0 - 28
MyMoviesWPF/MVVM/View/Catalog.xaml.cs

@@ -1,28 +0,0 @@
-using MyMoviesWPF.MVVM.ViewModel;
-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;
-
-namespace MyMoviesWPF.MVVM.View
-{
-    /// <summary>
-    /// Interaction logic for Catalog.xaml
-    /// </summary>
-    public partial class Catalog : Window
-    {
-        public Catalog()
-        {
-            InitializeComponent();
-        }
-    }
-}

+ 0 - 54
MyMoviesWPF/MVVM/View/MovieView.xaml

@@ -1,54 +0,0 @@
-<Window x:Class="MyMoviesWPF.MVVM.View.MovieView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:MyMoviesWPF.MVVM.View"
-        mc:Ignorable="d"
-        Title="Фильм" Height="900" Width="1600">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="8*" />
-            <RowDefinition Height="205*"/>
-            <RowDefinition Height="8*"/>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="43*"/>
-            <ColumnDefinition Width="809*"/>
-            <ColumnDefinition Width="694*"/>
-            <ColumnDefinition Width="54*"/>
-
-        </Grid.ColumnDefinitions>
-        <StackPanel Margin="42,8,725,4" Grid.Column="1">
-            <Image HorizontalAlignment="Left" Margin="117,10,0,0" VerticalAlignment="Top"/>
-        </StackPanel>
-
-
-
-        <StackPanel Grid.Column="1" Orientation="Vertical" HorizontalAlignment="Center"  VerticalAlignment="Top" Grid.RowSpan="2" >
-            <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Category}" VerticalAlignment="Top"/>
-            <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Genre.Name}" VerticalAlignment="Top"/>
-            <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Year}" VerticalAlignment="Top"/>
-            <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Languages}" VerticalAlignment="Top"/>
-            <DataGrid ColumnWidth="100" IsReadOnly="True" AutoGenerateColumns="False" ItemsSource="{Binding ActorsCollection}">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="Актёры" Binding="{Binding Name}" IsReadOnly="True"></DataGridTextColumn>
-                </DataGrid.Columns>
-            </DataGrid>
-            <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Price}" VerticalAlignment="Top"/>
-
-        </StackPanel>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right"  VerticalAlignment="Bottom" Grid.Column="2" Grid.Row="1" Height="75" Width="400">
-            <Button Height="75" Width="200" Content="В корзину"/>
-            <Button Height="75" Width="200" Content="Отмена"/>
-
-        </StackPanel>
-        <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Grid.Column="2" Height="544" Margin="0,32,0,0" Grid.RowSpan="2" Width="512">
-            <!--<Image Height="512" Width="512" Source="https://i.ibb.co/zG06HJc/image.png"/>-->
-            <MediaElement Height="512" Width="512" Source="{Binding TrailerURL}" Name="mePlayer" Stretch="Uniform" />
-            <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Name}" VerticalAlignment="Top"/>
-            <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Description}" VerticalAlignment="Top"/>
-
-        </StackPanel>
-    </Grid>
-</Window>

+ 0 - 29
MyMoviesWPF/MVVM/View/MovieView.xaml.cs

@@ -1,29 +0,0 @@
-using MyMoviesWPF.MVVM.ViewModel;
-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;
-
-namespace MyMoviesWPF.MVVM.View
-{
-    /// <summary>
-    /// Логика взаимодействия для MovieView.xaml
-    /// </summary>
-    public partial class MovieView : Window
-    {
-        public MovieView()
-        {
-            InitializeComponent();
-            DataContext = new MovieViewModel();
-        }
-    }
-}

+ 6 - 0
MyMoviesWPF/MVVM/ViewModel/MovieViewModel.cs

@@ -3,6 +3,7 @@ using MyMoviesWPF.Models;
 using MyMoviesWPF.MVVM.ViewModel.Core;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -19,6 +20,11 @@ namespace MyMoviesWPF.MVVM.ViewModel
         public string Year { get => Convert.ToString(Service.movie.ProductYear); }
         public string Languages { get => Service.movie.Languages; }
         public string Price { get => Convert.ToString(Service.movie.Price); }
+        //public ObservableCollection<Actor> ActorsCollection
+        //{
+        //    //get => Service.db.ActorLists.Where(a => a.ListNum == Service.movie.IdactorList)
+
+        //}
 
         public MovieViewModel()
         {

+ 1 - 1
MyMoviesWPF/obj/Debug/net6.0-windows/MVVM/View/Pages/CatalogPage.g.i.cs

@@ -53,7 +53,7 @@ namespace MyMoviesWPF.MVVM.View.Pages {
                 return;
             }
             _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/MyMoviesWPF;component/mvvm/view/pages/catalogpage.xaml", System.UriKind.Relative);
+            System.Uri resourceLocater = new System.Uri("/MyMoviesWPF;V1.0.0.0;component/mvvm/view/pages/catalogpage.xaml", System.UriKind.Relative);
             
             #line 1 "..\..\..\..\..\..\MVVM\View\Pages\CatalogPage.xaml"
             System.Windows.Application.LoadComponent(this, resourceLocater);

+ 1 - 1
MyMoviesWPF/obj/Debug/net6.0-windows/MVVM/View/Pages/MoviePage.g.i.cs

@@ -61,7 +61,7 @@ namespace MyMoviesWPF.MVVM.View.Pages {
                 return;
             }
             _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/MyMoviesWPF;component/mvvm/view/pages/moviepage.xaml", System.UriKind.Relative);
+            System.Uri resourceLocater = new System.Uri("/MyMoviesWPF;V1.0.0.0;component/mvvm/view/pages/moviepage.xaml", System.UriKind.Relative);
             
             #line 1 "..\..\..\..\..\..\MVVM\View\Pages\MoviePage.xaml"
             System.Windows.Application.LoadComponent(this, resourceLocater);

+ 1 - 1
MyMoviesWPF/obj/Debug/net6.0-windows/MainWindow.g.i.cs

@@ -53,7 +53,7 @@ namespace MyMoviesWPF {
                 return;
             }
             _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/MyMoviesWPF;component/mainwindow.xaml", System.UriKind.Relative);
+            System.Uri resourceLocater = new System.Uri("/MyMoviesWPF;V1.0.0.0;component/mainwindow.xaml", System.UriKind.Relative);
             
             #line 1 "..\..\..\MainWindow.xaml"
             System.Windows.Application.LoadComponent(this, resourceLocater);

+ 4 - 4
MyMoviesWPF/obj/Debug/net6.0-windows/MyMoviesWPF_MarkupCompile.i.cache

@@ -10,11 +10,11 @@ none
 false
 TRACE;DEBUG;NET;NET6_0;NETCOREAPP
 C:\Users\gr602_horse\Source\Repos\MyMovies\MyMoviesWPF\App.xaml
-10-95010016
+8-1154585901
 
-29230415441
+27206347693
 222-691941673
-Dictionary_1.xaml;MainWindow.xaml;MVVM\View\Catalog.xaml;MVVM\View\Controls\UserView.xaml;MVVM\View\LogInControl.xaml;MVVM\View\MovieView.xaml;MVVM\View\Pages\CatalogPage.xaml;MVVM\View\Pages\MoviePage.xaml;MVVM\View\UserInit\LogInView.xaml;MVVM\View\UserInit\SignUpView.xaml;
+Dictionary_1.xaml;MainWindow.xaml;MVVM\View\Controls\UserView.xaml;MVVM\View\LogInControl.xaml;MVVM\View\Pages\CatalogPage.xaml;MVVM\View\Pages\MoviePage.xaml;MVVM\View\UserInit\LogInView.xaml;MVVM\View\UserInit\SignUpView.xaml;
 
-True
+False
 

+ 0 - 5
MyMoviesWPF/obj/Debug/net6.0-windows/MyMoviesWPF_MarkupCompile.i.lref

@@ -1,5 +0,0 @@
-
-
-FC:\Users\gr602_horse\Source\Repos\MyMovies\MyMoviesWPF\MVVM\View\Catalog.xaml;;
-FC:\Users\gr602_horse\Source\Repos\MyMovies\MyMoviesWPF\MVVM\View\Pages\CatalogPage.xaml;;
-