stable -> master (#5901)

* search POC * finishes ingesting the remainder of the database objects into the search table * make fix and images * migrtations reset * feed img fix * disables CLR round * date * chore: update sponsor clr section * avatar url * fixes the leaderboard job * a few small tweaks * enables daily email even iff there are no new bounties (#5831) * change default trend settings * sends new bounty daily email even if there are only actions (not new bounties * one quick copy update * Update emails.py * stop clr to save some cpu * is debugging offers https://gitcoincore.slack.com/archives/CAXQ7PT60/p1579891144044900 * kudos tab + toggle mode * fixes syntax error; my bad * loading indicator, new kdudos feed and corrects kudos feed kudos size * fixes /home nav * a fix to showing activity feed items that are hidden, also the ability to one click approve + email token requests * email fixes * prevent arbitrary created_on filter * fixes derpy email subject line * fixes https://sentry.io/organizations/gitcoin/issues/1448838094/?project=1398424&query=is%3Aunresolved&statsPeriod=14d&utc=true * alert timing * big scary warning to make sure u have access to addr u put int ot he form * loading indicator parent actiivyt * make fix; and a bailout for #5834 * offers are now 10x less lame looking * fixes grant number * fix offer backgrounds * changes offers for the better by adding the ability to have an offerer name / link * last little straggler commit * default tab * fixes a couple derpy things about actions * fixes the daily action * cancel bounty * cleans up the /products page, significantly alts the nav for more consistency and takes users to the various marketplaces accoss the site as a default (an consistent about button is now on the nav tho so ppl can easily see what these produts are about if they care to read the docs) * usdt value was wrong * only search if is staff * onme small fix * token creator Co-authored-by: Kevin Owocki <[email protected]> Co-authored-by: connoroday <[email protected]> Co-authored-by: Dan Lipert <[email protected]>
gitcoinco · Jan 29, 2020 · 4c0e4b9 · 4c0e4b9
1 parent 7efca07
commit 4c0e4b9
Show file tree

Hide file tree

Showing 70 changed files with 1,275 additions and 144 deletions.
diff --git a/app/app/settings.py b/app/app/settings.py
@@ -121,6 +121,7 @@
     'event_ethdenver2019',
     'inbox',
     'feeswapper',
+    'search',
     'oauth2_provider',
     'townsquare',
     'compliance',

diff --git a/app/app/urls.py b/app/app/urls.py
@@ -50,6 +50,7 @@
 import retail.emails
 import retail.views
 import revenue.views
+import search.views
 import tdi.views
 import townsquare.views
 from avatar.router import router as avatar_router
@@ -145,6 +146,7 @@
     url(r'^actions/api/v0.1/', include(dbrouter.urls)),  # same as active
     url(r'^api/v0.1/users_search/', dashboard.views.get_users, name='users_search'),
     url(r'^api/v0.1/kudos_search/', dashboard.views.get_kudos, name='kudos_search'),
+    url(r'^api/v0.1/search/', search.views.search, name='search'),
     url(r'^api/v0.1/choose_persona/', dashboard.views.choose_persona, name='choose_persona'),
 
     # chat

diff --git a/app/assets/v2/css/activity_stream.css b/app/assets/v2/css/activity_stream.css
@@ -22,13 +22,19 @@
   font-size: smaller;  
 }
 
+.activity_feed_kudos_image{
+  max-width: 70px;
+}
+
 .action i,
 a .sup {
   color: black;
 }
+
 .action:hover {
   background-color: #fafafa;
 }
+
 .action.open {
   background-color: #eeeeee;
 }
@@ -130,6 +136,10 @@ a .sup {
 }
 
 @media (min-width: 768px) {
+  .activity_feed_kudos_image{
+    max-width: 110px;
+  }
+
   .activity .secondary {
     position: relative;
     left: -10px;
@@ -141,6 +151,7 @@ a .sup {
     text-align: center;
     margin: 0px auto;
   }
+
   .activity-info {
     text-align: center;
   }

diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
@@ -1634,6 +1634,34 @@ div.busyOverlay {
   padding: 3px 5px;
   border-radius: 3px;
 }
+/* search */
+.navbar-nav .select2-selection__placeholder{
+  color: white;
+}
+.navbar-nav .select2{
+  height: 14px;
+}
+.select2-container--search .select2-dropdown{
+  width: 200px !important;
+  left: -200px !important;
+}
+.select2-container--search .element-search-result img{
+  max-width: 50px;
+  max-height: 50px;
+}
+.navbar-nav .select2-container--search .select2-selection.select2-selection--single{
+  border: none !important;
+  float: right;
+  font-size: 14px;
+  margin-top: 5px;
+}
+.select2-container--search .select2-results__option:hover{
+  background-color: yellow;
+  cursor: pointer;
+}
+#search{
+  width: 20px;
+}
 
 .card-shadow {
   box-shadow: 0px 2px 2px 1px rgba(0, 0, 0, .1);

diff --git a/app/assets/v2/css/grants/grant.css b/app/assets/v2/css/grants/grant.css
@@ -307,7 +307,8 @@
 }
 
 .grant-partners {
-  background: #0D0764;
+  background: linear-gradient(to right top, #0fce7c, #00a5a1, #0077b5, #0046a1, #0d0764);
+  animation: gradient 40s ease infinite;
   border-radius: 3px;
 }