diff --git a/Magazyn_Client/.gitattributes b/Magazyn_Client/.gitattributes
new file mode 100644
index 0000000..1ff0c42
--- /dev/null
+++ b/Magazyn_Client/.gitattributes
@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln merge=binary
+#*.csproj merge=binary
+#*.vbproj merge=binary
+#*.vcxproj merge=binary
+#*.vcproj merge=binary
+#*.dbproj merge=binary
+#*.fsproj merge=binary
+#*.lsproj merge=binary
+#*.wixproj merge=binary
+#*.modelproj merge=binary
+#*.sqlproj merge=binary
+#*.wwaproj merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg binary
+#*.png binary
+#*.gif binary
+
+###############################################################################
+# diff behavior for common document formats
+#
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the
+# entries below.
+###############################################################################
+#*.doc diff=astextplain
+#*.DOC diff=astextplain
+#*.docx diff=astextplain
+#*.DOCX diff=astextplain
+#*.dot diff=astextplain
+#*.DOT diff=astextplain
+#*.pdf diff=astextplain
+#*.PDF diff=astextplain
+#*.rtf diff=astextplain
+#*.RTF diff=astextplain
diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml b/Magazyn_Client/Magazyn/MainWindow.xaml
index 9849de2..03b31a6 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml
@@ -1,31 +1,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml.cs b/Magazyn_Client/Magazyn/MainWindow.xaml.cs
index 5cc8b41..342760b 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml.cs
@@ -25,7 +25,6 @@ namespace Magazyn
{
public partial class MainWindow : Window
{
-
public int size = 4;
public int page = 0;
@@ -37,12 +36,8 @@ namespace Magazyn
public MainWindow()
{
InitializeComponent();
- this.Initialized += MainWindow_Initialized;
- themeCombo.Items.Add("Jasno/Niebieski");
- themeCombo.Items.Add("Jasno/Zielony");
- themeCombo.Items.Add("Ciemno/Pomarańczowy");
- themeCombo.SelectedIndex = 0;
-
+ this.Initialized += MainWindow_Initialized; ;
+
client = new HttpClient();
}
@@ -158,11 +153,7 @@ namespace Magazyn
RefreshListOfFruits();
}
- private void themeCombo_SelectionChanged(object sender, SelectionChangedEventArgs e)
- {
- var app = App.Current as App;
- app.ChangeTheme(themeCombo.SelectedIndex);
- }
- }
+
+ }
}
diff --git a/Magazyn_Client/Magazyn/Views/FruitView.xaml b/Magazyn_Client/Magazyn/Views/FruitView.xaml
index a6abfc0..681178d 100644
--- a/Magazyn_Client/Magazyn/Views/FruitView.xaml
+++ b/Magazyn_Client/Magazyn/Views/FruitView.xaml
@@ -6,34 +6,21 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Magazyn.Views"
- mc:Ignorable="d" Height="64" Width="520">
+
+ mc:Ignorable="d" Height="64" Width="575.45">
-
+
-
-
-
+
+
+
-
-
+
+
-
-
+
diff --git a/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs b/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
index c5759c2..653e228 100644
--- a/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
+++ b/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
@@ -37,8 +37,8 @@ namespace Magazyn.Views
fruitName.Text = fruit.Name;
fruitAmount.Text = fruit.Quantity.ToString();
- fruitPrice.Text = fruit.Price.ToString();
- allPrice.Text = (fruit.Quantity * fruit.Price).ToString();
+ fruitPrice.Text = fruit.Price.ToString() + "zł";
+ allPrice.Text = (fruit.Quantity * fruit.Price).ToString() + "zł";
try
{
diff --git a/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml
index ef49a77..1929361 100644
--- a/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml
@@ -1,23 +1,23 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs
index fc75bc0..699c897 100644
--- a/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs
@@ -1,33 +1,33 @@
-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.Shapes;
-
-namespace Magazyn.Windows
-{
- ///
- /// Interaction logic for ErrorWindow.xaml
- ///
- public partial class ErrorWindow : Window
- {
- public ErrorWindow(string text)
- {
- InitializeComponent();
- messageBlock.Text = text;
- }
-
- private void okButton_Click(object sender, RoutedEventArgs e)
- {
- this.Close();
- }
- }
-}
+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.Shapes;
+
+namespace Magazyn.Windows
+{
+ ///
+ /// Interaction logic for ErrorWindow.xaml
+ ///
+ public partial class ErrorWindow : Window
+ {
+ public ErrorWindow(string text)
+ {
+ InitializeComponent();
+ messageBlock.Text = text;
+ }
+
+ private void okButton_Click(object sender, RoutedEventArgs e)
+ {
+ this.Close();
+ }
+ }
+}
diff --git a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
index cd8524e..47ce2ae 100644
--- a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
@@ -1,25 +1,25 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs
index 79c8666..11b771e 100644
--- a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs
@@ -1,33 +1,33 @@
-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.Shapes;
-
-namespace Magazyn.Windows
-{
- ///
- /// Interaction logic for ValueWindow.xaml
- ///
- public partial class ValueWindow : Window
- {
- public ValueWindow(float value)
- {
- InitializeComponent();
- valueBlock.Text = value.ToString() + " zł";
- }
-
- private void okButton_Click(object sender, RoutedEventArgs e)
- {
- this.Close();
- }
- }
-}
+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.Shapes;
+
+namespace Magazyn.Windows
+{
+ ///
+ /// Interaction logic for ValueWindow.xaml
+ ///
+ public partial class ValueWindow : Window
+ {
+ public ValueWindow(float value)
+ {
+ InitializeComponent();
+ valueBlock.Text = value.ToString() + " zł";
+ }
+
+ private void okButton_Click(object sender, RoutedEventArgs e)
+ {
+ this.Close();
+ }
+ }
+}