diff --git a/assets/views/about.jet.html b/assets/views/about.jet.html index 204b285..a5b7ade 100644 --- a/assets/views/about.jet.html +++ b/assets/views/about.jet.html @@ -1,5 +1,5 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}

About PixivFE

PixivFE is a Pixiv frontend. It lets you enjoy art on Pixiv without needless interruption.

@@ -25,4 +25,4 @@
-{{ end }} +{{- end }} diff --git a/assets/views/artwork.jet.html b/assets/views/artwork.jet.html index 336eb35..14e0b08 100644 --- a/assets/views/artwork.jet.html +++ b/assets/views/artwork.jet.html @@ -1,57 +1,57 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}
- {{ include "components/artwork" .Illust }} + {{- include "components/artwork" .Illust }}
{{ .Illust.User.Name }} Other works by {{ .Illust.User.Name }} » - {{ combinedUrl := "/artworks-multi/" + joinArtworkIds(.Illust.RecentWorks) }} + {{- combinedUrl := "/artworks-multi/" + joinArtworkIds(.Illust.RecentWorks) }}
View all
- {{ range .Illust.RecentWorks }} + {{- range .Illust.RecentWorks }}
- {{ include "components/thumbnail-dt" . }} + {{- include "components/thumbnail-dt" . }}
- {{ end }} + {{- end }}
Comments - {{ if .Illust.CommentDisabled == 1 }} + {{- if .Illust.CommentDisabled == 1 }}

The creator turned comments off

- {{ else if .Illust.Comments == 0 }} + {{- else if .Illust.Comments == 0 }}

There are no comments yet

- {{ else }} {{ range .Illust.CommentsList }} + {{- else }} {{ range .Illust.CommentsList }}
{{ .AuthorName }}
- {{ .AuthorName }} + {{- .AuthorName }}

- {{ if .Stamp }} + {{- if .Stamp }} /proxy/s.pximg.net/common/images/stamp/generated-stamps/{{ .Stamp }}_s.jpg - {{ else }} {{ raw: parseEmojis(.Context) }} {{ end }} + {{- else }} {{ raw: parseEmojis(.Context) }} {{ end }}

{{ .Date }}
- {{ end }} {{ end }} + {{- end }} {{ end }}

Related works

- {{ include "components/small-tn" .Illust.RelatedWorks }} + {{- include "components/small-tn" .Illust.RelatedWorks }}
-{{ end }} +{{- end }} diff --git a/assets/views/artworkMulti.jet.html b/assets/views/artworkMulti.jet.html index 318ef19..1450505 100644 --- a/assets/views/artworkMulti.jet.html +++ b/assets/views/artworkMulti.jet.html @@ -1,8 +1,8 @@ -{{ extends "layout/default" }} -{{ block body() }} -{{ range .Artworks }} +{{- extends "layout/default" }} +{{- block body() }} +{{- range .Artworks }}
-{{ include "components/artwork" . }} +{{- include "components/artwork" . }}
-{{ end }} -{{ end }} +{{- end }} +{{- end }} diff --git a/assets/views/components/artwork.jet.html b/assets/views/components/artwork.jet.html index 61f5bce..7bee19c 100644 --- a/assets/views/components/artwork.jet.html +++ b/assets/views/components/artwork.jet.html @@ -1,17 +1,17 @@ -{{ if !.IsUgoira }} +{{- if !.IsUgoira }}
- {{ range index := .Images }} + {{- range index := .Images }} - {{ if .Width != 0 && .Height != 0 }} + {{- if .Width != 0 && .Height != 0 }} {* todo: do not reflow the page because of loading image *} Page {{ index }} - {{ else }} + {{- else }} Page {{ index }} - {{ end }} + {{- end }} - {{ end }} + {{- end }}
-{{ else }} +{{- else }}
@@ -63,40 +63,40 @@
Views - {{ .Views }} + {{- .Views }} Bookmarks - {{ .Bookmarks }} + {{- .Bookmarks }} Likes - {{ .Likes }} + {{- .Likes }} Date - {{ parseTime: .Date }} + {{- parseTime: .Date }}
- {{ if .AiType == 2 }} + {{- if .AiType == 2 }} AI-generated - {{ end }} {{ range .Tags }} {{ if isEmphasize(.Name) }} + {{- end }} {{ range .Tags }} {{ if isEmphasize(.Name) }} {{ .Name }} - {{ else }} + {{- else }} #{{ .Name }}{{ .TranslatedName }} - {{ end }} {{ end }} + {{- end }} {{ end }}

- {{ raw: parsePixivRedirect(.Description) }} + {{- raw: parsePixivRedirect(.Description) }}

\ No newline at end of file diff --git a/assets/views/components/novel-tn.jet.html b/assets/views/components/novel-tn.jet.html index cf366c1..070d0d3 100644 --- a/assets/views/components/novel-tn.jet.html +++ b/assets/views/components/novel-tn.jet.html @@ -9,7 +9,7 @@
- {{ .Title }} + {{- .Title }}
{{ .WordCount }} word(s) {{ floor: .ReadingTime / 60 }} min @@ -22,42 +22,42 @@

{{ raw: .Description }}

- {{ if .AiType == 2 }} + {{- if .AiType == 2 }} AI-generated - {{ end }} - {{ if .IsOriginal }} + {{- end }} + {{- if .IsOriginal }} Original - {{ end }} - {{ if .Genre != "0" }} + {{- end }} + {{- if .Genre != "0" }} {{ novelGenre: .Genre }} - {{ end }} - {{ range .Tags }} {{ if isEmphasize(.) }} + {{- end }} + {{- range .Tags }} {{ if isEmphasize(.) }} {{ . }} - {{ else }} + {{- else }} #{{ . }} - {{ end }} {{ end }} + {{- end }} {{ end }}
Bookmarks - {{ .Bookmarks }} + {{- .Bookmarks }} Date - {{ parseTime: .CreateDate }} + {{- parseTime: .CreateDate }}
diff --git a/assets/views/components/ranking-tn.jet.html b/assets/views/components/ranking-tn.jet.html index 1ad616d..eae0e3d 100644 --- a/assets/views/components/ranking-tn.jet.html +++ b/assets/views/components/ranking-tn.jet.html @@ -1,5 +1,5 @@ -{{ range . }} -{{ target := CookieList["pixivfe-ThumbnailToNewTab"] }} +{{- range . }} +{{- target := CookieList["pixivfe-ThumbnailToNewTab"] }}
@@ -9,12 +9,12 @@
{{ .Rank }}
- {{ if .Pages > 1 }} + {{- if .Pages > 1 }}
⧉ {{ .Pages }}
- {{ end }} - {{ if .IllustType == 2 }} + {{- end }} + {{- if .IllustType == 2 }}
▶
- {{ end }} + {{- end }}
@@ -25,4 +25,4 @@ {{ .ArtistName }}
-{{ end }} +{{- end }} diff --git a/assets/views/components/small-tn.jet.html b/assets/views/components/small-tn.jet.html index 67c3372..6e20c56 100644 --- a/assets/views/components/small-tn.jet.html +++ b/assets/views/components/small-tn.jet.html @@ -1,4 +1,4 @@ -{{ range . }} {{ if .ID == "#" }} +{{- range . }} {{ if .ID == "#" }}
{{ .Title }}
@@ -11,9 +11,9 @@ >
-{{ else if .ID }} +{{- else if .ID }}
{{ include "thumbnail-dt" . }} {{ include "thumbnail-tt" . }} {{ include "thumbnail-at" . }}
-{{ end }} {{ end }} +{{- end }} {{ end }} diff --git a/assets/views/components/switcher.jet.html b/assets/views/components/switcher.jet.html index 30d0a5b..97476ed 100644 --- a/assets/views/components/switcher.jet.html +++ b/assets/views/components/switcher.jet.html @@ -1,7 +1,7 @@ -{{block Switcher(baseURL, paths, names, currentPath="artworks")}} - {{ range i, k := paths }} +{{- block Switcher(baseURL, paths, names, currentPath="artworks") }} + {{- range i, k := paths }} - {{names[i]}} + {{-names[i]}} - {{ end }} -{{ end }} + {{- end }} +{{- end }} diff --git a/assets/views/components/thumbnail-dt.jet.html b/assets/views/components/thumbnail-dt.jet.html index 4873cf8..a83d07e 100644 --- a/assets/views/components/thumbnail-dt.jet.html +++ b/assets/views/components/thumbnail-dt.jet.html @@ -1,16 +1,16 @@ -{{ target := CookieList["pixivfe-ThumbnailToNewTab"] }} +{{- target := CookieList["pixivfe-ThumbnailToNewTab"] }}
- {{ if .XRestrict != 0 }} + {{- if .XRestrict != 0 }}
{{ if .XRestrict == 1 }}R-18{{ else }}R-18G{{ end }}
- {{ end }} {{ if .Pages > 1 }} + {{- end }} {{ if .Pages > 1 }}
⧉ {{ .Pages }}
- {{ end }} - {{ if .IllustType == 2 }} + {{- end }} + {{- if .IllustType == 2 }}
▶
- {{ end }} + {{- end }}
diff --git a/assets/views/components/thumbnail-tt.jet.html b/assets/views/components/thumbnail-tt.jet.html index 791ee81..2d5ff9f 100644 --- a/assets/views/components/thumbnail-tt.jet.html +++ b/assets/views/components/thumbnail-tt.jet.html @@ -1,4 +1,4 @@ -{{ target := CookieList["pixivfe-ThumbnailToNewTab"] }} +{{- target := CookieList["pixivfe-ThumbnailToNewTab"] }}
{{ .Title }}
diff --git a/assets/views/discovery.jet.html b/assets/views/discovery.jet.html index 6f01513..02233db 100644 --- a/assets/views/discovery.jet.html +++ b/assets/views/discovery.jet.html @@ -1,5 +1,5 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}

Discover artworks

@@ -14,10 +14,10 @@ R-18
- {{ include "components/small-tn" .Artworks }} + {{- include "components/small-tn" .Artworks }}
-{{ end }} +{{- end }} diff --git a/assets/views/error.jet.html b/assets/views/error.jet.html index fac35ec..d95abcc 100644 --- a/assets/views/error.jet.html +++ b/assets/views/error.jet.html @@ -1,13 +1,13 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}

An error occured

This is what you got instead ¯\_(ツ)_/¯


- {{ .Error }} + {{- .Error }}

If you think this error should not occur, you can help us by submitting an issue to the upstream repository!

-{{ end }} +{{- end }} diff --git a/assets/views/following.jet.html b/assets/views/following.jet.html index 970289c..b939dc1 100644 --- a/assets/views/following.jet.html +++ b/assets/views/following.jet.html @@ -1,5 +1,5 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}

Newest works from people you follow

@@ -10,10 +10,10 @@
{{ include "components/small-tn" .Artworks }}
-{{ end }} +{{- end }} diff --git a/assets/views/index.jet.html b/assets/views/index.jet.html index cfb6f42..181b810 100644 --- a/assets/views/index.jet.html +++ b/assets/views/index.jet.html @@ -1,18 +1,18 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}
- {{ if !.LoggedIn }} + {{- if !.LoggedIn }}

Not logged in. You can login here.

Today's illustration rankings

See more
- {{ include "components/ranking-tn" .NoTokenData.Contents }} + {{- include "components/ranking-tn" .NoTokenData.Contents }}
- {{ else }} + {{- else }}
Filter All @@ -23,22 +23,22 @@ See more
- {{ include "components/small-tn" .Data.Following }} + {{- include "components/small-tn" .Data.Following }}

Recommended works

- {{ include "components/small-tn" .Data.Recommended }} + {{- include "components/small-tn" .Data.Recommended }}

- {{ range .Data.RecommendByTags }} + {{- range .Data.RecommendByTags }}

Recommended illustrations tagged #{{.Name}}

- {{ include "components/small-tn" .Artworks }} + {{- include "components/small-tn" .Artworks }}

- {{ end }} + {{- end }} - {{ end }} + {{- end }}
-{{ end }} +{{- end }} diff --git a/assets/views/layout/default.jet.html b/assets/views/layout/default.jet.html index 99b8f7a..e341180 100644 --- a/assets/views/layout/default.jet.html +++ b/assets/views/layout/default.jet.html @@ -3,13 +3,16 @@ - + - {{ title := "" }} {{ if isset(.Title) }} {{ title = .Title }} {{ else }} {{ - title = "PixivFE" }} {{ end }} - {{ title }} - PixivFE + {{ title := "PixivFE" }} + {{- if isset(.Title) -}} + {{ title = .Title + " - PixivFE" }} + {{ end -}} + {{ title }} + @@ -17,26 +20,28 @@ integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC"> + + + - - - {{ if isset(.MetaAuthor) }} + + {{- if isset(.MetaAuthor) }} - {{else}} + {{- else }} - {{end}} + {{- end -}} - {{ if isset(.MetaDescription) }} + {{- if isset(.MetaDescription) }} - {{end}} + {{- end -}} - {{ if isset(.MetaImage) }} + {{- if isset(.MetaImage) }} - {{ end }} + {{- end }}
- {{yield body()}} + {{- yield body() }}
{{CookieList["pixivfe-ArtworkPreview"]}} diff --git a/assets/views/newest.jet.html b/assets/views/newest.jet.html index c744322..0492fe9 100644 --- a/assets/views/newest.jet.html +++ b/assets/views/newest.jet.html @@ -1,5 +1,5 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}

Newest works from all users

@@ -9,4 +9,4 @@
{{ include "components/small-tn" .Items }}
-{{ end }} +{{- end }} diff --git a/assets/views/novel.jet.html b/assets/views/novel.jet.html index 6c2e4c7..f5b6692 100644 --- a/assets/views/novel.jet.html +++ b/assets/views/novel.jet.html @@ -1,5 +1,5 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}
@@ -14,48 +14,48 @@

{{ raw: .Novel.Description }}

- {{ if .Novel.AiType == 2 }} + {{- if .Novel.AiType == 2 }} AI-generated - {{ end }} - {{ if .Novel.IsOriginal }} + {{- end }} + {{- if .Novel.IsOriginal }} Original - {{ end }} - {{ if .Novel.Genre != "0" }} + {{- end }} + {{- if .Novel.Genre != "0" }} {{ novelGenre: .Novel.Genre }} - {{ end }} - {{ range .Novel.Tags.Tags }} {{ if isEmphasize(.Name) }} + {{- end }} + {{- range .Novel.Tags.Tags }} {{ if isEmphasize(.Name) }} {{ .Name }} - {{ else }} + {{- else }} #{{ .Name }} - {{ end }} {{ end }} + {{- end }} {{ end }}
Views - {{ .Novel.Views }} + {{- .Novel.Views }} Bookmarks - {{ .Novel.Bookmarks }} + {{- .Novel.Bookmarks }} Likes - {{ .Novel.Likes }} + {{- .Novel.Likes }} Date - {{ parseTime: .Novel.CreateDate }} + {{- parseTime: .Novel.CreateDate }}
@@ -64,7 +64,7 @@
- {{ url := "/settings/novelFontType" }} + {{- url := "/settings/novelFontType" }} Font size - {{ url := "/settings/novelViewMode" }} + {{- url := "/settings/novelViewMode" }}
- {{ range .NovelRelated }} - {{ include "components/novel-tn" . }} - {{ end }} + {{- range .NovelRelated }} + {{- include "components/novel-tn" . }} + {{- end }}
-{{ end }} +{{- end }} diff --git a/assets/views/novelDiscovery.jet.html b/assets/views/novelDiscovery.jet.html index f665bf2..a895646 100644 --- a/assets/views/novelDiscovery.jet.html +++ b/assets/views/novelDiscovery.jet.html @@ -1,5 +1,5 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}

Discover novels

@@ -8,19 +8,19 @@ Novels
- {{ url := "/discovery/novel?mode=" }} + {{- url := "/discovery/novel?mode=" }}
Filter
All Safe R-18
- {{ range .Novels }} - {{ include "components/novel-tn" . }} - {{ end }} + {{- range .Novels }} + {{- include "components/novel-tn" . }} + {{- end }}
-{{ end }} +{{- end }} diff --git a/assets/views/pixivision_article.jet.html b/assets/views/pixivision_article.jet.html index 05d324a..9f3f875 100644 --- a/assets/views/pixivision_article.jet.html +++ b/assets/views/pixivision_article.jet.html @@ -1,12 +1,12 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}

{{.Article.Title}}

- {{ range _, desc := .Article.Description }} + {{- range _, desc := .Article.Description }}

{{desc}}

- {{ end }} + {{- end }} - {{ range _, item := .Article.Items }} + {{- range _, item := .Article.Items }}
@@ -25,6 +25,6 @@
{{item.Title}}
- {{ end }} + {{- end }}
-{{ end }} +{{- end }} diff --git a/assets/views/pixivision_index.jet.html b/assets/views/pixivision_index.jet.html index b40acf3..77be013 100644 --- a/assets/views/pixivision_index.jet.html +++ b/assets/views/pixivision_index.jet.html @@ -1,21 +1,21 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}
- {{ range _, article := .Data }} + {{- range _, article := .Data }}
{{article.Title}}
- {{article.Title}} + {{-article.Title}}
- {{ range _, tag := article.Tags }} + {{- range _, tag := article.Tags }} #{{tag.Name}} - {{ end }} + {{- end }}
{{parseTimeCustomFormat(article.Date, "2006-01-02")}}
@@ -23,7 +23,7 @@
- {{ end }} + {{- end }}
-{{ end }} +{{- end }} diff --git a/assets/views/rank.jet.html b/assets/views/rank.jet.html index 0cb58e3..c1c98ee 100644 --- a/assets/views/rank.jet.html +++ b/assets/views/rank.jet.html @@ -1,25 +1,25 @@ -{{ extends "layout/default" }} -{{ import "components/switcher" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- import "components/switcher" }} +{{- block body() }}

{{ .Title }}

- {{ Mode := isset(.Queries.mode) ? .Queries.mode : "daily" }} - {{ Content := isset(.Queries.content) ? .Queries.content : "all" }} + {{- Mode := isset(.Queries.mode) ? .Queries.mode : "daily" }} + {{- Content := isset(.Queries.content) ? .Queries.content : "all" }} - {{ url := "" }} - {{ if Mode == "original" || Mode == "male" || Mode == "female" || Mode == ""}} + {{- url := "" }} + {{- if Mode == "original" || Mode == "male" || Mode == "female" || Mode == ""}} {{ url = "/ranking?date=" + .Data.CurrentDate + "&page=1&content=" }} - {{ else }} - {{ url = "/ranking?mode=" + Mode + "&date=" + .Data.CurrentDate + "&page=1&content=" }} - {{ end }} + {{- else }} + {{- url = "/ranking?mode=" + Mode + "&date=" + .Data.CurrentDate + "&page=1&content=" }} + {{- end }}
Content
- {{ path := slice("all", "illust", "manga", "ugoira") }} - {{ name := slice("Overall", "Illustrations", "Mangas", "Ugoira")}} - {{ yield Switcher(baseURL=url, paths=path, names=name, currentPath=Content)}} + {{- path := slice("all", "illust", "manga", "ugoira") }} + {{- name := slice("Overall", "Illustrations", "Mangas", "Ugoira")}} + {{- yield Switcher(baseURL=url, paths=path, names=name, currentPath=Content)}}

@@ -28,28 +28,28 @@ + "&page=1&mode=" }}
Modes
- {{ path := slice("daily", "weekly") }} - {{ name := slice("Daily", "Weekly")}} - {{ yield Switcher(baseURL=url, paths=path, names=name, currentPath=Mode)}} + {{- path := slice("daily", "weekly") }} + {{- name := slice("Daily", "Weekly")}} + {{- yield Switcher(baseURL=url, paths=path, names=name, currentPath=Mode)}} - {{ if Content != "ugoira" }} + {{- if Content != "ugoira" }} - {{ path := slice("monthly", "rookie") }} - {{ name := slice("Monthly", "Rookie")}} - {{ yield Switcher(baseURL=url, paths=path, names=name, currentPath=Mode)}} + {{- path := slice("monthly", "rookie") }} + {{- name := slice("Monthly", "Rookie")}} + {{- yield Switcher(baseURL=url, paths=path, names=name, currentPath=Mode)}} - {{ end }} + {{- end }} - {{ path := slice("daily_r18", "weekly_r18") }} - {{ name := slice("Daily (R-18)", "Weekly (R-18)")}} - {{ yield Switcher(baseURL=url, paths=path, names=name, currentPath=Mode)}} + {{- path := slice("daily_r18", "weekly_r18") }} + {{- name := slice("Daily (R-18)", "Weekly (R-18)")}} + {{- yield Switcher(baseURL=url, paths=path, names=name, currentPath=Mode)}}
- {{ if Content == "all" }} - {{ path := slice("original", "male", "female") }} - {{ name := slice("Original", "Popular among males", "Popular among females")}} - {{ yield Switcher(baseURL=url, paths=path, names=name, currentPath=Mode)}} - {{ end }} + {{- if Content == "all" }} + {{- path := slice("original", "male", "female") }} + {{- name := slice("Original", "Popular among males", "Popular among females")}} + {{- yield Switcher(baseURL=url, paths=path, names=name, currentPath=Mode)}} + {{- end }}

@@ -57,15 +57,15 @@ {{ url := "/ranking?content=" + Content + "&mode=" + Mode + "&page=1" }}
Date (current: {{ .Data.CurrentDate }})
- {{ if .Data.PrevDate != "false" }} + {{- if .Data.PrevDate != "false" }} Yesterday - {{ end }} {{ if .Data.NextDate != "false" }} + {{- end }} {{ if .Data.NextDate != "false" }} Next day - {{ end }} + {{- end }} Latest Ranking calendar @@ -73,7 +73,7 @@
- {{ include "components/ranking-tn" .Data.Contents }} + {{- include "components/ranking-tn" .Data.Contents }}
-{{ end }} +{{- end }} diff --git a/assets/views/rankingCalendar.jet.html b/assets/views/rankingCalendar.jet.html index 8f9b5f6..83ab2a9 100644 --- a/assets/views/rankingCalendar.jet.html +++ b/assets/views/rankingCalendar.jet.html @@ -1,9 +1,9 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}

Ranking calendar ({{ .ThisMonth.MonthLiteral }} {{ .Year }})

- {{ url := "/rankingCalendar?date=" + .ThisMonth.Link + "&mode=" }} + {{- url := "/rankingCalendar?date=" + .ThisMonth.Link + "&mode=" }} Modes Daily Weekly @@ -49,13 +49,13 @@
Sat
- {{ raw: .Render }} + {{- raw: .Render }}
-{{ end }} +{{- end }} diff --git a/assets/views/settings.jet.html b/assets/views/settings.jet.html index 1fe1fda..6c8cff2 100644 --- a/assets/views/settings.jet.html +++ b/assets/views/settings.jet.html @@ -1,5 +1,5 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}

Settings

@@ -58,20 +58,20 @@ No (use built-in proxy) - {{ range .WorkingProxyList }} + {{- range .WorkingProxyList }} - {{ end }} + {{- end }}

See all built-in proxies - {{ range .ProxyList }} + {{- range .ProxyList }} - {{ end }} + {{- end }}
@@ -158,7 +158,7 @@ Please note that some cookies here such as ShowArtR18, ShowArtR18G, and ShowArtAI are for features still under development.
- {{ range k, v := CookieList }} + {{- range k, v := CookieList }}

{{k}}

@@ -168,7 +168,7 @@
- {{ end }} + {{- end }}

Raw settings

@@ -187,4 +187,4 @@
-{{ end }} +{{- end }} diff --git a/assets/views/tag.jet.html b/assets/views/tag.jet.html index 3205f35..ffe3c9f 100644 --- a/assets/views/tag.jet.html +++ b/assets/views/tag.jet.html @@ -1,14 +1,14 @@ -{{ extends "layout/default" }} -{{ import "components/switcher" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- import "components/switcher" }} +{{- block body() }}
- {{ if .Tag.Metadata.ID }} + {{- if .Tag.Metadata.ID }} {{ .Tag.Name }} - {{ end }} + {{- end }}
#{{ .Tag.Name }} @@ -22,59 +22,59 @@
- {{ range .Data.RelatedTags }} + {{- range .Data.RelatedTags }}
#{{ . }}
 - {{ end }} + {{- end }}
- {{ Category := isset(.Queries.category) ? .Queries.category : "artworks" }} - {{ Order := isset(.Queries.order) ? .Queries.order : "date_d" }} - {{ Mode := isset(.Queries.mode) ? .Queries.mode : "safe" }} - {{ Ratio := isset(.Queries.ratio) ? .Queries.ratio : "" }} - {{ SearchMode := isset(.Queries.smode) ? .Queries.smode : "" }} + {{- Category := isset(.Queries.category) ? .Queries.category : "artworks" }} + {{- Order := isset(.Queries.order) ? .Queries.order : "date_d" }} + {{- Mode := isset(.Queries.mode) ? .Queries.mode : "safe" }} + {{- Ratio := isset(.Queries.ratio) ? .Queries.ratio : "" }} + {{- SearchMode := isset(.Queries.smode) ? .Queries.smode : "" }}
Category
- {{ URL := unfinishedQuery(.QueriesC, "category") }} - {{ path := slice("artworks", "illustrations", "manga")}} - {{ name := slice("Artworks", "Illustrations", "Manga")}} - {{ yield Switcher(baseURL=URL, paths=path, names=name, currentPath=Category) }} + {{- URL := unfinishedQuery(.QueriesC, "category") }} + {{- path := slice("artworks", "illustrations", "manga")}} + {{- name := slice("Artworks", "Illustrations", "Manga")}} + {{- yield Switcher(baseURL=URL, paths=path, names=name, currentPath=Category) }}
Order
- {{ URL := unfinishedQuery(.QueriesC, "order") }} - {{ path := slice("date_d", "date")}} - {{ name := slice("Newest", "Oldest")}} - {{ yield Switcher(baseURL=URL, paths=path, names=name, currentPath=Order) }} + {{- URL := unfinishedQuery(.QueriesC, "order") }} + {{- path := slice("date_d", "date")}} + {{- name := slice("Newest", "Oldest")}} + {{- yield Switcher(baseURL=URL, paths=path, names=name, currentPath=Order) }}
Filter
- {{ URL := unfinishedQuery(.QueriesC, "mode") }} - {{ path := slice("all", "safe", "r18")}} - {{ name := slice("All", "Safe", "R-18")}} - {{ yield Switcher(baseURL=URL, paths=path, names=name, currentPath=Mode) }} + {{- URL := unfinishedQuery(.QueriesC, "mode") }} + {{- path := slice("all", "safe", "r18")}} + {{- name := slice("All", "Safe", "R-18")}} + {{- yield Switcher(baseURL=URL, paths=path, names=name, currentPath=Mode) }}
Ratio
- {{ URL := unfinishedQuery(.QueriesC, "ratio") }} - {{ path := slice("", "-0.5", "0", "0.5")}} - {{ name := slice("All", "Portrait", "Square", "Landscape")}} - {{ yield Switcher(baseURL=URL, paths=path, names=name, currentPath=Ratio) }} + {{- URL := unfinishedQuery(.QueriesC, "ratio") }} + {{- path := slice("", "-0.5", "0", "0.5")}} + {{- name := slice("All", "Portrait", "Square", "Landscape")}} + {{- yield Switcher(baseURL=URL, paths=path, names=name, currentPath=Ratio) }}
Search mode
- {{ URL := unfinishedQuery(.QueriesC, "smode") }} - {{ path := slice("", "s_tag_full", "s_tag", "s_tc")}} - {{ name := slice("None", "Exact (tags)", "Partial (tags)", "Title/Caption")}} - {{ yield Switcher(baseURL=URL, paths=path, names=name, currentPath=SearchMode) }} + {{- URL := unfinishedQuery(.QueriesC, "smode") }} + {{- path := slice("", "s_tag_full", "s_tag", "s_tc")}} + {{- name := slice("None", "Exact (tags)", "Partial (tags)", "Title/Caption")}} + {{- yield Switcher(baseURL=URL, paths=path, names=name, currentPath=SearchMode) }}

Advanced settings

 - {{ URL := unfinishedQuery(.QueriesC, "") }} + {{- URL := unfinishedQuery(.QueriesC, "") }}
@@ -93,29 +93,29 @@
- {{ if .Data.Popular.Recent }} + {{- if .Data.Popular.Recent }}

Popular artworks

Recent

- {{ include "components/small-tn" .Data.Popular.Recent }} + {{- include "components/small-tn" .Data.Popular.Recent }}

All Time

- {{ include "components/small-tn" .Data.Popular.Permanent }} + {{- include "components/small-tn" .Data.Popular.Permanent }}
- {{ end }} + {{- end }} {* Switchers here *}

Works

- {{ include "components/small-tn" .Data.Artworks.Artworks }} + {{- include "components/small-tn" .Data.Artworks.Artworks }}
-{{ end }} +{{- end }} diff --git a/assets/views/temp.jet.html b/assets/views/temp.jet.html index 325d57b..b44bbf7 100644 --- a/assets/views/temp.jet.html +++ b/assets/views/temp.jet.html @@ -1,7 +1,7 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }} - {{ if Token }} + {{- if Token }}
Filter All @@ -12,17 +12,17 @@ See more
- {{ include "components/small-tn" .Artworks.Following }} + {{- include "components/small-tn" .Artworks.Following }}

Recently completed commissions

- {{ include "components/small-tn" .Artworks.Commissions }} + {{- include "components/small-tn" .Artworks.Commissions }}

Recommended works

- {{ include "components/small-tn" .Artworks.Recommended }} + {{- include "components/small-tn" .Artworks.Recommended }}

@@ -31,17 +31,17 @@ See more
- {{ range rank := .Artworks.Rankings }} + {{- range rank := .Artworks.Rankings }}
{{ rank + 1 }}
- {{ if .Pages > 1 }} + {{- if .Pages > 1 }}
⧉  2
- {{ end }} + {{- end }}
{{ .Title }} @@ -61,13 +61,13 @@ >
- {{ end }} + {{- end }}

{*

Pixivision

- {{ range .Artworks.Pixivision }} + {{- range .Artworks.Pixivision }} {{ .Title }}
- {{ end }} + {{- end }}

*}

Works by recommended users

- {{ include "components/small-tn" .Artworks.Users }} + {{- include "components/small-tn" .Artworks.Users }}

- {{ range .Artworks.RecommendByTags }} + {{- range .Artworks.RecommendByTags }}

Recommended illustrations tagged #{{.Name}}

- {{ include "components/small-tn" .Artworks }} + {{- include "components/small-tn" .Artworks }}

- {{ end }} + {{- end }}

Welcome!

Please check out the sidebar for more features. There used to be a small ranking container here...

{*

Newest works

- {{ include "components/small-tn" .Artworks.Newest }} + {{- include "components/small-tn" .Artworks.Newest }}
- {{ else }} + {{- else }}

Login to access more features!

Enjoying this frontend so far? I need your opinions and ideas to improve @@ -112,17 +112,17 @@ See more

- {{ range rank := .Artworks.Rankings }} + {{- range rank := .Artworks.Rankings }}
{{ rank + 1 }}
- {{ if .Pages > 1 }} + {{- if .Pages > 1 }}
⧉  2
- {{ end }} + {{- end }}
{{ .Title }} @@ -142,13 +142,13 @@ >
- {{ end }} + {{- end }}
*} {*

Pixivision

- {{ range .Artworks.Pixivision }} + {{- range .Artworks.Pixivision }} {{ .Title }}
- {{ end }} + {{- end }}
*} - {{ end }} -{{ end }} + {{- end }} +{{- end }} diff --git a/assets/views/unauthorized.jet.html b/assets/views/unauthorized.jet.html index 7a16648..58ef5e3 100644 --- a/assets/views/unauthorized.jet.html +++ b/assets/views/unauthorized.jet.html @@ -1,8 +1,8 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }}

Unauthorized

You need to log in to use this feature.

-{{ end }} +{{- end }} diff --git a/assets/views/user.jet.html b/assets/views/user.jet.html index 3a133d8..24692d3 100644 --- a/assets/views/user.jet.html +++ b/assets/views/user.jet.html @@ -1,12 +1,12 @@ -{{ extends "layout/default" }} -{{ block body() }} -{{ if ! .User.BackgroundImage }} +{{- extends "layout/default" }} +{{- block body() }} +{{- if ! .User.BackgroundImage }}
-{{ else }} +{{- else }}
{{ .User.Name }}
-{{ end }} +{{- end }}
Avatar Of User @@ -19,33 +19,33 @@
{{ .User.Following }} Following | {{ .User.MyPixiv }} MyPixiv
- {{ if .User.Webpage }} + {{- if .User.Webpage }} Webpage - {{ end }} {{ range index, item := .User.Social }} + {{- end }} {{ range index, item := .User.Social }} {{ index }} - {{ end }} + {{- end }}

{{ raw: parsePixivRedirect(.User.Comment) }}

Frequently Used Tags
- {{ range .User.FrequentTags }} + {{- range .User.FrequentTags }} #{{ .Name }} {*
- {{ if ! .TranslatedName }} + {{- if ! .TranslatedName }}
{{ .Name }}
- {{ else }} + {{- else }}
{{ .TranslatedName }}
#{{ .Name }}
- {{ end }} + {{- end }}
*} - {{ end }} + {{- end }}
Category
@@ -56,32 +56,32 @@ Bookmarks
- {{ if .Category != "novels" }} + {{- if .Category != "novels" }}

Illustrations and Mangas

- {{ combinedUrl := "/artworks-multi/" + joinArtworkIds(.User.Artworks) }} + {{- combinedUrl := "/artworks-multi/" + joinArtworkIds(.User.Artworks) }}
View all art on this page
- {{ include "components/small-tn" .User.Artworks }} + {{- include "components/small-tn" .User.Artworks }}
- {{ else }} + {{- else }}

Novels

- {{ range .User.Novels }} - {{ include "components/novel-tn" . }} - {{ end }} + {{- range .User.Novels }} + {{- include "components/novel-tn" . }} + {{- end }}
- {{ end }} + {{- end }}
-{{ end }} +{{- end }} diff --git a/assets/views/userAtom.jet.html b/assets/views/userAtom.jet.html index fcd8f28..8969108 100644 --- a/assets/views/userAtom.jet.html +++ b/assets/views/userAtom.jet.html @@ -1,5 +1,5 @@ -{{ extends "layout/default" }} -{{ block body() }} +{{- extends "layout/default" }} +{{- block body() }} {* *} {{ BaseURL }}/users/{{ .User.ID }}/{{ .Category }} @@ -7,12 +7,12 @@ - {{ if .Page - 1 >= 1 }} + {{- if .Page - 1 >= 1 }} - {{ end }} - {{ if .Page + 1 <= .PageLimit }} + {{- end }} + {{- if .Page + 1 <= .PageLimit }} - {{ end }} + {{- end }} {{ .Updated }} {{ .Title }} @@ -20,7 +20,7 @@ {{ BaseURL }}/users/{{ .User.ID }}/ - {{ range .User.Artworks }} + {{- range .User.Artworks }} {{ BaseURL }}/artworks/{{ .ID }}/ @@ -41,5 +41,5 @@ - {{ end }} + {{- end }} {{end}}