-
Notifications
You must be signed in to change notification settings - Fork 713
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
27 changed files
with
321 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| {{ define "title"}}{{ .tagName }} ({{ .total }}){{ end }} | ||
|
|
||
| {{ define "page_header"}} | ||
| <section class="page-header" aria-labelledby="page-header-title page-header-title-count"> | ||
| <h1 id="page-header-title" dir="auto"> | ||
| {{ .tagName }} | ||
| <span aria-hidden="true"> ({{ .total }})</span> | ||
| </h1> | ||
| <span id="page-header-title-count" class="sr-only">{{ plural "page.tag_entry_count" .total .total }}</span> | ||
| <nav aria-label="{{ .tagName }} {{ t "menu.title" }}"> | ||
| <ul> | ||
| {{ if .showOnlyUnreadEntries }} | ||
| <li> | ||
| <a class="page-link" href="{{ route "tagEntriesAll" "tagName" (urlEncode .tagName) }}">{{ icon "show-all-entries" }}{{ t "menu.show_all_entries" }}</a> | ||
| </li> | ||
| {{ else }} | ||
| <li> | ||
| <a class="page-link" href="{{ route "tagEntries" "tagName" (urlEncode .tagName) }}">{{ icon "show-unread-entries" }}{{ t "menu.show_only_unread_entries" }}</a> | ||
| </li> | ||
| {{ end }} | ||
| </ul> | ||
| </nav> | ||
| </section> | ||
| {{ end }} | ||
|
|
||
| {{ define "content"}} | ||
| {{ if not .entries }} | ||
| <p role="alert" class="alert alert-info">{{ t "alert.no_tag_entry" }}</p> | ||
| {{ else }} | ||
| <div class="pagination-top"> | ||
| {{ template "pagination" .pagination }} | ||
| </div> | ||
| <div class="items"> | ||
| {{ range .entries }} | ||
| <article | ||
| class="item entry-item {{ if $.user.EntrySwipe }}entry-swipe{{ end }} item-status-{{ .Status }}" | ||
| data-id="{{ .ID }}" | ||
| aria-labelledby="entry-title-{{ .ID }}" | ||
| tabindex="-1" | ||
| > | ||
| <header class="item-header" dir="auto"> | ||
| <h2 id="entry-title-{{ .ID }}" class="item-title"> | ||
| <a href="{{ route "tagEntry" "entryID" .ID "tagName" (urlEncode $.tagName) }}"> | ||
| {{ if ne .Feed.Icon.IconID 0 }} | ||
| <img src="{{ route "icon" "iconID" .Feed.Icon.IconID }}" width="16" height="16" loading="lazy" alt=""> | ||
| {{ end }} | ||
| {{ .Title }} | ||
| </a> | ||
| </h2> | ||
| <span class="category"> | ||
| <a href="{{ route "categoryEntries" "categoryID" .Feed.Category.ID }}"> | ||
| {{ .Feed.Category.Title }} | ||
| </a> | ||
| </span> | ||
| </header> | ||
| {{ template "item_meta" dict "user" $.user "entry" . "hasSaveEntry" $.hasSaveEntry }} | ||
| </article> | ||
| {{ end }} | ||
| </div> | ||
| <div class="pagination-bottom"> | ||
| {{ template "pagination" .pagination }} | ||
| </div> | ||
| {{ end }} | ||
|
|
||
| {{ end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package ui // import "miniflux.app/v2/internal/ui" | ||
|
|
||
| import ( | ||
| "net/http" | ||
| "net/url" | ||
|
|
||
| "miniflux.app/v2/internal/http/request" | ||
| "miniflux.app/v2/internal/http/response/html" | ||
| "miniflux.app/v2/internal/http/route" | ||
| "miniflux.app/v2/internal/model" | ||
| "miniflux.app/v2/internal/storage" | ||
| "miniflux.app/v2/internal/ui/session" | ||
| "miniflux.app/v2/internal/ui/view" | ||
| ) | ||
|
|
||
| func (h *handler) showTagEntryPage(w http.ResponseWriter, r *http.Request) { | ||
| user, err := h.store.UserByID(request.UserID(r)) | ||
| if err != nil { | ||
| html.ServerError(w, r, err) | ||
| return | ||
| } | ||
|
|
||
| tagName, err := url.PathUnescape(request.RouteStringParam(r, "tagName")) | ||
| if err != nil { | ||
| html.ServerError(w, r, err) | ||
| return | ||
| } | ||
| entryID := request.RouteInt64Param(r, "entryID") | ||
|
|
||
| builder := h.store.NewEntryQueryBuilder(user.ID) | ||
| builder.WithTags([]string{tagName}) | ||
| builder.WithEntryID(entryID) | ||
| builder.WithoutStatus(model.EntryStatusRemoved) | ||
|
|
||
| entry, err := builder.GetEntry() | ||
| if err != nil { | ||
| html.ServerError(w, r, err) | ||
| return | ||
| } | ||
|
|
||
| if entry == nil { | ||
| html.NotFound(w, r) | ||
| return | ||
| } | ||
|
|
||
| if user.MarkReadOnView && entry.Status == model.EntryStatusUnread { | ||
| err = h.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead) | ||
| if err != nil { | ||
| html.ServerError(w, r, err) | ||
| return | ||
| } | ||
|
|
||
| entry.Status = model.EntryStatusRead | ||
| } | ||
|
|
||
| entryPaginationBuilder := storage.NewEntryPaginationBuilder(h.store, user.ID, entry.ID, user.EntryOrder, user.EntryDirection) | ||
| entryPaginationBuilder.WithTags([]string{tagName}) | ||
| prevEntry, nextEntry, err := entryPaginationBuilder.Entries() | ||
| if err != nil { | ||
| html.ServerError(w, r, err) | ||
| return | ||
| } | ||
|
|
||
| nextEntryRoute := "" | ||
| if nextEntry != nil { | ||
| nextEntryRoute = route.Path(h.router, "tagEntry", "tagName", url.PathEscape(tagName), "entryID", nextEntry.ID) | ||
| } | ||
|
|
||
| prevEntryRoute := "" | ||
| if prevEntry != nil { | ||
| prevEntryRoute = route.Path(h.router, "tagEntry", "tagName", url.PathEscape(tagName), "entryID", prevEntry.ID) | ||
| } | ||
|
|
||
| sess := session.New(h.store, request.SessionID(r)) | ||
| view := view.New(h.tpl, r, sess) | ||
| view.Set("entry", entry) | ||
| view.Set("prevEntry", prevEntry) | ||
| view.Set("nextEntry", nextEntry) | ||
| view.Set("nextEntryRoute", nextEntryRoute) | ||
| view.Set("prevEntryRoute", prevEntryRoute) | ||
| view.Set("user", user) | ||
| view.Set("countUnread", h.store.CountUnreadEntries(user.ID)) | ||
| view.Set("countErrorFeeds", h.store.CountUserFeedsWithErrors(user.ID)) | ||
| view.Set("hasSaveEntry", h.store.HasSaveEntry(user.ID)) | ||
|
|
||
| html.OK(w, r, view.Render("entry")) | ||
| } |
Oops, something went wrong.