Merge branch 'master' into feature/binance-chain-integration

.eslintrc

@@ -15,7 +15,7 @@
   "plugins": [],
   "parserOptions": {
     "sourceType": "module",
-    "ecmaVersion": 8,
+    "ecmaVersion": 9,
     "ecmaFeatures": {
       "modules": true,
       "arrowFunctions": true,

CODEOWNERS

@@ -5,4 +5,4 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-*       @danlipert @thelostone-mc @octavioamu @pixelantdesign @frankchen07
+*       @danlipert @thelostone-mc @octavioamu @pixelantdesign @frankchen07 @aamustapha @chibie

app/app/local.env

@@ -31,6 +31,10 @@ GITHUB_APP_NAME=
 CHAT_SERVER_URL=chat
 CHAT_URL=localhost
 
+# To enable Google verification(in profile's trust tab)
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+
 INFURA_USE_V3=True
 
 SUPRESS_DEBUG_TOOLBAR=1

app/app/settings.py

@@ -598,6 +598,16 @@ def callback(request):
 GITHUB_API_TOKEN = env('GITHUB_API_TOKEN', default='')  # TODO
 GITHUB_APP_NAME = env('GITHUB_APP_NAME', default='gitcoin-local')
 
+# Google
+GOOGLE_AUTH_BASE_URL = env('GOOGLE_AUTH_BASE_URL', default='https://accounts.google.com/o/oauth2/auth')
+GOOGLE_TOKEN_URL = env('GOOGLE_TOKEN_URL', default='https://oauth2.googleapis.com/token')
+GOOGLE_CLIENT_ID = env('GOOGLE_CLIENT_ID', default='')
+GOOGLE_CLIENT_SECRET = env('GOOGLE_CLIENT_SECRET', default='')
+GOOGLE_SCOPE = env('GOOGLE_SCOPE', default='https://www.googleapis.com/auth/userinfo.profile')
+
+# OATHLIB
+OAUTHLIB_INSECURE_TRANSPORT = env('OAUTHLIB_INSECURE_TRANSPORT', default=1)
+
 # Kudos revenue account
 KUDOS_REVENUE_ACCOUNT_ADDRESS = env('KUDOS_REVENUE_ACCOUNT_ADDRESS', default='0xdb282cee382244e05dd226c8809d2405b76fbdc9')
 
@@ -673,6 +683,7 @@ def callback(request):
 KUDOS_OWNER_ACCOUNT = env('KUDOS_OWNER_ACCOUNT', default='0xD386793F1DB5F21609571C0164841E5eA2D33aD8')
 KUDOS_PRIVATE_KEY = env('KUDOS_PRIVATE_KEY', default='')
 KUDOS_CONTRACT_MAINNET = env('KUDOS_CONTRACT_MAINNET', default='0x2aea4add166ebf38b63d09a75de1a7b94aa24163')
+KUDOS_CONTRACT_XDAI = env('KUDOS_CONTRACT_XDAI', default='0x74e596525C63393f42C76987b6A66F4e52733efa')
 KUDOS_CONTRACT_RINKEBY = env('KUDOS_CONTRACT_RINKEBY', default='0x4077ae95eec529d924571d00e81ecde104601ae8')
 KUDOS_CONTRACT_ROPSTEN = env('KUDOS_CONTRACT_ROPSTEN', default='0xcd520707fc68d153283d518b29ada466f9091ea8')
 KUDOS_CONTRACT_TESTRPC = env('KUDOS_CONTRACT_TESTRPC', default='0x38c48d14a5bbc38c17ced9cd5f0695894336f426')

app/app/urls.py

@@ -156,6 +156,15 @@
         dashboard.views.verify_user_twitter,
         name='verify_user_twitter'
     ),
+    url(
+        r'^api/v0.1/profile/(?P<handle>.*)/verify_user_poap', dashboard.views.verify_user_poap, name='verify_user_poap'
+    ),
+    url(
+        r'^api/v0.1/profile/(?P<handle>.*)/request_verify_google',
+        dashboard.views.request_verify_google,
+        name='request_verify_google'
+    ),
+    url(r'^api/v0.1/profile/verify_user_google', dashboard.views.verify_user_google, name='verify_user_google'),
     url(r'^api/v0.1/profile/(?P<handle>.*)', dashboard.views.profile_details, name='profile_details'),
     url(r'^api/v0.1/user_card/(?P<handle>.*)', dashboard.views.user_card, name='user_card'),
     url(r'^api/v0.1/banners', dashboard.views.load_banners, name='load_banners'),
@@ -271,6 +280,11 @@
         dashboard.views.hackathon_get_project,
         name='hackathon_edit_project'
     ),
+    path(
+        'hackathon/<str:hackathon>/projects/<int:project_id>',
+        dashboard.views.hackathon_project_page,
+        name='hackathon_project_page'
+    ),
     path(
         'hackathon/<str:hackathon>/projects/<int:project_id>/<str:project_name>',
         dashboard.views.hackathon_project_page,

app/assets/landingpage/app.css

@@ -133,11 +133,10 @@ a.btn, button.btn {
   border: 0;
   outline: 0;
   font-size: 100%;
-  filter: brightness(95%);
   /* enhance to a 2col grid for icon */
 }
 a.btn:hover, button.btn:hover {
-  filter: brightness(100%);
+  filter: brightness(75%);
 }
 a.btn span, button.btn span {
   margin: auto;
@@ -147,7 +146,7 @@ a.btn.icon, button.btn.icon {
   grid-template-columns: auto auto;
 }
 a.btn.icon img, button.btn.icon img {
-  width: 27px;
+  width: 32px;
   height: 32px;
   margin: auto;
 }
@@ -1074,9 +1073,7 @@ section#footersocial {
   margin-top: 0em;
   margin-left: 3em;
   margin-right: 3em;
-  display: grid;
-  grid-template-columns: repeat(7, 1fr);
-  justify-content: end;
+  display: flex;
   padding: 1.5em 0em;
   background-color: var(--vinuspurple);
 }
@@ -1100,37 +1097,16 @@ section#footersocial figure svg:hover {
 
 @media (max-width: 688px) {
   section#footersocial {
-    grid-template-columns: repeat(3, 1fr);
-    grid-row-gap: 3em;
     margin-left: 1.5em;
     margin-right: 1.5em;
   }
+  section#footersocial figure svg {
+    width: 40px;
+    height: 40px;
+  }
 }
 section#footerconsensys figure {
   width: 200px;
   margin: auto;
   padding: 3em 0em;
 }
-
-@keyframes pulse {
-  from { transform: scale(1); }
-  50% { transform: scale(0.9); }
-  to { transform: scale(1); }
-}
-
-.fe-pulse:hover {
-  animation-name: pulse;
-  animation-duration: 3s;
-  animation-iteration-count: infinite;
-}
-
-.hover-logo div{
-  border-radius: 5px;
-  cursor: pointer;
-  padding: 20px;
-  margin-right: 10%;
-  margin-left: 10%;
-}
-.hover-logo div:hover{
-  background: rgba(55, 0, 200, 0.3);
-}

app/assets/v2/css/about.css

@@ -102,6 +102,10 @@ h4 {
   opacity: .9;
 }
 
+#team .alt_avatar{
+  border-radius: 150px;
+}
+
 #team .avatar:hover {
   width: 235px;
   height: 295px;

app/assets/v2/css/grants/cart.css

@@ -119,17 +119,16 @@
 }
 
 .comment-option .radio-label {
-  border: 1px solid #9a96ac;
   color: #9a96ac;
-  padding: 4px 9px;
+  font-weight: 600;
+  background: white;
 }
 
 .comment-option .radio-input:checked + .radio-label,
 .comment-option .radio-label:hover {
   cursor: pointer;
   background-color: #9a96ac;
   color: white !important;
-  font-weight: 600;
 }
 
 .middle-line {

app/assets/v2/css/grants/detail.css

@@ -154,6 +154,7 @@ textarea.editable {
 #form--input__description,
 #form--input__reference-url,
 #form--twitter__account,
+#form--input__github-project-url,
 #form--input__title,
 #contract_owner_address {
   width: 100%;

app/assets/v2/css/grants/new.css

@@ -74,4 +74,12 @@
 
 .select2-selection__rendered .select2-selection__choice {
   font-size: 14px;
+}
+
+.vs__open-indicator {
+  transform: scale(0.8);
+}
+
+.ql-editor{
+  min-height: 7rem;
 }