mix format
This commit is contained in:
parent
fe22704f8f
commit
7236ac409c
4 changed files with 40 additions and 21 deletions
|
@ -31,7 +31,7 @@ defmodule ChiyaWeb.NoteController do
|
||||||
def show(conn, %{"id" => id}) do
|
def show(conn, %{"id" => id}) do
|
||||||
# note = Notes.get_note!(id)
|
# note = Notes.get_note!(id)
|
||||||
# render(conn, :show, note: note)
|
# render(conn, :show, note: note)
|
||||||
live_render(conn, NoteShowLive, session: %{ "note_id" => id })
|
live_render(conn, NoteShowLive, session: %{"note_id" => id})
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit(conn, %{"id" => id}) do
|
def edit(conn, %{"id" => id}) do
|
||||||
|
|
|
@ -15,14 +15,12 @@
|
||||||
</.header>
|
</.header>
|
||||||
|
|
||||||
<%= if @setting !== nil do %>
|
<%= if @setting !== nil do %>
|
||||||
|
<.list>
|
||||||
<.list>
|
|
||||||
<:item title="Title"><%= @setting.title %></:item>
|
<:item title="Title"><%= @setting.title %></:item>
|
||||||
<:item title="Subtitle"><%= @setting.subtitle %></:item>
|
<:item title="Subtitle"><%= @setting.subtitle %></:item>
|
||||||
<:item title="Theme"><%= @setting.theme %></:item>
|
<:item title="Theme"><%= @setting.theme %></:item>
|
||||||
<:item title="User agent"><%= @setting.user_agent %></:item>
|
<:item title="User agent"><%= @setting.user_agent %></:item>
|
||||||
<:item title="Custom css"><%= @setting.custom_css %></:item>
|
<:item title="Custom css"><%= @setting.custom_css %></:item>
|
||||||
<:item title="Custom html"><%= @setting.custom_html %></:item>
|
<:item title="Custom html"><%= @setting.custom_html %></:item>
|
||||||
</.list>
|
</.list>
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -3,9 +3,30 @@ defmodule ChiyaWeb.SettingControllerTest do
|
||||||
|
|
||||||
import Chiya.SiteFixtures
|
import Chiya.SiteFixtures
|
||||||
|
|
||||||
@create_attrs %{custom_css: "some custom_css", custom_html: "some custom_html", subtitle: "some subtitle", theme: :default, title: "some title", user_agent: "some user_agent"}
|
@create_attrs %{
|
||||||
@update_attrs %{custom_css: "some updated custom_css", custom_html: "some updated custom_html", subtitle: "some updated subtitle", theme: :default, title: "some updated title", user_agent: "some updated user_agent"}
|
custom_css: "some custom_css",
|
||||||
@invalid_attrs %{custom_css: nil, custom_html: nil, subtitle: nil, theme: nil, title: nil, user_agent: nil}
|
custom_html: "some custom_html",
|
||||||
|
subtitle: "some subtitle",
|
||||||
|
theme: :default,
|
||||||
|
title: "some title",
|
||||||
|
user_agent: "some user_agent"
|
||||||
|
}
|
||||||
|
@update_attrs %{
|
||||||
|
custom_css: "some updated custom_css",
|
||||||
|
custom_html: "some updated custom_html",
|
||||||
|
subtitle: "some updated subtitle",
|
||||||
|
theme: :default,
|
||||||
|
title: "some updated title",
|
||||||
|
user_agent: "some updated user_agent"
|
||||||
|
}
|
||||||
|
@invalid_attrs %{
|
||||||
|
custom_css: nil,
|
||||||
|
custom_html: nil,
|
||||||
|
subtitle: nil,
|
||||||
|
theme: nil,
|
||||||
|
title: nil,
|
||||||
|
user_agent: nil
|
||||||
|
}
|
||||||
|
|
||||||
setup [:register_and_log_in_user]
|
setup [:register_and_log_in_user]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue