diff --git a/app/controllers/partners/passwords_controller.rb b/app/controllers/partners/passwords_controller.rb index 29013456..49732f1c 100644 --- a/app/controllers/partners/passwords_controller.rb +++ b/app/controllers/partners/passwords_controller.rb @@ -2,33 +2,33 @@ class Partners::PasswordsController < Devise::PasswordsController # GET /resource/password/new - # def new - # super - # end + def new + super + end # POST /resource/password - # def create - # super - # end + def create + super + end # GET /resource/password/edit?reset_password_token=abcdef - # def edit - # super - # end + def edit + super + end # PUT /resource/password - # def update - # super - # end + def update + super + end # protected - # def after_resetting_password_path_for(resource) - # super(resource) - # end + def after_resetting_password_path_for(resource) + super(resource) + end # The path used after sending reset password instructions - # def after_sending_reset_password_instructions_path_for(resource_name) - # super(resource_name) - # end + def after_sending_reset_password_instructions_path_for(resource_name) + super(resource_name) + end end diff --git a/app/controllers/partners/registrations_controller.rb b/app/controllers/partners/registrations_controller.rb index 4b3e0996..7c0be17e 100644 --- a/app/controllers/partners/registrations_controller.rb +++ b/app/controllers/partners/registrations_controller.rb @@ -1,62 +1,64 @@ # frozen_string_literal: true class Partners::RegistrationsController < Devise::RegistrationsController - # before_action :configure_sign_up_params, only: [:create] - # before_action :configure_account_update_params, only: [:update] + before_action :configure_sign_up_params, only: [:create] + before_action :configure_account_update_params, only: [:update] + layout "new_registration", only: [:new, :create] + layout "edit_registration", only: [:edit, :update] # GET /resource/sign_up - # def new - # super - # end + def new + super + end # POST /resource - # def create - # super - # end + def create + super + end # GET /resource/edit - # def edit - # super - # end + def edit + super + end # PUT /resource - # def update - # super - # end + def update + super + end # DELETE /resource - # def destroy - # super - # end + def destroy + super + end # GET /resource/cancel # Forces the session data which is usually expired after sign # in to be expired now. This is useful if the user wants to # cancel oauth signing in/up in the middle of the process, # removing all OAuth session data. - # def cancel - # super - # end + def cancel + super + end # protected # If you have extra params to permit, append them to the sanitizer. - # def configure_sign_up_params - # devise_parameter_sanitizer.permit(:sign_up, keys: [:attribute]) - # end + def configure_sign_up_params + devise_parameter_sanitizer.permit(:sign_up, keys: [:attribute]) + end # If you have extra params to permit, append them to the sanitizer. - # def configure_account_update_params - # devise_parameter_sanitizer.permit(:account_update, keys: [:attribute]) - # end + def configure_account_update_params + devise_parameter_sanitizer.permit(:account_update, keys: [:attribute]) + end # The path used after sign up. - # def after_sign_up_path_for(resource) - # super(resource) - # end + def after_sign_up_path_for(resource) + super(resource) + end # The path used after sign up for inactive accounts. - # def after_inactive_sign_up_path_for(resource) - # super(resource) - # end + def after_inactive_sign_up_path_for(resource) + super(resource) + end end diff --git a/app/models/partner.rb b/app/models/partner.rb index 58dde174..ee5f0945 100644 --- a/app/models/partner.rb +++ b/app/models/partner.rb @@ -2,7 +2,7 @@ class Partner < ApplicationRecord # Include default devise modules. Others available are: # :confirmable, :lockable, :timeoutable and :omniauthable devise :invitable, :database_authenticatable, - :recoverable, :rememberable, :trackable, :validatable + :recoverable, :rememberable, :trackable, :validatable, :registerable include DiaperBankClient diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index 6a796b05..442036a7 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -9,7 +9,7 @@ <% if @minimum_password_length %> (<%= @minimum_password_length %> characters minimum)
<% end %> - <%= f.password_field :password, autofocus: true, autocomplete: "off" %> + <%= f.password_field :password, autofocus: true, autocomplete: "new-password" %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 0abc0050..11b3d6af 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,18 +1,16 @@ -
-
-

Forgot your password?

- <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> -
- <%= f.label :email %>
- <%= f.email_field :email, autofocus: true, autocomplete: "email", class: 'form-control' %> -
+

Forgot your password?

-
- <%= f.submit "Send me reset password instructions", class: 'btn btn-primary btn-block' %> -
- <% end %> +<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= devise_error_messages! %> - <%= render "devise/shared/links" %> +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true, autocomplete: "email" %> +
+
+ <%= f.submit "Send me reset password instructions" %>
-
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 10ed32a9..ce22153c 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,6 +1,6 @@

Edit <%= resource_name.to_s.humanize %>

-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> +<%= form_for(resource, :as => resource_name, :url => partner_registration_path, :method => :put) do |f| %> <%= devise_error_messages! %>
@@ -32,12 +32,16 @@
- <%= f.submit "Update" %> + <%= link_to "Change your password", edit_partner_registration_path=%>
-<% end %> +
+ <%= f.submit "Update" %> +
+ <% end %> +

Cancel my account

-

Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>

+

Unhappy? <%= button_to "Cancel my account", partner_registration_path, data: { confirm: "Are you sure?" }, method: :delete %>

<%= link_to "Back", :back %> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 602803cf..9192a414 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,6 +1,6 @@

Sign up

-<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> +<%= form_for(resource, :as => resource_name, :url => partner_registration_path) do |f| %> <%= devise_error_messages! %>
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb index c2731dea..e6a3e419 100644 --- a/app/views/devise/shared/_links.html.erb +++ b/app/views/devise/shared/_links.html.erb @@ -1,5 +1,5 @@ <%- if controller_name != 'sessions' %> - <%= link_to "Sign in", new_session_path(resource_name) %>
+ <%= link_to "Log in", new_session_path(resource_name) %>
<% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> diff --git a/app/views/partners/_form.html.erb b/app/views/partners/_form.html.erb index 3ffd272c..bfe1e4b7 100644 --- a/app/views/partners/_form.html.erb +++ b/app/views/partners/_form.html.erb @@ -613,6 +613,9 @@
<%= link_to "Cancel Update", partner_requests_path, class: "btn btn-danger float-right" %>
+
+ <%= link_to "Change your password", edit_partner_registration_path %> +
diff --git a/config/routes.rb b/config/routes.rb index 5dfacf20..2d3b7186 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,9 @@ Rails.application.routes.draw do - devise_for :partners, controllers: { sessions: "partners/sessions" } - devise_scope :partner do + devise_for :partners, controllers: { sessions: "partners/sessions", registrations: "partners/registrations" }, skip: [:registrations] + devise_scope :partner do # , :skip => [:registrations] # do we need this? get "/partners/sign_out" => "devise/sessions#destroy" + get "partners/edit" => "devise/registrations#edit", :as => "edit_partner_registration" + put "partners" => "devise/registrations#update", :as => "partner_registration" end resources :partners do @@ -20,3 +22,4 @@ get "pages/:name", to: "static#page" root "static#index" end + diff --git a/spec/features/password_change_test.rb b/spec/features/password_change_test.rb new file mode 100644 index 00000000..62e29112 --- /dev/null +++ b/spec/features/password_change_test.rb @@ -0,0 +1,55 @@ +require "rails_helper" + +RSpec.feature "Changing Password To Existing Partner", type: :feature do + let(:parner_email) { "diapers@example.com" } + let(:old_password) { "Abc123$!#" } + let(:new_password) { "Xyz%@#321" } + + before(:each) do + let(:partner) do + create(:partner, + email: partner_email, + password: old_password) + end + visit "/partners/sign_in" + within("form") do + fill_in "EMAIL", with: partner_email + fill_in "PASSWORD", with: old_password + end + click_button "Login" + end + + context "Update Partner" do + scenario "should be successful" do + visit "/partners/1/edit" + click_link "Change your password" + within("form") do + fill_in "Email", with: partner_email + fill_in "Password", with: new_password + fill_in "Password confirmation", with: new_password + fill_in "Current password", with: old_password + end + click_button "Update" + + expect(page).to have_content "Your account has been successfully updated" + + visit "/partners/sign_in" + within("form") do + fill_in "EMAIL", with: partner_email + fill_in "PASSWORD", with: new_password + end + click_button "Login" + + expect(page).to have_content "Signed in successful" + + visit "/partners/sign_in" + within("form") do + fill_in "EMAIL", with: partner_email + fill_in "PASSWORD", with: old_password + end + click_button "Login" + + expect(page).to have_content "SIGN IN" + end + end +end diff --git a/sword_path(resource_name b/sword_path(resource_name new file mode 100644 index 00000000..43ff1cd3 --- /dev/null +++ b/sword_path(resource_name @@ -0,0 +1,1160 @@ +commit a9aca21536a028f8d43a3895f9445ee5422537ce (HEAD -> 2_update_and_change_password, origin/2_update_and_change_password) +Author: jessicakcao +Date: Thu Feb 28 18:55:04 2019 +0000 + + WIP password change: routes and view. Not working yet. + +commit 398929f587b8701a8575316e089cd7d1245ee6b0 (origin/master, origin/HEAD, master) +Merge: f79509b 86209bd +Author: Sean Marcia +Date: Sun Jan 27 13:16:22 2019 -0500 + + Merge pull request #74 from IlinDmitry/possible_url_injection + + Check the `:page` action for possible URL injection + +commit f79509b01435e52a2e40df21d72310551b642d86 +Merge: 42decd3 dd7e6a1 +Author: Sean Marcia +Date: Sun Jan 27 13:04:50 2019 -0500 + + Merge pull request #76 from nihonjinrxs/master + + Allow specifying database hostname via PG_HOST env var + +commit dd7e6a1a4a8d1446dafa7132949b2dc183394f91 +Author: Ryan B. Harvey +Date: Sat Jan 26 23:14:14 2019 -0600 + + Document change to database config in README + +commit 4108399ac1e87250aa8fba818049003da8882bbe +Author: Ryan B. Harvey +Date: Sat Jan 26 23:10:27 2019 -0600 + + Allow specifying database hostname via PG_HOST env var + +commit 86209bd3b0745e88c8bcdeedaeb14a0c00034cb7 +Author: IlinDmitry <339966289@mail.ru> +Date: Fri Jan 25 11:54:24 2019 +0300 + + Check the `:page` action for possible URL injection + +commit 42decd3496ccd58aaebf9f7f82a7222514fc74b6 +Author: Sean Marcia +Date: Wed Jan 23 18:29:45 2019 -0500 + + Gemfile update + +commit 9bc258ced05bc87493d0b0563eb2d60ad425067f +Merge: b01d104 f1d3564 +Author: Sean Marcia +Date: Sat Dec 22 11:41:52 2018 -0500 + + Merge branch 'master' of github.com:rubyforgood/partner + +commit b01d104654d56c4908a86723ff53f70a368bd670 +Author: Sean Marcia +Date: Sat Dec 22 11:41:47 2018 -0500 + + Update the invitation email to make it more agnostic. + +commit f1d35640e9b5cb8b895ba21cf66d404c676d2227 +Merge: 2e85604 3434bf9 +Author: Sean Marcia +Date: Sat Dec 22 10:47:23 2018 -0500 + + Merge pull request #69 from fv42wid/master + + WIP Add partners controller specs #51 + +commit 3434bf9036c19e1d9d6c3473ab0eb2ee5b5c0eb4 +Author: Frank Vinci +Date: Fri Dec 21 14:40:59 2018 -0500 + + fix rubocop violations + +commit fe11379f360c89aafac958fe36084f2b71835900 +Author: Frank Vinci +Date: Thu Dec 20 14:39:55 2018 -0500 + + finish partners controller html request specs + +commit ea15b49311b97f50ee7880f8355d0f36faa08179 +Merge: d8ab147 2e85604 +Author: Frank Vinci +Date: Thu Dec 20 12:33:53 2018 -0500 + + add partners_controller specs + +commit 2e8560427ab3cc597fd23eb26c1f3deef6783109 +Merge: 87d370b 15af1da +Author: Sean Marcia +Date: Tue Dec 18 16:40:34 2018 -0500 + + Merge pull request #68 from rubyforgood/new_theme + + New theme + +commit 15af1da3a493e9b3b6a2375ac6f70396b96590bb +Author: Sean Marcia +Date: Mon Dec 17 22:13:06 2018 -0500 + + Last bit of clean up. + +commit 357c9e40f522d14784e85f711ac2142d08847fa1 +Author: Sean Marcia +Date: Mon Dec 17 18:59:37 2018 -0500 + + Test and rubocop fix + +commit 6cdc9006f76b70c29b6d5ec3b32304e48aa76d81 +Author: Sean Marcia +Date: Mon Dec 17 18:05:22 2018 -0500 + + Fix some styling + +commit 6a31e2b73d7fdaafbc8da2098efc082d727f957d +Author: Sean Marcia +Date: Mon Dec 17 18:05:05 2018 -0500 + + UPdate the form to use new theme + +commit 8d7b53bc41c94536cbb5f002c671eb10c2c823cb +Author: Sean Marcia +Date: Sun Dec 16 23:10:47 2018 -0500 + + Make the partner request more usable in dev/staging + +commit 87d370b429ad196d11dc8141fc3d5bec645bc5e9 +Author: Sean Marcia +Date: Sat Dec 15 16:04:35 2018 -0500 + + Adding in menstrual categories as requested by our users. Also did a little bit of cleanup on the password reset page. + +commit e59c055d800ac76dd993ef71f848eb199b47ecab +Author: Sean Marcia +Date: Sun Dec 16 22:50:10 2018 -0500 + + Add the edit partner link to the sidebar. + +commit 81ee6fe27aed82302dc5354d55f34739d0f7e887 +Author: Sean Marcia +Date: Sun Dec 16 22:25:39 2018 -0500 + + Rubocop fixes and adding in alerts. + +commit 36d0d64f9d9aef5aed6f15cf34f82ffca49a4f92 +Author: Sean Marcia +Date: Sun Dec 16 16:50:56 2018 -0500 + + Finish up devise login/logout stuff + +commit 48cfe59e337081dc2028eb4565e25ef32d6cbd6b +Author: Sean Marcia +Date: Sun Dec 16 16:42:44 2018 -0500 + + Update login page and forgot password page. + +commit edee48585a145a01ae22d6e4a72bf61587c496ca +Author: Sean Marcia +Date: Sun Dec 16 16:29:56 2018 -0500 + + WIP + +commit 16f9bc6b024c2398921dccdecb5ca5b2a79e7bbe +Merge: fa6afbc 637b832 +Author: Sean Marcia +Date: Sun Dec 16 14:53:59 2018 -0500 + + WIP + +commit fa6afbc1a2dc70685d0cc276719017abdb400140 +Author: Sean Marcia +Date: Sun Dec 16 14:50:39 2018 -0500 + + WIP + +commit 637b8323ff01e5d32fa36dee7bd62f35a26a0d60 +Author: Frank Vinci +Date: Thu Dec 13 15:16:31 2018 -0500 + + add partner_requests_controller specs #51 + +commit d8ab1473ffa2ac63aed08af903816070b3b13206 +Author: Frank Vinci +Date: Thu Dec 13 15:16:31 2018 -0500 + + add partner_requests_controller specs #51 + +commit b699f090333d21d37b0abdc9596ce2a951395d72 +Merge: f48fa9c ea7eda6 +Author: Frank +Date: Wed Dec 12 12:37:26 2018 -0500 + + Merge pull request #1 from rubyforgood/master + + sync fork + +commit ea7eda6b23c5107b5fe9fd939ae6dbb7db0ddcea +Author: Chase Southard +Date: Mon Dec 10 23:12:44 2018 -0500 + + just some cleanup + +commit 632f6cfadf653e450424f1dbdc74362d2ce0b570 +Author: Sean Marcia +Date: Wed Dec 5 22:21:28 2018 -0500 + + Parse the result + +commit 7cb5e2409387c23662fc18ed48534c21993f8c7d +Author: Sean Marcia +Date: Wed Dec 5 22:01:36 2018 -0500 + + WIP + +commit 169b6b226d1a3f69e902eac0e82edc9422d4d87a +Author: Frank Vinci +Date: Sun Dec 9 15:09:33 2018 -0500 + + style the login form issue #28 + +commit f48fa9c70dc75139c60c1ad6229b48c769eb02f7 +Author: Frank Vinci +Date: Sun Dec 9 15:09:33 2018 -0500 + + style the login form issue #28 + +commit 35284ffc6f2e4e9a044a35936d9fa95998c0ee93 +Author: Sean Marcia +Date: Wed Dec 5 21:31:38 2018 -0500 + + Update .travis.yml + +commit aafc5217b1e9258db94dc223e0d71dd44db96792 +Author: David Curtis +Date: Sun Dec 2 16:05:05 2018 -0500 + + Lint. + +commit 133726947158eaa559551d684ae7a4cc9ff87dfd +Author: David Curtis +Date: Sun Dec 2 15:55:43 2018 -0500 + + Adds and updates partners and partner requests controller specs. + +commit 2c36f56edc0d454ca45f94598f4ae546dceea16b +Author: David Curtis +Date: Sun Dec 2 15:54:23 2018 -0500 + + Makes @partner available in specs. + +commit 5c38af64fbe7b5546e775a8227bf6bb43ab03537 +Author: David Curtis +Date: Sun Dec 2 15:53:49 2018 -0500 + + Sets up user not logged in shared example. + +commit dd6d67ac165c5b62e09bb9358f343497809a0917 +Author: David Curtis +Date: Sun Dec 2 13:33:20 2018 -0500 + + Adds partner and partner request specs; updates partner request model. + +commit 0b6b85dea571aef3d290ea1c3b36a2a7e6361bfe +Author: David Curtis +Date: Sun Dec 2 12:35:43 2018 -0500 + + Adds shoulda matchers for specs. + +commit 755bf5c179862b7b51416f2d9b676cc67a0df14f +Author: David Curtis +Date: Mon Nov 26 14:39:30 2018 -0500 + + Adds partner request spec for missing item quantity. + +commit 46fe52fd366b9df610c5859798b8793970e51e7c +Author: David Curtis +Date: Mon Nov 26 11:43:55 2018 -0500 + + Replace spec_helper with rails_helper in .rspec file. + +commit c830045bf851fa04a7907f677ea855c01eac71ba +Author: David Curtis +Date: Mon Nov 26 11:25:58 2018 -0500 + + Removes explicit calls to FactoryBot; remove unused spec. + +commit 4009927058ebcfb4d24fef9324281fa2859809ac +Merge: a5de22c 80911c3 +Author: Sean Marcia +Date: Fri Nov 30 15:53:18 2018 -0500 + + Merge branch 'master' of github.com:rubyforgood/partner + +commit a5de22c6f4c74d35d560c40515190db6fb3e966f +Author: Sean Marcia +Date: Fri Nov 30 15:51:55 2018 -0500 + + Add favicon + +commit 80911c33bd10f01f2c0d63accb72c3baf4154fa1 +Author: David Curtis +Date: Mon Nov 26 09:26:49 2018 -0500 + + Updates ruby version to 2.5.3 in README, rubocop, and prod deploy config. + +commit b5a6f10b34c7a226534810a6108d944e57ef4bb9 +Author: Chase Southard +Date: Fri Nov 23 12:46:17 2018 -0500 + + clean up the rubocop violations from the past + +commit 6e2eee895f92dd53c0a8740c8090b5ed2268f7af +Author: Chase Southard +Date: Fri Nov 23 12:10:12 2018 -0500 + + adds file paths into export_json content + + for proof_of_partner_status, proof_of_form_990, and documents + +commit 49bab7e543ea3d0c6a4e88bde1d3f8adb60a3113 +Author: Sean Marcia +Date: Tue Nov 20 23:06:52 2018 -0500 + + Forgot to update travis ruby + +commit cff5f20c75b7bc104ccdb5f86baf602fe48ea4b5 +Author: Sean Marcia +Date: Tue Nov 20 22:44:53 2018 -0500 + + Deploy to staging + +commit f73b25883957edf24ec890666c277d97aa50ed85 +Author: Sean Marcia +Date: Tue Nov 20 22:32:06 2018 -0500 + + Gemfile + +commit a47d5c6cd6b5e61aa23dd12f982f5a3a13442252 +Author: Sean Marcia +Date: Tue Nov 20 22:04:33 2018 -0500 + + Ruby 2.5.3 update + +commit c8658a824a1252da3df405730db3e890ab68877d +Merge: 396ffb2 f2e9a78 +Author: Sean Marcia +Date: Tue Nov 20 21:48:03 2018 -0500 + + Merge branch 'master' of github.com:rubyforgood/partner + +commit 396ffb26f00655882746c37e506c435dfc98d916 +Author: Sean Marcia +Date: Tue Nov 20 21:47:37 2018 -0500 + + Setting up staging server. + +commit f2e9a785ce78bc3b9fa4bb1e6e70cce16036da03 +Author: Francisco Saldaña +Date: Mon Nov 19 16:11:56 2018 -0600 + + add tests to partner controller + +commit 224635e4c62f4d3533d0210a8fcf7e8072226953 +Author: Chase Southard +Date: Sat Nov 17 22:51:15 2018 -0500 + + adds nav to other views + +commit 0bda1225b8cd32ff3acc3c81175da731571d043b +Author: Chase Southard +Date: Sat Nov 17 22:50:46 2018 -0500 + + add authorization for partner_requests + +commit 8a80dae22661c2728871d0af922e0d1d99dba52f +Author: Chase Southard +Date: Sat Nov 17 22:14:13 2018 -0500 + + adds partner policy with CRUD actions + +commit 24d0508df8806a85c12d30af9e032ab38975bcbe +Author: Chase Southard +Date: Sat Nov 17 22:13:44 2018 -0500 + + adds the base pundit policy + +commit 5eae577993d07909bc63d5504f04fabba1e18aaf +Author: Chase Southard +Date: Sat Nov 17 22:12:35 2018 -0500 + + adds pundit authorization to partners_controller + +commit 81ebd329f22cb000925cb29a388ec10b269e8d17 +Author: Chase Southard +Date: Sat Nov 17 22:11:27 2018 -0500 + + include pundit in the application_controller + +commit 26538896f2ef45b062ad8e3d1939317ad5b45e79 +Author: Chase Southard +Date: Sat Nov 17 22:10:42 2018 -0500 + + adds pundit for authorization + +commit b56c28c9140caa1c80daf0e3a481cab8faeeb8ed +Author: Chase Southard +Date: Sat Nov 17 23:47:07 2018 -0500 + + update readme + +commit c337ef5452f2e3d13363c54c441886d73933a210 +Author: Chase Southard +Date: Sat Nov 17 23:41:39 2018 -0500 + + update seeds to match what's in diaperbase readme + +commit 1ea7e2e0b504f6526812eb5a575eae2198b902a7 +Merge: f5c636d 846c41a +Author: Sean Marcia +Date: Sat Nov 17 16:42:56 2018 -0500 + + Merge pull request #42 from josisusan/small-refactor + + Refactor on model and services + +commit 846c41a2ed410ef5a4a3222f6fc71d1d57c8d162 +Author: josisusan +Date: Thu Nov 15 08:47:29 2018 +0545 + + Refactor: Use DRY principle. + +commit 5e70b3bc43e8847bfa3681eb184d199eba54155f +Author: josisusan +Date: Thu Nov 15 08:45:01 2018 +0545 + + Method refactor for formatted_item_hash. + + - Use each_with_object method for cleaner approach. + - Add spec for the method. + +commit 9a7f716e4c77dc126adf74f077ade20927764ddf +Author: josisusan +Date: Thu Nov 15 08:41:48 2018 +0545 + + Add spec to Item model. + +commit f5c636d80d39af96e3c3a5aea66c94faaaeeb4e0 +Author: Sean Marcia +Date: Fri Nov 2 21:58:14 2018 -0400 + + Mailer + +commit dee1b8ed12d92547fe8400180404a6bc4768f5c2 +Author: Sean Marcia +Date: Fri Nov 2 21:17:17 2018 -0400 + + Devise views + +commit 6062093cb0ee344464994bf38a98ffe3578b6c86 +Author: Sean Marcia +Date: Fri Nov 2 09:34:32 2018 -0400 + + tests + +commit 4f03159040d91bbe77abbcc57f3ff6208bbb3d63 +Author: Sean Marcia +Date: Fri Nov 2 09:29:02 2018 -0400 + + Bootstrap theme + +commit a4714d682dc2d7d44117eb638d5ba7827c3710c2 +Author: Sean Marcia +Date: Fri Nov 2 00:00:30 2018 -0400 + + Test fix + +commit 0f888fbf13e40e0e7f67e95009c46c9ee10fda7b +Author: Sean Marcia +Date: Thu Nov 1 23:58:31 2018 -0400 + + Rubocop and some basic formatting fixes. + +commit 5bce0f05d0c68e835eed4083199fcaafc83c4c60 +Merge: bf5c100 d59b5d0 +Author: Sean Marcia +Date: Thu Nov 1 22:12:37 2018 -0400 + + Merge branch 'master' of github.com:rubyforgood/partner + +commit bf5c10086106abd335ff616f0cace1e0d219d8e1 +Author: Sean Marcia +Date: Thu Nov 1 22:12:28 2018 -0400 + + Partner fix + +commit d59b5d0edce43fc4ba12a0525c004b57578e1c73 +Merge: 610795f 2fcb029 +Author: Sean Marcia +Date: Thu Nov 1 21:30:21 2018 -0400 + + Merge pull request #39 from tmr08c/partners-api-post-tests + + Adds request specs for the Partners API endpoint. + +commit 610795fe58553e0f4e70b152ac877c29307aee02 +Merge: cb342dc 3165a9c +Author: Sean Marcia +Date: Thu Nov 1 21:29:15 2018 -0400 + + Merge pull request #40 from separatio/patch-2 + + Refine tests for quantity + +commit cb342dceedb5f8e51c58845d690276b8a0aa0877 +Merge: 5858bfc 844aa3c +Author: Sean Marcia +Date: Thu Nov 1 08:24:27 2018 -0400 + + Merge pull request #41 from rubyforgood/27_add_partner_info_on_show_view + + 27 add partner info on show view + +commit 844aa3cd063b672362256b4d8140a6a03d9cc969 (origin/27_add_partner_info_on_show_view) +Author: Chase Southard +Date: Wed Oct 31 23:29:21 2018 -0400 + + adds card divs for better styling + +commit fc6f25ee533fbdfdddba877c217a52419b1c6837 +Author: Chase Southard +Date: Wed Oct 31 22:52:48 2018 -0400 + + we don't need this one + +commit 6d715c2dedfecffec536625e12554d3a2a0c260d +Author: Chase Southard +Date: Wed Oct 31 22:52:01 2018 -0400 + + dang. missed another `@`. thankfully we have tests + +commit 9f8f17d6cd7c26e5b41595d76b6072db199548f7 +Author: Chase Southard +Date: Wed Oct 31 22:46:00 2018 -0400 + + ack! missed a `@` + +commit 2232474686bb9e204062abb09a575bedfefe34b4 +Author: Chase Southard +Date: Wed Oct 31 22:41:24 2018 -0400 + + adds helper spec for humanize_boolean + +commit 5b72f164af0d6891379570eaab5df97019887ac2 +Author: Chase Southard +Date: Wed Oct 31 22:23:01 2018 -0400 + + add humanize_booleanadd humanize_booleanadd humanize_booleanadd + humanize_booleanadd humanize_booleanadd humanize_booleanadd + humanize_booleanadd humanize_booleanadd humanize_boolean + +commit f13a0646496e4d26ca5c4a57171d60ef15f612ee +Author: Chase Southard +Date: Wed Oct 31 22:11:23 2018 -0400 + + ok. list out partner data in def lists + +commit 5858bfcc53c631f6fbdcd8f700c525405a2ad703 +Author: Sean Marcia +Date: Wed Oct 31 17:37:23 2018 -0400 + + Azure fix + +commit 3165a9cb5b82b2975754d1ee7ee557d8874c0672 +Author: Alex Radulescu +Date: Wed Oct 31 23:04:07 2018 +0200 + + Refine tests for quantity + +commit 2fcb029e237b6d37370414afcb2bdd65a455f296 +Author: tmr08c +Date: Tue Oct 30 21:42:52 2018 -0400 + + Adds request specs for the Partners API endpoint. + + Adds specs for testing the POST/create action of `Api::V1::PartnersController`. + + Tests: + + - Making a request with an empty body + - Make requests with a valid body + +commit c603f8af6d9040be70cc92dc8ee8c9e1887753d5 +Merge: 4eea209 b4090a8 +Author: Sean Marcia +Date: Tue Oct 30 21:32:49 2018 -0400 + + Merge pull request #38 from tmr08c/standardize-html-title + + Standardized page title value. + +commit b4090a8553d2a5b13dee37e74fe0034a674744e6 +Merge: 9679d28 4eea209 +Author: Sean Marcia +Date: Tue Oct 30 21:32:39 2018 -0400 + + Merge branch 'master' into standardize-html-title + +commit 4eea2098a3ff072120a48c61eb2f3190e9e6e4e7 +Merge: 0fcff26 091a4e3 +Author: Sean Marcia +Date: Tue Oct 30 21:28:59 2018 -0400 + + Merge pull request #36 from tmr08c/update-diaper-bank-client-prod-check + + Updates environment check in `DiaperBankClient`. + +commit 0fcff26d39d711a817df4e64936362ab705dd663 +Author: Chase Southard +Date: Tue Oct 30 21:28:22 2018 -0400 + + approved partners can make requests (#33) + + * list of items as a constant hash + + * adds partner requests + + * show submit for approval if approved + + * adds items that belong to partner requests + + * remove partners.coffee; adds partner_requests + + * somehow missed this one + + * text area not text field + + * requests belong to partners + + * not the best receipt UI but functional + + * get all of the tests to run and pass + + * probably should have some sent state for requests + + * some validations on items + + * quantity should be done in whole step, min 1 + + * use the correct button text; add cancel + + * adding serializer via blueprinter + + i'm not sure if this is the best way to go yet + + * remove create view. + + * show errors on the thanks page + + the controller might add an error to if we fail to send the request + + * adds a request submission post + + first pass at this + + * update state if request sent or add to errors hash + + * actually use dotenv + + * run migrations after rebase + + * status verified + + * clean up partner show page + + * more partner show cleanup + + * sign out uses the delete method + + * sent got lost in the shuffle + + * adds tests for verified? + + * forgot the null false and default false for sent + + * update validations for partner_request and item + + * update factories + + * add some tests even if prefunctory + + * remove blueprinter in favor of export_json method + + * missed an n in partner + + * ack! remove last remnants of blueprinter + + * swap thanks for show; use the given conventions + + * adds a pending? method; conditionally disable approval btn + + * adds an index view of partner requests + + * you don’t have to pass partner here. + + * clean up show and index partner_request views + + * use the same button language everywhere + + * don't allow partner to edit their own status + + * don't allow partner to edit their own status + +commit 9679d282c859394a91ce1fd2e2dabb4b7278f788 +Author: tmr08c +Date: Tue Oct 30 20:21:35 2018 -0400 + + Standardized page title value. + + Updates the `` tag for `static#index` and the application layout to match + branding elsewhere in the app ("Partner Base"). + +commit 091a4e3694cf91bd1b2aa79a98b8fac5ff984b84 +Author: tmr08c <tmr08c@gmail.com> +Date: Tue Oct 30 17:30:24 2018 -0400 + + Updates environment check in `DiaperBankClient`. + + Updates the check for whether or not we are in production in + `DiaperBankClient.post` to use the `#production?` helper instead of checking the + string `"production"`. + +commit eef10908af656a4f19e3eafae7ecb56225ff5da8 +Merge: 93414b4 53734df +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 28 16:31:27 2018 -0400 + + Merge pull request #26 from chaserx/create_seeds_for_partner + + adds a couple of partners in seeds, approved and pending + +commit 53734dfc02d2d61e9bbfac201c981d4b32c72080 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 28 16:26:51 2018 -0400 + + Update seeds.rb + +commit 93414b4accfee7d9354f2e8d8a3d30f6f546e52a +Merge: f77470c 29fa42e +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 28 16:26:24 2018 -0400 + + Merge pull request #25 from chaserx/add_dotenv_to_gitignore + + Adds .env to gitignore; Updates README.md accordingly. + +commit f77470cb55da095f0045bb4a4a3667b8fdf66621 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 28 16:01:20 2018 -0400 + + Basic bootstrap layout + +commit 9fbb50641cc875e12fbc1c1268561bdd96b11df7 +Merge: 1174e6b 8190723 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 28 15:10:52 2018 -0400 + + Merge pull request #24 from marcelkooi/7-add-registration-form + + Add registration form + +commit 57b9c3ec3e6cab95014b5ae4cc43904dc686774a +Author: Chase Southard <chase.southard@gmail.com> +Date: Sat Oct 27 15:29:04 2018 -0400 + + adds a couple of partners approved and pending + +commit 81907238e6fa9c3cd51e5afdaa2fd1b40f1b35fe +Author: Marcel Kooi <1marcelkooi@gmail.com> +Date: Sat Oct 27 15:01:01 2018 -0400 + + Add tests for uploading + +commit 997780f20fff11bd94bb4c8b65f5f4d6db2fe30d +Author: Marcel Kooi <1marcelkooi@gmail.com> +Date: Sat Oct 27 14:52:21 2018 -0400 + + Add ActiveStorage and styling + +commit 29fa42e312e064dd58d138cf475bf36381c3da76 +Author: Chase Southard <chase.southard@gmail.com> +Date: Sat Oct 27 12:00:22 2018 -0400 + + copies over some setup docs from diaper + +commit 8b2633e107468868111d8298dcdbba1dc2b3566d +Author: Chase Southard <chase.southard@gmail.com> +Date: Sat Oct 27 11:55:22 2018 -0400 + + adds .env to .gitignore + +commit 72b5a9e2f14550c976063563844c853eabf86385 +Author: Marcel Kooi <1marcelkooi@gmail.com> +Date: Fri Oct 26 16:51:14 2018 -0400 + + Add specs for filling out registration form + +commit 44d7d298c20e4818489404c0a557f6f32f4e4e9d +Author: Marcel Kooi <1marcelkooi@gmail.com> +Date: Wed Oct 24 09:03:20 2018 -0400 + + Fix attribute names to match db columns + +commit 1a43dacea64f77d290c2a9431dce73160042851b +Author: Marcel Kooi <1marcelkooi@gmail.com> +Date: Tue Oct 23 22:20:14 2018 -0400 + + Modified form to include correct field name and type + +commit 85f148ca40415ab78832af00fb7f76d3d228a610 +Author: Marcel Kooi <1marcelkooi@gmail.com> +Date: Tue Oct 23 21:28:24 2018 -0400 + + Add all fields + +commit 1174e6bf51f9489e9b9b311725474384738289c7 +Author: Sean Marcia <smarcia@gmail.com> +Date: Mon Oct 22 21:08:50 2018 -0400 + + Finish partnerbase spike + +commit aa68d3d2402607efc8d7bef37312b39ab1ccfc82 +Author: Sean Marcia <smarcia@gmail.com> +Date: Mon Oct 22 20:54:56 2018 -0400 + + Mail options + +commit 2b5db19ee99f8100c70b13cbcf445a5e42581821 +Author: Sean Marcia <smarcia@gmail.com> +Date: Mon Oct 22 20:39:46 2018 -0400 + + Spiking + +commit 3125f060d80d74b08d0331be6efe28530b746145 +Author: Sean Marcia <smarcia@gmail.com> +Date: Mon Oct 22 20:37:30 2018 -0400 + + Spiking + +commit 590a81bee31bec31086b8801541ecf48f4da08e4 +Merge: 1752863 f087a12 +Author: Sean Marcia <smarcia@gmail.com> +Date: Mon Oct 22 17:50:09 2018 -0400 + + Merge pull request #23 from rubyforgood/integration_spike + + More feature spiking for national conf + +commit f087a12aab3cbb0c8e23eaefa0b924d3d47bddf8 (origin/integration_spike) +Author: Sean Marcia <smarcia@gmail.com> +Date: Mon Oct 22 17:49:27 2018 -0400 + + More feature spiking for national conf + +commit 175286347c8337b4de56587babce643b84994e9e +Author: Sean Marcia <smarcia@gmail.com> +Date: Mon Oct 22 17:41:15 2018 -0400 + + Update static_controller.rb + +commit a14fa5292a2ec7bb06f4d0b21efa6f03acbbea8c +Merge: 26a358a 3fc3c56 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 21 17:35:17 2018 -0400 + + Merge pull request #22 from cflipse/api + + render a nested partner structure + +commit 3fc3c56bb41b27c5008a183c4be75167630fcc92 +Author: Chris Flipse <cflipse@digitalocean.com> +Date: Sat Oct 20 18:41:50 2018 -0400 + + render a nested partner structure + + ref #9 + +commit 26a358a604ba148a81807e0072bf0ed79ec8f9e5 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sat Oct 20 13:45:16 2018 -0400 + + Update + +commit cd25fbd94e303a5233d9da3a74b8f381b410d9c6 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sat Oct 20 13:41:18 2018 -0400 + + require api-key for partner creation. + +commit 19124870055bc4016866d56f797a2c57293f68a1 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sat Oct 20 13:38:54 2018 -0400 + + require api-key for partner creation. + +commit 7d4a85b774f9298e57e6653478e069f05c4acf4b +Author: Sean Marcia <smarcia@gmail.com> +Date: Sat Oct 20 13:23:31 2018 -0400 + + require api-key for partner creation. + +commit 5f29cf4cc6e9ebfe5986fec392cf8d515bc88881 +Author: Sean Marcia <smarcia@gmail.com> +Date: Thu Oct 11 14:43:40 2018 -0700 + + First pass at putting in partnerbase landing page. + +commit 942beb3c09f00ea44c166a937fa3e630e8b47259 +Author: davidshr10 <1936038+davidshr10@users.noreply.github.com> +Date: Mon Oct 8 19:41:45 2018 -0400 + + Allow users to follow email link and register in the app + +commit 8cbfd226be839444598dc924ee5e184b96bd90c5 +Author: davidshr10 <1936038+davidshr10@users.noreply.github.com> +Date: Thu Oct 4 21:57:46 2018 -0400 + + Create a partner when a POST request is received at /api/v1/partners + +commit 309974a557f3364b282e04f7ae97436a10600b5d +Author: davidshr10 <1936038+davidshr10@users.noreply.github.com> +Date: Tue Oct 2 23:25:41 2018 -0400 + + Setup user registration api + +commit 749c2c929303a74c5d67c366f09e128463fb6dda +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 7 15:31:32 2018 -0400 + + testing + +commit 8f7669047848e9c0fe0117fe8086adb551a37177 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 7 15:18:54 2018 -0400 + + Final piece for travis deploy + +commit 4ba0c1786717154d9e6702a94d394d813bdbb9ae +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 7 15:10:58 2018 -0400 + + Final piece for travis deploy + +commit ea4f94c12bd6064598c8b776c50551e88db97ed1 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 7 15:06:54 2018 -0400 + + Test of the serve + +commit 1c14e651c80dcedb9d6f4200391376cbda9eb15c +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 7 14:45:49 2018 -0400 + + Setting up new server + +commit d8a2d143a42169c8d093cfc5bb1a9dfa76ae2d81 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 7 14:44:53 2018 -0400 + + Setting up new server + +commit 99c44e52bf6c825ea457c983e7593004ed79f820 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 7 14:40:15 2018 -0400 + + Setting up new server + +commit 40e5e15b65f9d1e73f4647dd25607ce943ae22ea +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 7 14:38:13 2018 -0400 + + Setting up new server + +commit 01383c6db95d25f804868836e1c14a580ad85d19 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sun Oct 7 14:37:25 2018 -0400 + + Setting up new server + +commit 6c57c0dcde73b465bf56a0cf40e28851b1752dec +Merge: 706e49a ee8847a +Author: Sean Marcia <smarcia@gmail.com> +Date: Sat Oct 6 23:49:06 2018 -0400 + + Merge branch 'master' of github.com:rubyforgood/partner + +commit ee8847a77d98db13ce49ed25fa276da97702d71c +Merge: 82de506 f92b221 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sat Oct 6 16:12:51 2018 -0400 + + Merge pull request #20 from rubyforgood/setup-travis + + Setup travis ci + +commit f92b2212ce3a6c1473f1a9ebb4d08a3c78bf9761 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sat Oct 6 16:07:50 2018 -0400 + + Update .travis.yml + +commit 5a0c8ddbe03a1d108ff25b78df32d41154983480 +Author: davidshr10 <1936038+davidshr10@users.noreply.github.com> +Date: Thu Oct 4 22:23:38 2018 -0400 + + Setup travis ci + +commit 82de50607a06c089956f734bc134aa2b553fe675 +Author: davidshr10 <1936038+davidshr10@users.noreply.github.com> +Date: Thu Oct 4 22:10:02 2018 -0400 + + Add build status in README + +commit 663c043d2b776555b858e5a5bebafdbf41d77af5 +Author: davidshr10 <1936038+davidshr10@users.noreply.github.com> +Date: Thu Oct 4 22:10:02 2018 -0400 + + Add build status in README + +commit c9ee68fffaa22d93fc5702c1be32f9c57a45b893 +Author: David S <1936038+davidshr10@users.noreply.github.com> +Date: Thu Oct 4 19:16:36 2018 -0400 + + Created a pull request template + +commit b1e9cb09d12840057e1e49d9b43d300e48ff87f5 +Author: vntheeb <cuongnm265@gmail.com> +Date: Thu Oct 4 02:02:49 2018 +0700 + + Add bootstrap 4 + +commit 9e6a2c730b660fca5885986d61612761532ad31a +Author: davidshr10 <1936038+davidshr10@users.noreply.github.com> +Date: Wed Oct 3 19:15:31 2018 -0400 + + Adding FactoryBot to the project with a test example + + Resolves #12 + +commit 51e68500fd84b30c0cb432b003807f25ed0fd786 +Merge: 978ed83 6b76a49 +Author: Sean Marcia <smarcia@gmail.com> +Date: Mon Oct 1 21:19:58 2018 -0400 + + Merge pull request #4 from rubyforgood/rspec-setup + + Setup rspec + +commit 706e49a464a761b51de23a276bb32b731a0fa485 +Author: Sean Marcia <smarcia@gmail.com> +Date: Mon Oct 1 21:17:24 2018 -0400 + + lets encrypt + +commit 978ed830d6f01013d64e3e8d2b5e30b9fa1aee6d +Merge: e97927e 9eec520 +Author: David S <1936038+davidshr10@users.noreply.github.com> +Date: Mon Oct 1 21:12:22 2018 -0400 + + Merge pull request #3 from rubyforgood/add_documents + + documentation and readme. + +commit 6b76a49df6719e3b94d4346713ccac5bde0a50ca +Author: davidshr10 <1936038+davidshr10@users.noreply.github.com> +Date: Mon Oct 1 21:09:13 2018 -0400 + + Setup rspec + +commit e97927e61a1f80aebcdd507c85de3dba216b9080 +Author: Sean Marcia <smarcia@gmail.com> +Date: Mon Oct 1 21:06:29 2018 -0400 + + lets encrypt + +commit 9eec5206d950264e59d115a2af22ebf2b6d498bf +Author: Sean Marcia <smarcia@gmail.com> +Date: Mon Oct 1 19:34:42 2018 -0400 + + documentation and readme. + +commit d4c9b26efcdd51328e0c8fb2c438a5f172e1d202 +Merge: fc18d65 99577a8 +Author: David S <1936038+davidshr10@users.noreply.github.com> +Date: Wed Sep 19 23:53:43 2018 -0400 + + Merge pull request #2 from davidshr10/master + + Cleanup Gemfile with rubocop + +commit 99577a87e87976bd85de8a43d005a783b0fa67eb +Author: davidshr10 <1936038+davidshr10@users.noreply.github.com> +Date: Wed Sep 19 23:41:52 2018 -0400 + + Cleanup Gemfile with rubocop + + 1. Updated vulnerable gem rubyzip + 2. Cleaned up rubocop rules + +commit fc18d654e8bff9f2c1a87be73f76c2897b0249bf +Merge: 22eaeb7 8d28833 +Author: David S <1936038+davidshr10@users.noreply.github.com> +Date: Wed Sep 19 23:00:48 2018 -0400 + + Merge pull request #1 from davidshr10/master + + Setup postgres and rubocop + +commit 8d288330b869584732beb4662a076ce70caa81f6 +Author: davidshr10 <1936038+davidshr10@users.noreply.github.com> +Date: Sat Sep 15 15:58:29 2018 -0400 + + Setup rubocop with the same rules as the diaper app + +commit 01141ed151545d88fb3c6869fa76b993daf03926 +Author: davidshr10 <1936038+davidshr10@users.noreply.github.com> +Date: Sat Sep 15 15:48:40 2018 -0400 + + Setting up postgres for dev, test and prod + +commit 22eaeb7e4b4f79c259c4a3beda4bbd464ea50b0d +Author: Sean Marcia <smarcia@gmail.com> +Date: Sat Aug 11 21:52:23 2018 -0400 + + asdf + +commit 2aa7532d8ff6e3635bb88fdc60e7a723804acade +Author: Sean Marcia <smarcia@gmail.com> +Date: Sat Aug 11 20:45:04 2018 -0400 + + Update + +commit 04af9dd7768e7516fb9a311673cea28ff92f286a +Author: Sean Marcia <smarcia@gmail.com> +Date: Sat Aug 11 20:43:28 2018 -0400 + + update + +commit 79856c174e91f7c25b788cc542f4d34b71839b60 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sat Aug 11 20:42:55 2018 -0400 + + first + +commit fa0826e81fa0aa1157fba7aa603246883b4c00f1 +Author: Sean Marcia <smarcia@gmail.com> +Date: Sat Aug 11 20:39:00 2018 -0400 + + test