From 6e20d92989739bde287c6a07c03ae3f70755660b Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Thu, 27 Feb 2014 17:56:31 -0500 Subject: Booted the strap --- Gemfile | 2 ++ Gemfile.lock | 3 +++ db/migrate/20140304014838_create_servers.rb | 8 -------- db/migrate/20140304014840_create_tournaments.rb | 8 -------- db/migrate/20140304014842_create_matches.rb | 9 --------- db/migrate/20140304014844_create_teams.rb | 8 -------- db/migrate/20140304014846_create_users.rb | 11 ----------- db/migrate/20140304014848_create_user_team_pairs.rb | 10 ---------- db/migrate/20140304014850_create_team_match_pairs.rb | 10 ---------- db/migrate/20140304014852_create_alerts.rb | 10 ---------- db/migrate/20140304014855_create_pms.rb | 11 ----------- db/migrate/20140304014857_create_server_settings.rb | 8 -------- db/migrate/20140304014908_create_servers.rb | 8 ++++++++ db/migrate/20140304014910_create_tournaments.rb | 8 ++++++++ db/migrate/20140304014913_create_matches.rb | 9 +++++++++ db/migrate/20140304014915_create_teams.rb | 8 ++++++++ db/migrate/20140304014917_create_users.rb | 11 +++++++++++ db/migrate/20140304014919_create_user_team_pairs.rb | 10 ++++++++++ db/migrate/20140304014921_create_team_match_pairs.rb | 10 ++++++++++ db/migrate/20140304014923_create_alerts.rb | 10 ++++++++++ db/migrate/20140304014926_create_pms.rb | 11 +++++++++++ db/migrate/20140304014928_create_server_settings.rb | 8 ++++++++ db/schema.rb | 2 +- generate.sh | 5 ++++- 24 files changed, 103 insertions(+), 95 deletions(-) delete mode 100644 db/migrate/20140304014838_create_servers.rb delete mode 100644 db/migrate/20140304014840_create_tournaments.rb delete mode 100644 db/migrate/20140304014842_create_matches.rb delete mode 100644 db/migrate/20140304014844_create_teams.rb delete mode 100644 db/migrate/20140304014846_create_users.rb delete mode 100644 db/migrate/20140304014848_create_user_team_pairs.rb delete mode 100644 db/migrate/20140304014850_create_team_match_pairs.rb delete mode 100644 db/migrate/20140304014852_create_alerts.rb delete mode 100644 db/migrate/20140304014855_create_pms.rb delete mode 100644 db/migrate/20140304014857_create_server_settings.rb create mode 100644 db/migrate/20140304014908_create_servers.rb create mode 100644 db/migrate/20140304014910_create_tournaments.rb create mode 100644 db/migrate/20140304014913_create_matches.rb create mode 100644 db/migrate/20140304014915_create_teams.rb create mode 100644 db/migrate/20140304014917_create_users.rb create mode 100644 db/migrate/20140304014919_create_user_team_pairs.rb create mode 100644 db/migrate/20140304014921_create_team_match_pairs.rb create mode 100644 db/migrate/20140304014923_create_alerts.rb create mode 100644 db/migrate/20140304014926_create_pms.rb create mode 100644 db/migrate/20140304014928_create_server_settings.rb diff --git a/Gemfile b/Gemfile index 630e133..f4e5b09 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,8 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.0.2' +gem 'bootstrap-sass' + # Use sqlite3 as the database for Active Record gem 'sqlite3' diff --git a/Gemfile.lock b/Gemfile.lock index 564ce87..75d27b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,6 +27,8 @@ GEM tzinfo (~> 0.3.37) arel (4.0.2) atomic (1.1.14) + bootstrap-sass (3.1.1.0) + sass (~> 3.2) builder (3.1.4) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -113,6 +115,7 @@ PLATFORMS ruby DEPENDENCIES + bootstrap-sass coffee-rails (~> 4.0.0) jbuilder (~> 1.2) jquery-rails diff --git a/db/migrate/20140304014838_create_servers.rb b/db/migrate/20140304014838_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140304014838_create_servers.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014840_create_tournaments.rb b/db/migrate/20140304014840_create_tournaments.rb deleted file mode 100644 index 2095590..0000000 --- a/db/migrate/20140304014840_create_tournaments.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014842_create_matches.rb b/db/migrate/20140304014842_create_matches.rb deleted file mode 100644 index 6c0c157..0000000 --- a/db/migrate/20140304014842_create_matches.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.references :tournament, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014844_create_teams.rb b/db/migrate/20140304014844_create_teams.rb deleted file mode 100644 index dd8397d..0000000 --- a/db/migrate/20140304014844_create_teams.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014846_create_users.rb b/db/migrate/20140304014846_create_users.rb deleted file mode 100644 index 6a500e5..0000000 --- a/db/migrate/20140304014846_create_users.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.text :name - t.text :pw_hash - t.integer :groups - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014848_create_user_team_pairs.rb b/db/migrate/20140304014848_create_user_team_pairs.rb deleted file mode 100644 index 2c492ac..0000000 --- a/db/migrate/20140304014848_create_user_team_pairs.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateUserTeamPairs < ActiveRecord::Migration - def change - create_table :user_team_pairs do |t| - t.references :user, index: true - t.references :team, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014850_create_team_match_pairs.rb b/db/migrate/20140304014850_create_team_match_pairs.rb deleted file mode 100644 index 8fac07e..0000000 --- a/db/migrate/20140304014850_create_team_match_pairs.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateTeamMatchPairs < ActiveRecord::Migration - def change - create_table :team_match_pairs do |t| - t.references :team, index: true - t.references :match, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014852_create_alerts.rb b/db/migrate/20140304014852_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140304014852_create_alerts.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateAlerts < ActiveRecord::Migration - def change - create_table :alerts do |t| - t.references :author, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014855_create_pms.rb b/db/migrate/20140304014855_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140304014855_create_pms.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreatePms < ActiveRecord::Migration - def change - create_table :pms do |t| - t.references :author, index: true - t.references :recipient, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014857_create_server_settings.rb b/db/migrate/20140304014857_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140304014857_create_server_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServerSettings < ActiveRecord::Migration - def change - create_table :server_settings do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014908_create_servers.rb b/db/migrate/20140304014908_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140304014908_create_servers.rb @@ -0,0 +1,8 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014910_create_tournaments.rb b/db/migrate/20140304014910_create_tournaments.rb new file mode 100644 index 0000000..2095590 --- /dev/null +++ b/db/migrate/20140304014910_create_tournaments.rb @@ -0,0 +1,8 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014913_create_matches.rb b/db/migrate/20140304014913_create_matches.rb new file mode 100644 index 0000000..6c0c157 --- /dev/null +++ b/db/migrate/20140304014913_create_matches.rb @@ -0,0 +1,9 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.references :tournament, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014915_create_teams.rb b/db/migrate/20140304014915_create_teams.rb new file mode 100644 index 0000000..dd8397d --- /dev/null +++ b/db/migrate/20140304014915_create_teams.rb @@ -0,0 +1,8 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014917_create_users.rb b/db/migrate/20140304014917_create_users.rb new file mode 100644 index 0000000..6a500e5 --- /dev/null +++ b/db/migrate/20140304014917_create_users.rb @@ -0,0 +1,11 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.text :name + t.text :pw_hash + t.integer :groups + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014919_create_user_team_pairs.rb b/db/migrate/20140304014919_create_user_team_pairs.rb new file mode 100644 index 0000000..2c492ac --- /dev/null +++ b/db/migrate/20140304014919_create_user_team_pairs.rb @@ -0,0 +1,10 @@ +class CreateUserTeamPairs < ActiveRecord::Migration + def change + create_table :user_team_pairs do |t| + t.references :user, index: true + t.references :team, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014921_create_team_match_pairs.rb b/db/migrate/20140304014921_create_team_match_pairs.rb new file mode 100644 index 0000000..8fac07e --- /dev/null +++ b/db/migrate/20140304014921_create_team_match_pairs.rb @@ -0,0 +1,10 @@ +class CreateTeamMatchPairs < ActiveRecord::Migration + def change + create_table :team_match_pairs do |t| + t.references :team, index: true + t.references :match, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014923_create_alerts.rb b/db/migrate/20140304014923_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140304014923_create_alerts.rb @@ -0,0 +1,10 @@ +class CreateAlerts < ActiveRecord::Migration + def change + create_table :alerts do |t| + t.references :author, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014926_create_pms.rb b/db/migrate/20140304014926_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140304014926_create_pms.rb @@ -0,0 +1,11 @@ +class CreatePms < ActiveRecord::Migration + def change + create_table :pms do |t| + t.references :author, index: true + t.references :recipient, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014928_create_server_settings.rb b/db/migrate/20140304014928_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140304014928_create_server_settings.rb @@ -0,0 +1,8 @@ +class CreateServerSettings < ActiveRecord::Migration + def change + create_table :server_settings do |t| + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 88dfa1a..5d839f4 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: 20140304014857) do +ActiveRecord::Schema.define(version: 20140304014928) do create_table "alerts", force: true do |t| t.integer "author_id" diff --git a/generate.sh b/generate.sh index 666869c..36a74ef 100755 --- a/generate.sh +++ b/generate.sh @@ -1,6 +1,9 @@ #!/bin/bash -# +# The generate.sh bash file is used to generate all of the necessary .rb files to run the website +# + + # To Start Rails Server: # bundle exec rails server # -- cgit v1.2.3