lint

Allows to style books as series

---------

Co-authored-by: Joffrey JAFFEUX <[email protected]>

app/services/discourse_rewind/rewind/action/reading_time.rb

@@ -4,7 +4,19 @@
 # Should we show book covers or just the names?
 module DiscourseRewind
   class Rewind::Action::ReadingTime < Rewind::Action::BaseReport
+    FakeData = {
+      data: {
+        reading_time: 2_880_000,
+        book: "The Combined Cosmere works + Wheel of Time",
+        isbn: "978-0812511819",
+        series: true,
+      },
+      identifier: "reading-time",
+    }
+
     def call
+      return FakeData if Rails.env.development?
+
       reading_time = UserVisit.where(user_id: user.id).where(visited_at: date).sum(:time_read)
       book = best_book_fit(reading_time)
 
@@ -15,6 +27,7 @@ module DiscourseRewind
           reading_time: reading_time,
           book: book[:title],
           isbn: book[:isbn],
+          series: book[:series],
         },
         identifier: "reading-time",
       }
@@ -25,110 +38,137 @@ module DiscourseRewind
         "The Hunger Games" => {
           reading_time: 19_740,
           isbn: "978-0439023481",
+          series: false,
         },
         "The Metamorphosis" => {
           reading_time: 3120,
           isbn: "978-0553213690",
+          series: false,
         },
         "To Kill a Mockingbird" => {
           reading_time: 22_800,
           isbn: "978-0061120084",
+          series: false,
         },
         "Pride and Prejudice" => {
           reading_time: 25_200,
           isbn: "978-1503290563",
+          series: false,
         },
         "1984" => {
           reading_time: 16_800,
           isbn: "978-0451524935",
+          series: false,
         },
         "The Lord of the Rings" => {
           reading_time: 108_000,
           isbn: "978-0544003415",
+          series: true,
         },
         "Harry Potter and the Sorcerer's Stone" => {
           reading_time: 24_600,
           isbn: "978-0590353427",
+          series: true,
         },
         "The Great Gatsby" => {
           reading_time: 12_600,
           isbn: "978-0743273565",
+          series: false,
         },
         "The Little Prince" => {
           reading_time: 5400,
           isbn: "978-0156012195",
+          series: false,
         },
         "Animal Farm" => {
           reading_time: 7200,
           isbn: "978-0451526342",
+          series: false,
         },
         "The Catcher in the Rye" => {
           reading_time: 18_000,
           isbn: "978-0316769488",
+          series: false,
         },
         "Jane Eyre" => {
           reading_time: 34_200,
           isbn: "978-0141441146",
+          series: false,
         },
         "Fahrenheit 451" => {
           reading_time: 15_000,
           isbn: "978-1451673319",
+          series: false,
         },
         "The Hobbit" => {
           reading_time: 27_000,
           isbn: "978-0547928227",
+          series: false,
         },
         "The Da Vinci Code" => {
           reading_time: 37_800,
           isbn: "978-0307474278",
+          series: false,
         },
         "Little Women" => {
           reading_time: 30_000,
           isbn: "978-0147514011",
+          series: false,
         },
         "One Hundred Years of Solitude" => {
           reading_time: 46_800,
           isbn: "978-0060883287",
+          series: false,
         },
         "And Then There Were None" => {
           reading_time: 16_200,
           isbn: "978-0062073488",
+          series: false,
         },
         "The Alchemist" => {
           reading_time: 10_800,
           isbn: "978-0061122415",
+          series: false,
         },
         "The Hitchhiker's Guide to the Galaxy" => {
           reading_time: 12_600,
           isbn: "978-0345391803",
+          series: false,
         },
         "The Complete works of Shakespeare" => {
           reading_time: 180_000,
           isbn: "978-1853268953",
+          series: true,
         },
         "The Game of Thrones Series" => {
           reading_time: 360_000,
           isbn: "978-0007477159",
+          series: true,
         },
         "Malazan Book of the Fallen" => {
           reading_time: 720_000,
           isbn: "978-0765348821",
+          series: true,
         },
         "Terry Pratchett’s Discworld series" => {
           reading_time: 1_440_000,
           isbn: "978-9123684458",
+          series: true,
         },
         "The Wandering Inn web series" => {
           reading_time: 2_160_000,
           isbn: "the-wandering-inn",
+          series: true,
         },
         "The Combined Cosmere works + Wheel of Time" => {
           reading_time: 2_880_000,
           isbn: "978-0812511819",
+          series: true,
         },
         "The Star Trek novels" => {
           reading_time: 3_600_000,
           isbn: "978-1852860691",
+          series: true,
         },
       }.symbolize_keys
     end
@@ -150,7 +190,11 @@ module DiscourseRewind
       book_title =
         books.group_by { |book| book }.transform_values(&:count).max_by { |_, count| count }.first
 
-      { title: book_title, isbn: popular_books[book_title][:isbn] }
+      {
+        title: book_title,
+        isbn: popular_books[book_title][:isbn],
+        series: popular_books[book_title][:series],
+      }
     end
   end
 end

assets/javascripts/discourse/components/reports/favorite-tags.gjs

@@ -11,10 +11,10 @@ const FavoriteTags = <template>
       <div class="rewind-report-container">
         {{#each @report.data as |data|}}
           <a class="rewind-card" href={{concat "/tag/" data.name}}>
-            <a
+            <p
               class="favorite-tags__tag"
               href={{concat "/tag/" data.name}}
-            >#{{data.name}}</a>
+            >#{{data.name}}</p>
           </a>
         {{/each}}
       </div>

assets/javascripts/discourse/components/reports/reading-time.gjs

@@ -8,7 +8,13 @@ export default class ReadingTime extends Component {
     let leftOverMinutes = totalMinutes % 60;
     let totalHours = (totalMinutes - leftOverMinutes) / 60;
 
-    return `${totalHours}h ${leftOverMinutes}m`;
+    if (leftOverMinutes >= 35) {
+      totalHours += 1;
+      leftOverMinutes = 0;
+      return `${totalHours}h`;
+    } else {
+      return `${totalHours}h ${leftOverMinutes}m`;
+    }
   }
 
   <template>
@@ -34,6 +40,11 @@ export default class ReadingTime extends Component {
                 src="/plugins/discourse-rewind/images/books/{{@report.data.isbn}}.jpg"
               />
             </div>
+            {{#if @report.data.series}}
+              <div class="book-series one"></div>
+              <div class="book-series two"></div>
+              <div class="book-series three"></div>
+            {{/if}}
           </div>
         </div>
       </div>

assets/javascripts/discourse/templates/user/rewind.hbs

@@ -1 +1 @@
-<Rewind />
+<Rewind />

assets/stylesheets/common/favorite-categories.scss

@@ -4,9 +4,13 @@
     gap: 0.5em;
     flex-wrap: wrap;
   }
-
   .rewind-card {
     @include rewind-border;
+    width: max-content;
+    flex-grow: 1;
+    &:hover {
+      background-color: var(--secondary-very-high);
+    }
   }
 }
 

assets/stylesheets/common/reading-time.scss

@@ -15,6 +15,7 @@
   position: relative;
   transform-style: preserve-3d;
   transform: rotateY(-20deg);
+  z-index: 2;
 }
 
 p.reading-time__text {
@@ -76,8 +77,8 @@ p.reading-time__text {
     #fff 80%,
     #f9f9f9 85%,
     #fff 90%,
-    #f9f9f9 95%,
-    #fff 100%
+    #b6b6b6 95%,
+    #b6b6b6 100%
   );
 }
 
@@ -91,6 +92,7 @@ p.reading-time__text {
   transform: translateZ(-17.5px);
   background-color: var(--book-color);
   border-radius: 0 5px 5px 0;
+  box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.25);
   @media screen and (width <= 475px) {
     width: 100px;
     height: 133px;
@@ -115,6 +117,87 @@ p.reading-time__text {
   justify-content: space-around;
   align-items: center;
   background-color: var(--secondary);
-  --book-color: rgba(var(--primary-rgb), 0.4);
+  --book-color: var(--primary-very-high);
   @include rewind-border;
 }
+
+.book-series {
+  width: 150px;
+  height: 200px;
+  @media screen and (width <= 475px) {
+    width: 100px;
+    height: 133px;
+  }
+  position: relative;
+  transform-style: preserve-3d;
+  transform: rotateY(-20deg);
+  position: absolute;
+  background-color: var(--book-color);
+  border-radius: 0 5px 5px 0;
+  box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.25);
+  z-index: 1;
+  &::before {
+    position: absolute;
+    content: " ";
+    background-color: blue;
+    left: 0;
+    top: 4px;
+    width: 33px;
+    height: 192px;
+    @media screen and (width <= 475px) {
+      left: -43px;
+      width: 22px;
+      height: 125px;
+    }
+    transform: translateX(128.5px) rotateY(90deg);
+    background: linear-gradient(
+      90deg,
+      #fff 0%,
+      #f9f9f9 5%,
+      #fff 10%,
+      #f9f9f9 15%,
+      #fff 20%,
+      #f9f9f9 25%,
+      #fff 30%,
+      #f9f9f9 35%,
+      #fff 40%,
+      #f9f9f9 45%,
+      #fff 50%,
+      #f9f9f9 55%,
+      #fff 60%,
+      #f9f9f9 65%,
+      #fff 70%,
+      #f9f9f9 75%,
+      #fff 80%,
+      #f9f9f9 85%,
+      #fff 90%,
+      #b6b6b6 95%,
+      #b6b6b6 100%
+    );
+  }
+  &.one {
+    top: 3px;
+    left: 14px;
+    @media screen and (width <= 475px) {
+      top: 3px;
+      left: 11px;
+    }
+  }
+  &.two {
+    top: 5px;
+    left: 22px;
+    z-index: -1;
+    @media screen and (width <= 475px) {
+      top: 5px;
+      left: 17px;
+    }
+  }
+  &.three {
+    top: 7px;
+    left: 31px;
+    z-index: -2;
+    @media screen and (width <= 475px) {
+      display: none;
+    }
+  }
+}