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

Hi branch #42

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

Hi branch #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3cd987
Initial Cavalier Daily commit. Added support for Facebook and Google+…
rcdizon Jul 20, 2017
e7e5627
added hi
lavkannan Jul 29, 2017
441a0c8
added sup
lavkannan Jul 29, 2017
ff2887e
hi
lavkannan Jul 29, 2017
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
28 changes: 0 additions & 28 deletions hackathon_starter/hackathon/templates/hackathon/login.html
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,6 @@ <h2 class="form-signin-heading">Login</h2>
</div>

<div class="form-signin">
<a class="btn btn-block btn-social btn-twitter" href="http://127.0.0.1:8000/hackathon/twitter_login/">
<i class="fa fa-twitter"></i>
Sign in with Twitter
</a>
<a class="btn btn-block btn-social btn-instagram" href="http://localhost:8000/hackathon/instagram_login/">
<i class="fa fa-instagram"></i>
Sign in with Instagram
</a>
<a class="btn btn-block btn-social btn-tumblr" href="http://localhost:8000/hackathon/tumblr_login/">
<i class="fa fa-tumblr"></i>
Sign in with Tumblr
</a>
<a class="btn btn-block btn-social btn-github" href="http://localhost:8000/hackathon/github_login/">
<i class="fa fa-github"></i>
Sign in with Github
</a>
<a class="btn btn-block btn-social btn-linkedin" href="http://localhost:8000/hackathon/linkedin_login/">
<i class="fa fa-linkedin"></i>
Sign in with LinkedIn
</a>
<a class="btn btn-block btn-social btn-facebook" href="http://localhost:8000/hackathon/facebook_login/">
<i class="fa fa-facebook"></i>
Sign in with Facebook
Expand All @@ -54,14 +34,6 @@ <h2 class="form-signin-heading">Login</h2>
<i class="fa fa-google"></i>
Sign in with Google+
</a>
<a class="btn btn-block btn-social btn-dropbox" href="http://localhost:8000/hackathon/dropbox_login/">
<i class="fa fa-dropbox"></i>
Sign in with Dropbox
</a>
<a class="btn btn-block btn-social btn-foursquare" href="http://localhost:8000/hackathon/foursquare_login/">
<i class="fa fa-foursquare"></i>
Sign in with Foursquare
</a>
</div>
</body>
</html>
8 changes: 4 additions & 4 deletions hackathon_starter/hackathon_starter/settings.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@

QUANDLAPIKEY = ''

FACEBOOK_APP_ID = ''
FACEBOOK_APP_SECRET = ''
FACEBOOK_APP_ID = '135096223749093'
FACEBOOK_APP_SECRET = 'c49859d6040baee88b578a8d1a5333fe'

GOOGLE_PLUS_APP_ID = ''
GOOGLE_PLUS_APP_SECRET = ''
GOOGLE_PLUS_APP_ID = '855088085720-3odqeigkm52orpsblhtfmc6lpean1lai.apps.googleusercontent.com'
GOOGLE_PLUS_APP_SECRET = 'wApSt2VOuZBq01czUcOVVpa1'

DROPBOX_APP_ID = ''
DROPBOX_APP_SECRET = ''
Expand Down
2 changes: 2 additions & 0 deletions hi.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
hi
hi