Merge pull request #31 from UCF/whoops

Announcement Keyword Bug Fix
UCF · Feb 14, 2019 · fbac00d · fbac00d
2 parents 8c259ee + c361d9d
commit fbac00d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git a/src/js/.eslintrc.json b/src/js/.eslintrc.json
@@ -8,7 +8,8 @@
   },
   "globals": {
     "Bloodhound": true,
-    "tinymce": true
+    "tinymce": true,
+    "ANNOUNCEMENTS_CONST": true
   },
   "extends": "eslint:recommended",
   "parserOptions": {

diff --git a/src/js/backend-script.js b/src/js/backend-script.js
@@ -1,7 +1,7 @@
 function confirmNewUser() {
-  const $urlInput = $('#confirmUserURL'),
-    url = $urlInput.val(),
-    $token = $('input[name="csrfmiddlewaretoken"]');
+  const $urlInput = $('#confirmUserURL');
+  const url = $urlInput.val();
+  const $token = $('input[name="csrfmiddlewaretoken"]');
 
   $.post(
     url,
@@ -12,9 +12,9 @@ function confirmNewUser() {
 }
 
 function showNewUserModal($) {
-  const $hfShowModal = $('#showNewUserModal'),
-    $newUserModal = $('#newUserModal'),
-    showModal = $hfShowModal ? $hfShowModal.val() : false;
+  const $hfShowModal = $('#showNewUserModal');
+  const $newUserModal = $('#newUserModal');
+  const showModal = $hfShowModal ? $hfShowModal.val() : false;
 
   if (showModal === 'True') {
     $newUserModal.modal();

diff --git a/src/js/frontend-script.js b/src/js/frontend-script.js
@@ -5,7 +5,7 @@ function tagsInput($) {
     },
     queryTokenizer: Bloodhound.tokenizers.whitespace,
     remote: {
-      url: 'http://127.0.0.1:8000/api/keywords/?s=%QUERY&format=json',
+      url: `${ANNOUNCEMENTS_CONST.KEYWORDS_API}?s=%QUERY&format=json`,
       wildcard: '%QUERY'
     }
   });

diff --git a/src/scss/_forms.scss b/src/scss/_forms.scss
@@ -1,5 +1,6 @@
 .tt-menu {
     background-color: $white;
+    border: 1px solid $black;
     font-size: 13px !important;
     width: 100%;
 
@@ -31,4 +32,4 @@
     [type="checkbox"] {
         @extend .form-check-input;
     }
-}
+}
diff --git a/static/css/style.min.css b/static/css/style.min.css
diff --git a/static/js/script.min.js b/static/js/script.min.js
diff --git a/templates/base.html b/templates/base.html
@@ -28,6 +28,11 @@
         </main>
         {% block footer %}{% endblock %}
     {% block footer_scripts %}
+    <script type="text/javascript">
+      var ANNOUNCEMENTS_CONST = {
+        KEYWORDS_API: "{% url 'announcements.api.keywords' %}"
+      };
+    </script>
     <script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput.min.js" integrity="sha256-tQ3x4V2JW+L0ew/P3v2xzL46XDjEWUExFkCDY0Rflqc=" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script>