Quotes cleanup

This commit is contained in:
2018-02-25 17:06:47 +01:00
parent fd9f25a0f3
commit dddb066b0d
6 changed files with 20 additions and 29 deletions

View File

@ -1,15 +1,16 @@
package quotes
import (
"net/http"
"strconv"
"github.com/aerogo/aero"
"github.com/animenotifier/arn"
"github.com/animenotifier/notify.moe/components"
"github.com/animenotifier/notify.moe/utils"
"net/http"
"strconv"
)
const maxQuotes = 12
const maxQuotes = 6
// Latest renders the quotes page.
func Latest(ctx *aero.Context) string {
@ -21,10 +22,15 @@ func Latest(ctx *aero.Context) string {
arn.SortQuotesLatestFirst(quotes)
// Reduce the number of displayed quotes
loadMoreIndex := 0
if len(quotes) > maxQuotes {
quotes = quotes[:maxQuotes]
loadMoreIndex = maxQuotes
}
return ctx.HTML(components.Quotes(quotes, maxQuotes, user))
return ctx.HTML(components.Quotes(quotes, loadMoreIndex, user))
}
// LatestFrom renders the quotes from the given index.

View File

@ -1,4 +1,4 @@
component Quotes(quotes []*arn.Quote, quotesPerPage int, user *arn.User)
component Quotes(quotes []*arn.Quote, loadMoreIndex int, user *arn.User)
h1.page-title Quotes
QuotesTabs
@ -17,9 +17,9 @@ component Quotes(quotes []*arn.Quote, quotesPerPage int, user *arn.User)
#load-more-target.quotes
QuotesScrollable(quotes, user)
if len(quotes) == quotesPerPage
if loadMoreIndex != 0
.buttons
LoadMore(quotesPerPage)
LoadMore(loadMoreIndex)
component QuotesScrollable(quotes []*arn.Quote, user *arn.User)
each quote in quotes

View File

@ -12,25 +12,14 @@
vertical
ui-element
border-left 5px solid quote-side-border-color !important
overflow hidden
box-shadow shadow-light
align-items stretch
align-content stretch
.quote-character
horizontal
align-self flex-end
align-items baseline
justify-content space-around
padding 0 1em 1em 0
span
opacity 0.65
a
display inline
margin-left 0.5em
margin 0 1em 1em 0
.quote-footer
text-align center
@ -45,8 +34,6 @@
height 100%
display flex
flex-grow 1
align-items stretch
align-content stretch
blockquote
flex-grow 1
@ -76,7 +63,6 @@ blockquote
margin-left 0.25em
vertical-align -0.4em
.character
margin 0.5em 0 0 0.5em !important
display block !important