Skip to content
This repository has been archived by the owner on Apr 22, 2021. It is now read-only.

Commit

Permalink
Added place holders for each gui element with basic button navigation
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Helin committed Mar 10, 2018
1 parent c6f668d commit 829ddfc
Show file tree
Hide file tree
Showing 25 changed files with 399 additions and 51 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -5,3 +5,6 @@ package-lock.json
/Driver
/TgimbaWpfClient/obj/Debug
/TgimbaWpfClient/bin/Debug
/Tests/obj/Debug
/Shared/obj/Debug
/Daily/obj/Debug
4 changes: 4 additions & 0 deletions Driver/Driver.csproj
Expand Up @@ -51,6 +51,10 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Daily\Prices.csproj">
<Project>{eab7d64a-b6ef-4996-b348-6965c60c78de}</Project>
<Name>Prices</Name>
</ProjectReference>
<ProjectReference Include="..\Shared\Shared.csproj">
<Project>{cf111be2-fe73-4ac4-8188-fd839737ac12}</Project>
<Name>Shared</Name>
Expand Down
22 changes: 15 additions & 7 deletions TgimbaWpfClient/MainWindow.xaml
Expand Up @@ -4,14 +4,22 @@
xmlns:v="clr-namespace:TgimbaWpfClient.Views"
xmlns:vm="clr-namespace:TgimbaWpfClient.ViewModels"
xmlns:local="clr-namespace:TgimbaWpfClient"
Title="MainWindow" Height="350" Width="525"
Title="TGIMBA" Height="550" Width="525"
xmlns:myUserControls="clr-namespace:TgimbaWpfClient.Views">


<Grid>

<myUserControls:LoginView Visibility="Visible" x:Name="ucLogin" />
<myUserControls:BucketListView Visibility="Hidden" x:Name="ucBucketList"/>

<myUserControls:AddEditView Visibility="Hidden" x:Name="ucAditEdit"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
<myUserControls:BucketListView Visibility="Hidden" x:Name="ucBucketList"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
<myUserControls:LoginView Visibility="Visible" x:Name="ucLogin"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
<myUserControls:MenuView Visibility="Hidden" x:Name="ucMenu"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
<myUserControls:RegistrationView Visibility="Hidden" x:Name="ucRegistration"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
<myUserControls:SearchEntryView Visibility="Hidden" x:Name="ucSearchEntry"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
<myUserControls:SearchResultsView Visibility="Hidden" x:Name="ucSearchResults"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
</Grid>
</Window>
55 changes: 30 additions & 25 deletions TgimbaWpfClient/MainWindow.xaml.cs
@@ -1,48 +1,53 @@
using System.Windows;
using Shared.Interfaces;
using CommonServiceCode;
using TgimbaWpfClient;

namespace TgimbaWpfClient
{
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
{
public static MainWindow Instance;

public MainWindow()
{
InitializeComponent();
//Test();
Instance = this;
}
public static MainWindow Instance;

private void Test()
{
ITgimbaService service = new TgimbaService();
var result = service.GetDashboard();
int test = 1;
var tesft = ucBucketList.ActualHeight;
}

public void SetCurrentPanel(UseControls userControl)
{
HideAllUserControls();

if (userControl == UseControls.Login)
{
ucLogin.Visibility = Visibility.Visible;
}
else if (userControl == UseControls.BucketList)
{
ucBucketList.Visibility = Visibility.Visible;
switch (userControl) {
case UseControls.AddEdit:
ucAditEdit.Visibility = Visibility.Visible;
break;
case UseControls.BucketList:
ucBucketList.Visibility = Visibility.Visible;
break;
case UseControls.Menu:
ucMenu.Visibility = Visibility.Visible;
break;
case UseControls.Registration:
ucRegistration.Visibility = Visibility.Visible;
break;
case UseControls.SearchEntry:
ucSearchEntry.Visibility = Visibility.Visible;
break;
case UseControls.SeachResults:
ucSearchResults.Visibility = Visibility.Visible;
break;
default:
ucLogin.Visibility = Visibility.Visible;
break;
}
}

private void HideAllUserControls() {
ucLogin.Visibility = Visibility.Hidden;
ucAditEdit.Visibility = Visibility.Hidden;
ucBucketList.Visibility = Visibility.Hidden;
ucLogin.Visibility = Visibility.Hidden;
ucMenu.Visibility = Visibility.Hidden;
ucRegistration.Visibility = Visibility.Hidden;
ucSearchEntry.Visibility = Visibility.Hidden;
ucSearchResults.Visibility = Visibility.Hidden;
}
}
}
2 changes: 1 addition & 1 deletion TgimbaWpfClient/TgimbaEnum.cs
@@ -1,4 +1,4 @@
namespace TgimbaWpfClient
{
public enum UseControls { Login, BucketList };
public enum UseControls { AddEdit, BucketList, Login, Menu, Registration, SearchEntry, SeachResults };
}
40 changes: 40 additions & 0 deletions TgimbaWpfClient/TgimbaWpfClient.csproj
Expand Up @@ -56,13 +56,33 @@
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="TgimbaEnum.cs" />
<Compile Include="ViewModels\AddEditModel.cs" />
<Compile Include="ViewModels\MainWindowViewModel.cs" />
<Compile Include="ViewModels\MenuModel.cs" />
<Compile Include="ViewModels\RegistrationModel.cs" />
<Compile Include="ViewModels\SearchEntryModel.cs" />
<Compile Include="ViewModels\SearchResultsModel.cs" />
<Compile Include="Views\AddEditView.xaml.cs">
<DependentUpon>AddEditView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\BucketListView.xaml.cs">
<DependentUpon>BucketListView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\LoginView.xaml.cs">
<DependentUpon>LoginView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\MenuView.xaml.cs">
<DependentUpon>MenuView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\RegistrationView.xaml.cs">
<DependentUpon>RegistrationView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\SearchEntryView.xaml.cs">
<DependentUpon>SearchEntryView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\SearchResultsView.xaml.cs">
<DependentUpon>SearchResultsView.xaml</DependentUpon>
</Compile>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand All @@ -77,6 +97,10 @@
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="Views\AddEditView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\BucketListView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand All @@ -85,6 +109,22 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\MenuView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\RegistrationView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\SearchEntryView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\SearchResultsView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
Expand Down
12 changes: 12 additions & 0 deletions TgimbaWpfClient/ViewModels/AddEditModel.cs
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace TgimbaWpfClient.ViewModels
{
class AddEditModel
{
}
}
12 changes: 12 additions & 0 deletions TgimbaWpfClient/ViewModels/MenuModel.cs
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace TgimbaWpfClient.ViewModels
{
class MenuModel
{
}
}
12 changes: 12 additions & 0 deletions TgimbaWpfClient/ViewModels/RegistrationModel.cs
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace TgimbaWpfClient.ViewModels
{
class RegistrationModel
{
}
}
12 changes: 12 additions & 0 deletions TgimbaWpfClient/ViewModels/SearchEntryModel.cs
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace TgimbaWpfClient.ViewModels
{
class SearchEntryModel
{
}
}
12 changes: 12 additions & 0 deletions TgimbaWpfClient/ViewModels/SearchResultsModel.cs
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace TgimbaWpfClient.ViewModels
{
class SearchResultsModel
{
}
}
17 changes: 17 additions & 0 deletions TgimbaWpfClient/Views/AddEditView.xaml
@@ -0,0 +1,17 @@
<UserControl x:Class="TgimbaWpfClient.Views.AddEditView"
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:TgimbaWpfClient.Views"
>
<Grid>
<TextBlock x:Name="textBlock"
Height="46" Margin="40,10,50,134" TextWrapping="Wrap" Text="AddEdit View" Width="96" TextAlignment="Center"/>
<Button x:Name="btnSubmit" Content="Submit" Margin="51,89,60,77"
Height="24" Width="75" Click="btnSubmit_Click"/>
<Button x:Name="btnCancel" Content="Cancel" Margin="51,127,60,39"
Height="24" Width="75" Click="btnCancel_Click"/>

</Grid>
</UserControl>
25 changes: 25 additions & 0 deletions TgimbaWpfClient/Views/AddEditView.xaml.cs
@@ -0,0 +1,25 @@
using System.Windows.Controls;

namespace TgimbaWpfClient.Views
{
/// <summary>
/// Interaction logic for AddEdit.xaml
/// </summary>
public partial class AddEditView : UserControl
{
public AddEditView()
{
InitializeComponent();
}

private void btnSubmit_Click(object sender, System.Windows.RoutedEventArgs e)
{
MainWindow.Instance.SetCurrentPanel(UseControls.BucketList);
}

private void btnCancel_Click(object sender, System.Windows.RoutedEventArgs e)
{
MainWindow.Instance.SetCurrentPanel(UseControls.BucketList);
}
}
}
11 changes: 5 additions & 6 deletions TgimbaWpfClient/Views/BucketListView.xaml
Expand Up @@ -3,13 +3,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:TgimbaWpfClient.Views"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
xmlns:local="clr-namespace:TgimbaWpfClient.Views">
<Grid>
<TextBlock x:Name="textBlock" HorizontalAlignment="Left"
Height="46" Margin="89,82,0,0" TextWrapping="Wrap" Text="Bucket List View" VerticalAlignment="Top" Width="96" TextAlignment="Center"/>
<Button x:Name="button" Content="Button" HorizontalAlignment="Left" Margin="89,166,0,0" VerticalAlignment="Top" Width="75" Click="button_Click"/>
<TextBlock x:Name="textBlock"
Height="46" Margin="40,66,50,78" TextWrapping="Wrap" Text="Bucket List View" Width="96" TextAlignment="Center"/>
<Button x:Name="button" Content="Menu" Margin="52,0,59,166"
Height="24" Width="75" Click="btnMenu_Click"/>

</Grid>
</UserControl>
4 changes: 2 additions & 2 deletions TgimbaWpfClient/Views/BucketListView.xaml.cs
Expand Up @@ -26,9 +26,9 @@ public BucketListView()
InitializeComponent();
}

private void button_Click(object sender, RoutedEventArgs e)
private void btnMenu_Click(object sender, RoutedEventArgs e)
{
MainWindow.Instance.SetCurrentPanel(UseControls.Login);
MainWindow.Instance.SetCurrentPanel(UseControls.Menu);
}
}
}
13 changes: 8 additions & 5 deletions TgimbaWpfClient/Views/LoginView.xaml
Expand Up @@ -4,11 +4,14 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:TgimbaWpfClient.Views"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<Grid>
<TextBlock x:Name="textBlock" HorizontalAlignment="Left" Height="61" Margin="80,53,0,0" TextAlignment="Center" TextWrapping="Wrap" Text="Login View" VerticalAlignment="Top" Width="144"/>
<Button x:Name="button" Content="Login" HorizontalAlignment="Left" Height="24" Margin="120,90,0,0" VerticalAlignment="Top" Width="71" Click="button_Click"/>
>
<Grid Height="211">
<TextBox x:Name="tbUserName" Height="23" Margin="37,10,34,172" TextWrapping="Wrap" Text="UserName" Width="120"/>
<TextBox x:Name="tbPassword" Height="23" Margin="37,38,34,144" TextWrapping="Wrap" Text="Password" Width="120"/>
<Button x:Name="btnLogin" Content="Login" Height="24"
Margin="63,89,57,92" Width="71" Click="btnLogin_Click"/>
<Button x:Name="btnRegistration" Content="Registration"
Height="24" Margin="63,127,57,54" Width="71" Click="btnRegister_Click"/>

</Grid>
</UserControl>
11 changes: 6 additions & 5 deletions TgimbaWpfClient/Views/LoginView.xaml.cs
@@ -1,22 +1,23 @@
using System.Windows;
using System.Windows.Controls;
using TgimbaWpfClient;

namespace TgimbaWpfClient.Views
{
/// <summary>
/// Interaction logic for LoginView.xaml
/// </summary>
public partial class LoginView : UserControl
{
public LoginView()
{
InitializeComponent();
}

private void button_Click(object sender, RoutedEventArgs e)
private void btnLogin_Click(object sender, RoutedEventArgs e)
{
MainWindow.Instance.SetCurrentPanel(UseControls.BucketList);
}

private void btnRegister_Click(object sender, RoutedEventArgs e)
{
MainWindow.Instance.SetCurrentPanel(UseControls.Registration);
}
}
}

0 comments on commit 829ddfc

Please sign in to comment.