Improved searching query (added 'like wildcards')

3 files changed, 18 insertions, 12 deletions

diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css
index da6243e..2afc962 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css
+++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css
@@ -223,6 +223,7 @@ hr.ChatHeaderDivider {
 /* main chat */
 .SelectedReceiver {
     display: none;
+    height: 100%;
 }
 
 .ChatMessages {
diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js
index b7ebd1f..0f3dfd8 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js
@@ -143,26 +143,31 @@ $("#ImageUploadButton").on("click", function () {
  * SEARCH
  */
 UserSearchBar.keyup(function () {
-    SearchResults.empty();
     const RequestedUser = UserSearchBar.val();
-    if (RequestedUser !== " " && RequestedUser !== "")
+    if (RequestedUser !== " " && RequestedUser !== "") {
         $.ajax({
-            url: site.uri.public + "/api/users/u/" + RequestedUser,
-            success: function (answer) {
-                console.log("%c[SEARCH LOGGER] User " + RequestedUser + " was found!", "color: green");
-                //var GifUrls = ["https://media.giphy.com/media/xUPGcg01dIAot4zyZG/giphy.gif", "https://media.giphy.com/media/IS9LfP9oSLdcY/giphy.gif", "https://media.giphy.com/media/5wWf7H0WTquIU1DFY4g/giphy.gif"];
-                //var RandomGif = Math.floor((Math.random() * GifUrls.length));
-                //var RandomGifUrl = GifUrls[RandomGif];
-                //console.image(RandomGifUrl, 0.5);
-
-                SearchResults.append("<img class='Avatar' src='" + answer.avatar + "'/><div class='UsersFullName'>" + answer.full_name + "</div>");
+            url: site.uri.public + "/api/search/user/" + RequestedUser,
+            success: function (UserArray) {
+                SearchResults.empty();
+                UserArray.forEach(function(User) {
+                    console.log("%c[SEARCH LOGGER] User " + RequestedUser + " was found!", "color: green");
+                    //var GifUrls = ["https://media.giphy.com/media/xUPGcg01dIAot4zyZG/giphy.gif", "https://media.giphy.com/media/IS9LfP9oSLdcY/giphy.gif", "https://media.giphy.com/media/5wWf7H0WTquIU1DFY4g/giphy.gif"];
+                    //var RandomGif = Math.floor((Math.random() * GifUrls.length));
+                    //var RandomGifUrl = GifUrls[RandomGif];
+                    //console.image(RandomGifUrl, 0.5);
+                    SearchResults.append("<img class='Avatar' src='" + User.avatar + "'/><div class='UsersFullName'>" + User.full_name + "</div>");
+                })
             },
             error: function () {
+                SearchResults.empty();
                 console.log("%c[SEARCH LOGGER] User " + RequestedUser + " was not found!", "color: red");
 
                 alerts.ufAlerts().ufAlerts('fetch');
             }
         });
+    } else {
+        SearchResults.empty();
+    }
 });
 
 /**
diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig
index c77fa4d..5f8fe76 100644
--- a/main/app/sprinkles/core/templates/pages/index.html.twig
+++ b/main/app/sprinkles/core/templates/pages/index.html.twig
@@ -42,7 +42,7 @@
                            title="{{ translate("EXPLORE_TAB.USER_SEARCH_PH") }}"
                            placeholder="{{ translate("EXPLORE_TAB.USER_SEARCH_PH") }}">
                     <br>
-                    {#<div id="alerts-page"></div>#}
+                    <div id="alerts-page"></div>
                     <div class="SearchResults">
                     </div>
                     <div id="ExploreData">