Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions app/controllers/quests_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ def index
@quests = Quest.all
end

def show
@quest = Quest.find(params[:id])
end

def assign
@quest = Quest.find(params[:id])
@assignment = @quest.assignments.build user: current_user
Expand Down
2 changes: 2 additions & 0 deletions app/models/place.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
class Place < ApplicationRecord
has_many :adventures
has_many :quests, through: :adventures # place.quests
end
6 changes: 3 additions & 3 deletions app/models/quest.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Quest < ApplicationRecord
has_many :adventures
has_many :places, through: :adventures
has_many :assignments
has_many :users, through: :assignments
has_many :places, through: :adventures # quest.places

# doesn't need quest.users (yet)

def add_user(user)
users << user
Expand Down
3 changes: 2 additions & 1 deletion app/models/user.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
class User < ApplicationRecord
has_secure_password

has_many :assignments
has_many :quests, through: :assignments
has_many :quests, through: :assignments # user.quests
end
11 changes: 2 additions & 9 deletions app/views/quests/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
<h2>Quests</h2>
<% @quests.each do |quest| %>
<hr>
<h4>Description:</h4>
<%= quest.description %>

<%= take_button(quest) if signed_in? %>

<h4>Places:</h4>
<% quest.places.each do |place| %>
<%= link_to place.name, place %><br>
<% end %>
<%= link_to quest.description.split(' ').first, quest %>
<%= quest.description.split(' ')[1..-1].join(' ') %>
<br>
<% end %>
<hr>
9 changes: 9 additions & 0 deletions app/views/quests/show.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<h4>Description:</h4>
<%= @quest.description %>

<%= take_button(@quest) if signed_in? %>

<h4>Places:</h4>
<% @quest.places.each do |place| %>
<%= link_to place.name, place %><br>
<% end %>
2 changes: 1 addition & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Rails.application.routes.draw do
root 'quests#index'
resources :places, only: [:show]
resources :quests, only: [:index] do
resources :quests, only: [:index, :show] do
member do
post 'assign'
post 'unassign'
Expand Down