Compare commits
5 Commits
f03037a943
...
4a5c09d819
Author | SHA1 | Date | |
---|---|---|---|
4a5c09d819 | |||
ec2fe32afe | |||
1703661af7 | |||
8d8a556a07 | |||
30260685e4 |
@ -2,7 +2,6 @@
|
|||||||
.input {
|
.input {
|
||||||
@apply rounded-lg px-4 py-2 border focus:outline-none;
|
@apply rounded-lg px-4 py-2 border focus:outline-none;
|
||||||
@apply shadow-sm focus:shadow-lg;
|
@apply shadow-sm focus:shadow-lg;
|
||||||
@apply transition-all duration-300 ease-in-out;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-primary {
|
.input-primary {
|
||||||
@ -79,7 +78,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.alert p {
|
.alert p {
|
||||||
margin-bottom: 0;
|
@apply mb-0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.alert:empty {
|
.alert:empty {
|
||||||
|
@ -2,7 +2,21 @@
|
|||||||
// update. https://github.com/phoenixframework/phoenix_live_view/issues/1011
|
// update. https://github.com/phoenixframework/phoenix_live_view/issues/1011
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
attrs () { return this.el.getAttribute('data-attrs').split(', ') },
|
attrs () {
|
||||||
beforeUpdate () { this.prevAttrs = this.attrs().map(name => [name, this.el.getAttribute(name)]) },
|
if (this.el && this.el.getAttribute('data-attrs')) {
|
||||||
updated () { this.prevAttrs.forEach(([name, val]) => this.el.setAttribute(name, val)) }
|
return this.el.getAttribute('data-attrs').split(', ')
|
||||||
|
} else {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
},
|
||||||
|
beforeUpdate () {
|
||||||
|
if (this.el) {
|
||||||
|
this.prevAttrs = this.attrs().map(name => [name, this.el.getAttribute(name)])
|
||||||
|
}
|
||||||
|
},
|
||||||
|
updated () {
|
||||||
|
if (this.el) {
|
||||||
|
this.prevAttrs.forEach(([name, val]) => this.el.setAttribute(name, val))
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,21 +4,82 @@ defmodule Memex.Notes do
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import Ecto.Query, warn: false
|
import Ecto.Query, warn: false
|
||||||
alias Memex.Repo
|
alias Ecto.Changeset
|
||||||
|
alias Memex.{Accounts.User, Notes.Note, Repo}
|
||||||
alias Memex.Notes.Note
|
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
Returns the list of notes.
|
Returns the list of notes.
|
||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
iex> list_notes()
|
iex> list_notes(%User{id: 123})
|
||||||
[%Note{}, ...]
|
[%Note{}, ...]
|
||||||
|
|
||||||
"""
|
"""
|
||||||
def list_notes do
|
@spec list_notes(User.t() | nil) :: [Note.t()]
|
||||||
Repo.all(Note)
|
@spec list_notes(search :: String.t() | nil, User.t() | nil) :: [Note.t()]
|
||||||
|
def list_notes(search \\ nil, user)
|
||||||
|
|
||||||
|
def list_notes(search, %{id: user_id}) when search |> is_nil() or search == "" do
|
||||||
|
Repo.all(from n in Note, where: n.user_id == ^user_id, order_by: n.title)
|
||||||
|
end
|
||||||
|
|
||||||
|
def list_notes(search, %{id: user_id}) when search |> is_binary() do
|
||||||
|
trimmed_search = String.trim(search)
|
||||||
|
|
||||||
|
Repo.all(
|
||||||
|
from n in Note,
|
||||||
|
where: n.user_id == ^user_id,
|
||||||
|
where:
|
||||||
|
fragment(
|
||||||
|
"search @@ to_tsquery(websearch_to_tsquery(?)::text || ':*')",
|
||||||
|
^trimmed_search
|
||||||
|
),
|
||||||
|
order_by: {
|
||||||
|
:desc,
|
||||||
|
fragment(
|
||||||
|
"ts_rank_cd(search, to_tsquery(websearch_to_tsquery(?)::text || ':*'), 4)",
|
||||||
|
^trimmed_search
|
||||||
|
)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
Returns the list of public notes for viewing
|
||||||
|
|
||||||
|
## Examples
|
||||||
|
|
||||||
|
iex> list_public_notes()
|
||||||
|
[%Note{}, ...]
|
||||||
|
"""
|
||||||
|
@spec list_public_notes() :: [Note.t()]
|
||||||
|
@spec list_public_notes(search :: String.t() | nil) :: [Note.t()]
|
||||||
|
def list_public_notes(search \\ nil)
|
||||||
|
|
||||||
|
def list_public_notes(search) when search |> is_nil() or search == "" do
|
||||||
|
Repo.all(from n in Note, where: n.visibility == :public, order_by: n.title)
|
||||||
|
end
|
||||||
|
|
||||||
|
def list_public_notes(search) when search |> is_binary() do
|
||||||
|
trimmed_search = String.trim(search)
|
||||||
|
|
||||||
|
Repo.all(
|
||||||
|
from n in Note,
|
||||||
|
where: n.visibility == :public,
|
||||||
|
where:
|
||||||
|
fragment(
|
||||||
|
"search @@ to_tsquery(websearch_to_tsquery(?)::text || ':*')",
|
||||||
|
^trimmed_search
|
||||||
|
),
|
||||||
|
order_by: {
|
||||||
|
:desc,
|
||||||
|
fragment(
|
||||||
|
"ts_rank_cd(search, to_tsquery(websearch_to_tsquery(?)::text || ':*'), 4)",
|
||||||
|
^trimmed_search
|
||||||
|
)
|
||||||
|
}
|
||||||
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
@ -28,31 +89,46 @@ defmodule Memex.Notes do
|
|||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
iex> get_note!(123)
|
iex> get_note!(123, %User{id: 123})
|
||||||
%Note{}
|
%Note{}
|
||||||
|
|
||||||
iex> get_note!(456)
|
iex> get_note!(456, %User{id: 123})
|
||||||
** (Ecto.NoResultsError)
|
** (Ecto.NoResultsError)
|
||||||
|
|
||||||
"""
|
"""
|
||||||
def get_note!(id), do: Repo.get!(Note, id)
|
@spec get_note!(Note.id(), User.t()) :: Note.t()
|
||||||
|
def get_note!(id, %{id: user_id}) do
|
||||||
|
Repo.one!(
|
||||||
|
from n in Note,
|
||||||
|
where: n.id == ^id,
|
||||||
|
where: n.user_id == ^user_id or n.visibility in [:public, :unlisted]
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def get_note!(id, _invalid_user) do
|
||||||
|
Repo.one!(
|
||||||
|
from n in Note,
|
||||||
|
where: n.id == ^id,
|
||||||
|
where: n.visibility in [:public, :unlisted]
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
Creates a note.
|
Creates a note.
|
||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
iex> create_note(%{field: value})
|
iex> create_note(%{field: value}, %User{id: 123})
|
||||||
{:ok, %Note{}}
|
{:ok, %Note{}}
|
||||||
|
|
||||||
iex> create_note(%{field: bad_value})
|
iex> create_note(%{field: bad_value}, %User{id: 123})
|
||||||
{:error, %Ecto.Changeset{}}
|
{:error, %Ecto.Changeset{}}
|
||||||
|
|
||||||
"""
|
"""
|
||||||
def create_note(attrs \\ %{}) do
|
@spec create_note(User.t()) :: {:ok, Note.t()} | {:error, Changeset.t()}
|
||||||
%Note{}
|
@spec create_note(attrs :: map(), User.t()) :: {:ok, Note.t()} | {:error, Changeset.t()}
|
||||||
|> Note.changeset(attrs)
|
def create_note(attrs \\ %{}, user) do
|
||||||
|> Repo.insert()
|
Note.create_changeset(attrs, user) |> Repo.insert()
|
||||||
end
|
end
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
@ -60,16 +136,18 @@ defmodule Memex.Notes do
|
|||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
iex> update_note(note, %{field: new_value})
|
iex> update_note(note, %{field: new_value}, %User{id: 123})
|
||||||
{:ok, %Note{}}
|
{:ok, %Note{}}
|
||||||
|
|
||||||
iex> update_note(note, %{field: bad_value})
|
iex> update_note(note, %{field: bad_value}, %User{id: 123})
|
||||||
{:error, %Ecto.Changeset{}}
|
{:error, %Ecto.Changeset{}}
|
||||||
|
|
||||||
"""
|
"""
|
||||||
def update_note(%Note{} = note, attrs) do
|
@spec update_note(Note.t(), attrs :: map(), User.t()) ::
|
||||||
|
{:ok, Note.t()} | {:error, Changeset.t()}
|
||||||
|
def update_note(%Note{} = note, attrs, user) do
|
||||||
note
|
note
|
||||||
|> Note.changeset(attrs)
|
|> Note.update_changeset(attrs, user)
|
||||||
|> Repo.update()
|
|> Repo.update()
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -78,15 +156,16 @@ defmodule Memex.Notes do
|
|||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
iex> delete_note(note)
|
iex> delete_note(note, %User{id: 123})
|
||||||
{:ok, %Note{}}
|
{:ok, %Note{}}
|
||||||
|
|
||||||
iex> delete_note(note)
|
iex> delete_note(note, %User{id: 123})
|
||||||
{:error, %Ecto.Changeset{}}
|
{:error, %Ecto.Changeset{}}
|
||||||
|
|
||||||
"""
|
"""
|
||||||
def delete_note(%Note{} = note) do
|
@spec delete_note(Note.t(), User.t()) :: {:ok, Note.t()} | {:error, Changeset.t()}
|
||||||
Repo.delete(note)
|
def delete_note(%Note{user_id: user_id} = note, %{id: user_id}) do
|
||||||
|
note |> Repo.delete()
|
||||||
end
|
end
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
@ -94,11 +173,30 @@ defmodule Memex.Notes do
|
|||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
iex> change_note(note)
|
iex> change_note(note, %User{id: 123})
|
||||||
|
%Ecto.Changeset{data: %Note{}}
|
||||||
|
|
||||||
|
iex> change_note(note, %{title: "new title"}, %User{id: 123})
|
||||||
%Ecto.Changeset{data: %Note{}}
|
%Ecto.Changeset{data: %Note{}}
|
||||||
|
|
||||||
"""
|
"""
|
||||||
def change_note(%Note{} = note, attrs \\ %{}) do
|
@spec change_note(Note.t(), User.t()) :: Changeset.t(Note.t())
|
||||||
Note.changeset(note, attrs)
|
@spec change_note(Note.t(), attrs :: map(), User.t()) :: Changeset.t(Note.t())
|
||||||
|
def change_note(%Note{} = note, attrs \\ %{}, user) do
|
||||||
|
note |> Note.update_changeset(attrs, user)
|
||||||
|
end
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
Gets a canonical string representation of the `:tags` field for a Note
|
||||||
|
"""
|
||||||
|
@spec get_tags_string(Note.t() | Changeset.t() | [String.t()] | nil) :: String.t()
|
||||||
|
def get_tags_string(nil), do: ""
|
||||||
|
def get_tags_string(tags) when tags |> is_list(), do: tags |> Enum.join(",")
|
||||||
|
def get_tags_string(%Note{tags: tags}), do: tags |> get_tags_string()
|
||||||
|
|
||||||
|
def get_tags_string(%Changeset{} = changeset) do
|
||||||
|
changeset
|
||||||
|
|> Changeset.get_field(:tags)
|
||||||
|
|> get_tags_string()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1,22 +1,57 @@
|
|||||||
defmodule Memex.Notes.Note do
|
defmodule Memex.Notes.Note do
|
||||||
|
@moduledoc """
|
||||||
|
Schema for a user-written note
|
||||||
|
"""
|
||||||
use Ecto.Schema
|
use Ecto.Schema
|
||||||
import Ecto.Changeset
|
import Ecto.Changeset
|
||||||
|
alias Ecto.{Changeset, UUID}
|
||||||
|
alias Memex.{Accounts.User, Notes.Note}
|
||||||
|
|
||||||
@primary_key {:id, :binary_id, autogenerate: true}
|
@primary_key {:id, :binary_id, autogenerate: true}
|
||||||
@foreign_key_type :binary_id
|
@foreign_key_type :binary_id
|
||||||
schema "notes" do
|
schema "notes" do
|
||||||
field :content, :string
|
field :content, :string
|
||||||
field :tag, {:array, :string}
|
field :tags, {:array, :string}
|
||||||
|
field :tags_string, :string, virtual: true
|
||||||
field :title, :string
|
field :title, :string
|
||||||
field :visibility, Ecto.Enum, values: [:public, :private, :unlisted]
|
field :visibility, Ecto.Enum, values: [:public, :private, :unlisted]
|
||||||
|
|
||||||
|
belongs_to :user, User
|
||||||
|
|
||||||
timestamps()
|
timestamps()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@type t :: %Note{}
|
||||||
|
@type id :: UUID.t()
|
||||||
|
@type changeset :: Changeset.t(t())
|
||||||
|
|
||||||
@doc false
|
@doc false
|
||||||
def changeset(note, attrs) do
|
@spec create_changeset(attrs :: map(), User.t()) :: changeset()
|
||||||
|
def create_changeset(attrs, %User{id: user_id}) do
|
||||||
|
%Note{}
|
||||||
|
|> cast(attrs, [:title, :content, :tags, :visibility])
|
||||||
|
|> change(user_id: user_id)
|
||||||
|
|> cast_tags_string(attrs)
|
||||||
|
|> validate_required([:title, :content, :user_id, :visibility])
|
||||||
|
end
|
||||||
|
|
||||||
|
@spec update_changeset(Note.t(), attrs :: map(), User.t()) :: changeset()
|
||||||
|
def update_changeset(%{user_id: user_id} = note, attrs, %User{id: user_id}) do
|
||||||
note
|
note
|
||||||
|> cast(attrs, [:title, :content, :tag, :visibility])
|
|> cast(attrs, [:title, :content, :tags, :visibility])
|
||||||
|> validate_required([:title, :content, :tag, :visibility])
|
|> cast_tags_string(attrs)
|
||||||
|
|> validate_required([:title, :content, :visibility])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp cast_tags_string(changeset, %{"tags_string" => tags_string}) when is_binary(tags_string) do
|
||||||
|
tags =
|
||||||
|
tags_string
|
||||||
|
|> String.split(",", trim: true)
|
||||||
|
|> Enum.map(fn str -> str |> String.trim() end)
|
||||||
|
|> Enum.sort()
|
||||||
|
|
||||||
|
changeset |> change(tags: tags)
|
||||||
|
end
|
||||||
|
|
||||||
|
defp cast_tags_string(changeset, _attrs), do: changeset
|
||||||
end
|
end
|
||||||
|
@ -23,6 +23,7 @@ defmodule MemexWeb do
|
|||||||
|
|
||||||
import Plug.Conn
|
import Plug.Conn
|
||||||
import MemexWeb.Gettext
|
import MemexWeb.Gettext
|
||||||
|
alias MemexWeb.Endpoint
|
||||||
alias MemexWeb.Router.Helpers, as: Routes
|
alias MemexWeb.Router.Helpers, as: Routes
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -98,6 +99,7 @@ defmodule MemexWeb do
|
|||||||
import Phoenix.View
|
import Phoenix.View
|
||||||
|
|
||||||
import MemexWeb.{ErrorHelpers, Gettext, LiveHelpers, ViewHelpers}
|
import MemexWeb.{ErrorHelpers, Gettext, LiveHelpers, ViewHelpers}
|
||||||
|
alias MemexWeb.Endpoint
|
||||||
alias MemexWeb.Router.Helpers, as: Routes
|
alias MemexWeb.Router.Helpers, as: Routes
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -4,7 +4,6 @@ defmodule MemexWeb.Components.InviteCard do
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
use MemexWeb, :component
|
use MemexWeb, :component
|
||||||
alias MemexWeb.Endpoint
|
|
||||||
|
|
||||||
def invite_card(assigns) do
|
def invite_card(assigns) do
|
||||||
~H"""
|
~H"""
|
||||||
|
29
lib/memex_web/components/note_card.ex
Normal file
29
lib/memex_web/components/note_card.ex
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
defmodule MemexWeb.Components.NoteCard do
|
||||||
|
@moduledoc """
|
||||||
|
Display card for an note
|
||||||
|
"""
|
||||||
|
|
||||||
|
use MemexWeb, :component
|
||||||
|
|
||||||
|
def note_card(assigns) do
|
||||||
|
~H"""
|
||||||
|
<div class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
|
||||||
|
border border-gray-400 rounded-lg shadow-lg hover:shadow-md
|
||||||
|
transition-all duration-300 ease-in-out">
|
||||||
|
<h1 class="title text-xl">
|
||||||
|
<%= @note.name %>
|
||||||
|
</h1>
|
||||||
|
|
||||||
|
<h2 class="title text-md">
|
||||||
|
<%= gettext("visibility: %{visibility}", visibility: @note.visibility) %>
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<%= if @inner_block do %>
|
||||||
|
<div class="flex space-x-4 justify-center items-center">
|
||||||
|
<%= render_slot(@inner_block) %>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
"""
|
||||||
|
end
|
||||||
|
end
|
135
lib/memex_web/components/notes_table_component.ex
Normal file
135
lib/memex_web/components/notes_table_component.ex
Normal file
@ -0,0 +1,135 @@
|
|||||||
|
defmodule MemexWeb.Components.NotesTableComponent do
|
||||||
|
@moduledoc """
|
||||||
|
A component that displays a list of notes
|
||||||
|
"""
|
||||||
|
use MemexWeb, :live_component
|
||||||
|
alias Ecto.UUID
|
||||||
|
alias Memex.{Accounts.User, Notes, Notes.Note}
|
||||||
|
alias Phoenix.LiveView.{Rendered, Socket}
|
||||||
|
|
||||||
|
@impl true
|
||||||
|
@spec update(
|
||||||
|
%{
|
||||||
|
required(:id) => UUID.t(),
|
||||||
|
required(:current_user) => User.t(),
|
||||||
|
required(:notes) => [Note.t()],
|
||||||
|
optional(any()) => any()
|
||||||
|
},
|
||||||
|
Socket.t()
|
||||||
|
) :: {:ok, Socket.t()}
|
||||||
|
def update(%{id: _id, notes: _notes, current_user: _current_user} = assigns, socket) do
|
||||||
|
socket =
|
||||||
|
socket
|
||||||
|
|> assign(assigns)
|
||||||
|
|> assign_new(:actions, fn -> [] end)
|
||||||
|
|> display_notes()
|
||||||
|
|
||||||
|
{:ok, socket}
|
||||||
|
end
|
||||||
|
|
||||||
|
defp display_notes(
|
||||||
|
%{
|
||||||
|
assigns: %{
|
||||||
|
notes: notes,
|
||||||
|
current_user: current_user,
|
||||||
|
actions: actions
|
||||||
|
}
|
||||||
|
} = socket
|
||||||
|
) do
|
||||||
|
columns =
|
||||||
|
if actions == [] or current_user |> is_nil() do
|
||||||
|
[]
|
||||||
|
else
|
||||||
|
[%{label: nil, key: :actions, sortable: false}]
|
||||||
|
end
|
||||||
|
|
||||||
|
columns = [
|
||||||
|
%{label: gettext("title"), key: :title},
|
||||||
|
%{label: gettext("content"), key: :content},
|
||||||
|
%{label: gettext("tags"), key: :tags},
|
||||||
|
%{label: gettext("visibility"), key: :visibility}
|
||||||
|
| columns
|
||||||
|
]
|
||||||
|
|
||||||
|
rows =
|
||||||
|
notes
|
||||||
|
|> Enum.map(fn note ->
|
||||||
|
note
|
||||||
|
|> get_row_data_for_note(%{
|
||||||
|
columns: columns,
|
||||||
|
current_user: current_user,
|
||||||
|
actions: actions
|
||||||
|
})
|
||||||
|
end)
|
||||||
|
|
||||||
|
socket |> assign(columns: columns, rows: rows)
|
||||||
|
end
|
||||||
|
|
||||||
|
@impl true
|
||||||
|
def render(assigns) do
|
||||||
|
~H"""
|
||||||
|
<div class="w-full">
|
||||||
|
<.live_component
|
||||||
|
module={MemexWeb.Components.TableComponent}
|
||||||
|
id={@id}
|
||||||
|
columns={@columns}
|
||||||
|
rows={@rows}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
"""
|
||||||
|
end
|
||||||
|
|
||||||
|
@spec get_row_data_for_note(Note.t(), additional_data :: map()) :: map()
|
||||||
|
defp get_row_data_for_note(note, %{columns: columns} = additional_data) do
|
||||||
|
columns
|
||||||
|
|> Map.new(fn %{key: key} ->
|
||||||
|
{key, get_value_for_key(key, note, additional_data)}
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
|
@spec get_value_for_key(atom(), Note.t(), additional_data :: map()) ::
|
||||||
|
any() | {any(), Rendered.t()}
|
||||||
|
defp get_value_for_key(:title, %{id: id, title: title}, _additional_data) do
|
||||||
|
assigns = %{id: id, title: title}
|
||||||
|
|
||||||
|
title_block = ~H"""
|
||||||
|
<.link
|
||||||
|
navigate={Routes.note_show_path(Endpoint, :show, @id)}
|
||||||
|
class="link"
|
||||||
|
data-qa={"note-show-#{@id}"}
|
||||||
|
>
|
||||||
|
<%= @title %>
|
||||||
|
</.link>
|
||||||
|
"""
|
||||||
|
|
||||||
|
{title, title_block}
|
||||||
|
end
|
||||||
|
|
||||||
|
defp get_value_for_key(:content, %{content: content}, _additional_data) do
|
||||||
|
assigns = %{content: content}
|
||||||
|
|
||||||
|
content_block = ~H"""
|
||||||
|
<div class="truncate max-w-sm">
|
||||||
|
<%= @content %>
|
||||||
|
</div>
|
||||||
|
"""
|
||||||
|
|
||||||
|
{content, content_block}
|
||||||
|
end
|
||||||
|
|
||||||
|
defp get_value_for_key(:tags, %{tags: tags}, _additional_data) do
|
||||||
|
tags |> Notes.get_tags_string()
|
||||||
|
end
|
||||||
|
|
||||||
|
defp get_value_for_key(:actions, note, %{actions: actions}) do
|
||||||
|
assigns = %{actions: actions, note: note}
|
||||||
|
|
||||||
|
~H"""
|
||||||
|
<div class="flex justify-center items-center space-x-4">
|
||||||
|
<%= render_slot(@actions, @note) %>
|
||||||
|
</div>
|
||||||
|
"""
|
||||||
|
end
|
||||||
|
|
||||||
|
defp get_value_for_key(key, note, _additional_data), do: note |> Map.get(key)
|
||||||
|
end
|
@ -6,7 +6,7 @@ defmodule MemexWeb.Components.Topbar do
|
|||||||
use MemexWeb, :component
|
use MemexWeb, :component
|
||||||
|
|
||||||
alias Memex.Accounts
|
alias Memex.Accounts
|
||||||
alias MemexWeb.{Endpoint, HomeLive}
|
alias MemexWeb.HomeLive
|
||||||
|
|
||||||
def topbar(assigns) do
|
def topbar(assigns) do
|
||||||
assigns =
|
assigns =
|
||||||
@ -35,7 +35,6 @@ defmodule MemexWeb.Components.Topbar do
|
|||||||
|
|
||||||
<ul class="flex flex-row flex-wrap justify-center items-center
|
<ul class="flex flex-row flex-wrap justify-center items-center
|
||||||
text-lg text-primary-400 text-ellipsis">
|
text-lg text-primary-400 text-ellipsis">
|
||||||
<%= if @current_user do %>
|
|
||||||
<li class="mx-2 my-1">
|
<li class="mx-2 my-1">
|
||||||
<.link
|
<.link
|
||||||
navigate={Routes.note_index_path(Endpoint, :index)}
|
navigate={Routes.note_index_path(Endpoint, :index)}
|
||||||
@ -65,6 +64,7 @@ defmodule MemexWeb.Components.Topbar do
|
|||||||
|
|
||||||
<li class="mx-2 my-1 border-left border border-primary-700"></li>
|
<li class="mx-2 my-1 border-left border border-primary-700"></li>
|
||||||
|
|
||||||
|
<%= if @current_user do %>
|
||||||
<%= if @current_user.role == :admin do %>
|
<%= if @current_user.role == :admin do %>
|
||||||
<li class="mx-2 my-1">
|
<li class="mx-2 my-1">
|
||||||
<.link
|
<.link
|
||||||
|
@ -3,7 +3,7 @@ defmodule MemexWeb.UserRegistrationController do
|
|||||||
import MemexWeb.Gettext
|
import MemexWeb.Gettext
|
||||||
alias Memex.{Accounts, Invites}
|
alias Memex.{Accounts, Invites}
|
||||||
alias Memex.Accounts.User
|
alias Memex.Accounts.User
|
||||||
alias MemexWeb.{Endpoint, HomeLive}
|
alias MemexWeb.HomeLive
|
||||||
|
|
||||||
def new(conn, %{"invite" => invite_token}) do
|
def new(conn, %{"invite" => invite_token}) do
|
||||||
invite = Invites.get_invite_by_token(invite_token)
|
invite = Invites.get_invite_by_token(invite_token)
|
||||||
|
@ -6,7 +6,7 @@ defmodule MemexWeb.InviteLive.Index do
|
|||||||
use MemexWeb, :live_view
|
use MemexWeb, :live_view
|
||||||
import MemexWeb.Components.{InviteCard, UserCard}
|
import MemexWeb.Components.{InviteCard, UserCard}
|
||||||
alias Memex.{Accounts, Invites, Invites.Invite}
|
alias Memex.{Accounts, Invites, Invites.Invite}
|
||||||
alias MemexWeb.{Endpoint, HomeLive}
|
alias MemexWeb.HomeLive
|
||||||
alias Phoenix.LiveView.JS
|
alias Phoenix.LiveView.JS
|
||||||
|
|
||||||
@impl true
|
@impl true
|
||||||
|
@ -4,8 +4,8 @@ defmodule MemexWeb.NoteLive.FormComponent do
|
|||||||
alias Memex.Notes
|
alias Memex.Notes
|
||||||
|
|
||||||
@impl true
|
@impl true
|
||||||
def update(%{note: note} = assigns, socket) do
|
def update(%{note: note, current_user: current_user} = assigns, socket) do
|
||||||
changeset = Notes.change_note(note)
|
changeset = Notes.change_note(note, current_user)
|
||||||
|
|
||||||
{:ok,
|
{:ok,
|
||||||
socket
|
socket
|
||||||
@ -14,39 +14,51 @@ defmodule MemexWeb.NoteLive.FormComponent do
|
|||||||
end
|
end
|
||||||
|
|
||||||
@impl true
|
@impl true
|
||||||
def handle_event("validate", %{"note" => note_params}, socket) do
|
def handle_event(
|
||||||
|
"validate",
|
||||||
|
%{"note" => note_params},
|
||||||
|
%{assigns: %{note: note, current_user: current_user}} = socket
|
||||||
|
) do
|
||||||
changeset =
|
changeset =
|
||||||
socket.assigns.note
|
note
|
||||||
|> Notes.change_note(note_params)
|
|> Notes.change_note(note_params, current_user)
|
||||||
|> Map.put(:action, :validate)
|
|> Map.put(:action, :validate)
|
||||||
|
|
||||||
{:noreply, assign(socket, :changeset, changeset)}
|
{:noreply, assign(socket, :changeset, changeset)}
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_event("save", %{"note" => note_params}, socket) do
|
def handle_event("save", %{"note" => note_params}, %{assigns: %{action: action}} = socket) do
|
||||||
save_note(socket, socket.assigns.action, note_params)
|
save_note(socket, action, note_params)
|
||||||
end
|
end
|
||||||
|
|
||||||
defp save_note(socket, :edit, note_params) do
|
defp save_note(
|
||||||
case Notes.update_note(socket.assigns.note, note_params) do
|
%{assigns: %{note: note, return_to: return_to, current_user: current_user}} = socket,
|
||||||
{:ok, _note} ->
|
:edit,
|
||||||
|
note_params
|
||||||
|
) do
|
||||||
|
case Notes.update_note(note, note_params, current_user) do
|
||||||
|
{:ok, %{title: title}} ->
|
||||||
{:noreply,
|
{:noreply,
|
||||||
socket
|
socket
|
||||||
|> put_flash(:info, gettext("%{title} saved", title: title))
|
|> put_flash(:info, gettext("%{title} saved", title: title))
|
||||||
|> push_navigate(to: socket.assigns.return_to)}
|
|> push_navigate(to: return_to)}
|
||||||
|
|
||||||
{:error, %Ecto.Changeset{} = changeset} ->
|
{:error, %Ecto.Changeset{} = changeset} ->
|
||||||
{:noreply, assign(socket, :changeset, changeset)}
|
{:noreply, assign(socket, :changeset, changeset)}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defp save_note(socket, :new, note_params) do
|
defp save_note(
|
||||||
case Notes.create_note(note_params) do
|
%{assigns: %{return_to: return_to, current_user: current_user}} = socket,
|
||||||
{:ok, _note} ->
|
:new,
|
||||||
|
note_params
|
||||||
|
) do
|
||||||
|
case Notes.create_note(note_params, current_user) do
|
||||||
|
{:ok, %{title: title}} ->
|
||||||
{:noreply,
|
{:noreply,
|
||||||
socket
|
socket
|
||||||
|> put_flash(:info, gettext("%{title} created", title: title))
|
|> put_flash(:info, gettext("%{title} created", title: title))
|
||||||
|> push_navigate(to: socket.assigns.return_to)}
|
|> push_navigate(to: return_to)}
|
||||||
|
|
||||||
{:error, %Ecto.Changeset{} = changeset} ->
|
{:error, %Ecto.Changeset{} = changeset} ->
|
||||||
{:noreply, assign(socket, changeset: changeset)}
|
{:noreply, assign(socket, changeset: changeset)}
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
<div>
|
<div class="h-full flex flex-col justify-start items-stretch space-y-4">
|
||||||
<h2><%= @title %></h2>
|
|
||||||
|
|
||||||
<.form
|
<.form
|
||||||
:let={f}
|
:let={f}
|
||||||
for={@changeset}
|
for={@changeset}
|
||||||
@ -8,27 +6,44 @@
|
|||||||
phx-target={@myself}
|
phx-target={@myself}
|
||||||
phx-change="validate"
|
phx-change="validate"
|
||||||
phx-submit="save"
|
phx-submit="save"
|
||||||
|
phx-debounce="300"
|
||||||
|
class="flex flex-col justify-start items-stretch space-y-4"
|
||||||
>
|
>
|
||||||
<%= label(f, :title) %>
|
<%= text_input(f, :title,
|
||||||
<%= text_input(f, :title) %>
|
class: "input input-primary",
|
||||||
|
placeholder: gettext("title")
|
||||||
|
) %>
|
||||||
<%= error_tag(f, :title) %>
|
<%= error_tag(f, :title) %>
|
||||||
|
|
||||||
<%= label(f, :content) %>
|
<%= textarea(f, :content,
|
||||||
<%= textarea(f, :content) %>
|
id: "note-form-content",
|
||||||
|
class: "input input-primary h-64 min-h-64",
|
||||||
|
phx_hook: "MaintainAttrs",
|
||||||
|
phx_update: "ignore",
|
||||||
|
placeholder: gettext("content")
|
||||||
|
) %>
|
||||||
<%= error_tag(f, :content) %>
|
<%= error_tag(f, :content) %>
|
||||||
|
|
||||||
<%= label(f, :tag) %>
|
<%= text_input(f, :tags_string,
|
||||||
<%= multiple_select(f, :tag, "Option 1": "option1", "Option 2": "option2") %>
|
id: "tags-input",
|
||||||
<%= error_tag(f, :tag) %>
|
class: "input input-primary",
|
||||||
|
placeholder: gettext("tag1,tag2"),
|
||||||
<%= label(f, :visibility) %>
|
phx_update: "ignore",
|
||||||
<%= select(f, :visibility, Ecto.Enum.values(Memex.Notes.Note, :visibility),
|
value: Notes.get_tags_string(@changeset)
|
||||||
prompt: "Choose a value"
|
|
||||||
) %>
|
) %>
|
||||||
<%= error_tag(f, :visibility) %>
|
<%= error_tag(f, :tags_string) %>
|
||||||
|
|
||||||
<div>
|
<div class="flex justify-center items-stretch space-x-4">
|
||||||
<%= submit("Save", phx_disable_with: "Saving...") %>
|
<%= select(f, :visibility, Ecto.Enum.values(Memex.Notes.Note, :visibility),
|
||||||
|
class: "grow input input-primary",
|
||||||
|
prompt: gettext("select privacy")
|
||||||
|
) %>
|
||||||
|
|
||||||
|
<%= submit(dgettext("actions", "save"),
|
||||||
|
phx_disable_with: gettext("saving..."),
|
||||||
|
class: "mx-auto btn btn-primary"
|
||||||
|
) %>
|
||||||
</div>
|
</div>
|
||||||
|
<%= error_tag(f, :visibility) %>
|
||||||
</.form>
|
</.form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,45 +1,75 @@
|
|||||||
defmodule MemexWeb.NoteLive.Index do
|
defmodule MemexWeb.NoteLive.Index do
|
||||||
use MemexWeb, :live_view
|
use MemexWeb, :live_view
|
||||||
|
alias Memex.{Notes, Notes.Note}
|
||||||
alias Memex.Notes
|
|
||||||
alias Memex.Notes.Note
|
|
||||||
|
|
||||||
@impl true
|
@impl true
|
||||||
def mount(_params, _session, socket) do
|
def mount(_params, _session, socket) do
|
||||||
{:ok, assign(socket, :notes, list_notes())}
|
{:ok, socket |> assign(search: nil) |> display_notes()}
|
||||||
end
|
end
|
||||||
|
|
||||||
@impl true
|
@impl true
|
||||||
def handle_params(params, _url, socket) do
|
def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
|
||||||
{:noreply, apply_action(socket, socket.assigns.live_action, params)}
|
{:noreply, apply_action(socket, live_action, params)}
|
||||||
end
|
end
|
||||||
|
|
||||||
defp apply_action(socket, :edit, %{"id" => id}) do
|
defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do
|
||||||
|
%{title: title} = note = Notes.get_note!(id, current_user)
|
||||||
|
|
||||||
socket
|
socket
|
||||||
|> assign(page_title: gettext("edit %{title}", title: title))
|
|> assign(page_title: gettext("edit %{title}", title: title))
|
||||||
|> assign(:note, Notes.get_note!(id))
|
|> assign(note: note)
|
||||||
end
|
end
|
||||||
|
|
||||||
defp apply_action(socket, :new, _params) do
|
defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do
|
||||||
socket
|
socket
|
||||||
|> assign(page_title: "new note")
|
|> assign(page_title: "new note")
|
||||||
|> assign(:note, %Note{})
|
|> assign(note: %Note{user_id: current_user_id})
|
||||||
end
|
end
|
||||||
|
|
||||||
defp apply_action(socket, :index, _params) do
|
defp apply_action(socket, :index, _params) do
|
||||||
socket
|
socket
|
||||||
|> assign(page_title: "notes")
|
|> assign(page_title: "notes")
|
||||||
|> assign(:note, nil)
|
|> assign(search: nil)
|
||||||
|
|> assign(note: nil)
|
||||||
|
|> display_notes()
|
||||||
|
end
|
||||||
|
|
||||||
|
defp apply_action(socket, :search, %{"search" => search}) do
|
||||||
|
socket
|
||||||
|
|> assign(page_title: "notes")
|
||||||
|
|> assign(search: search)
|
||||||
|
|> assign(note: nil)
|
||||||
|
|> display_notes()
|
||||||
end
|
end
|
||||||
|
|
||||||
@impl true
|
@impl true
|
||||||
def handle_event("delete", %{"id" => id}, socket) do
|
def handle_event("delete", %{"id" => id}, %{assigns: %{current_user: current_user}} = socket) do
|
||||||
note = Notes.get_note!(id)
|
%{title: title} = note = Notes.get_note!(id, current_user)
|
||||||
{:ok, _} = Notes.delete_note(note)
|
{:ok, _} = Notes.delete_note(note, current_user)
|
||||||
|
|
||||||
|
socket =
|
||||||
|
socket
|
||||||
|
|> assign(notes: Notes.list_notes(current_user))
|
||||||
|> put_flash(:info, gettext("%{title} deleted", title: title))
|
|> put_flash(:info, gettext("%{title} deleted", title: title))
|
||||||
|
|
||||||
defp list_notes do
|
{:noreply, socket}
|
||||||
Notes.list_notes()
|
end
|
||||||
|
|
||||||
|
@impl true
|
||||||
|
def handle_event("search", %{"search" => %{"search_term" => ""}}, socket) do
|
||||||
|
{:noreply, socket |> push_patch(to: Routes.note_index_path(Endpoint, :index))}
|
||||||
|
end
|
||||||
|
|
||||||
|
def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do
|
||||||
|
{:noreply, socket |> push_patch(to: Routes.note_index_path(Endpoint, :search, 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))
|
||||||
|
end
|
||||||
|
|
||||||
|
defp display_notes(%{assigns: %{search: search}} = socket) do
|
||||||
|
socket |> assign(notes: Notes.list_public_notes(search))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1,10 +1,65 @@
|
|||||||
<h1>Listing Notes</h1>
|
<div class="mx-auto flex flex-col justify-center items-start space-y-4 max-w-3xl">
|
||||||
|
<h1 class="text-xl">
|
||||||
|
<%= gettext("notes") %>
|
||||||
|
</h1>
|
||||||
|
|
||||||
|
<.form
|
||||||
|
:let={f}
|
||||||
|
for={:search}
|
||||||
|
phx-change="search"
|
||||||
|
phx-submit="search"
|
||||||
|
phx-debounce="500"
|
||||||
|
class="self-stretch flex flex-col items-stretch"
|
||||||
|
>
|
||||||
|
<%= text_input(f, :search_term, class: "input input-primary") %>
|
||||||
|
</.form>
|
||||||
|
|
||||||
|
<%= if @notes |> Enum.empty?() do %>
|
||||||
|
<h1 class="self-center text-primary-500">
|
||||||
|
<%= gettext("no notes found") %>
|
||||||
|
</h1>
|
||||||
|
<% else %>
|
||||||
|
<.live_component
|
||||||
|
module={MemexWeb.Components.NotesTableComponent}
|
||||||
|
id="notes-index-table"
|
||||||
|
current_user={@current_user}
|
||||||
|
notes={@notes}
|
||||||
|
>
|
||||||
|
<:actions :let={note}>
|
||||||
|
<%= if @current_user do %>
|
||||||
|
<.link
|
||||||
|
patch={Routes.note_index_path(@socket, :edit, note)}
|
||||||
|
data-qa={"note-edit-#{note.id}"}
|
||||||
|
>
|
||||||
|
<%= dgettext("actions", "edit") %>
|
||||||
|
</.link>
|
||||||
|
<.link
|
||||||
|
href="#"
|
||||||
|
phx-click="delete"
|
||||||
|
phx-value-id={note.id}
|
||||||
|
data-confirm={dgettext("prompts", "are you sure?")}
|
||||||
|
data-qa={"delete-note-#{note.id}"}
|
||||||
|
>
|
||||||
|
<%= dgettext("actions", "delete") %>
|
||||||
|
</.link>
|
||||||
|
<% end %>
|
||||||
|
</:actions>
|
||||||
|
</.live_component>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<%= if @current_user do %>
|
||||||
|
<.link patch={Routes.note_index_path(@socket, :new)} class="self-end btn btn-primary">
|
||||||
|
<%= dgettext("actions", "new note") %>
|
||||||
|
</.link>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
||||||
<%= if @live_action in [:new, :edit] do %>
|
<%= if @live_action in [:new, :edit] do %>
|
||||||
<.modal return_to={Routes.note_index_path(@socket, :index)}>
|
<.modal return_to={Routes.note_index_path(@socket, :index)}>
|
||||||
<.live_component
|
<.live_component
|
||||||
module={MemexWeb.NoteLive.FormComponent}
|
module={MemexWeb.NoteLive.FormComponent}
|
||||||
id={@note.id || :new}
|
id={@note.id || :new}
|
||||||
|
current_user={@current_user}
|
||||||
title={@page_title}
|
title={@page_title}
|
||||||
action={@live_action}
|
action={@live_action}
|
||||||
note={@note}
|
note={@note}
|
||||||
@ -12,55 +67,3 @@
|
|||||||
/>
|
/>
|
||||||
</.modal>
|
</.modal>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<table>
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>Title</th>
|
|
||||||
<th>Content</th>
|
|
||||||
<th>Tag</th>
|
|
||||||
<th>Visibility</th>
|
|
||||||
|
|
||||||
<th></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody id="notes">
|
|
||||||
<%= for note <- @notes do %>
|
|
||||||
<tr id={"note-#{note.id}"}>
|
|
||||||
<td><%= note.title %></td>
|
|
||||||
<td><%= note.content %></td>
|
|
||||||
<td><%= note.tag %></td>
|
|
||||||
<td><%= note.visibility %></td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<span>
|
|
||||||
<.link navigate={Routes.note_show_path(@socket, :show, note)}>
|
|
||||||
<%= dgettext("actions", "Show") %>
|
|
||||||
</.link>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
<.link patch={Routes.note_index_path(@socket, :edit, note)}>
|
|
||||||
<%= dgettext("actions", "Edit") %>
|
|
||||||
</.link>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
<.link
|
|
||||||
href="#"
|
|
||||||
phx-click="delete"
|
|
||||||
phx-value-id={note.id}
|
|
||||||
data-confirm={dgettext("prompts", "Are you sure?")}
|
|
||||||
>
|
|
||||||
<%= dgettext("actions", "Delete") %>
|
|
||||||
</.link>
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<% end %>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<span>
|
|
||||||
<.link patch={Routes.note_index_path(@socket, :new)}>
|
|
||||||
<%= dgettext("actions", "New Note") %>
|
|
||||||
</.link>
|
|
||||||
</span>
|
|
||||||
|
@ -9,11 +9,15 @@ defmodule MemexWeb.NoteLive.Show do
|
|||||||
end
|
end
|
||||||
|
|
||||||
@impl true
|
@impl true
|
||||||
def handle_params(%{"id" => id}, _, socket) do
|
def handle_params(
|
||||||
|
%{"id" => id},
|
||||||
|
_,
|
||||||
|
%{assigns: %{live_action: live_action, current_user: current_user}} = socket
|
||||||
|
) do
|
||||||
{:noreply,
|
{:noreply,
|
||||||
socket
|
socket
|
||||||
|> assign(:page_title, page_title(socket.assigns.live_action))
|
|> assign(:page_title, page_title(live_action))
|
||||||
|> assign(:note, Notes.get_note!(id))}
|
|> assign(:note, Notes.get_note!(id, current_user))}
|
||||||
end
|
end
|
||||||
|
|
||||||
defp page_title(:show), do: "show note"
|
defp page_title(:show), do: "show note"
|
||||||
|
@ -1,10 +1,41 @@
|
|||||||
<h1>Show Note</h1>
|
<div class="mx-auto flex flex-col justify-center items-stretch space-y-4 max-w-3xl">
|
||||||
|
<h1 class="text-xl">
|
||||||
|
<%= @note.title %>
|
||||||
|
</h1>
|
||||||
|
|
||||||
|
<p><%= if @note.tags, do: @note.tags |> Enum.join(", ") %></p>
|
||||||
|
|
||||||
|
<textarea
|
||||||
|
id="show-note-content"
|
||||||
|
class="input input-primary h-128 min-h-128"
|
||||||
|
phx-hook="MaintainAttrs"
|
||||||
|
phx-update="ignore"
|
||||||
|
readonly
|
||||||
|
phx-no-format
|
||||||
|
><%= @note.content %></textarea>
|
||||||
|
|
||||||
|
<p class="self-end">
|
||||||
|
<%= gettext("Visibility: %{visibility}", visibility: @note.visibility) %>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div class="self-end flex space-x-4">
|
||||||
|
<.link class="btn btn-primary" patch={Routes.note_index_path(@socket, :index)}>
|
||||||
|
<%= dgettext("actions", "Back") %>
|
||||||
|
</.link>
|
||||||
|
<%= if @current_user do %>
|
||||||
|
<.link class="btn btn-primary" patch={Routes.note_show_path(@socket, :edit, @note)}>
|
||||||
|
<%= dgettext("actions", "edit") %>
|
||||||
|
</.link>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<%= if @live_action in [:edit] do %>
|
<%= if @live_action in [:edit] do %>
|
||||||
<.modal return_to={Routes.note_show_path(@socket, :show, @note)}>
|
<.modal return_to={Routes.note_show_path(@socket, :show, @note)}>
|
||||||
<.live_component
|
<.live_component
|
||||||
module={MemexWeb.NoteLive.FormComponent}
|
module={MemexWeb.NoteLive.FormComponent}
|
||||||
id={@note.id}
|
id={@note.id}
|
||||||
|
current_user={@current_user}
|
||||||
title={@page_title}
|
title={@page_title}
|
||||||
action={@live_action}
|
action={@live_action}
|
||||||
note={@note}
|
note={@note}
|
||||||
@ -12,37 +43,3 @@
|
|||||||
/>
|
/>
|
||||||
</.modal>
|
</.modal>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<ul>
|
|
||||||
<li>
|
|
||||||
<strong>Title:</strong>
|
|
||||||
<%= @note.title %>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li>
|
|
||||||
<strong>Content:</strong>
|
|
||||||
<%= @note.content %>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li>
|
|
||||||
<strong>Tag:</strong>
|
|
||||||
<%= @note.tag %>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li>
|
|
||||||
<strong>Visibility:</strong>
|
|
||||||
<%= @note.visibility %>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<span>
|
|
||||||
<.link patch={Routes.note_show_path(@socket, :edit, @note)} class="button">
|
|
||||||
<%= dgettext("actions", "Edit") %>
|
|
||||||
</.link>
|
|
||||||
</span>
|
|
||||||
|
|
|
||||||
<span>
|
|
||||||
<.link patch={Routes.note_index_path(@socket, :index)}>
|
|
||||||
<%= dgettext("actions", "Back") %>
|
|
||||||
</.link>
|
|
||||||
</span>
|
|
||||||
|
@ -59,15 +59,15 @@ defmodule MemexWeb.Router do
|
|||||||
|
|
||||||
live "/notes/new", NoteLive.Index, :new
|
live "/notes/new", NoteLive.Index, :new
|
||||||
live "/notes/:id/edit", NoteLive.Index, :edit
|
live "/notes/:id/edit", NoteLive.Index, :edit
|
||||||
live "/notes/:id/show/edit", NoteLive.Show, :edit
|
live "/note/:id/edit", NoteLive.Show, :edit
|
||||||
|
|
||||||
live "/contexts/new", ContextLive.Index, :new
|
live "/contexts/new", ContextLive.Index, :new
|
||||||
live "/contexts/:id/edit", ContextLive.Index, :edit
|
live "/contexts/:id/edit", ContextLive.Index, :edit
|
||||||
live "/contexts/:id/show/edit", ContextLive.Show, :edit
|
live "/context/:id/show/edit", ContextLive.Show, :edit
|
||||||
|
|
||||||
live "/pipelines/new", PipelineLive.Index, :new
|
live "/pipelines/new", PipelineLive.Index, :new
|
||||||
live "/pipelines/:id/edit", PipelineLive.Index, :edit
|
live "/pipelines/:id/edit", PipelineLive.Index, :edit
|
||||||
live "/pipelines/:id/show/edit", PipelineLive.Show, :edit
|
live "/pipeline/:id/edit", PipelineLive.Show, :edit
|
||||||
|
|
||||||
get "/users/settings", UserSettingsController, :edit
|
get "/users/settings", UserSettingsController, :edit
|
||||||
put "/users/settings", UserSettingsController, :update
|
put "/users/settings", UserSettingsController, :update
|
||||||
@ -79,13 +79,14 @@ defmodule MemexWeb.Router do
|
|||||||
pipe_through [:browser]
|
pipe_through [:browser]
|
||||||
|
|
||||||
live "/notes", NoteLive.Index, :index
|
live "/notes", NoteLive.Index, :index
|
||||||
live "/notes/:id", NoteLive.Show, :show
|
live "/notes/:search", NoteLive.Index, :search
|
||||||
|
live "/note/:id", NoteLive.Show, :show
|
||||||
|
|
||||||
live "/contexts", ContextLive.Index, :index
|
live "/contexts", ContextLive.Index, :index
|
||||||
live "/contexts/:id", ContextLive.Show, :show
|
live "/context/:id", ContextLive.Show, :show
|
||||||
|
|
||||||
live "/pipelines", PipelineLive.Index, :index
|
live "/pipelines", PipelineLive.Index, :index
|
||||||
live "/pipelines/:id", PipelineLive.Show, :show
|
live "/pipeline/:id", PipelineLive.Show, :show
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ defmodule MemexWeb.EmailView do
|
|||||||
@moduledoc """
|
@moduledoc """
|
||||||
A view for email-related helper functions
|
A view for email-related helper functions
|
||||||
"""
|
"""
|
||||||
alias MemexWeb.{Endpoint, HomeLive}
|
alias MemexWeb.HomeLive
|
||||||
|
|
||||||
use MemexWeb, :view
|
use MemexWeb, :view
|
||||||
end
|
end
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
defmodule MemexWeb.ErrorView do
|
defmodule MemexWeb.ErrorView do
|
||||||
use MemexWeb, :view
|
use MemexWeb, :view
|
||||||
import MemexWeb.Components.Topbar
|
import MemexWeb.Components.Topbar
|
||||||
alias MemexWeb.{Endpoint, HomeLive}
|
alias MemexWeb.HomeLive
|
||||||
|
|
||||||
def template_not_found(error_path, _assigns) do
|
def template_not_found(error_path, _assigns) do
|
||||||
error_string =
|
error_string =
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
defmodule MemexWeb.LayoutView do
|
defmodule MemexWeb.LayoutView do
|
||||||
use MemexWeb, :view
|
use MemexWeb, :view
|
||||||
import MemexWeb.Components.Topbar
|
import MemexWeb.Components.Topbar
|
||||||
alias MemexWeb.{Endpoint, HomeLive}
|
alias MemexWeb.HomeLive
|
||||||
|
|
||||||
# Phoenix LiveDashboard is available only in development by default,
|
# Phoenix LiveDashboard is available only in development by default,
|
||||||
# so we instruct Elixir to not warn if the dashboard route is missing.
|
# so we instruct Elixir to not warn if the dashboard route is missing.
|
||||||
|
@ -1,15 +1,41 @@
|
|||||||
defmodule Memex.Repo.Migrations.CreateNotes do
|
defmodule Memex.Repo.Migrations.CreateNotes do
|
||||||
use Ecto.Migration
|
use Ecto.Migration
|
||||||
|
|
||||||
def change do
|
def up do
|
||||||
create table(:notes, primary_key: false) do
|
create table(:notes, primary_key: false) do
|
||||||
add :id, :binary_id, primary_key: true
|
add :id, :binary_id, primary_key: true
|
||||||
add :title, :string
|
add :title, :string
|
||||||
add :content, :text
|
add :content, :text
|
||||||
add :tag, {:array, :string}
|
add :tags, {:array, :citext}
|
||||||
add :visibility, :string
|
add :visibility, :string
|
||||||
|
|
||||||
|
add :user_id, references(:users, on_delete: :delete_all, type: :binary_id)
|
||||||
|
|
||||||
timestamps()
|
timestamps()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
flush()
|
||||||
|
|
||||||
|
execute """
|
||||||
|
CREATE FUNCTION immutable_array_to_string(text[], text)
|
||||||
|
RETURNS text LANGUAGE sql IMMUTABLE as $$SELECT array_to_string($1, $2)$$
|
||||||
|
"""
|
||||||
|
|
||||||
|
execute """
|
||||||
|
ALTER TABLE notes
|
||||||
|
ADD COLUMN search tsvector
|
||||||
|
GENERATED ALWAYS AS (
|
||||||
|
setweight(to_tsvector('english', coalesce(title, '')), 'A') ||
|
||||||
|
setweight(to_tsvector('english', coalesce(immutable_array_to_string(tags, ' '), '')), 'B') ||
|
||||||
|
setweight(to_tsvector('english', coalesce(content, '')), 'C')
|
||||||
|
) STORED
|
||||||
|
"""
|
||||||
|
|
||||||
|
execute("CREATE INDEX notes_trgm_idx ON notes USING GIN (search)")
|
||||||
|
end
|
||||||
|
|
||||||
|
def down do
|
||||||
|
drop table(:notes)
|
||||||
|
execute("DROP FUNCTION immutable_array_to_string(text[], text)")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1,71 +1,85 @@
|
|||||||
defmodule Memex.NotesTest do
|
defmodule Memex.NotesTest do
|
||||||
use Memex.DataCase
|
use Memex.DataCase
|
||||||
|
|
||||||
alias Memex.Notes
|
|
||||||
|
|
||||||
describe "notes" do
|
|
||||||
alias Memex.Notes.Note
|
|
||||||
|
|
||||||
import Memex.NotesFixtures
|
import Memex.NotesFixtures
|
||||||
|
alias Memex.{Notes, Notes.Note}
|
||||||
|
|
||||||
@invalid_attrs %{content: nil, tag: nil, title: nil, visibility: nil}
|
@invalid_attrs %{content: nil, tag: nil, title: nil, visibility: nil}
|
||||||
|
|
||||||
test "list_notes/0 returns all notes" do
|
describe "notes" do
|
||||||
note = note_fixture()
|
setup do
|
||||||
assert Notes.list_notes() == [note]
|
[user: user_fixture()]
|
||||||
end
|
end
|
||||||
|
|
||||||
test "get_note!/1 returns the note with given id" do
|
test "list_notes/1 returns all notes for a user", %{user: user} do
|
||||||
note = note_fixture()
|
note_a = note_fixture(%{title: "a", visibility: :public}, user)
|
||||||
assert Notes.get_note!(note.id) == note
|
note_b = note_fixture(%{title: "b", visibility: :unlisted}, user)
|
||||||
|
note_c = note_fixture(%{title: "c", visibility: :private}, user)
|
||||||
|
assert Notes.list_notes(user) == [note_a, note_b, note_c]
|
||||||
end
|
end
|
||||||
|
|
||||||
test "create_note/1 with valid data creates a note" do
|
test "list_public_notes/0 returns public notes", %{user: user} do
|
||||||
valid_attrs = %{content: "some content", tag: [], title: "some title", visibility: :public}
|
public_note = note_fixture(%{visibility: :public}, user)
|
||||||
|
note_fixture(%{visibility: :unlisted}, user)
|
||||||
|
note_fixture(%{visibility: :private}, user)
|
||||||
|
assert Notes.list_public_notes() == [public_note]
|
||||||
|
end
|
||||||
|
|
||||||
assert {:ok, %Note{} = note} = Notes.create_note(valid_attrs)
|
test "get_note!/1 returns the note with given id", %{user: user} do
|
||||||
|
note = note_fixture(user)
|
||||||
|
assert Notes.get_note!(note.id, user) == note
|
||||||
|
end
|
||||||
|
|
||||||
|
test "create_note/1 with valid data creates a note", %{user: user} do
|
||||||
|
valid_attrs = %{
|
||||||
|
"content" => "some content",
|
||||||
|
"tags_string" => "tag1,tag2",
|
||||||
|
"title" => "some title",
|
||||||
|
"visibility" => :public
|
||||||
|
}
|
||||||
|
|
||||||
|
assert {:ok, %Note{} = note} = Notes.create_note(valid_attrs, user)
|
||||||
assert note.content == "some content"
|
assert note.content == "some content"
|
||||||
assert note.tag == []
|
assert note.tags == ["tag1", "tag2"]
|
||||||
assert note.title == "some title"
|
assert note.title == "some title"
|
||||||
assert note.visibility == :public
|
assert note.visibility == :public
|
||||||
end
|
end
|
||||||
|
|
||||||
test "create_note/1 with invalid data returns error changeset" do
|
test "create_note/1 with invalid data returns error changeset", %{user: user} do
|
||||||
assert {:error, %Ecto.Changeset{}} = Notes.create_note(@invalid_attrs)
|
assert {:error, %Ecto.Changeset{}} = Notes.create_note(@invalid_attrs, user)
|
||||||
end
|
end
|
||||||
|
|
||||||
test "update_note/2 with valid data updates the note" do
|
test "update_note/2 with valid data updates the note", %{user: user} do
|
||||||
note = note_fixture()
|
note = note_fixture(user)
|
||||||
|
|
||||||
update_attrs = %{
|
update_attrs = %{
|
||||||
content: "some updated content",
|
"content" => "some updated content",
|
||||||
tag: [],
|
"tags_string" => "tag1,tag2",
|
||||||
title: "some updated title",
|
"title" => "some updated title",
|
||||||
visibility: :private
|
"visibility" => :private
|
||||||
}
|
}
|
||||||
|
|
||||||
assert {:ok, %Note{} = note} = Notes.update_note(note, update_attrs)
|
assert {:ok, %Note{} = note} = Notes.update_note(note, update_attrs, user)
|
||||||
assert note.content == "some updated content"
|
assert note.content == "some updated content"
|
||||||
assert note.tag == []
|
assert note.tags == ["tag1", "tag2"]
|
||||||
assert note.title == "some updated title"
|
assert note.title == "some updated title"
|
||||||
assert note.visibility == :private
|
assert note.visibility == :private
|
||||||
end
|
end
|
||||||
|
|
||||||
test "update_note/2 with invalid data returns error changeset" do
|
test "update_note/2 with invalid data returns error changeset", %{user: user} do
|
||||||
note = note_fixture()
|
note = note_fixture(user)
|
||||||
assert {:error, %Ecto.Changeset{}} = Notes.update_note(note, @invalid_attrs)
|
assert {:error, %Ecto.Changeset{}} = Notes.update_note(note, @invalid_attrs, user)
|
||||||
assert note == Notes.get_note!(note.id)
|
assert note == Notes.get_note!(note.id, user)
|
||||||
end
|
end
|
||||||
|
|
||||||
test "delete_note/1 deletes the note" do
|
test "delete_note/1 deletes the note", %{user: user} do
|
||||||
note = note_fixture()
|
note = note_fixture(user)
|
||||||
assert {:ok, %Note{}} = Notes.delete_note(note)
|
assert {:ok, %Note{}} = Notes.delete_note(note, user)
|
||||||
assert_raise Ecto.NoResultsError, fn -> Notes.get_note!(note.id) end
|
assert_raise Ecto.NoResultsError, fn -> Notes.get_note!(note.id, user) end
|
||||||
end
|
end
|
||||||
|
|
||||||
test "change_note/1 returns a note changeset" do
|
test "change_note/1 returns a note changeset", %{user: user} do
|
||||||
note = note_fixture()
|
note = note_fixture(user)
|
||||||
assert %Ecto.Changeset{} = Notes.change_note(note)
|
assert %Ecto.Changeset{} = Notes.change_note(note, user)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -4,14 +4,24 @@ defmodule MemexWeb.ContextLiveTest do
|
|||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
import Memex.ContextsFixtures
|
import Memex.ContextsFixtures
|
||||||
|
|
||||||
@create_attrs %{content: "some content", tag: [], title: "some title", visibility: :public}
|
@create_attrs %{
|
||||||
@update_attrs %{
|
"content" => "some content",
|
||||||
content: "some updated content",
|
"tags_string" => "tag1",
|
||||||
tag: [],
|
"title" => "some title",
|
||||||
title: "some updated title",
|
"visibility" => :public
|
||||||
visibility: :private
|
}
|
||||||
|
@update_attrs %{
|
||||||
|
"content" => "some updated content",
|
||||||
|
"tags_string" => "tag1,tag2",
|
||||||
|
"title" => "some updated title",
|
||||||
|
"visibility" => :private
|
||||||
|
}
|
||||||
|
@invalid_attrs %{
|
||||||
|
"content" => nil,
|
||||||
|
"tags_string" => "",
|
||||||
|
"title" => nil,
|
||||||
|
"visibility" => nil
|
||||||
}
|
}
|
||||||
@invalid_attrs %{content: nil, tag: [], title: nil, visibility: nil}
|
|
||||||
|
|
||||||
defp create_context(_) do
|
defp create_context(_) do
|
||||||
context = context_fixture()
|
context = context_fixture()
|
||||||
|
@ -4,22 +4,31 @@ defmodule MemexWeb.NoteLiveTest do
|
|||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
import Memex.NotesFixtures
|
import Memex.NotesFixtures
|
||||||
|
|
||||||
@create_attrs %{content: "some content", tag: [], title: "some title", visibility: :public}
|
@create_attrs %{
|
||||||
@update_attrs %{
|
"content" => "some content",
|
||||||
content: "some updated content",
|
"tags_string" => "tag1",
|
||||||
tag: [],
|
"title" => "some title",
|
||||||
title: "some updated title",
|
"visibility" => :public
|
||||||
visibility: :private
|
}
|
||||||
|
@update_attrs %{
|
||||||
|
"content" => "some updated content",
|
||||||
|
"tags_string" => "tag1,tag2",
|
||||||
|
"title" => "some updated title",
|
||||||
|
"visibility" => :private
|
||||||
|
}
|
||||||
|
@invalid_attrs %{
|
||||||
|
"content" => nil,
|
||||||
|
"tags_string" => "",
|
||||||
|
"title" => nil,
|
||||||
|
"visibility" => nil
|
||||||
}
|
}
|
||||||
@invalid_attrs %{content: nil, tag: [], title: nil, visibility: nil}
|
|
||||||
|
|
||||||
defp create_note(_) do
|
defp create_note(%{user: user}) do
|
||||||
note = note_fixture()
|
[note: note_fixture(user)]
|
||||||
%{note: note}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "Index" do
|
describe "Index" do
|
||||||
setup [:create_note]
|
setup [:register_and_log_in_user, :create_note]
|
||||||
|
|
||||||
test "lists all notes", %{conn: conn, note: note} do
|
test "lists all notes", %{conn: conn, note: note} do
|
||||||
{:ok, _index_live, html} = live(conn, Routes.note_index_path(conn, :index))
|
{:ok, _index_live, html} = live(conn, Routes.note_index_path(conn, :index))
|
||||||
@ -53,7 +62,7 @@ defmodule MemexWeb.NoteLiveTest do
|
|||||||
test "updates note in listing", %{conn: conn, note: note} do
|
test "updates note in listing", %{conn: conn, note: note} do
|
||||||
{:ok, index_live, _html} = live(conn, Routes.note_index_path(conn, :index))
|
{:ok, index_live, _html} = live(conn, Routes.note_index_path(conn, :index))
|
||||||
|
|
||||||
assert index_live |> element("#note-#{note.id} a", "Edit") |> render_click() =~
|
assert index_live |> element("[data-qa=\"note-edit-#{note.id}\"]") |> render_click() =~
|
||||||
"edit"
|
"edit"
|
||||||
|
|
||||||
assert_patch(index_live, Routes.note_index_path(conn, :edit, note))
|
assert_patch(index_live, Routes.note_index_path(conn, :edit, note))
|
||||||
@ -75,7 +84,7 @@ defmodule MemexWeb.NoteLiveTest do
|
|||||||
test "deletes note in listing", %{conn: conn, note: note} do
|
test "deletes note in listing", %{conn: conn, note: note} do
|
||||||
{:ok, index_live, _html} = live(conn, Routes.note_index_path(conn, :index))
|
{:ok, index_live, _html} = live(conn, Routes.note_index_path(conn, :index))
|
||||||
|
|
||||||
assert index_live |> element("#note-#{note.id} a", "Delete") |> render_click()
|
assert index_live |> element("[data-qa=\"delete-note-#{note.id}\"]") |> render_click()
|
||||||
refute has_element?(index_live, "#note-#{note.id}")
|
refute has_element?(index_live, "#note-#{note.id}")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -3,20 +3,23 @@ defmodule Memex.NotesFixtures do
|
|||||||
This module defines test helpers for creating
|
This module defines test helpers for creating
|
||||||
entities via the `Memex.Notes` context.
|
entities via the `Memex.Notes` context.
|
||||||
"""
|
"""
|
||||||
|
alias Memex.{Accounts.User, Notes, Notes.Note}
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
Generate a note.
|
Generate a note.
|
||||||
"""
|
"""
|
||||||
def note_fixture(attrs \\ %{}) do
|
@spec note_fixture(User.t()) :: Note.t()
|
||||||
|
@spec note_fixture(attrs :: map(), User.t()) :: Note.t()
|
||||||
|
def note_fixture(attrs \\ %{}, user) do
|
||||||
{:ok, note} =
|
{:ok, note} =
|
||||||
attrs
|
attrs
|
||||||
|> Enum.into(%{
|
|> Enum.into(%{
|
||||||
content: "some content",
|
content: "some content",
|
||||||
tag: [],
|
tag: [],
|
||||||
title: "some title",
|
title: "some title",
|
||||||
visibility: :public
|
visibility: :private
|
||||||
})
|
})
|
||||||
|> Memex.Notes.create_note()
|
|> Notes.create_note(user)
|
||||||
|
|
||||||
note
|
note
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user