From da7f2f2709e0a70f02942e752050515082cfb81b Mon Sep 17 00:00:00 2001 From: Giovani Date: Tue, 20 Jul 2021 14:54:11 -0400 Subject: [PATCH] wip: finish converting some more projects --- .../App.config | 66 ---- ...abitica.Todoist.Integration.Console.csproj | 342 ------------------ .../Program.cs | 65 ---- .../Properties/AssemblyInfo.cs | 36 -- .../packages.config | 90 ----- .../Habitica.Todoist.Integration.Data.csproj | 11 - .../Habitica.Todoist.Integration.Model.csproj | 12 - .../Habitica/Enums/ScoreAction.cs | 12 - .../Habitica/Enums/TaskType.cs | 14 - .../Storage/Enums/TodoAction.cs | 14 - .../Storage/Enums/TodoApp.cs | 12 - ...bitica.Todoist.Integration.Services.csproj | 16 - Habitica.Todoist.Integration.sln | 61 ---- Habittodo.Console/Habittodo.Console.csproj | 11 + Habittodo.Console/Program.cs | 50 ++- Habittodo.Data/Habittodo.Data.csproj | 11 + .../TableStorageClient.cs | 2 +- .../Habitica/ChecklistItem.cs | 5 +- Habittodo.Model/Habitica/Enums/ScoreAction.cs | 8 + Habittodo.Model/Habitica/Enums/TaskType.cs | 10 + .../Habitica/Responses/HabiticaResponse.cs | 5 +- .../Habitica/Task.cs | 4 +- Habittodo.Model/Storage/Enums/TodoAction.cs | 10 + Habittodo.Model/Storage/Enums/TodoApp.cs | 8 + .../Storage/HabitTodoLink.cs | 5 +- .../Storage/TodoChange.cs | 7 +- .../Storage/TodoHabitLink.cs | 5 +- .../Storage/TodoistSync.cs | 5 +- .../Todoist/Due.cs | 6 +- .../Todoist/Item.cs | 2 +- .../Todoist/Responses/SyncResponse.cs | 2 +- .../Extensions}/Extensions.cs | 8 +- .../HabiticaIntegrationService.cs | 15 +- .../HabiticaServiceClient.cs | 11 +- Habittodo.Service/Habittodo.Service.csproj | 16 + .../TodoistIntegrationService.cs | 10 +- .../TodoistServiceClient.cs | 7 +- Habittodo.sln | 12 + 38 files changed, 167 insertions(+), 819 deletions(-) delete mode 100644 Habitica.Todoist.Integration.Console/App.config delete mode 100644 Habitica.Todoist.Integration.Console/Habitica.Todoist.Integration.Console.csproj delete mode 100644 Habitica.Todoist.Integration.Console/Program.cs delete mode 100644 Habitica.Todoist.Integration.Console/Properties/AssemblyInfo.cs delete mode 100644 Habitica.Todoist.Integration.Console/packages.config delete mode 100644 Habitica.Todoist.Integration.Data/Habitica.Todoist.Integration.Data.csproj delete mode 100644 Habitica.Todoist.Integration.Model/Habitica.Todoist.Integration.Model.csproj delete mode 100644 Habitica.Todoist.Integration.Model/Habitica/Enums/ScoreAction.cs delete mode 100644 Habitica.Todoist.Integration.Model/Habitica/Enums/TaskType.cs delete mode 100644 Habitica.Todoist.Integration.Model/Storage/Enums/TodoAction.cs delete mode 100644 Habitica.Todoist.Integration.Model/Storage/Enums/TodoApp.cs delete mode 100644 Habitica.Todoist.Integration.Services/Habitica.Todoist.Integration.Services.csproj delete mode 100644 Habitica.Todoist.Integration.sln create mode 100644 Habittodo.Data/Habittodo.Data.csproj rename {Habitica.Todoist.Integration.Data => Habittodo.Data}/TableStorageClient.cs (98%) rename {Habitica.Todoist.Integration.Model => Habittodo.Model}/Habitica/ChecklistItem.cs (63%) create mode 100644 Habittodo.Model/Habitica/Enums/ScoreAction.cs create mode 100644 Habittodo.Model/Habitica/Enums/TaskType.cs rename {Habitica.Todoist.Integration.Model => Habittodo.Model}/Habitica/Responses/HabiticaResponse.cs (70%) rename {Habitica.Todoist.Integration.Model => Habittodo.Model}/Habitica/Task.cs (87%) create mode 100644 Habittodo.Model/Storage/Enums/TodoAction.cs create mode 100644 Habittodo.Model/Storage/Enums/TodoApp.cs rename {Habitica.Todoist.Integration.Model => Habittodo.Model}/Storage/HabitTodoLink.cs (84%) rename {Habitica.Todoist.Integration.Model => Habittodo.Model}/Storage/TodoChange.cs (73%) rename {Habitica.Todoist.Integration.Model => Habittodo.Model}/Storage/TodoHabitLink.cs (85%) rename {Habitica.Todoist.Integration.Model => Habittodo.Model}/Storage/TodoistSync.cs (70%) rename {Habitica.Todoist.Integration.Model => Habittodo.Model}/Todoist/Due.cs (75%) rename {Habitica.Todoist.Integration.Model => Habittodo.Model}/Todoist/Item.cs (94%) rename {Habitica.Todoist.Integration.Model => Habittodo.Model}/Todoist/Responses/SyncResponse.cs (85%) rename {Habitica.Todoist.Integration.Services => Habittodo.Service/Extensions}/Extensions.cs (86%) rename {Habitica.Todoist.Integration.Services => Habittodo.Service}/HabiticaIntegrationService.cs (93%) rename {Habitica.Todoist.Integration.Services => Habittodo.Service}/HabiticaServiceClient.cs (92%) create mode 100644 Habittodo.Service/Habittodo.Service.csproj rename {Habitica.Todoist.Integration.Services => Habittodo.Service}/TodoistIntegrationService.cs (94%) rename {Habitica.Todoist.Integration.Services => Habittodo.Service}/TodoistServiceClient.cs (90%) diff --git a/Habitica.Todoist.Integration.Console/App.config b/Habitica.Todoist.Integration.Console/App.config deleted file mode 100644 index 91a7e94..0000000 --- a/Habitica.Todoist.Integration.Console/App.config +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Habitica.Todoist.Integration.Console/Habitica.Todoist.Integration.Console.csproj b/Habitica.Todoist.Integration.Console/Habitica.Todoist.Integration.Console.csproj deleted file mode 100644 index 9790656..0000000 --- a/Habitica.Todoist.Integration.Console/Habitica.Todoist.Integration.Console.csproj +++ /dev/null @@ -1,342 +0,0 @@ - - - - - Debug - AnyCPU - {3D276A4F-F1BE-4ED9-8CC2-42A4F1942AE9} - Exe - Habitica.Todoist.Integration.Console - Habitica.Todoist.Integration.Console - v4.7.2 - 512 - true - true - - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Microsoft.Azure.Cosmos.Table.1.0.6\lib\netstandard2.0\Microsoft.Azure.Cosmos.Table.dll - - - ..\packages\Microsoft.Azure.DocumentDB.Core.2.1.3\lib\netstandard1.6\Microsoft.Azure.DocumentDB.Core.dll - - - ..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - - - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\packages\Microsoft.Extensions.Configuration.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll - - - ..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Configuration.FileExtensions.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Configuration.FileExtensions.dll - - - ..\packages\Microsoft.Extensions.Configuration.Json.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Configuration.Json.dll - - - ..\packages\Microsoft.Extensions.FileProviders.Abstractions.3.1.2\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Abstractions.dll - - - ..\packages\Microsoft.Extensions.FileProviders.Physical.3.1.2\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Physical.dll - - - ..\packages\Microsoft.Extensions.FileSystemGlobbing.3.1.2\lib\netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll - - - ..\packages\Microsoft.Extensions.Primitives.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - - - ..\packages\Microsoft.OData.Core.7.5.0\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll - - - ..\packages\Microsoft.OData.Edm.7.5.0\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll - - - ..\packages\Microsoft.Spatial.7.5.0\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.165\lib\net45\Microsoft.Threading.Tasks.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.165\lib\net45\Microsoft.Threading.Tasks.Extensions.dll - - - ..\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll - True - True - - - ..\packages\WindowsAzure.Storage.9.3.3\lib\net45\Microsoft.WindowsAzure.Storage.dll - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - - ..\packages\System.AppContext.4.1.0\lib\net463\System.AppContext.dll - True - True - - - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - - ..\packages\System.Collections.NonGeneric.4.0.1\lib\net46\System.Collections.NonGeneric.dll - True - True - - - ..\packages\System.Collections.Specialized.4.0.1\lib\net46\System.Collections.Specialized.dll - True - True - - - - ..\packages\System.Console.4.0.0\lib\net46\System.Console.dll - True - True - - - - ..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll - - - ..\packages\System.Diagnostics.TraceSource.4.0.0\lib\net46\System.Diagnostics.TraceSource.dll - True - True - - - ..\packages\System.Diagnostics.Tracing.4.1.0\lib\net462\System.Diagnostics.Tracing.dll - True - True - - - ..\packages\System.Globalization.Calendars.4.0.1\lib\net46\System.Globalization.Calendars.dll - True - True - - - ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll - True - True - - - ..\packages\System.IO.Compression.4.1.0\lib\net46\System.IO.Compression.dll - True - True - - - - ..\packages\System.IO.Compression.ZipFile.4.0.1\lib\net46\System.IO.Compression.ZipFile.dll - True - True - - - ..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll - True - True - - - ..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll - True - True - - - ..\packages\System.Linq.4.1.0\lib\net463\System.Linq.dll - True - True - - - ..\packages\System.Linq.Expressions.4.1.0\lib\net463\System.Linq.Expressions.dll - True - True - - - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - - - - ..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll - True - True - - - ..\packages\Microsoft.Net.Http.2.2.22\lib\net45\System.Net.Http.Extensions.dll - - - ..\packages\Microsoft.Net.Http.2.2.22\lib\net45\System.Net.Http.Primitives.dll - - - - ..\packages\System.Net.NameResolution.4.0.0\lib\net46\System.Net.NameResolution.dll - True - True - - - ..\packages\System.Net.NetworkInformation.4.1.0\lib\net46\System.Net.NetworkInformation.dll - True - True - - - ..\packages\System.Net.Security.4.3.2\lib\net46\System.Net.Security.dll - True - True - - - ..\packages\System.Net.Sockets.4.1.0\lib\net46\System.Net.Sockets.dll - True - True - - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Reflection.4.1.0\lib\net462\System.Reflection.dll - True - True - - - ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - True - True - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Runtime.Extensions.4.1.0\lib\net462\System.Runtime.Extensions.dll - True - True - - - ..\packages\System.Runtime.InteropServices.4.1.0\lib\net462\System.Runtime.InteropServices.dll - True - True - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - True - - - - ..\packages\System.Runtime.Serialization.Primitives.4.1.1\lib\net46\System.Runtime.Serialization.Primitives.dll - True - True - - - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll - True - True - - - ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - True - - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - True - - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - True - - - ..\packages\System.Security.SecureString.4.0.0\lib\net46\System.Security.SecureString.dll - True - True - - - ..\packages\System.Text.Encodings.Web.4.7.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - ..\packages\System.Text.Json.4.7.1\lib\net461\System.Text.Json.dll - - - ..\packages\System.Text.RegularExpressions.4.1.0\lib\net463\System.Text.RegularExpressions.dll - True - True - - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - - - - - - - - Always - - - - - - {08055C1C-7581-4E74-97BB-C5D56E0CA3D8} - Habitica.Todoist.Integration.Data - - - {1EDCF34E-E1B1-4F82-AEC7-90C35A267967} - Habitica.Todoist.Integration.Model - - - {A804D4CC-B5CC-466F-AF3D-E850B16D2D15} - Habitica.Todoist.Integration.Services - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/Habitica.Todoist.Integration.Console/Program.cs b/Habitica.Todoist.Integration.Console/Program.cs deleted file mode 100644 index 0c0dcf7..0000000 --- a/Habitica.Todoist.Integration.Console/Program.cs +++ /dev/null @@ -1,65 +0,0 @@ -using Habitica.Todoist.Integration.Data; -using Habitica.Todoist.Integration.Model.Habitica; -using Habitica.Todoist.Integration.Model.Habitica.Enums; -using Habitica.Todoist.Integration.Model.Storage; -using Habitica.Todoist.Integration.Model.Todoist; -using Habitica.Todoist.Integration.Services; -using Microsoft.Extensions.Configuration; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Net; -using System.Text; -using System.Web; - -namespace Habitica.Todoist.Integration.Console -{ - class Program - { - private static IConfiguration configuration { get; set; } - - private static string habiticaUserId => configuration["habitica:userId"]; - private static string habiticaApiKey => configuration["habitica:apiKey"]; - private static string todoistApiKey => configuration["todoist:apiKey"]; - private static string tableStorageConnectionString => configuration["tableStorage:connectionString"]; - private static string giosUserId => "0b6ec4eb-8878-4b9e-8585-7673764a6541"; - - static void Main(string[] args) - { - ConfigBuild(); - - // initialize all the clients - var habiticaClient = new HabiticaServiceClient(habiticaUserId, habiticaApiKey); - var todoistClient = new TodoistServiceClient(todoistApiKey); - var tableStorageClient = new TableStorageClient(tableStorageConnectionString); - - // get todoist sync token if available - var syncToken = ""; - try { syncToken = tableStorageClient.Query().Where(x => x.PartitionKey == giosUserId).ToList() - .OrderByDescending(x => x.Timestamp).First().RowKey; } catch { } - - // get all changed items from todoist - var response = todoistClient.GetItemChanges(syncToken).ConfigureAwait(false).GetAwaiter().GetResult(); - var changedItems = response.Items; - - /* TESTING */ - - // store sync token - var todoistSync = new TodoistSync(giosUserId, response.Sync_token); - tableStorageClient.InsertOrUpdate(todoistSync).ConfigureAwait(false).GetAwaiter().GetResult(); - } - - static void ConfigBuild() - { - new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) - .AddJsonFile("secrets.json"); - - configuration = new ConfigurationBuilder() - .AddJsonFile("secrets.json", true, true) - .Build(); - } - } -} diff --git a/Habitica.Todoist.Integration.Console/Properties/AssemblyInfo.cs b/Habitica.Todoist.Integration.Console/Properties/AssemblyInfo.cs deleted file mode 100644 index f3a2d58..0000000 --- a/Habitica.Todoist.Integration.Console/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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("Habitica.Todoist.Integration.Console")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Habitica.Todoist.Integration.Console")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3d276a4f-f1be-4ed9-8cc2-42a4f1942ae9")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Habitica.Todoist.Integration.Console/packages.config b/Habitica.Todoist.Integration.Console/packages.config deleted file mode 100644 index b395e6d..0000000 --- a/Habitica.Todoist.Integration.Console/packages.config +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Habitica.Todoist.Integration.Data/Habitica.Todoist.Integration.Data.csproj b/Habitica.Todoist.Integration.Data/Habitica.Todoist.Integration.Data.csproj deleted file mode 100644 index 6a513ba..0000000 --- a/Habitica.Todoist.Integration.Data/Habitica.Todoist.Integration.Data.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netstandard2.0 - - - - - - - diff --git a/Habitica.Todoist.Integration.Model/Habitica.Todoist.Integration.Model.csproj b/Habitica.Todoist.Integration.Model/Habitica.Todoist.Integration.Model.csproj deleted file mode 100644 index a0a2fa5..0000000 --- a/Habitica.Todoist.Integration.Model/Habitica.Todoist.Integration.Model.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.0 - - - - - - - - diff --git a/Habitica.Todoist.Integration.Model/Habitica/Enums/ScoreAction.cs b/Habitica.Todoist.Integration.Model/Habitica/Enums/ScoreAction.cs deleted file mode 100644 index 635efce..0000000 --- a/Habitica.Todoist.Integration.Model/Habitica/Enums/ScoreAction.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Habitica.Todoist.Integration.Model.Habitica.Enums -{ - public enum ScoreAction - { - Up = 0, - Down = 1 - } -} diff --git a/Habitica.Todoist.Integration.Model/Habitica/Enums/TaskType.cs b/Habitica.Todoist.Integration.Model/Habitica/Enums/TaskType.cs deleted file mode 100644 index 8ec5f92..0000000 --- a/Habitica.Todoist.Integration.Model/Habitica/Enums/TaskType.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Habitica.Todoist.Integration.Model.Habitica.Enums -{ - public enum TaskType - { - Habit = 0, - Daily = 1, - Todo = 2, - Reward = 3 - } -} diff --git a/Habitica.Todoist.Integration.Model/Storage/Enums/TodoAction.cs b/Habitica.Todoist.Integration.Model/Storage/Enums/TodoAction.cs deleted file mode 100644 index a4ffe51..0000000 --- a/Habitica.Todoist.Integration.Model/Storage/Enums/TodoAction.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Habitica.Todoist.Integration.Model.Storage.Enum -{ - public enum TodoAction - { - Add = 1, - Update = 2, - Complete = 3, - Delete = 4 - } -} diff --git a/Habitica.Todoist.Integration.Model/Storage/Enums/TodoApp.cs b/Habitica.Todoist.Integration.Model/Storage/Enums/TodoApp.cs deleted file mode 100644 index c16dbe0..0000000 --- a/Habitica.Todoist.Integration.Model/Storage/Enums/TodoApp.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Habitica.Todoist.Integration.Model.Storage.Enum -{ - public enum TodoApp - { - Habitica = 1, - Todoist = 2 - } -} diff --git a/Habitica.Todoist.Integration.Services/Habitica.Todoist.Integration.Services.csproj b/Habitica.Todoist.Integration.Services/Habitica.Todoist.Integration.Services.csproj deleted file mode 100644 index 7e9feba..0000000 --- a/Habitica.Todoist.Integration.Services/Habitica.Todoist.Integration.Services.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netstandard2.0 - - - - - - - - - - - - diff --git a/Habitica.Todoist.Integration.sln b/Habitica.Todoist.Integration.sln deleted file mode 100644 index 1742247..0000000 --- a/Habitica.Todoist.Integration.sln +++ /dev/null @@ -1,61 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29009.5 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Habitica.Todoist.Integration.Console", "Habitica.Todoist.Integration.Console\Habitica.Todoist.Integration.Console.csproj", "{3D276A4F-F1BE-4ED9-8CC2-42A4F1942AE9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Habitica.Todoist.Integration.Model", "Habitica.Todoist.Integration.Model\Habitica.Todoist.Integration.Model.csproj", "{1EDCF34E-E1B1-4F82-AEC7-90C35A267967}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8D05CFA9-A4A2-4310-AF9A-E10A562D03BC}" - ProjectSection(SolutionItems) = preProject - .gitignore = .gitignore - LICENSE.txt = LICENSE.txt - README.md = README.md - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Habitica.Todoist.Integration.Services", "Habitica.Todoist.Integration.Services\Habitica.Todoist.Integration.Services.csproj", "{A804D4CC-B5CC-466F-AF3D-E850B16D2D15}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Functions", "Functions", "{2DEF5574-4626-414C-9CF2-1FD6F3815B16}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Habitica.Todoist.Integration.Function.Sync", "Habitica.Todoist.Integration.Function.Sync\Habitica.Todoist.Integration.Function.Sync.csproj", "{9C825688-20BC-4580-8126-1E7320A8CC4D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Habitica.Todoist.Integration.Data", "Habitica.Todoist.Integration.Data\Habitica.Todoist.Integration.Data.csproj", "{08055C1C-7581-4E74-97BB-C5D56E0CA3D8}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3D276A4F-F1BE-4ED9-8CC2-42A4F1942AE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D276A4F-F1BE-4ED9-8CC2-42A4F1942AE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D276A4F-F1BE-4ED9-8CC2-42A4F1942AE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D276A4F-F1BE-4ED9-8CC2-42A4F1942AE9}.Release|Any CPU.Build.0 = Release|Any CPU - {1EDCF34E-E1B1-4F82-AEC7-90C35A267967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EDCF34E-E1B1-4F82-AEC7-90C35A267967}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EDCF34E-E1B1-4F82-AEC7-90C35A267967}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EDCF34E-E1B1-4F82-AEC7-90C35A267967}.Release|Any CPU.Build.0 = Release|Any CPU - {A804D4CC-B5CC-466F-AF3D-E850B16D2D15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A804D4CC-B5CC-466F-AF3D-E850B16D2D15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A804D4CC-B5CC-466F-AF3D-E850B16D2D15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A804D4CC-B5CC-466F-AF3D-E850B16D2D15}.Release|Any CPU.Build.0 = Release|Any CPU - {9C825688-20BC-4580-8126-1E7320A8CC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C825688-20BC-4580-8126-1E7320A8CC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C825688-20BC-4580-8126-1E7320A8CC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C825688-20BC-4580-8126-1E7320A8CC4D}.Release|Any CPU.Build.0 = Release|Any CPU - {08055C1C-7581-4E74-97BB-C5D56E0CA3D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08055C1C-7581-4E74-97BB-C5D56E0CA3D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08055C1C-7581-4E74-97BB-C5D56E0CA3D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08055C1C-7581-4E74-97BB-C5D56E0CA3D8}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {9C825688-20BC-4580-8126-1E7320A8CC4D} = {2DEF5574-4626-414C-9CF2-1FD6F3815B16} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {BE97C2C4-DA2B-45F1-BB8C-7662BE10E9DC} - EndGlobalSection -EndGlobal diff --git a/Habittodo.Console/Habittodo.Console.csproj b/Habittodo.Console/Habittodo.Console.csproj index 1d2d39a..b0910e4 100644 --- a/Habittodo.Console/Habittodo.Console.csproj +++ b/Habittodo.Console/Habittodo.Console.csproj @@ -5,4 +5,15 @@ net5.0 + + + + + + + + + + + diff --git a/Habittodo.Console/Program.cs b/Habittodo.Console/Program.cs index 0297dd3..8b5eba0 100644 --- a/Habittodo.Console/Program.cs +++ b/Habittodo.Console/Program.cs @@ -1,12 +1,56 @@ -using System; +using Habittodo.Data; +using Habittodo.Model.Storage; +using Habittodo.Service; +using Microsoft.Extensions.Configuration; +using System.IO; +using System.Linq; -namespace Habittodo.Console +namespace Habitica.Todoist.Integration.Console { class Program { + private static IConfiguration configuration { get; set; } + + private static string habiticaUserId => configuration["habitica:userId"]; + private static string habiticaApiKey => configuration["habitica:apiKey"]; + private static string todoistApiKey => configuration["todoist:apiKey"]; + private static string tableStorageConnectionString => configuration["tableStorage:connectionString"]; + private static string giosUserId => "0b6ec4eb-8878-4b9e-8585-7673764a6541"; + static void Main(string[] args) { - System.Console.WriteLine("Hello World!"); + ConfigBuild(); + + // initialize all the clients + var habiticaClient = new HabiticaServiceClient(habiticaUserId, habiticaApiKey); + var todoistClient = new TodoistServiceClient(todoistApiKey); + var tableStorageClient = new TableStorageClient(tableStorageConnectionString); + + // get todoist sync token if available + var syncToken = ""; + try { syncToken = tableStorageClient.Query().Where(x => x.PartitionKey == giosUserId).ToList() + .OrderByDescending(x => x.Timestamp).First().RowKey; } catch { } + + // get all changed items from todoist + var response = todoistClient.GetItemChanges(syncToken).ConfigureAwait(false).GetAwaiter().GetResult(); + var changedItems = response.Items; + + /* TESTING */ + + // store sync token + var todoistSync = new TodoistSync(giosUserId, response.Sync_token); + tableStorageClient.InsertOrUpdate(todoistSync).ConfigureAwait(false).GetAwaiter().GetResult(); + } + + static void ConfigBuild() + { + new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("secrets.json"); + + configuration = new ConfigurationBuilder() + .AddJsonFile("secrets.json", true, true) + .Build(); } } } diff --git a/Habittodo.Data/Habittodo.Data.csproj b/Habittodo.Data/Habittodo.Data.csproj new file mode 100644 index 0000000..8daa3b3 --- /dev/null +++ b/Habittodo.Data/Habittodo.Data.csproj @@ -0,0 +1,11 @@ + + + + net5.0 + + + + + + + diff --git a/Habitica.Todoist.Integration.Data/TableStorageClient.cs b/Habittodo.Data/TableStorageClient.cs similarity index 98% rename from Habitica.Todoist.Integration.Data/TableStorageClient.cs rename to Habittodo.Data/TableStorageClient.cs index e81e550..1689bdf 100644 --- a/Habitica.Todoist.Integration.Data/TableStorageClient.cs +++ b/Habittodo.Data/TableStorageClient.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Habitica.Todoist.Integration.Data +namespace Habittodo.Data { public class TableStorageClient { diff --git a/Habitica.Todoist.Integration.Model/Habitica/ChecklistItem.cs b/Habittodo.Model/Habitica/ChecklistItem.cs similarity index 63% rename from Habitica.Todoist.Integration.Model/Habitica/ChecklistItem.cs rename to Habittodo.Model/Habitica/ChecklistItem.cs index 0f15fb4..bd92329 100644 --- a/Habitica.Todoist.Integration.Model/Habitica/ChecklistItem.cs +++ b/Habittodo.Model/Habitica/ChecklistItem.cs @@ -1,9 +1,6 @@ using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Text; -namespace Habitica.Todoist.Integration.Model.Habitica +namespace Habittodo.Model.Habitica { public class ChecklistItem { diff --git a/Habittodo.Model/Habitica/Enums/ScoreAction.cs b/Habittodo.Model/Habitica/Enums/ScoreAction.cs new file mode 100644 index 0000000..04a34fd --- /dev/null +++ b/Habittodo.Model/Habitica/Enums/ScoreAction.cs @@ -0,0 +1,8 @@ +namespace Habittodo.Model.Habitica.Enums +{ + public enum ScoreAction + { + Up = 0, + Down = 1 + } +} diff --git a/Habittodo.Model/Habitica/Enums/TaskType.cs b/Habittodo.Model/Habitica/Enums/TaskType.cs new file mode 100644 index 0000000..6af5df7 --- /dev/null +++ b/Habittodo.Model/Habitica/Enums/TaskType.cs @@ -0,0 +1,10 @@ +namespace Habittodo.Model.Habitica.Enums +{ + public enum TaskType + { + Habit = 0, + Daily = 1, + Todo = 2, + Reward = 3 + } +} diff --git a/Habitica.Todoist.Integration.Model/Habitica/Responses/HabiticaResponse.cs b/Habittodo.Model/Habitica/Responses/HabiticaResponse.cs similarity index 70% rename from Habitica.Todoist.Integration.Model/Habitica/Responses/HabiticaResponse.cs rename to Habittodo.Model/Habitica/Responses/HabiticaResponse.cs index 878f9ca..48434cc 100644 --- a/Habitica.Todoist.Integration.Model/Habitica/Responses/HabiticaResponse.cs +++ b/Habittodo.Model/Habitica/Responses/HabiticaResponse.cs @@ -1,9 +1,6 @@ using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Text; -namespace Habitica.Todoist.Integration.Model.Habitica.Responses +namespace Habittodo.Model.Habitica.Responses { public class HabiticaReponse { diff --git a/Habitica.Todoist.Integration.Model/Habitica/Task.cs b/Habittodo.Model/Habitica/Task.cs similarity index 87% rename from Habitica.Todoist.Integration.Model/Habitica/Task.cs rename to Habittodo.Model/Habitica/Task.cs index 6185b88..87575b2 100644 --- a/Habitica.Todoist.Integration.Model/Habitica/Task.cs +++ b/Habittodo.Model/Habitica/Task.cs @@ -1,9 +1,7 @@ using Newtonsoft.Json; -using System; using System.Collections.Generic; -using System.Text; -namespace Habitica.Todoist.Integration.Model.Habitica +namespace Habittodo.Model.Habitica { public class Task { diff --git a/Habittodo.Model/Storage/Enums/TodoAction.cs b/Habittodo.Model/Storage/Enums/TodoAction.cs new file mode 100644 index 0000000..3a33ba9 --- /dev/null +++ b/Habittodo.Model/Storage/Enums/TodoAction.cs @@ -0,0 +1,10 @@ +namespace Habittodo.Model.Storage.Enums +{ + public enum TodoAction + { + Add = 1, + Update = 2, + Complete = 3, + Delete = 4 + } +} diff --git a/Habittodo.Model/Storage/Enums/TodoApp.cs b/Habittodo.Model/Storage/Enums/TodoApp.cs new file mode 100644 index 0000000..cfe5c46 --- /dev/null +++ b/Habittodo.Model/Storage/Enums/TodoApp.cs @@ -0,0 +1,8 @@ +namespace Habittodo.Model.Storage.Enums +{ + public enum TodoApp + { + Habitica = 1, + Todoist = 2 + } +} diff --git a/Habitica.Todoist.Integration.Model/Storage/HabitTodoLink.cs b/Habittodo.Model/Storage/HabitTodoLink.cs similarity index 84% rename from Habitica.Todoist.Integration.Model/Storage/HabitTodoLink.cs rename to Habittodo.Model/Storage/HabitTodoLink.cs index 4d75665..1f22b59 100644 --- a/Habitica.Todoist.Integration.Model/Storage/HabitTodoLink.cs +++ b/Habittodo.Model/Storage/HabitTodoLink.cs @@ -1,9 +1,6 @@ using Microsoft.Azure.Cosmos.Table; -using System; -using System.Collections.Generic; -using System.Text; -namespace Habitica.Todoist.Integration.Model.Storage +namespace Habittodo.Model.Storage { public class HabitTodoLink : TableEntity { diff --git a/Habitica.Todoist.Integration.Model/Storage/TodoChange.cs b/Habittodo.Model/Storage/TodoChange.cs similarity index 73% rename from Habitica.Todoist.Integration.Model/Storage/TodoChange.cs rename to Habittodo.Model/Storage/TodoChange.cs index a7569e1..17e788c 100644 --- a/Habitica.Todoist.Integration.Model/Storage/TodoChange.cs +++ b/Habittodo.Model/Storage/TodoChange.cs @@ -1,10 +1,7 @@ -using Habitica.Todoist.Integration.Model.Storage.Enum; +using Habittodo.Model.Storage.Enums; using Microsoft.Azure.Cosmos.Table; -using System; -using System.Collections.Generic; -using System.Text; -namespace Habitica.Todoist.Integration.Model.Storage +namespace Habittodo.Model.Storage { /* TODO: Rework structure */ public class TodoChange : TableEntity diff --git a/Habitica.Todoist.Integration.Model/Storage/TodoHabitLink.cs b/Habittodo.Model/Storage/TodoHabitLink.cs similarity index 85% rename from Habitica.Todoist.Integration.Model/Storage/TodoHabitLink.cs rename to Habittodo.Model/Storage/TodoHabitLink.cs index d01ebe6..b3eec24 100644 --- a/Habitica.Todoist.Integration.Model/Storage/TodoHabitLink.cs +++ b/Habittodo.Model/Storage/TodoHabitLink.cs @@ -1,9 +1,6 @@ using Microsoft.Azure.Cosmos.Table; -using System; -using System.Collections.Generic; -using System.Text; -namespace Habitica.Todoist.Integration.Model.Storage +namespace Habittodo.Model.Storage { public class TodoHabitLink : TableEntity { diff --git a/Habitica.Todoist.Integration.Model/Storage/TodoistSync.cs b/Habittodo.Model/Storage/TodoistSync.cs similarity index 70% rename from Habitica.Todoist.Integration.Model/Storage/TodoistSync.cs rename to Habittodo.Model/Storage/TodoistSync.cs index 1f925a4..ba71cfa 100644 --- a/Habitica.Todoist.Integration.Model/Storage/TodoistSync.cs +++ b/Habittodo.Model/Storage/TodoistSync.cs @@ -1,9 +1,6 @@ using Microsoft.Azure.Cosmos.Table; -using System; -using System.Collections.Generic; -using System.Text; -namespace Habitica.Todoist.Integration.Model.Storage +namespace Habittodo.Model.Storage { public class TodoistSync : TableEntity { diff --git a/Habitica.Todoist.Integration.Model/Todoist/Due.cs b/Habittodo.Model/Todoist/Due.cs similarity index 75% rename from Habitica.Todoist.Integration.Model/Todoist/Due.cs rename to Habittodo.Model/Todoist/Due.cs index 43fd2d8..ae517e3 100644 --- a/Habitica.Todoist.Integration.Model/Todoist/Due.cs +++ b/Habittodo.Model/Todoist/Due.cs @@ -1,10 +1,6 @@ using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Text; -namespace Habitica.Todoist.Integration.Model.Todoist +namespace Habittodo.Model.Todoist { public class Due { diff --git a/Habitica.Todoist.Integration.Model/Todoist/Item.cs b/Habittodo.Model/Todoist/Item.cs similarity index 94% rename from Habitica.Todoist.Integration.Model/Todoist/Item.cs rename to Habittodo.Model/Todoist/Item.cs index c4da509..fbffbb9 100644 --- a/Habitica.Todoist.Integration.Model/Todoist/Item.cs +++ b/Habittodo.Model/Todoist/Item.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Habitica.Todoist.Integration.Model.Todoist +namespace Habittodo.Model.Todoist { public class Item { diff --git a/Habitica.Todoist.Integration.Model/Todoist/Responses/SyncResponse.cs b/Habittodo.Model/Todoist/Responses/SyncResponse.cs similarity index 85% rename from Habitica.Todoist.Integration.Model/Todoist/Responses/SyncResponse.cs rename to Habittodo.Model/Todoist/Responses/SyncResponse.cs index e5edd8b..f711c64 100644 --- a/Habitica.Todoist.Integration.Model/Todoist/Responses/SyncResponse.cs +++ b/Habittodo.Model/Todoist/Responses/SyncResponse.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace Habitica.Todoist.Integration.Model.Todoist.Responses +namespace Habittodo.Model.Todoist.Responses { public class SyncResponse { diff --git a/Habitica.Todoist.Integration.Services/Extensions.cs b/Habittodo.Service/Extensions/Extensions.cs similarity index 86% rename from Habitica.Todoist.Integration.Services/Extensions.cs rename to Habittodo.Service/Extensions/Extensions.cs index 192aac3..aff4c6b 100644 --- a/Habitica.Todoist.Integration.Services/Extensions.cs +++ b/Habittodo.Service/Extensions/Extensions.cs @@ -1,11 +1,11 @@ -using Habitica.Todoist.Integration.Model.Habitica; -using Habitica.Todoist.Integration.Model.Habitica.Enums; -using Habitica.Todoist.Integration.Model.Todoist; +using Habittodo.Model.Habitica; +using Habittodo.Model.Habitica.Enums; +using Habittodo.Model.Todoist; using System; using System.Collections.Generic; using System.Text; -namespace Habitica.Todoist.Integration.Services.Extensions +namespace Habittodo.Service.Extensions { public static class Extensions { diff --git a/Habitica.Todoist.Integration.Services/HabiticaIntegrationService.cs b/Habittodo.Service/HabiticaIntegrationService.cs similarity index 93% rename from Habitica.Todoist.Integration.Services/HabiticaIntegrationService.cs rename to Habittodo.Service/HabiticaIntegrationService.cs index 22d283b..23dbe01 100644 --- a/Habitica.Todoist.Integration.Services/HabiticaIntegrationService.cs +++ b/Habittodo.Service/HabiticaIntegrationService.cs @@ -1,16 +1,15 @@ -using Habitica.Todoist.Integration.Data; -using ChecklistItem = Habitica.Todoist.Integration.Model.Habitica.ChecklistItem; -using Habitica.Todoist.Integration.Model.Habitica.Enums; -using Habitica.Todoist.Integration.Model.Storage; -using Habitica.Todoist.Integration.Model.Todoist; -using Habitica.Todoist.Integration.Services.Extensions; +using Habittodo.Data; +using ChecklistItem = Habittodo.Model.Habitica.ChecklistItem; +using Habittodo.Model.Habitica.Enums; +using Habittodo.Model.Storage; +using Habittodo.Model.Todoist; +using Habittodo.Service.Extensions; using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; -namespace Habitica.Todoist.Integration.Services +namespace Habittodo.Service { public class HabiticaIntegrationService { diff --git a/Habitica.Todoist.Integration.Services/HabiticaServiceClient.cs b/Habittodo.Service/HabiticaServiceClient.cs similarity index 92% rename from Habitica.Todoist.Integration.Services/HabiticaServiceClient.cs rename to Habittodo.Service/HabiticaServiceClient.cs index 219043c..511a736 100644 --- a/Habitica.Todoist.Integration.Services/HabiticaServiceClient.cs +++ b/Habittodo.Service/HabiticaServiceClient.cs @@ -1,14 +1,13 @@ -using HabiticaTask = Habitica.Todoist.Integration.Model.Habitica.Task; -using ChecklistItem = Habitica.Todoist.Integration.Model.Habitica.ChecklistItem; +using HabiticaTask = Habittodo.Model.Habitica.Task; +using ChecklistItem = Habittodo.Model.Habitica.ChecklistItem; using System.Net; using System.Threading.Tasks; using Newtonsoft.Json; -using System.Collections.Generic; -using Habitica.Todoist.Integration.Model.Habitica.Responses; -using Habitica.Todoist.Integration.Model.Habitica.Enums; +using Habittodo.Model.Habitica.Responses; +using Habittodo.Model.Habitica.Enums; using System; -namespace Habitica.Todoist.Integration.Services +namespace Habittodo.Service { public class HabiticaServiceClient { diff --git a/Habittodo.Service/Habittodo.Service.csproj b/Habittodo.Service/Habittodo.Service.csproj new file mode 100644 index 0000000..065e9d7 --- /dev/null +++ b/Habittodo.Service/Habittodo.Service.csproj @@ -0,0 +1,16 @@ + + + + net5.0 + + + + + + + + + + + + diff --git a/Habitica.Todoist.Integration.Services/TodoistIntegrationService.cs b/Habittodo.Service/TodoistIntegrationService.cs similarity index 94% rename from Habitica.Todoist.Integration.Services/TodoistIntegrationService.cs rename to Habittodo.Service/TodoistIntegrationService.cs index 2f0b5d3..78fb686 100644 --- a/Habitica.Todoist.Integration.Services/TodoistIntegrationService.cs +++ b/Habittodo.Service/TodoistIntegrationService.cs @@ -1,14 +1,12 @@ -using Habitica.Todoist.Integration.Data; -using Habitica.Todoist.Integration.Model.Storage; -using System; +using Habittodo.Data; +using Habittodo.Model.Storage; using System.Collections.Generic; -using System.Text; using System.Linq; -using Habitica.Todoist.Integration.Model.Todoist; +using Habittodo.Model.Todoist; using System.Threading.Tasks; using System.Collections; -namespace Habitica.Todoist.Integration.Services +namespace Habittodo.Service { public class TodoistIntegrationService { diff --git a/Habitica.Todoist.Integration.Services/TodoistServiceClient.cs b/Habittodo.Service/TodoistServiceClient.cs similarity index 90% rename from Habitica.Todoist.Integration.Services/TodoistServiceClient.cs rename to Habittodo.Service/TodoistServiceClient.cs index bac5bf9..9ecb4e2 100644 --- a/Habitica.Todoist.Integration.Services/TodoistServiceClient.cs +++ b/Habittodo.Service/TodoistServiceClient.cs @@ -1,13 +1,10 @@ -using Habitica.Todoist.Integration.Model.Todoist; -using Habitica.Todoist.Integration.Model.Todoist.Responses; +using Habittodo.Model.Todoist.Responses; using Newtonsoft.Json; -using System; using System.Collections.Generic; using System.Net; -using System.Text; using System.Threading.Tasks; -namespace Habitica.Todoist.Integration.Services +namespace Habittodo.Service { public class TodoistServiceClient { diff --git a/Habittodo.sln b/Habittodo.sln index 2746bc4..1af6df6 100644 --- a/Habittodo.sln +++ b/Habittodo.sln @@ -7,6 +7,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Habittodo.Console", "Habitt EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Habittodo.Model", "Habittodo.Model\Habittodo.Model.csproj", "{871A5C5D-FBB9-4D2A-8D18-EC9923618C2C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Habittodo.Service", "Habittodo.Service\Habittodo.Service.csproj", "{E627001C-DA5D-469A-BC60-5AD2E8CF08E6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Habittodo.Data", "Habittodo.Data\Habittodo.Data.csproj", "{8245731C-C053-49B2-AFAC-0A41C35F243C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +25,14 @@ Global {871A5C5D-FBB9-4D2A-8D18-EC9923618C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {871A5C5D-FBB9-4D2A-8D18-EC9923618C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {871A5C5D-FBB9-4D2A-8D18-EC9923618C2C}.Release|Any CPU.Build.0 = Release|Any CPU + {E627001C-DA5D-469A-BC60-5AD2E8CF08E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E627001C-DA5D-469A-BC60-5AD2E8CF08E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E627001C-DA5D-469A-BC60-5AD2E8CF08E6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E627001C-DA5D-469A-BC60-5AD2E8CF08E6}.Release|Any CPU.Build.0 = Release|Any CPU + {8245731C-C053-49B2-AFAC-0A41C35F243C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8245731C-C053-49B2-AFAC-0A41C35F243C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8245731C-C053-49B2-AFAC-0A41C35F243C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8245731C-C053-49B2-AFAC-0A41C35F243C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE