Add navigation
This commit is contained in:
@@ -133,3 +133,43 @@ func ArticleByID(store *Store, ID int, slug string) (article model.DisplayArticl
|
|||||||
|
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func PreviousAndNextArticleUrlByID(store *Store, ID int) (nextUrl string, previousUrl string, err error) {
|
||||||
|
|
||||||
|
nextResult, previousResult := "#", "#"
|
||||||
|
query, err := store.Prepare(`
|
||||||
|
select id,title, content, slug, original_url, source_id, created_at from articles where id = $1;
|
||||||
|
`)
|
||||||
|
if err != nil {
|
||||||
|
return nextResult, previousResult, err
|
||||||
|
}
|
||||||
|
defer query.Close()
|
||||||
|
|
||||||
|
row := query.QueryRow(ID - 1)
|
||||||
|
if err != nil {
|
||||||
|
return nextResult, previousResult, err
|
||||||
|
}
|
||||||
|
|
||||||
|
r := model.DisplayArticle{}
|
||||||
|
content := ""
|
||||||
|
err = row.Scan(&r.ID, &r.Title, &content, &r.Slug, &r.OriginalUrl, &r.SourceId, &r.CreatedAt)
|
||||||
|
if err != nil {
|
||||||
|
return nextResult, previousResult, err
|
||||||
|
}
|
||||||
|
|
||||||
|
previousResult = fmt.Sprintf("/%d/%s", r.ID, r.Slug)
|
||||||
|
|
||||||
|
row = query.QueryRow(ID + 1)
|
||||||
|
if err != nil {
|
||||||
|
return nextResult, previousResult, err
|
||||||
|
}
|
||||||
|
|
||||||
|
content = ""
|
||||||
|
err = row.Scan(&r.ID, &r.Title, &content, &r.Slug, &r.OriginalUrl, &r.SourceId, &r.CreatedAt)
|
||||||
|
if err != nil {
|
||||||
|
return nextResult, previousResult, err
|
||||||
|
}
|
||||||
|
nextResult = fmt.Sprintf("/%d/%s", r.ID, r.Slug)
|
||||||
|
|
||||||
|
return nextResult, previousResult, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package server
|
package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"gitlab.com/kbr4/svevijesti/internal/database"
|
"gitlab.com/kbr4/svevijesti/internal/database"
|
||||||
"net/http"
|
"net/http"
|
||||||
@@ -21,9 +22,51 @@ func rootHandler(wr http.ResponseWriter, req *http.Request) {
|
|||||||
http.Error(wr, err.Error(), http.StatusInternalServerError)
|
http.Error(wr, err.Error(), http.StatusInternalServerError)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dayBefore := "/dan/" + time.Now().Add(-24*time.Hour).Format("2006-01-02")
|
||||||
|
|
||||||
data := map[string]interface{}{
|
data := map[string]interface{}{
|
||||||
"title": title,
|
"title": title,
|
||||||
"articles": articles,
|
"articles": articles,
|
||||||
|
"previous": dayBefore,
|
||||||
|
"next": "/",
|
||||||
|
}
|
||||||
|
|
||||||
|
err = templates.ExecuteTemplate(wr, "homeHTML", data)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(wr, err.Error(), http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func dailyArticlesHandler(wr http.ResponseWriter, req *http.Request) {
|
||||||
|
vars := mux.Vars(req)
|
||||||
|
day, err := time.Parse("2006-01-02", vars["date"])
|
||||||
|
if err != nil {
|
||||||
|
http.Error(wr, err.Error(), http.StatusNotFound)
|
||||||
|
}
|
||||||
|
dayBefore := "/dan/" + day.Add(-24*time.Hour).Format("2006-01-02")
|
||||||
|
dayAfter := "/dan/" + day.Add(24*time.Hour).Format("2006-01-02")
|
||||||
|
|
||||||
|
if day.Add(24*time.Hour).Format("2006-01-02") == time.Now().Format("2006-01-02") {
|
||||||
|
dayAfter = "/"
|
||||||
|
}
|
||||||
|
|
||||||
|
title := fmt.Sprintf("Stare novine na dan %s", day.Format("2006-01-02"))
|
||||||
|
store, err := database.Connect()
|
||||||
|
if err != nil {
|
||||||
|
http.Error(wr, err.Error(), http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
defer store.Close()
|
||||||
|
|
||||||
|
articles, err := database.ArticlesForDay(store, day)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(wr, err.Error(), http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
|
||||||
|
data := map[string]interface{}{
|
||||||
|
"title": title,
|
||||||
|
"articles": articles,
|
||||||
|
"previous": dayBefore,
|
||||||
|
"next": dayAfter,
|
||||||
}
|
}
|
||||||
|
|
||||||
err = templates.ExecuteTemplate(wr, "homeHTML", data)
|
err = templates.ExecuteTemplate(wr, "homeHTML", data)
|
||||||
@@ -50,10 +93,14 @@ func articleHandler(wr http.ResponseWriter, req *http.Request) {
|
|||||||
http.Error(wr, err.Error(), http.StatusNotFound)
|
http.Error(wr, err.Error(), http.StatusNotFound)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
next, previous, _ := database.PreviousAndNextArticleUrlByID(store, articleID)
|
||||||
|
|
||||||
title := article.Title
|
title := article.Title
|
||||||
data := map[string]interface{}{
|
data := map[string]interface{}{
|
||||||
"title": title,
|
"title": title,
|
||||||
"article": article,
|
"article": article,
|
||||||
|
"previous": previous,
|
||||||
|
"next": next,
|
||||||
}
|
}
|
||||||
|
|
||||||
err = templates.ExecuteTemplate(wr, "articleHTML", data)
|
err = templates.ExecuteTemplate(wr, "articleHTML", data)
|
||||||
|
|||||||
@@ -39,7 +39,8 @@ func init() {
|
|||||||
|
|
||||||
func CreateRoutes() *mux.Router {
|
func CreateRoutes() *mux.Router {
|
||||||
r := mux.NewRouter()
|
r := mux.NewRouter()
|
||||||
r.HandleFunc("/", rootHandler)
|
r.HandleFunc("/dan/{date}", dailyArticlesHandler)
|
||||||
r.HandleFunc("/{id:[0-9]+}/{slug}", articleHandler)
|
r.HandleFunc("/{id:[0-9]+}/{slug}", articleHandler)
|
||||||
|
r.HandleFunc("/", rootHandler)
|
||||||
return r
|
return r
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,5 +2,12 @@
|
|||||||
|
|
||||||
<footer>
|
<footer>
|
||||||
SN
|
SN
|
||||||
|
<div>
|
||||||
|
<nav>
|
||||||
|
<a href="{{.previous}}"><----</a> |
|
||||||
|
<a href="/">Početna</a> |
|
||||||
|
<a href="{{.next}}">----></a>
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|||||||
@@ -12,7 +12,9 @@
|
|||||||
</pre>
|
</pre>
|
||||||
<br>
|
<br>
|
||||||
<nav>
|
<nav>
|
||||||
<a href="/">Početna</a>
|
<a href="{{.previous}}"><----</a> |
|
||||||
|
<a href="/">Početna</a> |
|
||||||
|
<a href="{{.next}}">----></a>
|
||||||
</nav>
|
</nav>
|
||||||
</header>
|
</header>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|||||||
12
web/tpl/dailyArticles.html
Normal file
12
web/tpl/dailyArticles.html
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
{{define "homeHTML"}}
|
||||||
|
|
||||||
|
{{template "headHTML" .}}
|
||||||
|
<body>
|
||||||
|
{{template "headerHTML" .}}
|
||||||
|
|
||||||
|
{{template "articlesHTML" .}}
|
||||||
|
|
||||||
|
{{template "footerHTML" .}}
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
{{end}}
|
||||||
Reference in New Issue
Block a user