diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
commit | c93c9f837c09ba0385690fb1a228a9c506ca120c (patch) | |
tree | 19f115b0bc62fefc45f9c25ec4beeefee6429c8b | |
parent | 9003a9099719a771fbbb9d2e8a4bfb093f35929a (diff) | |
parent | 933199499f9adfa0347783c538a10b88ffb1b98b (diff) |
Merge branch 'clean2'
Conflicts:
app/assets/stylesheets/static.css.scss
app/controllers/static_controller.rb
-rw-r--r-- | app/assets/javascripts/main/homepage.js.coffee (renamed from app/assets/javascripts/static/homepage.js.coffee) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/static.js.coffee | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/main.css.scss | 11 | ||||
-rw-r--r-- | app/assets/stylesheets/static.css.scss | 14 | ||||
-rw-r--r-- | app/controllers/main_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/static_controller.rb | 4 | ||||
-rw-r--r-- | app/helpers/static_helper.rb | 2 | ||||
-rw-r--r-- | app/views/main/homepage.html.erb (renamed from app/views/static/homepage.html.erb) | 0 | ||||
-rw-r--r-- | config/routes.rb | 2 | ||||
-rw-r--r-- | db/migrate/20140423205436_create_simple_captcha_data.rb (renamed from db/migrate/20140422172559_create_simple_captcha_data.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005433_create_mailboxer.mailboxer_engine.rb (renamed from db/migrate/20140422212555_create_mailboxer.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005434_add_notified_object.mailboxer_engine.rb (renamed from db/migrate/20140422212556_add_notified_object.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005435_add_notification_code.mailboxer_engine.rb (renamed from db/migrate/20140422212557_add_notification_code.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005436_add_attachments.mailboxer_engine.rb (renamed from db/migrate/20140422212558_add_attachments.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005437_rename_receipts_read.mailboxer_engine.rb (renamed from db/migrate/20140422212559_rename_receipts_read.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005438_add_global_notification_support.mailboxer_engine.rb (renamed from db/migrate/20140422212560_add_global_notification_support.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005439_create_delayed_jobs.rb (renamed from db/migrate/20140422212602_create_delayed_jobs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005442_create_servers.rb (renamed from db/migrate/20140422212605_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005445_create_matches.rb (renamed from db/migrate/20140422212609_create_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005448_create_teams.rb (renamed from db/migrate/20140422212613_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005451_create_alerts.rb (renamed from db/migrate/20140422212616_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005454_create_pms.rb (renamed from db/migrate/20140422212619_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005457_create_tournaments.rb (renamed from db/migrate/20140422212623_create_tournaments.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005500_create_games.rb (renamed from db/migrate/20140422212627_create_games.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005503_create_users.rb (renamed from db/migrate/20140422212630_create_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005506_create_sessions.rb (renamed from db/migrate/20140422212634_create_sessions.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005509_create_brackets.rb (renamed from db/migrate/20140422212637_create_brackets.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005512_create_game_settings.rb (renamed from db/migrate/20140422212641_create_game_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005515_create_tournament_settings.rb (renamed from db/migrate/20140422212644_create_tournament_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005519_create_tournament_stages.rb (renamed from db/migrate/20140422212648_create_tournament_stages.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005523_create_statistics.rb (renamed from db/migrate/20140422212651_create_statistics.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005527_create_remote_usernames.rb (renamed from db/migrate/20140422212654_create_remote_usernames.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005530_create_bracket_matches.rb (renamed from db/migrate/20140422212657_create_bracket_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005533_create_api_requests.rb (renamed from db/migrate/20140422212701_create_api_requests.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005536_create_tournament_players_join_table.rb (renamed from db/migrate/20140422212704_create_tournament_players_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005539_create_tournament_hosts_join_table.rb (renamed from db/migrate/20140422212707_create_tournament_hosts_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005542_create_team_user_join_table.rb (renamed from db/migrate/20140422212711_create_team_user_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005544_create_match_team_join_table.rb (renamed from db/migrate/20140422212714_create_match_team_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424005552_add_hidden_attrs_to_user.rb (renamed from db/migrate/20140422212727_add_hidden_attrs_to_user.rb) | 0 | ||||
-rw-r--r-- | db/schema.rb | 2 | ||||
-rwxr-xr-x | generate.sh | 2 | ||||
-rw-r--r-- | test/controllers/static_controller_test.rb | 7 | ||||
-rw-r--r-- | test/helpers/static_helper_test.rb | 4 |
43 files changed, 16 insertions, 37 deletions
diff --git a/app/assets/javascripts/static/homepage.js.coffee b/app/assets/javascripts/main/homepage.js.coffee index e69de29..e69de29 100644 --- a/app/assets/javascripts/static/homepage.js.coffee +++ b/app/assets/javascripts/main/homepage.js.coffee diff --git a/app/assets/javascripts/static.js.coffee b/app/assets/javascripts/static.js.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/static.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss index a0d94c1..3859f53 100644 --- a/app/assets/stylesheets/main.css.scss +++ b/app/assets/stylesheets/main.css.scss @@ -1,3 +1,14 @@ // Place all the styles related to the main controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +.jumbotron { + background-color: #FFF; + box-shadow: 1px 1px 20px black; + width: 93%; + + p { + line-height: 1.5em; + } + +} diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss deleted file mode 100644 index 6732370..0000000 --- a/app/assets/stylesheets/static.css.scss +++ /dev/null @@ -1,14 +0,0 @@ -// Place all the styles related to the static controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -.jumbotron { - background-color: #FFF; - box-shadow: 1px 1px 20px black; - width: 93%; - - p { - line-height: 1.5em; - } - -} diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 6519d7b..0ba4d94 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -1,2 +1,4 @@ class MainController < ApplicationController + def homepage + end end diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb deleted file mode 100644 index 6fc9490..0000000 --- a/app/controllers/static_controller.rb +++ /dev/null @@ -1,4 +0,0 @@ -class StaticController < ApplicationController - def homepage - end -end diff --git a/app/helpers/static_helper.rb b/app/helpers/static_helper.rb deleted file mode 100644 index 8cfc9af..0000000 --- a/app/helpers/static_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module StaticHelper -end diff --git a/app/views/static/homepage.html.erb b/app/views/main/homepage.html.erb index 3ca8176..3ca8176 100644 --- a/app/views/static/homepage.html.erb +++ b/app/views/main/homepage.html.erb diff --git a/config/routes.rb b/config/routes.rb index 1ce6e05..d7807f0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -19,7 +19,7 @@ Leaguer::Application.routes.draw do resource :server, only: [:show, :edit, :update] - root to: 'static#homepage' + root to: 'main#homepage' get '/search', to: 'search#go' diff --git a/db/migrate/20140422172559_create_simple_captcha_data.rb b/db/migrate/20140423205436_create_simple_captcha_data.rb index 4573b20..4573b20 100644 --- a/db/migrate/20140422172559_create_simple_captcha_data.rb +++ b/db/migrate/20140423205436_create_simple_captcha_data.rb diff --git a/db/migrate/20140422212555_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140424005433_create_mailboxer.mailboxer_engine.rb index 690cec2..690cec2 100644 --- a/db/migrate/20140422212555_create_mailboxer.mailboxer_engine.rb +++ b/db/migrate/20140424005433_create_mailboxer.mailboxer_engine.rb diff --git a/db/migrate/20140422212556_add_notified_object.mailboxer_engine.rb b/db/migrate/20140424005434_add_notified_object.mailboxer_engine.rb index 7f41ac6..7f41ac6 100644 --- a/db/migrate/20140422212556_add_notified_object.mailboxer_engine.rb +++ b/db/migrate/20140424005434_add_notified_object.mailboxer_engine.rb diff --git a/db/migrate/20140422212557_add_notification_code.mailboxer_engine.rb b/db/migrate/20140424005435_add_notification_code.mailboxer_engine.rb index 04c12ef..04c12ef 100644 --- a/db/migrate/20140422212557_add_notification_code.mailboxer_engine.rb +++ b/db/migrate/20140424005435_add_notification_code.mailboxer_engine.rb diff --git a/db/migrate/20140422212558_add_attachments.mailboxer_engine.rb b/db/migrate/20140424005436_add_attachments.mailboxer_engine.rb index b8d6588..b8d6588 100644 --- a/db/migrate/20140422212558_add_attachments.mailboxer_engine.rb +++ b/db/migrate/20140424005436_add_attachments.mailboxer_engine.rb diff --git a/db/migrate/20140422212559_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140424005437_rename_receipts_read.mailboxer_engine.rb index 9ce904f..9ce904f 100644 --- a/db/migrate/20140422212559_rename_receipts_read.mailboxer_engine.rb +++ b/db/migrate/20140424005437_rename_receipts_read.mailboxer_engine.rb diff --git a/db/migrate/20140422212560_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140424005438_add_global_notification_support.mailboxer_engine.rb index 60f67ab..60f67ab 100644 --- a/db/migrate/20140422212560_add_global_notification_support.mailboxer_engine.rb +++ b/db/migrate/20140424005438_add_global_notification_support.mailboxer_engine.rb diff --git a/db/migrate/20140422212602_create_delayed_jobs.rb b/db/migrate/20140424005439_create_delayed_jobs.rb index ec0dd93..ec0dd93 100644 --- a/db/migrate/20140422212602_create_delayed_jobs.rb +++ b/db/migrate/20140424005439_create_delayed_jobs.rb diff --git a/db/migrate/20140422212605_create_servers.rb b/db/migrate/20140424005442_create_servers.rb index fbe1b02..fbe1b02 100644 --- a/db/migrate/20140422212605_create_servers.rb +++ b/db/migrate/20140424005442_create_servers.rb diff --git a/db/migrate/20140422212609_create_matches.rb b/db/migrate/20140424005445_create_matches.rb index bac92d1..bac92d1 100644 --- a/db/migrate/20140422212609_create_matches.rb +++ b/db/migrate/20140424005445_create_matches.rb diff --git a/db/migrate/20140422212613_create_teams.rb b/db/migrate/20140424005448_create_teams.rb index dd8397d..dd8397d 100644 --- a/db/migrate/20140422212613_create_teams.rb +++ b/db/migrate/20140424005448_create_teams.rb diff --git a/db/migrate/20140422212616_create_alerts.rb b/db/migrate/20140424005451_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140422212616_create_alerts.rb +++ b/db/migrate/20140424005451_create_alerts.rb diff --git a/db/migrate/20140422212619_create_pms.rb b/db/migrate/20140424005454_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140422212619_create_pms.rb +++ b/db/migrate/20140424005454_create_pms.rb diff --git a/db/migrate/20140422212623_create_tournaments.rb b/db/migrate/20140424005457_create_tournaments.rb index 716871f..716871f 100644 --- a/db/migrate/20140422212623_create_tournaments.rb +++ b/db/migrate/20140424005457_create_tournaments.rb diff --git a/db/migrate/20140422212627_create_games.rb b/db/migrate/20140424005500_create_games.rb index 46ed30d..46ed30d 100644 --- a/db/migrate/20140422212627_create_games.rb +++ b/db/migrate/20140424005500_create_games.rb diff --git a/db/migrate/20140422212630_create_users.rb b/db/migrate/20140424005503_create_users.rb index 8032870..8032870 100644 --- a/db/migrate/20140422212630_create_users.rb +++ b/db/migrate/20140424005503_create_users.rb diff --git a/db/migrate/20140422212634_create_sessions.rb b/db/migrate/20140424005506_create_sessions.rb index f667f1e..f667f1e 100644 --- a/db/migrate/20140422212634_create_sessions.rb +++ b/db/migrate/20140424005506_create_sessions.rb diff --git a/db/migrate/20140422212637_create_brackets.rb b/db/migrate/20140424005509_create_brackets.rb index 8813bf2..8813bf2 100644 --- a/db/migrate/20140422212637_create_brackets.rb +++ b/db/migrate/20140424005509_create_brackets.rb diff --git a/db/migrate/20140422212641_create_game_settings.rb b/db/migrate/20140424005512_create_game_settings.rb index 06fb72e..06fb72e 100644 --- a/db/migrate/20140422212641_create_game_settings.rb +++ b/db/migrate/20140424005512_create_game_settings.rb diff --git a/db/migrate/20140422212644_create_tournament_settings.rb b/db/migrate/20140424005515_create_tournament_settings.rb index e56697f..e56697f 100644 --- a/db/migrate/20140422212644_create_tournament_settings.rb +++ b/db/migrate/20140424005515_create_tournament_settings.rb diff --git a/db/migrate/20140422212648_create_tournament_stages.rb b/db/migrate/20140424005519_create_tournament_stages.rb index e3668cb..e3668cb 100644 --- a/db/migrate/20140422212648_create_tournament_stages.rb +++ b/db/migrate/20140424005519_create_tournament_stages.rb diff --git a/db/migrate/20140422212651_create_statistics.rb b/db/migrate/20140424005523_create_statistics.rb index cc2e97d..cc2e97d 100644 --- a/db/migrate/20140422212651_create_statistics.rb +++ b/db/migrate/20140424005523_create_statistics.rb diff --git a/db/migrate/20140422212654_create_remote_usernames.rb b/db/migrate/20140424005527_create_remote_usernames.rb index e265985..e265985 100644 --- a/db/migrate/20140422212654_create_remote_usernames.rb +++ b/db/migrate/20140424005527_create_remote_usernames.rb diff --git a/db/migrate/20140422212657_create_bracket_matches.rb b/db/migrate/20140424005530_create_bracket_matches.rb index 3323e31..3323e31 100644 --- a/db/migrate/20140422212657_create_bracket_matches.rb +++ b/db/migrate/20140424005530_create_bracket_matches.rb diff --git a/db/migrate/20140422212701_create_api_requests.rb b/db/migrate/20140424005533_create_api_requests.rb index 544c330..544c330 100644 --- a/db/migrate/20140422212701_create_api_requests.rb +++ b/db/migrate/20140424005533_create_api_requests.rb diff --git a/db/migrate/20140422212704_create_tournament_players_join_table.rb b/db/migrate/20140424005536_create_tournament_players_join_table.rb index be240e8..be240e8 100644 --- a/db/migrate/20140422212704_create_tournament_players_join_table.rb +++ b/db/migrate/20140424005536_create_tournament_players_join_table.rb diff --git a/db/migrate/20140422212707_create_tournament_hosts_join_table.rb b/db/migrate/20140424005539_create_tournament_hosts_join_table.rb index 7521d89..7521d89 100644 --- a/db/migrate/20140422212707_create_tournament_hosts_join_table.rb +++ b/db/migrate/20140424005539_create_tournament_hosts_join_table.rb diff --git a/db/migrate/20140422212711_create_team_user_join_table.rb b/db/migrate/20140424005542_create_team_user_join_table.rb index f3b57fc..f3b57fc 100644 --- a/db/migrate/20140422212711_create_team_user_join_table.rb +++ b/db/migrate/20140424005542_create_team_user_join_table.rb diff --git a/db/migrate/20140422212714_create_match_team_join_table.rb b/db/migrate/20140424005544_create_match_team_join_table.rb index c2ed1b7..c2ed1b7 100644 --- a/db/migrate/20140422212714_create_match_team_join_table.rb +++ b/db/migrate/20140424005544_create_match_team_join_table.rb diff --git a/db/migrate/20140422212727_add_hidden_attrs_to_user.rb b/db/migrate/20140424005552_add_hidden_attrs_to_user.rb index 9b5c505..9b5c505 100644 --- a/db/migrate/20140422212727_add_hidden_attrs_to_user.rb +++ b/db/migrate/20140424005552_add_hidden_attrs_to_user.rb diff --git a/db/schema.rb b/db/schema.rb index a160f22..c014e84 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140422212727) do +ActiveRecord::Schema.define(version: 20140424005552) do create_table "alerts", force: true do |t| t.integer "author_id" diff --git a/generate.sh b/generate.sh index 5fe3c74..74976d3 100755 --- a/generate.sh +++ b/generate.sh @@ -29,6 +29,7 @@ cd "$srcdir" export RAILS_ENV=development git rm -rf -- app test config/routes.rb db/migrate || true +git rm -f -- config/initializers/mailboxer.rb || true git checkout clean-start -- app test config/routes.rb bundle install @@ -73,7 +74,6 @@ bundle exec rails generate migration CreateMatchTeamJoinTable matches teams # Just controllers bundle exec rails generate controller search bundle exec rails generate controller main -bundle exec rails generate controller static # Migrations # By having these separate from the original 'generate', it makes it diff --git a/test/controllers/static_controller_test.rb b/test/controllers/static_controller_test.rb deleted file mode 100644 index e62ae2a..0000000 --- a/test/controllers/static_controller_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class StaticControllerTest < ActionController::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/helpers/static_helper_test.rb b/test/helpers/static_helper_test.rb deleted file mode 100644 index 3b96f2b..0000000 --- a/test/helpers/static_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class StaticHelperTest < ActionView::TestCase -end |