From ed3ada502baa62a8dae5e4972a3654af3ec8b034 Mon Sep 17 00:00:00 2001 From: Ayesha Asif Date: Fri, 22 Jan 2021 09:18:45 -0800 Subject: [PATCH 01/14] Added videos create feature --- app/controllers/videos_controller.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index c9a2bb08..078e2160 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -21,6 +21,22 @@ def show ) end + def create + video = Video.new( + title: params[:title], + overview: params[:overview], + # release_date: params[:release_date], + # image_url: params[:image_url], + # inventory: 1, + # external_id: params[:external_id] + ) + if video.save + render status: :ok, json: videos + else + render status: :bad_request, json: { errors: rentals.errors.messages } + end + end + private def require_video From 48df6df06577445dc3a68297b2d6b5bab98cd8ba Mon Sep 17 00:00:00 2001 From: Ayesha Asif Date: Fri, 22 Jan 2021 10:26:37 -0800 Subject: [PATCH 02/14] Fixed issues in the videos controller create action --- app/controllers/videos_controller.rb | 10 +++++----- config/routes.rb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 078e2160..cca421dc 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -25,13 +25,13 @@ def create video = Video.new( title: params[:title], overview: params[:overview], - # release_date: params[:release_date], - # image_url: params[:image_url], - # inventory: 1, - # external_id: params[:external_id] + release_date: params[:release_date], + image_url: params[:image_url], + inventory: 5, + external_id: params[:external_id] ) if video.save - render status: :ok, json: videos + render status: :ok, json: video else render status: :bad_request, json: { errors: rentals.errors.messages } end diff --git a/config/routes.rb b/config/routes.rb index 16fc2214..1111b4bf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,7 @@ resources :customers, only: [:index] - resources :videos, only: [:index, :show], param: :title + resources :videos, only: [:index, :show, :create], param: :title post "/rentals/:title/check-out", to: "rentals#check_out", as: "check_out" post "/rentals/:title/return", to: "rentals#check_in", as: "check_in" From 61cb83f04ee67055ed62affb689cc2b2b341b785 Mon Sep 17 00:00:00 2001 From: spv-hub Date: Mon, 22 Nov 2021 20:54:51 -0800 Subject: [PATCH 03/14] seeding db --- .DS_Store | Bin 0 -> 8196 bytes .github/workflows/run_tests.yml | 0 .gitignore | 0 Gemfile | 3 +++ Gemfile.lock | 9 ++++++++- README.md | 0 Rakefile | 0 app.js | 0 app/.DS_Store | Bin 0 -> 6148 bytes app/assets/.DS_Store | Bin 0 -> 6148 bytes app/assets/config/manifest.js | 0 app/channels/application_cable/channel.rb | 0 app/channels/application_cable/connection.rb | 0 app/controllers/application_controller.rb | 0 app/controllers/concerns/.keep | 0 app/controllers/customers_controller.rb | 0 app/controllers/rentals_controller.rb | 0 app/controllers/videos_controller.rb | 0 app/helpers/application_helper.rb | 0 app/helpers/customers_helper.rb | 0 app/helpers/rentals_helper.rb | 0 app/helpers/videos_helper.rb | 0 app/jobs/application_job.rb | 0 app/mailers/application_mailer.rb | 0 app/models/application_record.rb | 0 app/models/concerns/.keep | 0 app/models/customer.rb | 0 app/models/rental.rb | 0 app/models/video.rb | 0 app/serializers/video_serializer.rb | 0 app/views/.DS_Store | Bin 0 -> 6148 bytes app/views/layouts/application.html.erb | 0 app/views/layouts/mailer.html.erb | 0 app/views/layouts/mailer.text.erb | 0 config.ru | 0 config/application.rb | 0 config/boot.rb | 0 config/cable.yml | 0 config/credentials.yml.enc | 0 config/database.yml | 0 config/environment.rb | 0 config/environments/development.rb | 0 config/environments/production.rb | 0 config/environments/test.rb | 0 .../application_controller_renderer.rb | 0 config/initializers/assets.rb | 0 config/initializers/backtrace_silencers.rb | 0 config/initializers/cookies_serializer.rb | 0 config/initializers/filter_parameter_logging.rb | 0 config/initializers/inflections.rb | 0 config/initializers/mime_types.rb | 0 config/initializers/new_framework_defaults.rb | 0 config/initializers/session_store.rb | 0 config/initializers/wrap_parameters.rb | 0 config/locales/en.yml | 0 config/puma.rb | 0 config/routes.rb | 0 config/secrets.yml | 0 config/spring.rb | 0 db/migrate/20170111220114_create_customers.rb | 0 db/migrate/20170111220123_create_movies.rb | 0 db/migrate/20170111220126_create_rentals.rb | 0 ...170117221429_add_returned_status_to_rental.rb | 0 ...1517_remove_available_inventory_from_movie.rb | 0 db/migrate/20170608201920_add_image_to_movie.rb | 0 .../20180618042754_add_external_id_to_movie.rb | 0 .../20200706194441_rename_movies_to_videos.rb | 0 db/schema.rb | 0 db/seeds.rb | 0 db/seeds/customers.json | 0 db/seeds/videos.json | 0 lib/assets/.keep | 0 lib/tasks/.keep | 0 lib/video_wrapper.rb | 0 log/.keep | 0 package.json | 0 public/404.html | 0 public/422.html | 0 public/500.html | 0 public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 ...anifest-204c8f150bcd69b5c03f155b30b15bae.json | 0 ...anifest-22e48dabd7cc9f16f212f23c5df83e68.json | 0 public/favicon.ico | 0 public/robots.txt | 0 test/controllers/.keep | 0 test/controllers/customers_controller_test.rb | 0 test/controllers/rentals_controller_test.rb | 0 test/controllers/videos_controller_test.rb | 0 test/fixtures/.keep | 0 test/fixtures/customers.yml | 0 test/fixtures/files/.keep | 0 test/fixtures/rentals.yml | 0 test/fixtures/videos.yml | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/integration/cors_headers_test.rb | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 0 test/models/rental_test.rb | 0 test/models/video_test.rb | 0 test/test_helper.rb | 0 tmp/.keep | 0 vendor/assets/javascripts/.keep | 0 vendor/assets/stylesheets/.keep | 0 yarn.lock | 0 107 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .DS_Store mode change 100644 => 100755 .github/workflows/run_tests.yml mode change 100644 => 100755 .gitignore mode change 100644 => 100755 Gemfile mode change 100644 => 100755 Gemfile.lock mode change 100644 => 100755 README.md mode change 100644 => 100755 Rakefile mode change 100644 => 100755 app.js create mode 100644 app/.DS_Store create mode 100644 app/assets/.DS_Store mode change 100644 => 100755 app/assets/config/manifest.js mode change 100644 => 100755 app/channels/application_cable/channel.rb mode change 100644 => 100755 app/channels/application_cable/connection.rb mode change 100644 => 100755 app/controllers/application_controller.rb mode change 100644 => 100755 app/controllers/concerns/.keep mode change 100644 => 100755 app/controllers/customers_controller.rb mode change 100644 => 100755 app/controllers/rentals_controller.rb mode change 100644 => 100755 app/controllers/videos_controller.rb mode change 100644 => 100755 app/helpers/application_helper.rb mode change 100644 => 100755 app/helpers/customers_helper.rb mode change 100644 => 100755 app/helpers/rentals_helper.rb mode change 100644 => 100755 app/helpers/videos_helper.rb mode change 100644 => 100755 app/jobs/application_job.rb mode change 100644 => 100755 app/mailers/application_mailer.rb mode change 100644 => 100755 app/models/application_record.rb mode change 100644 => 100755 app/models/concerns/.keep mode change 100644 => 100755 app/models/customer.rb mode change 100644 => 100755 app/models/rental.rb mode change 100644 => 100755 app/models/video.rb mode change 100644 => 100755 app/serializers/video_serializer.rb create mode 100644 app/views/.DS_Store mode change 100644 => 100755 app/views/layouts/application.html.erb mode change 100644 => 100755 app/views/layouts/mailer.html.erb mode change 100644 => 100755 app/views/layouts/mailer.text.erb mode change 100644 => 100755 config.ru mode change 100644 => 100755 config/application.rb mode change 100644 => 100755 config/boot.rb mode change 100644 => 100755 config/cable.yml mode change 100644 => 100755 config/credentials.yml.enc mode change 100644 => 100755 config/database.yml mode change 100644 => 100755 config/environment.rb mode change 100644 => 100755 config/environments/development.rb mode change 100644 => 100755 config/environments/production.rb mode change 100644 => 100755 config/environments/test.rb mode change 100644 => 100755 config/initializers/application_controller_renderer.rb mode change 100644 => 100755 config/initializers/assets.rb mode change 100644 => 100755 config/initializers/backtrace_silencers.rb mode change 100644 => 100755 config/initializers/cookies_serializer.rb mode change 100644 => 100755 config/initializers/filter_parameter_logging.rb mode change 100644 => 100755 config/initializers/inflections.rb mode change 100644 => 100755 config/initializers/mime_types.rb mode change 100644 => 100755 config/initializers/new_framework_defaults.rb mode change 100644 => 100755 config/initializers/session_store.rb mode change 100644 => 100755 config/initializers/wrap_parameters.rb mode change 100644 => 100755 config/locales/en.yml mode change 100644 => 100755 config/puma.rb mode change 100644 => 100755 config/routes.rb mode change 100644 => 100755 config/secrets.yml mode change 100644 => 100755 config/spring.rb mode change 100644 => 100755 db/migrate/20170111220114_create_customers.rb mode change 100644 => 100755 db/migrate/20170111220123_create_movies.rb mode change 100644 => 100755 db/migrate/20170111220126_create_rentals.rb mode change 100644 => 100755 db/migrate/20170117221429_add_returned_status_to_rental.rb mode change 100644 => 100755 db/migrate/20170118201517_remove_available_inventory_from_movie.rb mode change 100644 => 100755 db/migrate/20170608201920_add_image_to_movie.rb mode change 100644 => 100755 db/migrate/20180618042754_add_external_id_to_movie.rb mode change 100644 => 100755 db/migrate/20200706194441_rename_movies_to_videos.rb mode change 100644 => 100755 db/schema.rb mode change 100644 => 100755 db/seeds.rb mode change 100644 => 100755 db/seeds/customers.json mode change 100644 => 100755 db/seeds/videos.json mode change 100644 => 100755 lib/assets/.keep mode change 100644 => 100755 lib/tasks/.keep mode change 100644 => 100755 lib/video_wrapper.rb mode change 100644 => 100755 log/.keep mode change 100644 => 100755 package.json mode change 100644 => 100755 public/404.html mode change 100644 => 100755 public/422.html mode change 100644 => 100755 public/500.html mode change 100644 => 100755 public/apple-touch-icon-precomposed.png mode change 100644 => 100755 public/apple-touch-icon.png mode change 100644 => 100755 public/assets/.sprockets-manifest-204c8f150bcd69b5c03f155b30b15bae.json mode change 100644 => 100755 public/assets/.sprockets-manifest-22e48dabd7cc9f16f212f23c5df83e68.json mode change 100644 => 100755 public/favicon.ico mode change 100644 => 100755 public/robots.txt mode change 100644 => 100755 test/controllers/.keep mode change 100644 => 100755 test/controllers/customers_controller_test.rb mode change 100644 => 100755 test/controllers/rentals_controller_test.rb mode change 100644 => 100755 test/controllers/videos_controller_test.rb mode change 100644 => 100755 test/fixtures/.keep mode change 100644 => 100755 test/fixtures/customers.yml mode change 100644 => 100755 test/fixtures/files/.keep mode change 100644 => 100755 test/fixtures/rentals.yml mode change 100644 => 100755 test/fixtures/videos.yml mode change 100644 => 100755 test/helpers/.keep mode change 100644 => 100755 test/integration/.keep mode change 100644 => 100755 test/integration/cors_headers_test.rb mode change 100644 => 100755 test/mailers/.keep mode change 100644 => 100755 test/models/.keep mode change 100644 => 100755 test/models/customer_test.rb mode change 100644 => 100755 test/models/rental_test.rb mode change 100644 => 100755 test/models/video_test.rb mode change 100644 => 100755 test/test_helper.rb mode change 100644 => 100755 tmp/.keep mode change 100644 => 100755 vendor/assets/javascripts/.keep mode change 100644 => 100755 vendor/assets/stylesheets/.keep mode change 100644 => 100755 yarn.lock diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5be42f0f237fdcd49d33137720a763bb5fd72a6e GIT binary patch literal 8196 zcmeHM!EVz)5S@)f>XZUOLeLA6FWgGiR8`=D6w+3x2P8xg900X;Vp>zzjuNL)2|>B@ z1#sXO5TC&ZAijkYyxHAW_9nd+Bz7h5tasnroqe;hGYJui*05VAS|%bF7u(upRC5ZC z^EFdSy5}aW0H4xM5T^m|YBN~dVHL0nSOu&CRspNPzo7u$*<9Rn-ur6Q)>Z+lz<;R# zKOa0?Y@6Cnm6eYUR5AsCEu&i&wB?t7SdTkko7zs5MGuNlR9Hn7I>it=cMyt>@utR4 zl~r^Sa%Ie;R~9-$5jyn{o`jQVDr;-2fK^~t0nXhW@~KC?ow$&{Kg7uDZ&@Twqk_?( zr?dR;K`)L5+1lDqQF6+cDhsZ==q_GaeBC}sNA1kdhJ%*hf5~@G{Olmm?PqBkpSAtq zc@&OzYd1F2B=e&r>`QXg4FP%eB1*dHsFe0(ZE*oSoqMVp~3iNFiO;=pol5) zUh;k}&?5@zNO}-cXrO->=%peWUc~UfLx)A4vuW@g;3Cr(=i3}qYU)6I^uFYd-V*dm zv9pkN;WxL2m_3{ukv#7@jVf-y!_tGcg+xj$a;M1%4YEZP8=cRVdOeu2A9_<{4$mSS`wmI2p4% z&H?Vod=SW( 3.2015) mime-types-data (3.2020.1104) - mimemagic (0.3.5) mini_mime (1.0.2) mini_portile2 (2.5.0) minitest (5.14.3) @@ -230,6 +236,7 @@ DEPENDENCIES httparty jbuilder (~> 2.7) listen (~> 3.2) + mimemagic! minitest-rails minitest-reporters pg (>= 0.18, < 2.0) diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/Rakefile b/Rakefile old mode 100644 new mode 100755 diff --git a/app.js b/app.js old mode 100644 new mode 100755 diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6b76648408b7647d1a35e5238c1e3ff3156831a0 GIT binary patch literal 6148 zcmeHK&2G~`5S~ra#7R_<0}{O;?S)%};y}~(fRv`?&>K<^900X;V-X|Q8^ul|ng-?0 z6TnL#9)kx!JPRlI_6HO@=>@5%pdD-W8}H7HcR%fqmxx$zGH{6+MC3pvmTD;0h-{a- zA_Y^k31liqO36_qPW?#uE8e!kGGH0FX$;7-U^r zh0f6PaD5*Na)ir0FT-2VVBIJSUvs{7HGRg&?IC+e7wh_6Jjg|D&^deqn&x|6{Cu_N z4V!eGohEO)9X;tr6$7kv*gx!HNak!^8Js+8 uIrIc7Mfxo?st^?BI97%{inpLj(8i?!>>6BXL=D9L2q+qCVHxPb@VGDD8gWGMAURbJ-XteHAlzwj$+?yGs-Y_PH~2?>fuF<7 z?pD&2M}o{Gv)|n8%--&|m)#ox5VcOj1E>IiL?tYgu=zx&pL9eD&NGH6%os6T?k4&? zN^~?5&5qy50PWoboP&lGE?{{7=%d&|U3@cQrau%Lb=x;?uV12@ByML*ORu6ZRve$0 zl(H<#)8&)kN_T@S%sTB_*gB%8y)e6qoV~Ag@?nS3LEP+~R%W+#nuT%NY?8QmRB~aYJGXF-!I9z1#ffr?E3D$ z_t1ZQGRpvgAFPoXhXZ&_PADur>n;BpR zzK;Pq9~3H~?=ZJ$jt*>034mBcw-L1Iw~=y`L*HR;5qnUCO+~b+!j%}prlViEINxDz z(WZlN#fNZj7Op}O=IuDXGT|V6i`+5;%)l@MRQsV+=>FgNy8bso+%N;o!2e`G6zf5~ zhHG&PnUu2raKs3a7ZTl`2t!(7D}OIPtcsuA=nG7x=-xkdD#@Q;9@fg5JvM;Ukr DC&OMi literal 0 HcmV?d00001 diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js old mode 100644 new mode 100755 diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb old mode 100644 new mode 100755 diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb old mode 100644 new mode 100755 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep old mode 100644 new mode 100755 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb old mode 100644 new mode 100755 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/customers_helper.rb b/app/helpers/customers_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/rentals_helper.rb b/app/helpers/rentals_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/videos_helper.rb b/app/helpers/videos_helper.rb old mode 100644 new mode 100755 diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb old mode 100644 new mode 100755 diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb old mode 100644 new mode 100755 diff --git a/app/models/application_record.rb b/app/models/application_record.rb old mode 100644 new mode 100755 diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep old mode 100644 new mode 100755 diff --git a/app/models/customer.rb b/app/models/customer.rb old mode 100644 new mode 100755 diff --git a/app/models/rental.rb b/app/models/rental.rb old mode 100644 new mode 100755 diff --git a/app/models/video.rb b/app/models/video.rb old mode 100644 new mode 100755 diff --git a/app/serializers/video_serializer.rb b/app/serializers/video_serializer.rb old mode 100644 new mode 100755 diff --git a/app/views/.DS_Store b/app/views/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ba10fa3c0b740a6206b32cef9dc3080c00054945 GIT binary patch literal 6148 zcmeHK%}T>S5T317w-vDmL63X!R-_fFUW8cn;7y3=K}8c=G!V1Wq!z7}yoSD!PvGO| z%QPadf!S{|Kb!2Au$ut@(d@SB02Kg`sDy5?68+!hOx9{`=xQg(&O>MKY8}7YLAV#Sd&ia84V`2`l(ajhIBK;q z<#0brTDsTN-K3S8d3+m?vLs8#mHB?Zu~Jn_^~Rv8`t_ySYE?Cs8-qbf&Mnl}wofju zZ~C``yL+<`5cts=nQ=IT2Q)sAa^-iDSSM!~8CDIm8JPiQfEoC647iOD8k$w=T{~jglCaQW`G%Z&j9s)C>1*Yx4!QGO%e~x05kAE84$%y zf3t~eb7$+wD(S3Ms3)i-l$Tq4EkVN^#h6P+@jR*#^eZwDJ%_nP^q}yMfT4j0X5dE| FcmbH;U&8 Date: Mon, 22 Nov 2021 21:45:54 -0800 Subject: [PATCH 04/14] testing --- .env | 1 + .gitignore | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100755 .env diff --git a/.env b/.env new file mode 100755 index 00000000..606ac93a --- /dev/null +++ b/.env @@ -0,0 +1 @@ +MOVIEDB_KEY = "fab6e945ca8bd693a69acea57b30c0b9" \ No newline at end of file diff --git a/.gitignore b/.gitignore index cb5b9b3e..8e751d86 100755 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,7 @@ # Ignore Byebug command history file. .byebug_history -.env +#.env # Ignore master key for decrypting credentials and more. /config/master.key From 420448b735bfe4857abaa6428eccfea8a61657cf Mon Sep 17 00:00:00 2001 From: spv-hub Date: Tue, 23 Nov 2021 13:27:40 -0800 Subject: [PATCH 05/14] adding movie api key --- .env | 2 +- .gitignore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 606ac93a..28271357 100755 --- a/.env +++ b/.env @@ -1 +1 @@ -MOVIEDB_KEY = "fab6e945ca8bd693a69acea57b30c0b9" \ No newline at end of file +API_KEY = fab6e945ca8bd693a69acea57b30c0b9 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 8e751d86..cb5b9b3e 100755 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,7 @@ # Ignore Byebug command history file. .byebug_history -#.env +.env # Ignore master key for decrypting credentials and more. /config/master.key From f132f0de9919b8b2336b108d9c368969e925a111 Mon Sep 17 00:00:00 2001 From: spv-hub Date: Tue, 23 Nov 2021 13:41:05 -0800 Subject: [PATCH 06/14] adding movie api key --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 28271357..dc470fa5 100755 --- a/.env +++ b/.env @@ -1 +1 @@ -API_KEY = fab6e945ca8bd693a69acea57b30c0b9 \ No newline at end of file +MOVIEDB_KEY = fab6e945ca8bd693a69acea57b30c0b9 \ No newline at end of file From e592c8ea812b7f5fced66947836dcbb1ec4609d4 Mon Sep 17 00:00:00 2001 From: spv-hub Date: Tue, 23 Nov 2021 13:45:57 -0800 Subject: [PATCH 07/14] adding movie api key --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index dc470fa5..45b29247 100755 --- a/.env +++ b/.env @@ -1 +1 @@ -MOVIEDB_KEY = fab6e945ca8bd693a69acea57b30c0b9 \ No newline at end of file +MOVIEDB_KEY = 'fab6e945ca8bd693a69acea57b30c0b9' \ No newline at end of file From 46ee338ef8a4436b40db49221eafd7e320eb5874 Mon Sep 17 00:00:00 2001 From: spv-hub Date: Tue, 23 Nov 2021 15:12:15 -0800 Subject: [PATCH 08/14] added storage yml file for active storage --- config/secrets.yml | 2 +- config/storage.yml | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 config/storage.yml diff --git a/config/secrets.yml b/config/secrets.yml index b81fd05f..7fda229b 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -19,4 +19,4 @@ test: # Do not keep production secrets in the repository, # instead read values from the environment. production: - secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> + secret_key_base: <%= ENV["SECRET_KEY_BASE"] || 'da7849f96c38ebd65869daaa319c01acb3fb369da7c00cd7ae49b5610b65e48d23aea52b369d58394582c6500f9b51c8f0c93be3fe6b4b5c6ea0d416e3ec637d' %> diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 00000000..d32f76e8 --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] From efd6f33cd0c260577493677c6daeda63062911cc Mon Sep 17 00:00:00 2001 From: sandy Date: Sat, 4 Dec 2021 21:46:28 -0800 Subject: [PATCH 09/14] save all changed files & remove deleted ones --- .DS_Store | Bin 8196 -> 10244 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.DS_Store b/.DS_Store index 5be42f0f237fdcd49d33137720a763bb5fd72a6e..61938f2c9394ea6c68d67ddf94544a461d2ebd91 100644 GIT binary patch literal 10244 zcmeHMO^72!6n>STnNA#a6h$vWg9^Ja4wFS@1>GgiW*Bxs5wp0WE;H#Qlf+HBL(_Pfno}=nvgisag+u{e-1`U>UFsSOzQu zmI2Ga|Ahhk&Zg$vqNMFD1C{~Hz=Q#+4=!FL%UX_=l%)eZc?3Y2!^g7W{UY6QYVnu91SX?x3nWgy7_ zo!xV=3@zwDXq?|)dixiy>jjmH*9|;;=3Kr1(04z-_xa=wzV=edwR;26Y`N6%(3a`ES|q z4nSLZJHx)V`qJxnJHv2gk4`mw5gvdizdpV$6G79$$xmtx(#18JSo@u?4*YK5x9|y}n^Q}H3GyNgV+-;T z>dgi5FnN8`O5B%jWyV$f1Ff2_v<^soz+z((BL;hzBc?KHbnKl_( zLmr*9F`^P@DJuD#N3*^CMZ~(+O*xP24D{-^z&va~6MB;IE;M7PuE$UV(naWFc_vHOJ4We}RvcCS z%463wD)i^5e*Eh22iH|@5h|&jqDpExs{EBQ4hjpH{{d!56E<;O=x&4~HB)yq$2rrF zBNwl}|J=>y;ISM%-TVIV8Cj=hj?MSXzp>}>W~wsYJMinHMmdCi3*&q!$|+UHkb$%+ zWkzm}AnRX>A5{?UH-|IhSE$U*x|zX(_Uues&M3g0pP;QV7H1LQ(`bLjY^HfJ%Z9TB zszN&OH1c!~d7>Jb+_6+gIPL=4uVYSE;0ct=m{AQg(hTi!?vaC#vJFDhPVVVcJClv} zD>&X{49>*m{Wl^en10Gan%-pK1`dt2AjBwQKR9G9;pnuLiH+PNe~#>ji@!z4v>(sw zq}D_wN1cQ7$eNG4HGqN1990x?8>=XWZ3;p|&v9Pf|2@JPv*9eJ+oWJFzy-{u0ivE! z#{qve7|3O)wzCXa1}p;ylYy)X+okva>$Cs=KbYj$s4W8rgaMJOR4Z#3Z1i3z9ygt@ zUA(sNqDFROC8Y~?@(7MnzK+Ka^g8|!USzvMk{aHZwHzynPq6(Le+Jm|f1jwg=l|%P L1V1Mofb;)9^B0tl delta 176 zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8FDWo2aKKEC!MX@)`1zlXCKtKvEkMm$GkW z=V0Mr6x%E!$j>-=vQXmW3BtUS3x(w;ONfL`z9uqZ@-Jg From 5c00f66ab79e8cfcaa50e53c3c6873d77c4d620b Mon Sep 17 00:00:00 2001 From: sandy Date: Sat, 4 Dec 2021 21:57:04 -0800 Subject: [PATCH 10/14] updating ruby version to work with newer heroku stack --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 61bfba2d..4cfa8fb2 100755 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.6.5' +ruby '2.6.6' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 6.0', '>= 6.0.3.1' From ec80f99cc030681119a7ab16d2f4fb8dfbefeb49 Mon Sep 17 00:00:00 2001 From: sandy Date: Sat, 4 Dec 2021 22:00:08 -0800 Subject: [PATCH 11/14] updating ruby version to work with newer heroku stack --- .github/workflows/run_tests.yml | 4 ++-- Gemfile.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 3199c7b7..b268f032 100755 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -20,10 +20,10 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 - - name: Setup Ruby 2.6.5 + - name: Setup Ruby 2.6.6 uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.5 + ruby-version: 2.6.6 - name: Install PostgreSQL 11 client run: | diff --git a/Gemfile.lock b/Gemfile.lock index aeaddcd6..d2bd1f66 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -251,7 +251,7 @@ DEPENDENCIES will_paginate RUBY VERSION - ruby 2.6.5p114 + ruby 2.6.6 BUNDLED WITH 2.1.4 From f0df08a0166be06fe473b2f640e0e9b9bbebc47d Mon Sep 17 00:00:00 2001 From: sandy Date: Sat, 4 Dec 2021 22:08:17 -0800 Subject: [PATCH 12/14] updating ruby version to work with newer heroku stack --- .ruby-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 00000000..338a5b5d --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.6 From dc6fce2ed3556c7a1f4d2cff59e8672e206ca75a Mon Sep 17 00:00:00 2001 From: Sandy Vasquez Date: Mon, 3 Jan 2022 14:52:47 -0800 Subject: [PATCH 13/14] updating gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 4cfa8fb2..5a28c254 100755 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.6.6' +ruby '2.6.8' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 6.0', '>= 6.0.3.1' From 62b59534d114bc000516880d05998bfd9ed5f3ed Mon Sep 17 00:00:00 2001 From: Sandy Vasquez Date: Thu, 6 Jan 2022 13:59:45 -0800 Subject: [PATCH 14/14] changing ruby version --- .DS_Store | Bin 10244 -> 10244 bytes Gemfile | 2 +- app/.DS_Store | Bin 6148 -> 10244 bytes config/.DS_Store | Bin 0 -> 6148 bytes db/.DS_Store | Bin 0 -> 6148 bytes lib/.DS_Store | Bin 0 -> 6148 bytes test/.DS_Store | Bin 0 -> 6148 bytes 7 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 config/.DS_Store create mode 100644 db/.DS_Store create mode 100644 lib/.DS_Store create mode 100644 test/.DS_Store diff --git a/.DS_Store b/.DS_Store index 61938f2c9394ea6c68d67ddf94544a461d2ebd91..35da3dd0df3d80a2dd504bb48539c791fc0bef16 100644 GIT binary patch delta 1101 zcmZn(XbIS$CJ_6b0SH(a^cd0^G8sy8^Icq$a`KaaVjO>Zr)l3lc-RqDJ_WCQL55*) za(-?B$WVqxg~`nV&a4ZMZ{Kow@<##T$@c{KAiT{V1soXV3ax>Pm>Cio3K$BIE$(1H zv;Wq?$^JqTY*1#dkQC#F$sIy7RSRvib_0zAIf|Jf3Fzd!+(Ct!JQ$MA$M}Wg!tqyBF*8len3HHh8&Nq0%f!q}VFNuA^xvGKV90Qm4&r2qf` delta 1103 zcmZn(XbIS$CJ;OKH3I_!3xgg*IzuKyNp8N2OHxjL5>Sj|rn1KEm&*=2qROY>l`qIJ z3{K9^Edc6aV5oaAxmm!O^`N`mr$duJ3J6cWC%^~cZT=|Wz$lk!4OGO;kjPNLP=IW) z3WMKeJJ-qnLK19HX0DJFG7eBUA$6L}UqmWD}W!9VUl}KV>}tP7`(#@=#Wi z#L?J{4q#}oFq8m;s2DXR_8*!G3w9)Vgmu{Dk!@vQcrdv|(%u#n2f*+yVaP>Ia1X1# tz|4osB20(MPLh(GoGK+WSz9WCz5mcxum`%NWMS;h>!eO{jo297006zyMoRzy diff --git a/Gemfile b/Gemfile index 5a28c254..4cfa8fb2 100755 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.6.8' +ruby '2.6.6' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 6.0', '>= 6.0.3.1' diff --git a/app/.DS_Store b/app/.DS_Store index 6b76648408b7647d1a35e5238c1e3ff3156831a0..a86c1f725caaa2cd962173ab1891393da872630a 100644 GIT binary patch literal 10244 zcmeHN&ubGw6n@*J?KbsC4+V=**o&YTB&jxS4~1)x!!is^@;(szMvJ*3TOqi0$KsBz)?^D z*K8{0B)9sg70?Q31qKSx`@zCW*7j|WTlVU}14{wW#_=*Mc#e4h>tp%W_HB<_))mL( z*@NMCHT)FA;N7v^A~;&xw>@rocQAN&F#MSfKSMFt?AXs@a4>9c^-(LJ6$mOox%(It zpoyQdlE2fVw1V}*FIHG*30rJ8>wd2PsaSWNW-FEYW{kw*qhsTynJ^Q_6Swmfubpod zT06~bp>d18truFAqJMtf^W4FCp?Je7w>PJzSG`)R;MB?u*4ZhQ5wda9sg=BT*4wF- znrxgrZ!paXb7FI9rqfB!&nK<)Qa5RJ(sLJ=lGftfLbp3%o;s6WUfZhP-|IZ+K77n* zfZ@MK;3WS(I6lEMiKKfso!|DVb&i;!_l?wE^>R611T!=H`R(`jA4xO?Q#ue+uZZ(l zG@UfYZoW}-z1m&8PQIJ44HXPr4L@aYrHvN~+zYH?-~xD=7d#CcQ{;ATC`$EEc8?Gt#!5lUtiTD5C$i~GU+uF|#u1|wjSBHT4)-uN#XwYkDt-@e zipS>>H)s=meST%7@2k*0)HSsEf)>c zynw1Zuore;$5s(3Dj(5H<^j*5#}^slZ_+-ah;hY;9E_G(vioWjc9B~d+UlJjd#NxJ zkVkA$%q%3WxpamvimAnmKr5gXIGh484zpe}n!8rMV uMEYWO4h}(Pps_$8zzrl^K{jkG{LVa?U&Rw-9|IG_Zjf^rHplbKVFm#9xFNLw diff --git a/config/.DS_Store b/config/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3113733ad7c78dc28fff8e0faecea3a707d03772 GIT binary patch literal 6148 zcmeHKJ5Iwu5S2DUk3HNJDKRBhlvqkdFewj-wDLQn}$C90G}gl9o$w6W+|M zh(9EP1|gV{X5M-|yMFtm-SHBU>)npJL>(du;Ee4Zginm$vp1~edqSX-Ip&nplrkD4 znwbKoz;9Q8_iiZr^^UHnynh#TlTNz*VV=!&5eLVca125CM(PH=dC{rvR!a$3hW3FsDO-I@I|qhSTBbk9=P2u~5|E^T?3YY>_1-A6D!}b4k{r$f>$ev6AQ{Yc2;Mz$)>0wE}wl)^WwKjsE!`V2m lP?RAEz8p(~OYuHj4DTXt0Ar7ZB6?u^8fp;)%gWdoD literal 0 HcmV?d00001 diff --git a/db/.DS_Store b/db/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c6d4f19f7e8a44e379a7fb070bb6da1fb5cfaa3d GIT binary patch literal 6148 zcmeHLJx{|x47E$4K`b4a(5;O92cZfpOIL^BFfMNd&lT@h}fldq-Pp2a+>3Y9%;T@j3&2r$J-VE zkpa1P1FGnr7W6=k`&X@Wxksm6kE$+;*|MI&lD(fjf4;qbTIKO_`tfLWM)!%E_?a|85Q_1h*3^)VMz`iqpnk|x@D0=S< zI0MeWmH~M`1T?|iFe;{32fDNc0QR9yg0bu+BqkWpduPBIXftr2r$ed#mp||S+d+Qj3^)UO#Q^tADehEWk3h<^wq8oYA`{*-|)mikTu literal 0 HcmV?d00001 diff --git a/lib/.DS_Store b/lib/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..2fa55d78f86864cb15a3f88c5d8a6dbca5404669 GIT binary patch literal 6148 zcmeHK!A`?447JBVow)4CF~6`s2vhe3yK;ar1QM${X>iXU@DF^$qL z6KFzq<-F9flk}ykYa-(5>vBRgCZY-|I2fTRh>VN&WMCE<&s4_i*M1v z=#f2iJc>Iw@F=W*is$2dat53MXW%y&K+YDaE)~6X2AlzBV9$Vj9|BY`8Yad3=|Gc9 z0N@bjEa*!uAu+))8YV@IKv+Y88p>8;u!h4P%r6=yMGYsm;)88vwhD#w>X<)dcjBn% ztux>ZbQw6)+p*;T+41_n8{~J+fHUx~7~o+&ucvq<%dNeKlUy61w@?xBON#ptbaE<& eucYEDXcpLmbb!$?DZ&ErAAwARH_pJHGVlek1Wft> literal 0 HcmV?d00001 diff --git a/test/.DS_Store b/test/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4c204bd16df7b4a25fbabe843a2e85528a81f713 GIT binary patch literal 6148 zcmeHLO-=$a82ySwC$eGba$LHT1DK2i*P`r1LZQs16Erp0web%cHRf#A-W-M=_$VvR1^HM6A$QDpZA5%(b zj8C7YOKczT4tNLtnghIcE7Zlhy`*cb+Qs_48V_o%ZW2$lyX27bwncMhYFn8oPvr*UwQ|;1Kxp82Y7!7kr^X{sYcm4P{av#uLk<8VgQ-SDkd$r;)J>JSVkq4l@zC%hgQ-T{oRo}=e$2?q+)$K^j(8|^Qjtbq zdI!7%t^;fOYn9LcgW~(Y+sJ?O4tNLtl>@5WXf^71C3Chey&RvlA@VsgC+4LZr3ngi i97~0dV*X!25}t)z0Y(N>jff!m9|B^7FT4Z4>c9sWF6a#a literal 0 HcmV?d00001