Home redesign

internal/webserver/controller.go

@@ -7,6 +7,7 @@ import (
 	"github.com/svera/coreander/v4/internal/webserver/controller/auth"
 	"github.com/svera/coreander/v4/internal/webserver/controller/document"
 	"github.com/svera/coreander/v4/internal/webserver/controller/highlight"
+	"github.com/svera/coreander/v4/internal/webserver/controller/home"
 	"github.com/svera/coreander/v4/internal/webserver/controller/user"
 	"github.com/svera/coreander/v4/internal/webserver/model"
 	"gorm.io/gorm"
@@ -17,6 +18,7 @@ type Controllers struct {
 	Users      *user.Controller
 	Highlights *highlight.Controller
 	Documents  *document.Controller
+	Home       *home.Controller
 }
 
 func SetupControllers(cfg Config, db *gorm.DB, metadataReaders map[string]metadata.Reader, idx *index.BleveIndexer, sender Sender, appFs afero.Fs) Controllers {
@@ -48,10 +50,16 @@ func SetupControllers(cfg Config, db *gorm.DB, metadataReaders map[string]metada
 		UploadDocumentMaxSize: cfg.UploadDocumentMaxSize,
 	}
 
+	homeCfg := home.Config{
+		LibraryPath:   cfg.LibraryPath,
+		CoverMaxWidth: cfg.CoverMaxWidth,
+	}
+
 	return Controllers{
 		Auth:       auth.NewController(usersRepository, sender, authCfg, printers),
 		Users:      user.NewController(usersRepository, usersCfg),
 		Highlights: highlight.NewController(highlightsRepository, usersRepository, sender, cfg.WordsPerMinute, idx),
 		Documents:  document.NewController(highlightsRepository, sender, idx, metadataReaders, appFs, documentsCfg),
+		Home:       home.NewController(highlightsRepository, sender, idx, homeCfg),
 	}
 }

internal/webserver/controller/document/delete.go

@@ -1,7 +1,9 @@
 package document
 
 import (
+	"errors"
 	"log"
+	"os"
 	"path/filepath"
 
 	"github.com/gofiber/fiber/v2"
@@ -14,20 +16,22 @@ func (d *Controller) Delete(c *fiber.Ctx) error {
 	}
 
 	fullPath := filepath.Join(d.config.LibraryPath, document.ID)
-	if _, err := d.appFs.Stat(fullPath); err != nil {
+	if _, err := d.appFs.Stat(fullPath); err != nil && !errors.Is(err, os.ErrNotExist) {
+		log.Printf("error checking file %s for removal: %s\n", fullPath, err.Error())
 		return fiber.ErrBadRequest
 	}
 
 	if err := d.idx.RemoveFile(fullPath); err != nil {
+		log.Printf("error removing file %s from index: %s\n", fullPath, err.Error())
 		return fiber.ErrInternalServerError
 	}
 
 	if err := d.appFs.Remove(fullPath); err != nil {
-		log.Printf("error removing file %s", fullPath)
+		log.Printf("error removing file %s\n", fullPath)
 	}
 
 	if err := d.hlRepository.RemoveDocument(document.ID); err != nil {
-		log.Printf("error removing file %s from highlights", document.ID)
+		log.Printf("error removing file %s from highlights\n", document.ID)
 	}
 
 	return nil

internal/webserver/controller/document/detail.go

@@ -2,6 +2,7 @@ package document
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -28,6 +29,11 @@ func (d *Controller) Detail(c *fiber.Ctx) error {
 
 	document, err := d.idx.Document(c.Params("slug"))
 	if err != nil {
+		log.Println(err)
+		return fiber.ErrInternalServerError
+	}
+
+	if document.Slug == "" {
 		return fiber.ErrNotFound
 	}
 

internal/webserver/controller/document/reader.go

@@ -2,6 +2,7 @@ package document
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -12,8 +13,12 @@ import (
 func (d *Controller) Reader(c *fiber.Ctx) error {
 	document, err := d.idx.Document(c.Params("slug"))
 	if err != nil {
-		fmt.Println(err)
-		return fiber.ErrBadRequest
+		log.Println(err)
+		return fiber.ErrInternalServerError
+	}
+
+	if document.Slug == "" {
+		return fiber.ErrNotFound
 	}
 
 	if _, err := os.Stat(filepath.Join(d.config.LibraryPath, document.ID)); err != nil {

internal/webserver/controller/document/search.go

@@ -18,11 +18,6 @@ func (d *Controller) Search(c *fiber.Ctx) error {
 		emailSendingConfigured = false
 	}
 
-	page, err := strconv.Atoi(c.Query("page"))
-	if err != nil {
-		page = 1
-	}
-
 	var session model.Session
 	if val, ok := c.Locals("Session").(model.Session); ok {
 		session = val
@@ -33,58 +28,34 @@ func (d *Controller) Search(c *fiber.Ctx) error {
 	}
 
 	var searchResults result.Paginated[[]index.Document]
+	keywords := c.Query("search")
 
-	if keywords := c.Query("search"); keywords != "" {
-		if searchResults, err = d.idx.Search(keywords, page, model.ResultsPerPage); err != nil {
-			log.Println(err)
-			return fiber.ErrInternalServerError
-		}
-
-		if session.ID > 0 {
-			searchResults = d.hlRepository.HighlightedPaginatedResult(int(session.ID), searchResults)
-		}
-
-		return c.Render("results", fiber.Map{
-			"Keywords":               keywords,
-			"Results":                searchResults,
-			"Paginator":              view.Pagination(model.MaxPagesNavigator, searchResults, map[string]string{"search": keywords}),
-			"Title":                  "Search results",
-			"EmailSendingConfigured": emailSendingConfigured,
-			"EmailFrom":              d.sender.From(),
-			"WordsPerMinute":         d.config.WordsPerMinute,
-		}, "layout")
-	}
-
-	count, err := d.idx.Count()
-	if err != nil {
-		return fiber.ErrInternalServerError
+	if keywords == "" {
+		return fiber.ErrBadRequest
 	}
 
-	docsSortedByHighlightedDate, err := d.hlRepository.Highlights(int(session.ID), page, 6)
+	page, err := strconv.Atoi(c.Query("page"))
 	if err != nil {
-		return fiber.ErrInternalServerError
+		page = 1
 	}
 
-	docs, err := d.idx.Documents(docsSortedByHighlightedDate.Hits())
-	if err != nil {
+	if searchResults, err = d.idx.Search(keywords, page, model.ResultsPerPage); err != nil {
+		log.Println(err)
 		return fiber.ErrInternalServerError
 	}
 
-	highlights := make([]index.Document, 0, len(docs))
-	for _, path := range docsSortedByHighlightedDate.Hits() {
-		if _, ok := docs[path]; !ok {
-			continue
-		}
-		doc := docs[path]
-		doc.Highlighted = true
-		highlights = append(highlights, doc)
+	if session.ID > 0 {
+		searchResults = d.hlRepository.HighlightedPaginatedResult(int(session.ID), searchResults)
 	}
 
-	return c.Render("index", fiber.Map{
-		"Count":                  count,
-		"Title":                  "Coreander",
-		"Highlights":             highlights,
+	return c.Render("results", fiber.Map{
+		"Keywords":               keywords,
+		"Results":                searchResults,
+		"Paginator":              view.Pagination(model.MaxPagesNavigator, searchResults, map[string]string{"search": keywords}),
+		"Title":                  "Search results",
 		"EmailSendingConfigured": emailSendingConfigured,
 		"EmailFrom":              d.sender.From(),
+		"WordsPerMinute":         d.config.WordsPerMinute,
 	}, "layout")
+
 }

internal/webserver/controller/home/controller.go

@@ -0,0 +1,44 @@
+package home
+
+import (
+	"github.com/svera/coreander/v4/internal/index"
+	"github.com/svera/coreander/v4/internal/result"
+)
+
+const highlightsAmount = 6
+
+type Sender interface {
+	SendDocument(address string, libraryPath string, fileName string) error
+	From() string
+}
+
+// IdxReaderWriter defines a set of reading and writing operations over an index
+type IdxReaderWriter interface {
+	Documents(IDs []string) (map[string]index.Document, error)
+	Count() (uint64, error)
+}
+
+type highlightsRepository interface {
+	Highlights(userID int, page int, resultsPerPage int) (result.Paginated[[]string], error)
+}
+
+type Config struct {
+	LibraryPath   string
+	CoverMaxWidth int
+}
+
+type Controller struct {
+	hlRepository highlightsRepository
+	idx          IdxReaderWriter
+	sender       Sender
+	config       Config
+}
+
+func NewController(hlRepository highlightsRepository, sender Sender, idx IdxReaderWriter, cfg Config) *Controller {
+	return &Controller{
+		hlRepository: hlRepository,
+		idx:          idx,
+		sender:       sender,
+		config:       cfg,
+	}
+}

internal/webserver/controller/home/index.go

@@ -0,0 +1,59 @@
+package home
+
+import (
+	"log"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/svera/coreander/v4/internal/index"
+	"github.com/svera/coreander/v4/internal/webserver/infrastructure"
+	"github.com/svera/coreander/v4/internal/webserver/model"
+)
+
+func (d *Controller) Index(c *fiber.Ctx) error {
+	emailSendingConfigured := true
+	if _, ok := d.sender.(*infrastructure.NoEmail); ok {
+		emailSendingConfigured = false
+	}
+
+	var session model.Session
+	if val, ok := c.Locals("Session").(model.Session); ok {
+		session = val
+	}
+
+	count, err := d.idx.Count()
+	if err != nil {
+		log.Println(err)
+		return fiber.ErrInternalServerError
+	}
+
+	docsSortedByHighlightedDate, err := d.hlRepository.Highlights(int(session.ID), 0, highlightsAmount)
+	if err != nil {
+		log.Println(err)
+		return fiber.ErrInternalServerError
+	}
+
+	docs, err := d.idx.Documents(docsSortedByHighlightedDate.Hits())
+	if err != nil {
+		log.Println(err)
+		return fiber.ErrInternalServerError
+	}
+
+	highlights := make([]index.Document, 0, len(docs))
+	for _, path := range docsSortedByHighlightedDate.Hits() {
+		if _, ok := docs[path]; !ok {
+			continue
+		}
+		doc := docs[path]
+		doc.Highlighted = true
+		highlights = append(highlights, doc)
+	}
+
+	return c.Render("index", fiber.Map{
+		"Count":                  count,
+		"Title":                  "Coreander",
+		"Highlights":             highlights,
+		"EmailSendingConfigured": emailSendingConfigured,
+		"EmailFrom":              d.sender.From(),
+		"HomeNavbar":             true,
+	}, "layout")
+}

internal/webserver/embedded/css/display.css

@@ -54,7 +54,7 @@ a.collapse-control.collapsed:after {
 .nav-item .bi {
     width: 1em;
     height: 1em;
-}      
+}
 
 :root, [data-bs-theme=light] {
     --bs-link-color-rgb: 0, 0, 0;
@@ -68,6 +68,9 @@ a.collapse-control.collapsed:after {
         --bs-bg-opacity: 1;
         background-color: rgba(var(--bs-light-rgb), var(--bs-bg-opacity)) !important;
     }
+    .navbar-home {
+        background-color: white !important;
+    }
 }
 
 [data-bs-theme=dark] {
@@ -91,3 +94,9 @@ a.collapse-control.collapsed:after {
 .card-img-overlay a, .card-img-overlay p, .card-img-overlay h2, .card-img-overlay h3, .card-img-overlay h4, .card-img-overlay h5 {
     color: rgba(255,255,255,0.8);
 }
+
+[data-bs-theme=dark] {
+    .color-invertible {
+      filter: invert(100%);
+    }
+  }

internal/webserver/embedded/views/index.html

@@ -1,4 +1,5 @@
 <section class="pb-5 text-center">
+    <img src="/images/coreander-header.png" class="w-50 color-invertible"/>
     {{template "partials/searchbox" .}}
     <p>{{t .Lang "%d documents available" .Count}}</p>
 </section>
@@ -46,17 +47,4 @@ <h2>{{t .Lang "Your highlights" }}</h2>
             {{end}}
     </section>
 {{else}}
-    <section class="pt-5 text-center">
-            <h2 class="mb-3">{{t .Lang "Search tips"}}</h2>
-            <p>{{t .Lang "Use %s prefix in search box to search by authors only" `<span
-                    class="font-monospace">Authors:</span>`}}</p>
-            <p>{{t .Lang "Use %s prefix in search box to search by title only" `<span
-                    class="font-monospace">Title:</span>`}}</p>
-            <p>{{t .Lang "Use %s prefix in search box to search by series only" `<span
-                    class="font-monospace">Series:</span>`}}</p>
-            <p>{{t .Lang "Use %s prefix in search box to search by subjects only" `<span
-                    class="font-monospace">Subjects:</span>`}}</p>
-            <p>{{t .Lang "Enclose your search terms in double quotes to require all those terms and with the same order"}}
-            </p>
-    </section>
 {{end}}