From f9ed27716800d09a26be35b014080efb8ffe8111 Mon Sep 17 00:00:00 2001 From: Donatas Adamonis Date: Fri, 28 Apr 2017 16:26:21 +0200 Subject: aaa --- ApartmentAdmin | 2 +- ApartmentManager/ApartmentManager/App.xaml | 2 +- HousingDatabase.ldf | Bin 8388608 -> 8388608 bytes HousingDatabase.mdf | Bin 8388608 -> 8388608 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ApartmentAdmin b/ApartmentAdmin index 9345c7a..6f77826 160000 --- a/ApartmentAdmin +++ b/ApartmentAdmin @@ -1 +1 @@ -Subproject commit 9345c7a897c4f0f195c80f117850b8fec1f91afc +Subproject commit 6f7782691aa31bf3b45e87a5a9e0160274a1015d diff --git a/ApartmentManager/ApartmentManager/App.xaml b/ApartmentManager/ApartmentManager/App.xaml index dc08cec..e4c9342 100644 --- a/ApartmentManager/ApartmentManager/App.xaml +++ b/ApartmentManager/ApartmentManager/App.xaml @@ -3,6 +3,6 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:ApartmentManager" - RequestedTheme="Dark"> + RequestedTheme="Light"> diff --git a/HousingDatabase.ldf b/HousingDatabase.ldf index 17d07d1..5130103 100644 Binary files a/HousingDatabase.ldf and b/HousingDatabase.ldf differ diff --git a/HousingDatabase.mdf b/HousingDatabase.mdf index d8ee802..7b24ca2 100644 Binary files a/HousingDatabase.mdf and b/HousingDatabase.mdf differ -- cgit v1.2.3 From 262c9785230e2d3ff7775cc95db70a346a7ff14a Mon Sep 17 00:00:00 2001 From: Donatas Adamonis Date: Fri, 28 Apr 2017 16:53:16 +0200 Subject: Appartment page --- .../ApartmentManager/ApartmentManager.csproj | 7 +++++ .../ApartmentManager/View/ApartmentPage.xaml | 29 ++++++++++++++++++++ .../ApartmentManager/View/ApartmentPage.xaml.cs | 30 +++++++++++++++++++++ .../ApartmentManager/View/LoginPage.xaml | 2 +- .../ApartmentManager/View/LoginPage.xaml.cs | 5 ++++ HousingDatabase.ldf | Bin 8388608 -> 8388608 bytes HousingDatabase.mdf | Bin 8388608 -> 8388608 bytes 7 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 ApartmentManager/ApartmentManager/View/ApartmentPage.xaml create mode 100644 ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index b08d130..a010a50 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -99,6 +99,9 @@ + + ApartmentPage.xaml + LoginPage.xaml @@ -124,6 +127,10 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml new file mode 100644 index 0000000..8773f0f --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs new file mode 100644 index 0000000..8c9d26c --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs @@ -0,0 +1,30 @@ +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=234238 + +namespace ApartmentManager.View +{ + /// + /// An empty page that can be used on its own or navigated to within a Frame. + /// + public sealed partial class ApartmentPage : Page + { + public ApartmentPage() + { + this.InitializeComponent(); + } + } +} diff --git a/ApartmentManager/ApartmentManager/View/LoginPage.xaml b/ApartmentManager/ApartmentManager/View/LoginPage.xaml index bca57b4..80071d1 100644 --- a/ApartmentManager/ApartmentManager/View/LoginPage.xaml +++ b/ApartmentManager/ApartmentManager/View/LoginPage.xaml @@ -13,7 +13,7 @@ - + diff --git a/ApartmentManager/ApartmentManager/View/LoginPage.xaml.cs b/ApartmentManager/ApartmentManager/View/LoginPage.xaml.cs index 246ec8e..dcc17ee 100644 --- a/ApartmentManager/ApartmentManager/View/LoginPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/LoginPage.xaml.cs @@ -26,5 +26,10 @@ namespace ApartmentManager.View { this.InitializeComponent(); } + + private void click(object sender, RoutedEventArgs e) + { + Frame.Navigate(typeof(ApartmentPage)); + } } } diff --git a/HousingDatabase.ldf b/HousingDatabase.ldf index 5130103..16ec302 100644 Binary files a/HousingDatabase.ldf and b/HousingDatabase.ldf differ diff --git a/HousingDatabase.mdf b/HousingDatabase.mdf index 7b24ca2..191f6dd 100644 Binary files a/HousingDatabase.mdf and b/HousingDatabase.mdf differ -- cgit v1.2.3 From 1dd0fde8ead60a95119eb266d79231235ca7951b Mon Sep 17 00:00:00 2001 From: Donatas Adamonis Date: Fri, 28 Apr 2017 17:07:12 +0200 Subject: Plan page --- .../ApartmentManager/ApartmentManager.csproj | 7 +++++ .../ApartmentManager/View/ApartmentPage.xaml | 2 +- .../ApartmentManager/View/ApartmentPage.xaml.cs | 5 ++++ .../ApartmentManager/View/ApartmentPlanPage.xaml | 22 +++++++++++++++ .../View/ApartmentPlanPage.xaml.cs | 30 +++++++++++++++++++++ HousingDatabase.ldf | Bin 8388608 -> 8388608 bytes HousingDatabase.mdf | Bin 8388608 -> 8388608 bytes 7 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml create mode 100644 ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index a010a50..a117703 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -102,6 +102,9 @@ ApartmentPage.xaml + + ApartmentPlanPage.xaml + LoginPage.xaml @@ -131,6 +134,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml index 8773f0f..da8d7dd 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml +++ b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml @@ -18,7 +18,7 @@ - diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs index 8c9d26c..32f0079 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs @@ -26,5 +26,10 @@ namespace ApartmentManager.View { this.InitializeComponent(); } + + private void click(object sender, RoutedEventArgs e) + { + Frame.Navigate(typeof(ApartmentPlanPage)); + } } } diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml new file mode 100644 index 0000000..4f8b466 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs new file mode 100644 index 0000000..45feb63 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs @@ -0,0 +1,30 @@ +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=234238 + +namespace ApartmentManager.View +{ + /// + /// An empty page that can be used on its own or navigated to within a Frame. + /// + public sealed partial class ApartmentPlanPage : Page + { + public ApartmentPlanPage() + { + this.InitializeComponent(); + } + } +} diff --git a/HousingDatabase.ldf b/HousingDatabase.ldf index 16ec302..6dee888 100644 Binary files a/HousingDatabase.ldf and b/HousingDatabase.ldf differ diff --git a/HousingDatabase.mdf b/HousingDatabase.mdf index 191f6dd..76e5c09 100644 Binary files a/HousingDatabase.mdf and b/HousingDatabase.mdf differ -- cgit v1.2.3