From fa3645719d0a9ca2f2170baff95f75d29daa4a6d Mon Sep 17 00:00:00 2001 From: Adam Piontek Date: Mon, 8 Mar 2021 22:45:19 -0500 Subject: [PATCH] formatting --- assets/js/app.js | 5 ++-- .../live/user/registration.html.leex | 1 - .../live/user/reset_password.html.leex | 1 - .../live/user/settings/email.html.leex | 3 --- .../live/user/settings/password.html.leex | 1 - .../user_management/form_component.html.leex | 1 - .../templates/user_session/new.html.eex | 2 -- priv/repo/seeds.exs | 23 +++++++++++-------- 8 files changed, 16 insertions(+), 21 deletions(-) diff --git a/assets/js/app.js b/assets/js/app.js index c7015ec..29258d1 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -19,8 +19,8 @@ import "../node_modules/bootstrap-icons/icons/key-fill.svg"; // pw confirm field import "../node_modules/bootstrap-icons/icons/lock.svg"; // current pw field import "../node_modules/bootstrap-icons/icons/shield.svg"; // role // live tables -import "../node_modules/bootstrap-icons/icons/funnel.svg"; -import "../node_modules/bootstrap-icons/icons/backspace.svg"; // clear filter +import "../node_modules/bootstrap-icons/icons/funnel.svg"; // filter +import "../node_modules/bootstrap-icons/icons/x-circle-fill.svg"; // clear filter import "../node_modules/bootstrap-icons/icons/sort-down-alt.svg"; import "../node_modules/bootstrap-icons/icons/sort-up-alt.svg"; import "../node_modules/bootstrap-icons/icons/chevron-left.svg"; @@ -29,7 +29,6 @@ import "../node_modules/bootstrap-icons/icons/pencil.svg"; import "../node_modules/bootstrap-icons/icons/trash.svg"; import "../node_modules/bootstrap-icons/icons/check.svg"; import "../node_modules/bootstrap-icons/icons/x.svg"; -import "../node_modules/bootstrap-icons/icons/x-circle-fill.svg"; // page headers import "../node_modules/bootstrap-icons/icons/shield-lock.svg"; // reset password import "../node_modules/bootstrap-icons/icons/arrow-repeat.svg"; // resend confirmation diff --git a/lib/bones73k_web/live/user/registration.html.leex b/lib/bones73k_web/live/user/registration.html.leex index f23cee6..22416c1 100644 --- a/lib/bones73k_web/live/user/registration.html.leex +++ b/lib/bones73k_web/live/user/registration.html.leex @@ -9,7 +9,6 @@ <%= form_for @changeset, "#", [phx_change: :validate, phx_submit: :save, novalidate: true, id: "reg_form"], fn f -> %> - <%= label f, :email, class: "form-label" %>
<%= icon_div @socket, "bi-at", [class: "icon is-left text-muted fs-5"] %> diff --git a/lib/bones73k_web/live/user/reset_password.html.leex b/lib/bones73k_web/live/user/reset_password.html.leex index 67bc766..049d15a 100644 --- a/lib/bones73k_web/live/user/reset_password.html.leex +++ b/lib/bones73k_web/live/user/reset_password.html.leex @@ -34,7 +34,6 @@ <%= error_tag f, :password_confirmation %>
-
<%= submit "Reset password", class: "btn btn-primary", diff --git a/lib/bones73k_web/live/user/settings/email.html.leex b/lib/bones73k_web/live/user/settings/email.html.leex index 18bc711..d50ce90 100644 --- a/lib/bones73k_web/live/user/settings/email.html.leex +++ b/lib/bones73k_web/live/user/settings/email.html.leex @@ -4,7 +4,6 @@ <%= form_for @changeset, "#", [phx_change: :validate, phx_submit: :save, phx_target: @myself], fn f -> %> - <%= label f, :email, class: "form-label" %>
<%= icon_div @socket, "bi-at", [class: "icon is-left text-muted fs-5"] %> @@ -19,7 +18,6 @@ <%= error_tag f, :email %>
- <%= label f, :current_password, class: "form-label" %>
<%= icon_div @socket, "bi-lock", [class: "icon is-left text-muted fs-5"] %> @@ -31,7 +29,6 @@ <%= error_tag f, :current_password %>
-
<%= submit "Change email", class: "btn btn-primary", diff --git a/lib/bones73k_web/live/user/settings/password.html.leex b/lib/bones73k_web/live/user/settings/password.html.leex index 6d21d7d..eca8b96 100644 --- a/lib/bones73k_web/live/user/settings/password.html.leex +++ b/lib/bones73k_web/live/user/settings/password.html.leex @@ -4,7 +4,6 @@ <%= form_for @changeset, "#", [phx_change: :validate, phx_submit: :save, phx_target: @myself], fn f -> %> - <%= label f, :password, "New password", class: "form-label" %>
<%= icon_div @socket, "bi-key", [class: "icon is-left text-muted fs-5"] %> diff --git a/lib/bones73k_web/live/user_management/form_component.html.leex b/lib/bones73k_web/live/user_management/form_component.html.leex index 6d856cc..fbe7d25 100644 --- a/lib/bones73k_web/live/user_management/form_component.html.leex +++ b/lib/bones73k_web/live/user_management/form_component.html.leex @@ -46,7 +46,6 @@ <%= hidden_input f, :role, value: input_value(f, :role) %> <% end %> -
diff --git a/lib/bones73k_web/templates/user_session/new.html.eex b/lib/bones73k_web/templates/user_session/new.html.eex index 59df5ad..310f089 100644 --- a/lib/bones73k_web/templates/user_session/new.html.eex +++ b/lib/bones73k_web/templates/user_session/new.html.eex @@ -15,7 +15,6 @@
<% end %> - <%= label f, :email, class: "form-label" %>
<%= icon_div @conn, "bi-at", [class: "icon is-left text-muted fs-5"] %> @@ -38,7 +37,6 @@ password is required
-
<%= checkbox f, :remember_me, class: "form-check-input" %> <%= label f, :remember_me, "Keep me logged in for 60 days", class: "form-check-label" %> diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs index c729da4..5545d62 100644 --- a/priv/repo/seeds.exs +++ b/priv/repo/seeds.exs @@ -52,14 +52,17 @@ count_to_take = 123 mock_users = users_json |> File.read!() |> Jason.decode!() |> Enum.take_random(count_to_take) -mock_users = ~s([ - {"email":"adam@73k.us","password":"adamadamA1","role":"admin","inserted_at":"2018-12-14T01:01:01Z","confirmed_at":true}, - {"email":"karen@73k.us","password":"karenkarenA1","role":"manager","inserted_at":"2018-12-14T01:06:01Z","confirmed_at":true}, - {"email":"kat@73k.us","password":"katkatA1","role":"manager","inserted_at":"2018-12-14T01:06:01Z","confirmed_at":true} - ]) |> Jason.decode!() |> Enum.concat(mock_users) +extra_mock_users = ~s([ + {"email":"adam@73k.us","password":"adamadamA1","role":"admin","inserted_at":"2018-12-14T01:01:01Z","confirmed_at":true}, + {"email":"karen@73k.us","password":"karenkarenA1","role":"manager","inserted_at":"2018-12-14T01:06:01Z","confirmed_at":true}, + {"email":"kat@73k.us","password":"katkatA1","role":"manager","inserted_at":"2018-12-14T01:06:01Z","confirmed_at":true} +]) mock_users = - Enum.map(mock_users, fn e -> + extra_mock_users + |> Jason.decode!() + |> Enum.concat(mock_users) + |> Enum.map(fn e -> add_dt = NaiveDateTime.from_iso8601!(e["inserted_at"]) %{ @@ -112,12 +115,14 @@ props_json = Path.join(this_path, "MOCK_DATA_properties.json") count_to_take = 123 -mock_props = props_json |> File.read!() |> Jason.decode!() |> Enum.take_random(count_to_take) - random_user_query = from User, order_by: fragment("RANDOM()"), limit: 1 mock_props = - Enum.map(mock_props, fn e -> + props_json + |> File.read!() + |> Jason.decode!() + |> Enum.take_random(count_to_take) + |> Enum.map(fn e -> add_dt = NaiveDateTime.from_iso8601!(e["inserted_at"]) rand_user = Repo.one(random_user_query)