Expose lastUpdated on source feed page
This commit is contained in:
parent
ee63ee32b0
commit
0bb7871832
@ -3,6 +3,7 @@ package web
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/Jaculabilis/intake/core"
|
"github.com/Jaculabilis/intake/core"
|
||||||
"github.com/Jaculabilis/intake/web/html"
|
"github.com/Jaculabilis/intake/web/html"
|
||||||
@ -91,10 +92,11 @@ func (env *Env) getChannel(writer http.ResponseWriter, req *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
data := html.FeedData{
|
data := html.FeedData{
|
||||||
Items: items,
|
Items: items,
|
||||||
ShowHidden: showHidden,
|
ShowHidden: showHidden,
|
||||||
Page: page,
|
Page: page,
|
||||||
Count: count,
|
Count: count,
|
||||||
|
LastUpdated: time.Time{},
|
||||||
}
|
}
|
||||||
html.Feed(writer, data)
|
html.Feed(writer, data)
|
||||||
}
|
}
|
||||||
|
@ -27,11 +27,19 @@
|
|||||||
hx-vals='{{ massDeacVars .Items }}'
|
hx-vals='{{ massDeacVars .Items }}'
|
||||||
hx-confirm="Deactivate {{ len .Items }} items?"
|
hx-confirm="Deactivate {{ len .Items }} items?"
|
||||||
>Deactivate All</button>
|
>Deactivate All</button>
|
||||||
|
<br>
|
||||||
|
{{ if not .LastUpdated.IsZero }}
|
||||||
|
last updated {{ .LastUpdated | until }} ({{ .LastUpdated | dateFormat }})
|
||||||
|
{{ end }}
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
{{ else }}
|
{{ else }}
|
||||||
<article class="center">
|
<article class="center">
|
||||||
<span class="feed-controls">Feed is empty</span>
|
<span class="feed-controls">Feed is empty</span>
|
||||||
|
<br>
|
||||||
|
{{ if not .LastUpdated.IsZero }}
|
||||||
|
last updated {{ .LastUpdated | until }} ({{ .LastUpdated | dateFormat }})
|
||||||
|
{{ end }}
|
||||||
</article>
|
</article>
|
||||||
{{ end }}
|
{{ end }}
|
||||||
{{/* end if .Items */}}
|
{{/* end if .Items */}}
|
||||||
|
@ -117,10 +117,11 @@ func Home(writer io.Writer, data HomeData) {
|
|||||||
var feed = load("feed.html", "item.html")
|
var feed = load("feed.html", "item.html")
|
||||||
|
|
||||||
type FeedData struct {
|
type FeedData struct {
|
||||||
Items []core.Item
|
Items []core.Item
|
||||||
ShowHidden int
|
ShowHidden int
|
||||||
Page int
|
Page int
|
||||||
Count int
|
Count int
|
||||||
|
LastUpdated time.Time
|
||||||
}
|
}
|
||||||
|
|
||||||
func Feed(writer io.Writer, data FeedData) {
|
func Feed(writer io.Writer, data FeedData) {
|
||||||
|
@ -33,11 +33,18 @@ func (env *Env) getSource(writer http.ResponseWriter, req *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
lastUpdated, err := core.GetLastUpdated(env.db, source)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(writer, err.Error(), 500)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
data := html.FeedData{
|
data := html.FeedData{
|
||||||
Items: items,
|
Items: items,
|
||||||
ShowHidden: showHidden,
|
ShowHidden: showHidden,
|
||||||
Page: page,
|
Page: page,
|
||||||
Count: count,
|
Count: count,
|
||||||
|
LastUpdated: lastUpdated,
|
||||||
}
|
}
|
||||||
html.Feed(writer, data)
|
html.Feed(writer, data)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user