Improve notifications, fix styles not being added
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Based on https://petr.codes/blog/rails/modern-rails-flash-messages/part-3/
This commit is contained in:
@@ -1,39 +1,49 @@
|
||||
<!-- Global notification live region, render this permanently at the end of the document -->
|
||||
<div aria-live="assertive" class="fixed inset-0 flex items-end px-4 py-6 pointer-events-none sm:p-6 sm:items-start">
|
||||
<div class="w-full flex flex-col items-center space-y-4 sm:items-end">
|
||||
<!--
|
||||
Notification panel, dynamically insert this into the live region when it needs to be displayed
|
||||
|
||||
Entering: "transform ease-out duration-300 transition"
|
||||
From: "translate-y-2 opacity-0 sm:translate-y-0 sm:translate-x-2"
|
||||
To: "translate-y-0 opacity-100 sm:translate-x-0"
|
||||
Leaving: "transition ease-in duration-100"
|
||||
From: "opacity-100"
|
||||
To: "opacity-0"
|
||||
-->
|
||||
<div class="max-w-sm w-full bg-white shadow-lg rounded-lg pointer-events-auto ring-1 ring-black ring-opacity-5 overflow-hidden">
|
||||
<div class="p-4">
|
||||
<div class="flex items-start">
|
||||
<div class="flex-shrink-0">
|
||||
<span class="inline-block h-6 w-6 <%= @icon_color_class %>">
|
||||
<%= render "icons/#{@icon_name}" %>
|
||||
</span>
|
||||
</div>
|
||||
<div class="ml-3 w-0 flex-1 pt-0.5">
|
||||
<p class="text-sm font-medium text-gray-900"><%= @data[:title] %></p>
|
||||
<p class="mt-1 text-sm text-gray-500"><%= @data[:body] %></p>
|
||||
</div>
|
||||
<div class="ml-4 flex-shrink-0 flex">
|
||||
<button class="bg-white rounded-md inline-flex text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-600">
|
||||
<span class="sr-only">Close</span>
|
||||
<!-- Heroicon name: solid/x -->
|
||||
<svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
|
||||
<path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
<div class="hidden max-w-sm w-full bg-white shadow-lg rounded-lg pointer-events-auto mt-4"
|
||||
data-turbo="false"
|
||||
data-notification-action-url="<%= @data.dig(:action, :url) %>"
|
||||
data-notification-action-method="<%= @data.dig(:action, :method) %>"
|
||||
data-notification-timeout="<%= @data[:timeout] %>"
|
||||
data-controller="notification">
|
||||
<div class="rounded-lg shadow-xs overflow-hidden">
|
||||
<div class="p-4">
|
||||
<div class="flex items-start">
|
||||
<div class="flex-shrink-0">
|
||||
<span class="inline-block h-6 w-6 <%= @icon_color_class %>">
|
||||
<%= render "icons/#{@icon_name}" %>
|
||||
</span>
|
||||
</div>
|
||||
<div class="ml-3 w-0 flex-1 pt-0.5">
|
||||
<p class="text-sm leading-5 font-medium text-gray-900">
|
||||
<%= @data[:title] %>
|
||||
</p>
|
||||
<% if @data[:body].present? %>
|
||||
<p class="mt-1 text-sm leading-5 text-gray-500">
|
||||
<%= @data[:body] %>
|
||||
</p>
|
||||
<% end %>
|
||||
<% if @data[:action].present? %>
|
||||
<div class="mt-2" data-notification-target="buttons">
|
||||
<a data-turbo-frame="_top" <% if @data.dig(:action, :method) == 'get' %> href="<%= @data.dig(:action, :url) %>" <% else %> href="#" data-action="notification#run" <% end %> class="text-sm leading-5 font-medium text-indigo-600 hover:text-indigo-500 focus:outline-none focus:underline transition ease-in-out duration-150">
|
||||
<%= @data.dig(:action, :name) %>
|
||||
</a>
|
||||
<button data-action="notification#close" class="ml-6 text-sm leading-5 font-medium text-gray-700 hover:text-gray-500 focus:outline-none focus:underline transition ease-in-out duration-150">
|
||||
<%= t('.dismiss') %>
|
||||
</button>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="ml-4 flex-shrink-0 flex">
|
||||
<button class="inline-flex text-gray-400 focus:outline-none focus:text-gray-500 transition ease-in-out duration-150" data-action="notification#close">
|
||||
<!-- Heroicon name: solid/x -->
|
||||
<svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
|
||||
<path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% if @data[:countdown] %>
|
||||
<div class="bg-indigo-600 rounded-lg h-1 w-0" data-notification-target="countdown"></div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,13 +1,22 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
# @param type [String] Classic notification type `error`, `alert` and `info` + custom `success`
|
||||
# @param data [String, Hash] `String` for backward compatibility,
|
||||
# `Hash` for the new functionality `{title: '', body: '', timeout: 5, countdown: false, action: { url: '', method: '', name: ''}}`.
|
||||
# The `title` attribute for `Hash` is mandatory.
|
||||
class NotificationComponent < ViewComponent::Base
|
||||
def initialize(type:, data:)
|
||||
@type = type
|
||||
@data = prepare_data(data)
|
||||
@icon_name = icon_name
|
||||
@icon_color_class = icon_color_class
|
||||
|
||||
@data[:timeout] ||= 5
|
||||
@data[:action][:method] ||= "get" if @data[:action]
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def prepare_data(data)
|
||||
case data
|
||||
when Hash
|
||||
|
||||
Reference in New Issue
Block a user