From 60c9de4956547d46390c948146aa6e0c865ffcda Mon Sep 17 00:00:00 2001
From: David Gay <david@davidgay.org>
Date: Thu, 3 Jun 2021 21:26:14 -0400
Subject: Move timer and results to new game containers which are always
 visible

---
 app/views/characters/show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/views/characters')

diff --git a/app/views/characters/show.html.erb b/app/views/characters/show.html.erb
index b2e8f94..dda770e 100644
--- a/app/views/characters/show.html.erb
+++ b/app/views/characters/show.html.erb
@@ -19,7 +19,7 @@
   <% if @character.active_states.any? %>
     <ul>
       <% @character.active_states.each do |state| %>
-        <ul><%= state.condition.name %> (expires in <%= state.remaining_duration %> seconds)</ul>
+        <ul><%= state.condition.name %> (expires in <%= distance_of_time_in_words_to_now(state.expires_at)%>)</ul>
       <% end %>
     </ul>
   <% else %>
@@ -109,7 +109,7 @@
   <div class="my-6">
     <h2 class="text-2xl mb-4">Rest</h2>
     <p class="mb-4">
-      You have <%= @character.rested_duration %> seconds of rested time stored.
+      You have <%= distance_of_time_in_words_to_now(current_char.rested_until) %> of rested time.
       <% if current_char.resting? %>
         This does not include time from your current rest. That time will be added when you stop resting.
       <% end %>
-- 
cgit v1.2.3