From b9b164eb89db63ecd6f471c43a161f996a188db7 Mon Sep 17 00:00:00 2001 From: Scott Date: Tue, 10 Apr 2018 14:17:10 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=A8=20Started=20main=20quote=20with?= =?UTF-8?q?=20bool=20types=20for=20EditForm.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/character/character.go | 9 ++++++++- pages/character/character.pixy | 6 ++++-- pages/character/character.scarlet | 3 ++- utils/editform/editform.go | 1 + 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pages/character/character.go b/pages/character/character.go index a1f426aa..b0adb041 100644 --- a/pages/character/character.go +++ b/pages/character/character.go @@ -37,7 +37,14 @@ func Get(ctx *aero.Context) string { }) // Quotes + var mainQuote *arn.Quote quotes := character.Quotes() + for i, quote := range quotes { + if quote.IsMainQuote { + mainQuote = quote + quotes = append(quotes[:i], quotes[i+1:]...) + } + } arn.SortQuotesPopularFirst(quotes) // Set OpenGraph attributes @@ -65,5 +72,5 @@ func Get(ctx *aero.Context) string { }, } - return ctx.HTML(components.CharacterDetails(character, characterAnime, quotes, user)) + return ctx.HTML(components.CharacterDetails(character, characterAnime, quotes, mainQuote, user)) } diff --git a/pages/character/character.pixy b/pages/character/character.pixy index b6cddc43..60103002 100644 --- a/pages/character/character.pixy +++ b/pages/character/character.pixy @@ -1,4 +1,4 @@ -component CharacterDetails(character *arn.Character, characterAnime []*arn.Anime, quotes []*arn.Quote, user *arn.User) +component CharacterDetails(character *arn.Character, characterAnime []*arn.Anime, quotes []*arn.Quote, mainQuote *arn.Quote, user *arn.User) .character-page .character-left-column .character-header @@ -13,7 +13,9 @@ component CharacterDetails(character *arn.Character, characterAnime []*arn.Anime Japanese(character.Name.Japanese) else Japanese("日本語の名前無し") - + if mainQuote != nil + .character-main-quote + Quote(mainQuote) .character-description.mountable!= markdown.Render(character.Description) h3.mountable Anime diff --git a/pages/character/character.scarlet b/pages/character/character.scarlet index 73de7810..5fb415da 100644 --- a/pages/character/character.scarlet +++ b/pages/character/character.scarlet @@ -45,7 +45,8 @@ .character-quotes vertical -.character-quote +.character-quote, +.character-main-quote footer, .quote-footer display none diff --git a/utils/editform/editform.go b/utils/editform/editform.go index 82f8f6da..9342d4aa 100644 --- a/utils/editform/editform.go +++ b/utils/editform/editform.go @@ -201,6 +201,7 @@ func RenderField(b *bytes.Buffer, v *reflect.Value, field reflect.StructField, i } // TODO: Render bool type + b.WriteString(components.InputBool(idPrefix+field.Name, fieldValue.Bool(), field.Name, field.Tag.Get("tooltip"))) return } From 3118ec3dfe21c6bc4dbe87f6a60cde119dd81d22 Mon Sep 17 00:00:00 2001 From: Scott Date: Tue, 10 Apr 2018 20:15:57 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=A8=20Removed=20unnecessary=20css?= =?UTF-8?q?=20class?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/character/character.pixy | 2 +- pages/character/character.scarlet | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pages/character/character.pixy b/pages/character/character.pixy index 60103002..93ebd36c 100644 --- a/pages/character/character.pixy +++ b/pages/character/character.pixy @@ -14,7 +14,7 @@ component CharacterDetails(character *arn.Character, characterAnime []*arn.Anime else Japanese("日本語の名前無し") if mainQuote != nil - .character-main-quote + .character-quote Quote(mainQuote) .character-description.mountable!= markdown.Render(character.Description) diff --git a/pages/character/character.scarlet b/pages/character/character.scarlet index 5fb415da..73de7810 100644 --- a/pages/character/character.scarlet +++ b/pages/character/character.scarlet @@ -45,8 +45,7 @@ .character-quotes vertical -.character-quote, -.character-main-quote +.character-quote footer, .quote-footer display none