From 2e110b6ccbb6dac07682aa099ca38720eff3a3a2 Mon Sep 17 00:00:00 2001 From: Peter Mein Date: Wed, 16 Dec 2015 13:43:46 +0100 Subject: [PATCH 1/4] Added user online indicator to post --- framework/core/js/forum/src/components/PostUser.js | 1 + framework/core/js/lib/helpers/useronline.js | 13 +++++++++++++ framework/core/less/forum/Post.less | 10 ++++++++++ 3 files changed, 24 insertions(+) create mode 100644 framework/core/js/lib/helpers/useronline.js diff --git a/framework/core/js/forum/src/components/PostUser.js b/framework/core/js/forum/src/components/PostUser.js index 071c333ed..551e61eea 100644 --- a/framework/core/js/forum/src/components/PostUser.js +++ b/framework/core/js/forum/src/components/PostUser.js @@ -45,6 +45,7 @@ export default class PostUser extends Component { return (
+ {useronline(user)}

{avatar(user, {className: 'PostUser-avatar'})}{' '}{username(user)} diff --git a/framework/core/js/lib/helpers/useronline.js b/framework/core/js/lib/helpers/useronline.js new file mode 100644 index 000000000..dc4804850 --- /dev/null +++ b/framework/core/js/lib/helpers/useronline.js @@ -0,0 +1,13 @@ +import icon from 'flarum/helpers/icon'; + +/** + * The `useronline` helper displays a green circle if the user is online + * + * @param {User} user + * @return {Object} + */ +export default function useronline(user) { + if (user.lastSeenTime() && user.isOnline()) { + return {icon('circle')}; + } +} diff --git a/framework/core/less/forum/Post.less b/framework/core/less/forum/Post.less index e79c8e00c..44b0ec6ad 100644 --- a/framework/core/less/forum/Post.less +++ b/framework/core/less/forum/Post.less @@ -49,6 +49,16 @@ font-size: 14px; } + .UserOnline { + & .icon { + font-size: 12px; + } + + & .fa-circle { + color: @online-user-circle-color; + } + } + .UserCard { position: absolute; top: -10px; From b6464a719eceaa4c1fa458f2b8b9811070e092a1 Mon Sep 17 00:00:00 2001 From: Peter Mein Date: Wed, 16 Dec 2015 13:48:38 +0100 Subject: [PATCH 2/4] Added missing import --- framework/core/js/forum/src/components/PostUser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/core/js/forum/src/components/PostUser.js b/framework/core/js/forum/src/components/PostUser.js index 551e61eea..b457b9f2d 100644 --- a/framework/core/js/forum/src/components/PostUser.js +++ b/framework/core/js/forum/src/components/PostUser.js @@ -2,6 +2,7 @@ import Component from 'flarum/Component'; import UserCard from 'flarum/components/UserCard'; import avatar from 'flarum/helpers/avatar'; import username from 'flarum/helpers/username'; +import useronline from 'flarum/helpers/useronline'; import listItems from 'flarum/helpers/listItems'; /** From e607297635e28a24180c73653400abc0ad9e3672 Mon Sep 17 00:00:00 2001 From: Peter Mein Date: Sat, 26 Dec 2015 13:06:31 +0100 Subject: [PATCH 3/4] Changed case on helper function Stub for renaming case of file --- framework/core/js/forum/src/components/PostUser.js | 4 ++-- .../{useronline.js => userOnline-rename-for-case-change.js} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename framework/core/js/lib/helpers/{useronline.js => userOnline-rename-for-case-change.js} (87%) diff --git a/framework/core/js/forum/src/components/PostUser.js b/framework/core/js/forum/src/components/PostUser.js index b457b9f2d..38e64f1f5 100644 --- a/framework/core/js/forum/src/components/PostUser.js +++ b/framework/core/js/forum/src/components/PostUser.js @@ -2,7 +2,7 @@ import Component from 'flarum/Component'; import UserCard from 'flarum/components/UserCard'; import avatar from 'flarum/helpers/avatar'; import username from 'flarum/helpers/username'; -import useronline from 'flarum/helpers/useronline'; +import userOnline from 'flarum/helpers/userOnline'; import listItems from 'flarum/helpers/listItems'; /** @@ -46,7 +46,7 @@ export default class PostUser extends Component { return (
- {useronline(user)} + {userOnline(user)}

{avatar(user, {className: 'PostUser-avatar'})}{' '}{username(user)} diff --git a/framework/core/js/lib/helpers/useronline.js b/framework/core/js/lib/helpers/userOnline-rename-for-case-change.js similarity index 87% rename from framework/core/js/lib/helpers/useronline.js rename to framework/core/js/lib/helpers/userOnline-rename-for-case-change.js index dc4804850..edf21b498 100644 --- a/framework/core/js/lib/helpers/useronline.js +++ b/framework/core/js/lib/helpers/userOnline-rename-for-case-change.js @@ -6,7 +6,7 @@ import icon from 'flarum/helpers/icon'; * @param {User} user * @return {Object} */ -export default function useronline(user) { +export default function userOnline(user) { if (user.lastSeenTime() && user.isOnline()) { return {icon('circle')}; } From 596ed23495d617e643c1cc0f7f3b99b76cc883ad Mon Sep 17 00:00:00 2001 From: Peter Mein Date: Sat, 26 Dec 2015 13:06:58 +0100 Subject: [PATCH 4/4] Fixed name to camel case --- .../{userOnline-rename-for-case-change.js => userOnline.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename framework/core/js/lib/helpers/{userOnline-rename-for-case-change.js => userOnline.js} (100%) diff --git a/framework/core/js/lib/helpers/userOnline-rename-for-case-change.js b/framework/core/js/lib/helpers/userOnline.js similarity index 100% rename from framework/core/js/lib/helpers/userOnline-rename-for-case-change.js rename to framework/core/js/lib/helpers/userOnline.js