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.

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

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! 👍

14 changes: 13 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
source 'https://rubygems.org'
ruby '2.2.3'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.5'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand All @@ -27,14 +28,17 @@ gem "omniauth"
gem "omniauth-github"
gem "omniauth-twitter"
gem "omniauth-vimeo"
gem 'omniauth-oauth2', '~> 1.3.1'
gem 'httparty'
gem 'twitter'

gem 'bootstrap-sass', '~> 3.3.5'






# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

Expand All @@ -48,21 +52,29 @@ group :production do
gem "pg"
end

group :test do
gem 'webmock', '1.8.0'
end

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
gem 'rspec-rails'
gem 'dotenv-rails'
gem 'simplecov'
gem 'pry'
gem 'factory_girl_rails'
gem 'vcr'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'sqlite3'
gem 'web-console', '~> 2.0'
gem "better_errors"
gem "binding_of_caller"

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'pry-rails'
end
54 changes: 53 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
arel (6.0.3)
autoprefixer-rails (6.2.3)
execjs
Expand All @@ -49,6 +50,7 @@ GEM
bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
buftok (0.2.0)
builder (3.2.2)
byebug (8.2.1)
coderay (1.1.0)
Expand All @@ -60,20 +62,39 @@ GEM
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.0)
crack (0.4.3)
safe_yaml (~> 1.0.0)
debug_inspector (0.0.2)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.25)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.0.2)
dotenv-rails (2.0.2)
dotenv (= 2.0.2)
railties (~> 4.0)
equalizer (0.0.10)
erubis (2.7.0)
execjs (2.6.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
globalid (0.3.6)
activesupport (>= 4.1.0)
hashie (3.4.3)
http (0.9.8)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 1.0.1)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.2)
domain_name (~> 0.5)
http-form_data (1.0.1)
http_parser.rb (0.6.0)
httparty (0.13.7)
json (~> 1.8)
multi_xml (>= 0.5.2)
Expand All @@ -91,13 +112,16 @@ GEM
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
mime-types (2.99)
mini_portile2 (2.0.0)
minitest (5.8.3)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
naught (1.1.0)
nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
oauth (0.4.7)
Expand All @@ -116,7 +140,7 @@ GEM
omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.4.0)
omniauth-oauth2 (1.3.1)
oauth2 (~> 1.0)
omniauth (~> 1.2)
omniauth-twitter (1.2.1)
Expand All @@ -129,6 +153,8 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.4)
pry (>= 0.9.10)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand Down Expand Up @@ -176,6 +202,7 @@ GEM
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
safe_yaml (1.0.4)
sass (3.4.20)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
Expand All @@ -186,6 +213,7 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
simple_oauth (0.3.1)
simplecov (0.11.1)
docile (~> 1.1.0)
json (~> 1.8)
Expand All @@ -206,16 +234,34 @@ GEM
tilt (2.0.2)
turbolinks (2.5.3)
coffee-rails
twitter (5.15.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (= 0.0.10)
faraday (~> 0.9.0)
http (>= 0.4, < 0.10)
http_parser.rb (~> 0.6.0)
json (~> 1.8)
memoizable (~> 0.4.0)
naught (~> 1.0)
simple_oauth (~> 0.3.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.1)
vcr (3.0.1)
web-console (2.2.1)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
webmock (1.8.0)
addressable (>= 2.2.7)
crack (>= 0.1.7)

PLATFORMS
ruby
Expand All @@ -227,15 +273,18 @@ DEPENDENCIES
byebug
coffee-rails (~> 4.1.0)
dotenv-rails
factory_girl_rails
httparty
jbuilder (~> 2.0)
jquery-rails
omniauth
omniauth-github
omniauth-oauth2 (~> 1.3.1)
omniauth-twitter
omniauth-vimeo
pg
pry
pry-rails
rails (= 4.2.5)
rspec-rails
sass-rails (~> 5.0)
Expand All @@ -244,8 +293,11 @@ DEPENDENCIES
spring
sqlite3
turbolinks
twitter
uglifier (>= 1.3.0)
vcr
web-console (~> 2.0)
webmock (= 1.8.0)

BUNDLED WITH
1.11.2
1 change: 1 addition & 0 deletions app/Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: bundle exec rackup -p $PORT
Binary file added app/assets/images/favicon.ico
Binary file not shown.
Binary file added app/assets/images/twitter_default_image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/vimeo_default_image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/vimeo_default_two.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 0 additions & 15 deletions app/assets/stylesheets/application.css

This file was deleted.

116 changes: 116 additions & 0 deletions app/assets/stylesheets/application.scss
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;
}
15 changes: 15 additions & 0 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Choose a reason for hiding this comment

The 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
Loading