bterkuile/fizzy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2619 from basecamp/style-devices-page

Browse Source 
Style devices page
This commit is contained in:
Adrien Maston
2026-03-03 12:20:09 +01:00
committed by GitHub
parent 9bf0663941 34ab9c6231
commit f6b9e765b8
4 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/layouts/public.html.erb
+1 -1
View File
@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<%= render "layouts/shared/head" %> <%= render "layouts/shared/head" %>
<body class="public <%= @body_class %>" data-controller="local-time timezone-cookie" data-action="turbo:morph@window->local-time#refreshAll"> <body class="public <%= @body_class %>" data-controller="local-time timezone-cookie bridge--title bridge--text-size bridge--insets" data-action="turbo:morph@window->local-time#refreshAll" data-platform="<%= platform.type %>" data-bridge--title-title-value="<%= @page_title %>">
<div id="global-container"> <div id="global-container">
<header class="header" id="header"> <header class="header" id="header">
<a href="#main" class="header__skip-navigation btn" data-turbo="false">Skip to main content</a> <a href="#main" class="header__skip-navigation btn" data-turbo="false">Skip to main content</a>
saas/app/controllers/devices_controller.rb
+2
View File
@@ -2,6 +2,8 @@ class DevicesController < ApplicationController
disallow_account_scope disallow_account_scope
before_action :set_device, only: :destroy before_action :set_device, only: :destroy
layout "public"
def index def index
@devices = Current.identity.devices.order(created_at: :desc) @devices = Current.identity.devices.order(created_at: :desc)
end end
saas/app/views/devices/index.html.erb
+34 -15
View File
@@ -1,16 +1,35 @@
<h1>Registered Devices</h1> <% @page_title = "Registered devices" %>
<% if @devices.any? %> <section class="panel panel--centered flex flex-column gap" style="--panel-size: auto;">
<ul> <% if @devices.any? %>
<% @devices.each do |device| %> <h1 class="txt-x-large font-weight-black txt-tight-lines margin-none">
<li> Registered devices
<strong><%= device.name || "Unnamed device" %></strong> </h1>
(<%= device.platform == "apple" ? "iOS" : "Android" %>) <ul class="flex flex-column gap list-style-none full-width pad border-radius border" style="--inline-space: var(--block-space);">
<span>Added <%= time_ago_in_words(device.created_at) %> ago</span> <% @devices.each do |device| %>
<%= button_to "Remove", saas.device_path(device), method: :delete, data: { confirm: "Remove this device?" } %> <li class="flex align-center gap txt-medium txt-align-start">
</li> <div class="flex-1 flex flex-column">
<% end %> <span>
</ul> <strong><%= device.name || "Unnamed device" %></strong>
<% else %> (<%= device.platform == "apple" ? "iOS" : "Android" %>)
<p>No devices registered. Install the mobile app to receive push notifications.</p> </span>
<% end %> <span class="txt-subtle txt-x-small">
Added <%= local_datetime_tag(device.created_at, style: :daysago) %>
</span>
</div>
<%= button_to saas.device_path(device), method: :delete, class: "btn btn--circle-mobile txt-small", data: { confirm: "Remove this device?" }, form: { class: "flex-item-no-shrink" } do %>
<%= icon_tag "trash", class: "icon--mobile-only" %>
<span class="overflow-ellipsis">Remove</span>
<% end %>
</li>
<% end %>
</ul>
<% else %>
<h1 class="txt-x-large font-weight-black margin-none">No devices registered</h1>
<p class="margin-none-block-start">Mobile devices registered with the mobile app will receive push notifications and will be listed here.</p>
<% end %>
<%= link_to session_menu_path(script_name: nil), class: "btn center txt-small margin-block-start hide-on-native", data: { turbo_prefetch: false } do %>
<span>Your Fizzy accounts</span>
<% end %>
</section>
saas/test/controllers/devices_controller_test.rb
+1 -1
View File
@@ -22,7 +22,7 @@ class DevicesControllerTest < ActionDispatch::IntegrationTest
untenanted { get saas.devices_path } untenanted { get saas.devices_path }
assert_response :success assert_response :success
assert_select "p", /No devices registered/ assert_select "h1", /No devices registered/
end end
test "show notification settings with registered devices" do test "show notification settings with registered devices" do