Skip to content

Commit 0ae5a73

Browse files
committed
Merge branch 'develop' into feature/backpex-installer
2 parents b2f3b57 + 33a21f8 commit 0ae5a73

File tree

31 files changed

+269
-342
lines changed

31 files changed

+269
-342
lines changed

.github/renovate.json

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,22 @@
1212
":automergePatch",
1313
"helpers:pinGitHubActionDigestsToSemver"
1414
],
15+
"pinDigests": false,
1516
"lockFileMaintenance": {
16-
"enabled": true
17+
"enabled": true,
18+
"extends": [
19+
"schedule:weekly"
20+
]
1721
},
1822
"additionalBranchPrefix": "{{packageFileDir}}-",
1923
"packageRules": [
24+
{
25+
"description": "Set Mix versioning strategy to update-lockfile",
26+
"matchManagers": [
27+
"mix"
28+
],
29+
"rangeStrategy": "update-lockfile"
30+
},
2031
{
2132
"description": "Group dependency updates to the Elixir base image",
2233
"groupName": "Base Image",
@@ -28,16 +39,15 @@
2839
"pinDigests": false
2940
},
3041
{
31-
"description": "Disable ubuntu major updates and digest pinning",
42+
"description": "Disable ubuntu major updates",
3243
"matchDatasources": [
3344
"docker"
3445
],
3546
"matchDepNames": [
3647
"ubuntu"
3748
],
3849
"matchUpdateTypes": [
39-
"major",
40-
"pinDigest"
50+
"major"
4151
],
4252
"enabled": false
4353
},
@@ -46,16 +56,10 @@
4656
"matchDatasources": [
4757
"docker"
4858
],
49-
"automerge": false
50-
},
51-
{
52-
"matchManagers": [
53-
"mix"
54-
],
55-
"rangeStrategy": "update-lockfile"
59+
"automerge": true
5660
},
5761
{
58-
"description": "Automatically merge github actions updates",
62+
"description": "Automatically merge non-major github actions updates",
5963
"matchManagers": [
6064
"github-actions"
6165
],
@@ -67,6 +71,26 @@
6771
],
6872
"automerge": true
6973
},
74+
{
75+
"description": "Automerge some non-major node package updates",
76+
"matchDepNames": [
77+
"@sentry/browser",
78+
"stylelint",
79+
"stylelint-config-standard",
80+
"standard",
81+
"playwright",
82+
"topbar",
83+
"npm-run-all2"
84+
],
85+
"matchDatasources": [
86+
"npm"
87+
],
88+
"matchUpdateTypes": [
89+
"minor",
90+
"patch"
91+
],
92+
"automerge": true
93+
},
7094
{
7195
"description": "Label dependency updates in demo directory",
7296
"matchFileNames": [

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
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: >-
@@ -277,7 +277,7 @@ jobs:
277277

278278
- name: Extract metadata (tags, labels) for Docker
279279
id: meta
280-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
280+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
281281
with:
282282
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_RUNTIME }}
283283

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/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,

demo/lib/demo_web/live/user_live.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ defmodule DemoWeb.UserLive do
7777
assigns ->
7878
~H'<img class="h-10 w-auto" src={file_url(@value)} />'
7979
end,
80-
align: :center
80+
align_label: :center
8181
},
8282
username: %{
8383
module: Backpex.Fields.Text,

demo/mix.exs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ defmodule Demo.MixProject do
4545
{:phoenix_test, "~> 0.7.0", only: :test, runtime: false},
4646
{:phoenix_test_playwright, "~> 0.7.0", only: :test, runtime: false},
4747
{:a11y_audit, "~> 0.2.3", only: :test},
48+
{:live_debugger, "~> 0.3", only: :dev},
4849

4950
# core
5051
{:dns_cluster, "~> 0.2.0"},

0 commit comments

Comments
 (0)