Merge branch 'master' into reserve-bounty-improvements

app/app/settings.py

@@ -120,7 +120,7 @@
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'app.middleware.drop_accept_langauge',
-    'app.middleware.bleach_requests',
+    # 'app.middleware.bleach_requests',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',

app/app/templates/shared/current_profile.html

@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
   let currentProfile = {
     username: "{{ github_handle }}",
     githubToken: "{{ access_token }}",

app/app/templates/shared/sentry.html

@@ -15,8 +15,8 @@
   along with this program. If not, see <http://www.gnu.org/licenses/>.
 {% endcomment %}
 {% if raven_js_dsn %}
-  <script src="https://cdn.ravenjs.com/{{ raven_js_version|default_if_none:'3.26.4' }}/raven.min.js" crossorigin="anonymous" type="text/javascript"></script>
-  <script type="text/javascript">
+  <script src="https://cdn.ravenjs.com/{{ raven_js_version|default_if_none:'3.26.4' }}/raven.min.js" crossorigin="anonymous"></script>
+  <script>
     var ravenOptions = {
       release: '{{ release }}',
       environment: '{{ env }}',

app/app/urls.py

@@ -112,6 +112,11 @@
         dashboard.views.social_contribution_email,
         name='social_contribution_email'
     ),
+    url(
+        r'^api/v0.1/bulk_invite',
+        dashboard.views.bulk_invite,
+        name='bulk_invite'
+    ),
     url(r'^api/v0.1/bountydocument', dashboard.views.bounty_upload_nda, name='bounty_upload_nda'),
     url(r'^api/v0.1/faucet/save/?', faucet.views.save_faucet, name='save_faucet'),
     url(r'^api/v0.1/', include(dbrouter.urls)),

app/assets/v2/css/about.css

@@ -113,6 +113,16 @@ h4 {
   margin-bottom: -90px;
 }
 
+#team .avatar.joe {
+  width: 255px;
+  margin-left: -15px;
+}
+
+#team .avatar.joe:hover {
+  width: 265px;
+  margin-left: -15px;
+}
+
 #team .avatar.jobs {
   height: 275px;
 }
@@ -127,7 +137,7 @@ h4 {
 }
 
 #team .social-links a i {
-  font-size: 2.25em;
+  font-size: 1.75em;
   transition: all 0.3s;
   color: black;
 }

app/assets/v2/js/users.js

@@ -120,6 +120,53 @@ Vue.mixin({
         }
       });
     },
+    sendInviteAll: function(bountyUrl) {
+      let vm = this;
+      const apiUrlInvite = '/api/v0.1/bulk_invite/';
+      const postInvite = fetchData(
+        apiUrlInvite,
+        'POST',
+        { 'params': vm.params, 'bountyId': bountyUrl},
+        {'X-CSRFToken': csrftoken}
+      );
+
+      $.when(postInvite).then((response) => {
+        console.log(response);
+        if (response.status !== 200) {
+          _alert(response.msg, 'error');
+
+        } else {
+          vm.$refs['user-modal'].closeModal();
+          _alert('The invitation has been sent', 'info');
+        }
+      });
+
+    },
+    getIssueDetails: function(url) {
+      let vm = this;
+      const apiUrldetails = `/actions/api/v0.1/bounties/?github_url=${encodeURIComponent(url)}`;
+
+      vm.errorIssueDetails = undefined;
+
+      if (url.indexOf('github.com/') < 0) {
+        vm.issueDetails = null;
+        vm.errorIssueDetails = 'Please paste a github issue url';
+        return;
+      }
+      vm.issueDetails = undefined;
+      const getIssue = fetchData(apiUrldetails, 'GET');
+
+      $.when(getIssue).then((response) => {
+        if (response[0]) {
+          vm.issueDetails = response[0];
+          vm.errorIssueDetails = undefined;
+        } else {
+          vm.issueDetails = null;
+          vm.errorIssueDetails = 'This issue wasn\'t bountied yet.';
+        }
+      });
+
+    },
     closeModal() {
       this.$refs['user-modal'].closeModal();
     },
@@ -187,7 +234,10 @@ if (document.getElementById('gc-users-directory')) {
       skills: document.keywords,
       selectedSkills: [],
       noResults: false,
-      isLoading: true
+      isLoading: true,
+      gitcoinIssueUrl: '',
+      issueDetails: undefined,
+      errorIssueDetails: undefined
     },
     mounted() {
       this.fetchUsers();

app/assets/v2/js/vue-components.js

@@ -1,6 +1,6 @@
 Vue.component('modal', {
-  props: [ 'user', 'size' ],
-  template: `<div class="vue-modal modal fade" id="userModal" tabindex="-1" role="dialog" aria-labelledby="userModalLabel" aria-hidden="true">
+  props: [ 'user', 'size', 'id', 'issueDetails' ],
+  template: `<div class="vue-modal modal fade" :id="id" tabindex="-1" role="dialog" aria-labelledby="userModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered" :class="size" role="document">
           <div class="modal-content">
             <div class="modal-header border-0">
@@ -52,7 +52,9 @@ Vue.component('select2', {
   },
   watch: {
     value: function(value) {
-      if ([...value].sort().join(',') !== [...$(this.$el).val()].sort().join(',')) {
+      if (value === undefined) {
+        $(this.$el).empty().select2({ data: this.options });
+      } else if ([...value].sort().join(',') !== [...$(this.$el).val()].sort().join(',')) {
         $(this.$el).val(value).trigger('change');
       }
     },