From cc3fe23fc8dfa7f793faf236487389878f54e602 Mon Sep 17 00:00:00 2001
From: Aron Ridgway <Aron.Ridgway@clearview-continuity.com>
Date: Tue, 29 Jun 2021 20:03:09 +0100
Subject: [PATCH 1/3] up to 7 Todo list

---
 .../TodoItems/TodoItemEditFieldsFactory.cs    |  2 +-
 Todo/Models/TodoItems/TodoItemCreateFields.cs |  5 +-
 Todo/Models/TodoItems/TodoItemEditFields.cs   |  6 +-
 .../ApplicationDbContextConvenience.cs        |  7 ++-
 Todo/Views/TodoList/Detail.cshtml             | 57 +++++++++++--------
 Todo/wwwroot/css/site.css                     |  5 ++
 Todo/wwwroot/js/site.js                       |  8 +++
 7 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/Todo/EntityModelMappers/TodoItems/TodoItemEditFieldsFactory.cs b/Todo/EntityModelMappers/TodoItems/TodoItemEditFieldsFactory.cs
index 6d3e893b..1b35f05c 100644
--- a/Todo/EntityModelMappers/TodoItems/TodoItemEditFieldsFactory.cs
+++ b/Todo/EntityModelMappers/TodoItems/TodoItemEditFieldsFactory.cs
@@ -3,7 +3,7 @@
 
 namespace Todo.EntityModelMappers.TodoItems
 {
-    public class TodoItemEditFieldsFactory
+    public static class TodoItemEditFieldsFactory
     {
         public static TodoItemEditFields Create(TodoItem todoItem)
         {
diff --git a/Todo/Models/TodoItems/TodoItemCreateFields.cs b/Todo/Models/TodoItems/TodoItemCreateFields.cs
index dfaed4af..7e2c93fa 100644
--- a/Todo/Models/TodoItems/TodoItemCreateFields.cs
+++ b/Todo/Models/TodoItems/TodoItemCreateFields.cs
@@ -1,4 +1,6 @@
-using Todo.Data.Entities;
+
+using System.ComponentModel.DataAnnotations;
+using Todo.Data.Entities;
 
 namespace Todo.Models.TodoItems
 {
@@ -7,6 +9,7 @@ public class TodoItemCreateFields
         public int TodoListId { get; set; }
         public string Title { get; set; }
         public string TodoListTitle { get; set; }
+        [Display(Name ="Responsible Party")]
         public string ResponsiblePartyId { get; set; }
         public Importance Importance { get; set; } = Importance.Medium;
 
diff --git a/Todo/Models/TodoItems/TodoItemEditFields.cs b/Todo/Models/TodoItems/TodoItemEditFields.cs
index 43c970ef..e1eb6974 100644
--- a/Todo/Models/TodoItems/TodoItemEditFields.cs
+++ b/Todo/Models/TodoItems/TodoItemEditFields.cs
@@ -1,4 +1,5 @@
-using Todo.Data.Entities;
+using System.ComponentModel.DataAnnotations;
+using Todo.Data.Entities;
 
 namespace Todo.Models.TodoItems
 {
@@ -9,6 +10,7 @@ public class TodoItemEditFields
         public string TodoListTitle { get; set; }
         public int TodoItemId { get; set; }
         public bool IsDone { get; set; }
+        [Display(Name = "Responsible Party")]
         public string ResponsiblePartyId { get; set; }
         public Importance Importance { get; set; }
 
@@ -22,7 +24,7 @@ public TodoItemEditFields(int todoListId, string todoListTitle, int todoItemId,
             Title = title;
             IsDone = isDone;
             ResponsiblePartyId = responsiblePartyId;
-            Importance = Importance.Medium;
+            Importance = Importance;
         }
     }
 }
\ No newline at end of file
diff --git a/Todo/Services/ApplicationDbContextConvenience.cs b/Todo/Services/ApplicationDbContextConvenience.cs
index 3549d4b3..04466c7f 100644
--- a/Todo/Services/ApplicationDbContextConvenience.cs
+++ b/Todo/Services/ApplicationDbContextConvenience.cs
@@ -10,8 +10,11 @@ public static class ApplicationDbContextConvenience
         public static IQueryable<TodoList> RelevantTodoLists(this ApplicationDbContext dbContext, string userId)
         {
             return dbContext.TodoLists.Include(tl => tl.Owner)
-                .Include(tl => tl.Items)
-                .Where(tl => tl.Owner.Id == userId);
+               .Include(tl => tl.Items)
+               .ThenInclude(ti => ti.ResponsibleParty)
+               .Where(w => w.Items
+                        .Any(w => w.ResponsiblePartyId == userId)
+                        || w.Owner.Id == userId);
         }
 
         public static TodoList SingleTodoList(this ApplicationDbContext dbContext, int todoListId)
diff --git a/Todo/Views/TodoList/Detail.cshtml b/Todo/Views/TodoList/Detail.cshtml
index 650f0bc2..791dda81 100644
--- a/Todo/Views/TodoList/Detail.cshtml
+++ b/Todo/Views/TodoList/Detail.cshtml
@@ -14,12 +14,21 @@
     <ul class="list-group">
 
         <li class="list-group-item">
-            <a asp-action="Create" asp-controller="TodoItem" asp-route-todoListId="@Model.TodoListId">
-                <strong>Add New Item</strong>
-            </a>
+            <div class="flex-container">
+                <div>
+                    <a asp-action="Create" asp-controller="TodoItem" asp-route-todoListId="@Model.TodoListId">
+                        <strong>Add New Item</strong>
+                    </a>
+                </div>
+                <div>
+                    <input type="checkbox" id="chkDoneItems" name="chkDoneItems" onclick="filterHiddenItems(this)">
+                    <label for="chkDoneItems"> Hide Done Items</label><br>
+                </div>
+            </div>
+              
         </li>
 
-        @foreach (var item in Model.Items)
+        @foreach (var item in Model.Items.OrderBy(o => o.Importance))
         {
             string contextualClass;
             switch (item.Importance)
@@ -35,32 +44,32 @@
                     break;
             }
 
-            <li class="list-group-item @contextualClass">
-                
+            <li data-isDone="@item.IsDone" class="list-group-item @contextualClass">
+
                 <div class="row">
 
-                <div class="col-md-8">
-                    <a asp-action="Edit" asp-controller="TodoItem" asp-route-todoItemId="@item.TodoItemId">
+                    <div class="col-md-8">
+                        <a asp-action="Edit" asp-controller="TodoItem" asp-route-todoItemId="@item.TodoItemId">
 
-                        @if (item.IsDone)
-                        {
-                            <s>@item.Title</s>
-                        }
-                        else
-                        {
-                            <text>@item.Title</text>
-                        }
-                    </a>
-                </div>
+                            @if (item.IsDone)
+                            {
+                                <s>@item.Title</s>
+                            }
+                            else
+                            {
+                                <text>@item.Title</text>
+                            }
+                        </a>
+                    </div>
 
-                <div class="col-md-4 text-right">
-                    <small>
-                        @item.ResponsibleParty.UserName
+                    <div class="col-md-4 text-right">
+                        <small>
+                            @item.ResponsibleParty.UserName
 
-                        <img src="https://www.gravatar.com/avatar/@Gravatar.GetHash(item.ResponsibleParty.Email)?s=30"/>
+                            <img src="https://www.gravatar.com/avatar/@Gravatar.GetHash(item.ResponsibleParty.Email)?s=30" />
 
-                    </small>
-                </div>
+                        </small>
+                    </div>
                 </div>
 
             </li>
diff --git a/Todo/wwwroot/css/site.css b/Todo/wwwroot/css/site.css
index b6b779a4..4440f78a 100644
--- a/Todo/wwwroot/css/site.css
+++ b/Todo/wwwroot/css/site.css
@@ -35,3 +35,8 @@ body {
         display: none;
     }
 }
+
+.flex-container {
+    justify-content: space-between;
+    display: flex;
+}
diff --git a/Todo/wwwroot/js/site.js b/Todo/wwwroot/js/site.js
index b2f58e17..e4c902d4 100644
--- a/Todo/wwwroot/js/site.js
+++ b/Todo/wwwroot/js/site.js
@@ -2,3 +2,11 @@
 // for details on configuring this project to bundle and minify static web assets.
 
 // Write your JavaScript code.
+function filterHiddenItems(element) {
+
+    let elements = document.querySelectorAll('[data-isDone="True"]');
+    let displayVal = element.checked ? "none" : "block";
+        
+    for (let i = 0; i < elements.length; i++) 
+        elements[i].style.display = displayVal; 
+}
\ No newline at end of file

From af87bffdaab2986ab5acb7fbc2810ea3723a778b Mon Sep 17 00:00:00 2001
From: Aron Ridgway <Aron.Ridgway@clearview-continuity.com>
Date: Thu, 1 Jul 2021 20:14:17 +0100
Subject: [PATCH 2/3] Remaining Tasks (apologies the commits are not per task)

---
 Todo.Tests/Todo.Tests.csproj                  |   6 +
 .../WhenTodoItemIsConvertedToEditFields.cs    |   6 +
 Todo/ApiControllers/TodoItemController.cs     |  40 ++
 Todo/Controllers/TodoItemController.cs        |   3 +-
 Todo/Data/Entities/TodoItem.cs                |   5 +-
 ...94639_TodoItem_add_column_risk.Designer.cs | 343 ++++++++++++++++++
 ...20210629194639_TodoItem_add_column_risk.cs |  23 ++
 .../ApplicationDbContextModelSnapshot.cs      | 154 +++++---
 .../TodoItems/TodoItemCreateFieldsFactory.cs  |   2 +-
 .../TodoItems/TodoItemEditFieldsFactory.cs    |   3 +-
 .../TodoItemSummaryViewmodelFactory.cs        |   2 +-
 .../TodoListDetailViewmodelFactory.cs         |   2 +-
 Todo/Models/TodoItems/TodoItemEditFields.cs   |   6 +-
 .../TodoItems/TodoItemSummaryViewmodel.cs     |   4 +-
 Todo/Services/Gravatar.cs                     | 109 +++++-
 Todo/Todo.csproj                              |   4 +
 Todo/Views/Shared/_LoginPartial.cshtml        |   8 +-
 Todo/Views/TodoItem/Create.cshtml             |   5 +-
 Todo/Views/TodoItem/Edit.cshtml               |   9 +-
 Todo/Views/TodoItem/_Create.cshtml            |  54 +++
 Todo/Views/TodoList/Detail.cshtml             |  25 +-
 Todo/wwwroot/js/site.js                       |  33 +-
 22 files changed, 772 insertions(+), 74 deletions(-)
 create mode 100644 Todo/ApiControllers/TodoItemController.cs
 create mode 100644 Todo/Data/Migrations/20210629194639_TodoItem_add_column_risk.Designer.cs
 create mode 100644 Todo/Data/Migrations/20210629194639_TodoItem_add_column_risk.cs
 create mode 100644 Todo/Views/TodoItem/_Create.cshtml

diff --git a/Todo.Tests/Todo.Tests.csproj b/Todo.Tests/Todo.Tests.csproj
index 726a5e71..d33dccb4 100644
--- a/Todo.Tests/Todo.Tests.csproj
+++ b/Todo.Tests/Todo.Tests.csproj
@@ -7,11 +7,17 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.13" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.13" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.13" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
diff --git a/Todo.Tests/WhenTodoItemIsConvertedToEditFields.cs b/Todo.Tests/WhenTodoItemIsConvertedToEditFields.cs
index 2025be1b..68c7f5f5 100644
--- a/Todo.Tests/WhenTodoItemIsConvertedToEditFields.cs
+++ b/Todo.Tests/WhenTodoItemIsConvertedToEditFields.cs
@@ -41,5 +41,11 @@ public void EqualImportance()
         {
             Assert.Equal(srcTodoItem.Importance, resultFields.Importance);
         }
+
+        [Fact]
+        public void EqualRank()
+        {
+            Assert.Equal(srcTodoItem.Rank, resultFields.Rank);
+        }
     }
 }
\ No newline at end of file
diff --git a/Todo/ApiControllers/TodoItemController.cs b/Todo/ApiControllers/TodoItemController.cs
new file mode 100644
index 00000000..53ba8504
--- /dev/null
+++ b/Todo/ApiControllers/TodoItemController.cs
@@ -0,0 +1,40 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Todo.Data;
+using Todo.Services;
+
+namespace Todo.ApiControllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class TodoItemController : ControllerBase
+    {
+        private readonly ApplicationDbContext dbContext;
+
+        public TodoItemController(ApplicationDbContext dbContext)
+        {
+            this.dbContext = dbContext;
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> SetRank(int rank, int todoItemId)
+        {
+            var todoItem = dbContext.SingleTodoItem(todoItemId);
+
+            if (todoItem != null)
+            {
+                todoItem.Rank = rank;
+                dbContext.Update(todoItem);
+                await dbContext.SaveChangesAsync();
+            }               
+            else
+                return BadRequest();
+
+            return Ok();
+        }
+    }
+}
diff --git a/Todo/Controllers/TodoItemController.cs b/Todo/Controllers/TodoItemController.cs
index e4a44fce..6dc01c81 100644
--- a/Todo/Controllers/TodoItemController.cs
+++ b/Todo/Controllers/TodoItemController.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Net;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Todo.Data;
diff --git a/Todo/Data/Entities/TodoItem.cs b/Todo/Data/Entities/TodoItem.cs
index 4e08ea41..2b38b0d9 100644
--- a/Todo/Data/Entities/TodoItem.cs
+++ b/Todo/Data/Entities/TodoItem.cs
@@ -9,18 +9,19 @@ public class TodoItem
         public IdentityUser ResponsibleParty { get; set; }
         public bool IsDone { get; set; }
         public Importance Importance { get; set; }
-
+        public int Rank { get; set; }
         public int TodoListId { get; set; }
         public TodoList TodoList { get; set; }
 
         protected TodoItem() { }
 
-        public TodoItem(int todoListId, string responsiblePartyId, string title, Importance importance)
+        public TodoItem(int todoListId, string responsiblePartyId, string title, Importance importance, int rank = 0)
         {
             TodoListId = todoListId;
             ResponsiblePartyId = responsiblePartyId;
             Title = title;
             Importance = importance;
+            Rank = rank;
         }
     }
 }
\ No newline at end of file
diff --git a/Todo/Data/Migrations/20210629194639_TodoItem_add_column_risk.Designer.cs b/Todo/Data/Migrations/20210629194639_TodoItem_add_column_risk.Designer.cs
new file mode 100644
index 00000000..deb1db23
--- /dev/null
+++ b/Todo/Data/Migrations/20210629194639_TodoItem_add_column_risk.Designer.cs
@@ -0,0 +1,343 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Todo.Data;
+
+namespace Todo.Data.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20210629194639_TodoItem_add_column_risk")]
+    partial class TodoItem_add_column_risk
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "3.1.13");
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserName")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens");
+                });
+
+            modelBuilder.Entity("Todo.Data.Entities.TodoItem", b =>
+                {
+                    b.Property<int>("TodoItemId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Importance")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDone")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Rank")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ResponsiblePartyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("TodoListId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("TodoItemId");
+
+                    b.HasIndex("ResponsiblePartyId");
+
+                    b.HasIndex("TodoListId");
+
+                    b.ToTable("TodoItems");
+                });
+
+            modelBuilder.Entity("Todo.Data.Entities.TodoList", b =>
+                {
+                    b.Property<int>("TodoListId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("OwnerId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("TodoListId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("TodoLists");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Todo.Data.Entities.TodoItem", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "ResponsibleParty")
+                        .WithMany()
+                        .HasForeignKey("ResponsiblePartyId");
+
+                    b.HasOne("Todo.Data.Entities.TodoList", "TodoList")
+                        .WithMany("Items")
+                        .HasForeignKey("TodoListId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Todo.Data.Entities.TodoList", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Todo/Data/Migrations/20210629194639_TodoItem_add_column_risk.cs b/Todo/Data/Migrations/20210629194639_TodoItem_add_column_risk.cs
new file mode 100644
index 00000000..646622b6
--- /dev/null
+++ b/Todo/Data/Migrations/20210629194639_TodoItem_add_column_risk.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Todo.Data.Migrations
+{
+    public partial class TodoItem_add_column_risk : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "Rank",
+                table: "TodoItems",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Rank",
+                table: "TodoItems");
+        }
+    }
+}
diff --git a/Todo/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/Todo/Data/Migrations/ApplicationDbContextModelSnapshot.cs
index c05e7dee..259af32d 100644
--- a/Todo/Data/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Todo/Data/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -14,20 +14,23 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.4-rtm-31024");
+                .HasAnnotation("ProductVersion", "3.1.13");
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
                 {
                     b.Property<string>("Id")
-                        .ValueGeneratedOnAdd();
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken();
+                        .IsConcurrencyToken()
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
+                        .HasColumnType("TEXT")
                         .HasMaxLength(256);
 
                     b.Property<string>("NormalizedName")
+                        .HasColumnType("TEXT")
                         .HasMaxLength(256);
 
                     b.HasKey("Id");
@@ -42,14 +45,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
                 {
                     b.Property<int>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
 
-                    b.Property<string>("ClaimType");
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("TEXT");
 
-                    b.Property<string>("ClaimValue");
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("RoleId")
-                        .IsRequired();
+                        .IsRequired()
+                        .HasColumnType("TEXT");
 
                     b.HasKey("Id");
 
@@ -61,39 +68,53 @@ protected override void BuildModel(ModelBuilder modelBuilder)
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
                 {
                     b.Property<string>("Id")
-                        .ValueGeneratedOnAdd();
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("AccessFailedCount");
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken();
+                        .IsConcurrencyToken()
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Email")
+                        .HasColumnType("TEXT")
                         .HasMaxLength(256);
 
-                    b.Property<bool>("EmailConfirmed");
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("INTEGER");
 
-                    b.Property<bool>("LockoutEnabled");
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("INTEGER");
 
-                    b.Property<DateTimeOffset?>("LockoutEnd");
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("NormalizedEmail")
+                        .HasColumnType("TEXT")
                         .HasMaxLength(256);
 
                     b.Property<string>("NormalizedUserName")
+                        .HasColumnType("TEXT")
                         .HasMaxLength(256);
 
-                    b.Property<string>("PasswordHash");
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("TEXT");
 
-                    b.Property<string>("PhoneNumber");
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("TEXT");
 
-                    b.Property<bool>("PhoneNumberConfirmed");
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("INTEGER");
 
-                    b.Property<string>("SecurityStamp");
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("TEXT");
 
-                    b.Property<bool>("TwoFactorEnabled");
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("UserName")
+                        .HasColumnType("TEXT")
                         .HasMaxLength(256);
 
                     b.HasKey("Id");
@@ -111,14 +132,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
                 {
                     b.Property<int>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
 
-                    b.Property<string>("ClaimType");
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("TEXT");
 
-                    b.Property<string>("ClaimValue");
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("UserId")
-                        .IsRequired();
+                        .IsRequired()
+                        .HasColumnType("TEXT");
 
                     b.HasKey("Id");
 
@@ -130,15 +155,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
                 {
                     b.Property<string>("LoginProvider")
+                        .HasColumnType("TEXT")
                         .HasMaxLength(128);
 
                     b.Property<string>("ProviderKey")
+                        .HasColumnType("TEXT")
                         .HasMaxLength(128);
 
-                    b.Property<string>("ProviderDisplayName");
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("UserId")
-                        .IsRequired();
+                        .IsRequired()
+                        .HasColumnType("TEXT");
 
                     b.HasKey("LoginProvider", "ProviderKey");
 
@@ -149,9 +178,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
                 {
-                    b.Property<string>("UserId");
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<string>("RoleId");
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT");
 
                     b.HasKey("UserId", "RoleId");
 
@@ -162,15 +193,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
                 {
-                    b.Property<string>("UserId");
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("LoginProvider")
+                        .HasColumnType("TEXT")
                         .HasMaxLength(128);
 
                     b.Property<string>("Name")
+                        .HasColumnType("TEXT")
                         .HasMaxLength(128);
 
-                    b.Property<string>("Value");
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
 
                     b.HasKey("UserId", "LoginProvider", "Name");
 
@@ -180,17 +215,26 @@ protected override void BuildModel(ModelBuilder modelBuilder)
             modelBuilder.Entity("Todo.Data.Entities.TodoItem", b =>
                 {
                     b.Property<int>("TodoItemId")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Importance")
+                        .HasColumnType("INTEGER");
 
-                    b.Property<int>("Importance");
+                    b.Property<bool>("IsDone")
+                        .HasColumnType("INTEGER");
 
-                    b.Property<bool>("IsDone");
+                    b.Property<int>("Rank")
+                        .HasColumnType("INTEGER");
 
-                    b.Property<string>("ResponsiblePartyId");
+                    b.Property<string>("ResponsiblePartyId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<string>("Title");
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("TodoListId");
+                    b.Property<int>("TodoListId")
+                        .HasColumnType("INTEGER");
 
                     b.HasKey("TodoItemId");
 
@@ -204,12 +248,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
             modelBuilder.Entity("Todo.Data.Entities.TodoList", b =>
                 {
                     b.Property<int>("TodoListId")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
 
-                    b.Property<string>("OwnerId");
+                    b.Property<string>("OwnerId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Title")
-                        .IsRequired();
+                        .IsRequired()
+                        .HasColumnType("TEXT");
 
                     b.HasKey("TodoListId");
 
@@ -220,47 +267,53 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
                 {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
                         .WithMany()
                         .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
                 {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
                 {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
                 {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
                         .WithMany()
                         .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
                 {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Todo.Data.Entities.TodoItem", b =>
@@ -272,7 +325,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasOne("Todo.Data.Entities.TodoList", "TodoList")
                         .WithMany("Items")
                         .HasForeignKey("TodoListId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Todo.Data.Entities.TodoList", b =>
diff --git a/Todo/EntityModelMappers/TodoItems/TodoItemCreateFieldsFactory.cs b/Todo/EntityModelMappers/TodoItems/TodoItemCreateFieldsFactory.cs
index a5cd94a2..2a6f250a 100644
--- a/Todo/EntityModelMappers/TodoItems/TodoItemCreateFieldsFactory.cs
+++ b/Todo/EntityModelMappers/TodoItems/TodoItemCreateFieldsFactory.cs
@@ -3,7 +3,7 @@
 
 namespace Todo.EntityModelMappers.TodoItems
 {
-    public class TodoItemCreateFieldsFactory
+    public static class TodoItemCreateFieldsFactory
     {
         public static TodoItemCreateFields Create(TodoList todoList, string defaultResponsibleUserId)
         {
diff --git a/Todo/EntityModelMappers/TodoItems/TodoItemEditFieldsFactory.cs b/Todo/EntityModelMappers/TodoItems/TodoItemEditFieldsFactory.cs
index 1b35f05c..40e05419 100644
--- a/Todo/EntityModelMappers/TodoItems/TodoItemEditFieldsFactory.cs
+++ b/Todo/EntityModelMappers/TodoItems/TodoItemEditFieldsFactory.cs
@@ -9,7 +9,7 @@ public static TodoItemEditFields Create(TodoItem todoItem)
         {
             var todoList = todoItem.TodoList;
             return new TodoItemEditFields(todoList.TodoListId, todoList.Title, todoItem.TodoItemId, todoItem.Title,
-                todoItem.IsDone, todoItem.ResponsiblePartyId, todoItem.Importance);
+                todoItem.IsDone, todoItem.ResponsiblePartyId, todoItem.Importance, todoItem.Rank);
         }
 
         public static void Update(TodoItemEditFields src, TodoItem dest)
@@ -18,6 +18,7 @@ public static void Update(TodoItemEditFields src, TodoItem dest)
             dest.IsDone = src.IsDone;
             dest.ResponsiblePartyId = src.ResponsiblePartyId;
             dest.Importance = src.Importance;
+            dest.Rank = src.Rank;
         }
     }
 }
\ No newline at end of file
diff --git a/Todo/EntityModelMappers/TodoItems/TodoItemSummaryViewmodelFactory.cs b/Todo/EntityModelMappers/TodoItems/TodoItemSummaryViewmodelFactory.cs
index c223577b..7cf82c5f 100644
--- a/Todo/EntityModelMappers/TodoItems/TodoItemSummaryViewmodelFactory.cs
+++ b/Todo/EntityModelMappers/TodoItems/TodoItemSummaryViewmodelFactory.cs
@@ -7,7 +7,7 @@ public static class TodoItemSummaryViewmodelFactory
     {
         public static TodoItemSummaryViewmodel Create(TodoItem ti)
         {
-            return new TodoItemSummaryViewmodel(ti.TodoItemId, ti.Title, ti.IsDone, UserSummaryViewmodelFactory.Create(ti.ResponsibleParty), ti.Importance);
+            return new TodoItemSummaryViewmodel(ti.TodoItemId, ti.Title, ti.IsDone, UserSummaryViewmodelFactory.Create(ti.ResponsibleParty), ti.Importance, ti.Rank);
         }
     }
 }
\ No newline at end of file
diff --git a/Todo/EntityModelMappers/TodoLists/TodoListDetailViewmodelFactory.cs b/Todo/EntityModelMappers/TodoLists/TodoListDetailViewmodelFactory.cs
index dd5d1014..ea9faf06 100644
--- a/Todo/EntityModelMappers/TodoLists/TodoListDetailViewmodelFactory.cs
+++ b/Todo/EntityModelMappers/TodoLists/TodoListDetailViewmodelFactory.cs
@@ -9,7 +9,7 @@ public static class TodoListDetailViewmodelFactory
     {
         public static TodoListDetailViewmodel Create(TodoList todoList)
         {
-            var items = todoList.Items.Select(TodoItemSummaryViewmodelFactory.Create).ToList();
+            var items = todoList.Items.Select(TodoItemSummaryViewmodelFactory.Create).OrderBy(o => o.Rank).ToList();
             return new TodoListDetailViewmodel(todoList.TodoListId, todoList.Title, items);
         }
     }
diff --git a/Todo/Models/TodoItems/TodoItemEditFields.cs b/Todo/Models/TodoItems/TodoItemEditFields.cs
index e1eb6974..4c6a5562 100644
--- a/Todo/Models/TodoItems/TodoItemEditFields.cs
+++ b/Todo/Models/TodoItems/TodoItemEditFields.cs
@@ -9,6 +9,7 @@ public class TodoItemEditFields
         public string Title { get; set; }
         public string TodoListTitle { get; set; }
         public int TodoItemId { get; set; }
+        public int Rank { get; set; }
         public bool IsDone { get; set; }
         [Display(Name = "Responsible Party")]
         public string ResponsiblePartyId { get; set; }
@@ -16,7 +17,7 @@ public class TodoItemEditFields
 
         public TodoItemEditFields() { }
 
-        public TodoItemEditFields(int todoListId, string todoListTitle, int todoItemId, string title, bool isDone, string responsiblePartyId, Importance importance)
+        public TodoItemEditFields(int todoListId, string todoListTitle, int todoItemId, string title, bool isDone, string responsiblePartyId, Importance importance, int rank)
         {
             TodoListId = todoListId;
             TodoListTitle = todoListTitle;
@@ -24,7 +25,8 @@ public TodoItemEditFields(int todoListId, string todoListTitle, int todoItemId,
             Title = title;
             IsDone = isDone;
             ResponsiblePartyId = responsiblePartyId;
-            Importance = Importance;
+            Importance = importance;
+            Rank = rank;
         }
     }
 }
\ No newline at end of file
diff --git a/Todo/Models/TodoItems/TodoItemSummaryViewmodel.cs b/Todo/Models/TodoItems/TodoItemSummaryViewmodel.cs
index 934010a7..e3b2d55c 100644
--- a/Todo/Models/TodoItems/TodoItemSummaryViewmodel.cs
+++ b/Todo/Models/TodoItems/TodoItemSummaryViewmodel.cs
@@ -6,17 +6,19 @@ public class TodoItemSummaryViewmodel
     {
         public int TodoItemId { get; }
         public string Title { get; }
+        public int Rank { get; }
         public UserSummaryViewmodel ResponsibleParty { get; }
         public bool IsDone { get; }
         public Importance Importance { get; }
 
-        public TodoItemSummaryViewmodel(int todoItemId, string title, bool isDone, UserSummaryViewmodel responsibleParty, Importance importance)
+        public TodoItemSummaryViewmodel(int todoItemId, string title, bool isDone, UserSummaryViewmodel responsibleParty, Importance importance, int rank)
         {
             TodoItemId = todoItemId;
             Title = title;
             IsDone = isDone;
             ResponsibleParty = responsibleParty;
             Importance = importance;
+            Rank = rank;
         }
     }
 }
\ No newline at end of file
diff --git a/Todo/Services/Gravatar.cs b/Todo/Services/Gravatar.cs
index 81ac8efe..0fe1aafa 100644
--- a/Todo/Services/Gravatar.cs
+++ b/Todo/Services/Gravatar.cs
@@ -1,5 +1,14 @@
-using System.Security.Cryptography;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Security.Cryptography;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Todo.Services
 {
@@ -20,5 +29,103 @@ public static string GetHash(string emailAddress)
                 return builder.ToString().ToLowerInvariant();
             }
         }
+
+        public static async Task<string> GetProfileName(string emailAddress)
+        {
+            HttpClient client = new HttpClient();
+
+            var hash = GetHash(emailAddress);
+            var url = $"https://www.gravatar.com/{hash}.json"; //json url
+            var hasAccountUrl = $"https://www.gravatar.com/avatar/{hash}?d=404";
+
+            var cts = new CancellationTokenSource();
+
+            //lets impersonate browser headers.
+            client.DefaultRequestHeaders.Add("user-agent", "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; WOW64; Trident/6.0)");
+
+            try
+            {
+                HttpResponseMessage hasAccount = await client.GetAsync(hasAccountUrl, cts.Token);
+
+                //if we have a 404 then the email address is not asscioted to a gravatar account.
+                if (hasAccount.StatusCode == System.Net.HttpStatusCode.NotFound)
+                    return "";
+
+                HttpResponseMessage response = await client.GetAsync(url, cts.Token);
+                response.EnsureSuccessStatusCode();
+                
+                var responseBody = await response.Content.ReadAsStringAsync();
+
+                var json = JsonConvert.DeserializeObject<Root>(responseBody);
+
+                var name = json?.Entry?.Select(s => s.Name.Formatted).FirstOrDefault();
+
+                return !string.IsNullOrEmpty(name) ? $" - {name}" : "";
+            }
+            catch (TaskCanceledException ex)
+            {
+                //If the api call timeouts, catch it and display an error instead of a username so we know something has gone wrong.
+                Console.WriteLine(ex.InnerException);
+                return "API - ERROR (please contact support)";
+            }
+        }
+
+        #region model
+
+        public class Name
+        {
+            [JsonProperty("givenName")]
+            public string GivenName { get; set; }
+
+            [JsonProperty("familyName")]
+            public string FamilyName { get; set; }
+
+            [JsonProperty("formatted")]
+            public string Formatted { get; set; }
+        }
+
+        public class Entry
+        {
+            [JsonProperty("id")]
+            public string Id { get; set; }
+
+            [JsonProperty("hash")]
+            public string Hash { get; set; }
+
+            [JsonProperty("requestHash")]
+            public string RequestHash { get; set; }
+
+            [JsonProperty("profileUrl")]
+            public string ProfileUrl { get; set; }
+
+            [JsonProperty("preferredUsername")]
+            public string PreferredUsername { get; set; }
+
+            [JsonProperty("thumbnailUrl")]
+            public string ThumbnailUrl { get; set; }
+
+            [JsonProperty("photos")]
+            public List<object> Photos { get; set; }
+
+            [JsonProperty("name")]
+            public Name Name { get; set; }
+
+            [JsonProperty("displayName")]
+            public string DisplayName { get; set; }
+
+            [JsonProperty("currentLocation")]
+            public string CurrentLocation { get; set; }
+
+            [JsonProperty("urls")]
+            public List<object> Urls { get; set; }
+        }
+
+        public class Root
+        {
+            [JsonProperty("entry")]
+            public List<Entry> Entry { get; set; }
+        }
+        #endregion
+
     }
 }
\ No newline at end of file
diff --git a/Todo/Todo.csproj b/Todo/Todo.csproj
index 6e31e445..8609b39b 100644
--- a/Todo/Todo.csproj
+++ b/Todo/Todo.csproj
@@ -12,6 +12,10 @@
     <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.1.13" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.13" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.5" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/Todo/Views/Shared/_LoginPartial.cshtml b/Todo/Views/Shared/_LoginPartial.cshtml
index 2892faa9..ae0fa2c3 100644
--- a/Todo/Views/Shared/_LoginPartial.cshtml
+++ b/Todo/Views/Shared/_LoginPartial.cshtml
@@ -7,6 +7,7 @@
 @inject SignInManager<IdentityUser> SignInManager
 @inject UserManager<IdentityUser> UserManager
 
+
 @if (SignInManager.IsSignedIn(User))
 {
     <form asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Action("Index", "Home", new { area = "" })" method="post" id="logoutForm" class="navbar-right">
@@ -19,10 +20,13 @@
                         var iu = await UserManager.GetUserAsync(User);
                         var emailAddress = await UserManager.GetEmailAsync(iu);
                         var gravatarhash = Gravatar.GetHash(emailAddress);
+ 
+                        var profileName = await Gravatar.GetProfileName(emailAddress);
+
                     }
 
                     <img src="https://www.gravatar.com/avatar/@gravatarhash?s=30" />
-                    @UserManager.GetUserName(User)
+                    @UserManager.GetUserName(User) @profileName
                 </a>
             </li>
             <li>
@@ -37,4 +41,4 @@ else
         <li><a asp-area="Identity" asp-page="/Account/Register">Register</a></li>
         <li><a asp-area="Identity" asp-page="/Account/Login">Login</a></li>
     </ul>
-}
\ No newline at end of file
+}
diff --git a/Todo/Views/TodoItem/Create.cshtml b/Todo/Views/TodoItem/Create.cshtml
index 0b1b7c3b..f0e0393f 100644
--- a/Todo/Views/TodoItem/Create.cshtml
+++ b/Todo/Views/TodoItem/Create.cshtml
@@ -27,13 +27,12 @@
                 <span asp-validation-for="Title" class="text-danger"></span>
             </div>
 
-
             <div class="form-group">
                 <label asp-for="Importance"></label>
                 @Html.DropDownListFor(
                     m => m.Importance,
                     SelectListConvenience.ImportanceSelectListItems,
-                    new {@class="form-control"}
+                    new { @class = "form-control" }
                     )
                 <span asp-validation-for="Importance" class="text-danger"></span>
             </div>
@@ -43,7 +42,7 @@
                 @Html.DropDownListFor(
                     m => m.ResponsiblePartyId,
                     dbContext.UserSelectListItems(),
-                    new {@class="form-control"}
+                    new { @class = "form-control" }
                     )
                 <span asp-validation-for="ResponsiblePartyId" class="text-danger"></span>
             </div>
diff --git a/Todo/Views/TodoItem/Edit.cshtml b/Todo/Views/TodoItem/Edit.cshtml
index 5668a213..e125ce45 100644
--- a/Todo/Views/TodoItem/Edit.cshtml
+++ b/Todo/Views/TodoItem/Edit.cshtml
@@ -29,13 +29,18 @@
                 <span asp-validation-for="Title" class="text-danger"></span>
             </div>
 
+            <div class="form-group">
+                <label asp-for="Rank"></label>
+                <input asp-for="Rank" class="form-control" />
+                <span asp-validation-for="Rank" class="text-danger"></span>
+            </div>
 
             <div class="form-group">
                 <label asp-for="Importance"></label>
                 @Html.DropDownListFor(
                     m => m.Importance,
                     SelectListConvenience.ImportanceSelectListItems,
-                    new {@class="form-control"}
+                    new { @class = "form-control" }
                     )
                 <span asp-validation-for="Importance" class="text-danger"></span>
             </div>
@@ -52,7 +57,7 @@
                 @Html.DropDownListFor(
                     m => m.ResponsiblePartyId,
                     dbContext.UserSelectListItems(),
-                    new {@class="form-control"}
+                    new { @class = "form-control" }
                     )
                 <span asp-validation-for="ResponsiblePartyId" class="text-danger"></span>
             </div>
diff --git a/Todo/Views/TodoItem/_Create.cshtml b/Todo/Views/TodoItem/_Create.cshtml
new file mode 100644
index 00000000..35ccf2a7
--- /dev/null
+++ b/Todo/Views/TodoItem/_Create.cshtml
@@ -0,0 +1,54 @@
+@using Microsoft.AspNetCore.Identity
+@using Todo.Data
+@using Todo.Data.Entities
+@using Todo.Views.TodoItem
+@model Todo.Models.TodoItems.TodoItemCreateFields
+
+@{
+    ViewData["Title"] = $"New Item in {Model.TodoListTitle}";
+}
+
+@inject ApplicationDbContext dbContext
+<div class="container-fluid">
+    <h2>@ViewData["Title"]</h2>
+
+    @using (Html.BeginForm("Create", "TodoItem", FormMethod.Post))
+    {
+
+        @Html.AntiForgeryToken()
+
+        @Html.HiddenFor(m => m.TodoListTitle)
+        @Html.HiddenFor(m => m.TodoListId)
+
+        <div class="form-group">
+            <label asp-for="Title"></label>
+            <input asp-for="Title" class="form-control" />
+            <span asp-validation-for="Title" class="text-danger"></span>
+        </div>
+
+        <div class="form-group">
+            <label asp-for="Importance"></label>
+            @Html.DropDownListFor(
+                m => m.Importance,
+                SelectListConvenience.ImportanceSelectListItems,
+                new { @class = "form-control" }
+                )
+            <span asp-validation-for="Importance" class="text-danger"></span>
+        </div>
+
+        <div class="form-group">
+            <label asp-for="ResponsiblePartyId"></label>
+            @Html.DropDownListFor(
+                m => m.ResponsiblePartyId,
+                dbContext.UserSelectListItems(),
+                new { @class = "form-control" }
+                )
+            <span asp-validation-for="ResponsiblePartyId" class="text-danger"></span>
+        </div>
+
+        <div class="form-group">
+            <button type="submit" class="btn btn-default">Save</button>
+        </div>
+
+    }
+</div>
diff --git a/Todo/Views/TodoList/Detail.cshtml b/Todo/Views/TodoList/Detail.cshtml
index 791dda81..dc6831a0 100644
--- a/Todo/Views/TodoList/Detail.cshtml
+++ b/Todo/Views/TodoList/Detail.cshtml
@@ -1,6 +1,7 @@
 @using Todo.Controllers
 @using Todo.Data.Entities
 @using Todo.Services
+@using Todo.Models.TodoItems
 @model Todo.Models.TodoLists.TodoListDetailViewmodel
 
 @{
@@ -9,27 +10,41 @@
 
 <h2>@ViewData["Title"]</h2>
 
-<div class="col-md-6">
+@*This Modal should be on a shared place so we can reuse and pass it a form/model*@
+<div class="modal fade bd-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            @{
+                var model = new TodoItemCreateFields { TodoListId = Model.TodoListId, TodoListTitle = Model.Title};
+                await Html.RenderPartialAsync("~/Views/TodoItem/_Create.cshtml", model);
+            }
+        </div>
+    </div>
+</div>
 
-    <ul class="list-group">
+<div class="col-md-6">
+    <ul id="toDoList" class="list-group">
 
         <li class="list-group-item">
             <div class="flex-container">
                 <div>
-                    <a asp-action="Create" asp-controller="TodoItem" asp-route-todoListId="@Model.TodoListId">
+                    <a data-toggle="modal" data-target=".bd-example-modal-lg">
                         <strong>Add New Item</strong>
                     </a>
                 </div>
+                <div>
+                    <button data-sort-direction="asc" id="btnSortRank" name="btnSortRank" onclick="sortByRank(this)">Sorted By Rank > asc</button>
+                </div>
                 <div>
                     <input type="checkbox" id="chkDoneItems" name="chkDoneItems" onclick="filterHiddenItems(this)">
                     <label for="chkDoneItems"> Hide Done Items</label><br>
                 </div>
             </div>
-              
         </li>
 
         @foreach (var item in Model.Items.OrderBy(o => o.Importance))
         {
+
             string contextualClass;
             switch (item.Importance)
             {
@@ -44,7 +59,7 @@
                     break;
             }
 
-            <li data-isDone="@item.IsDone" class="list-group-item @contextualClass">
+            <li data-isDone="@item.IsDone" data-rank="@item.Rank" class="list-group-item @contextualClass">
 
                 <div class="row">
 
diff --git a/Todo/wwwroot/js/site.js b/Todo/wwwroot/js/site.js
index e4c902d4..581f049b 100644
--- a/Todo/wwwroot/js/site.js
+++ b/Todo/wwwroot/js/site.js
@@ -2,6 +2,9 @@
 // for details on configuring this project to bundle and minify static web assets.
 
 // Write your JavaScript code.
+const _sortAsc = "asc";
+const _sortDesc = "desc";
+
 function filterHiddenItems(element) {
 
     let elements = document.querySelectorAll('[data-isDone="True"]');
@@ -9,4 +12,32 @@ function filterHiddenItems(element) {
         
     for (let i = 0; i < elements.length; i++) 
         elements[i].style.display = displayVal; 
-}
\ No newline at end of file
+}
+
+function sortByRank(element) {
+
+    let elements = document.querySelectorAll('[data-rank]');
+    let divs = Array.from(elements);
+    let currentSort = element.getAttribute('data-sort-direction');
+
+    //list loads from server ordered by rank asc.
+    let sorted = divs.reverse();;
+
+    if (currentSort === _sortAsc)
+        element.dataset.sortDirection = _sortDesc;
+    else if (currentSort === _sortDesc) 
+        element.dataset.sortDirection = _sortAsc;
+
+    console.log(element)
+    element.innerHTML = 'Sorted By Rank > ' + element.dataset.sortDirection;
+    
+    if (sorted !== undefined)
+        sorted.forEach(e => document.querySelector("#toDoList").appendChild(e));
+}
+
+function SetRankApi() {
+    alert("test");
+}
+
+
+

From ea2c0212472b82e4b528574aedbbff197b844eb6 Mon Sep 17 00:00:00 2001
From: Aron Ridgway <Aron.Ridgway@clearview-continuity.com>
Date: Thu, 1 Jul 2021 21:15:29 +0100
Subject: [PATCH 3/3] Add new api test for api

---
 Todo/ApiControllers/TodoItemController.cs | 15 ++++++++++++---
 Todo/Views/TodoItem/Edit.cshtml           |  1 +
 Todo/wwwroot/js/site.js                   | 21 +++++++++++++++++++--
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/Todo/ApiControllers/TodoItemController.cs b/Todo/ApiControllers/TodoItemController.cs
index 53ba8504..fb3b51d8 100644
--- a/Todo/ApiControllers/TodoItemController.cs
+++ b/Todo/ApiControllers/TodoItemController.cs
@@ -21,13 +21,16 @@ public TodoItemController(ApplicationDbContext dbContext)
         }
 
         [HttpPost]
-        public async Task<IActionResult> SetRank(int rank, int todoItemId)
+        public async Task<IActionResult> SetRank(RankSetModel model)
         {
-            var todoItem = dbContext.SingleTodoItem(todoItemId);
+            if (model.TodoItemId == 0)
+                return BadRequest();
+
+            var todoItem = dbContext.SingleTodoItem(model.TodoItemId);
 
             if (todoItem != null)
             {
-                todoItem.Rank = rank;
+                todoItem.Rank = model.Rank;
                 dbContext.Update(todoItem);
                 await dbContext.SaveChangesAsync();
             }               
@@ -36,5 +39,11 @@ public async Task<IActionResult> SetRank(int rank, int todoItemId)
 
             return Ok();
         }
+
+        public class RankSetModel
+        {
+            public int Rank { get; set; }
+            public int TodoItemId { get; set; }
+        }
     }
 }
diff --git a/Todo/Views/TodoItem/Edit.cshtml b/Todo/Views/TodoItem/Edit.cshtml
index e125ce45..492587de 100644
--- a/Todo/Views/TodoItem/Edit.cshtml
+++ b/Todo/Views/TodoItem/Edit.cshtml
@@ -33,6 +33,7 @@
                 <label asp-for="Rank"></label>
                 <input asp-for="Rank" class="form-control" />
                 <span asp-validation-for="Rank" class="text-danger"></span>
+                <button type="button" onclick="SetRankApi(@Html.Raw(Model.TodoItemId))"> Set Rank via Api</button>
             </div>
 
             <div class="form-group">
diff --git a/Todo/wwwroot/js/site.js b/Todo/wwwroot/js/site.js
index 581f049b..436cac95 100644
--- a/Todo/wwwroot/js/site.js
+++ b/Todo/wwwroot/js/site.js
@@ -35,8 +35,25 @@ function sortByRank(element) {
         sorted.forEach(e => document.querySelector("#toDoList").appendChild(e));
 }
 
-function SetRankApi() {
-    alert("test");
+function SetRankApi(todoItemId) {
+
+    var currentRank = document.getElementById('Rank').value;
+
+    var model = JSON.stringify({ rank: parseInt(currentRank), todoItemId: todoItemId });
+
+    $.ajax({
+        type: "POST",
+        url: '/api/TodoItem/',
+        data: model,
+        contentType: "application/json",
+        success: function (data) {
+            alert('Rank has been updated via the api')
+        },
+        error: function (data) {
+            alert('Something went wrong!')
+        }
+
+    });
 }