Permalink
Browse files

Merge branch 'ArjunRayGA-revert-commits'

  • Loading branch information...
MicFin committed Sep 7, 2018
2 parents 0bf4c1a + 6015bee commit 524b7dc6c53ec68289a75b70fc569de8646bfad0
Showing with 459 additions and 1,468 deletions.
  1. +0 −2 Gemfile
  2. +1 −26 Gemfile.lock
  3. +351 −2 README.md
  4. +0 −2 accessKeys.csv
  5. +0 −51 app/controllers/album_images_controller.rb
  6. +0 −51 app/controllers/albums_controller.rb
  7. +59 −0 app/controllers/examples_controller.rb
  8. +0 −51 app/controllers/images_controller.rb
  9. +0 −51 app/controllers/photographers_controller.rb
  10. +0 −51 app/controllers/user_types_controller.rb
  11. +3 −5 app/controllers/users_controller.rb
  12. +0 −4 app/models/album.rb
  13. +0 −4 app/models/album_image.rb
  14. +6 −0 app/models/example.rb
  15. +0 −4 app/models/image.rb
  16. +0 −3 app/models/photographer.rb
  17. +1 −1 app/models/user.rb
  18. +0 −3 app/models/user_type.rb
  19. +0 −5 app/serializers/album_image_serializer.rb
  20. +0 −15 app/serializers/album_serializer.rb
  21. +9 −0 app/serializers/example_serializer.rb
  22. +0 −4 app/serializers/image_serializer.rb
  23. +0 −3 app/serializers/photographer_serializer.rb
  24. +1 −1 app/serializers/user_login_serializer.rb
  25. +0 −3 app/serializers/user_type_serializer.rb
  26. +0 −1 arn.txt
  27. +1 −1 config/application.rb
  28. +1 −1 config/database.yml
  29. +1 −2 config/initializers/cors.rb
  30. +3 −2 config/routes.rb
  31. BIN db/data/images/Alice Bag by Milana Burdette (4x5in)/burdette_alicebag_01_72dpi.jpg
  32. BIN db/data/images/Alice Bag by Milana Burdette (4x5in)/burdette_alicebag_02_72dpi.jpg
  33. BIN db/data/images/Alice Bag by Milana Burdette (4x5in)/burdette_alicebag_03_72dpi.jpg
  34. BIN db/data/images/Alice Bag by Milana Burdette (4x5in)/burdette_alicebag_04_72dpi.jpg
  35. BIN db/data/images/Allee Willis by Ashley Guo (35mm)/guo_alleewillis_01_72dpi.jpg
  36. BIN db/data/images/Allee Willis by Ashley Guo (35mm)/guo_alleewillis_02_72dpi.jpg
  37. BIN db/data/images/Allee Willis by Ashley Guo (35mm)/guo_alleewillis_03_72dpi.jpg
  38. BIN db/data/images/Allee Willis by Ashley Guo (35mm)/guo_alleewillis_04_72dpi.jpg
  39. BIN db/data/images/Allee Willis by Ashley Guo (35mm)/guo_alleewillis_05_72dpi.jpg
  40. BIN db/data/images/Echo Hattix by Labbie Manesh (digital)/manesh_echohattix_01_72dpi.jpg
  41. BIN db/data/images/Echo Hattix by Labbie Manesh (digital)/manesh_echohattix_02_72dpi.jpg
  42. BIN db/data/images/Echo Hattix by Labbie Manesh (digital)/manesh_echohattix_03_72dpi.jpg
  43. BIN db/data/images/Echo Hattix by Labbie Manesh (digital)/manesh_echohattix_04_72dpi.jpg
  44. BIN db/data/images/Echo Hattix by Labbie Manesh (digital)/manesh_echohattix_05_72dpi.jpg
  45. BIN db/data/images/Gianna Geller by Labbie Manesh (digital)/manesh_giannageller_01_72dpi.jpg
  46. BIN db/data/images/Gianna Geller by Labbie Manesh (digital)/manesh_giannageller_02_72dpi.jpg
  47. BIN db/data/images/Gianna Geller by Labbie Manesh (digital)/manesh_giannageller_03_72dpi.jpg
  48. BIN db/data/images/Gianna Geller by Labbie Manesh (digital)/manesh_giannageller_04_72dpi.jpg
  49. BIN db/data/images/Jasmine Solano by Adam Hutsell (120mm)/hutsell_jasminesolano_01_72dpi.jpg
  50. BIN db/data/images/Jasmine Solano by Adam Hutsell (120mm)/hutsell_jasminesolano_02_72dpi.jpg
  51. BIN db/data/images/Jasmine Solano by Adam Hutsell (120mm)/hutsell_jasminesolano_03_72dpi.jpg
  52. BIN db/data/images/Jasmine Solano by Adam Hutsell (120mm)/hutsell_jasminesolano_04_72dpi.jpg
  53. BIN db/data/images/Jasmine Solano by Adam Hutsell (120mm)/hutsell_jasminesolano_05_72dpi.jpg
  54. BIN db/data/images/Jasmine Solano by Adam Hutsell (120mm)/hutsell_jasminesolano_06_72dpi.jpg
  55. BIN db/data/images/Macy Gray by Adam Hutsell (120mm)/hutsell_macygray_01_72dpi.jpg
  56. BIN db/data/images/Nicole Lexi Davis by Daniel Yoo (digital)/yoo_nicolelexidavis_01_72dpi.jpg
  57. BIN db/data/images/Nicole Lexi Davis by Daniel Yoo (digital)/yoo_nicolelexidavis_02_72dpi.jpg
  58. BIN db/data/images/Nicole Lexi Davis by Daniel Yoo (digital)/yoo_nicolelexidavis_03_72dpi.jpg
  59. BIN db/data/images/Nicole Lexi Davis by Daniel Yoo (digital)/yoo_nicolelexidavis_04_72dpi.jpg
  60. BIN db/data/images/Thea Austin by Jennica Mae (digital)/mae_theaaustin_01_72dpi.jpg
  61. BIN db/data/images/Thea Austin by Jennica Mae (digital)/mae_theaaustin_02_72dpi.jpg
  62. BIN db/data/images/Thea Austin by Jennica Mae (digital)/mae_theaaustin_03_72dpi.jpg
  63. BIN db/data/images/Thea Austin by Jennica Mae (digital)/mae_theaaustin_04_72dpi.jpg
  64. BIN db/data/images/Thea Austin by Jennica Mae (digital)/mae_theaaustin_05_72dpi.jpg
  65. BIN db/data/images/Thea Austin by Jennica Mae (digital)/mae_theaaustin_06_72dpi.jpg
  66. BIN db/data/images/Yvonne Faison by Ashley Guo (35mm)/guo_yvonnefaison_01_72dpi.jpg
  67. BIN db/data/images/Yvonne Faison by Ashley Guo (35mm)/guo_yvonnefaison_02_72dpi.jpg
  68. BIN db/data/images/Yvonne Faison by Ashley Guo (35mm)/guo_yvonnefaison_03_72dpi.jpg
  69. BIN db/data/images/Yvonne Faison by Ashley Guo (35mm)/guo_yvonnefaison_04_72dpi.jpg
  70. BIN db/data/images/Yvonne Faison by Ashley Guo (35mm)/guo_yvonnefaison_05_72dpi.jpg
  71. +0 −4 db/migrate/001_create_users.rb
  72. +12 −0 db/migrate/002_create_examples.rb
  73. +0 −9 db/migrate/002_create_user_types.rb
  74. +0 −5 db/migrate/003_add_user_type_reference_to_users.rb
  75. +0 −11 db/migrate/004_create_photographers.rb
  76. +0 −12 db/migrate/005_create_images.rb
  77. +0 −12 db/migrate/006_create_albums.rb
  78. +0 −11 db/migrate/007_create_album_images.rb
  79. +5 −51 db/schema.rb
  80. +5 −119 db/seeds.rb
  81. BIN erd.pdf
  82. +0 −129 spec/controllers/galleries_controller_spec.rb
  83. +0 −129 spec/controllers/gallery_images_controller_spec.rb
  84. +0 −129 spec/controllers/images_controller_spec.rb
  85. +0 −129 spec/controllers/photographers_controller_spec.rb
  86. +0 −129 spec/controllers/user_types_controller_spec.rb
  87. +0 −5 spec/models/gallery_image_spec.rb
  88. +0 −5 spec/models/gallery_spec.rb
  89. +0 −5 spec/models/image_spec.rb
  90. +0 −5 spec/models/photographer_spec.rb
  91. +0 −5 spec/models/user_type_spec.rb
  92. +0 −10 spec/requests/galleries_spec.rb
  93. +0 −10 spec/requests/gallery_images_spec.rb
  94. +0 −10 spec/requests/images_spec.rb
  95. +0 −10 spec/requests/photographers_spec.rb
  96. +0 −10 spec/requests/user_types_spec.rb
  97. +0 −33 spec/routing/galleries_routing_spec.rb
  98. +0 −33 spec/routing/gallery_images_routing_spec.rb
  99. +0 −33 spec/routing/images_routing_spec.rb
  100. +0 −33 spec/routing/photographers_routing_spec.rb
  101. +0 −33 spec/routing/user_types_routing_spec.rb
@@ -9,10 +9,8 @@ gem 'pg', '~> 0.21'
gem 'puma', '~> 3.11.2'
gem 'rack-cors', '~> 1.0.2', require: 'rack/cors'
gem 'rails', '~> 5.1.3'
gem 'aws-sdk-s3'

group :development, :test do
gem 'rails-erd'
gem 'byebug', '~> 10.0.0', platform: :mri
gem 'dotenv-rails', '~> 2.2.1'
gem 'pry', '~> 0.11.3'
@@ -45,27 +45,11 @@ GEM
tzinfo (~> 1.1)
arel (8.0.0)
ast (2.4.0)
aws-eventstream (1.0.1)
aws-partitions (1.102.0)
aws-sdk-core (3.26.0)
aws-eventstream (~> 1.0)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-kms (1.8.0)
aws-sdk-core (~> 3)
aws-sigv4 (~> 1.0)
aws-sdk-s3 (1.18.0)
aws-sdk-core (~> 3, >= 3.21.2)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
aws-sigv4 (1.0.3)
bcrypt (3.1.11)
builder (3.2.3)
byebug (10.0.0)
case_transform (0.2)
activesupport
choice (0.2.0)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.3)
@@ -80,7 +64,6 @@ GEM
activesupport (>= 4.2.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jmespath (1.4.0)
jsonapi-renderer (0.2.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -131,11 +114,6 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-erd (1.5.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
@@ -178,7 +156,6 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-graphviz (1.2.3)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
spring (2.0.2)
@@ -206,7 +183,6 @@ PLATFORMS

DEPENDENCIES
active_model_serializers (~> 0.10.6)
aws-sdk-s3
bcrypt (~> 3.1.11)
byebug (~> 10.0.0)
dotenv-rails (~> 2.2.1)
@@ -218,7 +194,6 @@ DEPENDENCIES
puma (~> 3.11.2)
rack-cors (~> 1.0.2)
rails (~> 5.1.3)
rails-erd
rails_12factor (~> 0.0.3)
rspec-rails (~> 3.7.2)
rubocop (~> 0.52.1)
@@ -229,4 +204,4 @@ RUBY VERSION
ruby 2.5.0p0

BUNDLED WITH
1.16.2
1.16.1
Oops, something went wrong.

0 comments on commit 524b7dc

Please sign in to comment.