Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tags Feature #135

Merged
merged 9 commits into from
Jun 11, 2018
Merged

Tags Feature #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8cfa10c
Added Tags url
itsron143 Jun 11, 2018
0ed2421
Added Tags VIew
itsron143 Jun 11, 2018
dc72e60
Create tags.html
itsron143 Jun 11, 2018
c82b0d3
Added Tags button to Homepage
itsron143 Jun 11, 2018
abff115
Added Tags
itsron143 Jun 11, 2018
6d30a12
Added Tags
itsron143 Jun 11, 2018
19b27e0
Update views.py
itsron143 Jun 11, 2018
44867fe
Update views.py
itsron143 Jun 11, 2018
c3c4483
Update views.py
itsron143 Jun 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions search/templates/cosmos/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
<a class="btn float-right" href="https://github.com/OpenGenus/cosmos-search">GitHub</a>
<a class="btn float-right" href="https://github.com/OpenGenus/cosmos">cosmos</a>
<a class="btn float-right" href="{% url 'query' %}?q=calculator">calculator</a>
<a class="btn float-right" href="{% url 'tags' %}">tags</a>
</div>
</div>
</br>
Expand Down
14 changes: 13 additions & 1 deletion search/templates/cosmos/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
{% extends 'cosmos/header.html' %}
{% block body %}
{% load random_numbers %}

<!-- Style for Tags-->
<style>
ul#menu li {
display:inline-grid;
}
</style>
<!-- Styling Ends-->
<article>
<ul id="menu">
{% for tag in random %}
<li><a href="{% url 'query' %}?q={{tag}}">{{tag}}, </a></li>
{% endfor %}
<li><a href="{% url 'tags' %}">More...</a></li>
</ul>
<h1 style="text-align: center">Welcome to <em>cosmos-search</em></h1>
<hr>

Expand Down
41 changes: 41 additions & 0 deletions search/templates/cosmos/tags.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!DOCTYPE html>
<html>
{% extends 'cosmos/header.html' %}
{% block body %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<!--Code for the Search Filter-->
<script>
$(document).ready(function(){
$("#myInput").on("keyup", function() {
var value = $(this).val().toLowerCase();
$("#myList li").filter(function() {
$(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
});
});
});
</script>
<!--Code Ends-->
<!--Creating Columns for HTML List-->
<style>
ul {
columns: 3;
-webkit-columns: 3;
-moz-columns: 3;
}
</style>
<!--Styling Ends-->
<h1>Tags</h1>
<hr>
<h7>
A tag is a keyword or label that categorizes your search query with other, similar queries. Users can use these tags in exploring new topics and continue browsing without prior knowledge.
</h7>
<br><br>
<input id="myInput" type="text" placeholder="Search...">
<p><br></p>
<ul id="myList">
{% for tag in tags %}
<li class="list-group-item"><a href="{% url 'query' %}?q={{tag}}"/>{{ tag }}</li>
{% endfor %}
</ul>
{% endblock %}
</html>
1 change: 1 addition & 0 deletions search/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

urlpatterns = [
url(r'^$', views.index, name='index'),
url(r'^tags/', views.tags, name='tags'),
url(r'^query/', views.query, name='query'),
url(r'^display', views.display, name='display'),
url(r'^calculator/', views.calculator, name='calculator'),
Expand Down
42 changes: 27 additions & 15 deletions search/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,16 @@
# Create your views here


# Tags page for users
def tags(request):
f = open(settings.TAGS_JSON, 'r')
jsonL = sorted(list(json.load(f)))
args = {"tags": jsonL}
return render(request, 'cosmos/tags.html', args)

# To prefill the searchbar


def get_random_tag():
jsonFile = open(settings.TAGS_JSON, 'r')
algo_list = json.load(jsonFile)
Expand Down Expand Up @@ -50,12 +59,15 @@ def searchSuggestion(request):


def index(request):
randomTags = []
for i in range(4):
randomTags.append(get_random_tag())
query = get_random_tag()
algo = searchSuggestion(request)
if request.is_ajax():
mimetype = 'application/json'
return HttpResponse(algo, mimetype)
return render(request, 'cosmos/index.html', {'query': query})
return render(request, 'cosmos/index.html', {'query': query, 'random': randomTags})


# Handlers for error pages
Expand Down Expand Up @@ -158,20 +170,20 @@ def code_search(request, query):
else:
d = folder_list[-3] + '/'
for i, j in data.items():
if d in i:
if query not in i:
only_contents_md = True
for f in j:
if not is_file_extension_ignored(f):
only_contents_md = False
break
if only_contents_md:
continue
p = i
p = p.split('/')
l = p[len(p) - 1]
codes['recommendations'].append(
{'recpath': i, 'recdirs': p, 'last': l})
if d in i:
if query not in i:
only_contents_md = True
for f in j:
if not is_file_extension_ignored(f):
only_contents_md = False
break
if only_contents_md:
continue
p = i
p = p.split('/')
l = p[len(p) - 1]
codes['recommendations'].append(
{'recpath': i, 'recdirs': p, 'last': l})
shuffle(codes['recommendations'])
codes['recommendations'] = codes['recommendations'][:5]

Expand Down