Skip to content

Commit fb4fb93

Browse files
tfwrighttfwright
committed
Fix tests
1 parent 95005d3 commit fb4fb93

File tree

14 files changed

+109
-112
lines changed

14 files changed

+109
-112
lines changed

‎lib/live_admin/components.ex‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ defmodule LiveAdmin.Components do
2424
<.list items={@items} inner_block={@inner_block} />
2525
<% end %>
2626
<%= if render_slot(@control) do %>
27-
<%= render_slot(@control) %>
27+
{render_slot(@control)}
2828
<% else %>
2929
<button
3030
class={"resource__action#{if @disabled, do: "--disabled", else: "--btn"}"}
3131
disabled={if @disabled, do: "disabled"}
3232
>
33-
<%= @label %>
33+
{@label}
3434
</button>
3535
<% end %>
3636
<%= if @orientation == :down do %>
@@ -153,13 +153,13 @@ defmodule LiveAdmin.Components do
153153
}
154154
data-confirm={if @modalize, do: nil, else: "Are you sure?"}
155155
>
156-
<%= @title %>
156+
{@title}
157157
</button>
158158
<%= if @modalize do %>
159159
<.modal id={"#{@action}-action-modal"}>
160-
<span class="modal__title"><%= @title %></span>
160+
<span class="modal__title">{@title}</span>
161161
<%= for {_lang, doc} <- @function_docs do %>
162-
<span class="docs"><%= doc %></span>
162+
<span class="docs">{doc}</span>
163163
<% end %>
164164
<.form
165165
for={Phoenix.Component.to_form(%{})}
@@ -170,7 +170,7 @@ defmodule LiveAdmin.Components do
170170
<b>Arguments</b>
171171
<%= for num <- 1..@extra_arg_count do %>
172172
<div>
173-
<label><%= num %></label>
173+
<label>{num}</label>
174174
<input type="text" name="args[]" />
175175
</div>
176176
<% end %>
@@ -192,7 +192,7 @@ defmodule LiveAdmin.Components do
192192
}
193193
>
194194
<div>
195-
<%= render_slot(@inner_block) %>
195+
{render_slot(@inner_block)}
196196
</div>
197197
</div>
198198
"""
@@ -204,10 +204,10 @@ defmodule LiveAdmin.Components do
204204
<nav>
205205
<ul>
206206
<%= if Enum.empty?(@items) && assigns[:empty_label] do %>
207-
<li><%= render_slot(@empty_label) %></li>
207+
<li>{render_slot(@empty_label)}</li>
208208
<% end %>
209209
<%= for item <- @items do %>
210-
<li><%= render_slot(@inner_block, item) %></li>
210+
<li>{render_slot(@inner_block, item)}</li>
211211
<% end %>
212212
</ul>
213213
</nav>

‎lib/live_admin/components/container.ex‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ defmodule LiveAdmin.Components.Container do
178178
~H"""
179179
<div class="resource__banner">
180180
<h1 class="resource__title">
181-
<%= resource_title(@resource, @config) %>
181+
{resource_title(@resource, @config)}
182182
</h1>
183183
184184
<div class="resource__actions">
@@ -187,18 +187,18 @@ defmodule LiveAdmin.Components.Container do
187187
navigate={route_with_params(assigns, params: [prefix: @prefix])}
188188
class="resource__action--btn"
189189
>
190-
<%= trans("List") %>
190+
{trans("List")}
191191
</.link>
192192
<%= if LiveAdmin.fetch_config(@resource, :create_with, @config) != false do %>
193193
<.link
194194
navigate={route_with_params(assigns, segments: ["new"], params: [prefix: @prefix])}
195195
class="resource__action--btn"
196196
>
197-
<%= trans("New") %>
197+
{trans("New")}
198198
</.link>
199199
<% else %>
200200
<button class="resource__action--disabled" disabled="disabled">
201-
<%= trans("New") %>
201+
{trans("New")}
202202
</button>
203203
<% end %>
204204
<.dropdown
@@ -217,7 +217,7 @@ defmodule LiveAdmin.Components.Container do
217217
items={[""] ++ Enum.filter(@prefix_options, &(to_string(&1) != @prefix))}
218218
>
219219
<.link navigate={route_with_params(assigns, params: [prefix: prefix])}>
220-
<%= if prefix == "", do: trans("clear"), else: prefix %>
220+
{if prefix == "", do: trans("clear"), else: prefix}
221221
</.link>
222222
</.dropdown>
223223
<% end %>
@@ -237,15 +237,15 @@ defmodule LiveAdmin.Components.Container do
237237
class="resource__action--link"
238238
phx-click={JS.push("set_locale", value: %{locale: locale}, page_loading: true)}
239239
>
240-
<%= locale %>
240+
{locale}
241241
</button>
242242
</.dropdown>
243243
<% end %>
244244
</div>
245245
</div>
246246
</div>
247247
248-
<%= render("#{@live_action}.html", assigns) %>
248+
{render("#{@live_action}.html", assigns)}
249249
"""
250250
end
251251

@@ -458,21 +458,21 @@ defmodule LiveAdmin.Components.Container do
458458
,
459459
data-confirm={if @modalize, do: nil, else: "Are you sure?"}
460460
>
461-
<%= @task |> to_string() |> humanize() %>
461+
{@task |> to_string() |> humanize()}
462462
</button>
463463
<%= if @modalize do %>
464464
<.modal id={"#{@task}-task-modal"}>
465-
<span class="modal__title"><%= @title %></span>
465+
<span class="modal__title">{@title}</span>
466466
<%= for {_lang, doc} <- @function_docs do %>
467-
<span class="docs"><%= doc %></span>
467+
<span class="docs">{doc}</span>
468468
<% end %>
469469
<.form for={Phoenix.Component.to_form(%{})} phx-submit="task">
470470
<input type="hidden" name="name" value={@task} />
471471
<%= if @extra_arg_count > 0 do %>
472472
<b>Arguments</b>
473473
<%= for num <- 1..@extra_arg_count do %>
474474
<div>
475-
<label><%= num %></label>
475+
<label>{num}</label>
476476
<input type="text" name="args[]" />
477477
</div>
478478
<% end %>

‎lib/live_admin/components/layout/app.html.heex‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<main class="main__content">
2-
<div class="toast__container--success"><%= Phoenix.Flash.get(@flash, :success) %></div>
3-
<div class="toast__container--info"><%= Phoenix.Flash.get(@flash, :info) %></div>
4-
<div class="toast__container--error"><%= Phoenix.Flash.get(@flash, :error) %></div>
5-
<%= live_render(@socket, LiveAdmin.Components.Nav.Jobs,
2+
<div class="toast__container--success">{Phoenix.Flash.get(@flash, :success)}</div>
3+
<div class="toast__container--info">{Phoenix.Flash.get(@flash, :info)}</div>
4+
<div class="toast__container--error">{Phoenix.Flash.get(@flash, :error)}</div>
5+
{live_render(@socket, LiveAdmin.Components.Nav.Jobs,
66
sticky: true,
77
id: "jobs",
88
session: %{"session_id" => @session.id}
9-
) %>
9+
)}
1010
<div class="main__wrap">
1111
<.live_component
1212
id="nav"
@@ -21,7 +21,7 @@
2121
session={@session}
2222
/>
2323
<div class="content">
24-
<%= @inner_content %>
24+
{@inner_content}
2525
</div>
2626
</div>
2727
</main>

‎lib/live_admin/components/layout/layout.html.heex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<meta name="description" content="" />
88
<meta name="author" content="" />
99
<link rel="icon" href="data:;base64,=" />
10-
<title><%= Keyword.fetch!(@config, :title) %></title>
10+
<title>{Keyword.fetch!(@config, :title)}</title>
1111
<style>
1212
<%= raw(render_css(@session)) %>
1313
</style>
14-
<%= csrf_meta_tag() %>
14+
{csrf_meta_tag()}
1515
<link rel="manifest" href="/manifest.json " />
1616
</head>
1717
<body>
18-
<%= @inner_content %>
18+
{@inner_content}
1919
</body>
2020
<script>
2121
<%= raw(render_js()) %>

‎lib/live_admin/components/nav.ex‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ defmodule LiveAdmin.Components.Nav do
5656
<ul class="nav__list">
5757
<li class="nav__item--group">
5858
<span>
59-
<%= Keyword.fetch!(@config, :title) %>
59+
{Keyword.fetch!(@config, :title)}
6060
</span>
6161
</li>
6262
<li class="nav__item--group">
63-
<.link navigate={@base_path}><%= trans("Home") %></.link>
63+
<.link navigate={@base_path}>{trans("Home")}</.link>
6464
</li>
6565
<li class="nav__item--group">
6666
<.nav_group
@@ -74,14 +74,14 @@ defmodule LiveAdmin.Components.Nav do
7474
<li class="nav__item--group">
7575
<%= for route <- @extra_pages do %>
7676
<.link navigate={route.path}>
77-
<%= humanize(route.helper) %>
77+
{humanize(route.helper)}
7878
</.link>
7979
<% end %>
8080
</li>
8181
<% end %>
8282
<li class="nav__item--group">
8383
<.link navigate={Path.join(@base_path, "session")}>
84-
<%= trans("Session") %>
84+
{trans("Session")}
8585
</.link>
8686
</li>
8787
</ul>
@@ -96,13 +96,13 @@ defmodule LiveAdmin.Components.Nav do
9696
<%= if match?({_key, _resource}, parent) do %>
9797
<li class={"nav__item#{if elem(parent, 1) == @current_resource, do: "--selected"}"}>
9898
<.link navigate={route_with_params(assigns, resource_path: elem(parent, 0))}>
99-
<%= resource_title(elem(parent, 1), @config) %>
99+
{resource_title(elem(parent, 1), @config)}
100100
</.link>
101101
</li>
102102
<% else %>
103103
<li class="nav__item--drop">
104104
<input type="checkbox" id={"menu-group-#{parent}"} checked={open?(assigns, parent)} />
105-
<label for={"menu-group-#{parent}"}><%= parent %></label>
105+
<label for={"menu-group-#{parent}"}>{parent}</label>
106106
<.nav_group
107107
items={children}
108108
base_path={@base_path}

‎lib/live_admin/components/nav/jobs.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ defmodule LiveAdmin.Components.Nav.Jobs do
8585
~H"""
8686
<%= for {_, label, progress} <- @jobs do %>
8787
<div class="job__container">
88-
<span class="job__label"><%= label %></span>
88+
<span class="job__label">{label}</span>
8989
<div class="job__bar" style={"width: #{progress |> Kernel.*(100) |> Float.round()}%"} />
9090
</div>
9191
<% end %>

0 commit comments

Comments
 (0)