Merge branch 'master' into dark-mode

gitcoinco · Mar 20, 2020 · fa03bbd · fa03bbd
2 parents 8b3c8b0 + 33ab7b5
commit fa03bbd
Show file tree

Hide file tree

Showing 46 changed files with 8,822 additions and 408 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -20,4 +20,5 @@ app/assets/onepager/js/bignumber.js
 
 app/assets/v2/js/lib/emoji-button.js
 app/assets/v2/js/lib/vue.js
+app/assets/v2/js/lib/jitsi.js
 app/assets/v2/js/lib/qrcode.js
diff --git a/app/app/context.py b/app/app/context.py
@@ -153,6 +153,7 @@ def preprocess(request):
             'protocol': settings.IPFS_API_SCHEME,
             'root': settings.IPFS_API_ROOT,
         },
+        'chat_persistence_frequency': 60 * 1000,
         'access_token': profile.access_token if profile else '',
         'is_staff': request.user.is_staff if user_is_authenticated else False,
         'is_moderator': profile.is_moderator if profile else False,

diff --git a/app/app/urls.py b/app/app/urls.py
@@ -74,6 +74,7 @@
     path('api/v1/bounty/<int:bounty_id>/close', dashboard.views.close_bounty_v1, name='close_bounty_v1'),
     path('api/v1/bounty/payout/<int:fulfillment_id>', dashboard.views.payout_bounty_v1, name='payout_bounty_v1'),
     re_path(r'.*api/v0.1/chat/presence$', chat.views.chat_presence, name='chat_presence'),
+    re_path(r'.*api/v0.1/video/presence$', townsquare.views.video_presence, name='video_presence'),
 
     # inbox
     re_path(r'^inbox/?', include('inbox.urls', namespace='inbox')),

diff --git a/app/app/utils.py b/app/app/utils.py
@@ -242,8 +242,9 @@ def sync_profile(handle, user=None, hide_profile=True):
         if not profile_exists:
             defaults['hide_profile'] = hide_profile
         profile, created = Profile.objects.update_or_create(handle=handle, defaults=defaults)
-        access_token = profile.user.social_auth.filter(provider='github').latest('pk').access_token
-        orgs = get_user(handle, '/orgs', auth=(profile.handle, access_token))
+        latest_obj = profile.user.social_auth.filter(provider='github').latest('pk') if profile.user else None
+        access_token = latest_obj.access_token if latest_obj else None
+        orgs = get_user(handle, '/orgs', auth=(profile.handle, access_token)) if access_token else []
         profile.organizations = [ele['login'] for ele in orgs if ele and type(ele) is dict] if orgs else []
         print("Profile:", profile, "- created" if created else "- updated")
         keywords = []

diff --git a/app/assets/v2/css/activity_stream.css b/app/assets/v2/css/activity_stream.css
@@ -5,6 +5,17 @@
   background-color: #ecf0f4;
   border: 0px solid;
 }
+.click_here_to_join_video{
+  width: 100%;
+  cursor: pointer;
+  min-height: 250px;
+}
+.click_here_to_join_video iframe{
+  min-height: 250px;
+}
+.click_here_to_join_video img{
+  width: 100%;
+}
 .after_copy{
   font-size: 12px;
 }
@@ -197,9 +208,26 @@ a .sup {
   display: inline-block;
 }
 
-#poll-button.selected{
+.click-gif.selected,
+#poll-button.selected,
+#video-button.selected{
   color: black;
 }
+#video_container{
+  background-color: white;
+  text-align: center;
+}
+#video_container img{
+  width: 75%;
+  margin: 0px auto;
+}
+iframe.popout{
+  position: fixed;
+  right: 0px;
+  bottom: 0px;
+  width: 25% !important;
+  height: 25% !important;
+}
 
 #poll_container input{
   display: block;
@@ -270,6 +298,9 @@ a .sup {
   border: 1px solid;
   margin-left: 25%;
 }
+.dropdown-menu.gif-inject-target.show{
+  margin-top: -185px;
+}
 
 @media (min-width: 768px) {
   .activity_feed_kudos_image{
@@ -281,6 +312,11 @@ a .sup {
   }
 }
 @media (max-width: 767.98px) {
+  .dropdown-menu.gif-inject-target.show{
+    margin-top: -150px;
+    margin-left: -300px;
+  }
+
   .activity_stream .activity-avatar{
     margin-top: 0px;
   }

diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
@@ -1709,6 +1709,13 @@ div.busyOverlay {
   font-size: 24px;
   line-height: 0px
 }
+.indie_chat_indicator{
+  color: #0fce7c;
+  display: inline;
+}
+.indie_chat_indicator.offline{
+  color: #aaa;
+}
 .navbar .chat_presence_indicator:hover{
   background-color: rgba(0,0,0,.5);
   border-radius: 5px;

diff --git a/app/assets/v2/css/grants/grant.css b/app/assets/v2/css/grants/grant.css
@@ -1,3 +1,122 @@
+.infinite-more-link{
+  display: none;
+}
+.announce {
+  text-align: center;
+  border-radius: 5px;
+  background-color: #fdedee;
+  padding: 3px;
+  position: relative;
+  margin-top: 25px;
+  margin-bottom: 25px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.announce:after {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 50%;
+  width: 0;
+  height: 0;
+  border: 20px solid transparent;
+  border-bottom-color: #fdedee;
+  border-top: 0;
+  border-left: 0;
+  margin-left: -10px;
+  margin-top: -20px;
+}
+
+.announce a {
+  background-color: #f2c3c4;
+  color: black;
+}
+
+.announce h4 {
+  border-bottom: 3px solid #fdedee;
+}
+
+.announce5 h4 {
+  border-bottom: 3px solid #def390 !important;
+}
+
+.announce5:after {
+  border-bottom-color: #def390 !important;
+}
+
+.announce5 {
+  background-color: #def390 !important;
+}
+
+.announce5 a {
+  background-color: #cee370 !important;
+}
+
+.announce4 h4 {
+  border-bottom: 3px solid #fce5ac !important;
+}
+
+.announce4:after {
+  border-bottom-color: #fce5ac !important;
+}
+
+.announce4 {
+  background-color: #fce5ac !important;
+}
+
+.announce4 a {
+  background-color: #dcc58c !important;
+}
+
+.announce3 h4 {
+  border-bottom: 3px solid #d0f9f4 !important;
+}
+
+.announce3:after {
+  border-bottom-color: #d0f9f4 !important;
+}
+
+.announce3 {
+  background-color: #d0f9f4 !important;
+}
+
+.announce3 a {
+  background-color: #b0d9d4 !important;
+}
+
+.announce2 h4 {
+  border-bottom: 3px solid #a4affc !important;
+}
+
+.announce2:after {
+  border-bottom-color: #a4affc !important;
+}
+
+.announce2 {
+  background-color: #a4affc !important;
+}
+
+.announce2 a {
+  background-color: #849ffc !important;
+}
+
+.announce6 h4 {
+  border-bottom: 3px solid #fde9ed !important;
+}
+
+.announce6:after {
+  border-bottom-color: #fde9ed !important;
+}
+
+.announce6 {
+  background-color: #fde9ed !important;
+}
+
+.announce6 a {
+  background-color: #ddb9bd !important;
+}
+
 .clr .label {
   background: #0FCE7C;
   color: #fff;
@@ -30,10 +149,7 @@
 }
 
 .header {
-  background-image: none;
-  background: linear-gradient(to right top, #0fce7c, #00a5a1, #0077b5, #0046a1, #0d0764);
-  animation: gradient 40s ease infinite;
-  background-size: 200% 200% !important;
+  background-size: cover;
 }
 
 .header .embed-responsive {

diff --git a/app/assets/v2/css/results.css b/app/assets/v2/css/results.css
@@ -7,6 +7,9 @@
 .navbar {
   background-color: #0d023b;
 }
+.infinite-more-link{
+  display: none;
+}
 
 .mega-founder {
   height: 150px;