From 17ef5403e347784ddbf8ecda5391a806fb6e76f9 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Sat, 24 Feb 2024 20:23:36 +0000
Subject: [PATCH] feat: patch rather than PR status icons

use icons more suitable for applying patches than merging PRs
---
 .../components/proposals/ProposalsListItem.svelte |  4 ++--
 src/lib/components/proposals/Status.svelte        |  8 ++------
 src/lib/components/proposals/icons.ts             | 15 ++++++++++++++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/lib/components/proposals/ProposalsListItem.svelte b/src/lib/components/proposals/ProposalsListItem.svelte
index 3076cae..e198ff8 100644
--- a/src/lib/components/proposals/ProposalsListItem.svelte
+++ b/src/lib/components/proposals/ProposalsListItem.svelte
@@ -47,7 +47,7 @@
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 16 16"
       class="h-5 w-5 flex-none fill-success pt-1"
-      ><path d={proposal_icon_path.open} /></svg
+      ><path d={proposal_icon_path.open_patch} /></svg
     >
   {:else if status === proposal_status_closed}
     <svg
@@ -68,7 +68,7 @@
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 16 16"
       class="h-5 w-5 flex-none fill-primary pt-1"
-      ><path d={proposal_icon_path.merge} /></svg
+      ><path d={proposal_icon_path.applied} /></svg
     >
   {/if}
   <a
diff --git a/src/lib/components/proposals/Status.svelte b/src/lib/components/proposals/Status.svelte
index fbe671d..0e4f934 100644
--- a/src/lib/components/proposals/Status.svelte
+++ b/src/lib/components/proposals/Status.svelte
@@ -26,25 +26,22 @@
     class="btn btn-success btn-sm align-middle"
   >
     {#if status === proposal_status_open}
-      <!-- http://icon-sets.iconify.design/octicon/git-pull-request-16/ -->
       <svg
         xmlns="http://www.w3.org/2000/svg"
         viewBox="0 0 18 18"
         class="h-5 w-5 flex-none fill-success-content pt-1"
-        ><path d={proposal_icon_path.open} />
+        ><path d={proposal_icon_path.open_patch} />
       </svg>
       Open
     {:else if status === proposal_status_applied}
-      <!-- https://icon-sets.iconify.design/octicon/git-merge-16/ -->
       <svg
         xmlns="http://www.w3.org/2000/svg"
         viewBox="0 0 16 16"
         class="h-5 w-5 flex-none fill-primary-content pt-1"
-        ><path d={proposal_icon_path.merge} /></svg
+        ><path d={proposal_icon_path.applied} /></svg
       >
       Applied
     {:else if status === proposal_status_closed}
-      <!-- https://icon-sets.iconify.design/octicon/git-pull-request-closed-16/ -->
       <svg
         xmlns="http://www.w3.org/2000/svg"
         viewBox="0 0 16 16"
@@ -53,7 +50,6 @@
       >
       Closed
     {:else if status === proposal_status_draft}
-      <!-- https://icon-sets.iconify.design/octicon/git-pull-request-draft-16// -->
       <svg
         xmlns="http://www.w3.org/2000/svg"
         viewBox="0 0 16 16"
diff --git a/src/lib/components/proposals/icons.ts b/src/lib/components/proposals/icons.ts
index 81b4a6b..b885c05 100644
--- a/src/lib/components/proposals/icons.ts
+++ b/src/lib/components/proposals/icons.ts
@@ -1,9 +1,22 @@
+// icon are MIT licenced
 export const proposal_icon_path = {
-  open: 'M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25m5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354M3.75 2.5a.75.75 0 1 0 0 1.5a.75.75 0 0 0 0-1.5m0 9.5a.75.75 0 1 0 0 1.5a.75.75 0 0 0 0-1.5m8.25.75a.75.75 0 1 0 1.5 0a.75.75 0 0 0-1.5 0',
+  // http://icon-sets.iconify.design/octicon/git-pull-request-16/
+  open_pull:
+    'M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25m5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354M3.75 2.5a.75.75 0 1 0 0 1.5a.75.75 0 0 0 0-1.5m0 9.5a.75.75 0 1 0 0 1.5a.75.75 0 0 0 0-1.5m8.25.75a.75.75 0 1 0 1.5 0a.75.75 0 0 0-1.5 0',
+  // https://icon-sets.iconify.design/octicon/git-pull-request-closed-16/
+  open_patch:
+    'M3.75 4.5a1.25 1.25 0 1 0 0-2.5a1.25 1.25 0 0 0 0 2.5M3 7.75a.75.75 0 0 1 1.5 0v2.878a2.251 2.251 0 1 1-1.5 0Zm.75 5.75a.75.75 0 1 0 0-1.5a.75.75 0 0 0 0 1.5m5-7.75a1.25 1.25 0 1 1-2.5 0a1.25 1.25 0 0 1 2.5 0m5.75 2.5a2.25 2.25 0 1 1-4.5 0a2.25 2.25 0 0 1 4.5 0m-1.5 0a.75.75 0 1 0-1.5 0a.75.75 0 0 0 1.5 0',
+  // https://icon-sets.iconify.design/octicon/git-pull-request-closed-16/
   close:
     'M3.25 1A2.25 2.25 0 0 1 4 5.372v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.251 2.251 0 0 1 3.25 1m9.5 5.5a.75.75 0 0 1 .75.75v3.378a2.251 2.251 0 1 1-1.5 0V7.25a.75.75 0 0 1 .75-.75m-2.03-5.273a.75.75 0 0 1 1.06 0l.97.97l.97-.97a.748.748 0 0 1 1.265.332a.75.75 0 0 1-.205.729l-.97.97l.97.97a.751.751 0 0 1-.018 1.042a.751.751 0 0 1-1.042.018l-.97-.97l-.97.97a.749.749 0 0 1-1.275-.326a.749.749 0 0 1 .215-.734l.97-.97l-.97-.97a.75.75 0 0 1 0-1.06ZM2.5 3.25a.75.75 0 1 0 1.5 0a.75.75 0 0 0-1.5 0M3.25 12a.75.75 0 1 0 0 1.5a.75.75 0 0 0 0-1.5m9.5 0a.75.75 0 1 0 0 1.5a.75.75 0 0 0 0-1.5',
+  // https://icon-sets.iconify.design/octicon/git-pull-request-draft-16/
   draft:
     'M3.25 1A2.25 2.25 0 0 1 4 5.372v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.251 2.251 0 0 1 3.25 1m9.5 14a2.25 2.25 0 1 1 0-4.5a2.25 2.25 0 0 1 0 4.5M2.5 3.25a.75.75 0 1 0 1.5 0a.75.75 0 0 0-1.5 0M3.25 12a.75.75 0 1 0 0 1.5a.75.75 0 0 0 0-1.5m9.5 0a.75.75 0 1 0 0 1.5a.75.75 0 0 0 0-1.5M14 7.5a1.25 1.25 0 1 1-2.5 0a1.25 1.25 0 0 1 2.5 0m0-4.25a1.25 1.25 0 1 1-2.5 0a1.25 1.25 0 0 1 2.5 0',
+  // https://icon-sets.iconify.design/octicon/git-merge-16/
   merge:
     'M5.45 5.154A4.25 4.25 0 0 0 9.25 7.5h1.378a2.251 2.251 0 1 1 0 1.5H9.25A5.734 5.734 0 0 1 5 7.123v3.505a2.25 2.25 0 1 1-1.5 0V5.372a2.25 2.25 0 1 1 1.95-.218M4.25 13.5a.75.75 0 1 0 0-1.5a.75.75 0 0 0 0 1.5m8.5-4.5a.75.75 0 1 0 0-1.5a.75.75 0 0 0 0 1.5M5 3.25a.75.75 0 1 0 0 .005z',
+  // adapted from https://icon-sets.iconify.design/octicon/git-pull-request-closed-16/
+  // TODO: centre in icon frame
+  applied:
+    'M 3.25 1 A 2.25 2.25 0 0 1 4 5.372 v 5.256 a 2.251 2.251 0 1 1 -1.5 0 V 5.372 A 2.251 2.251 0 0 1 3.25 1 Z M 2.5 3.25 a 0.75 0.75 0 1 0 1.5 0 a 0.75 0.75 0 0 0 -1.5 0 M 3.25 12 a 0.75 0.75 0 1 0 0 1.5 a 0.75 0.75 0 0 0 0 -1.5',
 }