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

Mod11 #103

Open
wants to merge 121 commits into
base: master
Choose a base branch
from
Open

Mod11 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
cfd17a5
added categories, show category page
johntmorgan Feb 28, 2014
5a04908
fixed index, category pages so videos only display once
johntmorgan Mar 1, 2014
c75ec4f
a bit more cleanup of index code
johntmorgan Mar 1, 2014
074bfb7
installed rspec
johntmorgan Mar 3, 2014
0a596de
Merge pull request #1 from Nissl/video_model_test
johntmorgan Mar 3, 2014
aa91532
basic save test of video model
johntmorgan Mar 3, 2014
1769972
category and category/video relationship tests
johntmorgan Mar 3, 2014
a2f8aba
revised testing with more options from solutions
johntmorgan Mar 3, 2014
c48a9de
video validations
johntmorgan Mar 3, 2014
ae3125b
replaced original tests with shoulda matchers
johntmorgan Mar 3, 2014
e9af52e
added empty category check from Amber's code
johntmorgan Mar 3, 2014
5989a4f
Merge pull request #2 from Nissl/mod1
johntmorgan Mar 4, 2014
c8aca12
added search by title (before viewing solution)
johntmorgan Mar 4, 2014
192f5b6
cleaned up search_by_title after watching solution
johntmorgan Mar 4, 2014
aa792c5
search bar added
johntmorgan Mar 4, 2014
81a9435
recent_videos method w/tests (pre-solution)
johntmorgan Mar 4, 2014
0e28fa0
recent videos method revision after solution
johntmorgan Mar 4, 2014
76808c1
added users, wired up registration & sign-in pages (pre-solution)
johntmorgan Mar 5, 2014
ba7d93a
added users, wired up registration & sign-in pages (post-solution)
johntmorgan Mar 5, 2014
cec2d4e
added authentication features (pre-solution)
johntmorgan Mar 5, 2014
8a68f86
minor revisions to authentication from solution
johntmorgan Mar 5, 2014
ab4128b
Merge pull request #3 from Nissl/mod1
johntmorgan Mar 6, 2014
92349e2
video controller test (with solution revisions & notes)
johntmorgan Mar 8, 2014
c6d5497
user, session controller tests
johntmorgan Mar 10, 2014
5bb1ac6
user & session controller tests (solution refactor)
johntmorgan Mar 10, 2014
cc79a4d
added reviews to video show page, with test (pre-solution)
johntmorgan Mar 11, 2014
72170cf
added user submission of reviews (pre-solution)
johntmorgan Mar 11, 2014
16cf4b5
minor refactor to user review submission from solutions
johntmorgan Mar 11, 2014
9f2dde5
added set @reviews test to user multiple submission error condition
johntmorgan Mar 11, 2014
0f160d4
revisions to reviews controller from @poiyzy suggestions
johntmorgan Mar 13, 2014
469cd52
revised 'user has already submitted a review for this video' conditio…
johntmorgan Mar 13, 2014
25136b8
basic queues view, pre-solution
johntmorgan Mar 17, 2014
7cf0abd
revised my_queue display from solution(major refactor)
johntmorgan Mar 17, 2014
8422dc2
updated with fixed review error messaging
johntmorgan Mar 19, 2014
cbaf85a
Merge pull request #4 from Nissl/mod2
johntmorgan Mar 19, 2014
cd60da4
implemented user adding video to queue, list order
johntmorgan Mar 20, 2014
e14891a
add video to queue, solution refactor
johntmorgan Mar 20, 2014
41b6716
implemented user deletion of items from queue (pre-solution)
johntmorgan Mar 20, 2014
41f7418
revised queue item delete post-solution, one major fix
johntmorgan Mar 20, 2014
68dcfdd
Merge pull request #5 from Nissl/mod2
johntmorgan Mar 21, 2014
551b015
a few minor refactorings from luketower's feedback
johntmorgan Mar 21, 2014
46e9287
Merge pull request #6 from Nissl/mod2
johntmorgan Mar 21, 2014
afae1a4
one more quick refactor from mod2
johntmorgan Mar 21, 2014
bdede77
added queue reordering (pre-solution refactor, but using solution for…
johntmorgan Apr 4, 2014
52b6e81
refactor queue reordering from solution
johntmorgan Apr 11, 2014
1ca25b7
added dropdowns that allow user to set and change ratings on my queue…
johntmorgan Apr 13, 2014
c3f9399
bug fix for rspec refactor in queue items controller
johntmorgan Apr 13, 2014
a842f08
fixed bug in queue items controller spec refactor
johntmorgan Apr 14, 2014
1235af5
cleaned up a few residual commented out binding.pry commands I missed
johntmorgan Apr 14, 2014
159a0a5
remove unnecessary quarantine.rb file, eliminate model-level validati…
johntmorgan Apr 14, 2014
a3468a0
Merge pull request #7 from Nissl/mod3
johntmorgan Apr 14, 2014
c4c7359
fix sessions controller bug, refactor half of queue_items_controller_…
johntmorgan Apr 14, 2014
a79dbea
complete spec refactor (pre-solution)
johntmorgan Apr 15, 2014
e130a3f
added first feature spec
johntmorgan Apr 15, 2014
97ffbf2
user interacts with queue spec (pre-solution, hideously ugly)
johntmorgan Apr 15, 2014
590f38b
refactor queue item feature spec
johntmorgan Apr 16, 2014
f7244d0
additional refactor queue item feature spec
johntmorgan Apr 16, 2014
0306e20
user profile page, start week 4
johntmorgan Apr 16, 2014
ed06647
minor refactor to user profile page from solution
johntmorgan Apr 17, 2014
c6f67f1
Merge pull request #8 from Nissl/mod4
johntmorgan Apr 18, 2014
4bf1faf
completed relationships functions (pre-solution refactor)
johntmorgan Apr 20, 2014
06edd8f
all relationships completed including refactor
johntmorgan Apr 21, 2014
70c5e4e
feature spec for following people (note ugly delete select, waiting f…
johntmorgan Apr 21, 2014
9084191
minor refactor to feature spec from solution
johntmorgan Apr 21, 2014
de71145
switched to postgresql prior to heroku deploy
johntmorgan Apr 22, 2014
cb81239
implemented basic mail on registration
johntmorgan Apr 22, 2014
4a3114c
test email sending
johntmorgan Apr 22, 2014
463135d
added bad input test to registration email
johntmorgan Apr 22, 2014
69ed2e1
password reset (pre-solution refactor, but with guidance to controlle…
johntmorgan Apr 23, 2014
c55d5ed
minor refactor/renaming to password reset from solution
johntmorgan Apr 23, 2014
ecc6020
Workaround for Heroku to migrate past a table I later dropped
johntmorgan Apr 23, 2014
117fedb
removed table erroneously created that was causing problems with hero…
johntmorgan Apr 23, 2014
0f4b68a
one more db fix
johntmorgan Apr 23, 2014
34032d6
Merge pull request #9 from Nissl/mod5
johntmorgan Apr 23, 2014
3ffd8ac
broken click button for tealeaf feedback
johntmorgan Apr 24, 2014
fa971e3
Merge pull request #10 from Nissl/mod6
johntmorgan Apr 24, 2014
9f8c5cd
feature spec for user login via email (pre-solution)
johntmorgan Apr 24, 2014
64b42e8
added invite a friend feature (pre-solution)
johntmorgan Apr 25, 2014
86f2d14
refactor user invites friend from solution
johntmorgan Apr 25, 2014
423a3be
shared concerns for token generation
johntmorgan Apr 29, 2014
a5fe52a
setup mailgun on heroku
johntmorgan Apr 29, 2014
b0abcc2
fixed bug in mail code
johntmorgan Apr 29, 2014
2099aea
Merge pull request #11 from Nissl/mod7
johntmorgan Apr 30, 2014
689bef3
added sidekiq mailing of invitation
johntmorgan Apr 30, 2014
66cea71
setup foreman and unicorn
johntmorgan Apr 30, 2014
8dda92d
setup redis for heroku
johntmorgan Apr 30, 2014
fb522f7
try fix to
johntmorgan Apr 30, 2014
8120781
fixed error in custom validation message being displayed by bootstrap…
johntmorgan Apr 30, 2014
4d59abb
update to email subject field
johntmorgan Apr 30, 2014
a255cf1
test port set via env file
johntmorgan May 1, 2014
d596a85
turn off worker dyno
johntmorgan May 1, 2014
d23fb1e
staging config, sentry setup
johntmorgan May 3, 2014
f353b94
add paratrooper
johntmorgan May 3, 2014
901648f
Merge pull request #12 from Nissl/mod8
johntmorgan May 5, 2014
25a4cae
add video page, admin role, authentication
johntmorgan May 5, 2014
44aa53e
admin add video solution refactor (bootstrap form for)
johntmorgan May 5, 2014
a43c31e
carrierwave and fog implemented, some tests of gem functionality not …
johntmorgan May 8, 2014
2c8b725
solution refactor to admin page, add video url
johntmorgan May 8, 2014
af8ce96
feature spec for admin adding video (pre-solution)
johntmorgan May 8, 2014
0d5a71f
admin adds video feature spec (solution refactor)
johntmorgan May 8, 2014
74f6509
Merge pull request #13 from Nissl/mod9
johntmorgan May 9, 2014
a0f2a38
stripe checkout charges card (presolution)
johntmorgan May 9, 2014
073abb7
stripe form (pre-solution)
johntmorgan May 9, 2014
9344516
stripe form (solution revise)
johntmorgan May 9, 2014
e6c0356
stripe form with solution controller
johntmorgan May 10, 2014
3b54fbc
Figaro update fix
johntmorgan May 12, 2014
4981767
Merge pull request #14 from Nissl/mod10
johntmorgan May 12, 2014
2a705aa
JS staging server fix
johntmorgan May 12, 2014
1574adf
another js fix attempt
johntmorgan May 12, 2014
3bb9840
another heroku js fix attempt
johntmorgan May 12, 2014
3d2bbbc
another js fix by setting config.serve_static_assets to true
johntmorgan May 12, 2014
4cfb23e
undo serve_static_assets
johntmorgan May 12, 2014
afebec3
deleted manifest
johntmorgan May 12, 2014
62c0507
added payments to application file
johntmorgan May 12, 2014
6583b93
stripe wrapper w/tests (pre-solution)
johntmorgan May 12, 2014
bc9f8d0
stripe wrapper (solution refactor)
johntmorgan May 13, 2014
4a1abd1
charge credit card on registration w/tests (incl solution)
johntmorgan May 13, 2014
acdb972
setup capybara-webkit testing
johntmorgan May 13, 2014
cfe66cb
webkit implementation (w/webkit and vcr issues)
johntmorgan May 14, 2014
abe5656
VCR fix via configure_metadata
johntmorgan May 14, 2014
144be72
webkit fix
johntmorgan May 14, 2014
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
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PORT=3000
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp

# Ignore application configuration
/config/application.yml
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--color
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.0.0-p247
2.0.0-p247
44 changes: 38 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,55 @@ ruby '2.0.0'

gem 'bootstrap-sass'
gem 'coffee-rails'
gem 'rails'
gem 'rails', '4.0.1'
gem 'haml-rails'
gem 'sass-rails'
gem 'sass-rails', '~> 4.0.0'
gem 'sprockets', '2.11.0'
gem 'uglifier'
gem 'jquery-rails'
gem 'bcrypt-ruby', '3.1.2'
gem 'bootstrap_form'
gem 'pg'
gem 'sidekiq'
gem 'redis'
gem 'sinatra', require: false
gem 'slim'
gem 'unicorn'
gem 'sentry-raven'
gem 'paratrooper'
gem 'carrierwave'
gem 'mini_magick'
gem 'fog'
gem 'stripe'
gem 'figaro', '>= 1.0.0.rc1'

group :development do
gem 'sqlite3'
gem 'pry'
gem 'pry-nav'
gem 'pry-remote'
gem 'pry-stack_explorer'
gem 'pry-debugger'
gem 'thin'
gem "better_errors"
gem "binding_of_caller"
gem 'letter_opener'
end

group :production do
gem 'pg'
gem 'rails_12factor'
group :test do
gem "rspec-rails", "~> 2.0"
gem 'shoulda-matchers'
gem 'fabrication'
gem 'faker'
gem 'capybara'
gem 'capybara-email'
gem 'capybara-webkit'
gem 'launchy'
gem 'database_cleaner'
gem 'selenium-webdriver'
gem 'vcr'
gem 'webmock'
end

group :staging, :production do
gem 'rails_12factor'
end
Loading