From 59b2dc33ea83d5d5a52a72d14213f564afe8f0ce Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sun, 2 Mar 2014 15:04:26 -0500 Subject: Gemfile.lock --- Gemfile.lock | 48 ++++++++++++++++++++--- app/controllers/users_controller.rb | 3 ++ app/views/layouts/application.html.erb | 25 ------------ config/application.rb | 2 + config/routes.rb | 70 ---------------------------------- log/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 15 -------- 13 files changed, 48 insertions(+), 115 deletions(-) delete mode 100644 app/views/layouts/application.html.erb delete mode 100644 config/routes.rb delete mode 100644 log/.keep delete mode 100644 test/controllers/.keep delete mode 100644 test/fixtures/.keep delete mode 100644 test/helpers/.keep delete mode 100644 test/integration/.keep delete mode 100644 test/mailers/.keep delete mode 100644 test/models/.keep delete mode 100644 test/test_helper.rb diff --git a/Gemfile.lock b/Gemfile.lock index 75d27b8..9dd0199 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,10 +26,19 @@ GEM thread_safe (~> 0.1) tzinfo (~> 0.3.37) arel (4.0.2) - atomic (1.1.14) + atomic (1.1.15) + bcrypt-ruby (3.1.2) bootstrap-sass (3.1.1.0) sass (~> 3.2) builder (3.1.4) + capybara (2.1.0) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + childprocess (0.5.1) + ffi (~> 1.0, >= 1.0.11) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -37,8 +46,10 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) + diff-lcs (1.2.5) erubis (2.7.0) execjs (2.0.2) + ffi (1.9.3) hike (1.2.3) i18n (0.6.9) jbuilder (1.5.3) @@ -53,8 +64,11 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) + mini_portile (0.5.2) minitest (4.7.5) multi_json (1.8.4) + nokogiri (1.6.1) + mini_portile (~> 0.5.0) polyglot (0.3.4) rack (1.5.2) rack-test (0.6.2) @@ -76,6 +90,18 @@ GEM rdoc (4.1.1) json (~> 1.4) ref (1.0.5) + rspec-core (2.13.1) + rspec-expectations (2.13.0) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.13.1) + rspec-rails (2.13.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 2.13.0) + rspec-expectations (~> 2.13.0) + rspec-mocks (~> 2.13.0) + rubyzip (0.9.9) sass (3.2.14) sass-rails (4.0.1) railties (>= 4.0.0, < 5.0) @@ -84,7 +110,12 @@ GEM sdoc (0.4.0) json (~> 1.8) rdoc (~> 4.0, < 5.0) - sprockets (2.10.1) + selenium-webdriver (2.35.1) + childprocess (>= 0.2.5) + multi_json (~> 1.0) + rubyzip (< 1.0.0) + websocket (~> 1.0.4) + sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -93,13 +124,13 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - sqlite3 (1.3.8) + sqlite3 (1.3.9) therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref thor (0.18.1) - thread_safe (0.1.3) - atomic + thread_safe (0.2.0) + atomic (>= 1.1.7, < 2) tilt (1.4.1) treetop (1.4.15) polyglot @@ -110,18 +141,25 @@ GEM uglifier (2.4.0) execjs (>= 0.3.0) json (>= 1.8.0) + websocket (1.0.7) + xpath (2.0.0) + nokogiri (~> 1.3) PLATFORMS ruby DEPENDENCIES + bcrypt-ruby (= 3.1.2) bootstrap-sass + capybara (= 2.1.0) coffee-rails (~> 4.0.0) jbuilder (~> 1.2) jquery-rails rails (= 4.0.2) + rspec-rails (= 2.13.1) sass-rails (~> 4.0.0) sdoc + selenium-webdriver (= 2.35.1) sqlite3 therubyracer turbolinks diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ebcc3ac..f4e1499 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,4 +3,7 @@ class UsersController < ApplicationController def new end + def show + @user = User.find(param[:id]) + end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index e2b8e02..0000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,25 +0,0 @@ - - - - Leaguer - <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> - <%= javascript_include_tag "application", "data-turbolinks-track" => true %> - <%= csrf_meta_tags %> - - -
-

Leaguer

- <%= form_tag("/search", method: "get", :id => "search-bar") do %> - <%= text_field_tag(:query, nil, :placeholder => "Search") %> - <%= submit_tag("Go") %> - <% end %> -
- -<%= yield %> - - - - - diff --git a/config/application.rb b/config/application.rb index bf581b8..57c9163 100644 --- a/config/application.rb +++ b/config/application.rb @@ -12,6 +12,8 @@ module Leaguer # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. + I18n.enforce_available_locales = true + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. # config.time_zone = 'Central Time (US & Canada)' diff --git a/config/routes.rb b/config/routes.rb deleted file mode 100644 index f13c891..0000000 --- a/config/routes.rb +++ /dev/null @@ -1,70 +0,0 @@ -Leaguer::Application.routes.draw do - resources :pms - - resources :alerts - - resources :users - - resources :teams - - resources :matches - - resources :tournaments - - resources :servers - - # The priority is based upon order of creation: first created -> highest priority. - # See how all your routes lay out with "rake routes". - - # You can have the root of your site routed with "root" - # root 'welcome#index' - - # Example of regular route: - # get 'products/:id' => 'catalog#view' - - # Example of named route that can be invoked with purchase_url(id: product.id) - # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase - - # Example resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Example resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Example resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Example resource route with more complex sub-resources: - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', on: :collection - # end - # end - - # Example resource route with concerns: - # concern :toggleable do - # post 'toggle' - # end - # resources :posts, concerns: :toggleable - # resources :photos, concerns: :toggleable - - # Example resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end -end diff --git a/log/.keep b/log/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/controllers/.keep b/test/controllers/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/fixtures/.keep b/test/fixtures/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/helpers/.keep b/test/helpers/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/integration/.keep b/test/integration/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/mailers/.keep b/test/mailers/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/models/.keep b/test/models/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/test_helper.rb b/test/test_helper.rb deleted file mode 100644 index bc7e05d..0000000 --- a/test/test_helper.rb +++ /dev/null @@ -1,15 +0,0 @@ -ENV["RAILS_ENV"] ||= "test" -require File.expand_path('../../config/environment', __FILE__) -require 'rails/test_help' - -class ActiveSupport::TestCase - ActiveRecord::Migration.check_pending! - - # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. - # - # Note: You'll currently still have to declare fixtures explicitly in integration tests - # -- they do not yet inherit this setting - fixtures :all - - # Add more helper methods to be used by all tests here... -end -- cgit v1.1-4-g5e80