wrestlingdev.com

cody/wrestlingdev.com

Fork 0

mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-24 17:04:43 +00:00

Commit Graph

Select branches

Hide Pull Requests

64man

circleci-project-setup

dependabot/bundler/action_text-trix-2.1.17

dependabot/bundler/bcrypt-3.1.22

dependabot/bundler/json-2.19.2

dependabot/bundler/loofah-2.25.1

dependabot/bundler/nokogiri-1.19.1

dependabot/bundler/rack-3.2.5

development

master

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#40

#41

#41

#42

#42

#43

#43

#44

#44

#45

#45

#5

#5

#6

#7

#8

#9

4dcac987ac Removed old gems for css and js Jacob Cody Wimer 2015-04-22 08:46:27 -04:00
97c40587d0 Changed layout page Jacob Cody Wimer 2015-04-22 08:41:25 -04:00
7769006166 Refactored cdn name Jacob Cody Wimer 2015-04-22 08:41:09 -04:00
3e4dca0399 Revert "Trying passenger instead of puma" Jacob Cody Wimer 2015-04-22 08:03:55 -04:00
1fa79c9dc4 Trying passenger instead of puma Jacob Cody Wimer 2015-04-22 08:01:12 -04:00
1f67557fca Saving matchups_array Jacob Cody Wimer 2015-04-21 22:31:29 -04:00
e68eae312c Render datatables in browser Jacob Cody Wimer 2015-04-21 22:29:05 -04:00
1c8ad90e8a Stopped saving matchups_array to test page speed Jacob Cody Wimer 2015-04-21 22:15:18 -04:00
794690fc00 Precompiled assets Jacob Cody Wimer 2015-04-21 22:12:06 -04:00
4185c02d77 Render bootstrap and jquery from a different server. Jacob Cody Wimer 2015-04-21 22:11:20 -04:00
9de0d46e66 Saving matchups_array again. Jacob Cody Wimer 2015-04-21 21:26:10 -04:00
b61431930f Now naming loser of boutNumber in boutgen. Boutgen only run once now. Jacob Cody Wimer 2015-04-21 21:15:44 -04:00
a6757e6bfe Removed delayed_job from config/application.rb Jacob Cody Wimer 2015-04-21 19:37:23 -04:00
ef90577cf7 Trying to gzip assets to render faster Jacob Cody Wimer 2015-04-21 19:36:55 -04:00
42b46cb670 Removed some logic from view for faster rendering Jacob Cody Wimer 2015-04-21 19:32:37 -04:00
367381208a Took out matchups_array saving, did not remove from database. Jacob Cody Wimer 2015-04-21 17:13:26 -04:00
1a5f00e775 Updated databtables Jacob Cody Wimer 2015-04-21 17:12:38 -04:00
acd4acf1a9 Added what app does not to readme jcwimer 2015-04-15 14:08:47 +00:00
4499ce3cfe Updated readme jcwimer 2015-04-15 14:02:43 +00:00
0e0fbb649d Removed unused files jcwimer 2015-04-15 13:44:40 +00:00
2b1618c69b Cleaned up a bunch of shit. Depricated model methods and controller methods. jcwimer 2015-04-15 13:42:12 +00:00
451e6911f8 Fixed totalRounds in weight jcwimer 2015-04-01 13:44:01 +00:00
9b9f6a0353 Ordered all pool bracket rounds by bracket_position_number jcwimer 2015-04-01 13:00:48 +00:00
d0277e1ab8 Preliminary bracket print page jcwimer 2015-03-30 19:11:47 +00:00
9986c8b407 Removed unnecessary attr_accessors jcwimer 2015-03-30 17:45:37 +00:00
85a5cb3993 Removed deprecated config in application.rb jcwimer 2015-03-28 18:40:55 +00:00
522798a2c4 Removed score from school table and added attr_accessor jcwimer 2015-03-28 18:38:09 +00:00
9976fd5869 Added before save on wrestler and weight. Also fixed fourPoolNumbers for weight jcwimer 2015-03-28 18:16:32 +00:00
43d7089b44 Associated wrestlers and tournaments through weights jcwimer 2015-03-28 14:48:36 +00:00
d7bbd32460 Formatting code and deleting uneeded methods jcwimer 2015-03-28 14:43:14 +00:00
7b5ffaff29 Removed old pool views jcwimer 2015-03-27 19:09:12 +00:00
7146c401cf Test 5 match rule for bracket size 5-16 jcwimer 2015-03-27 19:07:49 +00:00
12b27ef3bc Ordered wrestlers by seed in bracket jcwimer 2015-03-27 16:35:55 +00:00
a821c28cf7 Created one page for all pools jcwimer 2015-03-27 16:33:09 +00:00
86faf8b2a4 Tested serialization in poolbracket integration test jcwimer 2015-03-27 13:07:32 +00:00
f166da9a2f Fixed two pool to semi view jcwimer 2015-03-27 12:56:23 +00:00
4b6b20c912 Created integration test for poolbracket matchups jcwimer 2015-03-27 12:52:35 +00:00
819d735480 Cleaned scaffold tests and set up fixtures needed for now. jcwimer 2015-03-26 16:55:33 +00:00
a1fbcc4a9f Added weight_max to matchup jcwimer 2015-03-25 13:08:36 +00:00
06a4d1b95d Fixed matchup object to hash and hash to object jcwimer 2015-03-25 12:56:19 +00:00
e0f6c129c7 Had to convert all Matchups to hash and back to objects for serialization jcwimer 2015-03-25 12:32:38 +00:00
a0083ab939 Currently not saving tournament.matchups_array jcwimer 2015-03-25 01:42:10 +00:00
862c69e431 Changed tournament.matchups to tournament.matchups_array jcwimer 2015-03-25 00:49:23 +00:00
0b4c9075b1 Idk jcwimer 2015-03-25 00:43:21 +00:00
a6f78a6dc6 Persisting matchups jcwimer 2015-03-25 00:15:27 +00:00
5fe8c394a2 Create seed for each type of poolbracket jcwimer 2015-03-24 21:09:59 +00:00
79f44d4600 Updated bracket views for all pool bracket types jcwimer 2015-03-24 21:06:09 +00:00
5c14165d6f Updated procfile for puma jcwimer 2015-03-24 14:40:20 +00:00
458c0a8723 poolbracket.rb updated for different brackets jcwimer 2015-03-24 14:21:18 +00:00
c1081ef64a Generate blank matchups for pool brackets jcwimer 2015-03-23 19:14:58 +00:00
b00d11a222 Merge branch 'master' of heroku.com:wrestlingapp jcwimer 2015-03-23 18:20:02 +00:00
27883597ca Set up blank bracket matches for fourPools jcwimer 2015-03-23 18:17:06 +00:00
20f9b7f016 Cleaned up a little bit of code jcwimer 2015-03-23 11:59:56 +00:00
b3b4fdb6e5 Revert "Moved generateMatches to tournament. Trying to reduce queries and speed" Jacob Cody Wimer 2015-03-17 09:34:43 -04:00
662a1ad498 Revert "Still trying to generate matches from tournament." Jacob Cody Wimer 2015-03-17 09:34:36 -04:00
e3a1323d39 Still trying to generate matches from tournament. Jacob Cody Wimer 2015-03-17 09:32:11 -04:00
0e5dabac8a Moved generateMatches to tournament. Trying to reduce queries and speed up page load. Jacob Cody Wimer 2015-03-17 09:26:30 -04:00
c86f678fd1 Moved poolNumber generation to weight. Jacob Cody Wimer 2015-03-17 09:06:21 -04:00
d6a9abffac Update seeds on one page. Jacob Cody Wimer 2015-03-16 15:06:45 -04:00
8d6fab3428 Trying to get two pool seeds corrected Jacob Cody Wimer 2015-03-16 12:47:55 -04:00
83703e58bf Two pool separate seeds better Jacob Cody Wimer 2015-03-16 12:43:27 -04:00
4413c81100 Two pools view needed five rounds Jacob Cody Wimer 2015-03-16 12:39:27 -04:00
6452aee07a Removed delayed job and generate matches Jacob Cody Wimer 2015-03-16 09:13:12 -04:00
2843760779 Create bracket views with upcomingMatches Jacob Cody Wimer 2015-03-16 08:35:56 -04:00
7b9422fd6c Filter wrestlers per pool for matchups. Jacob Cody Wimer 2015-03-16 08:13:41 -04:00
05c340eb94 Reducing queries for upcoming matches Jacob Cody Wimer 2015-03-16 08:06:08 -04:00
e8dd332bbc Add boutNumber to upcomgingMatches Jacob Cody Wimer 2015-03-12 15:18:06 -04:00
dc9639cf1c Calculate matchups for pools. This breaks generating matches. Jacob Cody Wimer 2015-03-12 15:03:38 -04:00
d68cebc6e4 Compiled assets before deploy Jacob Cody Wimer 2015-02-11 11:24:15 -05:00
4d8a58a36a Still working on dataTables for heroku Jacob Cody Wimer 2015-02-11 11:20:42 -05:00
56d2778624 Rearranging application.css Jacob Cody Wimer 2015-02-11 11:19:06 -05:00
2b52295a0e Changed depricated setting Jacob Cody Wimer 2015-02-11 11:14:43 -05:00
984222b9d7 Added ruby version to gemfile Jacob Cody Wimer 2015-02-11 11:14:32 -05:00
c7ea29f2e3 Re-arranging requires in application.js Jacob Cody Wimer 2015-02-11 11:11:29 -05:00
2d053500ed Still trying to get dataTables working in production Jacob Cody Wimer 2015-02-11 11:03:59 -05:00
750071627e Trying to get dataTables working in Heroku Jacob Cody Wimer 2015-02-11 11:00:05 -05:00
fbe6b8cd78 Updated Gemfile.lock Jacob Cody Wimer 2015-02-11 10:51:43 -05:00
bdec6c0463 Added dataTables for matches and tournaments. Jacob Cody Wimer 2015-02-11 10:50:25 -05:00
f32b91def7 Change weight.bracket_type to weight.pool_bracket_type and added twoPoolToFinal for 9 and 10 man weights. Jacob Cody Wimer 2015-02-09 12:35:25 -05:00
2fe11495c6 Reversed match order for round robin to hopefully move bigger matchups to later rounds in a bigger pool. Jacob Cody Wimer 2015-02-09 12:32:50 -05:00
2e7e34125b Updated match generation view, created a bracket_type for weight, and add DQ as a win type. Jacob Cody Wimer 2015-02-09 12:31:14 -05:00
399318c6c0 Needed for heroku Jacob Cody Wimer 2015-02-09 11:04:22 -05:00
aca4d9adf4 Added generating matches as delayed job Jacob Cody Wimer 2015-02-09 11:02:13 -05:00
3b93c337c7 Fixed delayed job Jacob Cody Wimer 2015-02-09 11:02:00 -05:00
e09ec3356b Configured delayed_job for rails 4.2.0 Jacob Cody Wimer 2015-02-09 10:35:01 -05:00
66c6840716 Updated to rails 4.2.0 Jacob Cody Wimer 2015-02-09 10:34:12 -05:00
7f692cc925 Delayed job gem installed Jacob Cody Wimer 2015-02-09 10:32:59 -05:00
b7122fda8b Assigned four pools correctly Jacob Cody Wimer 2015-02-09 10:26:56 -05:00
d52d462d77 reverse match order for pool Jacob Cody Wimer 2015-02-07 00:24:10 +00:00
a96a602586 in two pool moved 4 seed to pool 1 and 3 seed to pool 2 Jacob Cody Wimer 2015-02-07 00:05:02 +00:00
eba979740c fixed generation sort Jacob Cody Wimer 2015-02-06 23:29:00 +00:00
cba5d0a96d removed wrestlers array convert on pool generation Jacob Cody Wimer 2015-02-06 22:52:58 +00:00
8c7c1abc99 sorting before generating Jacob Cody Wimer 2015-02-06 22:48:26 +00:00
e7113af9a2 Added round 4 in twoPool Jacob Cody Wimer 2015-02-06 15:00:41 -05:00
6dd136d0ee Sort pool views by seed Jacob Cody Wimer 2015-02-06 14:58:06 -05:00
23bef4a2b5 Removed word result from fourPools. Jacob Cody Wimer 2015-02-06 14:53:46 -05:00
5ca2a7c7ab Added bracket for two pools Jacob Cody Wimer 2015-02-06 13:39:51 -05:00
8caaf588fd Made two pool for 7-10 people Jacob Cody Wimer 2015-02-06 13:26:58 -05:00
7032760360 Organized weights on tournament page. Jacob Cody Wimer 2015-02-06 12:37:30 -05:00
c1f2363a46 Changed tournament view Jacob Cody Wimer 2015-02-06 12:33:20 -05:00

... 9 10 11 12 13