diff options
author | Donatas Adamonis <dona0169@edu.easj.dk> | 2017-04-28 15:48:02 +0200 |
---|---|---|
committer | Donatas Adamonis <dona0169@edu.easj.dk> | 2017-04-28 15:48:02 +0200 |
commit | e1fc8e95fe37d680c247bae064f0d52acfb6c9c7 (patch) | |
tree | 84ec9c163d9c870c83805822a92257271f0ac631 | |
parent | 5f607a5329a9ed7657a313fa32f651967d66ad2c (diff) |
Loginpage
5 files changed, 5 insertions, 52 deletions
diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index 5a65b17..b08d130 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -96,9 +96,6 @@ <DependentUpon>App.xaml</DependentUpon> </Compile> <Compile Include="Common\RelayCommand.cs" /> - <Compile Include="MainPage.xaml.cs"> - <DependentUpon>MainPage.xaml</DependentUpon> - </Compile> <Compile Include="Model\Class1.cs" /> <Compile Include="Persistency\Persistency.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> @@ -127,10 +124,6 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </ApplicationDefinition> - <Page Include="MainPage.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> <Page Include="View\LoginPage.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> diff --git a/ApartmentManager/ApartmentManager/App.xaml.cs b/ApartmentManager/ApartmentManager/App.xaml.cs index a1f0134..297bf9d 100644 --- a/ApartmentManager/ApartmentManager/App.xaml.cs +++ b/ApartmentManager/ApartmentManager/App.xaml.cs @@ -14,6 +14,7 @@ using Windows.UI.Xaml.Data; using Windows.UI.Xaml.Input; using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Navigation; +using ApartmentManager.View; namespace ApartmentManager { @@ -66,7 +67,7 @@ namespace ApartmentManager // When the navigation stack isn't restored navigate to the first page, // configuring the new page by passing required information as a navigation // parameter - rootFrame.Navigate(typeof(MainPage), e.Arguments); + rootFrame.Navigate(typeof(LoginPage), e.Arguments); } // Ensure the current window is active Window.Current.Activate(); diff --git a/ApartmentManager/ApartmentManager/MainPage.xaml b/ApartmentManager/ApartmentManager/MainPage.xaml deleted file mode 100644 index 4eef6cd..0000000 --- a/ApartmentManager/ApartmentManager/MainPage.xaml +++ /dev/null @@ -1,13 +0,0 @@ -<Page - x:Class="ApartmentManager.MainPage" - xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:local="using:ApartmentManager" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - mc:Ignorable="d"> - - <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - - </Grid> -</Page> diff --git a/ApartmentManager/ApartmentManager/MainPage.xaml.cs b/ApartmentManager/ApartmentManager/MainPage.xaml.cs deleted file mode 100644 index 7c4f831..0000000 --- a/ApartmentManager/ApartmentManager/MainPage.xaml.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; - -// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409 - -namespace ApartmentManager -{ - /// <summary> - /// An empty page that can be used on its own or navigated to within a Frame. - /// </summary> - public sealed partial class MainPage : Page - { - public MainPage() - { - this.InitializeComponent(); - } - } -} diff --git a/ApartmentManager/ApartmentManager/View/LoginPage.xaml b/ApartmentManager/ApartmentManager/View/LoginPage.xaml index aa2b0d7..a3b3111 100644 --- a/ApartmentManager/ApartmentManager/View/LoginPage.xaml +++ b/ApartmentManager/ApartmentManager/View/LoginPage.xaml @@ -8,6 +8,8 @@ mc:Ignorable="d"> <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - + <StackPanel> + <TextBox Text="weqwe"></TextBox> + </StackPanel> </Grid> </Page> |