From be58824bd329fad7a4520b5ae7ffd581cafc28ee Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Mon, 1 Mar 2021 15:53:31 -0600 Subject: [PATCH] feat: Add Alpine to assets --- apps/app/assets/js/app.js | 3 ++- apps/app/assets/package-lock.json | 5 +++++ apps/app/assets/package.json | 1 + apps/core/test/auth_web/plugs/require_admin_test.exs | 9 +++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/apps/app/assets/js/app.js b/apps/app/assets/js/app.js index c7998ec1..bc4627f5 100644 --- a/apps/app/assets/js/app.js +++ b/apps/app/assets/js/app.js @@ -13,6 +13,7 @@ import "../css/app.css" // import socket from "./socket" // import "phoenix_html" +import "alpinejs" import { ready } from "./utils" function togglePasswordFieldVisibility() @@ -22,7 +23,7 @@ function togglePasswordFieldVisibility() if (el.type == 'password') { el.type = 'text' - } + } else { el.type = 'password' diff --git a/apps/app/assets/package-lock.json b/apps/app/assets/package-lock.json index 9135e71b..df446d3c 100644 --- a/apps/app/assets/package-lock.json +++ b/apps/app/assets/package-lock.json @@ -1332,6 +1332,11 @@ "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", "dev": true }, + "alpinejs": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-2.8.1.tgz", + "integrity": "sha512-ETJ/k0fbiBeP+OSd5Fhj70c+zb+YRzcVbyh5DVeLT3FBWMUeUvjOSWLi53IVLPSehaT2SKmB7w08WGF2jYTqNA==" + }, "amdefine": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", diff --git a/apps/app/assets/package.json b/apps/app/assets/package.json index 825d13c2..a3988afd 100644 --- a/apps/app/assets/package.json +++ b/apps/app/assets/package.json @@ -9,6 +9,7 @@ }, "dependencies": { "@fortawesome/fontawesome-free": "^5.14.0", + "alpinejs": "^2.8.1", "autoprefixer": "^9.8.6", "csswring": "^7.0.0", "glob": "^7.1.6", diff --git a/apps/core/test/auth_web/plugs/require_admin_test.exs b/apps/core/test/auth_web/plugs/require_admin_test.exs index 7cd976a4..f44fa7b8 100644 --- a/apps/core/test/auth_web/plugs/require_admin_test.exs +++ b/apps/core/test/auth_web/plugs/require_admin_test.exs @@ -27,4 +27,13 @@ defmodule AuthWeb.Plugs.RequireAdminTest do assert !conn.halted end + + test "call/2 with a user who is not admin", %{conn: conn} do + conn = + conn + |> Pow.Plug.assign_current_user(%User{roles: []}, []) + |> RequireAdmin.call([]) + + assert conn.halted + end end