From 06849440d90d912d7fc6d8aef0d66700f12a7746 Mon Sep 17 00:00:00 2001 From: Giovani Date: Tue, 20 Jul 2021 02:01:47 -0400 Subject: [PATCH] wip: convert projects to .net 5 --- Habittodo.Console/Program.cs | 2 +- Habittodo.Model/ChecklistItem.cs | 15 ------------ Habittodo.Model/Due.cs | 24 ------------------- Habittodo.Model/HabitTodoLink.cs | 28 ---------------------- Habittodo.Model/Habittodo.Model.csproj | 11 +++++++++ Habittodo.Model/Item.cs | 33 -------------------------- Habittodo.Model/Task.cs | 23 ------------------ Habittodo.Model/TodoChange.cs | 25 ------------------- Habittodo.Model/TodoHabitLink.cs | 28 ---------------------- Habittodo.Model/TodoistSync.cs | 18 -------------- 10 files changed, 12 insertions(+), 195 deletions(-) delete mode 100644 Habittodo.Model/ChecklistItem.cs delete mode 100644 Habittodo.Model/Due.cs delete mode 100644 Habittodo.Model/HabitTodoLink.cs delete mode 100644 Habittodo.Model/Item.cs delete mode 100644 Habittodo.Model/Task.cs delete mode 100644 Habittodo.Model/TodoChange.cs delete mode 100644 Habittodo.Model/TodoHabitLink.cs delete mode 100644 Habittodo.Model/TodoistSync.cs diff --git a/Habittodo.Console/Program.cs b/Habittodo.Console/Program.cs index 9888123..0297dd3 100644 --- a/Habittodo.Console/Program.cs +++ b/Habittodo.Console/Program.cs @@ -6,7 +6,7 @@ namespace Habittodo.Console { static void Main(string[] args) { - Console.WriteLine("Hello World!"); + System.Console.WriteLine("Hello World!"); } } } diff --git a/Habittodo.Model/ChecklistItem.cs b/Habittodo.Model/ChecklistItem.cs deleted file mode 100644 index 88e347c..0000000 --- a/Habittodo.Model/ChecklistItem.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Habittodo.Model -{ - public class ChecklistItem - { - [JsonProperty("id")] - public string Id { get; set; } - [JsonProperty("text")] - public string Text { get; set; } - } -} diff --git a/Habittodo.Model/Due.cs b/Habittodo.Model/Due.cs deleted file mode 100644 index e6cc312..0000000 --- a/Habittodo.Model/Due.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Text; - -namespace Habittodo.Model -{ - public class Due - { - [JsonProperty("date")] - public string Date { get; set; } - [JsonProperty("timezone")] - public string Timezone { get; set; } - [JsonProperty("string")] - public string @String { get; set; } - - public string ToJavaScriptDateStr() - { - try { return Date + "T00:00:00.000Z"; } catch { } - return null; - } - } -} diff --git a/Habittodo.Model/HabitTodoLink.cs b/Habittodo.Model/HabitTodoLink.cs deleted file mode 100644 index 8ad41fa..0000000 --- a/Habittodo.Model/HabitTodoLink.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Microsoft.Azure.Cosmos.Table; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Habittodo.Model -{ - public class HabitTodoLink : TableEntity - { - public HabitTodoLink() { } - - public HabitTodoLink(string userId, string habiticaId, string todoistId, string habiticaParentId = null) - { - PartitionKey = userId; - RowKey = habiticaId; - HabiticaParentId = habiticaParentId; - TodoistId = todoistId; - } - - public string HabiticaParentId { get; set; } - public string TodoistId { get; set; } - - public TodoHabitLink Reverse() - { - return new TodoHabitLink(PartitionKey, TodoistId, RowKey); - } - } -} diff --git a/Habittodo.Model/Habittodo.Model.csproj b/Habittodo.Model/Habittodo.Model.csproj index b3577fa..0fbb804 100644 --- a/Habittodo.Model/Habittodo.Model.csproj +++ b/Habittodo.Model/Habittodo.Model.csproj @@ -8,4 +8,15 @@ + + + + + + + + + + + diff --git a/Habittodo.Model/Item.cs b/Habittodo.Model/Item.cs deleted file mode 100644 index 5e6cea3..0000000 --- a/Habittodo.Model/Item.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Habittodo.Model -{ - public class Item - { - [JsonProperty("id")] - public string Id { get; set; } - [JsonProperty("content")] - public string Content { get; set; } - [JsonProperty("due")] - public Due Due { get; set; } - [JsonProperty("priority")] - public int Priority { get; set; } - [JsonProperty("parent_id")] - public string Parent_Id { get; set; } - [JsonProperty("is_deleted")] - public int Is_deleted { get; set; } - [JsonProperty("project_id")] - public string Project_id { get; set; } - [JsonProperty("date_completed")] - public string Date_completed { get; set; } - - /// - /// This field will always be false when an item is marked as deleted - /// - [JsonIgnore] - public bool IsChild => !string.IsNullOrEmpty(Parent_Id); - } -} diff --git a/Habittodo.Model/Task.cs b/Habittodo.Model/Task.cs deleted file mode 100644 index da8cc60..0000000 --- a/Habittodo.Model/Task.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Habittodo.Model -{ - public class Task - { - [JsonProperty("text")] - public string Text { get; set; } - [JsonProperty("type")] - public string Type { get; set; } - [JsonProperty("date")] - public string Date { get; set; } - [JsonProperty("priority")] - public string Priority { get; set; } - [JsonProperty("checklist", NullValueHandling = NullValueHandling.Ignore)] - public List Checklist { get; set; } - [JsonProperty("id")] - public string Id { get; set; } - } -} diff --git a/Habittodo.Model/TodoChange.cs b/Habittodo.Model/TodoChange.cs deleted file mode 100644 index 8db3af4..0000000 --- a/Habittodo.Model/TodoChange.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Habitica.Todoist.Integration.Model.Storage.Enum; -using Microsoft.Azure.Cosmos.Table; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Habittodo.Model -{ - /* TODO: Rework structure */ - public class TodoChange : TableEntity - { - public TodoChange() { } - - public TodoChange(string userId, string todoId) - { - PartitionKey = userId; - RowKey = todoId; - } - - public TodoApp Application { get; set; } - public TodoAction Action { get; set; } - public bool Applied { get; set; } - public string JsonTodo { get; set; } - } -} diff --git a/Habittodo.Model/TodoHabitLink.cs b/Habittodo.Model/TodoHabitLink.cs deleted file mode 100644 index 0f98bdc..0000000 --- a/Habittodo.Model/TodoHabitLink.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Microsoft.Azure.Cosmos.Table; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Habittodo.Model -{ - public class TodoHabitLink : TableEntity - { - public TodoHabitLink() { } - - public TodoHabitLink(string userId, string todoistId, string habiticaId, string todoistParentId = null) - { - PartitionKey = userId; - RowKey = todoistId; - TodoistParentId = todoistParentId; - HabiticaId = habiticaId; - } - - public string TodoistParentId { get; set; } - public string HabiticaId { get; set; } - - public HabitTodoLink Reverse(string habiticaParentId = null) - { - return new HabitTodoLink(PartitionKey, HabiticaId, RowKey, habiticaParentId); - } - } -} diff --git a/Habittodo.Model/TodoistSync.cs b/Habittodo.Model/TodoistSync.cs deleted file mode 100644 index ae37a43..0000000 --- a/Habittodo.Model/TodoistSync.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Microsoft.Azure.Cosmos.Table; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Habittodo.Model -{ - public class TodoistSync : TableEntity - { - public TodoistSync() { } - - public TodoistSync(string userId, string syncToken) - { - PartitionKey = userId; - RowKey = syncToken; - } - } -}