admin/bodyshop-uploader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed project.

Browse Source
This commit is contained in:
Patrick Fic
2020-05-27 08:59:48 -07:00
parent 75739656c4
commit a8a8998250
44 changed files with 106 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BodyshopUploader.sln
View File

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BodyshopUploader", "BodyshopUploader\BodyshopUploader.csproj", "{76B98E9B-A33A-464F-A07B-56E773376543}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BodyshopPartner", "BodyshopUploader\BodyshopPartner.csproj", "{76B98E9B-A33A-464F-A07B-56E773376543}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

6
BodyshopUploader/App.config
View File

@@ -2,7 +2,7 @@
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="BodyshopUploader.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="BodyshopPartner.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
@@ -33,7 +33,7 @@
</assemblyBinding>
</runtime>
<userSettings>
<BodyshopUploader.Properties.Settings>
<BodyshopPartner.Properties.Settings>
<setting name="Username" serializeAs="String">
<value />
</setting>
@@ -46,6 +46,6 @@
<setting name="AutoStartMonitor" serializeAs="String">
<value>True</value>
</setting>
</BodyshopUploader.Properties.Settings>
</BodyshopPartner.Properties.Settings>
</userSettings>
</configuration>

4
BodyshopUploader/App.xaml
View File

@@ -1,7 +1,7 @@
<Application x:Class="BodyshopUploader.App"
<Application x:Class="BodyshopPartner.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:BodyshopUploader"
xmlns:local="clr-namespace:BodyshopPartner"
ShutdownMode="OnExplicitShutdown"
StartupUri="Views\Login.xaml">
<Application.Resources>

2
BodyshopUploader/App.xaml.cs
View File

@@ -6,7 +6,7 @@ using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace BodyshopUploader
namespace BodyshopPartner
{
/// <summary>
/// Interaction logic for App.xaml

4
BodyshopUploader/BodyshopUploader.csproj → BodyshopUploader/BodyshopPartner.csproj
View File

@@ -7,8 +7,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{76B98E9B-A33A-464F-A07B-56E773376543}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>BodyshopUploader</RootNamespace>
<AssemblyName>BodyshopUploader</AssemblyName>
<RootNamespace>BodyshopPartner</RootNamespace>
<AssemblyName>BodyshopPartner</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

2
BodyshopUploader/Models/Bodyshop.cs
View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Models
namespace BodyshopPartner.Models
{
[JsonConverter(typeof(Utils.JsonPathConverter))]
public class Bodyshop : DTO_Base

2
BodyshopUploader/Models/DTO_Base.cs
View File

@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Models
namespace BodyshopPartner.Models
{
public abstract class DTO_Base : INotifyPropertyChanged
{

4
BodyshopUploader/Models/DTO_QueueItem.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader
namespace BodyshopPartner
{
public enum SourceSystem
{
@@ -14,7 +14,7 @@ namespace BodyshopUploader
}
}
namespace BodyshopUploader.Models
namespace BodyshopPartner.Models
{
public class DTO_QueueItem : DTO_Base
{

2
BodyshopUploader/Models/Monitor.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Models
namespace BodyshopPartner.Models
{
public class Monitor : DTO_Base
{

4
BodyshopUploader/Properties/AssemblyInfo.cs
View File

@@ -7,11 +7,11 @@ using System.Windows;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("BodyshopUploader")]
[assembly: AssemblyTitle("BodyshopPartner")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Snapt Software Inc.")]
[assembly: AssemblyProduct("BodyshopUploader")]
[assembly: AssemblyProduct("BodyshopPartner")]
[assembly: AssemblyCopyright("Copyright © Snapt Software Inc. 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

4
BodyshopUploader/Properties/Resources.Designer.cs generated
View File

@@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace BodyshopUploader.Properties {
namespace BodyshopPartner.Properties {
using System;
@@ -39,7 +39,7 @@ namespace BodyshopUploader.Properties {
public static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BodyshopUploader.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BodyshopPartner.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

2
BodyshopUploader/Properties/Settings.Designer.cs generated
View File

@@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace BodyshopUploader.Properties {
namespace BodyshopPartner.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

2
BodyshopUploader/Properties/Settings.settings
View File

@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="BodyshopUploader.Properties" GeneratedClassName="Settings">
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="BodyshopPartner.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>
<Setting Name="Username" Type="System.String" Scope="User">

2
BodyshopUploader/Utils/AppMetaData.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Utils
namespace BodyshopPartner.Utils
{
public static class AppMetaData
{

2
BodyshopUploader/Utils/ApplicationExceptionHandler.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Utils
namespace BodyshopPartner.Utils
{
public static class ApplicationExceptionHandler
{

7
BodyshopUploader/Utils/Auth.cs
View File

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
using Firebase.Auth;
using System.Timers;
namespace BodyshopUploader.Utils
namespace BodyshopPartner.Utils
{
public static class Auth
{
@@ -25,9 +25,8 @@ namespace BodyshopUploader.Utils
{
authlink = await ap.SignInWithEmailAndPasswordAsync(Username, Password);
authlink.FirebaseAuthRefreshed += Authlink_FirebaseAuthRefreshed;
logger.Trace("Firebase Auth Token {0}.", authlink.FirebaseToken);
logger.Trace("Firebase Refresh Token {0}.", authlink.RefreshToken);
logger.Trace("Firebase Auth Token expires in {0} seconds.", authlink.ExpiresIn);
tokenTimer.Interval = (authlink.ExpiresIn - 600) * 1000; //Set the token to refresh 10 minutes before it has to.
logger.Trace("Refresh timer interval set to {0}ms", (authlink.ExpiresIn - 600) * 1000);
@@ -81,7 +80,7 @@ namespace BodyshopUploader.Utils
//Gotta do some stuff now that i got a new token!
//Maybe the token auto refreshes?
logger.Info("Timer Old Token {0}", authlink.FirebaseToken);
authlink = await ap.SignInWithEmailAndPasswordAsync(U, P);
authlink = await authlink.GetFreshAuthAsync();
logger.Info("new Token {0}", authlink.FirebaseToken);
tokenTimer.Stop();
tokenTimer.Interval = (authlink.ExpiresIn - 600) * 1000; //Set the token to refresh 10 minutes before it has to.

2
BodyshopUploader/Utils/BaseModel.cs
View File

@@ -3,7 +3,7 @@ using System.ComponentModel;
using System.Runtime.CompilerServices;
namespace BodyshopUploader
namespace BodyshopPartner
{
public class BaseModel : INotifyPropertyChanged
{

2
BodyshopUploader/Utils/BaseViewModel.cs
View File

@@ -2,7 +2,7 @@
using System.ComponentModel;
using System.Runtime.CompilerServices;
namespace BodyshopUploader
namespace BodyshopPartner
{
public abstract class BaseViewModel : INotifyPropertyChanged
{

4
BodyshopUploader/Utils/CIECAMonitor.cs
View File

@@ -4,9 +4,9 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BodyshopUploader.Models;
using BodyshopPartner.Models;
namespace BodyshopUploader.Utils
namespace BodyshopPartner.Utils
{
public class CIECAMonitor : FileSystemWatcher
{

2
BodyshopUploader/Utils/Decoder/EstimateDecoder.cs
View File

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
using DotNetDBF;
using Newtonsoft.Json.Linq;
namespace BodyshopUploader.Utils.Decoder
namespace BodyshopPartner.Utils.Decoder
{
class EstimateDecoder
{

2
BodyshopUploader/Utils/GraphQL.cs
View File

@@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Utils
namespace BodyshopPartner.Utils
{
public static class GraphQL
{

6
BodyshopUploader/Utils/Growls/GrowlNotification.xaml
View File

@@ -1,9 +1,9 @@
<Window x:Class="BodyshopUploader.Utils.Growls.GrowlNotification"
<Window x:Class="BodyshopPartner.Utils.Growls.GrowlNotification"
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:BodyshopUploader.Utils.Growls"
xmlns:local="clr-namespace:BodyshopPartner.Utils.Growls"
mc:Ignorable="d"
SizeToContent="WidthAndHeight"
AllowsTransparency="True"
@@ -11,7 +11,7 @@
ShowInTaskbar="False"
Topmost="True"
UseLayoutRounding="True"
Title="BodyshopUploader Notification"
Title="BodyshopPartner Notification"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
TextElement.FontWeight="Regular"

2
BodyshopUploader/Utils/Growls/GrowlNotification.xaml.cs
View File

@@ -15,7 +15,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace BodyshopUploader.Utils.Growls
namespace BodyshopPartner.Utils.Growls
{
public partial class GrowlNotification
{

2
BodyshopUploader/Utils/Growls/Notification.cs
View File

@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Utils.Growls
namespace BodyshopPartner.Utils.Growls
{
public class Notification : INotifyPropertyChanged
{

8
BodyshopUploader/Utils/JobProcessingQueue.cs
View File

@@ -5,13 +5,13 @@ using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using BodyshopUploader.Utils;
using BodyshopUploader.Models;
using BodyshopUploader.Utils.Growls;
using BodyshopPartner.Utils;
using BodyshopPartner.Models;
using BodyshopPartner.Utils.Growls;
using GraphQL.Common.Request;
using Newtonsoft.Json.Linq;
namespace BodyshopUploader.Utils
namespace BodyshopPartner.Utils
{
public static class JobProcessingQueue
{

2
BodyshopUploader/Utils/JsonConverter.cs
View File

@@ -7,7 +7,7 @@ using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Utils
namespace BodyshopPartner.Utils
{
class JsonPathConverter : JsonConverter
{

2
BodyshopUploader/Utils/JsonExtensions.cs
View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Utils
namespace BodyshopPartner.Utils
{
public static class JsonExtensions
{

2
BodyshopUploader/Utils/LoginHelpers.cs
View File

@@ -6,7 +6,7 @@ using System.Security;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Utils
namespace BodyshopPartner.Utils
{
public static class LoginHelpers
{

2
BodyshopUploader/Utils/Queries/JobsQueries.cs
View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Utils.Queries
namespace BodyshopPartner.Utils.Queries
{
class JobsQueries
{

2
BodyshopUploader/Utils/Queries/VehicleQueries.cs
View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Utils.Queries
namespace BodyshopPartner.Utils.Queries
{
public static class VehicleQueries
{

2
BodyshopUploader/Utils/RelayCommand.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Windows.Input;
namespace BodyshopUploader
namespace BodyshopPartner
{
public class RelayCommand : ICommand
{

2
BodyshopUploader/Utils/TrayIcon.cs
View File

@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace BodyshopUploader.Utils
namespace BodyshopPartner.Utils
{
public class OpenMainWindowCommand : ICommand
{

2
BodyshopUploader/Utils/UiConverters.cs
View File

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
using System.Windows;
using System.Windows.Data;
namespace BodyshopUploader.Utils
namespace BodyshopPartner.Utils
{
public class BoolVisibilityConverter : IValueConverter
{

2
BodyshopUploader/Utils/UpdateHandler.cs
View File

@@ -8,7 +8,7 @@ using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.Utils
namespace BodyshopPartner.Utils
{
public static class UpdateHandler
{

2
BodyshopUploader/ViewModels/LoginViewModel.commands.cs
View File

@@ -2,7 +2,7 @@
using System.Windows;
using System.Windows.Input;
namespace BodyshopUploader.ViewModels
namespace BodyshopPartner.ViewModels
{
public partial class LoginViewModel : BaseViewModel
{

2
BodyshopUploader/ViewModels/LoginViewModel.cs
View File

@@ -6,7 +6,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows;
namespace BodyshopUploader.ViewModels
namespace BodyshopPartner.ViewModels
{
public partial class LoginViewModel : BaseViewModel
{

2
BodyshopUploader/ViewModels/LoginViewModel.props.cs
View File

@@ -6,7 +6,7 @@ using System.Security;
using System.Text;
using System.Threading.Tasks;
namespace BodyshopUploader.ViewModels
namespace BodyshopPartner.ViewModels
{
public partial class LoginViewModel : BaseViewModel
{

2
BodyshopUploader/ViewModels/MainViewModel.commands.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Windows.Input;
namespace BodyshopUploader.ViewModels
namespace BodyshopPartner.ViewModels
{
public partial class MainViewModel : BaseViewModel
{

70
BodyshopUploader/ViewModels/MainViewModel.cs
View File

@@ -1,5 +1,5 @@
using BodyshopUploader.Models;
using BodyshopUploader.Utils.Growls;
using BodyshopPartner.Models;
using BodyshopPartner.Utils.Growls;
using GraphQL.Client;
using GraphQL.Common.Request;
using Newtonsoft.Json;
@@ -12,8 +12,9 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using Firebase.Auth;
namespace BodyshopUploader.ViewModels
namespace BodyshopPartner.ViewModels
{
public partial class MainViewModel : BaseViewModel
{
@@ -81,7 +82,7 @@ namespace BodyshopUploader.ViewModels
private async void _updateTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
if(await Utils.UpdateHandler.AreUpdatesAvailable())
if (await Utils.UpdateHandler.AreUpdatesAvailable())
{
await Utils.UpdateHandler.ApplyUpdates(Progress, Progress);
}
@@ -212,6 +213,7 @@ namespace BodyshopUploader.ViewModels
IndeterminateLoading = false;
}
private FirebaseAuthLink al = BodyshopPartner.Utils.Auth.authlink;
public async Task TestGql()
{
//Notification _n = new Notification()
@@ -223,36 +225,40 @@ namespace BodyshopUploader.ViewModels
//};
//Growler.AddNotification(_n);
var r = new GraphQLRequest
{
Query = @"query MyQuery($key: String!) {
masterdata(where: {key: {_eq: $key}}) {
value
key
}
}",
Variables = new
{
key = Utils.AppMetaData.ShopRegion + "_ciecaopcodes"
}
};
var data = await Utils.GraphQL.ExecuteQuery(r);
//var t = Newtonsoft.Json.JsonConvert.DeserializeObject<List<dynamic>>(data.masterdata[0].value.Value);
Utils.AppMetaData.CiecaOpCodes = JObject.Parse(data.masterdata[0].value.Value);
Console.WriteLine(al.FirebaseToken);
FirebaseAuthLink t = await al.GetFreshAuthAsync();
Console.WriteLine(t.FirebaseToken);
try
{
var aa = Utils.AppMetaData.CiecaOpCodes.Property("OP1").Children();
var cc = Utils.AppMetaData.CiecaOpCodes["OP1"]["desc"].Value;
var ab = Utils.AppMetaData.CiecaOpCodes.Property("OP1.desc");
//var r = new GraphQLRequest
//{
// Query = @"query MyQuery($key: String!) {
// masterdata(where: {key: {_eq: $key}}) {
// value
// key
// }
// }",
// Variables = new
// {
// key = Utils.AppMetaData.ShopRegion + "_ciecaopcodes"
// }
//};
//var data = await Utils.GraphQL.ExecuteQuery(r);
////var t = Newtonsoft.Json.JsonConvert.DeserializeObject<List<dynamic>>(data.masterdata[0].value.Value);
//Utils.AppMetaData.CiecaOpCodes = JObject.Parse(data.masterdata[0].value.Value);
//try
//{
// var aa = Utils.AppMetaData.CiecaOpCodes.Property("OP1").Children();
// var cc = Utils.AppMetaData.CiecaOpCodes["OP1"]["desc"].Value;
// var ab = Utils.AppMetaData.CiecaOpCodes.Property("OP1.desc");
//}
//catch (Exception EX)
//{
// logger.Warn("Err");
//}
}
catch (Exception EX)
{
logger.Warn("Err");
}
}
}
}

6
BodyshopUploader/ViewModels/MainViewModel.props.cs
View File

@@ -4,10 +4,10 @@ using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BodyshopUploader.Utils.Growls;
using BodyshopUploader.Models;
using BodyshopPartner.Utils.Growls;
using BodyshopPartner.Models;
namespace BodyshopUploader.ViewModels
namespace BodyshopPartner.ViewModels
{
public partial class MainViewModel : BaseViewModel
{

10
BodyshopUploader/Views/Login.xaml
View File

@@ -1,16 +1,16 @@
<Window x:Class="BodyshopUploader.Views.Login"
<Window x:Class="BodyshopPartner.Views.Login"
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:BodyshopUploader.Views"
xmlns:vm="clr-namespace:BodyshopUploader.ViewModels"
xmlns:local="clr-namespace:BodyshopPartner.Views"
xmlns:vm="clr-namespace:BodyshopPartner.ViewModels"
mc:Ignorable="d"
Title="{x:Static p:Resources.Title_Login}"
Height="325"
Width="475"
xmlns:p="clr-namespace:BodyshopUploader.Properties"
xmlns:util="clr-namespace:BodyshopUploader.Utils"
xmlns:p="clr-namespace:BodyshopPartner.Properties"
xmlns:util="clr-namespace:BodyshopPartner.Utils"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
TextElement.FontWeight="Regular"

2
BodyshopUploader/Views/Login.xaml.cs
View File

@@ -13,7 +13,7 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace BodyshopUploader.Views
namespace BodyshopPartner.Views
{
/// <summary>
/// Interaction logic for Login.xaml

10
BodyshopUploader/Views/Main.xaml
View File

@@ -1,16 +1,16 @@
<Window x:Class="BodyshopUploader.Views.Main"
<Window x:Class="BodyshopPartner.Views.Main"
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:BodyshopUploader.Views"
xmlns:local="clr-namespace:BodyshopPartner.Views"
mc:Ignorable="d"
Title="{x:Static p:Resources.Title_Main}"
Height="450"
xmlns:vm="clr-namespace:BodyshopUploader.ViewModels"
xmlns:vm="clr-namespace:BodyshopPartner.ViewModels"
Width="800"
xmlns:tb="http://www.hardcodet.net/taskbar"
xmlns:p="clr-namespace:BodyshopUploader.Properties"
xmlns:p="clr-namespace:BodyshopPartner.Properties"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
TextElement.FontWeight="Regular"
@@ -20,7 +20,7 @@
Background="{DynamicResource MaterialDesignPaper}"
FontFamily="{DynamicResource MaterialDesignFont}"
Loaded="Window_Loaded"
xmlns:util="clr-namespace:BodyshopUploader.Utils"
xmlns:util="clr-namespace:BodyshopPartner.Utils"
Closing="Window_Closing">
<Window.DataContext>
<vm:MainViewModel />

2
BodyshopUploader/Views/Main.xaml.cs
View File

@@ -12,7 +12,7 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace BodyshopUploader.Views
namespace BodyshopPartner.Views
{
/// <summary>
/// Interaction logic for Main.xaml