diff --git a/BodyshopUploader.sln b/BodyshopUploader.sln index 2c90e6f..eb41d46 100644 --- a/BodyshopUploader.sln +++ b/BodyshopUploader.sln @@ -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 diff --git a/BodyshopUploader/App.config b/BodyshopUploader/App.config index c02d0a6..9c7497c 100644 --- a/BodyshopUploader/App.config +++ b/BodyshopUploader/App.config @@ -2,7 +2,7 @@ -
+
@@ -33,7 +33,7 @@ - + @@ -46,6 +46,6 @@ True - + \ No newline at end of file diff --git a/BodyshopUploader/App.xaml b/BodyshopUploader/App.xaml index a1b0cb1..2ae91cc 100644 --- a/BodyshopUploader/App.xaml +++ b/BodyshopUploader/App.xaml @@ -1,7 +1,7 @@ - diff --git a/BodyshopUploader/App.xaml.cs b/BodyshopUploader/App.xaml.cs index 4b1ec90..c02d01c 100644 --- a/BodyshopUploader/App.xaml.cs +++ b/BodyshopUploader/App.xaml.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; -namespace BodyshopUploader +namespace BodyshopPartner { /// /// Interaction logic for App.xaml diff --git a/BodyshopUploader/BodyshopUploader.csproj b/BodyshopUploader/BodyshopPartner.csproj similarity index 99% rename from BodyshopUploader/BodyshopUploader.csproj rename to BodyshopUploader/BodyshopPartner.csproj index 53a63f5..9f3d97a 100644 --- a/BodyshopUploader/BodyshopUploader.csproj +++ b/BodyshopUploader/BodyshopPartner.csproj @@ -7,8 +7,8 @@ AnyCPU {76B98E9B-A33A-464F-A07B-56E773376543} WinExe - BodyshopUploader - BodyshopUploader + BodyshopPartner + BodyshopPartner v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/BodyshopUploader/Models/Bodyshop.cs b/BodyshopUploader/Models/Bodyshop.cs index 441fe6f..aa6bc3b 100644 --- a/BodyshopUploader/Models/Bodyshop.cs +++ b/BodyshopUploader/Models/Bodyshop.cs @@ -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 diff --git a/BodyshopUploader/Models/DTO_Base.cs b/BodyshopUploader/Models/DTO_Base.cs index 06dc769..a240043 100644 --- a/BodyshopUploader/Models/DTO_Base.cs +++ b/BodyshopUploader/Models/DTO_Base.cs @@ -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 { diff --git a/BodyshopUploader/Models/DTO_QueueItem.cs b/BodyshopUploader/Models/DTO_QueueItem.cs index 1cfc6b0..d3b74db 100644 --- a/BodyshopUploader/Models/DTO_QueueItem.cs +++ b/BodyshopUploader/Models/DTO_QueueItem.cs @@ -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 { diff --git a/BodyshopUploader/Models/Monitor.cs b/BodyshopUploader/Models/Monitor.cs index 992a4c5..7120ed1 100644 --- a/BodyshopUploader/Models/Monitor.cs +++ b/BodyshopUploader/Models/Monitor.cs @@ -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 { diff --git a/BodyshopUploader/Properties/AssemblyInfo.cs b/BodyshopUploader/Properties/AssemblyInfo.cs index d934ffa..38f935c 100644 --- a/BodyshopUploader/Properties/AssemblyInfo.cs +++ b/BodyshopUploader/Properties/AssemblyInfo.cs @@ -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("")] diff --git a/BodyshopUploader/Properties/Resources.Designer.cs b/BodyshopUploader/Properties/Resources.Designer.cs index f867152..794886f 100644 --- a/BodyshopUploader/Properties/Resources.Designer.cs +++ b/BodyshopUploader/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -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; diff --git a/BodyshopUploader/Properties/Settings.Designer.cs b/BodyshopUploader/Properties/Settings.Designer.cs index 3b0ae13..8622a17 100644 --- a/BodyshopUploader/Properties/Settings.Designer.cs +++ b/BodyshopUploader/Properties/Settings.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace BodyshopUploader.Properties { +namespace BodyshopPartner.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] diff --git a/BodyshopUploader/Properties/Settings.settings b/BodyshopUploader/Properties/Settings.settings index 29c6021..daa64b3 100644 --- a/BodyshopUploader/Properties/Settings.settings +++ b/BodyshopUploader/Properties/Settings.settings @@ -1,5 +1,5 @@  - + diff --git a/BodyshopUploader/Utils/AppMetaData.cs b/BodyshopUploader/Utils/AppMetaData.cs index cc85f80..6bd78c4 100644 --- a/BodyshopUploader/Utils/AppMetaData.cs +++ b/BodyshopUploader/Utils/AppMetaData.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BodyshopUploader.Utils +namespace BodyshopPartner.Utils { public static class AppMetaData { diff --git a/BodyshopUploader/Utils/ApplicationExceptionHandler.cs b/BodyshopUploader/Utils/ApplicationExceptionHandler.cs index 1d41514..71ee5e7 100644 --- a/BodyshopUploader/Utils/ApplicationExceptionHandler.cs +++ b/BodyshopUploader/Utils/ApplicationExceptionHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BodyshopUploader.Utils +namespace BodyshopPartner.Utils { public static class ApplicationExceptionHandler { diff --git a/BodyshopUploader/Utils/Auth.cs b/BodyshopUploader/Utils/Auth.cs index 059211e..8898798 100644 --- a/BodyshopUploader/Utils/Auth.cs +++ b/BodyshopUploader/Utils/Auth.cs @@ -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. diff --git a/BodyshopUploader/Utils/BaseModel.cs b/BodyshopUploader/Utils/BaseModel.cs index 5e9134f..efa1215 100644 --- a/BodyshopUploader/Utils/BaseModel.cs +++ b/BodyshopUploader/Utils/BaseModel.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using System.Runtime.CompilerServices; -namespace BodyshopUploader +namespace BodyshopPartner { public class BaseModel : INotifyPropertyChanged { diff --git a/BodyshopUploader/Utils/BaseViewModel.cs b/BodyshopUploader/Utils/BaseViewModel.cs index 242a279..6a9c38b 100644 --- a/BodyshopUploader/Utils/BaseViewModel.cs +++ b/BodyshopUploader/Utils/BaseViewModel.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.Runtime.CompilerServices; -namespace BodyshopUploader +namespace BodyshopPartner { public abstract class BaseViewModel : INotifyPropertyChanged { diff --git a/BodyshopUploader/Utils/CIECAMonitor.cs b/BodyshopUploader/Utils/CIECAMonitor.cs index 0636592..e52a24e 100644 --- a/BodyshopUploader/Utils/CIECAMonitor.cs +++ b/BodyshopUploader/Utils/CIECAMonitor.cs @@ -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 { diff --git a/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs b/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs index d650820..03d5d49 100644 --- a/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs +++ b/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using DotNetDBF; using Newtonsoft.Json.Linq; -namespace BodyshopUploader.Utils.Decoder +namespace BodyshopPartner.Utils.Decoder { class EstimateDecoder { diff --git a/BodyshopUploader/Utils/GraphQL.cs b/BodyshopUploader/Utils/GraphQL.cs index 11e43e1..4156cdb 100644 --- a/BodyshopUploader/Utils/GraphQL.cs +++ b/BodyshopUploader/Utils/GraphQL.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BodyshopUploader.Utils +namespace BodyshopPartner.Utils { public static class GraphQL { diff --git a/BodyshopUploader/Utils/Growls/GrowlNotification.xaml b/BodyshopUploader/Utils/Growls/GrowlNotification.xaml index a83a28e..0d72771 100644 --- a/BodyshopUploader/Utils/Growls/GrowlNotification.xaml +++ b/BodyshopUploader/Utils/Growls/GrowlNotification.xaml @@ -1,9 +1,9 @@ ->(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>(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"); - } - } } } diff --git a/BodyshopUploader/ViewModels/MainViewModel.props.cs b/BodyshopUploader/ViewModels/MainViewModel.props.cs index c3745a9..27633ab 100644 --- a/BodyshopUploader/ViewModels/MainViewModel.props.cs +++ b/BodyshopUploader/ViewModels/MainViewModel.props.cs @@ -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 { diff --git a/BodyshopUploader/Views/Login.xaml b/BodyshopUploader/Views/Login.xaml index 8ba388b..c091e38 100644 --- a/BodyshopUploader/Views/Login.xaml +++ b/BodyshopUploader/Views/Login.xaml @@ -1,16 +1,16 @@ - /// Interaction logic for Login.xaml diff --git a/BodyshopUploader/Views/Main.xaml b/BodyshopUploader/Views/Main.xaml index 776eabe..98a0f2d 100644 --- a/BodyshopUploader/Views/Main.xaml +++ b/BodyshopUploader/Views/Main.xaml @@ -1,16 +1,16 @@ - diff --git a/BodyshopUploader/Views/Main.xaml.cs b/BodyshopUploader/Views/Main.xaml.cs index 5d34a73..a4c5c29 100644 --- a/BodyshopUploader/Views/Main.xaml.cs +++ b/BodyshopUploader/Views/Main.xaml.cs @@ -12,7 +12,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; -namespace BodyshopUploader.Views +namespace BodyshopPartner.Views { /// /// Interaction logic for Main.xaml