From 7d44ede685027ea506f0b82ce291bff08477369d Mon Sep 17 00:00:00 2001 From: Ruth Grace Wong Date: Thu, 4 Jun 2026 22:39:05 -0700 Subject: [PATCH 1/2] bring back member keycodes --- app/views/members/users/index.html.haml | 5 ++++- spec/features/members_home_spec.rb | 19 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/views/members/users/index.html.haml b/app/views/members/users/index.html.haml index 00b3a23a..40781dfb 100644 --- a/app/views/members/users/index.html.haml +++ b/app/views/members/users/index.html.haml @@ -12,7 +12,10 @@ = link_to "Become a voting member", edit_members_user_voting_members_path(current_user), class: "btn btn-default" %h2 Space Access -%p Please reach out to Admins below via Email or Slack to get your own door passcode, thanks! +- if current_user.door_code.present? + %p Your door code is #{current_user.door_code.code}* +- elsif current_user.member? + = link_to "Become a key member", edit_members_user_key_members_path(current_user), class: "btn btn-default" = render 'bookmarks' diff --git a/spec/features/members_home_spec.rb b/spec/features/members_home_spec.rb index b7a39cd4..48995313 100644 --- a/spec/features/members_home_spec.rb +++ b/spec/features/members_home_spec.rb @@ -5,21 +5,30 @@ page.set_rack_session(user_id: member.id) end - context "when logged in as a key member" do + context "when logged in as a key member with a door code" do let(:member) { create :key_member } - it "shows space access information" do + before do + create :door_code, code: "123456", user: member + end + + it "shows their door code" do visit members_root_path - expect(page).to have_content "Please reach out to Admins below via Email or Slack to get your own door passcode, thanks!" + expect(page).to have_content "Your door code is 123456*" end end context "when logged in as a non-key-member" do let(:member) { create :member } - it "does not show content about unlocking the door" do + it "shows a button to become a key member" do + visit members_root_path + expect(page).to have_link "Become a key member" + end + + it "does not show a door code" do visit members_root_path - expect(page).to_not have_content "unlock the door" + expect(page).to_not have_content "Your door code is" end end end From f6be3ba767f7efe42cebbf60a58b27c9e4645800 Mon Sep 17 00:00:00 2001 From: Ruth Grace Wong Date: Thu, 4 Jun 2026 22:56:46 -0700 Subject: [PATCH 2/2] New keypad doesn't require you to press an asterisk at the end of your code - remove it --- app/views/members/users/index.html.haml | 2 +- spec/features/members_home_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/members/users/index.html.haml b/app/views/members/users/index.html.haml index 40781dfb..bcc455f5 100644 --- a/app/views/members/users/index.html.haml +++ b/app/views/members/users/index.html.haml @@ -13,7 +13,7 @@ %h2 Space Access - if current_user.door_code.present? - %p Your door code is #{current_user.door_code.code}* + %p Your door code is #{current_user.door_code.code} - elsif current_user.member? = link_to "Become a key member", edit_members_user_key_members_path(current_user), class: "btn btn-default" diff --git a/spec/features/members_home_spec.rb b/spec/features/members_home_spec.rb index 48995313..fe73a235 100644 --- a/spec/features/members_home_spec.rb +++ b/spec/features/members_home_spec.rb @@ -14,7 +14,7 @@ it "shows their door code" do visit members_root_path - expect(page).to have_content "Your door code is 123456*" + expect(page).to have_content "Your door code is 123456" end end