shibao/memEx
1
1
Fork 0
Code Issues 1 Pull Requests Projects Releases 21 Wiki Activity

better code style

Browse Source
This commit is contained in:
shibao
2025-02-15 04:04:10 +00:00
parent 2a8a1d11b8
commit 3e686fa199
32 changed files with 225 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/memex_web/components/contexts_table_component.ex
View File

@ -37,7 +37,7 @@ defmodule MemexWeb.Components.ContextsTableComponent do
} = socket
) do
columns =
if actions == [] or current_user |> is_nil() do
if actions == [] or !current_user do
[]
else
[%{label: gettext("actions"), key: :actions, sortable: false}]

22
lib/memex_web/components/core_components/invite_card.html.heex
View File

@ -1,12 +1,13 @@
<div class="px-8 py-4 flex flex-col justify-center items-center space-y-4
bg-primary-900
border border-gray-400 rounded-lg shadow-lg hover:shadow-md
transition-all duration-300 ease-in-out">
<h1 class="title text-xl">
<div class="flex flex-col justify-center items-center px-8 py-4 space-y-4 rounded-lg border border-gray-400 shadow-lg transition-all duration-300 ease-in-out bg-primary-900 hover:shadow-md">
<h1 class="text-xl title">
<%= @invite.name %>
</h1>
<%= if @invite.disabled_at |> is_nil() do %>
<%= if @invite.disabled_at do %>
<h2 class="title text-md">
<%= gettext("invite disabled") %>
</h2>
<% else %>
<h2 class="title text-md">
<%= if @invite.uses_left do %>
<%= gettext(
@ -17,10 +18,6 @@
<%= gettext("uses left: unlimited") %>
<% end %>
</h2>
<% else %>
<h2 class="title text-md">
<%= gettext("invite disabled") %>
</h2>
<% end %>
<.qr_code
@ -35,14 +32,13 @@
<div class="flex flex-row flex-wrap justify-center items-center">
<code
id={"code-#{@invite.id}"}
class="mx-2 my-1 text-xs px-4 py-2 rounded-lg text-center break-all
text-primary-400 bg-primary-800"
class="px-4 py-2 mx-2 my-1 text-xs text-center break-all rounded-lg text-primary-400 bg-primary-800"
phx-no-format
><%= url(MemexWeb.Endpoint, ~p"/users/register?invite=#{@invite.token}") %></code>
<%= if @code_actions, do: render_slot(@code_actions) %>
</div>
<div :if={@inner_block} class="flex space-x-4 justify-center items-center">
<div :if={@inner_block} class="flex justify-center items-center space-x-4">
<%= render_slot(@inner_block) %>
</div>
</div>

2
lib/memex_web/components/notes_table_component.ex
View File

@ -37,7 +37,7 @@ defmodule MemexWeb.Components.NotesTableComponent do
} = socket
) do
columns =
if actions == [] or current_user |> is_nil() do
if actions == [] or !current_user do
[]
else
[%{label: gettext("actions"), key: :actions, sortable: false}]

4
lib/memex_web/components/pipelines_table_component.ex
View File

@ -37,7 +37,7 @@ defmodule MemexWeb.Components.PipelinesTableComponent do
} = socket
) do
columns =
if actions == [] or current_user |> is_nil() do
if actions == [] or !current_user do
[]
else
[%{label: gettext("actions"), key: :actions, sortable: false}]
@ -101,7 +101,7 @@ defmodule MemexWeb.Components.PipelinesTableComponent do
defp get_value_for_key(:description, %{description: description} = assigns, _additional_data) do
description_block = ~H"""
<div class="truncate max-w-sm">
<div class="max-w-sm truncate">
<%= @description %>
</div>
"""

13
lib/memex_web/controller_helpers.ex Normal file
View File

@ -0,0 +1,13 @@
defmodule MemexWeb.ControllerHelpers do
@moduledoc """
Implements controller helpers
"""
import Plug.Conn, only: [assign: 3]
def assign(conn, assigns) do
assigns
|> Map.new()
|> Enum.reduce(conn, fn {key, value}, conn -> conn |> assign(key, value) end)
end
end

2
lib/memex_web/controllers/user_confirmation_controller.ex
View File

@ -42,7 +42,7 @@ defmodule MemexWeb.UserConfirmationController do
# by some automation or by the user themselves, so we redirect without
# a warning message.
case conn.assigns do
%{current_user: %{confirmed_at: confirmed_at}} when not is_nil(confirmed_at) ->
%{current_user: %{confirmed_at: %{}}} ->
redirect(conn, to: ~p"/")
%{} ->

2
lib/memex_web/controllers/user_reset_password_controller.ex
View File

@ -54,7 +54,7 @@ defmodule MemexWeb.UserResetPasswordController do
%{"token" => token} = conn.params
if user = Accounts.get_user_by_reset_password_token(token) do
conn |> assign(:user, user) |> assign(:token, token)
conn |> assign(user: user, token: token)
else
conn
|> put_flash(

8
lib/memex_web/controllers/user_settings_controller.ex
View File

@ -103,8 +103,10 @@ defmodule MemexWeb.UserSettingsController do
defp assign_email_and_password_changesets(%{assigns: %{current_user: user}} = conn, _opts) do
conn
|> assign(:email_changeset, Accounts.change_user_email(user))
|> assign(:password_changeset, Accounts.change_user_password(user))
|> assign(:locale_changeset, Accounts.change_user_locale(user))
|> assign(
email_changeset: Accounts.change_user_email(user),
locale_changeset: Accounts.change_user_locale(user),
password_changeset: Accounts.change_user_password(user)
)
end
end

2
lib/memex_web/live/context_live/form_component.ex
View File

@ -69,7 +69,7 @@ defmodule MemexWeb.ContextLive.FormComponent do
|> push_navigate(to: return_to)
{:error, %Changeset{} = changeset} ->
assign(socket, changeset: changeset)
assign(socket, :changeset, changeset)
end
{:noreply, socket}

31
lib/memex_web/live/context_live/index.ex
View File

@ -20,29 +20,37 @@ defmodule MemexWeb.ContextLive.Index do
%{slug: slug} = context = Contexts.get_context_by_slug(slug, current_user)
socket
|> assign(page_title: gettext("edit %{slug}", slug: slug))
|> assign(context: context)
|> assign(
context: context,
page_title: gettext("edit %{slug}", slug: slug)
)
end
defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do
socket
|> assign(page_title: gettext("new context"))
|> assign(context: %Context{visibility: :private, user_id: current_user_id})
|> assign(
context: %Context{visibility: :private, user_id: current_user_id},
page_title: gettext("new context")
)
end
defp apply_action(socket, :index, _params) do
socket
|> assign(page_title: gettext("contexts"))
|> assign(search: nil)
|> assign(context: nil)
|> assign(
context: nil,
page_title: gettext("contexts"),
search: nil
)
|> display_contexts()
end
defp apply_action(socket, :search, %{"search" => search}) do
socket
|> assign(page_title: gettext("contexts"))
|> assign(search: search)
|> assign(context: nil)
|> assign(
context: nil,
page_title: gettext("contexts"),
search: search
)
|> display_contexts()
end
@ -68,8 +76,7 @@ defmodule MemexWeb.ContextLive.Index do
{:noreply, socket |> push_patch(to: redirect_to)}
end
defp display_contexts(%{assigns: %{current_user: current_user, search: search}} = socket)
when not (current_user |> is_nil()) do
defp display_contexts(%{assigns: %{current_user: %{} = current_user, search: search}} = socket) do
socket |> assign(contexts: Contexts.list_contexts(search, current_user))
end

6
lib/memex_web/live/context_live/show.ex
View File

@ -21,8 +21,10 @@ defmodule MemexWeb.ContextLive.Show do
socket =
socket
|> assign(:page_title, page_title(live_action, context))
|> assign(:context, context)
|> assign(
context: context,
page_title: page_title(live_action, context)
)
{:noreply, socket}
end

2
lib/memex_web/live/home_live.ex
View File

@ -11,6 +11,6 @@ defmodule MemexWeb.HomeLive do
@impl true
def mount(_params, _session, socket) do
admins = Accounts.list_users_by_role(:admin)
{:ok, socket |> assign(page_title: gettext("home"), admins: admins, version: @version)}
{:ok, socket |> assign(admins: admins, page_title: gettext("home"), version: @version)}
end
end

2
lib/memex_web/live/invite_live/form_component.ex
View File

@ -82,7 +82,7 @@ defmodule MemexWeb.InviteLive.FormComponent do
socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
{:error, %Changeset{} = changeset} ->
socket |> assign(changeset: changeset)
socket |> assign(:changeset, changeset)
end
{:noreply, socket}

8
lib/memex_web/live/invite_live/index.ex
View File

@ -20,15 +20,15 @@ defmodule MemexWeb.InviteLive.Index do
defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do
socket
|> assign(page_title: gettext("edit invite"), invite: Invites.get_invite!(id, current_user))
|> assign(invite: Invites.get_invite!(id, current_user), page_title: gettext("edit invite"))
end
defp apply_action(socket, :new, _params) do
socket |> assign(page_title: gettext("new invite"), invite: %Invite{})
socket |> assign(invite: %Invite{}, page_title: gettext("new invite"))
end
defp apply_action(socket, :index, _params) do
socket |> assign(page_title: gettext("invites"), invite: nil)
socket |> assign(invite: nil, page_title: gettext("invites"))
end
@impl true
@ -138,6 +138,6 @@ defmodule MemexWeb.InviteLive.Index do
use_counts = invites |> Invites.get_use_counts(current_user)
users = all_users |> Map.get(:user, [])
socket |> assign(invites: invites, use_counts: use_counts, admins: admins, users: users)
socket |> assign(admins: admins, invites: invites, use_counts: use_counts, users: users)
end
end

2
lib/memex_web/live/invite_live/index.html.heex
View File

@ -71,7 +71,7 @@
</.link>
<.link
:if={invite.disabled_at |> is_nil() and not (invite.uses_left |> is_nil())}
:if={!invite.disabled_at and !!invite.uses_left}
href="#"
class="btn btn-secondary"
phx-click="set_unlimited"

2
lib/memex_web/live/note_live/form_component.ex
View File

@ -68,7 +68,7 @@ defmodule MemexWeb.NoteLive.FormComponent do
|> push_navigate(to: return_to)
{:error, %Changeset{} = changeset} ->
assign(socket, changeset: changeset)
assign(socket, :changeset, changeset)
end
{:noreply, socket}

41
lib/memex_web/live/note_live/index.ex
View File

@ -4,11 +4,11 @@ defmodule MemexWeb.NoteLive.Index do
@impl true
def mount(%{"search" => search}, _session, socket) do
{:ok, socket |> assign(search: search) |> display_notes()}
{:ok, socket |> assign(:search, search) |> display_notes()}
end
def mount(_params, _session, socket) do
{:ok, socket |> assign(search: nil) |> display_notes()}
{:ok, socket |> assign(:search, nil) |> display_notes()}
end
@impl true
@ -20,29 +20,37 @@ defmodule MemexWeb.NoteLive.Index do
%{slug: slug} = note = Notes.get_note_by_slug(slug, current_user)
socket
|> assign(page_title: gettext("edit %{slug}", slug: slug))
|> assign(note: note)
|> assign(
note: note,
page_title: gettext("edit %{slug}", slug: slug)
)
end
defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do
socket
|> assign(page_title: gettext("new note"))
|> assign(note: %Note{visibility: :private, user_id: current_user_id})
|> assign(
note: %Note{visibility: :private, user_id: current_user_id},
page_title: gettext("new note")
)
end
defp apply_action(socket, :index, _params) do
socket
|> assign(page_title: gettext("notes"))
|> assign(search: nil)
|> assign(note: nil)
|> assign(
note: nil,
page_title: gettext("notes"),
search: nil
)
|> display_notes()
end
defp apply_action(socket, :search, %{"search" => search}) do
socket
|> assign(page_title: gettext("notes"))
|> assign(search: search)
|> assign(note: nil)
|> assign(
note: nil,
page_title: gettext("notes"),
search: search
)
|> display_notes()
end
@ -53,7 +61,7 @@ defmodule MemexWeb.NoteLive.Index do
socket =
socket
|> assign(notes: Notes.list_notes(current_user))
|> assign(:notes, Notes.list_notes(current_user))
|> put_flash(:info, gettext("%{slug} deleted", slug: slug))
{:noreply, socket}
@ -67,12 +75,11 @@ defmodule MemexWeb.NoteLive.Index do
{:noreply, socket |> push_patch(to: ~p"/notes/#{search_term}")}
end
defp display_notes(%{assigns: %{current_user: current_user, search: search}} = socket)
when not (current_user |> is_nil()) do
socket |> assign(notes: Notes.list_notes(search, current_user))
defp display_notes(%{assigns: %{current_user: %{} = current_user, search: search}} = socket) do
socket |> assign(:notes, Notes.list_notes(search, current_user))
end
defp display_notes(%{assigns: %{search: search}} = socket) do
socket |> assign(notes: Notes.list_public_notes(search))
socket |> assign(:notes, Notes.list_public_notes(search))
end
end

6
lib/memex_web/live/note_live/show.ex
View File

@ -21,8 +21,10 @@ defmodule MemexWeb.NoteLive.Show do
socket =
socket
|> assign(:page_title, page_title(live_action, note))
|> assign(:note, note)
|> assign(
note: note,
page_title: page_title(live_action, note)
)
{:noreply, socket}
end

2
lib/memex_web/live/pipeline_live/form_component.ex
View File

@ -73,7 +73,7 @@ defmodule MemexWeb.PipelineLive.FormComponent do
|> push_navigate(to: return_to)
{:error, %Changeset{} = changeset} ->
assign(socket, changeset: changeset)
assign(socket, :changeset, changeset)
end
{:noreply, socket}

41
lib/memex_web/live/pipeline_live/index.ex
View File

@ -4,11 +4,11 @@ defmodule MemexWeb.PipelineLive.Index do
@impl true
def mount(%{"search" => search}, _session, socket) do
{:ok, socket |> assign(search: search) |> display_pipelines()}
{:ok, socket |> assign(:search, search) |> display_pipelines()}
end
def mount(_params, _session, socket) do
{:ok, socket |> assign(search: nil) |> display_pipelines()}
{:ok, socket |> assign(:search, nil) |> display_pipelines()}
end
@impl true
@ -20,29 +20,37 @@ defmodule MemexWeb.PipelineLive.Index do
%{slug: slug} = pipeline = Pipelines.get_pipeline_by_slug(slug, current_user)
socket
|> assign(page_title: gettext("edit %{slug}", slug: slug))
|> assign(pipeline: pipeline)
|> assign(
page_title: gettext("edit %{slug}", slug: slug),
pipeline: pipeline
)
end
defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do
socket
|> assign(page_title: gettext("new pipeline"))
|> assign(pipeline: %Pipeline{visibility: :private, user_id: current_user_id})
|> assign(
page_title: gettext("new pipeline"),
pipeline: %Pipeline{visibility: :private, user_id: current_user_id}
)
end
defp apply_action(socket, :index, _params) do
socket
|> assign(page_title: gettext("pipelines"))
|> assign(search: nil)
|> assign(pipeline: nil)
|> assign(
page_title: gettext("pipelines"),
pipeline: nil,
search: nil
)
|> display_pipelines()
end
defp apply_action(socket, :search, %{"search" => search}) do
socket
|> assign(page_title: gettext("pipelines"))
|> assign(search: search)
|> assign(pipeline: nil)
|> assign(
page_title: gettext("pipelines"),
pipeline: nil,
search: search
)
|> display_pipelines()
end
@ -53,7 +61,7 @@ defmodule MemexWeb.PipelineLive.Index do
socket =
socket
|> assign(pipelines: Pipelines.list_pipelines(current_user))
|> assign(:pipelines, Pipelines.list_pipelines(current_user))
|> put_flash(:info, gettext("%{slug} deleted", slug: slug))
{:noreply, socket}
@ -67,12 +75,11 @@ defmodule MemexWeb.PipelineLive.Index do
{:noreply, socket |> push_patch(to: ~p"/pipelines/#{search_term}")}
end
defp display_pipelines(%{assigns: %{current_user: current_user, search: search}} = socket)
when not (current_user |> is_nil()) do
socket |> assign(pipelines: Pipelines.list_pipelines(search, current_user))
defp display_pipelines(%{assigns: %{current_user: %{} = current_user, search: search}} = socket) do
socket |> assign(:pipelines, Pipelines.list_pipelines(search, current_user))
end
defp display_pipelines(%{assigns: %{search: search}} = socket) do
socket |> assign(pipelines: Pipelines.list_public_pipelines(search))
socket |> assign(:pipelines, Pipelines.list_public_pipelines(search))
end
end

12
lib/memex_web/live/pipeline_live/show.ex
View File

@ -21,9 +21,11 @@ defmodule MemexWeb.PipelineLive.Show do
socket =
socket
|> assign(:page_title, page_title(live_action, pipeline))
|> assign(:pipeline, pipeline)
|> assign(:steps, pipeline |> Steps.list_steps(current_user))
|> assign(
page_title: page_title(live_action, pipeline),
pipeline: pipeline,
steps: pipeline |> Steps.list_steps(current_user)
)
|> apply_action(live_action, params)
{:noreply, socket}
@ -47,8 +49,8 @@ defmodule MemexWeb.PipelineLive.Show do
socket
|> assign(
step: %Step{
position: steps |> Enum.count(),
pipeline_id: pipeline_id,
position: steps |> Enum.count(),
user_id: current_user_id
}
)
@ -59,7 +61,7 @@ defmodule MemexWeb.PipelineLive.Show do
:edit_step,
%{"step_id" => step_id}
) do
socket |> assign(step: step_id |> Steps.get_step!(current_user))
socket |> assign(:step, step_id |> Steps.get_step!(current_user))
end
@impl true

2
lib/memex_web/live/step_live/form_component.ex
View File

@ -75,7 +75,7 @@ defmodule MemexWeb.StepLive.FormComponent do
|> push_navigate(to: return_to)
{:error, %Changeset{} = changeset} ->
assign(socket, changeset: changeset)
assign(socket, :changeset, changeset)
end
{:noreply, socket}