Backups/Mango
1
0
Fork 0
mirror of https://github.com/hkalexling/Mango.git synced 2025-08-04 11:55:30 -04:00
Code Issues Projects Releases Wiki Activity

refactor on deck to continue reading and show percentages on home

Browse Source
This commit is contained in:
Jared Turner 2020-05-20 10:38:23 +01:00
parent c35e840694
commit a2c7638141
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/library.cr
View File

@ -325,7 +325,7 @@ class Title
@entries[idx + 1]
end
def get_on_deck_entry(username)
def get_continue_reading_entry(username)
in_progress_entries = @entries.select do |e|
load_progress(username, e.title) > 0
end

8
src/routes/main.cr
View File

@ -71,10 +71,14 @@ class MainRouter < Router
# map: get the on-deck entry or nil for each Title
# select: select only entries (and ignore Nil's) from the array
# produced by map
on_deck_entries = titles.map { |t|
t.get_on_deck_entry username
continue_reading_entries = titles.map { |t|
t.get_continue_reading_entry username
}.select Entry
percentage = continue_reading_entries.map do |e|
e.book.load_percentage username, e.title
end
layout "home"
rescue e
@context.error e

14
src/views/home.ecr
View File

@ -1,15 +1,15 @@
<%- unless on_deck_entries.empty? -%>
<h2 class="uk-title home-headings">On Deck</h2>
<%- unless continue_reading_entries.empty? -%>
<h2 class="uk-title home-headings">Continue Reading</h2>
<div id="item-container-continue" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
<%- on_deck_entries.each_with_index do |e, i| -%>
<div class="item" data-mtime="<%= e.mtime.to_unix %>" data-progress="" id="<%= e.id %>"> <!-- TODO: add percentage -->
<a class="acard"> <!-- Add percentage rounded below v -->
<div class="uk-card uk-card-default" onclick="showModal(&quot;<%= e.encoded_path %>&quot;, '<%= e.pages %>', <%= "0" %>, &quot;<%= e.book.encoded_display_name %>&quot;, &quot;<%= e.encoded_display_name %>&quot;, '<%= e.title_id %>', '<%= e.id %>')">
<%- continue_reading_entries.each_with_index do |e, i| -%>
<div class="item" data-mtime="<%= e.mtime.to_unix %>" data-progress="<%= percentage[i] %>" id="<%= e.id %>">
<a class="acard">
<div class="uk-card uk-card-default" onclick="showModal(&quot;<%= e.encoded_path %>&quot;, '<%= e.pages %>', <%= (percentage[i] * 100).round(1) %>, &quot;<%= e.book.encoded_display_name %>&quot;, &quot;<%= e.encoded_display_name %>&quot;, '<%= e.title_id %>', '<%= e.id %>')">
<div class="uk-card-media-top">
<img data-src="<%= e.cover_url %>" alt="" data-width data-height uk-img>
</div>
<div class="uk-card-body">
<div class="uk-card-badge uk-label"><%= "" %>%</div> <!-- TODO: add percentage rounded -->
<div class="uk-card-badge uk-label"><%= (percentage[i] * 100).round(1) %>%</div>
<h3 class="uk-card-title break-word" data-title="<%= e.display_name.gsub("\"", "&quot;") %>"><%= e.display_name %></h3>
<p><%= e.pages %> pages</p>
</div>