Permalink
Browse files

Overhaul. Remove mongo, switch to sessions, and clean up a lot of HTML

  • Loading branch information...
1 parent 7064c7f commit a063b8bc9583630184666ff689a5732327e11a0d @excid3 excid3 committed Jan 8, 2015
Showing with 624 additions and 958 deletions.
  1. +3 −5 Gemfile
  2. +87 −80 Gemfile.lock
  3. +5 −5 app/assets/javascripts/application.js
  4. +84 −83 app/assets/javascripts/confetti.js
  5. +111 −103 app/assets/stylesheets/_install_steps.scss
  6. +0 −2 app/assets/stylesheets/application.css.scss
  7. +11 −1 app/controllers/application_controller.rb
  8. +23 −53 app/controllers/install_steps_controller.rb
  9. +12 −0 app/controllers/main_controller.rb
  10. +0 −8 app/controllers/welcome_controller.rb
  11. +0 −37 app/helpers/sessions_helper.rb
  12. +15 −9 app/models/user.rb
  13. +3 −8 app/views/install_steps/choose_os.html.erb
  14. +8 −14 app/views/install_steps/choose_os_version.html.erb
  15. +2 −11 app/views/install_steps/configure_git.html.erb
  16. +0 −62 app/views/install_steps/congratulations.html.erb
  17. +6 −15 app/views/install_steps/create_ssh_key.html.erb
  18. +25 −38 app/views/install_steps/create_your_first_app.html.erb
  19. +3 −12 app/views/install_steps/find_git_bash.html.erb
  20. +37 −52 app/views/install_steps/find_the_command_line.html.erb
  21. +2 −13 app/views/install_steps/install_git.html.erb
  22. +2 −12 app/views/install_steps/install_homebrew.html.erb
  23. +1 −12 app/views/install_steps/install_rails.html.erb
  24. +4 −13 app/views/install_steps/install_rvm_and_ruby.html.erb
  25. +3 −13 app/views/install_steps/install_xcode.html.erb
  26. +3 −14 app/views/install_steps/rails_for_linux_and_other.html.erb
  27. +9 −22 app/views/install_steps/railsinstaller.html.erb
  28. +14 −28 app/views/install_steps/railsinstaller_windows.html.erb
  29. +2 −11 app/views/install_steps/see_it_live.html.erb
  30. +9 −21 app/views/install_steps/sublime_text.html.erb
  31. +6 −22 app/views/install_steps/textmate.html.erb
  32. +3 −25 app/views/install_steps/update_rails.html.erb
  33. +17 −26 app/views/install_steps/update_ruby.html.erb
  34. +2 −6 app/views/install_steps/verify_rails_version.html.erb
  35. +2 −7 app/views/install_steps/verify_ruby_version.html.erb
  36. +8 −0 app/views/layouts/_development.html.erb
  37. +4 −1 app/views/layouts/_disqus.html.erb
  38. +5 −0 app/views/layouts/_step_navigation.html.erb
  39. +19 −21 app/views/layouts/application.html.erb
  40. +3 −7 app/views/layouts/install_steps.html.erb
  41. 0 app/views/layouts/{welcome.html.erb → main.html.erb}
  42. +64 −0 app/views/main/congratulations.html.erb
  43. 0 app/views/{welcome → main}/index.html.erb
  44. 0 app/views/{welcome → main}/test.html.erb
  45. +1 −0 config/application.rb
  46. +0 −80 config/mongoid.yml
  47. +5 −5 config/routes.rb
  48. +1 −1 features/support/env.rb
View
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
-ruby "2.1.4"
+ruby "2.2.0"
-gem 'rails', '4.0.11'
+gem 'rails', '4.2.0'
group :development do
end
@@ -16,7 +16,6 @@ end
group :test do
gem 'cucumber-rails', require: false
- gem 'database_cleaner'
end
group :production do
@@ -31,7 +30,6 @@ gem 'coffee-rails'
gem 'jquery-rails'
gem 'turbolinks'
gem 'jbuilder', '~> 1.2'
-gem 'mongoid', git: 'https://github.com/mongoid/mongoid.git'
-gem 'wicked', '~> 0.6.1'
+gem 'wicked', '~> 1.1.0'
gem 'unicorn', require: false
gem 'figaro'
View
@@ -1,51 +1,51 @@
-GIT
- remote: https://github.com/mongoid/mongoid.git
- revision: f4f489e45adb0059fae6854d8a29ebb79cc6c8fd
- specs:
- mongoid (4.0.0)
- activemodel (~> 4.0)
- moped (~> 2.0.0)
- origin (~> 2.1)
- tzinfo (>= 0.3.37)
-
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.0.11)
- actionpack (= 4.0.11)
+ actionmailer (4.2.0)
+ actionpack (= 4.2.0)
+ actionview (= 4.2.0)
+ activejob (= 4.2.0)
mail (~> 2.5, >= 2.5.4)
- actionpack (4.0.11)
- activesupport (= 4.0.11)
- builder (~> 3.1.0)
- erubis (~> 2.7.0)
- rack (~> 1.5.2)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ actionpack (4.2.0)
+ actionview (= 4.2.0)
+ activesupport (= 4.2.0)
+ rack (~> 1.6.0)
rack-test (~> 0.6.2)
- activemodel (4.0.11)
- activesupport (= 4.0.11)
- builder (~> 3.1.0)
- activerecord (4.0.11)
- activemodel (= 4.0.11)
- activerecord-deprecated_finders (~> 1.0.2)
- activesupport (= 4.0.11)
- arel (~> 4.0.0)
- activerecord-deprecated_finders (1.0.3)
- activesupport (4.0.11)
- i18n (~> 0.6, >= 0.6.9)
- minitest (~> 4.2)
- multi_json (~> 1.3)
- thread_safe (~> 0.1)
- tzinfo (~> 0.3.37)
- arel (4.0.2)
- better_errors (2.0.0)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ actionview (4.2.0)
+ activesupport (= 4.2.0)
+ builder (~> 3.1)
+ erubis (~> 2.7.0)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ activejob (4.2.0)
+ activesupport (= 4.2.0)
+ globalid (>= 0.3.0)
+ activemodel (4.2.0)
+ activesupport (= 4.2.0)
+ builder (~> 3.1)
+ activerecord (4.2.0)
+ activemodel (= 4.2.0)
+ activesupport (= 4.2.0)
+ arel (~> 6.0)
+ activesupport (4.2.0)
+ i18n (~> 0.7)
+ json (~> 1.7, >= 1.7.7)
+ minitest (~> 5.1)
+ thread_safe (~> 0.3, >= 0.3.4)
+ tzinfo (~> 1.1)
+ arel (6.0.0)
+ better_errors (2.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.1.1.1)
sass (~> 3.2)
- bson (2.3.0)
- builder (3.1.4)
+ builder (3.2.2)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -60,8 +60,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.8.0)
- connection_pool (2.0.0)
- cucumber (1.3.17)
+ cucumber (1.3.18)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
@@ -73,7 +72,6 @@ GEM
mime-types (>= 1.16, < 3)
nokogiri (~> 1.5)
rails (>= 3, < 5)
- database_cleaner (1.3.0)
debug_inspector (0.0.2)
diff-lcs (1.2.5)
erubis (2.7.0)
@@ -89,61 +87,71 @@ GEM
railties (>= 3.2, < 5.0)
gherkin (2.12.2)
multi_json (~> 1.3)
+ globalid (0.3.0)
+ activesupport (>= 4.1.0)
hike (1.2.3)
- i18n (0.6.11)
+ i18n (0.7.0)
jbuilder (1.5.3)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
- jquery-rails (3.1.2)
- railties (>= 3.0, < 5.0)
+ jquery-rails (4.0.3)
+ rails-dom-testing (~> 1.0)
+ railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
kgio (2.9.2)
+ loofah (2.0.1)
+ nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.4.3)
- mini_portile (0.6.1)
- minitest (4.7.5)
- moped (2.0.1)
- bson (~> 2.2)
- connection_pool (~> 2.0)
- optionable (~> 0.2.0)
+ mini_portile (0.6.2)
+ minitest (5.5.0)
multi_json (1.10.1)
multi_test (0.1.1)
- nokogiri (1.6.4.1)
+ nokogiri (1.6.5)
mini_portile (~> 0.6.0)
- optionable (0.2.0)
- origin (2.1.1)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.2)
pry (>= 0.9.10)
- rack (1.5.2)
+ rack (1.6.0)
rack-test (0.6.2)
rack (>= 1.0)
- rails (4.0.11)
- actionmailer (= 4.0.11)
- actionpack (= 4.0.11)
- activerecord (= 4.0.11)
- activesupport (= 4.0.11)
+ rails (4.2.0)
+ actionmailer (= 4.2.0)
+ actionpack (= 4.2.0)
+ actionview (= 4.2.0)
+ activejob (= 4.2.0)
+ activemodel (= 4.2.0)
+ activerecord (= 4.2.0)
+ activesupport (= 4.2.0)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.0.11)
- sprockets-rails (~> 2.0)
+ railties (= 4.2.0)
+ sprockets-rails
+ rails-deprecated_sanitizer (1.0.3)
+ activesupport (>= 4.2.0.alpha)
+ rails-dom-testing (1.0.5)
+ activesupport (>= 4.2.0.beta, < 5.0)
+ nokogiri (~> 1.6.0)
+ rails-deprecated_sanitizer (>= 1.0.1)
+ rails-html-sanitizer (1.0.1)
+ loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
- rails_serve_static_assets (0.0.2)
+ rails_serve_static_assets (0.0.3)
rails_stdout_logging (0.0.3)
- railties (4.0.11)
- actionpack (= 4.0.11)
- activesupport (= 4.0.11)
+ railties (4.2.0)
+ actionpack (= 4.2.0)
+ activesupport (= 4.2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
- rake (10.3.2)
+ rake (10.4.2)
rspec-core (3.0.4)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.4)
@@ -160,37 +168,38 @@ GEM
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.4)
- sass (3.2.19)
- sass-rails (4.0.4)
+ sass (3.4.9)
+ sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0)
- sass (~> 3.2.2)
- sprockets (~> 2.8, < 2.12)
- sprockets-rails (~> 2.0)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (~> 1.1)
slop (3.6.0)
- sprockets (2.11.3)
+ sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.2.0)
+ sprockets-rails (2.2.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
- turbolinks (2.5.1)
+ turbolinks (2.5.3)
coffee-rails
- tzinfo (0.3.42)
- uglifier (2.5.3)
+ tzinfo (1.2.2)
+ thread_safe (~> 0.1)
+ uglifier (2.6.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.8.3)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
- wicked (0.6.1)
- activesupport (>= 3.0.7)
+ wicked (1.1.0)
rails (>= 3.0.7)
xpath (2.0.0)
nokogiri (~> 1.3)
@@ -204,19 +213,17 @@ DEPENDENCIES
bootstrap-sass (~> 3.1.1.0)
coffee-rails
cucumber-rails
- database_cleaner
factory_girl_rails
figaro
font-awesome-rails (~> 3.2.1.2)
jbuilder (~> 1.2)
jquery-rails
- mongoid!
pry-rails
- rails (= 4.0.11)
+ rails (= 4.2.0)
rails_12factor
rspec-rails (~> 3.0.0.beta)
sass-rails
turbolinks
uglifier (>= 1.3.0)
unicorn
- wicked (~> 0.6.1)
+ wicked (~> 1.1.0)
@@ -15,9 +15,9 @@
//= require turbolinks
//= require bootstrap
//= require_tree .
+//= require_self
-//if we are using the #confetti id, run the confetti
-confetti = document.getElementById("confetti");
-if(confetti !== null) {
- MetervaraConfetti();
-}
+$(document).ready(function() {
+ if ($("#confetti").length > 0)
+ MetervaraConfetti()
+});
Oops, something went wrong.

0 comments on commit a063b8b

Please sign in to comment.