summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomer Kimia <tkimia@purdue.edu>2014-03-02 11:11:04 -0500
committerTomer Kimia <tkimia@purdue.edu>2014-03-02 11:11:04 -0500
commitfbe54253ea8c31796a16d0fb90b7d3b5be717b1c (patch)
tree5eb5778cc9dad8312318f968eee08b46b0299823
parent4dcb9de406dd032ecb37109402c4475d96d2a05a (diff)
added preliminary homepage
-rw-r--r--app/assets/javascripts/static.js.coffee3
-rw-r--r--app/assets/stylesheets/static.css.scss3
-rw-r--r--app/controllers/static_controller.rb2
-rw-r--r--app/helpers/static_helper.rb2
-rw-r--r--db/migrate/20140304015824_create_servers.rb (renamed from db/migrate/20140304015739_create_servers.rb)0
-rw-r--r--db/migrate/20140304015826_create_tournaments.rb (renamed from db/migrate/20140304015742_create_tournaments.rb)0
-rw-r--r--db/migrate/20140304015828_create_matches.rb (renamed from db/migrate/20140304015744_create_matches.rb)0
-rw-r--r--db/migrate/20140304015831_create_teams.rb (renamed from db/migrate/20140304015746_create_teams.rb)0
-rw-r--r--db/migrate/20140304015835_create_users.rb (renamed from db/migrate/20140304015751_create_users.rb)0
-rw-r--r--db/migrate/20140304015837_create_user_team_pairs.rb (renamed from db/migrate/20140304015753_create_user_team_pairs.rb)0
-rw-r--r--db/migrate/20140304015839_create_team_match_pairs.rb (renamed from db/migrate/20140304015755_create_team_match_pairs.rb)0
-rw-r--r--db/migrate/20140304015842_create_alerts.rb (renamed from db/migrate/20140304015757_create_alerts.rb)0
-rw-r--r--db/migrate/20140304015844_create_pms.rb (renamed from db/migrate/20140304015800_create_pms.rb)0
-rw-r--r--db/migrate/20140304015846_create_games.rb (renamed from db/migrate/20140304015802_create_games.rb)0
-rw-r--r--db/migrate/20140304015849_create_game_attributes.rb (renamed from db/migrate/20140304015804_create_game_attributes.rb)0
-rw-r--r--db/migrate/20140304015851_create_server_settings.rb (renamed from db/migrate/20140304015807_create_server_settings.rb)0
-rw-r--r--db/migrate/20140304015859_create_tournament_options.rb (renamed from db/migrate/20140304015813_create_tournament_options.rb)0
-rw-r--r--db/schema.rb2
-rwxr-xr-xgenerate.sh1
-rw-r--r--spec/controllers/static_controller_spec.rb5
-rw-r--r--spec/helpers/static_helper_spec.rb15
21 files changed, 32 insertions, 1 deletions
diff --git a/app/assets/javascripts/static.js.coffee b/app/assets/javascripts/static.js.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/static.js.coffee
@@ -0,0 +1,3 @@
+# 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/static.css.scss b/app/assets/stylesheets/static.css.scss
new file mode 100644
index 0000000..5a803c8
--- /dev/null
+++ b/app/assets/stylesheets/static.css.scss
@@ -0,0 +1,3 @@
+// 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/
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
new file mode 100644
index 0000000..c6df11e
--- /dev/null
+++ b/app/controllers/static_controller.rb
@@ -0,0 +1,2 @@
+class StaticController < ApplicationController
+end
diff --git a/app/helpers/static_helper.rb b/app/helpers/static_helper.rb
new file mode 100644
index 0000000..8cfc9af
--- /dev/null
+++ b/app/helpers/static_helper.rb
@@ -0,0 +1,2 @@
+module StaticHelper
+end
diff --git a/db/migrate/20140304015739_create_servers.rb b/db/migrate/20140304015824_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304015739_create_servers.rb
+++ b/db/migrate/20140304015824_create_servers.rb
diff --git a/db/migrate/20140304015742_create_tournaments.rb b/db/migrate/20140304015826_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140304015742_create_tournaments.rb
+++ b/db/migrate/20140304015826_create_tournaments.rb
diff --git a/db/migrate/20140304015744_create_matches.rb b/db/migrate/20140304015828_create_matches.rb
index 6c0c157..6c0c157 100644
--- a/db/migrate/20140304015744_create_matches.rb
+++ b/db/migrate/20140304015828_create_matches.rb
diff --git a/db/migrate/20140304015746_create_teams.rb b/db/migrate/20140304015831_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304015746_create_teams.rb
+++ b/db/migrate/20140304015831_create_teams.rb
diff --git a/db/migrate/20140304015751_create_users.rb b/db/migrate/20140304015835_create_users.rb
index f0986d4..f0986d4 100644
--- a/db/migrate/20140304015751_create_users.rb
+++ b/db/migrate/20140304015835_create_users.rb
diff --git a/db/migrate/20140304015753_create_user_team_pairs.rb b/db/migrate/20140304015837_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304015753_create_user_team_pairs.rb
+++ b/db/migrate/20140304015837_create_user_team_pairs.rb
diff --git a/db/migrate/20140304015755_create_team_match_pairs.rb b/db/migrate/20140304015839_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304015755_create_team_match_pairs.rb
+++ b/db/migrate/20140304015839_create_team_match_pairs.rb
diff --git a/db/migrate/20140304015757_create_alerts.rb b/db/migrate/20140304015842_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304015757_create_alerts.rb
+++ b/db/migrate/20140304015842_create_alerts.rb
diff --git a/db/migrate/20140304015800_create_pms.rb b/db/migrate/20140304015844_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304015800_create_pms.rb
+++ b/db/migrate/20140304015844_create_pms.rb
diff --git a/db/migrate/20140304015802_create_games.rb b/db/migrate/20140304015846_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140304015802_create_games.rb
+++ b/db/migrate/20140304015846_create_games.rb
diff --git a/db/migrate/20140304015804_create_game_attributes.rb b/db/migrate/20140304015849_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304015804_create_game_attributes.rb
+++ b/db/migrate/20140304015849_create_game_attributes.rb
diff --git a/db/migrate/20140304015807_create_server_settings.rb b/db/migrate/20140304015851_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304015807_create_server_settings.rb
+++ b/db/migrate/20140304015851_create_server_settings.rb
diff --git a/db/migrate/20140304015813_create_tournament_options.rb b/db/migrate/20140304015859_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304015813_create_tournament_options.rb
+++ b/db/migrate/20140304015859_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index ae688b1..4e1da7f 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: 20140304015813) do
+ActiveRecord::Schema.define(version: 20140304015859) do
create_table "alerts", force: true do |t|
t.integer "author_id"
diff --git a/generate.sh b/generate.sh
index 2bf027a..807b9ef 100755
--- a/generate.sh
+++ b/generate.sh
@@ -28,6 +28,7 @@ bundle exec rails generate model game_attribute game:references key:text type:in
bundle exec rails generate model server_settings $NOTEST
bundle exec rails generate controller search $NOTEST
bundle exec rails generate controller main $NOTEST
+bundle exec rails generate controller static $NOTEST
#for the tournament controller to generate options
bundle exec rails generate model tournament_option $NOTEST
diff --git a/spec/controllers/static_controller_spec.rb b/spec/controllers/static_controller_spec.rb
new file mode 100644
index 0000000..a3db7c0
--- /dev/null
+++ b/spec/controllers/static_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe StaticController do
+
+end
diff --git a/spec/helpers/static_helper_spec.rb b/spec/helpers/static_helper_spec.rb
new file mode 100644
index 0000000..6a1bf5c
--- /dev/null
+++ b/spec/helpers/static_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the StaticHelper. For example:
+#
+# describe StaticHelper do
+# describe "string concat" do
+# it "concats two strings with spaces" do
+# helper.concat_strings("this","that").should == "this that"
+# end
+# end
+# end
+describe StaticHelper do
+ pending "add some examples to (or delete) #{__FILE__}"
+end