Merge branch 'gitcoinco:master' into master

Author: giliomeejg

app/assets/v2/images/trust/no-trust-man.svg

@@ -139,3 +139,7 @@ html.dark-mode {
 .gc-alert-yellow {
   background-color: #FFF4CB;
 }
+
+.text-dark-purple {
+  color: #0E0333;
+}

app/assets/v2/scss/colors.scss

@@ -180,6 +180,11 @@
   border-radius: 50%;
 }
 
+.trust-bonus-message {
+  background-color: #F3587D;
+  color: #0E0333;
+}
+
 @media (max-width: 1200px) {
   .profile-header{
     min-height: 350px;

app/assets/v2/scss/profile.scss

@@ -144,8 +144,33 @@ <h4>Processing...</h4>
           :show-modal="modalShow" :type="modalName"
           @modal-dismissed="hideModal()">
         </state-modal> -->
-        <div class="row spacer-mt-4" :class="{ trustBonusBg: apuScoreStatus === 'complete' }">
-          <div class="col-12 col-lg-6 spacer-pb-3 pl-0 pl-lg-5">
+        <div>
+          <div>
+            <div class="d-flex flex-row p-2 mb-lg-4 mx-lg-5 trust-bonus-message">
+              <div class="d-flex flex-column p-3 p-md-2">
+                <div class="order-0 d-lg-none w-50 w-md-25 mb-2 align-self-start">
+                  <img src="{% static 'v2/images/trust/no-trust-man.svg' %}" alt="Pink robot" />
+                </div>
+                <div class="order-1">
+                  <h3 class="line-height-1">Goodbye Trust Bonus. Soon Grants Protocol Launch.</h3>
+                </div>
+                <div class="order-2">
+                  <p class="line-height-2 font-weight-light">You cannot create a Trust Bonus score for your Passport anymore. Trust Bonus is exclusively relevant to the legacy Grants app here, which we will not continue operating much longer. On the positive flip side, as you may know, we are in full swing, working toward launching a fully revamped version of Gitcoin Grants: the Gitcoin Grants Protocol. When we roll out the new Grants app, we'll widely communicate with you how to verify your identity in the new app. See ya in the Quadratic Lands!</p>
+                  <p>
+                      <span><i class="fas fa-exclamation-circle"></i></span><a class="text-dark-purple" href="https://gov.gitcoin.co/t/request-for-feedback-proposed-future-for-the-grant-programs-and-gr16-as-we-transition-to-the-protocol/11624/42" target="_blank"><u> Find out more here.</u></a>
+                  </p>
+                </div>
+              </div>
+              <div class="d-none d-lg-block align-self-center w-75 p-lg-3 pr-5">
+                <div>
+                  <img src="{% static 'v2/images/trust/no-trust-man.svg' %}" alt="Pink robot" />
+                </div>  
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="row spacer-mt-4 trustBonusBg mx-1 px-md-3" :class="{ trustBonusBg: apuScoreStatus === 'complete' }">
+          <div class="col-12 col-lg-6 spacer-pb-3 pr-0 pr-lg-5 pl-0 pl-lg-4">
             <h1>Trust Bonus</h1>
             <span class="line-height-2">
               Trust Bonus is powered by <a href="https://passport.gitcoin.co/" target="_blank">Gitcoin Passport</a>, a decentralized identity verification application. Trust Bonus scores are calculated based on the identification stamps you complete.
@@ -156,17 +181,16 @@ <h1>Trust Bonus</h1>
               <br/>
               For more information check out, <a href="https://go.gitcoin.co/blog/wtf-is-trust-bonus/" target="_blank">"WTF is Trust Bonus?"</a>.
             </span>
-            <b-button v-if="apuScoreStatus === 'complete'" :disabled="!isStaff && !isSubmissionEnabled" variant="primary" class="col-12 col-md-auto btn btn-lg mt-3 flex-shrink-0 btn-primary mt-3 refresh-button" @click="() => checkForPassport()">
+
+            <b-button disabled="disabled" v-if="apuScoreStatus === 'complete'" variant="primary" class="btn col-12 col-md-auto btn btn-lg mt-3 flex-shrink-0 mt-3" @click="() => checkForPassport()">
               Resubmit Passport
             </b-button>
-            <b-button v-else variant="primary" :disabled="!isStaff && !isSubmissionEnabled" class="col-12 col-md-auto btn btn-lg mt-3 flex-shrink-0 btn-primary mt-3" @click="() => checkForPassport()">
+            <b-button disabled="disabled" v-else class="col-12 col-md-auto btn btn-lg mt-3 flex-shrink-0 mt-3" @click="() => checkForPassport()">
               Submit Passport
             </b-button>
-
-            <p v-if="!isSubmissionEnabled" class="text-grey-400 spacer-mt-2 text-left small">GR15 Countdown [[countDown]]</p>
-            <p v-if="!isSubmissionEnabled" class="text-grey-400 spacer-mt-2 text-left small">You will be able to connect your Passport when the Round begins.</p>
+          
           </div>
-          <div class="col-12 col-lg-6 position-relative pr-0 pl-0 pr-lg-5">
+          <div class="col-12 col-lg-6 position-relative pr-0 pl-0 pr-lg-3">
             <div class="h-100 shadow bg-white rounded flex-column text-center">
               <div class="d-flex flex-row-reverse"><div class="badge badge-pill bg-lightpurple mt-3 mr-3 font-subheader font-weight-light">GR[[clrRound]]</div></div>
               <div class="px-3 pt-3">
@@ -196,7 +220,6 @@ <h1 class="display-3 text-grey-400 currentScore" :class="{ saved: apuScoreStatus
       </div>
     </active-trust-manager>
 
-
   </div>
 
 {% endif %}

app/dashboard/templates/profiles/trust-vue.html

@@ -16,6 +16,8 @@
 {% endcomment %}
 {% load i18n static is_in_list matches bundle %}
 
+<script src="https://www.googleoptimize.com/optimize.js?id=OPT-PKX8Z87"></script>
+
 <meta charset="utf-8">
 
 <link rel="sitemap" type="application/xml" title="Sitemap" href="/sitemap.xml" />

app/retail/templates/shared/head.html

@@ -72,6 +72,7 @@ const staticAssetsBucket = new aws.s3.Bucket("bucket", {
     website: {
         indexDocument: "index.html",
     },
+    bucket: "bucket-0427bb4",
     forceDestroy: true,
 });