assets/css/admin.css

@@ -1,58 +1,10 @@
 .admin-panel {
   display: flex;
-  gap: 32px;
+  gap: 16px;
   margin-top: 16px;
 }
 
-.admin-panel .menu {
+.admin-panel ul {
   padding: 0;
   margin: 0;
-  list-style-type: none;
-}
-
-.admin-panel .menu li {
-  padding: 10px;
-  background-color: #20232f;
-}
-
-.admin-panel .menu li:first-child {
-  border-radius: 8px 8px 0 0;
-}
-
-.admin-panel .menu li:not(:first-child) {
-  border-top: 1px solid #353544;
-}
-
-.admin-panel .menu li:last-child {
-  border-radius: 0 0 8px 8px;
-}
-
-.admin-panel h3 {
-  margin-top: 0;
-}
-
-.admin-panel .stats {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 16px;
-}
-
-.admin-panel .stat {
-  background-color: #20232f;
-  padding: 16px;
-  border-radius: 8px;
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  align-items: center;
-  width: min-content;
-}
-
-.admin-panel .stat .value {
-  font-size: 48px;
-  font-weight: bold;
-}
-
-.admin-panel .stat .name {
-  text-align: center;
 }

assets/js/app.js

@@ -22,8 +22,6 @@ import {Socket} from "phoenix"
 import {LiveSocket} from "phoenix_live_view"
 import topbar from "../vendor/topbar"
 import "../css/core/app.css"
-import "../css/admin.css"
-import "../css/home.css"
 
 let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute("content")
 let liveSocket = new LiveSocket("/live", Socket, {

config/config.exs

@@ -38,7 +38,7 @@ config :esbuild,
   version: "0.17.11",
   comfycamp: [
     args:
-      ~w(js/app.js --bundle --target=es2017 --outdir=../priv/static/assets --external:/fonts/* --external:/images/*),
+      ~w(js/app.js css/home.css css/admin.css --bundle --target=es2017 --outdir=../priv/static/assets --external:/fonts/* --external:/images/*),
     cd: Path.expand("../assets", __DIR__),
     env: %{"NODE_PATH" => Path.expand("../deps", __DIR__)}
   ]

lib/comfycamp/accounts.ex

@@ -33,14 +33,6 @@ defmodule Comfycamp.Accounts do
     Repo.all(User)
   end
 
-  def count_users() do
-    Repo.one(from u in "users", select: count(u.id))
-  end
-
-  def count_unapproved_users() do
-    Repo.one(from u in "users", select: count(u.id), where: not u.is_approved)
-  end
-
   @doc """
   Gets a user by email and password.
 

lib/comfycamp_web/components/layouts/admin.html.heex

@@ -2,15 +2,12 @@
 
 <main>
   <div class="limiter">
+    <.link href={~p"/"}>
+      Главная страница
+    </.link>
     <h1>Панель администратора</h1>
-    <.back navigate={~p"/"}>Главная страница</.back>
     <div class="admin-panel">
-      <ul class="menu">
+      <ul>
-        <li>
-          <.link href={~p"/admin"}>
-            Управление
-          </.link>
-        </li>
         <li>
           <.link href={~p"/admin/notes"}>
             Заметки

lib/comfycamp_web/components/layouts/root.html.heex

@@ -15,6 +15,11 @@
       }
     />
     <link phx-track-static rel="stylesheet" href={~p"/assets/app.css"} />
+    <%= if assigns[:stylesheets] do %>
+      <%= for stylesheet <- @stylesheets do %>
+        <link phx-track-static rel="stylesheet" href={stylesheet} />
+      <% end %>
+    <% end %>
     <script defer phx-track-static type="text/javascript" src={~p"/assets/app.js"}>
     </script>
     <link

lib/comfycamp_web/controllers/admin_page_controller.ex

@@ -1,23 +1,15 @@
 defmodule ComfycampWeb.AdminPageController do
   use ComfycampWeb, :controller
-  alias Comfycamp.Accounts
 
   def home(conn, _params) do
-    user_count = Accounts.count_users()
-    unapproved_user_count = Accounts.count_unapproved_users()
-
     conn
     |> put_layout(html: :admin)
-    |> render(:home,
+    |> render(:home, page_title: "Админка", stylesheets: ["/assets/admin.css"])
-      page_title: "Админка",
-      user_count: user_count,
-      unapproved_user_count: unapproved_user_count
-    )
   end
 
   def services(conn, _params) do
     conn
     |> put_layout(html: :admin)
-    |> render(:home, page_title: "Админка")
+    |> render(:home, page_title: "Админка", stylesheets: ["/assets/admin.css"])
   end
 end

lib/comfycamp_web/controllers/admin_page_html.ex

@@ -3,31 +3,7 @@ defmodule ComfycampWeb.AdminPageHTML do
 
   def home(assigns) do
     ~H"""
-    <div>
+    Добро пожаловать, админ.
-      <h3>Управление сайтом</h3>
-      <div class="stats">
-        <.stat name="Всего пользователей" value={@user_count} />
-        <.stat
-          name="Неодобренных пользователей"
-          value={@unapproved_user_count}
-        />
-      </div>
-    </div>
-    """
-  end
-
-  @doc """
-  Card for statistical data.
-  """
-  attr :name, :string, required: true
-  attr :value, :any, required: true
-
-  def stat(assigns) do
-    ~H"""
-    <div class="stat">
-      <div class="value"><%= @value %></div>
-      <div class="name"><%= @name %></div>
-    </div>
     """
   end
 end

lib/comfycamp_web/controllers/home_controller.ex

@@ -2,14 +2,14 @@ defmodule ComfycampWeb.HomeController do
   use ComfycampWeb, :controller
 
   def index(conn, _params) do
-    render(conn, :index, page_title: "Главная")
+    render(conn, :index, page_title: "Главная", stylesheets: ["/assets/home.css"])
   end
 
   def mastodon(conn, _params) do
-    render(conn, :mastodon, page_title: "Mastodon")
+    render(conn, :mastodon, page_title: "Mastodon", stylesheets: ["/assets/home.css"])
   end
 
   def nextcloud(conn, _params) do
-    render(conn, :nextcloud, page_title: "Nextcloud")
+    render(conn, :nextcloud, page_title: "Nextcloud", stylesheets: ["/assets/home.css"])
   end
 end

lib/comfycamp_web/controllers/notes_editor_controller.ex

@@ -9,7 +9,7 @@ defmodule ComfycampWeb.NotesEditorController do
 
     conn
     |> put_layout(html: :admin)
-    |> render(:index, page_title: "Заметки", notes: notes)
+    |> render(:index, page_title: "Заметки", notes: notes, stylesheets: ["/assets/admin.css"])
   end
 
   def new(conn, _params) do
@@ -83,7 +83,7 @@ defmodule ComfycampWeb.NotesEditorController do
 
     conn
     |> put_layout(html: :admin)
-    |> render(:show, page_title: "Заметка", note: note)
+    |> render(:show, page_title: "Заметка", note: note, stylesheets: ["/assets/admin.css"])
   end
 
   def delete(conn, %{"id" => id}) do

lib/comfycamp_web/controllers/notes_editor_html.ex

@@ -4,7 +4,6 @@ defmodule ComfycampWeb.NotesEditorHTML do
   def index(assigns) do
     ~H"""
     <div>
-      <h3>Заметки</h3>
       <.link href={~p"/admin/notes/new"}>
         Создать заметку
       </.link>
@@ -27,8 +26,8 @@ defmodule ComfycampWeb.NotesEditorHTML do
   def show(assigns) do
     ~H"""
     <div>
-      <h3><%= @note.title %></h3>
       <.back navigate={~p"/admin/notes"}>Назад</.back>
+      <h3><%= @note.title %></h3>
 
       <.link href={~p"/admin/notes/#{@note}/edit"}>
         Редактировать
@@ -45,7 +44,7 @@ defmodule ComfycampWeb.NotesEditorHTML do
   def new(assigns) do
     ~H"""
     <div>
-      <h3>Новая заметка</h3>
+      <h2>Новая заметка</h2>
       <.note_form changeset={@changeset} action={~p"/admin/notes"} />
     </div>
     """
@@ -54,7 +53,7 @@ defmodule ComfycampWeb.NotesEditorHTML do
   def edit(assigns) do
     ~H"""
     <div>
-      <h3>Редактировать заметку</h3>
+      <h2>Редактировать заметку</h2>
       <.note_form changeset={@changeset} action={~p"/admin/notes/#{@changeset.data.id}"} />
     </div>
     """

lib/comfycamp_web/controllers/user_editor_controller.ex

@@ -19,7 +19,7 @@ defmodule ComfycampWeb.UserEditorController do
 
     conn
     |> put_layout(html: :admin)
-    |> render(:show, page_title: user.email, user: user)
+    |> render(:show, page_title: user.email, user: user, stylesheets: ["/assets/admin.css"])
   end
 
   def approve(conn, %{"id" => id}) do