Skip to content

Commit 26d4a03

Browse files
committed
Merge branch 'develop' into feature/backpex-installer
# Conflicts: # demo/mix.lock # mix.lock
2 parents 3758dd4 + 8363420 commit 26d4a03

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2192
-2115
lines changed

.credo.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ overwrite_checks = [
44
{Credo.Check.Readability.OnePipePerLine, false},
55
{Credo.Check.Readability.SinglePipe, false},
66
{Credo.Check.Readability.Specs, false},
7-
{Credo.Check.Readability.StrictModuleLayout, ignore_module_attributes: ~w[config_schema]a},
7+
{Credo.Check.Readability.StrictModuleLayout, ignore_module_attributes: ~w[config_schema resource_opts]a},
88
{Credo.Check.Refactor.ABCSize, false},
99
{Credo.Check.Refactor.ModuleDependencies, false},
1010
{Credo.Check.Refactor.PipeChainStart, false},

.github/renovate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
":automergePatch",
1313
"helpers:pinGitHubActionDigestsToSemver"
1414
],
15+
"lockFileMaintenance": {
16+
"enabled": true
17+
},
1518
"additionalBranchPrefix": "{{packageFileDir}}-",
1619
"packageRules": [
1720
{

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
elixir-version: ${{ matrix.elixir }}
4040

4141
- name: Setup node
42-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
42+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
4343
with:
4444
node-version: 20
4545
cache: 'yarn'
@@ -132,7 +132,7 @@ jobs:
132132

133133
services:
134134
postgres:
135-
image: postgres:16.8@sha256:e95b0cb95f719e0ce156c2bc5545c89fbd98a1a692845a5331ddc79ea61f1b1e
135+
image: postgres:16.9@sha256:64d54200dec0cb9d2d3e43f094e9aa47e7e6c8c246828a512969cccc39b5afb2
136136
env:
137137
POSTGRES_PASSWORD: postgres
138138
options: >-
@@ -155,7 +155,7 @@ jobs:
155155
version-type: strict
156156

157157
- name: Setup node
158-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
158+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
159159
with:
160160
node-version: 20
161161
cache: 'yarn'
@@ -269,7 +269,7 @@ jobs:
269269
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_RUNTIME }}
270270

271271
- name: Build container
272-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
272+
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
273273
with:
274274
push: ${{ env.PUSH_IMAGE }}
275275
tags: ${{ steps.meta.outputs.tags }}

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
erlang 27.3.2
1+
erlang 27.3.3
22
elixir 1.18.3

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.3
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=27.3.2
8+
ARG OTP_VERSION=27.3.3
99
# renovate: datasource=docker depName=ubuntu packageName=ubuntu versioning=ubuntu
10-
ARG UBUNTU_VERSION=noble-20250127
10+
ARG UBUNTU_VERSION=noble-20250404
1111

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

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<img src="https://github.com/naymspace/backpex/blob/develop/priv/static/images/logo.svg?raw=true" width="100" height="100">
88
<br />
99
<br />
10-
Phoenix Admin Panel built with PETAL · Backpex
10+
Phoenix LiveView Admin Panel · Backpex
1111
<br />
1212
<br />
1313
<span>📚 <a href="https://hexdocs.pm/backpex">Documentation</a></span>
@@ -51,4 +51,4 @@ We also provide a detailed [documentation](https://hexdocs.pm/backpex) with guid
5151

5252
## License
5353

54-
Backpex is open-source software, licensed under the [MIT License](https://github.com/naymspace/backpex/blob/main/LICENSE.md).
54+
Backpex is open-source software, licensed under the [MIT License](https://github.com/naymspace/backpex/blob/main/LICENSE.md).

compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
postgres:
1919
condition: service_healthy
2020
postgres:
21-
image: postgres:16.8@sha256:e95b0cb95f719e0ce156c2bc5545c89fbd98a1a692845a5331ddc79ea61f1b1e
21+
image: postgres:16.8@sha256:fecda556831814abf7396c63883bd23a789ea131c4c38d175b9690775223db39
2222
environment:
2323
- POSTGRES_PASSWORD=postgres
2424
ports:

demo/config/config.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ config :demo, DemoWeb.Endpoint,
4343
config :demo, Demo.Repo, migration_primary_key: [name: :id, type: :binary_id]
4444

4545
config :esbuild,
46-
version: "0.25.2",
46+
version: "0.25.4",
4747
default: [
4848
args:
4949
~w(assets/js/app.js --bundle --target=es2017 --outdir=priv/static/assets --external:/fonts/* --external:/images/* --alias:backpex=/opt/app),
@@ -52,7 +52,7 @@ config :esbuild,
5252
]
5353

5454
config :tailwind,
55-
version: "4.0.17",
55+
version: "4.1.7",
5656
default: [
5757
args: ~w(
5858
--input=assets/css/app.css

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="csrf-token" content={get_csrf_token()} />
77
<.sentry_meta_tag />
88
<.live_title suffix=" · Backpex">
9-
{assigns[:page_title] || "Phoenix Admin Panel build with PETAL"}
9+
{assigns[:page_title] || "Phoenix LiveView Admin Panel"}
1010
</.live_title>
1111
<link phx-track-static rel="stylesheet" href={~p"/assets/app.css"} />
1212
<script defer phx-track-static type="text/javascript" src={~p"/assets/app.js"}>

demo/lib/demo_web/live/tag_live.ex

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,18 @@ defmodule DemoWeb.TagLive do
77
create_changeset: &Demo.Tag.create_changeset/3
88
],
99
layout: {DemoWeb.Layouts, :admin},
10-
init_order: %{by: :name, direction: :desc}
10+
init_order: %{by: :name, direction: :desc},
11+
on_mount: __MODULE__
12+
13+
def on_mount(:default, _params, _session, socket) do
14+
msg = """
15+
Hi there, this is a flash from #{inspect(__ENV__.function)}
16+
in #{__MODULE__} via the #{socket.assigns.live_action} live_action.
17+
You can do all kind of stuff in here, like attaching hooks to handle_event, handle_info or handle_params.
18+
"""
19+
20+
{:cont, Phoenix.LiveView.put_flash(socket, :info, msg)}
21+
end
1122

1223
@impl Backpex.LiveResource
1324
def singular_name, do: "Tag"

0 commit comments

Comments
 (0)