SeeMore: BeastMaster

.gitignore

@@ -19,3 +19,4 @@
 coverage/
 .env
 .DS_Store
+vcr_cassettes/

Gemfile

@@ -6,11 +6,7 @@ gem 'dotenv-rails', groups: [:development, :test]
 gem 'twitter'
 
 gem 'omniauth'
-gem 'omniauth-github'
 gem 'omniauth-instagram'
-gem 'omniauth-twitter'
-
-gem 'instagram'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.2.3'

Gemfile.lock

@@ -82,8 +82,6 @@ GEM
       railties (>= 3.0.0)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.2)
-      faraday (>= 0.7.4, < 0.10)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
     hashie (3.4.2)
@@ -94,11 +92,6 @@ GEM
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
-    instagram (1.1.5)
-      faraday (>= 0.7, < 0.10)
-      faraday_middleware (>= 0.8, < 0.10)
-      hashie (>= 0.4.0)
-      multi_json (~> 1.0, >= 1.0.3)
     jbuilder (2.3.1)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
@@ -124,7 +117,6 @@ GEM
     naught (1.0.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    oauth (0.4.7)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
@@ -134,21 +126,12 @@ GEM
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
       rack (~> 1.0)
-    omniauth-github (1.1.2)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.1)
     omniauth-instagram (1.0.1)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
-    omniauth-oauth (1.1.0)
-      oauth
-      omniauth (~> 1.0)
     omniauth-oauth2 (1.3.1)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    omniauth-twitter (1.2.1)
-      json (~> 1.3)
-      omniauth-oauth (~> 1.1)
     pg (0.18.2)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -271,13 +254,10 @@ DEPENDENCIES
   dotenv-rails
   factory_girl_rails (~> 4.0)
   httparty
-  instagram
   jbuilder (~> 2.0)
   jquery-rails
   omniauth
-  omniauth-github
   omniauth-instagram
-  omniauth-twitter
   pg
   pry-rails
   rails (= 4.2.3)

app/assets/javascripts/posts.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/stylesheets/application.scss

@@ -17,13 +17,36 @@ body {
   // Exactly 50px because first (top) navbar is exactly 50px according to Bootstrap.
   // Any more than 50px and there will be white space between the first and second navbars.
   padding-top: 50px;
-  background-color: #FFFFCC;
+  background-color: #4FD5D6;
+}
+
+.container-fluid {
+  width: 70%;
+  background-color:  #CDFFFF;
+  margin-top: -20px;
+  background-position: fixed no-repeat;
+}
+
+header {
+  background-color: #FF0000;
+}
+
+.header1 {
+  float: left;
+  width: 20%;
+  margin: 5px;
+  box-sizing: border-box;
+}
+
+.header1:hover {
+  content: image-url("tongue-out.png");
 }
 
 .jumbotron {
   text-align: center;
   background-color: #FF0000;
   color: #FFFFCC;
+  margin-top: 20px;
 }
 
 .beast-mode {
@@ -32,6 +55,7 @@ body {
 
 // Style of the navbar(s).
 .navbar {
+  padding-left: 0;
   background-color: #FF0000;
   border: none;
   // Default is rounded borders, which looks weird with two navbars.
@@ -40,15 +64,15 @@ body {
 
 .navbar-default .navbar-brand {
   font-family: 'Rock Salt', cursive;
-  color: #FFFFCC;
+  color: #CDFFFF;
 }
 
 .navbar-default .navbar-brand:hover {
   color: #990000;
 }
 
 .navbar-default .navbar-text {
-  color: #FFFFCC;
+  color: #CDFFFF;
 }
 
 .navbar-brand {
@@ -57,7 +81,12 @@ body {
 
 // To adjust the height of the second navbar, so it's not MASSIVE.
 .navbar.navbar-static-top {
-  min-height: 30px;
+  margin-top: 5px;
+  min-height: 35px;
+}
+
+.navbar.navbar-static-top p {
+  margin-top: 20px;
 }
 
 //Style for the webpage subtitle.
@@ -81,8 +110,56 @@ p.navbar-text {
   border: none;
 }
 
-// Form gains a margin when shrinking window.
-// .navbar-form {
-//   margin-top: 1px;
-//   margin-bottom: 1px;
-// }
+.fa-refresh {
+  margin-right: 5px;
+}
+
+// Stuff for the feed!!!!!!!!!!!!!
+
+.thumbnail {
+  margin-top: 3rem;
+  width: 100%;
+}
+
+.user{
+  // padding-left: 20px;
+  margin-bottom: 10px;
+  border-bottom: solid 1px #CABCBC;
+}
+
+.prof-pic {
+  width: 50px;
+  margin: 5px;
+}
+
+.posted-at {
+  float: right;
+  margin-right: 10px;
+  margin-top: 20px;
+  color: #616161;
+}
+
+.fix-width {
+  width: 350px;
+}
+
+.caption {
+  margin: 0 60px 20px 60px;
+  text-align: center;
+  font-weight: 500;
+}
+
+.img2 {
+  width: 50px;
+}
+
+
+footer {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+}
+
+footer a{
+  float: right;
+}

app/assets/stylesheets/home.scss

@@ -1,3 +1,4 @@
 // Place all the styles related to the home controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+

app/assets/stylesheets/posts.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the posts controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/application_controller.rb

@@ -13,18 +13,10 @@ def assign_user
       end
     end
 
-    def twitter_api_object
-      Twitter::REST::Client.new do |config|
-        config.consumer_key        = ENV["TWITTER_CLIENT_ID"]
-        config.consumer_secret     = ENV["TWITTER_CLIENT_SECRET"]
-        config.access_token        = ENV["TWITTER_ACCESS_TOKEN"]
-        config.access_token_secret = ENV["TWITTER_ACCESS_SECRET"]
-      end
-    end
-
     def redirect_if_not_allowed
       unless logged_in?
         flash[:error] = "You must be logged in to see that."
+
         redirect_to root_path
       end
     end

app/controllers/home_controller.rb

@@ -1,34 +1,48 @@
 class HomeController < ApplicationController
 
-  # def index
-  #   if logged_in?
-  #     client = twitter_api_object
-  #     twitter_ids = @user.subscriptions.pluck(:twitter_id)
+  def index
+    if logged_in?
+      @posts = @user.posts.sorted_order
+    end
+  end
 
-  #     @sub_array_tweets = []
+  def search
+    if params[:search].nil? || params[:search].empty?
+      flash[:error] = "Please enter text into the search box."
+      redirect_to root_path
+    elsif params[:website] == "twitter"
+      redirect_to twi_subscriptions_path(params: {twitter_search: params[:search]})
+    else
+      # when the website is instagram
+      redirect_to ig_subscriptions_path(params: {instagram_search: params[:search]})
+    end
+  end
 
-  #     twitter_ids.each do |twitter_id|
-  #       client.user_timeline(twitter_id.to_i).each do |tweet|
-  #         @sub_array_tweets << tweet
-  #       end
-  #     end
+  # list of a user's subcriptions
+  def subscriptions
+    posts = @user.posts
 
-  #     @sub_array_tweets.sort! { |a,b| b.as_json["created_at"].to_time <=> a.as_json["created_at"].to_time }
+    sub_array = []
 
-      # could transform tweets into our own "post" object...
-      # need to combine
-  #   end
-  # end
+    posts.each do |post|
+      sub_array << [post.subscription_id, post.username]
+    end
 
-  def search
-    if params[:website] == "twitter"
-      redirect_to twi_subscriptions_path(params: {twitter_search: params[:search]})
-    elsif params[:website] == "instagram"
-      redirect_to ig_subscriptions_path(params: {instagram_search: params[:search]})
-    else
-      flash[:error] = "Please search via the search box."
-      redirect_to root_path
+    @sub_array = sub_array.uniq
+
+    @sub_array.each do |post|
+      id = post[0]
+      subscription = Subscription.find(id)
+      pic = subscription.profile_pic
+      post << pic
     end
   end
 
+  def unfollow
+    subscription = Subscription.find(params[:subscription_id])
+
+    @user.dissociate_subscription(subscription)
+
+    redirect_to subscriptions_path
+  end
 end