From 94a5654371812905c154f29cef393d42f13c5eaa Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 18 Feb 2014 18:16:28 -0500 Subject: Added the generate shell command. Please do not commit the generated files. --- generate.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 generate.sh (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh new file mode 100755 index 0000000..04a1294 --- /dev/null +++ b/generate.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +bundle exec rails generate scaffold server +bundle exec rails generate scaffold tournament +bundle exec rails generate scaffold match +bundle exec rails generate scaffold team +bundle exec rails generate scaffold user +#bundle exec rails generate scaffold -- cgit v1.2.3-2-g168b From 1b95d76d2bded709f512ccdca851388b8691708f Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 18 Feb 2014 18:34:50 -0500 Subject: Updated generate and added basic instruction block comment. --- generate.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 04a1294..95f00cc 100755 --- a/generate.sh +++ b/generate.sh @@ -1,8 +1,18 @@ #!/bin/bash +# +# To Start Rails Server: +# bundle exec rails server +# +# +# + + bundle exec rails generate scaffold server bundle exec rails generate scaffold tournament bundle exec rails generate scaffold match bundle exec rails generate scaffold team bundle exec rails generate scaffold user +bundle exec rake db:drop RAILS_ENV=development +bundle exec rake db:migrate RAILS_ENV=development #bundle exec rails generate scaffold -- cgit v1.2.3-2-g168b From 96b97d691f6889004c38bef15411bc27e448fda1 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 18 Feb 2014 20:42:51 -0500 Subject: Changes to generate.sh --- generate.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 95f00cc..28d1936 100755 --- a/generate.sh +++ b/generate.sh @@ -7,12 +7,19 @@ # # - +set -x bundle exec rails generate scaffold server bundle exec rails generate scaffold tournament -bundle exec rails generate scaffold match -bundle exec rails generate scaffold team -bundle exec rails generate scaffold user +bundle exec rails generate scaffold match tournament:reference +bundle exec rails generate scaffold team +bundle exec rails generate scaffold user name:text pw_hash:varchar groups:int +bundle exec rails generate model user_team_pair user:reference team:reference +bundle exec rails generate model team_match_pair team:reference match:reference +bundle exec rails generate scaffold alert author:reference message:text +bundle exec rails generate scaffold pm author:reference recipient:reference message:text +bundle exec rails generate model server_settings +bundle exec rails generate controller search +bundle exec rails generate controller main bundle exec rake db:drop RAILS_ENV=development bundle exec rake db:migrate RAILS_ENV=development #bundle exec rails generate scaffold -- cgit v1.2.3-2-g168b From cd1fabe40ca4d290df33a2590f3a1f2072103972 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Thu, 20 Feb 2014 17:13:51 -0500 Subject: fix datatype names in generate.sh --- generate.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 28d1936..666869c 100755 --- a/generate.sh +++ b/generate.sh @@ -10,13 +10,13 @@ set -x bundle exec rails generate scaffold server bundle exec rails generate scaffold tournament -bundle exec rails generate scaffold match tournament:reference +bundle exec rails generate scaffold match tournament:references bundle exec rails generate scaffold team -bundle exec rails generate scaffold user name:text pw_hash:varchar groups:int -bundle exec rails generate model user_team_pair user:reference team:reference -bundle exec rails generate model team_match_pair team:reference match:reference -bundle exec rails generate scaffold alert author:reference message:text -bundle exec rails generate scaffold pm author:reference recipient:reference message:text +bundle exec rails generate scaffold user name:text pw_hash:text groups:integer +bundle exec rails generate model user_team_pair user:references team:references +bundle exec rails generate model team_match_pair team:references match:references +bundle exec rails generate scaffold alert author:references message:text +bundle exec rails generate scaffold pm author:references recipient:references message:text bundle exec rails generate model server_settings bundle exec rails generate controller search bundle exec rails generate controller main -- cgit v1.2.3-2-g168b From 8e3e88f52c1f2d73acdcb7fdf60326b5f7717068 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Wed, 26 Feb 2014 20:07:42 -0500 Subject: Possibly broke everything. Added another model for populating tournament options. --- generate.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 666869c..52d0f90 100755 --- a/generate.sh +++ b/generate.sh @@ -4,7 +4,8 @@ # To Start Rails Server: # bundle exec rails server # -# +# To Clear the Generated Files: +# # set -x @@ -20,6 +21,11 @@ bundle exec rails generate scaffold pm author:references recipient:references me bundle exec rails generate model server_settings bundle exec rails generate controller search bundle exec rails generate controller main + +#for the tournament controller to generate options +bundle exec rails generate model tournament_options + bundle exec rake db:drop RAILS_ENV=development bundle exec rake db:migrate RAILS_ENV=development + #bundle exec rails generate scaffold -- cgit v1.2.3-2-g168b From 3a7b14f4a51c0fdb8b71720f361a0a8ccf080325 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 27 Feb 2014 16:59:04 -0500 Subject: add game types --- generate.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 52d0f90..7dbb444 100755 --- a/generate.sh +++ b/generate.sh @@ -5,7 +5,7 @@ # bundle exec rails server # # To Clear the Generated Files: -# +# git clean -df # set -x @@ -18,6 +18,8 @@ bundle exec rails generate model user_team_pair user:references team:references bundle exec rails generate model team_match_pair team:references match:references bundle exec rails generate scaffold alert author:references message:text bundle exec rails generate scaffold pm author:references recipient:references message:text +bundle exec rails generate scaffold game name:text +bundle exec rails generate model game_attribute game:references key:text type:integer bundle exec rails generate model server_settings bundle exec rails generate controller search bundle exec rails generate controller main -- cgit v1.2.3-2-g168b From de40ec53e8b80d8d880214183f19ea93172a0026 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 27 Feb 2014 17:02:10 -0500 Subject: give tournaments a game type --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 7dbb444..b384813 100755 --- a/generate.sh +++ b/generate.sh @@ -10,7 +10,7 @@ set -x bundle exec rails generate scaffold server -bundle exec rails generate scaffold tournament +bundle exec rails generate scaffold tournament game:references bundle exec rails generate scaffold match tournament:references bundle exec rails generate scaffold team bundle exec rails generate scaffold user name:text pw_hash:text groups:integer -- cgit v1.2.3-2-g168b From f3f17dcd9755020276062caae7c0677eff88cb2f Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Thu, 27 Feb 2014 17:41:59 -0500 Subject: Added the Games Attributes stuff. --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index b384813..77d6cb9 100755 --- a/generate.sh +++ b/generate.sh @@ -18,7 +18,7 @@ bundle exec rails generate model user_team_pair user:references team:references bundle exec rails generate model team_match_pair team:references match:references bundle exec rails generate scaffold alert author:references message:text bundle exec rails generate scaffold pm author:references recipient:references message:text -bundle exec rails generate scaffold game name:text +bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer bundle exec rails generate model game_attribute game:references key:text type:integer bundle exec rails generate model server_settings bundle exec rails generate controller search -- cgit v1.2.3-2-g168b From 068e95231c3d2cee113cf77af67ce785d853429e Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Thu, 27 Feb 2014 17:44:37 -0500 Subject: Added the seeding to generation. --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 77d6cb9..9c6a1ab 100755 --- a/generate.sh +++ b/generate.sh @@ -29,5 +29,5 @@ bundle exec rails generate model tournament_options bundle exec rake db:drop RAILS_ENV=development bundle exec rake db:migrate RAILS_ENV=development - +bundle exec rake db:seed #bundle exec rails generate scaffold -- cgit v1.2.3-2-g168b From 6e20d92989739bde287c6a07c03ae3f70755660b Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Thu, 27 Feb 2014 17:56:31 -0500 Subject: Booted the strap --- generate.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'generate.sh') 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-2-g168b From 2eb242f3e5b1f1ab66d84556cabcad965fe387aa Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sat, 1 Mar 2014 20:23:29 -0500 Subject: changed the user section of the generate --- generate.sh | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 07a7688..2bf027a 100755 --- a/generate.sh +++ b/generate.sh @@ -10,25 +10,27 @@ # To Clear the Generated Files: # git clean -df # +NOTEST='--skip-test-unit' set -x -bundle exec rails generate scaffold server -bundle exec rails generate scaffold tournament game:references -bundle exec rails generate scaffold match tournament:references -bundle exec rails generate scaffold team -bundle exec rails generate scaffold user name:text pw_hash:text groups:integer -bundle exec rails generate model user_team_pair user:references team:references -bundle exec rails generate model team_match_pair team:references match:references -bundle exec rails generate scaffold alert author:references message:text -bundle exec rails generate scaffold pm author:references recipient:references message:text -bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer -bundle exec rails generate model game_attribute game:references key:text type:integer -bundle exec rails generate model server_settings -bundle exec rails generate controller search -bundle exec rails generate controller main +bundle exec rails generate scaffold server $NOTEST +bundle exec rails generate scaffold tournament game:references $NOTEST +bundle exec rails generate scaffold match tournament:references $NOTEST +bundle exec rails generate scaffold team $NOTEST +bundle exec rails generate controller users $NOTEST +bundle exec rails generate model user name:string email:string user_name:string $NOTEST +bundle exec rails generate model user_team_pair user:references team:references $NOTEST +bundle exec rails generate model team_match_pair team:references match:references $NOTEST +bundle exec rails generate scaffold alert author:references message:text $NOTEST +bundle exec rails generate scaffold pm author:references recipient:references message:text $NOTEST +bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer $NOTEST +bundle exec rails generate model game_attribute game:references key:text type:integer $NOTEST +bundle exec rails generate model server_settings $NOTEST +bundle exec rails generate controller search $NOTEST +bundle exec rails generate controller main $NOTEST #for the tournament controller to generate options -bundle exec rails generate model tournament_options +bundle exec rails generate model tournament_option $NOTEST bundle exec rake db:drop RAILS_ENV=development bundle exec rake db:migrate RAILS_ENV=development -- cgit v1.2.3-2-g168b From fbe54253ea8c31796a16d0fb90b7d3b5be717b1c Mon Sep 17 00:00:00 2001 From: Tomer Kimia Date: Sun, 2 Mar 2014 11:11:04 -0500 Subject: added preliminary homepage --- generate.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'generate.sh') 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 -- cgit v1.2.3-2-g168b From eaf3d3cddf418c560c9619f722ea1dbc5d6cc61a Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sun, 2 Mar 2014 15:59:50 -0500 Subject: currently adding Session controller and view --- generate.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 807b9ef..7f70d56 100755 --- a/generate.sh +++ b/generate.sh @@ -18,6 +18,7 @@ bundle exec rails generate scaffold tournament game:references $NOTEST bundle exec rails generate scaffold match tournament:references $NOTEST bundle exec rails generate scaffold team $NOTEST bundle exec rails generate controller users $NOTEST +bundle exec rails generate controller Sessions bundle exec rails generate model user name:string email:string user_name:string $NOTEST bundle exec rails generate model user_team_pair user:references team:references $NOTEST bundle exec rails generate model team_match_pair team:references match:references $NOTEST -- cgit v1.2.3-2-g168b From c7469584f3fa51666d5df074d012741cbb2f3663 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Sun, 2 Mar 2014 19:10:29 -0500 Subject: Added --force flags for parts of the generator. --- generate.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 7f70d56..ea96b9b 100755 --- a/generate.sh +++ b/generate.sh @@ -13,9 +13,9 @@ NOTEST='--skip-test-unit' set -x -bundle exec rails generate scaffold server $NOTEST -bundle exec rails generate scaffold tournament game:references $NOTEST -bundle exec rails generate scaffold match tournament:references $NOTEST +bundle exec rails generate scaffold server --force $NOTEST +bundle exec rails generate scaffold tournament game:references --force $NOTEST +bundle exec rails generate scaffold match tournament:references --force $NOTEST bundle exec rails generate scaffold team $NOTEST bundle exec rails generate controller users $NOTEST bundle exec rails generate controller Sessions -- cgit v1.2.3-2-g168b From fefe3f469243d6c932c256cc8798bae35e4ff1c4 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Sun, 2 Mar 2014 21:10:49 -0500 Subject: Added Tournament Name. --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index ea96b9b..336ea5b 100755 --- a/generate.sh +++ b/generate.sh @@ -15,7 +15,7 @@ NOTEST='--skip-test-unit' set -x bundle exec rails generate scaffold server --force $NOTEST bundle exec rails generate scaffold tournament game:references --force $NOTEST -bundle exec rails generate scaffold match tournament:references --force $NOTEST +bundle exec rails generate scaffold match tournament:references name:string --force $NOTEST bundle exec rails generate scaffold team $NOTEST bundle exec rails generate controller users $NOTEST bundle exec rails generate controller Sessions -- cgit v1.2.3-2-g168b From ec0ee835e8671fc5a421b7e7bcb54d4eec6deedb Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sun, 2 Mar 2014 21:14:29 -0500 Subject: changed the generate.sh --- generate.sh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index ea96b9b..51546a1 100755 --- a/generate.sh +++ b/generate.sh @@ -31,6 +31,13 @@ bundle exec rails generate controller search $NOTEST bundle exec rails generate controller main $NOTEST bundle exec rails generate controller static $NOTEST +#added some stuff to the database + +rails generate migration add_index_to_user_email +rails generate migration add_index_to_user_name +rails generate migration add_password_digest_to_users +rails generate migration add_remember_token_to_users + #for the tournament controller to generate options bundle exec rails generate model tournament_option $NOTEST -- cgit v1.2.3-2-g168b From b59aa7c21ae04a399639209717b980d731c5bf13 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Mon, 3 Mar 2014 11:40:05 -0500 Subject: Some of the stuff I forgot to commit last night. Updated and cleaned up some pages as well as getting the gameType listing to work. --- generate.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 766453e..7f0467c 100755 --- a/generate.sh +++ b/generate.sh @@ -17,19 +17,21 @@ bundle exec rails generate scaffold server --force $NOTEST bundle exec rails generate scaffold tournament game:references --force $NOTEST bundle exec rails generate scaffold match tournament:references name:string --force $NOTEST bundle exec rails generate scaffold team $NOTEST -bundle exec rails generate controller users $NOTEST -bundle exec rails generate controller Sessions -bundle exec rails generate model user name:string email:string user_name:string $NOTEST -bundle exec rails generate model user_team_pair user:references team:references $NOTEST -bundle exec rails generate model team_match_pair team:references match:references $NOTEST bundle exec rails generate scaffold alert author:references message:text $NOTEST bundle exec rails generate scaffold pm author:references recipient:references message:text $NOTEST -bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer $NOTEST +bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer --force $NOTEST + bundle exec rails generate model game_attribute game:references key:text type:integer $NOTEST bundle exec rails generate model server_settings $NOTEST +bundle exec rails generate model user name:string email:string user_name:string $NOTEST +bundle exec rails generate model user_team_pair user:references team:references $NOTEST +bundle exec rails generate model team_match_pair team:references match:references $NOTEST + bundle exec rails generate controller search $NOTEST bundle exec rails generate controller main $NOTEST bundle exec rails generate controller static $NOTEST +bundle exec rails generate controller users $NOTEST +bundle exec rails generate controller Sessions #added some stuff to the database -- cgit v1.2.3-2-g168b From da4724adddc136b9a50123b8b019d15b95e8931e Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Mon, 3 Mar 2014 14:09:32 -0500 Subject: Made it possible to log in from the sign up page. As in I put a link under the mess I made. --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 7f0467c..4d70de1 100755 --- a/generate.sh +++ b/generate.sh @@ -14,7 +14,7 @@ NOTEST='--skip-test-unit' set -x bundle exec rails generate scaffold server --force $NOTEST -bundle exec rails generate scaffold tournament game:references --force $NOTEST +bundle exec rails generate scaffold tournament game:references $NOTEST bundle exec rails generate scaffold match tournament:references name:string --force $NOTEST bundle exec rails generate scaffold team $NOTEST bundle exec rails generate scaffold alert author:references message:text $NOTEST -- cgit v1.2.3-2-g168b From 114b7d13be2dbba1ce3bf3c344396c587e464e50 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 3 Mar 2014 21:48:32 -0500 Subject: fiddle with generate.sh --- generate.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 4d70de1..c678448 100755 --- a/generate.sh +++ b/generate.sh @@ -10,7 +10,7 @@ # To Clear the Generated Files: # git clean -df # -NOTEST='--skip-test-unit' +#NOTEST='--skip-test-unit' set -x bundle exec rails generate scaffold server --force $NOTEST @@ -20,18 +20,17 @@ bundle exec rails generate scaffold team $NOTEST bundle exec rails generate scaffold alert author:references message:text $NOTEST bundle exec rails generate scaffold pm author:references recipient:references message:text $NOTEST bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer --force $NOTEST +bundle exec rails generate scaffold user name:string email:string user_name:string $NOTEST bundle exec rails generate model game_attribute game:references key:text type:integer $NOTEST bundle exec rails generate model server_settings $NOTEST -bundle exec rails generate model user name:string email:string user_name:string $NOTEST bundle exec rails generate model user_team_pair user:references team:references $NOTEST bundle exec rails generate model team_match_pair team:references match:references $NOTEST bundle exec rails generate controller search $NOTEST bundle exec rails generate controller main $NOTEST bundle exec rails generate controller static $NOTEST -bundle exec rails generate controller users $NOTEST -bundle exec rails generate controller Sessions +bundle exec rails generate controller sessions #added some stuff to the database -- cgit v1.2.3-2-g168b