Skip to content

Commit 4151985

Browse files
committed
Merge branch 'develop' into feature/1280-improve-currency-field
2 parents f4f90c5 + aa6354b commit 4151985

File tree

24 files changed

+227
-189
lines changed

24 files changed

+227
-189
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132

133133
services:
134134
postgres:
135-
image: postgres:16.9@sha256:918e8e72b35b5370901965ce3da5a355c3537cb5e10c38e82c2b6f174b758334
135+
image: postgres:16.9@sha256:fec2740c517838d4f582e48a8a9a1cb51082af3dcae59e9b12a66ec262302b97
136136
env:
137137
POSTGRES_PASSWORD: postgres
138138
options: >-

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
erlang 28.0.1
1+
erlang 28.0.2
22
elixir 1.18.4

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# renovate: datasource=github-tags depName=elixir packageName=elixir-lang/elixir versioning=semver
66
ARG ELIXIR_VERSION=1.18.4
77
# renovate: datasource=github-tags depName=erlang packageName=erlang/otp versioning=regex:^(?<major>\d+?)\.(?<minor>\d+?)(\.(?<patch>\d+))?$ extractVersion=^OTP-(?<version>\S+)
8-
ARG OTP_VERSION=28.0.1
8+
ARG OTP_VERSION=28.0.2
99
# renovate: datasource=docker depName=ubuntu packageName=ubuntu versioning=ubuntu
10-
ARG UBUNTU_VERSION=noble-20250619
10+
ARG UBUNTU_VERSION=noble-20250714
1111

1212
ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-ubuntu-${UBUNTU_VERSION}"
1313
ARG RUNTIME_IMAGE="ubuntu:${UBUNTU_VERSION}"

compose.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ services:
99
environment:
1010
- STARTUP_COMMAND_1=mix do deps.get, ecto.create, ecto.migrate
1111
- STARTUP_COMMAND_2=yarn install --pure-lockfile
12-
- STARTUP_COMMAND_3=mix assets.setup
12+
- STARTUP_COMMAND_3=yarn playwright install chromium --with-deps
13+
- STARTUP_COMMAND_4=mix assets.setup
1314
volumes:
1415
- .:/opt/app
1516
ports:
1617
- 4000:4000
18+
- 4007:4007
1719
depends_on:
1820
postgres:
1921
condition: service_healthy
2022
postgres:
21-
image: postgres:16.9@sha256:918e8e72b35b5370901965ce3da5a355c3537cb5e10c38e82c2b6f174b758334
23+
image: postgres:16.9@sha256:fec2740c517838d4f582e48a8a9a1cb51082af3dcae59e9b12a66ec262302b97
2224
environment:
2325
- POSTGRES_PASSWORD=postgres
2426
ports:

demo/config/config.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ config :demo, DemoWeb.Endpoint,
5050
config :demo, Demo.Repo, migration_primary_key: [name: :id, type: :binary_id]
5151

5252
config :esbuild,
53-
version: "0.25.6",
53+
version: "0.25.8",
5454
default: [
5555
args:
5656
~w(assets/js/app.js --bundle --target=es2017 --outdir=priv/static/assets --external:/fonts/* --external:/images/* --alias:backpex=/opt/app),

demo/config/dev.exs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import Config
22

3+
config :live_debugger,
4+
ip: {0, 0, 0, 0},
5+
port: 4007,
6+
external_url: "http://localhost:4007"
7+
38
config :demo, Demo.Repo,
49
show_sensitive_data_on_connection_error: true,
510
migration_timestamps: [type: :utc_datetime]

demo/lib/demo_web/components/layouts/root.html.heex

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1" />
66
<meta name="csrf-token" content={get_csrf_token()} />
7+
{Application.get_env(:live_debugger, :live_debugger_tags)}
78
<.sentry_meta_tag />
89
<.live_title suffix=" · Backpex">
910
{assigns[:page_title] || "Phoenix LiveView Admin Panel"}

demo/lib/demo_web/live/invoice_live.ex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ defmodule DemoWeb.InvoiceLive do
3333
},
3434
amount: %{
3535
module: Backpex.Fields.Currency,
36-
label: "Amount",
37-
align: :right
36+
label: "Amount"
3837
}
3938
]
4039
end

demo/lib/demo_web/live/post_live.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ defmodule DemoWeb.PostLive do
110110
module: Backpex.Fields.Textarea,
111111
label: "Body",
112112
rows: 10,
113-
except: [:index]
113+
except: [:index, :resource_action],
114+
align_label: :center
114115
},
115116
published: %{
116117
module: Backpex.Fields.Boolean,
@@ -122,8 +123,7 @@ defmodule DemoWeb.PostLive do
122123
module: Backpex.Fields.Boolean,
123124
label: "Show likes",
124125
select: dynamic([post: p], fragment("? > 0", p.likes)),
125-
align: :center,
126-
except: [:index, :show]
126+
except: [:index, :resource_action, :show]
127127
},
128128
likes: %{
129129
module: Backpex.Fields.Number,

demo/lib/demo_web/live/product_live.ex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ defmodule DemoWeb.ProductLive do
5151
assigns ->
5252
~H"<p>{Backpex.HTML.pretty_value(@value)}</p>"
5353
end,
54-
except: [:index, :resource_action],
55-
align: :center
54+
except: [:index, :resource_action]
5655
},
5756
name: %{
5857
module: Backpex.Fields.Text,

0 commit comments

Comments
 (0)