[WIP] Grants

.github/ISSUE_TEMPLATE/custom.md

@@ -15,36 +15,8 @@ gitcoin.co/slack
 Provide a general summary of the issue in the title above and use relevant fields below to define the problem.
 
 -->
+### Who
 
-### User Story
+### What 
 
-[comment]: # (As a <user type>, I want to <task> so that <goal>.)
-
-### Why Is this Needed
-
-[comment]: # (Describe the problem and why this task is needed. Provide description of the current state, what you would like to happen, and what actually happen)
-*Summary*:
-
-### Description
-
-[comment]: # (Feature or Bug? i.e Type: Bug)
-*Type*:
-
-### Current Behavior
-[comment]: # (Describe what actually happened.)
-
-### Expected Behavior
-[comment]: # (Describe what you expected to happen.)
-
-### Reproduction
-[comment]: # (Describe how we can replicate the bug step by step.)
-
-### Solution
-[comment]: # (Provide a summary of the solution and a task list on what needs to be fixed.)
-*Summary*:
-
-### Definition of Done
-[comment]: # (Any other information that would be useful, bullets are helpful.)
-
-### Additional Information
-[comment]: # (Any other information that would be useful, content, screenshots, etc.)
+### Why

.github/ISSUE_TEMPLATE/feature_request.md

@@ -33,13 +33,6 @@ gitcoin.co/slack
 ### Expected Behavior
 [comment]: # (Describe what you expected to happen.)
 
-### Reproduction
-[comment]: # (Describe how we can replicate the bug step by step.)
-
-### Solution
-[comment]: # (Provide a summary of the solution and a task list on what needs to be fixed.)
-*Summary*:
-
 ### Definition of Done
 [comment]: # (Any other information that would be useful, bullets are helpful.)
 

.travis.yml

@@ -19,17 +19,6 @@ cache:
     - $HOME/.cache/pip
     - node_modules
 
-deploy:
-  provider: pages
-  skip-cleanup: true
-  github-token: $GITHUB_TOKEN
-  keep-history: true
-  local-dir: _build/site
-  fqdn: docs.gitcoin.co
-  target-branch: gh-pages
-  on:
-    branch: master
-
 jobs:
   include:
     # Lint and test the repository.
@@ -41,6 +30,15 @@ jobs:
         - cp app/app/travis.env app/app/.env
         - pip install pip setuptools --upgrade
         - pip install codecov
+        # Fetch and Install GeoIP database files.
+        - sudo apt-get update && sudo apt-get install -y libmaxminddb-dev
+        - wget http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz
+        - wget http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz
+        - gunzip GeoLite2-City.mmdb.gz && gunzip GeoLite2-Country.mmdb.gz
+        - sudo mkdir -p /opt/GeoIP/
+        - sudo mv *.mmdb /opt/GeoIP/
+        # Install libvips dependencies.
+        - sudo apt-get install -y libvips libvips-dev
         # Install Node and Python dependencies.
         - npm install
         - pip install -r requirements/test.txt
@@ -54,6 +52,16 @@ jobs:
       env:
         - PYTHONPATH="${TRAVIS_BUILD_DIR}/app/"
         - DJANGO_SETTINGS_MODULE="app.settings"
+      deploy:
+        provider: pages
+        skip-cleanup: true
+        github-token: $GITHUB_TOKEN
+        keep-history: true
+        local-dir: _build/site
+        fqdn: docs.gitcoin.co
+        target-branch: gh-pages
+        on:
+          branch: master
     # Deploy to Docker Hub and initiate a rolling update for web.
     - stage: deploy-stage
       if: branch = master AND NOT type = pull_request

Dockerfile

@@ -36,7 +36,7 @@ COPY bin/docker-command.bash /bin/docker-command.bash
 RUN dos2unix /bin/docker-command.bash && \
     apt-get purge -y --auto-remove dos2unix wget gcc libc6-dev libc-dev libssl-dev make automake libtool autoconf pkg-config libffi-dev apt-utils
 
-RUN apt-get update && apt-get install -y libmagickwand-dev
+RUN apt-get update && apt-get install -y libvips libvips-dev
 
 ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
 CMD ["bash", "/bin/docker-command.bash"]

Makefile

@@ -38,7 +38,7 @@ push: ## Push the Docker image to the Docker Hub repository.
 	@docker push "${REPO_NAME}"
 
 collect-static: ## Collect newly added static resources from the assets directory.
-	@docker-compose exec web python3 app/manage.py collectstatic -i other
+	@docker-compose exec -i web bash -c "cd /code/app && python3 manage.py collectstatic -i other"
 
 compress-images: ## Compress and optimize images throughout the repository. Requires optipng, svgo, and jpeg-recompress.
 	@./scripts/compress_images.bash

app/app/context.py

@@ -62,6 +62,9 @@ def insert_settings(request):
             'protocol': settings.IPFS_API_SCHEME,
             'root': settings.IPFS_API_ROOT,
         },
+        '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,
     }
     context['json_context'] = json.dumps(context)
 

app/app/local.env

@@ -29,5 +29,3 @@ GITHUB_API_TOKEN=
 GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
 GITHUB_APP_NAME=
-
-

app/app/pipeline.py

@@ -18,17 +18,17 @@
 
 """
 from django.conf import settings
+from django.core.exceptions import SuspiciousOperation
 
 from app.utils import setup_lang, sync_profile
 
 
 def save_profile(backend, user, response, request, *args, **kwargs):
     """Associate a Profile with a User."""
-
     if backend.name == 'github':
         handle = user.username
         if handle in settings.BLOCKED_USERS:
-            raise Exception('You cannot login')
+            raise SuspiciousOperation('You cannot login')
 
         sync_profile(handle, user, hide_profile=False)
         setup_lang(request, user)

app/app/settings.py

@@ -91,6 +91,7 @@
     'tdi',
     'gas',
     'git',
+    'healthcheck.apps.HealthcheckConfig',
     'legacy',
     'chartit',
     'email_obfuscator',
@@ -100,7 +101,8 @@
     'external_bounties',
     'dataviz',
     'impersonate',
-    'bounty_requests'
+    'grants',
+    'bounty_requests',
 ]
 
 MIDDLEWARE = [
@@ -586,7 +588,7 @@
 
 STABLE_COINS = ['DAI', 'USDT', 'TUSD']
 
-BLOCKED_USERS = env('BLOCKED_USERS', default=[]) 
+BLOCKED_USERS = env('BLOCKED_USERS', default=[])
 
 
 # Silk Profiling and Performance Monitoring

app/app/templates/shared/current_profile.html

@@ -0,0 +1,8 @@
+<script type="text/javascript">
+    var currentProfile = {
+        username: "{{ github_handle }}",
+        githubToken: "{{ access_token }}",
+        isStaff: "{{ is_staff }}" != "False",
+        isModerator: "{{ is_moderator }}" != "False"
+    };
+</script>

app/app/travis.env

@@ -4,3 +4,4 @@ DATABASE_URL=psql://postgres:postgres@localhost/testdb
 ENV=test
 REDIS_URL=rediscache://localhost:6379/0?client_class=django_redis.client.DefaultClient
 CACHEOPS_REDIS=redis://localhost:6379/0
+GEOIP_PATH=/opt/GeoIP/

app/app/urls.py

@@ -39,6 +39,7 @@
 import external_bounties.views
 import faucet.views
 import gitcoinbot.views
+import healthcheck.views
 import linkshortener.views
 import marketing.views
 import marketing.webhookviews
@@ -64,7 +65,10 @@
 
     # Health check endpoint
     re_path(r'^health/', include('health_check.urls')),
-    re_path(r'^lbcheck/?', retail.views.lbcheck, name='lbcheck'),
+    re_path(r'^lbcheck/?', healthcheck.views.lbcheck, name='lbcheck'),
+
+    # grant views
+    path('grants/', include('grants.urls', namespace='grants')),
 
     # dashboard views
 
@@ -176,7 +180,7 @@
     # sync methods
     url(r'^sync/web3/?', dashboard.views.sync_web3, name='sync_web3'),
     url(r'^sync/get_amount/?', dashboard.helpers.amount, name='helpers_amount'),
-    url(r'^sync/get_issue_details/?', dashboard.helpers.issue_details, name='helpers_issue_details'),
+    re_path(r'^sync/get_issue_details/?', dashboard.helpers.issue_details, name='helpers_issue_details'),
 
     # modals
     re_path(r'^modal/get_quickstart_video/?', dashboard.views.get_quickstart_video, name='get_quickstart_video'),
@@ -232,6 +236,9 @@
     re_path(r'^youtube/?', retail.views.youtube, name='youtube'),
     re_path(r'^web3/?', retail.views.web3, name='web3'),
 
+    # increase funding limit
+    re_path(r'^requestincrease/?', retail.views.increase_funding_limit_request, name='increase_funding_limit_request'),
+
     # link shortener
     url(r'^l/(.*)$/?', linkshortener.views.linkredirect, name='redirect'),
     url(r'^credit/(.*)$/?', credits.views.credits, name='credit'),

app/app/utils.py

@@ -208,6 +208,11 @@ def sync_profile(handle, user=None, hide_profile=True):
     if email and profile:
         get_or_save_email_subscriber(email, 'sync_profile', profile=profile)
 
+    if profile and not profile.github_access_token:
+        token = profile.get_access_token(save=False)
+        profile.github_access_token = token
+        profile.save()
+
     return profile
 
 

app/assets/cookielaw/css/cookielaw.css

@@ -5,7 +5,6 @@
   background-color: #F2F6F9;
   width: 100%;
   z-index: 999999999;
-  font-family: 'Muli', sans-serif;
 }
 
 #CookielawBanner .container {

app/assets/ens/index.js

@@ -1,18 +1,21 @@
 function signMsgAndCreateSubdomain(message, from) {
-  var msg = web3.toHex(message)
-  var params = [msg, from];
+  var msg = web3.toHex(message);
+  var params = [ msg, from ];
   var method = 'personal_sign';
+
   web3.currentProvider.sendAsync({
     method,
     params,
-    from,
-  }, function (err, result) {
-    if (err) return console.error(err)
-    if (result.error) return console.error(result.error)
-      $.post( "", { 'signedMsg' : result.result, 'signer': from }, function( data ) {
-        alert(data.msg);
-        location.reload();
-      });
+    from
+  }, function(err, result) {
+    if (err)
+      return console.error(err);
+    if (result.error)
+      return console.error(result.error);
+    $.post('', { 'signedMsg': result.result, 'signer': from }, function(data) {
+      alert(data.msg);
+      location.reload();
+    });
   });
 }
 

app/assets/ens/register.js

@@ -1,17 +1,18 @@
-window.onload = function () {
-  $("#register")[0].onclick = function (e) {
-    if ($("#tos")[0].checked === false) {
-      return alert('Please check the TOS checkbox.')
+window.onload = function() {
+  $('#register')[0].onclick = function(e) {
+    if ($('#tos')[0].checked === false) {
+      return alert('Please check the TOS checkbox.');
     }
     if (typeof web3 == 'undefined') {
-      return alert('Please install metamask in your browser and try again.')
+      return alert('Please install metamask in your browser and try again.');
     }
     // Get the github handle
-    githubHandle = $("#githubHandle").text()
+    githubHandle = $('#githubHandle').text();
     // Get the current account and call sign function:
-    web3.eth.getAccounts(function (err, accounts) {
-      if (!accounts) return
-      signMsgAndCreateSubdomain('Github Username : ' + $("#githubHandle").text(), accounts[0]);
+    web3.eth.getAccounts(function(err, accounts) {
+      if (!accounts)
+        return;
+      signMsgAndCreateSubdomain('Github Username : ' + $('#githubHandle').text(), accounts[0]);
     });
   };
-}
+};

app/assets/onepager/css/main.css

@@ -1,26 +1,9 @@
+/* One-Pager CSS */
 @charset "UTF-8";
 /* stylelint-disable no-descending-specificity */
 
-/* ...because sometimes descending-specificity is a PIA to clean up */
-
-/* Futura */
-
-@font-face {
-  font-family: 'futura-pt';
-  src: url('/static/v2/fonts/futura/font4.ttf')/* TTF file for CSS3 browsers */
-}
-
-/* Muli Regular */
-
-@font-face {
-  font-family: 'Muli';
-  src: url('/static/v2/fonts/Muli/Regular.ttf');
-  font-weight: 400;
-}
-
 body {
   line-height: 1;
-  font-family: 'Muli', sans-serif !important;
   -webkit-text-size-adjust: none;
   overflow: hidden;
   width: 100%;
@@ -72,7 +55,6 @@ body.is-loading:after {
   text-transform: uppercase;
   font-size: 14px;
   padding: 4px 7px;
-  font-family: 'Muli', sans-serif;
   font-weight: 100;
   letter-spacing: 0.15em;
   margin: 5px;
@@ -716,8 +698,6 @@ dl dd {
   position: absolute;
 }
 
-/* Footer */
-
 #footer {
   -moz-align-self: -moz-flex-end;
   -webkit-align-self: -webkit-flex-end;

app/assets/onepager/js/receive.js

@@ -118,7 +118,7 @@ $(document).ready(function() {
             nonce: web3.toHex(nonce),
             to: forwarding_address,
             from: holding_address,
-            value: amount_in_wei
+            value: amount_in_wei.toString()
           };
           web3.eth.estimateGas(rawTx, function(err, gasLimit) {
             var buffer = new BigNumber(0);
@@ -146,7 +146,7 @@ $(document).ready(function() {
         } else {
 
           // send ERC20
-          var data = token_contract.transfer.getData(forwarding_address, amount_in_wei);
+          var data = token_contract.transfer.getData(forwarding_address, amount_in_wei.toString());
 
           rawTx = {
             nonce: web3.toHex(nonce),
@@ -157,7 +157,7 @@ $(document).ready(function() {
           };
 
           web3.eth.estimateGas(rawTx, function(err, gasLimit) {
-            rawTx['gasPrice'] = gas_price_wei;
+            rawTx['gasPrice'] = gas_price_wei.toNumber();
             rawTx['gas'] = gasLimit;
             rawTx['gasLimit'] = gasLimit;
             var will_fail_at_this_gas_price = (gas_price_wei * gasLimit) > balance;