Skip to content

Commit 051d501

Browse files
dependabot[bot]firestack
dependabot[bot]
and
firestack
authored
chore: Bump phoenix_live_view from 0.20.7 to 1.1.14 (#908)
* chore: Bump phoenix_live_view from 0.20.7 to 1.1.14 Bumps [phoenix_live_view](https://github.com/phoenixframework/phoenix_live_view) from 0.20.7 to 1.1.14. - [Changelog](https://github.com/phoenixframework/phoenix_live_view/blob/v1.1.14/CHANGELOG.md) - [Commits](phoenixframework/phoenix_live_view@v0.20.7...v1.1.14) --- updated-dependencies: - dependency-name: phoenix_live_view dependency-version: 1.1.14 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix: escape curly brackets * fix: add `formats` to `ApiWeb.Web :controller` * fix: remove deprecated `namespace` arguments * fix: format with new heex formatter --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kayla Firestack <kfirestack@mbta.com>
1 parent 414e6c3 commit 051d501

40 files changed

+250
-254
lines changed

‎apps/api_web/lib/api_web/templates/admin/accounts/key/edit.html.heex‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<div class="panel-heading">Key Details</div>
44
<div class="panel-body">
55
<ul>
6-
<li><strong>User E-mail:</strong> <%= @user.email %></li>
7-
<li><strong>Key:</strong> <%= @key.key %></li>
6+
<li><strong>User E-mail:</strong> {@user.email}</li>
7+
<li><strong>Key:</strong> {@key.key}</li>
88
</ul>
99
</div>
1010
</div>
1111

12-
<%= render("form.html",
12+
{render("form.html",
1313
changeset: @changeset,
1414
action: admin_key_path(@conn, :update, @user, @key),
1515
method: :put,
1616
api_versions: @api_versions
17-
) %>
17+
)}
1818

19-
<span><%= link("Back", to: admin_user_path(@conn, :show, @user)) %></span>
19+
<span>{link("Back", to: admin_user_path(@conn, :show, @user))}</span>

‎apps/api_web/lib/api_web/templates/admin/accounts/key/form.html.heex‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,49 @@
66
<% end %>
77

88
<div class="form-group">
9-
<%= label(
9+
{label(
1010
f,
1111
"Per-Minute Limit (default #{ApiWeb.ApiViewHelpers.default_registered_per_minute()})",
1212
class: "control-label"
13-
) %>
14-
<%= text_input(f, :per_minute_limit,
13+
)}
14+
{text_input(f, :per_minute_limit,
1515
value: ApiWeb.ApiViewHelpers.per_minute_limit_value(@changeset.data),
1616
class: "form-control"
17-
) %>
18-
<%= error_tag(f, :daily_limit) %>
17+
)}
18+
{error_tag(f, :daily_limit)}
1919
</div>
2020

2121
<div class="form-group">
22-
<%= label(f, :description, class: "control-label") %>
23-
<%= text_input(f, :description, class: "form-control") %>
24-
<%= error_tag(f, :description) %>
22+
{label(f, :description, class: "control-label")}
23+
{text_input(f, :description, class: "form-control")}
24+
{error_tag(f, :description)}
2525
</div>
2626

2727
<div class="form-group">
28-
<%= label(f, :api_version, class: "control-label") %>
29-
<%= select(f, :api_version, @api_versions, class: "form-control") %>
30-
<%= error_tag(f, :api_version) %>
28+
{label(f, :api_version, class: "control-label")}
29+
{select(f, :api_version, @api_versions, class: "form-control")}
30+
{error_tag(f, :api_version)}
3131
</div>
3232

3333
<div class="form-group">
34-
<%= label(f, "Allowed domains (comma separated list of domains or *)", class: "control-label") %>
35-
<%= text_input(f, :allowed_domains, class: "form-control") %>
36-
<%= error_tag(f, :allowed_domains) %>
34+
{label(f, "Allowed domains (comma separated list of domains or *)", class: "control-label")}
35+
{text_input(f, :allowed_domains, class: "form-control")}
36+
{error_tag(f, :allowed_domains)}
3737
</div>
3838

3939
<div class="form-group">
40-
<%= label(f, :approved, class: "control-label") %>
41-
<%= checkbox(f, :approved, class: "checkbox") %>
42-
<%= error_tag(f, :approved) %>
40+
{label(f, :approved, class: "control-label")}
41+
{checkbox(f, :approved, class: "checkbox")}
42+
{error_tag(f, :approved)}
4343
</div>
4444

4545
<div class="form-group">
46-
<%= label(f, :locked, class: "control-label") %>
47-
<%= checkbox(f, :locked, class: "checkbox") %>
48-
<%= error_tag(f, :locked) %>
46+
{label(f, :locked, class: "control-label")}
47+
{checkbox(f, :locked, class: "checkbox")}
48+
{error_tag(f, :locked)}
4949
</div>
5050

5151
<div class="form-group">
52-
<%= submit("Submit", class: "btn btn-primary") %>
52+
{submit("Submit", class: "btn btn-primary")}
5353
</div>
5454
<% end %>

‎apps/api_web/lib/api_web/templates/admin/accounts/key/index.html.heex‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<h2>Find user by key</h2>
2-
<%= render("search.html",
2+
{render("search.html",
33
conn: @conn,
44
action: admin_key_path(@conn, :find_user_by_key),
55
method: :post
6-
) %>
6+
)}
77

88
<h2>Pending Key Approvals</h2>
99
<table class="table">
@@ -17,9 +17,9 @@
1717
<%= for {key, user} <- @key_requests do %>
1818
<tr data-key-id={key.key}>
1919
<td>
20-
<%= link(user.email, to: admin_user_path(@conn, :show, user), target: "_blank") %>
20+
{link(user.email, to: admin_user_path(@conn, :show, user), target: "_blank")}
2121
</td>
22-
<td><%= key.requested_date %></td>
22+
<td>{key.requested_date}</td>
2323
</tr>
2424
<% end %>
2525
</tbody>

‎apps/api_web/lib/api_web/templates/admin/accounts/key/search.html.heex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<%= form_for @conn, @action, [as: :search], fn f -> %>
22
<div class="form-group">
3-
<%= text_input(f, :key, class: "form-control") %>
3+
{text_input(f, :key, class: "form-control")}
44
</div>
55

66
<div class="form-group">
7-
<%= submit("Search", class: "btn btn-primary") %>
7+
{submit("Search", class: "btn btn-primary")}
88
</div>
99
<% end %>

‎apps/api_web/lib/api_web/templates/admin/accounts/user/edit.html.heex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<h2>Edit User</h2>
22

3-
<%= render("form.html",
3+
{render("form.html",
44
changeset: @changeset,
55
action: admin_user_path(@conn, :update, @user),
66
method: :put
7-
) %>
7+
)}
88

9-
<span><%= link("Back", to: admin_user_path(@conn, :index)) %></span>
9+
<span>{link("Back", to: admin_user_path(@conn, :index))}</span>

‎apps/api_web/lib/api_web/templates/admin/accounts/user/form.html.heex‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,48 @@
66
<% end %>
77

88
<div class="form-group">
9-
<%= label(f, :email, class: "control-label") %>
10-
<%= email_input(f, :email, class: "form-control") %>
11-
<%= error_tag(f, :email) %>
9+
{label(f, :email, class: "control-label")}
10+
{email_input(f, :email, class: "form-control")}
11+
{error_tag(f, :email)}
1212
</div>
1313

1414
<div class="form-group">
15-
<%= label(f, :username, class: "control-label") %>
16-
<%= text_input(f, :username, class: "form-control") %>
17-
<%= error_tag(f, :username) %>
15+
{label(f, :username, class: "control-label")}
16+
{text_input(f, :username, class: "form-control")}
17+
{error_tag(f, :username)}
1818
</div>
1919

2020
<div class="form-group">
21-
<%= label(f, :role, class: "control-label") %>
22-
<%= text_input(f, :role, class: "form-control") %>
23-
<%= error_tag(f, :role) %>
21+
{label(f, :role, class: "control-label")}
22+
{text_input(f, :role, class: "form-control")}
23+
{error_tag(f, :role)}
2424
</div>
2525

2626
<div class="form-group">
27-
<%= label(f, :phone, class: "control-label") %>
28-
<%= text_input(f, :phone, class: "form-control") %>
29-
<%= error_tag(f, :phone) %>
27+
{label(f, :phone, class: "control-label")}
28+
{text_input(f, :phone, class: "form-control")}
29+
{error_tag(f, :phone)}
3030
</div>
3131

3232
<div class="form-group">
33-
<%= label(f, :join_date, class: "control-label") %>
34-
<%= datetime_select(f, :join_date, class: "form-control") %>
35-
<%= error_tag(f, :join_date) %>
33+
{label(f, :join_date, class: "control-label")}
34+
{datetime_select(f, :join_date, class: "form-control")}
35+
{error_tag(f, :join_date)}
3636
</div>
3737

3838
<div class="form-group">
39-
<%= label(f, :active, class: "control-label") %>
40-
<%= checkbox(f, :active, class: "checkbox") %>
41-
<%= error_tag(f, :active) %>
39+
{label(f, :active, class: "control-label")}
40+
{checkbox(f, :active, class: "checkbox")}
41+
{error_tag(f, :active)}
4242
</div>
4343

4444
<div class="form-group">
45-
<%= label(f, :blocked, class: "control-label") %>
46-
<%= checkbox(f, :blocked, class: "checkbox") %>
47-
<%= error_tag(f, :blocked) %>
45+
{label(f, :blocked, class: "control-label")}
46+
{checkbox(f, :blocked, class: "checkbox")}
47+
{error_tag(f, :blocked)}
4848
</div>
4949

5050
<div class="form-group">
51-
<%= submit("Submit", class: "btn btn-primary") %>
51+
{submit("Submit", class: "btn btn-primary")}
5252
</div>
5353
<% end %>

‎apps/api_web/lib/api_web/templates/admin/accounts/user/index.html.heex‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<tbody>
1818
<%= for user <- @users do %>
1919
<tr>
20-
<td><%= user.email %></td>
21-
<td><%= user.username %></td>
22-
<td><%= user.role %></td>
23-
<td><%= user.phone %></td>
24-
<td><%= user.join_date %></td>
20+
<td>{user.email}</td>
21+
<td>{user.username}</td>
22+
<td>{user.role}</td>
23+
<td>{user.phone}</td>
24+
<td>{user.join_date}</td>
2525
<td>
2626
<%= if user.active == true do %>
2727
✔
@@ -40,30 +40,30 @@
4040

4141
<td class="text-right">
4242
<span>
43-
<%= link("Show",
43+
{link("Show",
4444
to: admin_user_path(@conn, :show, user),
4545
class: "btn btn-default btn-xs"
46-
) %>
46+
)}
4747
</span>
4848
<span>
49-
<%= link("Edit",
49+
{link("Edit",
5050
to: admin_user_path(@conn, :edit, user),
5151
class: "btn btn-default btn-xs"
52-
) %>
52+
)}
5353
</span>
5454
<span>
55-
<%= link("Delete",
55+
{link("Delete",
5656
to: admin_user_path(@conn, :delete, user),
5757
method: :delete,
5858
data: [confirm: "Are you sure?"],
5959
style: "display: inline-block",
6060
class: "btn btn-danger btn-xs"
61-
) %>
61+
)}
6262
</span>
6363
</td>
6464
</tr>
6565
<% end %>
6666
</tbody>
6767
</table>
6868

69-
<span><%= link("New User", to: admin_user_path(@conn, :new)) %></span>
69+
<span>{link("New User", to: admin_user_path(@conn, :new))}</span>

‎apps/api_web/lib/api_web/templates/admin/accounts/user/new.html.heex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<h2>New User</h2>
22

3-
<%= render("form.html",
3+
{render("form.html",
44
changeset: @changeset,
55
action: admin_user_path(@conn, :create)
6-
) %>
6+
)}
77

8-
<span><%= link("Back", to: admin_user_path(@conn, :index)) %></span>
8+
<span>{link("Back", to: admin_user_path(@conn, :index))}</span>

0 commit comments

Comments
 (0)