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

Jump to bottom

Apiresult #103

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

Apiresult #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
653fcea
fetch data from stackoverflow
Shweta4321 Mar 16, 2018
7416400
api result
Shweta4321 Mar 17, 2018
690af05
change
Shweta4321 Mar 17, 2018
52ce18d
changes
Shweta4321 Mar 17, 2018
d1a606f
changes
Shweta4321 Mar 17, 2018
e520415
changes
Shweta4321 Mar 17, 2018
ad3652a
changes
Shweta4321 Mar 17, 2018
fe37e1d
Merge branch 'apiresult' of https://github.com/Shweta4321/cosmos-sear…
Shweta4321 Mar 29, 2018
b261203
no change
Shweta4321 Apr 1, 2018
c6ec94e
change
Shweta4321 Apr 2, 2018
821fa93
all result
Shweta4321 Apr 4, 2018
fafb8e6
Merge branch 'master' into apiresult
Shweta4321 Apr 4, 2018
ea31339
falke8
Shweta4321 Apr 4, 2018
bd2775a
Update views.py
Shweta4321 Apr 4, 2018
3d8f549
Update views.py
Shweta4321 Apr 4, 2018
5d18111
add tutorialpoint
Shweta4321 Apr 12, 2018
8735673
add feat: tutorialpoint link
Shweta4321 Apr 12, 2018
88e9b75
Merge branch 'master' into apiresult
Shweta4321 Apr 12, 2018
0b9ca47
resolve conflicts
Shweta4321 Apr 14, 2018
4ef47ae
modified UI
Shweta4321 Apr 15, 2018
2d5268e
Reslove Conflict
Shweta4321 Apr 15, 2018
a468e8c
remove api
Shweta4321 May 8, 2018
11073e0
Merge branch 'master' into apiresult
Shweta4321 May 8, 2018
35654d7
conflict reslove
Shweta4321 May 8, 2018
64ae524
merge conflict
Shweta4321 May 8, 2018
eef4a41
Update views.py
Shweta4321 May 8, 2018
1209bac
merge conflict
Shweta4321 May 9, 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
3 changes: 2 additions & 1 deletion cosmos_search/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
SECRET_KEY = config('SECRET_KEY')

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = config('DEBUG', cast=bool)
# DEBUG = config('DEBUG', cast=bool)
DEBUG = True

ALLOWED_HOSTS = config('ALLOWED_HOSTS', cast=Csv())

Expand Down
3 changes: 3 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ smmap2==2.0.3
urllib3==1.22
pep8==1.7.1
python-decouple==3.1
wikiapi
google-api-python-client
beautifulsoup4

35 changes: 33 additions & 2 deletions search/templates/cosmos/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html>
<!doctype html>
{% load static %}
<html lang="en">

Expand Down Expand Up @@ -52,7 +52,26 @@
line-height: 1.2 !important;
}

.stylish-input-group .input-group-addon {

#myDIV {
width: 100%;
padding: 50px 0;
text-align: center;
background-color: floralwhite;
margin-top: 20px;
display: none !important;
}
.ff {
display: block !important;
}
.hd{
display: none !important;
}

.stylish-input-group .input-group-addon{



background: white !important;
}

Expand All @@ -72,7 +91,19 @@
border-width: 2px;
border-color: grey;
}

.bootstrap-iso .form-control{border-width: 2px; border-color: grey;}


</style>
<script>
jQuery(function(){
jQuery('class of view button').click(function(){
jQuery('#myDIV').removeClass(' hd ');
jQuery('#myDIV').addClass(' ff ');

})
</script>
{% block style %}
{% endblock %}

Expand Down
Loading