forked from AdaGold/seemore
-
Notifications
You must be signed in to change notification settings - Fork 5
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.
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
Rest/master #16
Open
TammyHer
wants to merge
319
commits into
Ada-C4:rest/master
Choose a base branch
from
TammyHer:rest/master
base: rest/master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Rest/master #16
Changes from all commits
Commits
Show all changes
319 commits
Select commit
Hold shift + click to select a range
7980992
added favicon! wahoo
rileslovesyall e2e1ab3
auth portal working, user not yet being created
rileslovesyall 9c78c93
tests working for search controller
emgord d9d35ee
Merge pull request #9 from TamarHershi/search
emgord 039a4ea
thank god it's finally working-- dev portal login
rileslovesyall 139a784
merge issues in coverage report-- need to just get rid of these?
rileslovesyall c8b711b
Merge pull request #10 from TamarHershi/devportal
rileslovesyall 71fbd07
added feed_path
rileslovesyall 353f38e
Merge branch 'rest/master' of github.com:TamarHershi/seemore into res…
rileslovesyall 469d95d
direct to feed path on login
rileslovesyall 69a2dd5
deleted coverage reports
rileslovesyall f597f9d
coverage
emgord c80cc7d
getting rid of coverage
emgord 5bd1cd9
added a follow button for twittwe that hold params info
TammyHer 9ec4610
now only the user sees the search bar'
rileslovesyall dbff33c
stubbed out this page, but can't be tested quite yet..
rileslovesyall c0d17ab
added missing end
rileslovesyall 7a709ad
fontawesome icons on front page as login links
rileslovesyall 4975c1d
pics on and proper size, btu not spacing right
rileslovesyall 444d01d
font awesome images look... okay
rileslovesyall 336c14f
Non-working method for searching users on Twitter
trowbrsa 7150aac
Merge pull request #11 from TamarHershi/login-page
rileslovesyall 8c15735
we can create new creators and display their info
TammyHer c842d17
Merge pull request #12 from TamarHershi/user-only-search
rileslovesyall 612abef
Merge pull request #13 from TamarHershi/follow
TammyHer 6f424fd
Merge branch 'creators-index' into rest/master
rileslovesyall 820eb8b
merge great
rileslovesyall f51a2de
added vimeo to omniauth.rb
emgord 92a3ebd
Fixed merge conflict with nav bar file
trowbrsa 1bf3e42
Fixed merge conflict with searches controller - removed non-working T…
trowbrsa 7db6d0b
Added default profile image for Vimeo users
trowbrsa 0e50c30
made the twittter search working
TammyHer 24ac58d
changed the search view so it'll display for vimeo OR twitter
TammyHer 2297563
its working great. wohhoo now we can search vimeo and twitter
TammyHer 4e2f402
follow button stays on page
rileslovesyall 863a9bc
Creator profile picture link being saved properly
rileslovesyall 5262c1b
testing embedding in feed
rileslovesyall 889c8bd
flash notice added to follow, stubbing out video init
rileslovesyall 8622645
added uri to users, added cols to videos
rileslovesyall c8b054a
removed uri from users, added to creators
rileslovesyall eb368e8
removed extraneous link from page, fixed creators save w uri
rileslovesyall de841a4
has_many vids/tweets added, videos gotten from api, working to get th…
rileslovesyall c6cdcbd
removed extraneous col from videos
rileslovesyall cbbab95
videos now being stored and connected to Creator upon creation of Cre…
rileslovesyall dcf2166
videos are showing on the feed, but they need sizing and ordering
rileslovesyall 3e5df09
added vimeo_id back into video model
rileslovesyall b158dc5
videos are displayinggit add .! yayyyyy
rileslovesyall dfa42f3
Merge pull request #15 from TamarHershi/creatorvideos
rileslovesyall 91182f7
Fixing merge conflict in searches controller
trowbrsa cdf7043
Merge pull request #17 from TamarHershi/defaultpic/master
trowbrsa 803c845
merge issues
TammyHer bf73699
fixed merge issues
TammyHer 56ff2cb
Added radio button for search bar
trowbrsa 4451abf
won
rileslovesyall aeb3694
see if creator is made yet my uri
rileslovesyall c444643
Radio button appears to be working
trowbrsa ab0ea28
Merge pull request #20 from TamarHershi/oauthvimeo
emgord d490140
Merge pull request #21 from TamarHershi/radiobutton/master
trowbrsa f379107
removed extraneous stuff from file
rileslovesyall 68d3adf
fixed merge issues
TammyHer 0077b76
Merge branch 'rest/master' of github.com:TamarHershi/seemore into res…
TammyHer 07be20d
you can see the pics in twitter
TammyHer 699696b
still can't follow vimeo, but fuxed some bugs
TammyHer eeaa72b
twitter not default
rileslovesyall 3c48ee7
we can follow vimeo again and radio button working
TammyHer 01883bb
Merge branch 'rest/master' of github.com:TamarHershi/seemore into res…
TammyHer b40c04f
profile image saved as default if user doesn't have profile image
rileslovesyall 18bdc58
added background color to flash so it shows up better
rileslovesyall efd9897
Merge branch 'bugs4days' into rest/master
rileslovesyall a53eb79
made labels for search into icons
rileslovesyall 07b4b37
working on twiter follow function
emgord a35f10f
flash message shows if you don't select a provider to search
rileslovesyall 1ea26db
removed require pry line form search results page
rileslovesyall 81c4a04
Changed text of flash notice
rileslovesyall b48cb0a
changed add_videos so it should still work if the user doesn't have a…
rileslovesyall 1caf3ca
typo fixed, search flash fix actually working now
rileslovesyall 75451be
stopped pulling vimeo bio from search page, so URI won't get too big
rileslovesyall 475bdcd
made Creator creation and adding their videos into an atomic transact…
rileslovesyall a0a936e
bug fixed so you can't follow someone twice, and throws a different f…
rileslovesyall ebb4bee
can follow twitter creators
emgord d90b373
factory girl fun added and stubbed out
rileslovesyall 6d12ca3
Merge pull request #22 from TamarHershi/addfactorygirl
rileslovesyall c2a8fa2
twitter creators save to db
emgord 4e4e66b
stubbed out specs
rileslovesyall 99957a1
Fixing merge conflicts
trowbrsa 4da2d68
trying to fix the search twitter display
TammyHer 71e9ce0
Merge pull request #24 from TamarHershi/twittersave2
trowbrsa ffbebb9
merge issues
TammyHer bb4064e
megred
TammyHer cf26ac5
Created factories for our models
trowbrsa 73d8f2b
Merge pull request #25 from TamarHershi/Factorygirl
trowbrsa 7513a66
added provider for params to vimeo
emgord 5a092ad
updated auth hash mock for vimeo and twitter
emgord a298c3e
changed mock auth to match factories
emgord bef574c
added tests for oauth with vimeo to user_spec
emgord 7dc52bc
create method grabs avatar url for vimeo correctly
emgord 0c97d5c
fixed rspec to work with pictures
emgord fc8d2aa
sessions controller twitter tests all working
emgord ecfaac8
added tests for vimeo authentication for sessions_controller_spec
emgord 2825f08
test destroy for sessions controller
emgord b85f991
added tests for searching twitter
emgord 302800d
added test if no provider is specified
emgord a638e60
stubbed out tests for CreatorController
rileslovesyall 2e8fe66
more rspec stubbing
rileslovesyall 2047962
added gems bcr and typhoeus
rileslovesyall a44d413
created vcr setup file
rileslovesyall a4f83f2
vcr gem setup complete
rileslovesyall ed25aec
Merge branch 'rest/master' into rspec/riley
rileslovesyall 510ece5
Merge pull request #27 from TamarHershi/rspecemily
emgord d37b805
Removed /coverage files from Git tracking
trowbrsa cd97484
added validation for creator
TammyHer db26c9f
1 rspec test for 'get#index' method working
trowbrsa 13b436f
Merge pull request #28 from TamarHershi/creatorcontrollerspec
trowbrsa d7bf6f5
trying to troubleshoot simplecov
emgord 4ebdad2
Merge branch 'rest/master' of github.com:TamarHershi/seemore into res…
emgord 2b5cbc3
Fixed missing 'end' in creatorscontrollerspec
trowbrsa a712296
added extra 'end' to creator controller spec
trowbrsa 1bcd911
Merge pull request #30 from TamarHershi/creatorcontrollerspec
trowbrsa f60aacf
Merge branch 'rest/master' of github.com:TamarHershi/seemore into res…
emgord 409ffd0
working on testing index method for creators
emgord d143c47
fixed simplecov coverage
emgord 381d680
broke into small methods the creator model
TammyHer 83524a8
test working for creators_controller index, factory set up
emgord fa08324
drafted a 'get#create' rspec test in creators controller
trowbrsa bf9ec07
trying to merge
TammyHer dabbbe6
merging
TammyHer 77f9300
Merge branch 'new' into rest/master
TammyHer 631bb08
fixed merging issues
TammyHer 5ea90c0
Merge pull request #32 from TamarHershi/creatorcreate
emgord d9f2508
Merge branch 'rest/master' of github.com:TamarHershi/seemore into res…
emgord 27ba0aa
some RSpec DRYing
rileslovesyall 41b5f79
fixed merge conflicts
rileslovesyall ff541e1
RSpec will run without end issues
rileslovesyall 767a99c
updated specs and gitignore
rileslovesyall afc75e0
moved #create_videe_videos to Video model, updated methods in Creator…
rileslovesyall fdc4343
working on arranging vcr setup
rileslovesyall 43f712b
removed search_api_call from main search method
rileslovesyall 5680326
refactored search method
rileslovesyall 936ddfd
VCR recording did a thing! yayyyy
rileslovesyall 79833e4
all RSpec examples (that aren't commented out) passing, VCR working
rileslovesyall 2b26446
removed twitter api call from search method
rileslovesyall 37accfa
rearranging rspec tests
rileslovesyall ed10226
changed creator#create to include new arrangement of modle methods
rileslovesyall 7c0d09d
moved webmock into dev test
rileslovesyall 1dbf823
played around with restructiring creator method for creators
emgord 84ca445
deleted coverage files
rileslovesyall 459418b
Merge branch 'rest/master' of github.com:TamarHershi/seemore into sar…
trowbrsa 5b17ae1
small fixes to creator follow method
emgord 5aa10f3
Merge pull request #33 from TamarHershi/emilycreatorcreate
emgord 9cf51c9
Merge branch 'rest/master' of github.com:TamarHershi/seemore into res…
rileslovesyall daf9e3c
merge conflicts fixed
rileslovesyall f0eefd9
Fixing merge conflict in creators controller spec
trowbrsa 3b25cf2
added an end to spec
TammyHer fb0da81
Merge branch 'rest/master' of github.com:TamarHershi/seemore into sar…
trowbrsa 1f74863
vimeo vidoes are being saved
TammyHer 0908046
got the creator model Rspec design
TammyHer ddca306
experimenting with twitter gem to embed tweets
emgord 9cb5ff8
we got some test working in Creator moderl spec
TammyHer f024144
test that new creator is created if necessary is passing
rileslovesyall 21b1d7b
Created method to save Tweets to db
trowbrsa 2388d0a
test that videos are being saved works
rileslovesyall ac9e9d7
Tweeted .save method in transaction of save_tweets
trowbrsa 29a34ad
switching drivers
emgord 9e1d358
fixed merge conflict
emgord e6ee1d8
tweets are showing on the feed, still need to be organized and integr…
emgord 9380d85
testing for days, and added version for vcr gem
rileslovesyall 86a6289
adding logic for if vimeo doesn't recognize the creator as a user
rileslovesyall f0344c6
Merge pull request #34 from TamarHershi/embedtweet
emgord 6946aa0
not sure what changed..
rileslovesyall ddd0183
Merge branch 'spec/master' into rest/master
rileslovesyall 97596b0
most merge issues fixed, specs still an issue
rileslovesyall 12a0e08
rspec up to date, hooray
rileslovesyall b852d26
vcr version fixed, rspec and vcr working
rileslovesyall ddec0a9
webmock gem in right spot, wahoooooooooooo
rileslovesyall b5072e6
uncommented out follow method
emgord 930d6bf
created has many through relationship for users videos to replace def…
emgord 6616469
fixed the twitter display
TammyHer b9a9eb8
add validations
TammyHer 9db39a8
done for tonight
TammyHer 8f0b8bf
fixed merging
TammyHer b47b5d2
fixed the gemfile
TammyHer 3e1e106
.
TammyHer 6e2796d
unfollow button is very close
TammyHer 86c3baa
thats it Im done
TammyHer 1573527
Merge pull request #36 from TamarHershi/button
TammyHer e840b42
updated creators controller spec - removed an 'end'
trowbrsa f98f927
Updated Gemfile per merge conflict
trowbrsa d63d0b9
fixed the follow button bug
TammyHer 99adee9
Merge branch 'rest/master' of github.com:TamarHershi/seemore into emb…
trowbrsa 931209b
icons in navbar fixed
rileslovesyall ebf60b1
changed factories to more closely match current db
emgord 33f7218
limiting number of videos and tweets shown on feed to most recent 25
rileslovesyall 50d285f
searching with nothing will no longer show error
rileslovesyall 6a6ff5f
videos and tweets displaying on the feed interspersed wahoooooooo
rileslovesyall 4f22726
unfollow button is working for vimeo and twitter
TammyHer 2a32f61
Merge branch 'rest/master' of github.com:TamarHershi/seemore into res…
TammyHer 8eeba2d
trying to figure out styling
rileslovesyall 6b72a15
Merge branch 'feed-order' into rest/master
rileslovesyall ffae1f0
more draft creator controller specs
trowbrsa ce1900d
removed extraneous line of code-- twitter provides its own default image
rileslovesyall 41ba86e
vimeo default image works
rileslovesyall 8fb9c78
simpolified button css
rileslovesyall 43d0be7
changed the gemfile before deploying to heroku
TammyHer 45b6ee6
working on creator spec
emgord b950295
added ruby version to the gemfile
TammyHer 076483f
removes all require pry
TammyHer 8d1dbd1
Additional rspec tests
trowbrsa eb330ce
more tests for creators spec
emgord 3dd0864
Merge pull request #37 from TamarHershi/tweetusercontrollerspec
emgord 64513dd
Merge branch 'rest/master' of github.com:TamarHershi/seemore into res…
TammyHer 36ff1ae
starting specs
rileslovesyall b0420ea
added description for the follow/unfollow methods
TammyHer 88382f8
fixed broken test for default vimeo image
emgord 0362c67
user controller spec tests covered
rileslovesyall 09f6645
Merge branch 'rest/master' of github.com:TamarHershi/seemore into res…
rileslovesyall d3614fb
More draft rspec tests
trowbrsa 9e03f81
test for twitter follow if not yet following
emgord be26dbb
more RSPEC tests working
trowbrsa 331ce06
Added another factory for testing unfollow method and added unfollow …
trowbrsa 3cbcede
Fixed merge conflict in factories.rb
trowbrsa f579dc8
merge issues fixed
rileslovesyall eec3672
add 2 tests to DELETE destry spec in Session controller , but still n…
TammyHer 89857fc
DRYed creator controller specs, added test for flash.now
rileslovesyall fdc36ea
test added for vimeo follow?
emgord 947768e
Merge pull request #39 from TamarHershi/finalemilyrspec
emgord 1d094c4
commented out test i can't get to work (flash.now)
rileslovesyall 1210cc1
fixed default image test
rileslovesyall dfba881
Merge branch 'rest/master' of github.com:TamarHershi/seemore into res…
TammyHer a850d01
the logout test is running
TammyHer 506ef29
removed the f from the it
TammyHer 1fe4cb1
navbar search button placement way better
rileslovesyall c616297
centered tweets on feed
emgord c463272
made tiles bigger, added title to feed
emgord 3f92b2e
Merge branch 'tweetcenter/erg' into rest/master
emgord 71c82b2
fixed merge conflict in show view
emgord 3b02764
moved out to partial
rileslovesyall 458a53f
buttons working properly
rileslovesyall e10d9e8
add some design
TammyHer 49b4df6
better design to session new page
TammyHer 63a0f3c
made changes in the seesion page
TammyHer f50dfdd
Merge branch 'stuff' into rest/master
TammyHer cbb88bb
fixed navbar link spacing
rileslovesyall 1592c30
made space between flash message and jumbotron
rileslovesyall de30460
removed search results header if you didn't pick twitter or vimeo
emgord 1bfe785
added a big notice when you didn't select twitter or vimeo
TammyHer 62be813
added jumbotron to creators you follow page
emgord 2a15cdb
Merge branch 'rest/master' of github.com:TamarHershi/seemore into res…
emgord c0124ef
fixed twitter unfollow button
emgord 6886835
flash notice now shows if you aren't following anybody
emgord 2c3a2ac
rspec test added for require login, fixed broken test for creator follow
emgord File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,3 +16,5 @@ | |
!/log/.keep | ||
/tmp | ||
/.env | ||
/coverage/* | ||
/.yml | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
web: bundle exec rackup -p $PORT |
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,116 @@ | ||
@import "bootstrap-sprockets"; | ||
@import "bootstrap"; | ||
@import 'bootstrap/theme'; | ||
|
||
|
||
$light-grey: #707070; | ||
$med-grey: #454545; | ||
|
||
|
||
body { | ||
font-family: 'Cardo', serif; | ||
text-align: center; | ||
color: $med-grey; | ||
} | ||
|
||
.flash { | ||
font-family: 'Cardo', serif; | ||
font-size: 14px; | ||
text-align: center; | ||
margin-top: 5px; | ||
margin-bottom: 5px; | ||
padding-top: 8px; | ||
padding-bottom: 8px; | ||
background-color: $med-grey; | ||
color: #FFFFFF; | ||
} | ||
|
||
h1 { | ||
font-family: 'Oswald', serif; | ||
color: $med-grey; | ||
} | ||
|
||
.navbar-default { | ||
background-color: #76CCAF; | ||
margin-top: 7px; | ||
} | ||
|
||
.navbar-right { | ||
margin-right: 30px; | ||
margin-top: 7px; | ||
} | ||
|
||
.navbar-left { | ||
margin-left: 20px; | ||
margin-top: 12px; | ||
} | ||
|
||
.navbar-links { | ||
font-size: 18px; | ||
margin-top: 17px; | ||
} | ||
|
||
#navbar-text-right { | ||
font-size: 18px; | ||
margin-top: 5px; | ||
color: $light-grey; | ||
} | ||
|
||
#navbar-text-left { | ||
font-size: 18px; | ||
color: $light-grey; | ||
} | ||
|
||
.search-button { | ||
margin-left: 4px; | ||
margin-bottom: 13px; | ||
} | ||
|
||
.login-links { | ||
font-size: 125px; | ||
} | ||
|
||
.login-link-right { | ||
margin-left: 15px; | ||
} | ||
|
||
.login-link-left { | ||
margin-right: 15px; | ||
margin-left: 15px; | ||
} | ||
|
||
.btn-default { | ||
font-family: 'Oswald', serif; | ||
border: 1px $med-grey solid; | ||
margin-top: 8px; | ||
} | ||
|
||
.creator_name { | ||
margin-top: 5px; | ||
} | ||
|
||
.creator-image { | ||
height: 75px; | ||
} | ||
|
||
.creator-col { | ||
height: 200px; | ||
} | ||
|
||
.embedded-video { | ||
margin: 30px 0; | ||
} | ||
|
||
.embedded-tweet { | ||
float:left; | ||
text-align:center; | ||
} | ||
|
||
a { | ||
color: $med-grey; | ||
} | ||
|
||
a:hover { | ||
color: $light-grey; | ||
text-decoration: none; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,4 +2,19 @@ class ApplicationController < ActionController::Base | |
# Prevent CSRF attacks by raising an exception. | ||
# For APIs, you may want to use :null_session instead. | ||
protect_from_forgery with: :exception | ||
helper_method :current_user | ||
before_action :require_login | ||
before_action :current_user | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice use of helper methods and before actions! |
||
|
||
def current_user | ||
@current_user ||= User.find(session[:user_id]) if session[:user_id] | ||
rescue ActiveRecord::RecordNotFound | ||
end | ||
|
||
def require_login | ||
unless current_user | ||
flash[:error] = "Login to begin curating." | ||
redirect_to new_session_path | ||
end | ||
end | ||
end |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice! What goes in the .gitignore is so important! 👍