Finally fixed flash messages
This commit is contained in:
parent
362701adf9
commit
0d51a1ccbd
2 changed files with 42 additions and 22 deletions
|
|
@ -112,25 +112,30 @@ defmodule PinchflatWeb.CoreComponents do
|
||||||
<div
|
<div
|
||||||
:if={msg = render_slot(@inner_block) || Phoenix.Flash.get(@flash, @kind)}
|
:if={msg = render_slot(@inner_block) || Phoenix.Flash.get(@flash, @kind)}
|
||||||
id={@id}
|
id={@id}
|
||||||
phx-click={JS.push("lv:clear-flash", value: %{key: @kind}) |> hide("##{@id}")}
|
class="pb-8"
|
||||||
role="alert"
|
role="alert"
|
||||||
class={[
|
|
||||||
"fixed top-2 right-2 mr-2 w-80 sm:w-96 z-50 rounded-lg p-3 ring-1",
|
|
||||||
@kind == :info && "bg-emerald-50 text-emerald-800 ring-emerald-500 fill-cyan-900",
|
|
||||||
@kind == :error && "bg-rose-50 text-rose-900 shadow-md ring-rose-500 fill-rose-900"
|
|
||||||
]}
|
|
||||||
{@rest}
|
{@rest}
|
||||||
>
|
>
|
||||||
<p :if={@title} class="flex items-center gap-1.5 text-sm font-semibold leading-6">
|
<div class={[
|
||||||
<.icon :if={@kind == :info} name="hero-information-circle-mini" class="h-4 w-4" />
|
"flex justify-between w-full border-l-6 bg-opacity-[50%] p-5 shadow-md dark:bg-opacity-40 dark:text-white",
|
||||||
<.icon :if={@kind == :error} name="hero-exclamation-circle-mini" class="h-4 w-4" />
|
@kind == :info && "border-[#34D399] bg-[#34D399]",
|
||||||
|
@kind == :error && "border-[#F87171] bg-[#F87171]"
|
||||||
|
]}>
|
||||||
|
<main>
|
||||||
|
<h5 :if={@title} class="mb-2 text-lg font-bold">
|
||||||
<%= @title %>
|
<%= @title %>
|
||||||
</p>
|
</h5>
|
||||||
<p class="mt-2 text-sm leading-5"><%= msg %></p>
|
<p class="mt-2 text-md leading-5 opacity-80"><%= msg %></p>
|
||||||
<button type="button" class="group absolute top-1 right-1 p-2" aria-label={gettext("close")}>
|
</main>
|
||||||
<.icon name="hero-x-mark-solid" class="h-5 w-5 opacity-40 group-hover:opacity-70" />
|
<button
|
||||||
|
type="button"
|
||||||
|
aria-label={gettext("close")}
|
||||||
|
phx-click={JS.push("lv:clear-flash", value: %{key: @kind}) |> hide("##{@id}")}
|
||||||
|
>
|
||||||
|
<.icon name="hero-x-mark-solid" class="h-7 w-7 opacity-70 hover:opacity-100" />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
"""
|
"""
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -146,7 +151,7 @@ defmodule PinchflatWeb.CoreComponents do
|
||||||
|
|
||||||
def flash_group(assigns) do
|
def flash_group(assigns) do
|
||||||
~H"""
|
~H"""
|
||||||
<div id={@id}>
|
<div class="flex flex-col gap-7.5" id={@id}>
|
||||||
<.flash kind={:info} title="Success!" flash={@flash} />
|
<.flash kind={:info} title="Success!" flash={@flash} />
|
||||||
<.flash kind={:error} title="Error!" flash={@flash} />
|
<.flash kind={:error} title="Error!" flash={@flash} />
|
||||||
<.flash
|
<.flash
|
||||||
|
|
@ -632,9 +637,11 @@ defmodule PinchflatWeb.CoreComponents do
|
||||||
def show(js \\ %JS{}, selector) do
|
def show(js \\ %JS{}, selector) do
|
||||||
JS.show(js,
|
JS.show(js,
|
||||||
to: selector,
|
to: selector,
|
||||||
transition:
|
transition: {
|
||||||
{"transition-all transform ease-out duration-300", "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95",
|
"transition-all transform ease-out duration-300",
|
||||||
"opacity-100 translate-y-0 sm:scale-100"}
|
"opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95",
|
||||||
|
"opacity-100 translate-y-0 sm:scale-100"
|
||||||
|
}
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -642,9 +649,11 @@ defmodule PinchflatWeb.CoreComponents do
|
||||||
JS.hide(js,
|
JS.hide(js,
|
||||||
to: selector,
|
to: selector,
|
||||||
time: 200,
|
time: 200,
|
||||||
transition:
|
transition: {
|
||||||
{"transition-all transform ease-in duration-200", "opacity-100 translate-y-0 sm:scale-100",
|
"transition-all transform ease-in duration-200",
|
||||||
"opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"}
|
"opacity-100 translate-y-0 sm:scale-100",
|
||||||
|
"opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
|
||||||
|
}
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,17 @@
|
||||||
Media Item #<%= @media_item.id %>
|
Media Item #<%= @media_item.id %>
|
||||||
</h2>
|
</h2>
|
||||||
</div>
|
</div>
|
||||||
|
<nav>
|
||||||
|
<.link
|
||||||
|
href={~p"/sources/#{@media_item.source_id}/media/#{@media_item}?delete_files=true"}
|
||||||
|
method="delete"
|
||||||
|
data-confirm="Are you sure?"
|
||||||
|
>
|
||||||
|
<.button color="bg-meta-1" rounding="rounded-full">
|
||||||
|
Delete Record and Files
|
||||||
|
</.button>
|
||||||
|
</.link>
|
||||||
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
<div class="rounded-sm border border-stroke bg-white px-5 pb-2.5 pt-6 shadow-default dark:border-strokedark dark:bg-boxdark sm:px-7.5 xl:pb-1">
|
<div class="rounded-sm border border-stroke bg-white px-5 pb-2.5 pt-6 shadow-default dark:border-strokedark dark:bg-boxdark sm:px-7.5 xl:pb-1">
|
||||||
<div class="max-w-full overflow-x-auto">
|
<div class="max-w-full overflow-x-auto">
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue