From a3cd98749d346dc7182cb4c9b4accb5c539d216d Mon Sep 17 00:00:00 2001
From: Richard Dizon <rcd6ab@virginia.edu>
Date: Wed, 19 Jul 2017 23:20:46 -0700
Subject: [PATCH 1/4] Initial Cavalier Daily commit. Added support for Facebook
 and Google+ APIs

---
 .../hackathon/templates/hackathon/login.html  | 28 -------------------
 .../hackathon_starter/settings.py             |  8 +++---
 2 files changed, 4 insertions(+), 32 deletions(-)
 mode change 100644 => 100755 hackathon_starter/hackathon/templates/hackathon/login.html
 mode change 100644 => 100755 hackathon_starter/hackathon_starter/settings.py

diff --git a/hackathon_starter/hackathon/templates/hackathon/login.html b/hackathon_starter/hackathon/templates/hackathon/login.html
old mode 100644
new mode 100755
index 12d63e9..d7b25f8
--- a/hackathon_starter/hackathon/templates/hackathon/login.html
+++ b/hackathon_starter/hackathon/templates/hackathon/login.html
@@ -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
@@ -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>
diff --git a/hackathon_starter/hackathon_starter/settings.py b/hackathon_starter/hackathon_starter/settings.py
old mode 100644
new mode 100755
index 7c081b5..4b75873
--- a/hackathon_starter/hackathon_starter/settings.py
+++ b/hackathon_starter/hackathon_starter/settings.py
@@ -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 = ''

From e7e5627c1d48d2718b0ab7005ef308d1266b8827 Mon Sep 17 00:00:00 2001
From: Lavanya Kannan <lavkannan@gmail.com>
Date: Fri, 28 Jul 2017 18:59:05 -0700
Subject: [PATCH 2/4] added hi

---
 hi.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 hi.txt

diff --git a/hi.txt b/hi.txt
new file mode 100644
index 0000000..45b983b
--- /dev/null
+++ b/hi.txt
@@ -0,0 +1 @@
+hi

From 441a0c85710b4858dd60f2351629055e0f2c902e Mon Sep 17 00:00:00 2001
From: Lavanya Kannan <lavkannan@gmail.com>
Date: Fri, 28 Jul 2017 19:05:34 -0700
Subject: [PATCH 3/4] added sup

---
 hi.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hi.txt b/hi.txt
index 45b983b..06e3888 100644
--- a/hi.txt
+++ b/hi.txt
@@ -1 +1,2 @@
 hi
+sup

From ff2887e24f6b674381b753b1236b04595ac896ea Mon Sep 17 00:00:00 2001
From: Lavanya Kannan <lavkannan@gmail.com>
Date: Fri, 28 Jul 2017 19:08:59 -0700
Subject: [PATCH 4/4] hi

---
 hi.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hi.txt b/hi.txt
index 06e3888..7452ee8 100644
--- a/hi.txt
+++ b/hi.txt
@@ -1,2 +1,2 @@
 hi
-sup
+hi