From 47b3b27308c60cc8828ac29cd2f5085d6b100741 Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Wed, 23 Oct 2019 15:53:13 -0500
Subject: [PATCH] chore: refactor basic payout

- add title
- remove unused code + file
- unify UI
- add back to bounty
---
 app/assets/v2/css/base.css                    |  8 ------
 app/assets/v2/js/pages/process_bounty.js      | 10 +++----
 app/dashboard/templates/process_bounty.html   | 26 ++++++++++++-------
 .../templates/shared/network_status.html      | 24 -----------------
 app/faucet/templates/faucet_form.html         |  5 +---
 .../shared/faucet_network_status.html         | 26 -------------------
 6 files changed, 23 insertions(+), 76 deletions(-)
 delete mode 100644 app/dashboard/templates/shared/network_status.html
 delete mode 100644 app/faucet/templates/shared/faucet_network_status.html

diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
index 4a87b948d27..b6764574481 100644
--- a/app/assets/v2/css/base.css
+++ b/app/assets/v2/css/base.css
@@ -547,14 +547,6 @@ input[type=text].loading {
   color: white;
 }
 
-.submit_bounty #network_status div {
-  display: inline;
-}
-
-#network_status div span {
-  color: #4aeba8;
-}
-
 .submit_bounty select[name=denomination] {
   text-align: left;
 }
diff --git a/app/assets/v2/js/pages/process_bounty.js b/app/assets/v2/js/pages/process_bounty.js
index 24bd5e1451d..7c9a11e0fe7 100644
--- a/app/assets/v2/js/pages/process_bounty.js
+++ b/app/assets/v2/js/pages/process_bounty.js
@@ -32,7 +32,7 @@ window.onload = function() {
     var account = web3.eth.accounts[0];
 
     if (getParam('source')) {
-      $('input[name=issueURL]').val(getParam('source'));
+      $('#issueURL').html(getParam('source'));
     }
 
     $('#tipPercent').change(function() {
@@ -64,7 +64,7 @@ window.onload = function() {
 
     };
 
-    var issueURL = $('input[name=issueURL]').val();
+    var issueURL = $('#issueURL').text();
 
     waitforWeb3(function() {
       var uri = '/api/v0.1/bounties/?github_url=' + issueURL + '&network=' + document.web3network;
@@ -85,7 +85,7 @@ window.onload = function() {
       var pct = parseFloat($('#tipPercent').val()) * 0.01;
 
       var email = '';
-      var github_url = $('#issueURL').val();
+      var github_url = $('#issueURL').text();
       var from_name = document.contxt['github_handle'];
       var username = getSelectedFulfillment() && getSelectedFulfillment().getAttribute('username');
       var amountInEth = bounty_amount * pct;
@@ -117,7 +117,7 @@ window.onload = function() {
       // get form data
 
       var email = '';
-      var github_url = $('#issueURL').val();
+      var github_url = $('#issueURL').text();
       var from_name = document.contxt['github_handle'];
       var username = getSelectedFulfillment() && getSelectedFulfillment().getAttribute('username');
       var amountInEth = selected_kudos.price_finney / 1000.0;
@@ -157,7 +157,7 @@ window.onload = function() {
       }
 
       e.preventDefault();
-      var issueURL = $('input[name=issueURL]').val();
+      var issueURL = $('#issueURL').text();
       var fulfillmentId = getSelectedFulfillment() && getSelectedFulfillment().getAttribute('value');
 
       sessionStorage['bountyId'] = getURLParams('pk');
diff --git a/app/dashboard/templates/process_bounty.html b/app/dashboard/templates/process_bounty.html
index d1a16b49f78..5d0eac8d84f 100644
--- a/app/dashboard/templates/process_bounty.html
+++ b/app/dashboard/templates/process_bounty.html
@@ -62,15 +62,23 @@
             </div>
             <div class="col offset-md-1 col-md-10 d-flex align-items-center justify-content-center" id="primary_form">
               <div class="d-flex justify-content-center flex-column mt-5" id="primary_subform">
-                <div class="w-100 text-center">
+                <div class="text-center mb-3">
                   <h3>{% trans "Basic Payout" %}</h3>
-                  <p><a href="{{action_urls.advanced_payout}}">Switch to Advanced Payout</a></p>
-                  <img src="{% static "v2/images/prime.png" %}">
+                  <p>
+                    <a class="d-block" href="{{ bounty.url }}">
+                      <i class="fas fa-chevron-left mr-1" style="font-size: 10px; position: relative;top: -1px;"></i>
+                      Back to Bounty
+                    </a>
+                    <a href="{{action_urls.advanced_payout}}">Switch to Advanced Payout</a>
+                  </p>
                 </div>
-                {% include 'shared/network_status.html' %}
-                <div class="w-100 mb-2">
-                  <label for=issueURL>{% trans "Issue URL:" %}</label>
-                  <input name='issueURL' id="issueURL" class="w-100 gc-round-text-input gc-border-blue" type="text" placeholder="https://github.com/user/repo/issues/n" value="{% if bounty %}{{bounty.github_url}}{%endif%}" />
+                <div>
+                  <label for="issueTitle">{% trans "Issue Title" %}</label>
+                  <p name="issueTitle" id="issueTitle" class="font-subheader">{{ bounty.title }}</p>
+                </div>
+                <div>
+                  <label for="issueURL">{% trans "Issue URL" %}</label>
+                  <p name="issueURL" id="issueURL" class="font-subheader">{{ bounty.github_url }}</p>
                 </div>
                 <div class="w-100 my-2">
                   <label for='bountyFulfillment'>{% trans "Bounty Submission:" %}</label>
@@ -93,7 +101,7 @@ <h3>{% trans "Basic Payout" %}</h3>
                 </div>
                 <div class="my-4">
                   <div class="d-flex justify-content-between align-items-center">
-                    <h3 class="font-bigger-1 mb-0">Suggested Kudos</h3>
+                    <h3 class="font-subheader mb-0">Suggested Kudos</h3>
                     <a href="{% url 'kudos_about' %}" target="_blank">What is kudos?</a>
                   </div>
 
@@ -106,7 +114,7 @@ <h3 class="font-bigger-1 mb-0">Suggested Kudos</h3>
                   {% include 'shared/bounty_actions_hidden_vars.html' %}
                   {% include 'shared/wallet_estimate.html' %}
                 </div>
-                <div class="w-100 mt-2 terms_container">
+                <div class="mt-4 terms_container">
                   <input name='terms' id='terms' type="checkbox" value=1 required />
                   <label for=terms>{% url "terms" as termsurl %}{% blocktrans %}I have read, understand, and agree to, the <a href="{{ termsurl }}" target="_blank" rel="noopener noreferrer">Terms of Service</a>.{% endblocktrans %}</label>
                 </div>
diff --git a/app/dashboard/templates/shared/network_status.html b/app/dashboard/templates/shared/network_status.html
deleted file mode 100644
index c57752a3ef3..00000000000
--- a/app/dashboard/templates/shared/network_status.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% comment %}
-  Copyright (C) 2018 Gitcoin Core
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU Affero General Public License for more details.
-
-  You should have received a copy of the GNU Affero General Public License
-  along with this program. If not, see <http://www.gnu.org/licenses/>.
-{% endcomment %}
-{% load i18n %}
-<div id=network_status class="w-100 text-center">
-  <div class="w-40">
-    Web3: <span>☑ - {% trans "Enabled" %}</span>
-    <br>
-    Eth: <span>☑ - {% trans "Available" %}</span>
-  </div>
-</div>
diff --git a/app/faucet/templates/faucet_form.html b/app/faucet/templates/faucet_form.html
index 4cae4165845..53ec2c274be 100644
--- a/app/faucet/templates/faucet_form.html
+++ b/app/faucet/templates/faucet_form.html
@@ -47,13 +47,10 @@ <h3>{% trans "Faucet Request" %} <span id="alpha">{% trans "Alpha" %}</span></h3
                   {% endblocktrans %}
                 </p>
                 <div class="faucet-form-img">
-                  <div class="faucet-form-svg">
+                  <div class="faucet-form-svg mb-3">
                     {% include 'svgs/gas.svg' %}
                   </div>
                 </div>
-                <div class="hidden-mobile">
-                  {% include 'shared/faucet_network_status.html' %}
-                </div>
                 <input type="hidden" id="currentFaucet" name="currentFaucet" value="{{ faucet_amount }}">
                 <p class="hidden-mobile">
                   {% trans "Please note, all input fields are required. Comment is optional." %}
diff --git a/app/faucet/templates/shared/faucet_network_status.html b/app/faucet/templates/shared/faucet_network_status.html
deleted file mode 100644
index 39e80412092..00000000000
--- a/app/faucet/templates/shared/faucet_network_status.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% comment %}
-  Copyright (C) 2018 Gitcoin Core
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU Affero General Public License for more details.
-
-  You should have received a copy of the GNU Affero General Public License
-  along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-{% endcomment %}
-{% load i18n %}
-
-<div id=network_status class="w-100 text-center" style="font-size: smaller;">
-  <div class="w-40">
-    Web3: <span>☑ - {% trans "Enabled" %}</span>
-    <br>
-    Eth: <span>☑ - {% trans "About Zero" %}</span>
-  </div>
-</div>