Skip to content

Commit

Permalink
Merge branch 'release/4.1.21'
Browse files Browse the repository at this point in the history
* release/4.1.21:
  refactored the float parsing for view counts
  fixed the missing read times
  • Loading branch information
austintoddj committed Apr 5, 2019
2 parents ab871bb + ea53999 commit a02a90a
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 23 deletions.
2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"/js/app.js": "/js/app.js?id=7ed9ca64baed70416578",
"/js/app.js": "/js/app.js?id=863f00cb958b96b4441a",
"/css/app.css": "/css/app.css?id=30702a620a23ba741c32",
"/css/app-dark.css": "/css/app-dark.css?id=ceb9852370c32c15e835",
"/js/app.js.map": "/js/app.js.map?id=9bbcbd4034997da44ae1",
"/js/app.js.map": "/js/app.js.map?id=d6ba47ca936cd965aed9",
"/favicon.png": "/favicon.png?id=d1ff042f5749eb7e2f66"
}
8 changes: 4 additions & 4 deletions resources/js/components/PostList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@
suffix = '';
} else if (n < 900000) {
let n_total = n / 1000;
format = n_total.toFixed(1);
format = parseFloat(n_total.toFixed(1));
suffix = 'K';
} else if (n < 900000000) {
let n_total = n / 1000000;
format = n_total.toFixed(1);
format = parseFloat(n_total.toFixed(1));
suffix = 'M';
} else if (n < 900000000000) {
let n_total = n / 1000000000;
format = n_total.toFixed(1);
format = parseFloat(n_total.toFixed(1));
suffix = 'B';
} else {
let n_total = n / 1000000000000;
format = n_total.toFixed(1);
format = parseFloat(n_total.toFixed(1));
suffix = 'T';
}
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Controllers/StatsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class StatsController extends Controller
public function index()
{
// Get all of the posts
$posts = Post::select('id', 'title', 'published_at', 'created_at')->withCount('views')->get();
$posts = Post::select('id', 'title', 'body', 'published_at', 'created_at')->withCount('views')->get();

// Filter out posts that are not published
$postList = $posts->filter(function ($value, $key) {
Expand Down
33 changes: 19 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2083,7 +2083,7 @@ deepmerge@^2.1.0:
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==

default-gateway@^4.0.1:
default-gateway@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
Expand Down Expand Up @@ -2266,9 +2266,9 @@ [email protected]:
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=

electron-to-chromium@^1.3.122:
version "1.3.122"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz#b32a0805f48557bd3c3b8104eadc7fa511b14a9a"
integrity sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw==
version "1.3.124"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==

elliptic@^6.0.0:
version "6.4.1"
Expand Down Expand Up @@ -3253,11 +3253,11 @@ ini@^1.3.4, ini@~1.3.0:
integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==

internal-ip@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.2.0.tgz#46e81b638d84c338e5c67e42b1a17db67d0814fa"
integrity sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==
version "4.3.0"
resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
dependencies:
default-gateway "^4.0.1"
default-gateway "^4.2.0"
ipaddr.js "^1.9.0"

interpret@^1.1.0:
Expand Down Expand Up @@ -3561,7 +3561,7 @@ js-tokens@^3.0.2:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=

js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.9.0:
js-yaml@^3.13.0, js-yaml@^3.9.0:
version "3.13.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.0.tgz#38ee7178ac0eea2c97ff6d96fff4b18c7d8cf98e"
integrity sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==
Expand Down Expand Up @@ -3996,7 +3996,12 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"

"mime-db@>= 1.38.0 < 2", mime-db@~1.38.0:
"mime-db@>= 1.38.0 < 2":
version "1.39.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.39.0.tgz#f95a20275742f7d2ad0429acfe40f4233543780e"
integrity sha512-DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw==

mime-db@~1.38.0:
version "1.38.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
Expand Down Expand Up @@ -5979,9 +5984,9 @@ supports-color@^6.1.0:
has-flag "^3.0.0"

svgo@^1.0.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.0.tgz#305a8fc0f4f9710828c65039bb93d5793225ffc3"
integrity sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw==
version "1.2.1"
resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.1.tgz#3fedde75a4016193e1c2608b5fdef6f3e4a9fd99"
integrity sha512-Y1+LyT4/y1ms4/0yxPMSlvx6dIbgklE9w8CIOnfeoFGB74MEkq8inSfEr6NhocTaFbyYp0a1dvNgRKGRmEBlzA==
dependencies:
chalk "^2.4.1"
coa "^2.0.2"
Expand All @@ -5990,7 +5995,7 @@ svgo@^1.0.0:
css-tree "1.0.0-alpha.28"
css-url-regex "^1.1.0"
csso "^3.5.1"
js-yaml "^3.12.0"
js-yaml "^3.13.0"
mkdirp "~0.5.1"
object.values "^1.1.0"
sax "~1.2.4"
Expand Down

0 comments on commit a02a90a

Please sign in to comment.