Merge branch 'mavca' of 21IS25/NBATeamTest into master

NBAManagment/NBAManagment/App.config

@@ -8,7 +8,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
   <connectionStrings>
-    <add name="PracticeNBAEntities" connectionString="metadata=res://*/Entities.NBAshka.csdl|res://*/Entities.NBAshka.ssdl|res://*/Entities.NBAshka.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=vpmt.ru\IS4;initial catalog=PracticeNBA;user id=user4;password=is4-user4;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="PracticeNBAEntities" connectionString="metadata=res://*/Entities.NBAshka.csdl|res://*/Entities.NBAshka.ssdl|res://*/Entities.NBAshka.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=srv-wsr\IS4;initial catalog=PracticeNBA;user id=user4;password=is4-user4;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">

NBAManagment/NBAManagment/Login.xaml

@@ -19,8 +19,8 @@
             </DockPanel>
             <CheckBox Name="rememberMeComboBox" Content="Remember me" Margin="30" Foreground="{StaticResource DarkGray}"/>
             <Grid>
-                <Button x:Name="loginButton"  Content="Login" HorizontalAlignment="Left" Width="80" Height="30" Template="{StaticResource RoundButtonTemplate}" Margin="10" Click="loginButton_Click"/>
-                <Button x:Name="cancelButton" Click="cancelButton_Click" Content="Cancel" HorizontalAlignment="Right" Width="80" Height="30" Template="{StaticResource RoundButtonTemplate}" Margin="10"/>
+                <Button x:Name="loginButton" Style="{StaticResource ModernButton}" Content="Login" HorizontalAlignment="Left" Width="80" Height="30"  Margin="10" Click="loginButton_Click"/>
+                <Button x:Name="cancelButton" Style="{StaticResource ModernButton}" Click="cancelButton_Click" Content="Cancel" HorizontalAlignment="Right" Width="80" Height="30" Margin="10"/>
             </Grid>
             <Popup x:Name="chooseAdminTypePoput" AllowsTransparency="True" Focusable="True" PopupAnimation="Fade" Placement="Center" PlacementTarget="{Binding ElementName=mainPanel}">
                 <Border Width="400" HorizontalAlignment="Center" VerticalAlignment="Center" BorderThickness="3" BorderBrush="{StaticResource DarkGray}" Background="White">

NBAManagment/NBAManagment/bin/Debug/NBAManagment.exe.config

@@ -8,7 +8,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
   <connectionStrings>
-    <add name="PracticeNBAEntities" connectionString="metadata=res://*/Entities.NBAshka.csdl|res://*/Entities.NBAshka.ssdl|res://*/Entities.NBAshka.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=vpmt.ru\IS4;initial catalog=PracticeNBA;user id=user4;password=is4-user4;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="PracticeNBAEntities" connectionString="metadata=res://*/Entities.NBAshka.csdl|res://*/Entities.NBAshka.ssdl|res://*/Entities.NBAshka.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=srv-wsr\IS4;initial catalog=PracticeNBA;user id=user4;password=is4-user4;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">

NBAManagment/NBAManagment/obj/Debug/NBAManagment.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f4c520ee30f2b55054bea71365d0428d3e00da466e3db9ea0082e70651775c3f
+6a01fd424eb7e73059241d0eb2aaeb72e75e246c

NBAManagment/NBAManagment/obj/Debug/NBAManagment.csproj.FileListAbsolute.txt

@@ -211,3 +211,38 @@ C:\Users\Lenovo\Downloads\АКТУАЛка\NBATeam\nbateam\NBAManagment\NBAManag
 C:\Users\Lenovo\Downloads\АКТУАЛка\NBATeam\nbateam\NBAManagment\NBAManagment\obj\Debug\NBAManagment.pdb
 C:\Users\Lenovo\Downloads\АКТУАЛка\NBATeam\nbateam\NBAManagment\NBAManagment\obj\Debug\Login.g.cs
 C:\Users\Lenovo\Downloads\АКТУАЛка\NBATeam\nbateam\NBAManagment\NBAManagment\obj\Debug\Login.baml
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\bin\Debug\NBAManagment.exe.config
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\bin\Debug\NBAManagment.exe
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\bin\Debug\NBAManagment.pdb
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\bin\Debug\EntityFramework.dll
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\bin\Debug\EntityFramework.SqlServer.dll
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\bin\Debug\EntityFramework.xml
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\bin\Debug\EntityFramework.SqlServer.xml
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\bin\Debug\ru\EntityFramework.resources.dll
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\NBAManagment.csproj.AssemblyReference.cache
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\NBAManagment.csproj.SuggestedBindingRedirects.cache
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\MainWindow.baml
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\SourceButton.baml
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\TeamsMain.baml
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\VisitorMenu.baml
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\Login.g.cs
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\MainWindow.g.cs
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\PlayersMain.g.cs
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\TeamDetail.g.cs
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\TeamsMain.g.cs
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\VisitorMenu.g.cs
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\App.g.cs
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\NBAManagment_Content.g.cs
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\NBAManagment_MarkupCompile.cache
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\NBAManagment_MarkupCompile.lref
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\App.baml
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\Login.baml
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\PlayersMain.baml
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\TeamDetail.baml
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\NBAManagment.g.resources
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\NBAManagment.Properties.Resources.resources
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\NBAManagment.csproj.GenerateResource.cache
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\NBAManagment.csproj.CoreCompileInputs.cache
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\NBAManagment.csproj.CopyComplete
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\NBAManagment.exe
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\NBAManagment.pdb

NBAManagment/NBAManagment/obj/Debug/NBAManagment_MarkupCompile.cache

@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-C:\Users\Lenovo\Downloads\АКТУАЛка\NBATeam\nbateam\NBAManagment\NBAManagment\obj\Debug\
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\obj\Debug\
 NBAManagment
 none
 false
 DEBUG;TRACE
-C:\Users\Lenovo\Downloads\АКТУАЛка\NBATeam\nbateam\NBAManagment\NBAManagment\App.xaml
+C:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\App.xaml
 71916644394
 2754249965
 3989514667
-19-126552445
+19-1030987123
 Login.xaml;MainWindow.xaml;PlayersMain.xaml;SourceButton.xaml;TeamDetail.xaml;TeamsMain.xaml;VisitorMenu.xaml;
 
 False

NBAManagment/NBAManagment/obj/Debug/NBAManagment_MarkupCompile.lref

@@ -1,6 +1,6 @@
 
-FC:\Users\Lenovo\Downloads\АКТУАЛка\NBATeam\nbateam\NBAManagment\NBAManagment\App.xaml;;
-FC:\Users\Lenovo\Downloads\АКТУАЛка\NBATeam\nbateam\NBAManagment\NBAManagment\Login.xaml;;
-FC:\Users\Lenovo\Downloads\АКТУАЛка\NBATeam\nbateam\NBAManagment\NBAManagment\PlayersMain.xaml;;
-FC:\Users\Lenovo\Downloads\АКТУАЛка\NBATeam\nbateam\NBAManagment\NBAManagment\TeamDetail.xaml;;
+FC:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\App.xaml;;
+FC:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\Login.xaml;;
+FC:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\PlayersMain.xaml;;
+FC:\Users\user\Desktop\NBATeamTest\NBAManagment\NBAManagment\TeamDetail.xaml;;