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

Topics Tags on Main Page #74

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Topics Tags on Main Page #74

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2db9f3f
Update searchresults.html
sarthikadhawan Feb 27, 2018
e6a4c76
Update searchresults.html
sarthikadhawan Feb 27, 2018
e9536c5
Update views.py
sarthikadhawan Feb 27, 2018
29bf67d
Update views.py
sarthikadhawan Feb 27, 2018
df5a4e4
Update views.py
sarthikadhawan Feb 27, 2018
dadabd5
Update views.py
sarthikadhawan Feb 28, 2018
ca07ee4
Update views.py
sarthikadhawan Feb 28, 2018
ebb3da2
Update header.html
sarthikadhawan Feb 28, 2018
38c6df1
Update index.html
sarthikadhawan Feb 28, 2018
9d73b56
Update views.py
sarthikadhawan Feb 28, 2018
6b2c232
Update header.html
sarthikadhawan Feb 28, 2018
54ae8e0
Update index.html
sarthikadhawan Feb 28, 2018
903e25f
Update index.html
sarthikadhawan Mar 11, 2018
bfd525e
Update views.py
sarthikadhawan Mar 11, 2018
90712e2
Update views.py
sarthikadhawan Mar 11, 2018
d4465b3
Update header.html
sarthikadhawan Mar 11, 2018
06167a1
Update searchresults.html
sarthikadhawan Mar 11, 2018
452d452
Update index.html
sarthikadhawan Mar 31, 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
12 changes: 11 additions & 1 deletion search/templates/cosmos/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,15 @@
line-height: 60px;
background-color: #f5f5f5;
}
#container{
width:100%;
height:auto;
margin:0;
padding:0;
}
</style>


</head>

<body>
Expand All @@ -58,7 +66,9 @@
<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>
</div>
</div><br>

</div>
<br>
{% block body %} {% endblock %}
</div>
<footer class="footer">
Expand Down
111 changes: 111 additions & 0 deletions search/templates/cosmos/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,118 @@
{% block body %}
{% load random_numbers %}



<head>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are including the header {% extends 'cosmos/header.html' %}, so, you do not need this.


<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/css/bootstrap.min.css" integrity="sha384-PsH8R72JQ3SOdhVi3uxftmaW6Vc51MKb0q5P2rRUpPvrszuE4W1povHYgTpBfshb" crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Roboto+Mono" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<style>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You must move the css code to its own file and link it here. 👍

html {
position: relative;
min-height: 100%;
}

body {
font-family: 'Roboto Mono', monospace;
margin-bottom: 60px;
}

article {
display: block;
text-align: left;
width: 80%;
padding-top: 15%;
padding-bottom: 15%;
margin: 0 auto;
}

.footer {
position: absolute;
bottom: 0;
width: 100%;
height: 60px;
line-height: 60px;
background-color: #f5f5f5;
}
#container{
width:100%;
height:auto;
margin:0;
padding:0;
}
</style>

<style>


/* The container <div> - needed to position the dropdown content */
.dropdown {
position: relative;
display: inline-block;
}

/* Dropdown Content (Hidden by Default) */
.dropdown-content {
display: none;
position: absolute;
background-color: #f9f9f9;
min-width: 160px;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
z-index: 1;
}

/* Links inside the dropdown */
.dropdown-content a {
color: black;
padding: 12px 16px;
text-decoration: none;
display: block;
}

/* Change color of dropdown links on hover */
.dropdown-content a:hover {background-color: #f1f1f1}

/* Show the dropdown menu on hover */
.dropdown:hover .dropdown-content {
display: block;
}

/* Change the background color of the dropdown button when the dropdown content is shown */
.dropdown:hover .dropbtn {
background-color: #3e8e41;
}
#container{
width:100%;
height:auto;
margin:0;
padding:0;
}
</style>

</head>
<article>
<body>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is, in fact, inside of body tags: {% block body %}. You need to fix this code.

<div class="row" id="container">
{% for ta in tabbed_algos_shortlist %}
<a class="btn float-right" href="/query/?q={{ta}}" style="font-size: 17px;">{{ta}}</a>
{% endfor %}

<div class="dropdown">
<a class="btn float-right" href="#" style="font-size: 17px;" >More</a>
<div class="dropdown-content">
{% for ta in tabbed_algos%}
<a href="/query/?q={{ta}}">{{ta}}</a>
{% endfor %}


</div>
</div>
</div>
</body>
<h1>Welcome to <em>cosmos-search</em></h1>
<hr>

Expand Down
13 changes: 12 additions & 1 deletion search/templates/cosmos/searchresults.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,18 @@
<title>"{{ query }}" | cosmos-search</title>
{% endblock %}
{% block body %}
<h6>Showing <span style="color: #5D337F;">{{ amount }}</span> results for: <span style="color: #5D337F;">{{ query }}</span>



{% if amount|add:"0" == 1%}
<h6>Showing <span style="color: #5D337F;">{{ amount }}</span> result for: <span style="color: #5D337F;">{{ query }}</span>
{%else%}
<h6>Showing <span style="color: #5D337F;">{{ amount }}</span> results for: <span style="color: #5D337F;">{{ query }}</span>
{% endif %}




<span>
<a href="#" style="color: #1b1e21"><div data-network="twitter" class="st-custom-button fa fa-twitter-square"></div></a>
<a href="#" style="color: #1b1e21"><div data-network="facebook" class="st-custom-button fa fa-facebook-square"></div></a>
Expand Down
92 changes: 72 additions & 20 deletions search/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import json
import random
from random import shuffle

import math
# Create your views here

# To prefill the searchbar
Expand All @@ -13,12 +13,27 @@ def searchbar():
algo_list = data['tags']
r_no = random.randint(0,len(algo_list))
algo_tag = algo_list[r_no]
return algo_tag

tabbed_algos=set()

data = json.loads(open(settings.METADATA_JSON, 'r').readline())
for k,v in data.items():
if k!="updated_at":
ans=k.split("/")[0].title().split("_")
ans2=' '.join(ans)
tabbed_algos.add(ans2)

tabbed_algos_list=list(tabbed_algos)
tabbed_algos_list.sort()
return algo_tag,list(tabbed_algos_list)


def index(request):
algo_tag = searchbar()
return render(request,'cosmos/index.html',{'algo_name':algo_tag})
algo_tag,tabbed_algos = searchbar()
return render(request,'cosmos/index.html',{'algo_name':algo_tag,'tabbed_algos':tabbed_algos[4:],'tabbed_algos_shortlist':tabbed_algos[:4]})





# Handlers for error pages
Expand All @@ -37,14 +52,48 @@ def error404(request):
def error500(request):
return render(request, 'cosmos/error/HTTP500.html')

# Generate all combinations of a search literal
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pull request brings in the changes from your previous pull request. You might want to separate it for independent review.

def generate_perm(query):

# Use bitmasking to generate all cases where the first letter of a word in the query is capitalized.
binary = []
final = []

n = len(query.split('_'))
for i in range(pow(2,n)):
b = bin(i)[2:].zfill(n)
binary.append(b)


# Create a query for the bitmask.

for b in binary:
perms = []
count = 0
for word in query.split('_'):
if b[count] == '0':
perms.append(word[0].lower() + word[1:])
else:
perms.append(word[0].upper() + word[1:] )
count = count+1
p='_'.join(perms)
final.append(p)

# Return the final list of queries to be passed to the query view.
return final


# Search query
def query(request):
query = request.GET['q']
q = query.replace(' ', '_')

combs=generate_perm(q)

data = json.loads(open(settings.METADATA_JSON, 'r').readline())
ans = []
rec = []

for k, v in data.items():
filtered_v = []
try:
Expand All @@ -53,22 +102,25 @@ def query(request):
filtered_v.append(f)
except TypeError:
print('TypeError')
if q in k:
if filtered_v:
path = k
k = k.split('/')
ans.append({'path': path, 'dirs': k, 'files': filtered_v})
if len(k) == 2:
d = k[len(k)-2] + '/'
else:
d = k[len(k)-3] + '/'
for i, j in data.items():
if d in i:
if not q in i:
p = i
p = p.split('/')
l = p[len(p)-1]
rec.append({'recpath': i, 'recdirs':p, 'last': l})

for q in combs:
# We do not want /test/ in the results if the user types in "test" in the searchbox
if q in k:
if filtered_v:
path = k
k = k.split('/')
ans.append({'path': path, 'dirs': k, 'files': filtered_v})
if len(k) == 2:
d = k[len(k)-2] + '/'
else:
d = k[len(k)-3] + '/'
for i, j in data.items():
if d in i:
if not q in i:
p = i
p = p.split('/')
l = p[len(p)-1]
rec.append({'recpath': i, 'recdirs':p, 'last': l})
if not ans:
return render(request, 'cosmos/notfound.html', {'query': query})
shuffle(rec)
Expand Down