Skip to content

Commit 0872852

Browse files
committed
Sync with Phoenix 1.7.18
1 parent 804d732 commit 0872852

File tree

7 files changed

+26
-10
lines changed

7 files changed

+26
-10
lines changed

config/config.exs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ config :esbuild,
4343

4444
# Configure tailwind (the version is required)
4545
config :tailwind,
46-
version: "3.3.2",
46+
version: "3.4.3",
4747
default: [
4848
args: ~w(
4949
--config=tailwind.config.js

config/dev.exs

+5-2
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,11 @@ config :phoenix, :stacktrace_depth, 20
8282
# Initialize plugs at runtime for faster development compilation
8383
config :phoenix, :plug_init_mode, :runtime
8484

85-
# Include HEEx debug annotations as HTML comments in rendered markup
86-
config :phoenix_live_view, :debug_heex_annotations, true
85+
config :phoenix_live_view,
86+
# Include HEEx debug annotations as HTML comments in rendered markup
87+
debug_heex_annotations: true,
88+
# Enable helpful, but potentially expensive runtime checks
89+
enable_expensive_runtime_checks: true
8790

8891
# Disable swoosh api client as it is only required for production adapters.
8992
config :swoosh, :api_client, false

config/test.exs

+6-2
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,18 @@ config :galaxies, GalaxiesWeb.Endpoint,
2323
secret_key_base: "lCGqGgsenSupke9immF7BXSQoTjQVdbNvJBWIM4noyg4Ll+vP5W/CSCya4dcWXlw",
2424
server: false
2525

26-
# In test we don't send emails.
26+
# In test we don't send emails
2727
config :galaxies, Galaxies.Mailer, adapter: Swoosh.Adapters.Test
2828

29-
# Disable swoosh api client as it is only required for production adapters.
29+
# Disable swoosh api client as it is only required for production adapters
3030
config :swoosh, :api_client, false
3131

3232
# Print only warnings and errors during test
3333
config :logger, level: :warning
3434

3535
# Initialize plugs at runtime for faster test compilation
3636
config :phoenix, :plug_init_mode, :runtime
37+
38+
# Enable helpful, but potentially expensive runtime checks
39+
config :phoenix_live_view,
40+
enable_expensive_runtime_checks: true

lib/galaxies_web/components/layouts.ex

+9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
defmodule GalaxiesWeb.Layouts do
2+
@moduledoc """
3+
This module holds different layouts used by your application.
4+
5+
See the `layouts` directory for all templates available.
6+
The "root" layout is a skeleton rendered as part of the
7+
application router. The "app" layout is set as the default
8+
layout on both `use SampleAppWeb, :controller` and
9+
`use SampleAppWeb, :live_view`.
10+
"""
211
use GalaxiesWeb, :html
312

413
embed_templates "layouts/*"

lib/galaxies_web/components/layouts/root.html.heex

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +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-
<.live_title suffix=" · 17 Galaxies">
7+
<.live_title default="17 Galaxies" suffix=" · 17 Galaxies">
88
{assigns[:page_title] || "Overview"}
99
</.live_title>
1010
<link phx-track-static rel="stylesheet" href={~p"/assets/app.css"} />

lib/galaxies_web/live/player_confirmation_live.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ defmodule GalaxiesWeb.PlayerConfirmationLive do
99
<.header class="text-center">Confirm Account</.header>
1010
1111
<.simple_form for={@form} id="confirmation_form" phx-submit="confirm_account">
12-
<.input field={@form[:token]} type="hidden" />
12+
<input type="hidden" name={@form[:token].name} value={@form[:token].value} />
1313
<:actions>
1414
<.button phx-disable-with="Confirming..." class="w-full">Confirm my account</.button>
1515
</:actions>

lib/galaxies_web/live/player_settings_live.ex

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ defmodule GalaxiesWeb.PlayerSettingsLive do
6565
phx-submit="update_password"
6666
phx-trigger-action={@trigger_submit}
6767
>
68-
<.input
69-
field={@password_form[:email]}
68+
<input
69+
name={@password_form[:email].name}
7070
type="hidden"
71-
id="hidden_player_email"
71+
id="hidden_players_email"
7272
value={@current_email}
7373
/>
7474
<.input field={@password_form[:password]} type="password" label="New password" required />

0 commit comments

Comments
 (0)