diff --git a/BodyshopUploader/BodyshopUploader.csproj b/BodyshopUploader/BodyshopUploader.csproj
index e4ef107..7b7d84c 100644
--- a/BodyshopUploader/BodyshopUploader.csproj
+++ b/BodyshopUploader/BodyshopUploader.csproj
@@ -53,6 +53,9 @@
favicon.ico
+
+ ..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll
+
..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
@@ -99,6 +102,9 @@
+
+
+
Login.xaml
@@ -106,10 +112,17 @@
App.xaml
Code
+
+ Main.xaml
+
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
diff --git a/BodyshopUploader/ViewModels/LoginViewModel.commands.cs b/BodyshopUploader/ViewModels/LoginViewModel.commands.cs
index 2e38694..8f4e67f 100644
--- a/BodyshopUploader/ViewModels/LoginViewModel.commands.cs
+++ b/BodyshopUploader/ViewModels/LoginViewModel.commands.cs
@@ -5,18 +5,18 @@ namespace BodyshopUploader.ViewModels
{
public partial class LoginViewModel : BaseViewModel
{
- private ICommand _testCommand;
- public ICommand TestCommand
+ private ICommand _openMainCommand;
+ public ICommand OpenMainCommand
{
get
{
- if (_testCommand == null)
+ if (_openMainCommand == null)
{
- _testCommand = new RelayCommand(
+ _openMainCommand = new RelayCommand(
p => true,
- p => Console.WriteLine("Hi"));
+ p => { Views.Main m = new Views.Main(); m.Show(); });
}
- return _testCommand;
+ return _openMainCommand;
}
}
diff --git a/BodyshopUploader/ViewModels/MainViewModel.commands.cs b/BodyshopUploader/ViewModels/MainViewModel.commands.cs
new file mode 100644
index 0000000..92496db
--- /dev/null
+++ b/BodyshopUploader/ViewModels/MainViewModel.commands.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Windows.Input;
+
+namespace BodyshopUploader.ViewModels
+{
+ public partial class MainViewModel : BaseViewModel
+ {
+ private ICommand _testCommand;
+ public ICommand TestCommand
+ {
+ get
+ {
+ if (_testCommand == null)
+ {
+ _testCommand = new RelayCommand(
+ p => true,
+ p =>
+ {
+ logger.Info("test command clicked");
+ });
+ }
+ return _testCommand;
+ }
+ }
+ }
+}
diff --git a/BodyshopUploader/ViewModels/MainViewModel.cs b/BodyshopUploader/ViewModels/MainViewModel.cs
new file mode 100644
index 0000000..c7f2623
--- /dev/null
+++ b/BodyshopUploader/ViewModels/MainViewModel.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BodyshopUploader.ViewModels
+{
+ public partial class MainViewModel:BaseViewModel
+ {
+ private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+
+ public MainViewModel()
+ {
+ logger.Trace("Main VM Created.");
+ }
+ }
+}
diff --git a/BodyshopUploader/ViewModels/MainViewModel.props.cs b/BodyshopUploader/ViewModels/MainViewModel.props.cs
new file mode 100644
index 0000000..2d1e511
--- /dev/null
+++ b/BodyshopUploader/ViewModels/MainViewModel.props.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BodyshopUploader.ViewModels
+{
+ public partial class MainViewModel : BaseViewModel
+ {
+ private int _progress = 5;
+ public int Progress
+ {
+ get { return _progress; }
+ set { SetProperty(ref _progress, value); }
+ }
+ }
+}
diff --git a/BodyshopUploader/Views/Login.xaml b/BodyshopUploader/Views/Login.xaml
index a477826..53187f4 100644
--- a/BodyshopUploader/Views/Login.xaml
+++ b/BodyshopUploader/Views/Login.xaml
@@ -6,14 +6,18 @@
xmlns:local="clr-namespace:BodyshopUploader.Views"
xmlns:vm="clr-namespace:BodyshopUploader.ViewModels"
mc:Ignorable="d"
- Title="{x:Static p:Resources.Title_Login}" Height="450" Width="800"
- xmlns:p = "clr-namespace:BodyshopUploader.Properties">
+ Title="{x:Static p:Resources.Title_Login}"
+ Height="450"
+ Width="800"
+ xmlns:p="clr-namespace:BodyshopUploader.Properties">
-
+
+
diff --git a/BodyshopUploader/Views/Main.xaml b/BodyshopUploader/Views/Main.xaml
new file mode 100644
index 0000000..5b431c2
--- /dev/null
+++ b/BodyshopUploader/Views/Main.xaml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Main Window
+
+
+
+
+
diff --git a/BodyshopUploader/Views/Main.xaml.cs b/BodyshopUploader/Views/Main.xaml.cs
new file mode 100644
index 0000000..2f55e55
--- /dev/null
+++ b/BodyshopUploader/Views/Main.xaml.cs
@@ -0,0 +1,30 @@
+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 BodyshopUploader.Views
+{
+ ///
+ /// Interaction logic for Main.xaml
+ ///
+ public partial class Main : Window
+ {
+ public Main()
+ {
+ InitializeComponent();
+
+ }
+
+
+ }
+}
diff --git a/BodyshopUploader/packages.config b/BodyshopUploader/packages.config
index f49b2f6..8168088 100644
--- a/BodyshopUploader/packages.config
+++ b/BodyshopUploader/packages.config
@@ -1,5 +1,6 @@
+