From 723cf409b64fccd15a0bd18c527295a363921810 Mon Sep 17 00:00:00 2001
From: Chibuotu Amadi <chibuotu@gmail.com>
Date: Fri, 19 Nov 2021 17:25:16 +0100
Subject: [PATCH 1/5] apply new design

---
 app/dashboard/sync/helpers.py                 |   2 +-
 .../tests/factories/bounty_factory.py         |   2 +-
 .../tests/factories/fulfillment_factory.py    |   4 +-
 app/dashboard/tests/views/test_bounty_api.py  |   2 +-
 .../tests/views/test_bounty_payout.py         |   4 +-
 .../grants/detail/template-grant-details.html | 137 ++++++++----------
 app/grants/views.py                           |   6 -
 7 files changed, 71 insertions(+), 86 deletions(-)

diff --git a/app/dashboard/sync/helpers.py b/app/dashboard/sync/helpers.py
index cf27dd53c24..8268b75d0b7 100644
--- a/app/dashboard/sync/helpers.py
+++ b/app/dashboard/sync/helpers.py
@@ -1,9 +1,9 @@
 
 import logging
+from decimal import Decimal
 
 from dashboard.helpers import bounty_activity_event_adapter, get_bounty_data_for_activity
 from dashboard.models import Activity, BountyEvent, BountyFulfillment
-from decimal import Decimal
 
 logger = logging.getLogger(__name__)
 
diff --git a/app/dashboard/tests/factories/bounty_factory.py b/app/dashboard/tests/factories/bounty_factory.py
index 9d0fe04d5e3..02fb6c8a603 100644
--- a/app/dashboard/tests/factories/bounty_factory.py
+++ b/app/dashboard/tests/factories/bounty_factory.py
@@ -12,4 +12,4 @@ class Meta:
     is_open = True
     expires_date = datetime.now() + timedelta(days=365)
     raw_data = {}
-    bounty_owner_github_username = 'gitcoin'
\ No newline at end of file
+    bounty_owner_github_username = 'gitcoin'
diff --git a/app/dashboard/tests/factories/fulfillment_factory.py b/app/dashboard/tests/factories/fulfillment_factory.py
index fba77211583..699ad1d37fd 100644
--- a/app/dashboard/tests/factories/fulfillment_factory.py
+++ b/app/dashboard/tests/factories/fulfillment_factory.py
@@ -1,6 +1,6 @@
 import factory
-
 from dashboard.models import BountyFulfillment
+
 from .bounty_factory import BountyFactory
 from .profile_factory import ProfileFactory
 
@@ -10,4 +10,4 @@ class Meta:
         model = BountyFulfillment
 
     bounty = factory.SubFactory(BountyFactory)
-    profile = factory.SubFactory(ProfileFactory)
\ No newline at end of file
+    profile = factory.SubFactory(ProfileFactory)
diff --git a/app/dashboard/tests/views/test_bounty_api.py b/app/dashboard/tests/views/test_bounty_api.py
index 7e6edf31083..0a5e9f99984 100644
--- a/app/dashboard/tests/views/test_bounty_api.py
+++ b/app/dashboard/tests/views/test_bounty_api.py
@@ -13,4 +13,4 @@ def test_retrieves_activities(self, django_user_model):
         client.force_login(user)
         response = client.get('/actions/api/v0.1/bounty/', github_url, format='json')
 
-        assert response.status_code == 200
\ No newline at end of file
+        assert response.status_code == 200
diff --git a/app/dashboard/tests/views/test_bounty_payout.py b/app/dashboard/tests/views/test_bounty_payout.py
index b7ee7043333..29e09f50aa4 100644
--- a/app/dashboard/tests/views/test_bounty_payout.py
+++ b/app/dashboard/tests/views/test_bounty_payout.py
@@ -1,7 +1,7 @@
 import pytest
-from dashboard.tests.factories.profile_factory import ProfileFactory
 from dashboard.tests.factories.bounty_factory import BountyFactory
 from dashboard.tests.factories.fulfillment_factory import FulfillmentFactory
+from dashboard.tests.factories.profile_factory import ProfileFactory
 from rest_framework.test import APIClient
 
 
@@ -31,4 +31,4 @@ def test_pays_out_bounty(self, django_user_model):
 
         response = client.post(f'/api/v1/bounty/payout/{fulfillment.id}', payload)
 
-        assert response.status_code == 200
\ No newline at end of file
+        assert response.status_code == 200
diff --git a/app/grants/templates/grants/detail/template-grant-details.html b/app/grants/templates/grants/detail/template-grant-details.html
index 37296709590..c3db6ce5195 100644
--- a/app/grants/templates/grants/detail/template-grant-details.html
+++ b/app/grants/templates/grants/detail/template-grant-details.html
@@ -482,7 +482,7 @@ <h3>Team</h3>
 
     <!-- Verify Twitter (step 1) -->
     <b-modal ref="startTwitterVerification" id="modal-start-twitter-verification" hide-footer no-stacking header-class="border-bottom-0" content-class="text-center px-4">
-      <img height="45" class="mb-4" src="{% static "v2/images/badge-verify.svg" %}" >
+      <img height="45" class="mb-4" src="{% static 'v2/images/badge-verify.svg' %}" >
       <h5 class="font-weight-bold mb-3">Verify Grant Ownership</h5>
       <p class="mb-4">Verify your grant ownership to ensure that your supporters are contributing to the correct grant.</p>
       <b-button v-b-modal.modal-twitter-verification size="lg" variant="gc-blue">Verify with twitter</b-button>
@@ -490,7 +490,7 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership</h5>
 
     <!-- Verify Twitter (step 2) -->
     <b-modal ref="twitterVerification" id="modal-twitter-verification" hide-footer no-stacking header-class="border-bottom-0" content-class="text-center px-4">
-      <img height="45" class="mb-4" src="{% static "v2/images/badge-verify.svg" %}" >
+      <img height="45" class="mb-4" src="{% static 'v2/images/badge-verify.svg' %}" >
       <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
       <p class="mb-4 text-left"><b>Step 1:</b> Fill your twitter account into the grants twitter field
         <i class="fas fa-check text-highlight-green" v-if="grant.twitter_handle_1"></i>
@@ -508,31 +508,17 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
     <!-- Edit Grant Details -->
     <b-sidebar
       id="sidebar-grant-edit"
-      title="Edit Grant"
       backdrop-variant="dark"
       bg-variant="white"
       backdrop
       shadow
       width="70%"
       >
+      <template v-slot:title><h2 class="pb-5">Edit Grant</h2></template>
       <form action="" @submit="checkForm($event)" ref="formEditGrant" v-if="grant" :class="`${Object.keys(errors).length ? 'invalid' : ''}`">
         <div class="col-12 mb-3">
-          <label class="font-caption letter-spacing text-black-60 text-uppercase" for="logo">
-            Project Logo
-          </label>
-          <div class="form__drop mt-0" id="js-drop">
-            <span v-if="!logoPreview">Drag & Drop or Browse</span>
-            <b-img-lazy v-if="logoPreview" id="preview" class="w-100 img-edit" :style="grant.image_css" :src="logoPreview" :class="{'blur-img':imgTransition}"></b-img-lazy>
-            <b-form-file @change="onFileChange($event)" v-model="logo" :state="Boolean(logo)" plain accept="image/*"></b-form-file>
-          </div>
-        </div>
-        <div class="col-12 mb-3 d-flex align-items-center">
-          <label class="font-caption letter-spacing text-black-60 text-uppercase mb-0 mr-3" for="title">Logo background color</label>
-          <input type="color" v-model="logoBackground" @input="changeColor">
-        </div>
-        <div class="col-12 mb-3">
-          <label class="font-caption letter-spacing text-black-60 text-uppercase" for="title">Title</label>
-          <span class="font-smaller-6 badge badge-greylight text-capitalize ml-2">Required</span>
+          <label class="font-subheader letter-spacing text-grey-500" for="title">Title</label>
+          <span class="font-smaller-6 badge badge-greylight ml-1">required</span>
 
           <input id="title" name="title" v-model.trim="grant.title" class="form__input form__input-lg" maxlength="150" type="text" placeholder="The Human Fund" required />
 
@@ -541,8 +527,8 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
           </div>
         </div>
         <div class="col-12 mb-3">
-          <label class="font-caption letter-spacing text-black-60 text-uppercase" for="description">Description</label>
-          <span class="font-smaller-6 badge badge-greylight text-capitalize ml-2">Required</span>
+          <label class="mt-3 font-subheader letter-spacing text-grey-500" for="description">Description</label>
+          <span class="font-smaller-6 badge badge-greylight ml-1">required</span>
 
           <quill-editor
             ref="myQuillEditor"
@@ -556,11 +542,31 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
             [[errors.description]]
           </div>
         </div>
+        <div class="col-12 mb-3">
+          <label class="mt-3 font-subheader letter-spacing text-grey-500" for="logo">
+            Project Logo
+          </label>
+          <div class="form__drop mt-0" id="js-drop" style="max-width: 345px; height: 128px;">
+            <span v-if="!logoPreview">Drag & Drop or Browse</span>
+            <b-img-lazy v-if="logoPreview" id="preview" class="img-edit" :style="grant.image_css" :src="logoPreview" :class="{'blur-img':imgTransition}"></b-img-lazy>
+            <b-form-file @change="onFileChange($event)" v-model="logo" :state="Boolean(logo)" plain accept="image/*"></b-form-file>
+          </div>
+        </div>
+        <div class="col-12 mb-3 d-flex align-items-center">
+          <label class="mt-3 font-subheader letter-spacing text-grey-500 mb-0 mr-3" for="title">Logo background color</label>
+          <input type="color" v-model="logoBackground" @input="changeColor">
+        </div>
+        
+        <!-- Github -->
+        <div class="col-12 mb-3">
+          <label class="mt-3 font-subheader letter-spacing text-grey-500" for="github_project_url">Github URL</label>
+          <input v-model.trim="grant.github_project_url" name="github_project_url" class="form__input form__input-lg" type="url" placeholder="https://github.com/humanfund"/>
+        </div>
 
-        <!-- Project url -->
+        <!-- Project website -->
         <div class="col-12 mb-3">
-          <label class="font-caption letter-spacing text-black-60 text-uppercase" for="reference_url">Project Website</label>
-          <span class="font-smaller-6 badge badge-greylight text-capitalize ml-2">Required</span>
+          <label class="mt-3 font-subheader letter-spacing text-grey-500" for="reference_url">Project Website</label>
+          <span class="font-smaller-6 badge badge-greylight ml-1">required</span>
           <input v-model.trim="grant.reference_url" name="reference_url" class="form__input form__input-lg" type="url" placeholder="https://human.fund/" required />
           <div class="text-danger" v-if="errors.reference_url">
             [[errors.reference_url]]
@@ -569,8 +575,8 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
 
         <!-- Project twitter -->
         <div class="col-12 mb-3">
-          <label class="font-caption letter-spacing text-black-60 text-uppercase" for="twitter_handle_1">Project Twitter Handle</label>
-          <span class="font-smaller-6 badge badge-greylight text-capitalize ml-2">Required</span>
+          <label class="mt-3 font-subheader letter-spacing text-grey-500" for="twitter_handle_1">Project Twitter Handle</label>
+          <span class="font-smaller-6 badge badge-greylight ml-1">required</span>
 
           <input id="twitter_handle_1" v-model="grant.twitter_handle_1" @change="transformTwitterHandle1" name="twitter_handle_1" class="form__input form__input-lg" type="text" placeholder="humanfund" required>
 
@@ -581,7 +587,7 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
 
         <!-- Owner twitter -->
         <div class="col-12 mb-3">
-          <label class="font-caption letter-spacing text-black-60 text-uppercase" for="twitter_handle_2">Your Twitter Handle</label>
+          <label class="mt-3 font-subheader letter-spacing text-grey-500" for="twitter_handle_2">Your Twitter Handle</label>
 
           <input id="twitter_handle_2" v-model="grant.twitter_handle_2" @change="transformTwitterHandle2" name="twitter_handle_2" class="form__input form__input-lg" type="text" placeholder="georgecostanza"/>
 
@@ -590,15 +596,9 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
           </div>
         </div>
 
-        <!-- Github -->
-        <div class="col-12 mb-3">
-          <label class="font-caption letter-spacing text-black-60 text-uppercase" for="github_project_url">Github URL</label>
-          <input v-model.trim="grant.github_project_url" name="github_project_url" class="form__input form__input-lg" type="url" placeholder="https://github.com/humanfund"/>
-        </div>
-
         <!-- Team Members -->
         <div class="col-12 mb-3">
-          <label class="font-caption letter-spacing text-black-60 text-uppercase" for="team_members">Team Members</label>
+          <label class="mt-3 font-subheader letter-spacing text-grey-500" for="team_members">Team Members</label>
           <v-select id="team_members" label="text" :close-on-select="false" @search="userSearch"  :options="usersOptions" placeholder="Add your team Gitcoin usernames" v-model="teamFormatted" multiple>
             <template slot="no-options">
               type to search Users..
@@ -622,29 +622,9 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
           </v-select>
         </div>
 
-        <!-- Region -->
-        <div class="col-12 mb-3">
-          <label class="font-caption letter-spacing text-black-60 text-uppercase" for="grant_region">Region</label>
-          <v-select placeholder="Pick your region" :options="grantRegions" label="label" v-model="grant.region">
-            <template v-slot:option="option">
-              <span class="font-weight-semibold">[[ option.label ]]</span>
-            </template>
-          </v-select>
-        </div>
-
-        <!-- Is CLR Eligible -->
+        <!-- Project Stage -->
         <div class="col-12 mb-3">
-          <b-form-checkbox v-model="grant.is_clr_eligible" name="is_clr_eligible">
-            <label class="font-caption letter-spacing text-black-60 text-uppercase">OPT IN FOR CLR</label>
-            <span class="font-smaller-6 text-black-60 text-capitalize ml-2">
-              (If unchecked, your grant will not be able part of the CLR rounds on Gitcoin)
-            </span>
-          </b-form-checkbox>
-        </div>
-
-        <!-- External Funding -->
-        <div class="col-12 mb-3">
-          <label class="font-caption letter-spacing text-black-60 text-uppercase">External Funding (VC Funding / Token Sale)</label>
+          <label class="mt-3 font-subheader letter-spacing text-grey-500">External Funding (VC Funding / Token Sale)</label>
           <v-select :options="externalFundingOptions" label="value" v-model="grant.has_external_funding" :reduce="state => state.key">
             <template v-slot:option="option">
               <span class="font-weight-semibold">[[ option.value ]]</span>
@@ -656,27 +636,26 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
           </div>
         </div>
 
-        <!-- Grant Tags -->
+        <hr>
+
+        <!-- Region -->
         <div class="col-12 mb-3">
-          <label class="font-caption letter-spacing text-black-60 text-uppercase" for="grant_tags">Tags</label>
-          <span class="font-smaller-6 badge badge-greylight text-capitalize ml-2">Required</span>
-
-          <v-select placeholder="Add tags to help others discover your grant" :options="grant_tags" label="name" v-model="grantTagsFormatted" multiple>
-            <template #search="{attributes, events}">
-              <input
-                class="vs__search"
-                v-bind="attributes"
-                v-on="events"
-              />
-            </template>
+          <label class="mt-3 font-subheader letter-spacing text-grey-500" for="grant_region">Region</label>
+          <v-select placeholder="Pick your region" :options="grantRegions" label="label" v-model="grant.region">
             <template v-slot:option="option">
-              <span class="font-weight-semibold">[[ option.name ]]</span>
+              <span class="font-weight-semibold">[[ option.label ]]</span>
             </template>
           </v-select>
+        </div>
 
-          <div class="text-danger" v-if="errors.grant_tags">
-            [[errors.grant_tags]]
-          </div>
+        <!-- Is CLR Eligible -->
+        <div class="col-12 mb-3">
+          <b-form-checkbox v-model="grant.is_clr_eligible" name="is_clr_eligible">
+            <label class="font-caption letter-spacing text-grey-500">OPT IN FOR CLR</label>
+            <span class="font-smaller-6 text-grey-500 text-capitalize ml-2">
+              (If unchecked, your grant will not be able part of the CLR rounds on Gitcoin)
+            </span>
+          </b-form-checkbox>
         </div>
 
         <!-- Save/Cancel -->
@@ -702,6 +681,14 @@ <h4 class="alert-heading pt-2 mb-2">Cancel Your Grant</h4>
 
 <style>
 
+  .badge-greylight {
+    color: #757087;
+  }
+
+  #sidebar-grant-edit {
+    padding: 40px 50px 40px 50px;
+  }
+
   .blur-img {
     filter: blur(9px);
     transition: 0.5s all linear;
@@ -709,7 +696,7 @@ <h4 class="alert-heading pt-2 mb-2">Cancel Your Grant</h4>
 
   .img-edit {
     width: 100%;
-    height: 300px;
+    height: 100%;
     object-fit: contain;
     background: black;
   }
@@ -776,6 +763,10 @@ <h4 class="alert-heading pt-2 mb-2">Cancel Your Grant</h4>
     grid-area: grant-managment;
   }
 
+  input {
+    border-radius: 4px !important;
+  }
+
   input[type=color]{
     width: 20px;
     height: 20px;
diff --git a/app/grants/views.py b/app/grants/views.py
index 252ed0a916b..c47fc587ba0 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -1780,12 +1780,6 @@ def grant_edit(request, grant_id):
         if region:
             grant.region = region
 
-        grant_tags = request.POST.get('grant_tags[]', None)
-        if grant_tags:
-            tags = [d['id'] for d in json.loads(grant_tags)]
-            grant.tags.set(tags)
-
-
         team_members = request.POST.getlist('team_members[]', None)
         if team_members:
             save_team_members = []

From 3023e091f7de23372124ef4e61211c9653969345 Mon Sep 17 00:00:00 2001
From: Chibuotu Amadi <chibuotu@gmail.com>
Date: Mon, 22 Nov 2021 15:18:05 +0100
Subject: [PATCH 2/5] resp

---
 .../grants/detail/template-grant-details.html | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/grants/templates/grants/detail/template-grant-details.html b/app/grants/templates/grants/detail/template-grant-details.html
index c3db6ce5195..d2065219df7 100644
--- a/app/grants/templates/grants/detail/template-grant-details.html
+++ b/app/grants/templates/grants/detail/template-grant-details.html
@@ -553,7 +553,7 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
           </div>
         </div>
         <div class="col-12 mb-3 d-flex align-items-center">
-          <label class="mt-3 font-subheader letter-spacing text-grey-500 mb-0 mr-3" for="title">Logo background color</label>
+          <label class="font-subheader letter-spacing text-grey-500 mb-0 mr-3" for="title">Logo background color</label>
           <input type="color" v-model="logoBackground" @input="changeColor">
         </div>
         
@@ -622,9 +622,14 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
           </v-select>
         </div>
 
+        <div class="mx-3 mt-5">
+          <hr class="mb-5">
+          <h4 class="font-bigger-1 text-black">Help contributors discover your grant</h4>
+        </div>
+
         <!-- Project Stage -->
         <div class="col-12 mb-3">
-          <label class="mt-3 font-subheader letter-spacing text-grey-500">External Funding (VC Funding / Token Sale)</label>
+          <label class="mt-3 font-subheader letter-spacing text-grey-500">Project Stage</label>
           <v-select :options="externalFundingOptions" label="value" v-model="grant.has_external_funding" :reduce="state => state.key">
             <template v-slot:option="option">
               <span class="font-weight-semibold">[[ option.value ]]</span>
@@ -636,8 +641,6 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
           </div>
         </div>
 
-        <hr>
-
         <!-- Region -->
         <div class="col-12 mb-3">
           <label class="mt-3 font-subheader letter-spacing text-grey-500" for="grant_region">Region</label>
@@ -649,27 +652,27 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
         </div>
 
         <!-- Is CLR Eligible -->
-        <div class="col-12 mb-3">
+        <div class="col-12 my-3">
           <b-form-checkbox v-model="grant.is_clr_eligible" name="is_clr_eligible">
             <label class="font-caption letter-spacing text-grey-500">OPT IN FOR CLR</label>
             <span class="font-smaller-6 text-grey-500 text-capitalize ml-2">
-              (If unchecked, your grant will not be able part of the CLR rounds on Gitcoin)
+              (If unchecked, your grant will not be a part of the CLR rounds on Gitcoin)
             </span>
           </b-form-checkbox>
         </div>
 
         <!-- Save/Cancel -->
         <div class="col-12 mb-3 text-right">
-          <button @click="saveGrant($event)" class="btn btn-primary">SAVE CHANGES</button>
+          <button @click="saveGrant($event)" class="btn btn-primary py-2 w-100 w-lg-25">Save Changes</button>
         </div>
         <div class="col-12 mb-3 mt-5">
           <div class="alert bs-alert alert-danger py-4" role="alert">
-            <h4 class="alert-heading pt-2 mb-2">Cancel Your Grant</h4>
-            <p class="mb-0">Once the grant is canceled will not longer receive contributions or participate on CLR matching.</p>
-            <p>If you need help instead, please create an <a href="https://github.com/gitcoinco/web/issues/new?assignees=&labels=help%20wanted&template=custom.md" target="_blank" class="alert-link">issue</a>
+            <h4 class="alert-heading font-bigger-1 pt-2 mb-2">Cancel your grant</h4>
+            <p class="mb-0 font-body">Once the grant is canceled will not longer receive contributions or participate on CLR matching.</p>
+            <p class="font-body">If you need help instead, please create an <a href="https://github.com/gitcoinco/web/issues/new?assignees=&labels=help%20wanted&template=custom.md" target="_blank" class="alert-link">issue</a>
               and don't forget to include your username and grant link.
             </p>
-            <button @click="cancelGrant($event)" class="btn btn-sm btn-danger font-weight-semibold">CANCEL GRANT</button>
+            <button @click="cancelGrant($event)" class="btn btn-sm btn-danger font-body px-4 py-2">Cancel Grant</button>
           </div>
         </div>
       </form>
@@ -686,7 +689,7 @@ <h4 class="alert-heading pt-2 mb-2">Cancel Your Grant</h4>
   }
 
   #sidebar-grant-edit {
-    padding: 40px 50px 40px 50px;
+    padding: 40px 50px;
   }
 
   .blur-img {
@@ -800,6 +803,13 @@ <h4 class="alert-heading pt-2 mb-2">Cancel Your Grant</h4>
     grid-template-areas: "grant-data";
   }
 
+  @media only screen and (max-width: 600px) {
+    #sidebar-grant-edit {
+      padding: 10px 0px;
+      width: 100% !important;
+    }
+  }
+
   @media (min-width: 960px) {
     .grid-template-sidebar {
       grid-auto-columns: 1fr 1fr 1fr 1.2fr;

From 0db5b2402ed3934be495e7eecd80f8703c8c2d24 Mon Sep 17 00:00:00 2001
From: Chibuotu Amadi <chibuotu@gmail.com>
Date: Wed, 24 Nov 2021 02:13:10 +0100
Subject: [PATCH 3/5] test updates

---
 .../grants/detail/template-grant-details.html |  6 +++-
 app/grants/tests/factories/grant_factory.py   | 21 ++++++++++++
 .../tests/factories/grant_type_factory.py     |  3 ++
 app/grants/tests/test_grant_api.py            | 33 +++++++++++++++++++
 4 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 app/grants/tests/factories/grant_factory.py
 create mode 100644 app/grants/tests/test_grant_api.py

diff --git a/app/grants/templates/grants/detail/template-grant-details.html b/app/grants/templates/grants/detail/template-grant-details.html
index d2065219df7..76b2a320ed6 100644
--- a/app/grants/templates/grants/detail/template-grant-details.html
+++ b/app/grants/templates/grants/detail/template-grant-details.html
@@ -514,7 +514,7 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
       shadow
       width="70%"
       >
-      <template v-slot:title><h2 class="pb-5">Edit Grant</h2></template>
+      <template v-slot:title><h2 class="d-inline">Edit Grant</h2></template>
       <form action="" @submit="checkForm($event)" ref="formEditGrant" v-if="grant" :class="`${Object.keys(errors).length ? 'invalid' : ''}`">
         <div class="col-12 mb-3">
           <label class="font-subheader letter-spacing text-grey-500" for="title">Title</label>
@@ -692,6 +692,10 @@ <h4 class="alert-heading font-bigger-1 pt-2 mb-2">Cancel your grant</h4>
     padding: 40px 50px;
   }
 
+  .b-sidebar-header {
+    padding-bottom: 48px !important;
+  }
+
   .blur-img {
     filter: blur(9px);
     transition: 0.5s all linear;
diff --git a/app/grants/tests/factories/grant_factory.py b/app/grants/tests/factories/grant_factory.py
new file mode 100644
index 00000000000..36c4a1b2e88
--- /dev/null
+++ b/app/grants/tests/factories/grant_factory.py
@@ -0,0 +1,21 @@
+from datetime import datetime, timedelta
+
+import factory
+import pytest
+from dashboard.tests.factories.profile_factory import ProfileFactory
+from grants.models.grant import Grant
+from grants.tests.factories.grant_type_factory import GrantTypeFactory
+
+
+@pytest.mark.django_db
+class GrantFactory(factory.django.DjangoModelFactory):
+    """Create mock Grant for testing."""
+
+    class Meta:
+        model = Grant
+
+    title = factory.Sequence(lambda n: f"Test grant {n}")
+    grant_type = factory.SubFactory(GrantTypeFactory)
+    # team_members = [factory.SubFactory(ProfileFactory)]
+    github_project_url = "https://github.com/gitcoinco"
+    admin_address = "0xde21F729137C5Af1b01d73aF1dC21eFfa2B8a0d6" # matching pool fund
diff --git a/app/grants/tests/factories/grant_type_factory.py b/app/grants/tests/factories/grant_type_factory.py
index c0f2619f0d5..ce89131cb6d 100644
--- a/app/grants/tests/factories/grant_type_factory.py
+++ b/app/grants/tests/factories/grant_type_factory.py
@@ -7,3 +7,6 @@ class GrantTypeFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = GrantType
+
+    name = "gr12"
+    label = "gr12"
diff --git a/app/grants/tests/test_grant_api.py b/app/grants/tests/test_grant_api.py
new file mode 100644
index 00000000000..21e47802e6c
--- /dev/null
+++ b/app/grants/tests/test_grant_api.py
@@ -0,0 +1,33 @@
+import pytest
+from dashboard.tests.factories.profile_factory import ProfileFactory
+from grants.tests.factories.grant_factory import GrantFactory
+from rest_framework.test import APIClient
+
+
+@pytest.mark.django_db
+class TestGrantAPI:
+    def test_grant_edit(self, django_user_model):
+        user = django_user_model.objects.create(username="gitcoinco", password="password123")
+        client = APIClient()
+        client.force_login(user)
+
+        grant = GrantFactory()
+        profile = ProfileFactory()
+        profile.handle = user.username
+        user.profile = profile
+        user.is_staff = True
+        user.save()
+        # grant.team_members.set([profile.id])
+        grant.save()
+
+        response = client.post(
+            f"/grants/v1/api/grant/edit/{grant.id}/",
+            {"title": "This is a new title"},
+            format="json",
+        )
+        print(response.json())
+
+        grant.refresh_from_db()
+
+        assert response.status_code == 200
+        assert grant.title == "This is a new title"

From 9151af8eb3967f7671ba6594fcb258388e601c2f Mon Sep 17 00:00:00 2001
From: Chibuotu Amadi <chibuotu@gmail.com>
Date: Wed, 24 Nov 2021 03:39:54 +0100
Subject: [PATCH 4/5] fix unit test

---
 app/dashboard/tests/test_dashboard_models.py |  4 ++--
 app/grants/tests/factories/grant_factory.py  |  1 +
 app/grants/tests/test_grant_api.py           | 17 ++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/dashboard/tests/test_dashboard_models.py b/app/dashboard/tests/test_dashboard_models.py
index 1b228707386..90d77949310 100644
--- a/app/dashboard/tests/test_dashboard_models.py
+++ b/app/dashboard/tests/test_dashboard_models.py
@@ -493,8 +493,8 @@ def test_profile_activate_avatar():
         CustomAvatar.objects.create(profile=profile, config="{}")
         social_avatar = SocialAvatar.objects.create(profile=profile)
         profile.activate_avatar(social_avatar.pk)
-        assert profile.avatar_baseavatar_related.get(pk=1).active is False
-        assert profile.avatar_baseavatar_related.get(pk=2).active is True
+        assert profile.avatar_baseavatar_related.all().first().active is False
+        assert profile.avatar_baseavatar_related.all().last().active is True
 
     @staticmethod
     def test_bounty_snooze_url():
diff --git a/app/grants/tests/factories/grant_factory.py b/app/grants/tests/factories/grant_factory.py
index 36c4a1b2e88..a8fe684f27c 100644
--- a/app/grants/tests/factories/grant_factory.py
+++ b/app/grants/tests/factories/grant_factory.py
@@ -15,6 +15,7 @@ class Meta:
         model = Grant
 
     title = factory.Sequence(lambda n: f"Test grant {n}")
+    description = "This is a grant description"
     grant_type = factory.SubFactory(GrantTypeFactory)
     # team_members = [factory.SubFactory(ProfileFactory)]
     github_project_url = "https://github.com/gitcoinco"
diff --git a/app/grants/tests/test_grant_api.py b/app/grants/tests/test_grant_api.py
index 21e47802e6c..f7e1e578304 100644
--- a/app/grants/tests/test_grant_api.py
+++ b/app/grants/tests/test_grant_api.py
@@ -7,25 +7,24 @@
 @pytest.mark.django_db
 class TestGrantAPI:
     def test_grant_edit(self, django_user_model):
-        user = django_user_model.objects.create(username="gitcoinco", password="password123")
+        user = django_user_model.objects.create(username="gitcoin", password="password123")
         client = APIClient()
         client.force_login(user)
 
         grant = GrantFactory()
-        profile = ProfileFactory()
-        profile.handle = user.username
-        user.profile = profile
+        ProfileFactory(user=user)
         user.is_staff = True
         user.save()
-        # grant.team_members.set([profile.id])
-        grant.save()
 
         response = client.post(
             f"/grants/v1/api/grant/edit/{grant.id}/",
-            {"title": "This is a new title"},
-            format="json",
+            {
+                "title": "This is a new title",
+                "description": grant.description,
+                "has_external_funding": "yes",
+                "eth_payout_address": grant.admin_address,
+            },
         )
-        print(response.json())
 
         grant.refresh_from_db()
 

From b1a5b5275e8a733247558cbc49e8ebf98b725bc4 Mon Sep 17 00:00:00 2001
From: Chibuotu Amadi <chibuotu@gmail.com>
Date: Wed, 24 Nov 2021 04:17:29 +0100
Subject: [PATCH 5/5] update tests

---
 app/grants/tests/factories/grant_factory.py      | 3 ++-
 app/grants/tests/factories/grant_type_factory.py | 4 +++-
 app/grants/tests/test_grant_api.py               | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/grants/tests/factories/grant_factory.py b/app/grants/tests/factories/grant_factory.py
index ed790e19152..554f4edcb7b 100644
--- a/app/grants/tests/factories/grant_factory.py
+++ b/app/grants/tests/factories/grant_factory.py
@@ -1,7 +1,8 @@
 import factory
 import pytest
 from grants.models.grant import Grant
-from grants.tests.factories import GrantTypeFactory
+
+from .grant_type_factory import GrantTypeFactory
 
 
 @pytest.mark.django_db
diff --git a/app/grants/tests/factories/grant_type_factory.py b/app/grants/tests/factories/grant_type_factory.py
index 26db1fcd5e1..79e2cd3e80e 100644
--- a/app/grants/tests/factories/grant_type_factory.py
+++ b/app/grants/tests/factories/grant_type_factory.py
@@ -1,10 +1,12 @@
 import factory
+import pytest
 from grants.models.grant_type import GrantType
 
 
+@pytest.mark.django_db
 class GrantTypeFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = GrantType
 
-    name = "gr12"
+    name = factory.Sequence(lambda n: f"gr{n}")
     label = "gr12"
diff --git a/app/grants/tests/test_grant_api.py b/app/grants/tests/test_grant_api.py
index f7e1e578304..8992128a48a 100644
--- a/app/grants/tests/test_grant_api.py
+++ b/app/grants/tests/test_grant_api.py
@@ -1,6 +1,6 @@
 import pytest
-from dashboard.tests.factories.profile_factory import ProfileFactory
-from grants.tests.factories.grant_factory import GrantFactory
+from dashboard.tests.factories import ProfileFactory
+from grants.tests.factories import GrantFactory
 from rest_framework.test import APIClient