From 1db857be07f76fe734a0bbefe79e2ba9a964dba2 Mon Sep 17 00:00:00 2001 From: Alexander_Kabui Date: Wed, 1 Mar 2023 03:27:13 +0300 Subject: show user history on global search --- wqflask/wqflask/templates/search_history.html | 297 ++++++++++++++++++++++++++ 1 file changed, 297 insertions(+) create mode 100644 wqflask/wqflask/templates/search_history.html diff --git a/wqflask/wqflask/templates/search_history.html b/wqflask/wqflask/templates/search_history.html new file mode 100644 index 00000000..11586c0a --- /dev/null +++ b/wqflask/wqflask/templates/search_history.html @@ -0,0 +1,297 @@ +< + + + + + + + + + + + +
+
+

+ this is the title +

+
+
+
+ +
+
+
+ + + + \ No newline at end of file -- cgit v1.2.3 From 66835226df792847fd89def61609a115d5089afc Mon Sep 17 00:00:00 2001 From: Alexander_Kabui Date: Wed, 1 Mar 2023 03:27:57 +0300 Subject: hint/autocomplete on global search --- wqflask/wqflask/templates/search_autocomplete.html | 249 +++++++++++++++++++++ 1 file changed, 249 insertions(+) create mode 100644 wqflask/wqflask/templates/search_autocomplete.html diff --git a/wqflask/wqflask/templates/search_autocomplete.html b/wqflask/wqflask/templates/search_autocomplete.html new file mode 100644 index 00000000..b8d0514e --- /dev/null +++ b/wqflask/wqflask/templates/search_autocomplete.html @@ -0,0 +1,249 @@ +< + + + + + + + + + + + +
+

hello there

+
+
+ +
+ +
+
+ + + + \ No newline at end of file -- cgit v1.2.3 From 3582c60551c5e6bf24a62d5c22fefd62a1aa560b Mon Sep 17 00:00:00 2001 From: Alexander_Kabui Date: Wed, 8 Mar 2023 05:57:07 +0300 Subject: add autocomplete js code --- .../static/new/javascript/search_autocomplete.js | 154 +++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 wqflask/wqflask/static/new/javascript/search_autocomplete.js diff --git a/wqflask/wqflask/static/new/javascript/search_autocomplete.js b/wqflask/wqflask/static/new/javascript/search_autocomplete.js new file mode 100644 index 00000000..a68dc655 --- /dev/null +++ b/wqflask/wqflask/static/new/javascript/search_autocomplete.js @@ -0,0 +1,154 @@ + //replace with gn search hints + function autocomplete(inp, arr) { + /*the autocomplete function takes two arguments, + the text field element and an array of possible autocompleted values:*/ + var currentFocus; + /*execute a function when someone writes in the text field:*/ + + inp.addEventListener("focus", function(e) { + var a, b, i, val = this.value; + closeAllLists(); + currentFocus = -1; + a = document.createElement("DIV"); + a.setAttribute("id", this.id + "autocomplete-list"); + a.setAttribute("class", "autocomplete-items"); + this.parentNode.appendChild(a); + let historySearch = retrieveSearchHistory().splice(0, 5) + let text_title = document.createElement("DIV") + text_title.innerHTML = "RECENT SEARCH"; + text_title.setAttribute("class", "recent-search-title") + text_title.setAttribute('disabled', true); + a.appendChild(text_title); + for (i = 0; i < historySearch.length; i++) { + b = document.createElement("DIV"); + b.innerHTML = "" + historySearch[i].substr(0, val.length) + ""; + b.style.color = "blue"; + b.innerHTML += historySearch[i].substr(val.length); + b.innerHTML += ""; + b.addEventListener("click", function(e) { + inp.value = this.getElementsByTagName("input")[0].value; + closeAllLists(); + }); + a.appendChild(b); + + } + }); + + + + inp.addEventListener("input", function(e) { + var a, b, i, val = this.value; + /*close any already open lists of autocompleted values*/ + closeAllLists(); + if (!val) { return false; } + currentFocus = -1; + /*create a DIV element that will contain the items (values):*/ + a = document.createElement("DIV"); + a.setAttribute("id", this.id + "autocomplete-list"); + a.setAttribute("class", "autocomplete-items"); + /*append the DIV element as a child of the autocomplete container:*/ + this.parentNode.appendChild(a); + /*for each item in the array...*/ + for (i = 0; i < arr.length; i++) { + /*check if the item starts with the same letters as the text field value:*/ + if (arr[i].substr(0, val.length).toUpperCase() == val.toUpperCase()) { + /*create a DIV element for each matching element:*/ + b = document.createElement("DIV"); + /*make the matching letters bold:*/ + b.innerHTML = "" + arr[i].substr(0, val.length) + ""; + b.innerHTML += arr[i].substr(val.length); + /*insert a input field that will hold the current array item's value:*/ + b.innerHTML += ""; + /*execute a function when someone clicks on the item value (DIV element):*/ + b.addEventListener("click", function(e) { + /*insert the value for the autocomplete text field:*/ + inp.value = this.getElementsByTagName("input")[0].value; + /*close the list of autocompleted values, + (or any other open lists of autocompleted values:*/ + closeAllLists(); + }); + a.appendChild(b); + } + } + }); + /*execute a function presses a key on the keyboard:*/ + inp.addEventListener("keydown", function(e) { + var x = document.getElementById(this.id + "autocomplete-list"); + if (x) x = x.getElementsByTagName("div"); + if (e.keyCode == 40) { + /*If the arrow DOWN key is pressed, + increase the currentFocus variable:*/ + currentFocus++; + /*and and make the current item more visible:*/ + addActive(x); + } else if (e.keyCode == 38) { //up + /*If the arrow UP key is pressed, + decrease the currentFocus variable:*/ + currentFocus--; + /*and and make the current item more visible:*/ + addActive(x); + } else if (e.keyCode == 13) { + /*If the ENTER key is pressed, prevent the form from being submitted,*/ + e.preventDefault(); + if (currentFocus > -1) { + /*and simulate a click on the "active" item:*/ + if (x) x[currentFocus].click(); + } + } + }); + + function addActive(x) { + /*a function to classify an item as "active":*/ + if (!x) return false; + /*start by removing the "active" class on all items:*/ + removeActive(x); + if (currentFocus >= x.length) currentFocus = 0; + if (currentFocus < 0) currentFocus = (x.length - 1); + /*add class "autocomplete-active":*/ + x[currentFocus].classList.add("autocomplete-active"); + } + + function removeActive(x) { + /*a function to remove the "active" class from all autocomplete items:*/ + for (var i = 0; i < x.length; i++) { + x[i].classList.remove("autocomplete-active"); + } + } + + function closeAllLists(elmnt) { + /*close all autocomplete lists in the document, + except the one passed as an argument:*/ + var x = document.getElementsByClassName("autocomplete-items"); + for (var i = 0; i < x.length; i++) { + if (elmnt != x[i] && elmnt != inp) { + x[i].parentNode.removeChild(x[i]); + } + } + } + + + + /*execute a function when someone clicks in the document:*/ + document.addEventListener("click", function(e) { + closeAllLists(e.target); + }) + + } + + function retrieveSearchHistory() { + let results = JSON.parse(localStorage.getItem("gn_search_history")) + return results ? results : [] + } + + + + + + function saveBeforeSubmit(new_search) { + + let search = retrieveSearchHistory() + search.unshift(new_search) + + localStorage.setItem("gn_search_history", JSON.stringify([...new Set(search)])) + + } \ No newline at end of file -- cgit v1.2.3 From cd4d100a2090e97077b0a4414365873e0de5dc25 Mon Sep 17 00:00:00 2001 From: Alexander_Kabui Date: Wed, 8 Mar 2023 05:58:38 +0300 Subject: add autocomplete css code --- wqflask/wqflask/static/new/css/autocomplete.css | 80 +++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 wqflask/wqflask/static/new/css/autocomplete.css diff --git a/wqflask/wqflask/static/new/css/autocomplete.css b/wqflask/wqflask/static/new/css/autocomplete.css new file mode 100644 index 00000000..aba68e37 --- /dev/null +++ b/wqflask/wqflask/static/new/css/autocomplete.css @@ -0,0 +1,80 @@ +.autocomplete { + /*the container must be positioned relative:*/ + position: relative; + display: inline-block; +} + +input.autocomplete { + border: 1px solid transparent; + background-color: #f1f1f1; + padding: 10px; + font-size: 16px; +} + +input[type=text].autocomplete { + background-color: #f1f1f1; + width: 100%; +} + +input[type=submit].autocomplete { + background-color: DodgerBlue; + color: #fff; +} + + +.autocomplete-items { + position: absolute; + border: 1px solid #d4d4d4; + border-bottom: none; + border-top: none; + z-index: 99; + /*position the autocomplete items to be the same width as the container:*/ + top: 100%; + left: 0; + right: 0; +} + +.autocomplete-items div { + padding: 10px; + cursor: pointer; + background-color: #fff; + border-bottom: 1px solid #d4d4d4; +} + +.autocomplete-items div:hover { + /*when hovering an item:*/ + background-color: #e9e9e9; +} + +.autocomplete-active { + /*when navigating through the items using the arrow keys:*/ + background-color: DodgerBlue !important; + color: #ffffff; +} + +.recent-search-title { + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -webkit-flex; + display: flex; +} + +.recent-search-title * { + -webkit-box-flex: 1 1 auto; + -moz-box-flex: 1 1 auto; + -webkit-flex: 1 1 auto; + -ms-flex: 1 1 auto; + flex: 1 1 auto; +} + + +.recent-search-title input[type="button"] { + border: none; + background: none; + cursor: pointer; + margin: 0; + padding: 0; + color: blue; + +} \ No newline at end of file -- cgit v1.2.3 From 23da4fa4123aa329084b48942946f93f939f01f9 Mon Sep 17 00:00:00 2001 From: Alexander_Kabui Date: Wed, 8 Mar 2023 06:00:41 +0300 Subject: integrate to global search --- .../static/new/javascript/search_autocomplete.js | 2 +- wqflask/wqflask/templates/index_page.html | 56 ++++++++++++++++++++-- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/wqflask/wqflask/static/new/javascript/search_autocomplete.js b/wqflask/wqflask/static/new/javascript/search_autocomplete.js index a68dc655..04634f9b 100644 --- a/wqflask/wqflask/static/new/javascript/search_autocomplete.js +++ b/wqflask/wqflask/static/new/javascript/search_autocomplete.js @@ -149,6 +149,6 @@ let search = retrieveSearchHistory() search.unshift(new_search) - localStorage.setItem("gn_search_history", JSON.stringify([...new Set(search)])) + localStorage.setItem("gn_search_history", JSON.stringify([...new Set(search)].splice(0,8))) } \ No newline at end of file diff --git a/wqflask/wqflask/templates/index_page.html b/wqflask/wqflask/templates/index_page.html index 09f24d5a..0e120d69 100755 --- a/wqflask/wqflask/templates/index_page.html +++ b/wqflask/wqflask/templates/index_page.html @@ -4,6 +4,7 @@ + @@ -62,7 +63,7 @@

Select and Search

-
@@ -115,8 +116,8 @@
-
- +
+
@@ -291,8 +292,30 @@ {%endblock%} {% block js %} + + + + + + @@ -323,5 +372,4 @@ twitterFetcher.fetch(configProfile); - {% endblock %} -- cgit v1.2.3