summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/controllers/game_controller.rb5
-rw-r--r--app/views/activities/_timer.html.erb2
2 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/game_controller.rb b/app/controllers/game_controller.rb
index f1387e0..c5bfdbc 100644
--- a/app/controllers/game_controller.rb
+++ b/app/controllers/game_controller.rb
@@ -1,4 +1,9 @@
class GameController < ApplicationController
+ def stop_activity
+ current_char.stop_activity
+ redirect_to locations_path
+ end
+
def finish_activity
@results = []
return unless current_char.activity_time_remaining <= 0
diff --git a/app/views/activities/_timer.html.erb b/app/views/activities/_timer.html.erb
index 27d9272..46e0eb0 100644
--- a/app/views/activities/_timer.html.erb
+++ b/app/views/activities/_timer.html.erb
@@ -5,5 +5,5 @@
class="text-center">
<span data-timer-target="timer" class="text-3xl"></span>
</div>
- <%= link_to "Stop", character_path(current_char) %>
+ <%= button_to "Stop", stop_activity_path %>
<% end %>