Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sprint 1 functionality #46

Merged
merged 39 commits into from
Feb 22, 2021
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
54b8d58
Added initial documentation
lincolnanders5 Jan 25, 2021
ba93adc
Add Devise & User (#26)
lincolnanders5 Jan 28, 2021
1cd42ab
Generated `Request` scaffold
lincolnanders5 Jan 29, 2021
4607f03
Added initial validation and link to form
lincolnanders5 Jan 29, 2021
ccbd638
Changed form copy to show Figma copy
lincolnanders5 Jan 29, 2021
e5ca88c
`type` is a reserved field in Rails
lincolnanders5 Jan 29, 2021
2cae615
Added enum-based fields
lincolnanders5 Jan 29, 2021
a5ea7ff
Added link to home page
lincolnanders5 Jan 29, 2021
3482527
Added link to home page
lincolnanders5 Jan 29, 2021
5accdd8
Fixed merge issue
lincolnanders5 Jan 29, 2021
7937d99
generated user mailer: settings to deliver when request created, draf…
nooreenfarooqui Jan 30, 2021
effa7dd
configured settings for sending email from dev, production, and test …
nooreenfarooqui Jan 30, 2021
71e4664
update readme with current action mailer info
nooreenfarooqui Jan 30, 2021
00dfb23
update readme
nooreenfarooqui Jan 30, 2021
935ebcf
Add Dockerfile (#28)
lincolnanders5 Feb 1, 2021
cb06454
Add Request (#30)
lincolnanders5 Feb 1, 2021
d7b1ee5
fixed hashmapped attribute display issue
nooreenfarooqui Feb 1, 2021
fbcddb6
Fix .env fetching error
lincolnanders5 Feb 1, 2021
284258e
Merge branch 'feature/add-email' of https://github.com/tumbleshack/Ca…
nooreenfarooqui Feb 1, 2021
139362a
Add Windows quirks to ReadMe
tumbleshack Jan 29, 2021
c9f7b19
Update README.md
lincolnanders5 Feb 1, 2021
198beb5
fixed smtp server issues, cleaned up action mailer settings in enviro…
nooreenfarooqui Feb 3, 2021
10b249b
fixed email text and html formatting for more optimal mobile view
nooreenfarooqui Feb 3, 2021
8440f15
update readme with actionmailer info
nooreenfarooqui Feb 3, 2021
42b48ac
update readme with actionmailer info
nooreenfarooqui Feb 3, 2021
61bb1b4
fixed environment variable issue for gmail account settings
nooreenfarooqui Feb 4, 2021
cd10582
fixed pickup location bug in email
nooreenfarooqui Feb 4, 2021
1cc2a8e
Merge branch 'feature/add-email' of https://github.com/tumbleshack/Ca…
nooreenfarooqui Feb 4, 2021
8ccdc68
update readme with new environment variable info
nooreenfarooqui Feb 4, 2021
68c980e
Merge branch 'develop' into feature/add-email
nooreenfarooqui Feb 5, 2021
fcdcd66
Merge pull request #35 from tumbleshack/feature/add-email
juliagrigni Feb 5, 2021
9db791b
Categories and DFCS (#39)
juliagrigni Feb 5, 2021
7ebbf82
Add Availability Text (#41)
lincolnanders5 Feb 5, 2021
9a9d634
Bump Ruby (#42)
lincolnanders5 Feb 5, 2021
fff1a11
update readme with error handling info for action mailer
nooreenfarooqui Feb 5, 2021
0658ac7
Merge pull request #43 from tumbleshack/feature/add-email
nooreenfarooqui Feb 5, 2021
2f0b517
Add Items (String) to Requests (#44)
lincolnanders5 Feb 6, 2021
3816a51
Feature/my requests (#48)
Nicholas714 Feb 8, 2021
1630314
Add Roles (#57)
lincolnanders5 Feb 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions app/controllers/requests_controller.rb
Original file line number Diff line number Diff line change
@@ -57,13 +57,14 @@ def destroy
end

private
# Use callbacks to share common setup or constraints between actions.
def set_request
@request = Request.find(params[:id])
end

# Only allow a list of trusted parameters through.
def request_params
params.require(:request).permit(:urgency, :full_name, :email, :phone, :type, :county, :meet, :availability, :comments)
end
# Use callbacks to share common setup or constraints between actions.
def set_request
@request = Request.find(params[:id])
end

# Only allow a list of trusted parameters through.
def request_params
params.require(:request).permit(:urgency, :full_name, :email, :phone, :relationship, :county, :meet, :address, :availability, :comments)
end
end
2 changes: 1 addition & 1 deletion app/views/requests/_request.json.jbuilder
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
json.extract! request, :id, :urgency, :full_name, :email, :phone, :type, :county, :meet, :availability, :comments, :created_at, :updated_at
json.extract! request, :id, :urgency, :full_name, :email, :phone, :relationship, :county, :meet, :address, :availability, :comments, :created_at, :updated_at
json.url request_url(request, format: :json)
6 changes: 4 additions & 2 deletions app/views/requests/index.html.erb
Original file line number Diff line number Diff line change
@@ -9,9 +9,10 @@
<th>Full name</th>
<th>Email</th>
<th>Phone</th>
<th>Type</th>
<th>Relationship</th>
<th>County</th>
<th>Meet</th>
<th>Address</th>
<th>Availability</th>
<th>Comments</th>
<th colspan="3"></th>
@@ -25,9 +26,10 @@
<td><%= request.full_name %></td>
<td><%= request.email %></td>
<td><%= request.phone %></td>
<td><%= request.type %></td>
<td><%= request.relationship %></td>
<td><%= request.county %></td>
<td><%= request.meet %></td>
<td><%= request.address %></td>
<td><%= request.availability %></td>
<td><%= request.comments %></td>
<td><%= link_to 'Show', request %></td>
2 changes: 1 addition & 1 deletion db/migrate/20210129013218_create_requests.rb
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ def change
t.string :full_name
t.string :email
t.integer :phone
t.integer :type
t.integer :relationship
t.integer :county
t.boolean :meet
t.string :address
2 changes: 1 addition & 1 deletion db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.