Merge pull request #9 from ISAAKiel/resurrection

Resurrection

R/github_api_conv.R

@@ -8,11 +8,10 @@ api_call <- function(url, col, oauth = NA){
   if(is.na(oauth)){
     api_ret <- content(GET(url))
   } else {
-    api_ret <- content(GET(paste(
+    api_ret <- content(GET(
       url, 
-      "?access_token=", oauth, 
-      sep = ""
-    )))
+      add_headers(Authorization = paste("token", oauth))
+    ))
   }
 
   # call function to transform the result of the api call to a clean data.frame
@@ -42,4 +41,4 @@ api_trans <- function(api_ret, col){
 
   # return clean data.frame
   return(api_ret_s3)
-}
+}

_site.yml

@@ -12,9 +12,9 @@ navbar:
     - text: "Events"
       icon: fa-calendar
       href: events.html
-    - text: "Screencasts"
-      icon: fa-film
-      href: screencasts.html
+    # - text: "Screencasts"
+    #   icon: fa-film
+    #   href: screencasts.html
   right:
     - icon: fa-facebook-square
       href: https://www.facebook.com/ISAAKiel-1998036960414490

elements/members.Rmd

@@ -17,10 +17,9 @@ user_info <- list()
 for (i in 1:nrow(members_info)){
   #user_res <- content(GET(paste("https://api.github.com/users/", members_info$login[i], sep = "")))
   user_res <- content(GET(paste(
-    "https://api.github.com/users/", members_info$login[i], 
-    "?access_token=", oauth, 
+    "https://api.github.com/users/", members_info$login[i],
     sep = ""
-  )))
+  ), add_headers(Authorization = paste("token", oauth))))
   user_info[[i]] <- user_res
 }
 

frontpage_styles.css

@@ -142,16 +142,3 @@ body > div.container-fluid.main-container .well a {
   -webkit-filter: grayscale(0);
   filter: none;
 }
-
-/* what we do section */
-.whatwedo_left {
-  height: 500px;
-  width: 500px;
-  float:left;
-  margin-right: 40px;
-}
-
-.whatwedo_right {
-  float:left;
-  height: 500px;
-}

index.Rmd

@@ -59,14 +59,6 @@ silent_bob <- file.remove("members.Rmd")
 
 <div>
 
-<div class="whatwedo_left">
-
-<iframe class="iframe" sandbox="allow-forms allow-scripts" width="490px" height="490px" frameborder="0" scrolling="yes" allowtransparency="true" seamless="seamless" src="https://cdoyle.me/gh-activity/gh-activity.html?user=ISAAKiel&type=user"></iframe>
-
-</div>
-
-<div class="whatwedo_rigth">
-
 ## What we do and offer:
 
 We offer programs, scripts and functions for data management and interoperability, develop R-packages for different tasks and present tutorials for programs and archaeological tasks. Everything in constant development and freely accessible in our github repository.
@@ -84,8 +76,6 @@ To see our current portfolio, visit the [projects](projects.html) page.
 
 </div>
 
-</div>
-
 </div>
 </div>
 <div class="row row-striped">