inhji/chiya
inhji/chiya
1
1
Fork 0
Code Issues 8 Pull requests 9 Activity

Merge pull request 'devel' (#198) from devel into main

Browse source 
Reviewed-on: #198
This commit is contained in:
inhji 2023-07-08 15:07:04 +02:00
commit 4073626d5f
5 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/chiya_web/components/layouts/root_public.html.heex
View file

@ -115,12 +115,14 @@
</p>
</footer>
<%= if @profile do %>
<section class="hidden | hcard h-card">
<a href="/" rel="me" class="u-url"><%= @profile.name %></a>
<img class="u-photo" src={ChiyaWeb.Uploaders.UserImage.url({@profile.user_image, @profile}, :thumb)} />
<span class="p-nickname"><%= @profile.handle %></span>
<span class="p-note"><%= @profile.bio %></span>
</section>
<% end %>
<section class="flex h-1 w-full flex-row">
<div class="bg-theme-primary w-full"></div>

18
lib/chiya_web/controllers/error_html/404.html.heex
View file

@ -1,4 +1,14 @@
<.header>
<:title>four oh four</:title>
<:subtitle>this page went away and never came back.</:subtitle>
</.header>
<html>
<head>
<title>Not found</title>
<link rel="preconnect" href="https://rsms.me/" />
<link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
<link phx-track-static rel="stylesheet" href={~p"/assets/app.css"} />
</head>
<body>
<.header>
<:title>Not found</:title>
<:subtitle>This page went away and never came back.</:subtitle>
</.header>
</body>
</html>

18
lib/chiya_web/controllers/error_html/500.html.heex
View file

@ -1,4 +1,14 @@
<.header>
<:title>infernal server error</:title>
<:subtitle>server got hot and went to hell.</:subtitle>
</.header>
<html>
<head>
<title>Infernal Server Error</title>
<link rel="preconnect" href="https://rsms.me/" />
<link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
<link phx-track-static rel="stylesheet" href={~p"/assets/app.css"} />
</head>
<body>
<.header>
<:title>Infernal Server Error</:title>
<:subtitle>Server got hot and went to hell.</:subtitle>
</.header>
</body>
</html>

3
lib/chiya_web/error.ex
View file

@ -1,10 +1,9 @@
defmodule ChiyaWeb.Error do
import Plug.Conn, only: [put_status: 2]
import Phoenix.Controller, only: [put_view: 2, render: 3, put_root_layout: 2]
import Phoenix.Controller, only: [put_view: 2, render: 3]
def render_error(conn, :not_found, assigns \\ []) do
conn
|> put_root_layout(html: {ChiyaWeb.Layouts, :root_error})
|> put_status(:not_found)
|> put_view(ChiyaWeb.ErrorHTML)
|> render("404.html", assigns)

7
lib/chiya_web/global_assigns.ex
View file

@ -6,12 +6,7 @@ defmodule ChiyaWeb.GlobalAssigns do
def fetch_profile(conn, _opts) do
user = Chiya.Accounts.get_user(1)
if user do
assign(conn, :profile, user)
else
conn
end
assign(conn, :profile, user)
end
def fetch_settings(conn, _opts) do