Skip to content

Commit 9da0124

Browse files
committed
Update to Latest Backpex Release
... which includes my fix to we no longer need to use our fork.
1 parent c859c54 commit 9da0124

8 files changed

Lines changed: 20 additions & 8 deletions

File tree

‎lib/dev_round_web/admin/event.ex‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ defmodule DevRoundWeb.Admin.Event do
2323
update_changeset: &DevRound.Events.Event.changeset/3,
2424
create_changeset: &DevRound.Events.Event.changeset/3
2525
],
26-
layout: {DevRoundWeb.Layouts, :admin},
2726
pubsub: [
2827
topic: "admin.events"
2928
],
@@ -32,6 +31,9 @@ defmodule DevRoundWeb.Admin.Event do
3231

3332
import Ecto.Query
3433

34+
@impl Backpex.LiveResource
35+
def layout(_assigns), do: {DevRoundWeb.Layouts, :admin}
36+
3537
@impl Backpex.LiveResource
3638
def singular_name, do: "Event"
3739

‎lib/dev_round_web/admin/event_attendees.ex‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ defmodule DevRoundWeb.Admin.EventAttendees do
1313
update_changeset: &DevRound.Events.EventAttendee.changeset/3,
1414
create_changeset: &DevRound.Events.EventAttendee.changeset/3
1515
],
16-
layout: {DevRoundWeb.Layouts, :admin},
1716
pubsub: [
1817
topic: "admin.event_attendees"
1918
],
2019
init_order: %{by: :begin, direction: :desc}
2120

21+
@impl Backpex.LiveResource
22+
def layout(_assigns), do: {DevRoundWeb.Layouts, :admin}
23+
2224
@impl Backpex.LiveResource
2325
def singular_name, do: "Event Attendee"
2426

‎lib/dev_round_web/admin/lang.ex‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ defmodule DevRoundWeb.Admin.Lang do
1414
update_changeset: &DevRound.Events.Lang.changeset/3,
1515
create_changeset: &DevRound.Events.Lang.changeset/3
1616
],
17-
layout: {DevRoundWeb.Layouts, :admin},
1817
pubsub: [
1918
topic: "admin.langs"
2019
]
2120

2221
use DevRoundWeb, :verified_routes
2322

23+
@impl Backpex.LiveResource
24+
def layout(_assigns), do: {DevRoundWeb.Layouts, :admin}
25+
2426
@impl Backpex.LiveResource
2527
def singular_name, do: "Programming Language"
2628

‎lib/dev_round_web/admin/team_name.ex‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ defmodule DevRoundWeb.Admin.TeamName do
1212
update_changeset: &DevRound.Hosting.TeamName.changeset/3,
1313
create_changeset: &DevRound.Hosting.TeamName.changeset/3
1414
],
15-
layout: {DevRoundWeb.Layouts, :admin},
1615
pubsub: [
1716
topic: "admin.team_names"
1817
]
1918

19+
@impl Backpex.LiveResource
20+
def layout(_assigns), do: {DevRoundWeb.Layouts, :admin}
21+
2022
@impl Backpex.LiveResource
2123
def singular_name, do: "Team Name"
2224

‎lib/dev_round_web/admin/user.ex‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ defmodule DevRoundWeb.Admin.User do
1313
create_changeset: &DevRound.Accounts.User.admin_changeset/3
1414
],
1515
init_order: %{by: :name, direction: :asc},
16-
layout: {DevRoundWeb.Layouts, :admin},
1716
pubsub: [
1817
topic: "admin.event_langs"
1918
]
2019

2120
import Ecto.Query, warn: false
2221

22+
@impl Backpex.LiveResource
23+
def layout(_assigns), do: {DevRoundWeb.Layouts, :admin}
24+
2325
@impl Backpex.LiveResource
2426
def singular_name, do: "User"
2527

‎lib/dev_round_web/admin/user_token.ex‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@ defmodule DevRoundWeb.Admin.UserToken do
1111
repo: DevRound.Repo,
1212
item_query: &__MODULE__.item_query/3
1313
],
14-
layout: {DevRoundWeb.Layouts, :admin},
1514
init_order: %{by: :inserted_at, direction: :desc},
1615
pubsub: [
1716
topic: "admin.user_tokens"
1817
]
1918

2019
import Ecto.Query, warn: false
2120

21+
@impl Backpex.LiveResource
22+
def layout(_assigns), do: {DevRoundWeb.Layouts, :admin}
23+
2224
def item_query(query, _live_action, _assigns) do
2325
query |> where([user_token], user_token.context == "session")
2426
end

‎mix.exs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ defmodule DevRound.MixProject do
6262
{:jason, "~> 1.2"},
6363
{:dns_cluster, "~> 0.2.0"},
6464
{:bandit, "~> 1.5"},
65-
{:backpex, github: "sebasgo/backpex", branch: "fix/inline-crud-validation-messages"},
65+
{:backpex, "~> 0.18.0"},
6666
{:earmark, "~> 1.4"},
6767
{:time_zone_info, "~> 0.7"},
6868
{:slugify, "~> 1.3"},

‎mix.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
%{
2-
"backpex": {:git, "https://github.com/sebasgo/backpex.git", "2b677627d214c424a52fc81f4f83b36fa4c57847", [branch: "fix/inline-crud-validation-messages"]},
2+
"backpex": {:hex, :backpex, "0.18.0", "bb006729fb71995a745c40d73b893d921c0ea3a2a6096e530cb6f0406ada3e25", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:gettext, ">= 0.26.0", [hex: :gettext, repo: "hexpm", optional: false]}, {:igniter, "~> 0.6", [hex: :igniter, repo: "hexpm", optional: true]}, {:igniter_js, "~> 0.4", [hex: :igniter_js, repo: "hexpm", optional: true]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}, {:nimble_options, "~> 1.1", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:number, "~> 1.0", [hex: :number, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.7.6 and < 1.9.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_ecto, "~> 4.4", [hex: :phoenix_ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_html_helpers, "~> 1.0", [hex: :phoenix_html_helpers, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}], "hexpm", "334d823b9cb2a7a5030c33be50264557d239cf86a6b3e7e61d50ca3d5f7f72ce"},
33
"bandit": {:hex, :bandit, "1.10.4", "02b9734c67c5916a008e7eb7e2ba68aaea6f8177094a5f8d95f1fb99069aac17", [:mix], [{:hpax, "~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}, {:plug, "~> 1.18", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:thousand_island, "~> 1.0", [hex: :thousand_island, repo: "hexpm", optional: false]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "a5faf501042ac1f31d736d9d4a813b3db4ef812e634583b6a457b0928798a51d"},
44
"bcrypt_elixir": {:hex, :bcrypt_elixir, "3.3.2", "d50091e3c9492d73e17fc1e1619a9b09d6a5ef99160eb4d736926fd475a16ca3", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "471be5151874ae7931911057d1467d908955f93554f7a6cd1b7d804cac8cef53"},
55
"bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},

0 commit comments

Comments
 (0)