Skip to content

Commit 72700a4

Browse files
tfwrighttfwright
committed
tweak components
1 parent b4bca09 commit 72700a4

File tree

7 files changed

+36
-36
lines changed

7 files changed

+36
-36
lines changed

‎assets/js/app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Hooks.ArrayInput = {
3030
}
3131
};
3232

33-
Hooks.Single = {
33+
Hooks.Show = {
3434
setTab(el) {
3535
const urlHash = window.location.hash || '#main';
3636

‎dist/js/app.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/live_admin.ex‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ defmodule LiveAdmin do
1414
nav: [type: :atom],
1515
home: [type: :atom],
1616
session: [type: :atom],
17-
new: [type: :atom],
17+
create: [type: :atom],
1818
edit: [type: :atom],
19-
list: [type: :atom],
20-
view: [type: :atom]
19+
index: [type: :atom],
20+
show: [type: :atom]
2121
]
2222
],
2323
ecto_repo: [
@@ -27,7 +27,7 @@ defmodule LiveAdmin do
2727
list_with: [
2828
type: {:or, [:atom, {:tuple, [:atom, :atom]}]},
2929
type_doc:
30-
"`t:func_ref/0` returning `{records, count}` used to fetch records in LiveAdmin :list component"
30+
"`t:func_ref/0` returning `{records, count}` used to fetch records in Index component"
3131
],
3232
render_with: [
3333
type: {:or, [:atom, {:tuple, [:atom, :atom]}]},

‎lib/live_admin/components/container.ex‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ defmodule LiveAdmin.Components.Container do
2626
uri,
2727
socket = %{assigns: %{live_action: action, loading: false}}
2828
)
29-
when action in [:edit, :single] do
29+
when action in [:edit, :show] do
3030
socket =
3131
socket
3232
|> assign_resource_info(uri)
@@ -48,7 +48,7 @@ defmodule LiveAdmin.Components.Container do
4848
end
4949

5050
@impl true
51-
def handle_params(params, uri, socket = %{assigns: %{live_action: :list, loading: false}}) do
51+
def handle_params(params, uri, socket = %{assigns: %{live_action: :index, loading: false}}) do
5252
socket =
5353
socket
5454
|> assign(search: params["s"])
@@ -95,16 +95,16 @@ defmodule LiveAdmin.Components.Container do
9595
~H"""
9696
<!-- Content Area -->
9797
<main class="content">
98-
{render("#{@live_action}.html", assigns)}
98+
{render(@live_action, assigns)}
9999
</main>
100100
"""
101101
end
102102

103-
def render("list.html", assigns) do
103+
def render(:index, assigns) do
104104
~H"""
105105
<.live_component
106106
module={@mod}
107-
id="list"
107+
id="index"
108108
key={@key}
109109
resource={@resource}
110110
page={@page}
@@ -122,7 +122,7 @@ defmodule LiveAdmin.Components.Container do
122122
"""
123123
end
124124

125-
def render("create.html", assigns) do
125+
def render(:create, assigns) do
126126
~H"""
127127
<.live_component
128128
module={@mod}
@@ -140,7 +140,7 @@ defmodule LiveAdmin.Components.Container do
140140
"""
141141
end
142142

143-
def render("edit.html", assigns) do
143+
def render(:edit, assigns) do
144144
~H"""
145145
<.live_component
146146
module={@mod}
@@ -159,11 +159,11 @@ defmodule LiveAdmin.Components.Container do
159159
"""
160160
end
161161

162-
def render("single.html", assigns) do
162+
def render(:show, assigns) do
163163
~H"""
164164
<.live_component
165165
module={@mod}
166-
id="single"
166+
id="show"
167167
record={@record}
168168
resource={@resource}
169169
resources={@resources}

lib/live_admin/components/resource/list.ex renamed to lib/live_admin/components/resource/index.ex

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule LiveAdmin.Components.Container.List do
1+
defmodule LiveAdmin.Components.Container.Index do
22
use Phoenix.LiveComponent
33
use PhoenixHTMLHelpers
44

@@ -24,7 +24,7 @@ defmodule LiveAdmin.Components.Container.List do
2424
{records, count} =
2525
Resource.list(
2626
assigns.resource,
27-
list_link_params(assigns),
27+
index_link_params(assigns),
2828
assigns.session,
2929
assigns.repo,
3030
assigns.config
@@ -48,7 +48,7 @@ defmodule LiveAdmin.Components.Container.List do
4848
<div class="content-header">
4949
<h1 class="content-title">
5050
{resource_title(@resource, @config)}
51-
<span>{trans("List")}</span>
51+
<span>{trans("Index")}</span>
5252
</h1>
5353
<div class="contextual-actions">
5454
<.link
@@ -165,7 +165,7 @@ defmodule LiveAdmin.Components.Container.List do
165165
route_with_params(
166166
assigns,
167167
params:
168-
list_link_params(assigns,
168+
index_link_params(assigns,
169169
sort_attr: field,
170170
sort_dir:
171171
if(field == @sort_attr,
@@ -223,7 +223,7 @@ defmodule LiveAdmin.Components.Container.List do
223223
patch={
224224
route_with_params(
225225
assigns,
226-
params: list_link_params(assigns, page: @page - 1)
226+
params: index_link_params(assigns, page: @page - 1)
227227
)
228228
}
229229
class="btn pagination-info-btn"
@@ -242,7 +242,7 @@ defmodule LiveAdmin.Components.Container.List do
242242
patch={
243243
route_with_params(
244244
assigns,
245-
params: list_link_params(assigns, page: @page + 1)
245+
params: index_link_params(assigns, page: @page + 1)
246246
)
247247
}
248248
class="btn pagination-info-btn"
@@ -277,7 +277,7 @@ defmodule LiveAdmin.Components.Container.List do
277277
push_patch(socket,
278278
to:
279279
route_with_params(socket.assigns,
280-
params: list_link_params(assigns, search: query)
280+
params: index_link_params(assigns, search: query)
281281
)
282282
)}
283283
end
@@ -446,7 +446,7 @@ defmodule LiveAdmin.Components.Container.List do
446446
push_patch(socket,
447447
to:
448448
route_with_params(socket.assigns,
449-
params: list_link_params(assigns, page: page, per: per)
449+
params: index_link_params(assigns, page: page, per: per)
450450
)
451451
)}
452452
end
@@ -464,7 +464,7 @@ defmodule LiveAdmin.Components.Container.List do
464464
push_patch(socket,
465465
to:
466466
route_with_params(socket.assigns,
467-
params: list_link_params(assigns, search: new_search)
467+
params: index_link_params(assigns, search: new_search)
468468
)
469469
)}
470470
end
@@ -482,7 +482,7 @@ defmodule LiveAdmin.Components.Container.List do
482482
push_patch(socket,
483483
to:
484484
route_with_params(socket.assigns,
485-
params: list_link_params(assigns, search: new_search)
485+
params: index_link_params(assigns, search: new_search)
486486
)
487487
)}
488488
end
@@ -502,12 +502,12 @@ defmodule LiveAdmin.Components.Container.List do
502502
push_patch(socket,
503503
to:
504504
route_with_params(socket.assigns,
505-
params: list_link_params(assigns, search: new_search)
505+
params: index_link_params(assigns, search: new_search)
506506
)
507507
)}
508508
end
509509

510-
defp list_link_params(assigns, overrides \\ []) do
510+
defp index_link_params(assigns, overrides \\ []) do
511511
assigns
512512
|> Map.take([:search, :page, :sort_attr, :sort_dir, :prefix, :per])
513513
|> Enum.into([])

lib/live_admin/components/resource/single.ex renamed to lib/live_admin/components/resource/show.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule LiveAdmin.Components.Container.Single do
1+
defmodule LiveAdmin.Components.Container.Show do
22
use Phoenix.LiveComponent
33
use PhoenixHTMLHelpers
44

@@ -19,7 +19,7 @@ defmodule LiveAdmin.Components.Container.Single do
1919
@impl true
2020
def render(assigns) do
2121
~H"""
22-
<div id="single-page" phx-hook="Single">
22+
<div id="show-page" phx-hook="Show">
2323
<div class="content-header">
2424
<h1 class="content-title">
2525
{resource_title(@resource, @config)}

‎lib/live_admin/router.ex‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ defmodule LiveAdmin.Router do
5555
quote bind_quoted: [path: path, resource_mod: resource_mod] do
5656
full_path = Path.join(@base_path, path)
5757

58-
live(path, LiveAdmin.Components.Container, :list,
59-
as: :"list_#{full_path}",
58+
live(path, LiveAdmin.Components.Container, :index,
59+
as: :"index_#{full_path}",
6060
metadata: %{base_path: @base_path, resource: {path, resource_mod}}
6161
)
6262

@@ -65,8 +65,8 @@ defmodule LiveAdmin.Router do
6565
metadata: %{base_path: @base_path, resource: {path, resource_mod}}
6666
)
6767

68-
live("#{path}/:record_id", LiveAdmin.Components.Container, :single,
69-
as: :"single_#{full_path}",
68+
live("#{path}/:record_id", LiveAdmin.Components.Container, :show,
69+
as: :"show_#{full_path}",
7070
metadata: %{base_path: @base_path, resource: {path, resource_mod}}
7171
)
7272

@@ -90,8 +90,8 @@ defmodule LiveAdmin.Router do
9090
session: LiveAdmin.Components.Session.Content,
9191
create: LiveAdmin.Components.Container.Form,
9292
edit: LiveAdmin.Components.Container.Form,
93-
list: LiveAdmin.Components.Container.List,
94-
single: LiveAdmin.Components.Container.Single
93+
index: LiveAdmin.Components.Container.Index,
94+
show: LiveAdmin.Components.Container.Show
9595
],
9696
Application.get_env(:live_admin, :components, [])
9797
)

0 commit comments

Comments
 (0)