mod2

mknight9090 · Oct 5, 2015 · d8f6222 · d8f6222
1 parent ac88623
commit d8f6222
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 6 deletions.
diff --git a/RestaurantManager.UniversalWindows/App.xaml b/RestaurantManager.UniversalWindows/App.xaml
@@ -15,4 +15,4 @@
             <Setter Property="FontSize" Value="32" />
         </Style>
     </Application.Resources>
-</Application>
+</Application>
diff --git a/RestaurantManager.UniversalWindows/ExpeditePage.xaml b/RestaurantManager.UniversalWindows/ExpeditePage.xaml
@@ -22,7 +22,16 @@
         </Grid.ColumnDefinitions>
         <TextBlock Text="Special Request:" Grid.Column="1" Grid.Row="1"/>
         <TextBlock Text="Order Items:" Grid.Column="2" Grid.Row="1" />
-        <TextBlock Text="**Add to Order**" Grid.Column="0" Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-        <TextBlock Text="**Sumbit Order**" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        <Button Content="Add to Order" Grid.Column="0" Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        <Button Content="Sumbit Order" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        <ListView  Grid.Column="0" Grid.Row="2" />
+        <ListView  Grid.Column="2" Grid.Row="2" />
+        <AppBar Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <AppBarButton Icon="Home" Label="Home" Click="AppBarButton_Click"/>
+            </StackPanel>
+        </AppBar>
+
     </Grid>
+
 </Page>
diff --git a/RestaurantManager.UniversalWindows/ExpeditePage.xaml.cs b/RestaurantManager.UniversalWindows/ExpeditePage.xaml.cs
@@ -26,5 +26,10 @@ public ExpeditePage()
         {
             this.InitializeComponent();
         }
+
+        private void AppBarButton_Click(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(MainPage));
+        }
     }
 }
diff --git a/RestaurantManager.UniversalWindows/MainPage.xaml b/RestaurantManager.UniversalWindows/MainPage.xaml
@@ -19,8 +19,8 @@
         </Grid.ColumnDefinitions>
         <TextBlock Text="Internal Test Version" Grid.Row="1" HorizontalAlignment="Center" Grid.ColumnSpan="2" VerticalAlignment="Bottom" FontSize="29.333"/>
         <TextBlock Text="Restaurant Manager" Grid.Row="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Bottom" FontSize="42.667" />
-        <TextBlock Text="**Go To Orders View**" Grid.Row="2" FontSize="42.667" HorizontalAlignment="Center" VerticalAlignment="Center" />
-        <TextBlock Text="**Submit Order**" Grid.Row="2" Grid.Column="1" FontSize="42.667" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        <Button x:Name="btnGTOV" Content="Go To Orders View" Grid.Row="2"  HorizontalAlignment="Center" VerticalAlignment="Center" Click="btnGTOV_Click"  />
+        <Button x:Name="btnSO" Content="Submit Order" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Click="btnSO_Click"/>
 
     </Grid>
 </Page>
diff --git a/RestaurantManager.UniversalWindows/MainPage.xaml.cs b/RestaurantManager.UniversalWindows/MainPage.xaml.cs
@@ -26,5 +26,15 @@ public MainPage()
         {
             this.InitializeComponent();
         }
+
+        private void btnGTOV_Click(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(ExpeditePage));
+        }
+
+        private void btnSO_Click(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(OrderPage));
+        }
     }
 }
diff --git a/RestaurantManager.UniversalWindows/OrderPage.xaml b/RestaurantManager.UniversalWindows/OrderPage.xaml
@@ -12,6 +12,12 @@
             <RowDefinition Height="0.9*" />
             <RowDefinition Height="0.1*" />
         </Grid.RowDefinitions>
-        <TextBlock Text="**Clear All Orders**" Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        <Button Content="Clear All Orders" Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        <GridView Grid.Row="0"/>
+        <AppBar>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <AppBarButton Icon="Home" Label="Home" Click="AppBarButton_Click"/>
+            </StackPanel>
+        </AppBar>
     </Grid>
 </Page>
diff --git a/RestaurantManager.UniversalWindows/OrderPage.xaml.cs b/RestaurantManager.UniversalWindows/OrderPage.xaml.cs
@@ -26,5 +26,10 @@ public OrderPage()
         {
             this.InitializeComponent();
         }
+
+        private void AppBarButton_Click(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(MainPage));
+        }
     }
 }