insects/ecoffee
insects/ecoffee
1
Fork 0
Code Issues 4 Pull requests Projects Releases Wiki Activity

feat: display the current ET

Browse source
This commit is contained in:
insects 2025-03-11 15:19:32 +01:00
parent 705e7b1dc0
commit 6710137d9b
4 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/application.css
View file

@ -180,6 +180,12 @@ span#password {
flex-direction: column;
align-items: center;
margin: 10px 0;
gap: 10px;
}
.time {
font-size: 20px;
font-weight: bold;
}
.weather-list {

7
app/controllers/instance_controller.rb
View file

@ -14,6 +14,7 @@ class InstanceController < ApplicationController
def show
@instance = Instance.includes(:pops).find_by(public_id: show_instance_params)
@forecast = Weather.forecast(@instance.zone.to_sym)
end
def pop
@ -23,7 +24,8 @@ class InstanceController < ApplicationController
pop = Pop.new(instance_id: parent_instance.id, name: nm)
if pop.save
@instance = Instance.includes(:pops).find_by(public_id: instance_id)
render partial: "list", locals: { instance: @instance }
@forecast = Weather.forecast(@instance.zone.to_sym)
render partial: "list", locals: { instance: @instance, forecast: @forecast }
end
end
end
@ -34,7 +36,8 @@ class InstanceController < ApplicationController
if parent_instance.password == pwd
Pop.delete_by(instance_id: parent_instance.id, name: nm)
@instance = Instance.includes(:pops).find_by(public_id: instance_id)
render partial: "list", locals: { instance: @instance }
@forecast = Weather.forecast(@instance.zone.to_sym)
render partial: "list", locals: { instance: @instance, forecast: @forecast }
end
end

5
app/views/instance/_list.html.erb
View file

@ -33,6 +33,11 @@
<span class="progress-container">
<span class="progress-bar" style="width: <%= (mins.in_minutes / 120) * 100 %>%"></span>
</span>
<% else %>
<% if nm[:weather] && forecast[0][:curr_weather] != nm[:weather] %>
<% next_pattern = forecast.find { |f| f[:curr_weather] == nm[:weather] } %>
<%= Weather.get_weather_name(nm[:weather]) %> in <%= ((next_pattern[:time] - Time.now.utc) / 1.minutes).floor %>m
<% end %>
<% end %>
</div>
<div class="action needs_pwd">

14
app/views/instance/show.html.erb
View file

@ -1,5 +1,5 @@
<div id="public_id" data-content="<%= @instance.public_id %>"></div>
<div hx-get="" hx-trigger="every 30s" hx-swap="innerHTML" hx-select="#nm-list" hx-target="#nm-list">
<div hx-get="" hx-trigger="every 15s" hx-swap="outerHTML" hx-select="#container" hx-target="#container">
<header>
<div class="title">
<%= link_to root_path do %><img src="/icon.png" width="50" alt="eureka.coffee logo" /><% end %>
@ -22,21 +22,21 @@
</div>
</header>
<main>
<%= render partial: "list", locals: { instance: @instance } %>
<main id="container">
<%= render partial: "list", locals: { instance: @instance, forecast: @forecast } %>
<div class="sidebar">
<div class="time">ET <%= Clock.display_ez_time(Clock.get_current_eorzea_time) %></div>
<div class="weather-list">
<% forecast = Weather.forecast(@instance.zone.to_sym) %>
<div class="weather">
<img src="/weather/<%= forecast[0][:curr_weather] %>.png" width="25" title="<%= forecast[0][:weather_name] %>" />
<img src="/weather/<%= @forecast[0][:curr_weather] %>.png" width="25" title="<%= @forecast[0][:weather_name] %>" />
<div>now</div>
</div>
<% 4.times do |i| %>
»
<div class="weather">
<img src="/weather/<%= forecast[i + 1][:curr_weather] %>.png" width="25" title="<%= forecast[i + 1][:weather_name] %>" />
<div><%= ((forecast[i + 1][:time] - Time.now.utc) / 1.minutes).floor %>m</div>
<img src="/weather/<%= @forecast[i + 1][:curr_weather] %>.png" width="25" title="<%= @forecast[i + 1][:weather_name] %>" />
<div><%= ((@forecast[i + 1][:time] - Time.now.utc) / 1.minutes).floor %>m</div>
</div>
<% end %>
</div>