From 782e205577b1972d1841df1f18e1e47bae1daea1 Mon Sep 17 00:00:00 2001
From: Bastard Operator <bofh@nogafam.es>
Date: Sat, 9 Jan 2021 22:21:34 +0100
Subject: [PATCH] Improved icons on account actions

---
 bin/svgs.js                 |  3 +++
 src/routes/_layout.html     | 15 ++++--------
 src/scss/themes/ozark.scss  | 49 +++++++++++++++++++++++++++++++------
 static/fedilove-no-react.js |  8 ++++--
 4 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/bin/svgs.js b/bin/svgs.js
index 3d22c84a..3f7a1db9 100644
--- a/bin/svgs.js
+++ b/bin/svgs.js
@@ -2,6 +2,9 @@ module.exports = [
   { id: 'pinafore-logo', src: 'src/static/sailboat.svg', inline: true },
   { id: 'fa-bell', src: 'src/thirdparty/font-awesome-svg-png/white/svg/bell.svg', inline: true },
   { id: 'fa-asterisk', src: 'src/thirdparty/font-awesome-svg-png/white/svg/asterisk.svg', inline: true },
+  { id: 'fa-close', src: 'src/thirdparty/font-awesome-svg-png/white/svg/close.svg', inline: true },
+  { id: 'fa-question', src: 'src/thirdparty/font-awesome-svg-png/white/svg/question.svg', inline: true },
+  { id: 'fa-heart', src: 'src/thirdparty/font-awesome-svg-png/white/svg/heart.svg', inline: true },
   { id: 'fa-users', src: 'src/thirdparty/font-awesome-svg-png/white/svg/users.svg', inline: true },
   { id: 'fa-globe', src: 'src/thirdparty/font-awesome-svg-png/white/svg/globe.svg' },
   { id: 'fa-gear', src: 'src/thirdparty/font-awesome-svg-png/white/svg/gear.svg', inline: true },
diff --git a/src/routes/_layout.html b/src/routes/_layout.html
index 86711bb7..829775b6 100644
--- a/src/routes/_layout.html
+++ b/src/routes/_layout.html
@@ -18,19 +18,13 @@
     <div id="account-actions">
       <div class="container">
         <div class="item">
-          <div class="btn-do">
-            <button>NOPE</button>
-          </div>
+          <div class="btn-do nope" onclick="window.fediloveUI.onAccountNope()"><SvgIcon href="#fa-close"/></div>
         </div>
         <div class="item">
-          <div class="btn-do">
-            <button>MAYBE</button>
-          </div>
+          <div class="btn-do match" onclick="window.fediloveUI.onAccountMatch()"><SvgIcon href="#fa-heart"/></div>
         </div>
         <div class="item">
-          <div class="btn-do">
-            <button>YES!</button>
-          </div>
+          <div class="btn-do maybe" onclick="window.fediloveUI.onAccountMaybe()"><SvgIcon href="#fa-question"/></div>
         </div>
       </div>
     </div>
@@ -86,7 +80,8 @@
     components: {
       Nav: './_components/Nav.html',
       InformationalFooter: './_components/InformationalFooter.html',
-      IconButton: './_components/IconButton.html'
+      IconButton: './_components/IconButton.html',
+      SvgIcon: './_components/SvgIcon.html'
     },
     oncreate () {
       if (process.browser && process.env.NODE_ENV !== 'production') {
diff --git a/src/scss/themes/ozark.scss b/src/scss/themes/ozark.scss
index ff802f4d..3cd70648 100644
--- a/src/scss/themes/ozark.scss
+++ b/src/scss/themes/ozark.scss
@@ -206,21 +206,54 @@ body.meet, body.account {
         z-index: 2;
 
         div.container {
-          background: red;
           display: flex;
           max-width: 50em;
           margin: auto;
-        }
 
-        div.item {
-          display: flex;
-          width: 100%;
+          div.item {
+            display: flex;
+            width: 100%;
+
+            div.btn-do {
+              background: #fff;
+              border-radius: 50%;
+              border: 3px solid #fbfbfb;
+              box-shadow: 0px 0px 1em #c1c1c1;
+              width: 4.5em;
+              height: 4.5em;
+              display: flex;
+              margin: auto;
+              cursor: pointer;
+              svg {
+                width: 2.4em;
+                height: 2.4em;
+                margin: auto;
+                position: relative;
+              }
+            }
+            div.btn-do.nope > svg {
+              fill: red;
+              top: -1px;
+            }
+            div.btn-do.match {
+              width: 4.2em !important;
+              height: 4.2em !important;
+              svg { fill: #01bb30; }
+            }
+            div.btn-do.maybe > svg {
+              fill: #048eb9;
+              width: 3em;
+              height: 3em;
+              left: -1px;
+            }
+            div.btn-do:focus, div.btn-do:active {
+              background: #ccc !important;
+            }
 
-          div.btn-do {
-            margin: auto;
-            /*button { width: 0; height: 0; }*/
           }
+
         }
+
       }
 
       div#prev, div#next {
diff --git a/static/fedilove-no-react.js b/static/fedilove-no-react.js
index a3cdbb6f..be0a17f1 100644
--- a/static/fedilove-no-react.js
+++ b/static/fedilove-no-react.js
@@ -218,7 +218,10 @@ var fediloveUI = {
         $('div#chat-party-global > div#name > a > span').html(name);
         $('div#chat-party-global > div#name > span').text(acct);
         if (accid != 0) $('div#chat-party-global > div#name > a').attr('href', `/accounts/${accid}`);
-    }
+    },
+    onAccountNope: function() {},
+    onAccountMatch: function() {},
+    onAccountMaybe: function() {}
 };
 
 // objects to access from React code
@@ -537,7 +540,7 @@ function fedilove_customization() {
                     if ($(selector)[0] !== undefined)
                         $(selector)[0].src = window.fediloveData.currentAccount.header;
                 }
-            }, 300);
+            }, 100);
         };
         const _this = setInterval(function() {
 
@@ -571,6 +574,7 @@ function fedilove_customization() {
                 clearInterval(_this);
             }
             countmax++;
+
         }, 200);
     }
     else if (window.location.pathname == '/federated')