PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-11-30 14:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove static paths

Browse source
This commit is contained in:
Liam 2024-04-27 23:01:16 -04:00
parent 1f34b90f5c
commit d2a1230288
9 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/philomena_web.ex
View file

@ -17,7 +17,7 @@ defmodule PhilomenaWeb do
and import those modules here.
"""
def static_paths, do: ~w(assets images favicon.ico favicon.svg robots.txt)
def static_paths, do: ~w(assets favicon.ico favicon.svg robots.txt)
def controller do
quote do

4
lib/philomena_web/templates/error/show.html.slime
View file

@ -8,8 +8,8 @@ html lang="en"
title
=> @status
| - Philomena
link rel="stylesheet" href=stylesheet_path(@conn, nil)
link rel="stylesheet" href=dark_stylesheet_path(@conn) media="(prefers-color-scheme: dark)"
link rel="stylesheet" href=stylesheet_path(nil)
link rel="stylesheet" href=dark_stylesheet_path() media="(prefers-color-scheme: dark)"
link rel="icon" href="/favicon.ico" type="image/x-icon"
link rel="icon" href="/favicon.svg" type="image/svg+xml"

2
lib/philomena_web/templates/image/_image_target.html.slime
View file

@ -6,7 +6,7 @@
strong
= link("This image is blocked by your current filter - click here to display it anyway", to: "#", data: [click_unfilter: @image.id])
p
= img_tag(Routes.static_path(PhilomenaWeb.Endpoint, "/images/tagblocked.svg"), width: 250, height: 250, data: [click_unfilter: @image.id])
= img_tag(static_path(@conn, "/images/tagblocked.svg"), width: 250, height: 250, data: [click_unfilter: @image.id])
span.filter-explanation
=< link("your current filter", to: Routes.filter_path(@conn, :show, @conn.assigns.current_filter), class: "filter-link")
' .

10
lib/philomena_web/templates/layout/app.html.slime
View file

@ -10,11 +10,11 @@ html lang="en"
' - Derpibooru
- else
' Derpibooru
link rel="stylesheet" href=stylesheet_path(@conn, @current_user)
link rel="stylesheet" href=stylesheet_path(@current_user)
= if is_nil(@current_user) do
link rel="stylesheet" href=dark_stylesheet_path(@conn) media="(prefers-color-scheme: dark)"
link rel="icon" href="/favicon.ico" type="image/x-icon"
link rel="icon" href="/favicon.svg" type="image/svg+xml"
link rel="stylesheet" href=dark_stylesheet_path() media="(prefers-color-scheme: dark)"
link rel="icon" href=~p"/favicon.ico" type="image/x-icon"
link rel="icon" href=~p"/favicon.svg" type="image/svg+xml"
meta name="generator" content="philomena"
meta name="theme-color" content="#618fc3"
meta name="format-detection" content="telephone=no"
@ -24,7 +24,7 @@ html lang="en"
script type="module" src="http://localhost:5173/@vite/client"
script type="module" src="http://localhost:5173/js/app.js"
- else
script type="text/javascript" src=Routes.static_path(@conn, "/js/app.js") async="async"
script type="text/javascript" src=~p"/js/app.js" async="async"
= render PhilomenaWeb.LayoutView, "_opengraph.html", assigns
body data-theme=theme_name(@current_user) data-vite-reload=to_string(vite_reload?())
= render PhilomenaWeb.LayoutView, "_burger.html", assigns

4
lib/philomena_web/templates/layout/two_factor.html.slime
View file

@ -6,8 +6,8 @@ html lang="en"
= viewport_meta_tag(@conn)
title Two Factor Authentication - Derpibooru
link rel="stylesheet" href=stylesheet_path(@conn, nil)
link rel="stylesheet" href=dark_stylesheet_path(@conn) media="(prefers-color-scheme: dark)"
link rel="stylesheet" href=stylesheet_path(nil)
link rel="stylesheet" href=dark_stylesheet_path() media="(prefers-color-scheme: dark)"
link rel="icon" href="/favicon.ico" type="image/x-icon"
link rel="icon" href="/favicon.svg" type="image/svg+xml"

2
lib/philomena_web/templates/setting/edit.html.slime
View file

@ -79,7 +79,7 @@ h1 Content Settings
' For 1080p monitors, try 24.
.field
=> label f, :theme
=> select f, :theme, theme_options(@conn), class: "input"
=> select f, :theme, theme_options(), class: "input"
= error_tag f, :theme
.fieldlabel: i Preview themes by selecting one from the dropdown. Saving sets the currently selected theme.
.field

4
lib/philomena_web/views/error_view.ex
View file

@ -3,8 +3,8 @@ defmodule PhilomenaWeb.ErrorView do
import PhilomenaWeb.LayoutView,
only: [
stylesheet_path: 2,
dark_stylesheet_path: 1,
stylesheet_path: 1,
dark_stylesheet_path: 0,
viewport_meta_tag: 1
]

15
lib/philomena_web/views/layout_view.ex
View file

@ -69,17 +69,10 @@ defmodule PhilomenaWeb.LayoutView do
Config.get(:footer)
end
def stylesheet_path(conn, %{theme: "dark"}),
do: Routes.static_path(conn, "/css/dark.css")
def stylesheet_path(conn, %{theme: "red"}),
do: Routes.static_path(conn, "/css/red.css")
def stylesheet_path(conn, _user),
do: Routes.static_path(conn, "/css/default.css")
def dark_stylesheet_path(conn),
do: Routes.static_path(conn, "/css/dark.css")
def stylesheet_path(%{theme: "dark"}), do: ~p"/css/dark.css"
def stylesheet_path(%{theme: "red"}), do: ~p"/css/red.css"
def stylesheet_path(_user), do: ~p"/css/default.css"
def dark_stylesheet_path, do: ~p"/css/dark.css"
def theme_name(%{theme: theme}), do: theme
def theme_name(_user), do: "default"

8
lib/philomena_web/views/setting_view.ex
View file

@ -1,15 +1,15 @@
defmodule PhilomenaWeb.SettingView do
use PhilomenaWeb, :view
def theme_options(conn) do
def theme_options do
[
[
key: "Default",
value: "default",
data: [theme_path: Routes.static_path(conn, "/css/default.css")]
data: [theme_path: ~p"/css/default.css"]
],
[key: "Dark", value: "dark", data: [theme_path: Routes.static_path(conn, "/css/dark.css")]],
[key: "Red", value: "red", data: [theme_path: Routes.static_path(conn, "/css/red.css")]]
[key: "Dark", value: "dark", data: [theme_path: ~p"/css/dark.css"]],
[key: "Red", value: "red", data: [theme_path: ~p"/css/red.css"]]
]
end