Merge branch 'release/4.1.14'

* release/4.1.14:
  Added patch notes
  Fixed percentage calculations with popular reading time stats
  Fixed a plurality bug in the line chart components

changelog.md

@@ -1,5 +1,11 @@
 # Release Notes
 
+## [v4.1.14](https://github.com/cnvs/canvas/compare/v4.1.13...v4.1.14)
+
+### Fixed
+- Fixed a plurality bug in the line chart components ([dc366f1](https://github.com/cnvs/canvas/commit/dc366f117c7b765d35a352bd996722f0745e17b1))
+- Fixed the percentage calculations with popular reading time stats ([6222eb](https://github.com/cnvs/canvas/commit/6222ebb38654ca0c0ec17ee881977a027a6d72a0))
+
 ## [v4.1.13](https://github.com/cnvs/canvas/compare/v4.1.12...v4.1.13)
 
 ### Added

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
-    "/js/app.js": "/js/app.js?id=d69243894400bea05685",
-    "/css/app.css": "/css/app.css?id=37a56433b3bea336ee12",
-    "/js/app.js.map": "/js/app.js.map?id=4790dfef3b25d6c9e790",
+    "/js/app.js": "/js/app.js?id=490deb75e999a7466efb",
+    "/css/app.css": "/css/app.css?id=a2c0da91701ff768556b",
+    "/js/app.js.map": "/js/app.js.map?id=9e83587ea744b07c733e",
     "/favicon.png": "/favicon.png?id=39d853e8c2bdbc38fde3"
 }

resources/js/components/DateTimePicker.vue

@@ -1,5 +1,5 @@
 <script type="text/ecmascript-6">
-    import moment from 'moment';
+    import moment from 'moment'
 
     /**
      * Create the default date/time picker.

resources/js/components/Editor.vue

@@ -1,11 +1,11 @@
 <script type="text/ecmascript-6">
-    import Quill from 'quill';
-    import Parchment from 'parchment';
-    import HTMLBlot from './editorComponents/HTMLBlot.js';
-    import ImageBlot from './editorComponents/ImageBlot.js';
-    import DividerBlot from './editorComponents/DividerBlot.js';
-    import HTMLEmbedder from './editorComponents/HTMLEmbedder.vue';
-    import ImageUploader from './editorComponents/ImageUploader.vue';
+    import Quill from 'quill'
+    import Parchment from 'parchment'
+    import HTMLBlot from './editorComponents/HTMLBlot.js'
+    import ImageBlot from './editorComponents/ImageBlot.js'
+    import DividerBlot from './editorComponents/DividerBlot.js'
+    import HTMLEmbedder from './editorComponents/HTMLEmbedder.vue'
+    import ImageUploader from './editorComponents/ImageUploader.vue'
 
     /**
      * Create an instance of the QuillJS editor.

resources/js/components/ImagePicker.vue

@@ -1,5 +1,5 @@
 <script type="text/ecmascript-6">
-    import axios from 'axios';
+    import axios from 'axios'
 
     /**
      * Create the default image picker.

resources/js/components/LineChart.vue

@@ -17,6 +17,16 @@
 
                 labels: Object.keys(this.views)
             }
+        },
+
+        methods: {
+            pluralize(string, count) {
+                if (count > 1 || count === 0) {
+                    return ' ' + string + 's';
+                } else {
+                    return ' ' + string;
+                }
+            }
         }
     }
 </script>
@@ -40,7 +50,7 @@
                 :dataSets="this.points"
                 :tooltipOptions="{
                     formatTooltipX: d => moment(d, 'YYYY-MM-DD').format('dddd, MMMM Do'),
-                    formatTooltipY: d => d + ' views',
+                    formatTooltipY: d => d + pluralize('view', d),
                 }">
         </vue-frappe>
     </div>

resources/js/components/editorComponents/DividerBlot.js

@@ -9,6 +9,7 @@ import Quill from 'quill';
 let BlockEmbed = Quill.import('blots/block/embed');
 
 class DividerBlot extends BlockEmbed {
+    //
 }
 
 DividerBlot.blotName = 'divider';

resources/js/components/editorComponents/HTMLBlot.js

@@ -4,7 +4,7 @@
  * @source https://github.com/writingink/wink
  */
 
-import Quill from 'quill';
+import Quill from 'quill'
 
 let BlockEmbed = Quill.import('blots/block/embed');
 

src/Post.php

@@ -188,7 +188,7 @@ public function getPopularReadingTimesAttribute($value): array
             $end_time = $start_time->copy()->addMinutes(60);
 
             // Find the percentage based on the value
-            $percentage = round($value / $data->count() * 100);
+            $percentage = number_format($value / $data->count() * 100, 2);
 
             // Get a human-readable hour range and floating percentage
             $popular_reading_times->put(sprintf('%s - %s', $start_time->format('g:i A'), $end_time->format('g:i A')), $percentage);

yarn.lock

@@ -612,9 +612,9 @@
     to-fast-properties "^2.0.0"
 
 "@fortawesome/fontawesome-free@^5.7":
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.0.tgz#e22f161b0f95d633f4223b43773241edfcba6fdc"
-  integrity sha512-fWy8Aq/O8sj3EFyeubTsWSdpbmcJiIXoUcO0AaAXazQ0SuxnDQv+Q5tUSJLvEkmuj/x9kRTOKreizQX5GSuwmg==
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.1.tgz#cbafbfe8894c4e3e3c3a9da6774e249ac1f2da8b"
+  integrity sha512-GJtx6e55qLEOy2gPOsok2lohjpdWNGrYGtQx0FFT/++K4SYx+Z8LlPHdQBaFzKEwH5IbBB4fNgb//uyZjgYXoA==
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
@@ -2238,9 +2238,9 @@ [email protected]:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.116:
-  version "1.3.118"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.118.tgz#5c82b0445a40934e6cae9c2f40bfaaa986ea44a3"
-  integrity sha512-/1FpHvmKmKo2Z6CCza2HfkrKvKhU7Rq4nvyX1FOherdTrdTufhVrJbCrcrIqgqUCI+BG6JC2rlY4z5QA1G0NOw==
+  version "1.3.119"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.119.tgz#9a7770da667252aeb81f667853f67c2b26e00197"
+  integrity sha512-3mtqcAWa4HgG+Djh/oNXlPH0cOH6MmtwxN1nHSaReb9P0Vn51qYPqYwLeoSuAX9loU1wrOBhFbiX3CkeIxPfgg==
 
 elliptic@^6.0.0:
   version "6.4.1"