diff --git a/OfficeFlow/App.xaml b/OfficeFlow/App.xaml index 54dfc52..5e82c02 100644 --- a/OfficeFlow/App.xaml +++ b/OfficeFlow/App.xaml @@ -4,6 +4,31 @@ xmlns:local="clr-namespace:OfficeFlow" StartupUri="MainWindow.xaml"> - + + + + diff --git a/OfficeFlow/MainWindow.xaml.cs b/OfficeFlow/MainWindow.xaml.cs index 2e6e4ba..3b4a610 100644 --- a/OfficeFlow/MainWindow.xaml.cs +++ b/OfficeFlow/MainWindow.xaml.cs @@ -1,17 +1,8 @@ -using System; -using System.Collections.Generic; +using OfficeFlow.Pages; 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.Navigation; -using System.Windows.Shapes; namespace OfficeFlow { @@ -28,6 +19,10 @@ namespace OfficeFlow { MainFrame.Navigate(new Pages.StartupPages.InitializeDataPage()); } + else + { + MainFrame.Navigate(new MainPage()); + } } diff --git a/OfficeFlow/OfficeFlow.csproj b/OfficeFlow/OfficeFlow.csproj index 9eb9bf1..d129894 100644 --- a/OfficeFlow/OfficeFlow.csproj +++ b/OfficeFlow/OfficeFlow.csproj @@ -64,6 +64,19 @@ MSBuild:Compile Designer + + NewEmployeePage.xaml + + + NewUserPage.xaml + + + LoginPage.xaml + + + MainPage.xaml + + MSBuild:Compile Designer @@ -76,6 +89,22 @@ MainWindow.xaml Code + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/OfficeFlow/Pages/EmployeePages/NewEmployeePage.xaml b/OfficeFlow/Pages/EmployeePages/NewEmployeePage.xaml new file mode 100644 index 0000000..bf92057 --- /dev/null +++ b/OfficeFlow/Pages/EmployeePages/NewEmployeePage.xaml @@ -0,0 +1,14 @@ + + + + + + diff --git a/OfficeFlow/Pages/EmployeePages/NewEmployeePage.xaml.cs b/OfficeFlow/Pages/EmployeePages/NewEmployeePage.xaml.cs new file mode 100644 index 0000000..6beb91d --- /dev/null +++ b/OfficeFlow/Pages/EmployeePages/NewEmployeePage.xaml.cs @@ -0,0 +1,28 @@ +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.Navigation; +using System.Windows.Shapes; + +namespace OfficeFlow.Pages.EmployeePages +{ + /// + /// Interaction logic for NewEmployeePage.xaml + /// + public partial class NewEmployeePage : Page + { + public NewEmployeePage() + { + InitializeComponent(); + } + } +} diff --git a/OfficeFlow/Pages/EmployeePages/NewUserPage.xaml b/OfficeFlow/Pages/EmployeePages/NewUserPage.xaml new file mode 100644 index 0000000..28ca236 --- /dev/null +++ b/OfficeFlow/Pages/EmployeePages/NewUserPage.xaml @@ -0,0 +1,14 @@ + + + + + + diff --git a/OfficeFlow/Pages/EmployeePages/NewUserPage.xaml.cs b/OfficeFlow/Pages/EmployeePages/NewUserPage.xaml.cs new file mode 100644 index 0000000..fe0caa2 --- /dev/null +++ b/OfficeFlow/Pages/EmployeePages/NewUserPage.xaml.cs @@ -0,0 +1,28 @@ +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.Navigation; +using System.Windows.Shapes; + +namespace OfficeFlow.Pages.EmployeePages +{ + /// + /// Interaction logic for NewUserPage.xaml + /// + public partial class NewUserPage : Page + { + public NewUserPage() + { + InitializeComponent(); + } + } +} diff --git a/OfficeFlow/Pages/LoginPage.xaml b/OfficeFlow/Pages/LoginPage.xaml new file mode 100644 index 0000000..662e3d5 --- /dev/null +++ b/OfficeFlow/Pages/LoginPage.xaml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +