From e7e5ab6c009dc064f277398f70fc8f9280869b03 Mon Sep 17 00:00:00 2001 From: iacore Date: Sat, 24 Aug 2024 10:15:23 +0000 Subject: [PATCH] fix all templates to make test pass --- assets/views/about.jet.html | 14 ++--- assets/views/artwork.jet.html | 6 +- assets/views/artworkMulti.jet.html | 9 +-- assets/views/discovery.jet.html | 18 +++--- assets/views/error.jet.html | 8 +-- assets/views/following.jet.html | 14 ++--- assets/views/index.jet.html | 6 +- assets/views/newest.jet.html | 8 +-- assets/views/novel.jet.html | 46 +++++++-------- assets/views/novelDiscovery.jet.html | 8 +-- assets/views/pixivision_article.jet.html | 12 ++-- assets/views/pixivision_index.jet.html | 8 +-- assets/views/rank.jet.html | 36 ++++++------ assets/views/rankingCalendar.jet.html | 22 +++---- assets/views/settings.jet.html | 10 ++-- assets/views/tag.jet.html | 74 ++++++++++++------------ assets/views/temp.jet.html | 26 ++++----- assets/views/unauthorized.jet.html | 6 +- assets/views/user.jet.html | 52 ++++++++--------- assets/views/userAtom.jet.html | 30 +++++----- routes/index.go | 4 +- routes/render_test.go | 22 +++++-- routes/render_types.go | 2 +- 23 files changed, 227 insertions(+), 214 deletions(-) diff --git a/assets/views/about.jet.html b/assets/views/about.jet.html index 21bf767..204b285 100644 --- a/assets/views/about.jet.html +++ b/assets/views/about.jet.html @@ -1,5 +1,5 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }}

About PixivFE

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

@@ -7,22 +7,22 @@

Server information

-{{end}} +{{ end }} diff --git a/assets/views/artwork.jet.html b/assets/views/artwork.jet.html index ffb1e09..336eb35 100644 --- a/assets/views/artwork.jet.html +++ b/assets/views/artwork.jet.html @@ -1,5 +1,5 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }}
{{ include "components/artwork" .Illust }}
@@ -54,4 +54,4 @@ {{ include "components/small-tn" .Illust.RelatedWorks }}
-{{end}} +{{ end }} diff --git a/assets/views/artworkMulti.jet.html b/assets/views/artworkMulti.jet.html index 02cf6f7..318ef19 100644 --- a/assets/views/artworkMulti.jet.html +++ b/assets/views/artworkMulti.jet.html @@ -1,7 +1,8 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} -{{ range Artworks }} +{{ extends "layout/default" }} +{{ block body() }} +{{ range .Artworks }}
{{ include "components/artwork" . }}
-{{ end }}{{end}} +{{ end }} +{{ end }} diff --git a/assets/views/discovery.jet.html b/assets/views/discovery.jet.html index 0f84244..6f01513 100644 --- a/assets/views/discovery.jet.html +++ b/assets/views/discovery.jet.html @@ -1,23 +1,23 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }}

Discover artworks

Type
- Artworks - Novels + .Artworks + .Novels
Filter
- All - Safe - R-18 + All + Safe + 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 bb9a28b..fac35ec 100644 --- a/assets/views/error.jet.html +++ b/assets/views/error.jet.html @@ -1,13 +1,13 @@ -{{extends "layout/default.jet.html"}} -{{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 2a87651..970289c 100644 --- a/assets/views/following.jet.html +++ b/assets/views/following.jet.html @@ -1,5 +1,5 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }}

Newest works from people you follow

@@ -8,12 +8,12 @@ Safe R-18
-
{{ include "components/small-tn" Artworks }}
+
{{ include "components/small-tn" .Artworks }}
-{{end}} +{{ end }} diff --git a/assets/views/index.jet.html b/assets/views/index.jet.html index 8c6ccd8..beac34c 100644 --- a/assets/views/index.jet.html +++ b/assets/views/index.jet.html @@ -1,5 +1,5 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }}
{{ if !.LoggedIn }} @@ -41,4 +41,4 @@ {{ end }}
-{{end}} +{{ end }} diff --git a/assets/views/newest.jet.html b/assets/views/newest.jet.html index 67414b9..c744322 100644 --- a/assets/views/newest.jet.html +++ b/assets/views/newest.jet.html @@ -1,5 +1,5 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }}

Newest works from all users

@@ -7,6 +7,6 @@ Safe R-18
-
{{ include "components/small-tn" Items }}
+
{{ include "components/small-tn" .Items }}
-{{end}} +{{ end }} diff --git a/assets/views/novel.jet.html b/assets/views/novel.jet.html index e50fc6a..a3b6b25 100644 --- a/assets/views/novel.jet.html +++ b/assets/views/novel.jet.html @@ -1,35 +1,35 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }}
- - {{ Novel.Title }} + + {{ .Novel.Title }}
-
{{ Novel.Title }}
- {{ Novel.WordCount }} word(s) {{ floor: Novel.ReadingTime / 60 }} +
{{ .Novel.Title }}
+ {{ .Novel.WordCount }} word(s) {{ floor: .Novel.ReadingTime / 60 }} min -

{{ raw: Novel.Description }}

+

{{ raw: .Novel.Description }}

- {{ if Novel.AiType == 2 }} + {{ if .Novel.AiType == 2 }} AI-generated {{ end }} - {{ if Novel.IsOriginal }} + {{ if .Novel.IsOriginal }} Original {{ end }} - {{ if Novel.Genre != "0" }} + {{ if .Novel.Genre != "0" }} - {{ novelGenre: Novel.Genre }} + {{ novelGenre: .Novel.Genre }} {{ end }} - {{ range Novel.Tags.Tags }} {{ if isEmphasize(.Name) }} + {{ range .Novel.Tags.Tags }} {{ if isEmphasize(.Name) }} {{ .Name }} @@ -43,19 +43,19 @@
Views - {{ Novel.Views }} + {{ .Novel.Views }} Bookmarks - {{ Novel.Bookmarks }} + {{ .Novel.Bookmarks }} Likes - {{ Novel.Likes }} + {{ .Novel.Likes }} Date - {{ parseTime: Novel.CreateDate }} + {{ parseTime: .Novel.CreateDate }}
@@ -108,25 +108,25 @@
-
+
- {{ raw: renderNovel(Novel.Content) }} + {{ raw: renderNovel(.Novel.Content) }}
- {{ User.Name }} + {{ .User.Name }}
- {{ User.Name }} + {{ .User.Name }}
- {{ range NovelRelated }} + {{ range .NovelRelated }} {{ include "components/novel-tn" . }} {{ end }}
-{{end}} +{{ end }} diff --git a/assets/views/novelDiscovery.jet.html b/assets/views/novelDiscovery.jet.html index d2a233b..f665bf2 100644 --- a/assets/views/novelDiscovery.jet.html +++ b/assets/views/novelDiscovery.jet.html @@ -1,5 +1,5 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }}

Discover novels

@@ -15,7 +15,7 @@ R-18
- {{ range Novels }} + {{ range .Novels }} {{ include "components/novel-tn" . }} {{ end }}
@@ -23,4 +23,4 @@ Reload
-{{end}} +{{ end }} diff --git a/assets/views/pixivision_article.jet.html b/assets/views/pixivision_article.jet.html index f7f1b1b..05d324a 100644 --- a/assets/views/pixivision_article.jet.html +++ b/assets/views/pixivision_article.jet.html @@ -1,12 +1,12 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }}
-

{{Article.Title}}

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

{{.Article.Title}}

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

{{desc}}

{{ end }} - {{ range _, item := Article.Items }} + {{ range _, item := .Article.Items }}
@@ -27,4 +27,4 @@
{{ end }}
-{{end}} +{{ end }} diff --git a/assets/views/pixivision_index.jet.html b/assets/views/pixivision_index.jet.html index dc23456..b40acf3 100644 --- a/assets/views/pixivision_index.jet.html +++ b/assets/views/pixivision_index.jet.html @@ -1,8 +1,8 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }}
- {{ range _, article := Data }} + {{ range _, article := .Data }}
{{article.Title}} @@ -26,4 +26,4 @@ {{ end }}
-{{end}} +{{ end }} diff --git a/assets/views/rank.jet.html b/assets/views/rank.jet.html index 2deeb1d..0cb58e3 100644 --- a/assets/views/rank.jet.html +++ b/assets/views/rank.jet.html @@ -1,20 +1,20 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} {{ import "components/switcher" }} +{{ block body() }}
-

{{ Title }}

+

{{ .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 = "/ranking?date=" + Data.CurrentDate + + {{ url = "/ranking?date=" + .Data.CurrentDate + "&page=1&content=" }} {{ else }} - {{ url = "/ranking?mode=" + Mode + "&date=" + Data.CurrentDate + "&page=1&content=" }} + {{ url = "/ranking?mode=" + Mode + "&date=" + .Data.CurrentDate + "&page=1&content=" }} {{ end }}
Content
{{ path := slice("all", "illust", "manga", "ugoira") }} @@ -24,7 +24,7 @@
- {{ url := "/ranking?content=" + Content +"&date=" + Data.CurrentDate + {{ url := "/ranking?content=" + Content +"&date=" + .Data.CurrentDate + "&page=1&mode=" }}
Modes
@@ -56,13 +56,13 @@
{{ url := "/ranking?content=" + Content + "&mode=" + Mode + "&page=1" }} -
Date (current: {{ Data.CurrentDate }})
- {{ if Data.PrevDate != "false" }} - Date (current: {{ .Data.CurrentDate }})
+ {{ if .Data.PrevDate != "false" }} + Yesterday - {{ end }} {{ if Data.NextDate != "false" }} - Next day {{ end }} @@ -73,15 +73,15 @@
- {{ 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 df87281..8f9b5f6 100644 --- a/assets/views/rankingCalendar.jet.html +++ b/assets/views/rankingCalendar.jet.html @@ -1,9 +1,9 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }}
-

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

+

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

- {{ url := "/rankingCalendar?date=" + ThisMonth.Link + "&mode=" }} + {{ url := "/rankingCalendar?date=" + .ThisMonth.Link + "&mode=" }} Modes Daily Weekly @@ -24,12 +24,12 @@
- + - + @@ -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 a9bdf92..56125ed 100644 --- a/assets/views/settings.jet.html +++ b/assets/views/settings.jet.html @@ -1,5 +1,5 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }}

Settings

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

See all built-in proxies - {{ range ProxyList }} + {{ range .ProxyList }}
-{{end}} +{{ end }} diff --git a/assets/views/tag.jet.html b/assets/views/tag.jet.html index baa077f..3205f35 100644 --- a/assets/views/tag.jet.html +++ b/assets/views/tag.jet.html @@ -1,28 +1,28 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} {{ import "components/switcher" }} +{{ block body() }}
- {{ if Tag.Metadata.ID }} - - {{ Tag.Name }} + {{ if .Tag.Metadata.ID }} + + {{ .Tag.Name }} {{ end }}
- #{{ Tag.Name }} - {{ Tag.Metadata.Name }} + #{{ .Tag.Name }} + {{ .Tag.Metadata.Name }}

- {{ Data.Artworks.Total }} works + {{ .Data.Artworks.Total }} works -

{{ Tag.Metadata.Detail }}

+

{{ .Tag.Metadata.Detail }}

- {{ range Data.RelatedTags }} + {{ range .Data.RelatedTags }}
#{{ . }}
@@ -30,42 +30,42 @@ {{ 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") }} + {{ 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") }} + {{ 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") }} + {{ 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") }} + {{ 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") }} + {{ 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) }} @@ -74,48 +74,48 @@

Advanced settings

 - {{ URL := unfinishedQuery(QueriesC, "") }} -
+ {{ URL := unfinishedQuery(.QueriesC, "") }} + - + - + - + - + - + - + - +
- {{ 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 }} {* 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 031030a..325d57b 100644 --- a/assets/views/temp.jet.html +++ b/assets/views/temp.jet.html @@ -1,5 +1,5 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }} {{ if Token }}
@@ -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,7 +31,7 @@ See more
- {{ range rank := Artworks.Rankings }} + {{ range rank := .Artworks.Rankings }}
{{ rank + 1 }}
@@ -67,7 +67,7 @@ {*

Pixivision

- {{ range Artworks.Pixivision }} + {{ range .Artworks.Pixivision }} 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 }} @@ -98,7 +98,7 @@

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 }}

Login to access more features!

@@ -112,7 +112,7 @@ See more
- {{ range rank := Artworks.Rankings }} + {{ range rank := .Artworks.Rankings }}
{{ rank + 1 }}
@@ -148,7 +148,7 @@ {*

Pixivision

- {{ range Artworks.Pixivision }} + {{ range .Artworks.Pixivision }} *} {{ end }} -{{end}} +{{ end }} diff --git a/assets/views/unauthorized.jet.html b/assets/views/unauthorized.jet.html index 041dd15..7a16648 100644 --- a/assets/views/unauthorized.jet.html +++ b/assets/views/unauthorized.jet.html @@ -1,8 +1,8 @@ -{{extends "layout/default.jet.html"}} -{{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 6246139..3a133d8 100644 --- a/assets/views/user.jet.html +++ b/assets/views/user.jet.html @@ -1,27 +1,27 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} -{{ if ! User.BackgroundImage }} +{{ extends "layout/default" }} +{{ block body() }} +{{ if ! .User.BackgroundImage }}
{{ else }}
- {{ User.Name }} + {{ .User.Name }}
{{ end }}
- Avatar Of User + Avatar Of User
-

{{ User.Name }}

+

{{ .User.Name }}

- {{ User.Following }} Following | {{ User.MyPixiv }} MyPixiv + {{ .User.Following }} Following | {{ .User.MyPixiv }} MyPixiv
- {{ if User.Webpage }} - Webpage - {{ end }} {{ range index, item := User.Social }} + {{ if .User.Webpage }} + Webpage + {{ end }} {{ range index, item := .User.Social }} {{ index }} @@ -29,11 +29,11 @@ {{ end }}
-

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

+

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

Frequently Used Tags
- {{ range User.FrequentTags }} + {{ range .User.FrequentTags }} #{{ .Name }} {*
@@ -49,21 +49,21 @@
Category
- All - Illustrations - Mangas - Novels - Bookmarks + All + Illustrations + Mangas + Novels + 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 }} @@ -71,17 +71,17 @@

Novels

- {{ range User.Novels }} + {{ range .User.Novels }} {{ include "components/novel-tn" . }} {{ end }}
{{ end }}
-{{end}} +{{ end }} diff --git a/assets/views/userAtom.jet.html b/assets/views/userAtom.jet.html index 041e030..fcd8f28 100644 --- a/assets/views/userAtom.jet.html +++ b/assets/views/userAtom.jet.html @@ -1,26 +1,26 @@ -{{extends "layout/default.jet.html"}} -{{block body()}} +{{ extends "layout/default" }} +{{ block body() }} {* *} - {{ BaseURL }}/users/{{ User.ID }}/{{ Category }} - + {{ BaseURL }}/users/{{ .User.ID }}/{{ .Category }} + - - - {{ if Page - 1 >= 1 }} - + + + {{ if .Page - 1 >= 1 }} + {{ end }} - {{ if Page + 1 <= PageLimit }} - + {{ if .Page + 1 <= .PageLimit }} + {{ end }} - {{ Updated }} - {{ Title }} + {{ .Updated }} + {{ .Title }} - {{ User.Name }} - {{ BaseURL }}/users/{{ User.ID }}/ + {{ .User.Name }} + {{ BaseURL }}/users/{{ .User.ID }}/ - {{ range User.Artworks }} + {{ range .User.Artworks }} {{ BaseURL }}/artworks/{{ .ID }}/ diff --git a/routes/index.go b/routes/index.go index c6780b2..961c682 100644 --- a/routes/index.go +++ b/routes/index.go @@ -21,7 +21,7 @@ func IndexPage(c *fiber.Ctx) error { return Render(c, Data_index{ Title: "Landing", Data: *works, - IsLoggedIn: true, + LoggedIn: true, }) } @@ -33,7 +33,7 @@ func IndexPage(c *fiber.Ctx) error { return Render(c, Data_index{ Title: "Landing", NoTokenData: works, - IsLoggedIn: false, + LoggedIn: false, }) } diff --git a/routes/render_test.go b/routes/render_test.go index 2d27124..eafa757 100644 --- a/routes/render_test.go +++ b/routes/render_test.go @@ -3,6 +3,7 @@ package routes import ( "io" "log" + "os" "reflect" "strings" "testing" @@ -12,28 +13,36 @@ import ( ) func TestTemplates(t *testing.T) { - autoTest[Data_error](t) + { + data := fakeData[Data_error]() + data.Error = io.EOF + manualTest(t, data) + } autoTest[Data_about](t) autoTest[Data_artwork](t) autoTest[Data_artworkMulti](t) autoTest[Data_discovery](t) - autoTest[Data_novelDiscovery](t) + autoTest[Data_following](t) autoTest[Data_index](t) autoTest[Data_newest](t) autoTest[Data_novel](t) - autoTest[Data_unauthorized](t) - autoTest[Data_following](t) - autoTest[Data_pixivision_index](t) + autoTest[Data_novelDiscovery](t) autoTest[Data_pixivision_article](t) + autoTest[Data_pixivision_index](t) autoTest[Data_rank](t) autoTest[Data_rankingCalendar](t) autoTest[Data_settings](t) autoTest[Data_tag](t) + autoTest[Data_unauthorized](t) autoTest[Data_user](t) autoTest[Data_userAtom](t) } func TestMain(m *testing.M) { + err := os.Chdir("..") + if err != nil { + panic(err) + } InitTemplatingEngine(false) m.Run() @@ -55,6 +64,9 @@ func manualTest[T any](t *testing.T, data T) { if !found { log.Panicf("struct name does not start with 'Data_': %s", route_name) } + + // log.Println("Testing " + route_name) + variables := jet.VarMap{} for k, v := range map[string]any{ diff --git a/routes/render_types.go b/routes/render_types.go index 4ce9e91..2f3b7cb 100644 --- a/routes/render_types.go +++ b/routes/render_types.go @@ -47,7 +47,7 @@ type Data_userAtom struct { } type Data_index struct { Title string - IsLoggedIn bool + LoggedIn bool Data core.LandingArtworks NoTokenData core.Ranking }