From bccb9a6f9c9c160a8997a7bcffa9e3aa520f1845 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 10 Mar 2020 15:26:34 -0500 Subject: [PATCH] Display favorites count on profile, fixes #126 --- .../gabsocial/components/panel/profile_stats_panel.js | 6 +++--- app/javascript/gabsocial/initial_state.js | 1 + app/serializers/initial_state_serializer.rb | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/javascript/gabsocial/components/panel/profile_stats_panel.js b/app/javascript/gabsocial/components/panel/profile_stats_panel.js index e69d6217..7ad089e2 100644 --- a/app/javascript/gabsocial/components/panel/profile_stats_panel.js +++ b/app/javascript/gabsocial/components/panel/profile_stats_panel.js @@ -1,7 +1,7 @@ import { defineMessages, injectIntl } from 'react-intl' import ImmutablePureComponent from 'react-immutable-pure-component' import ImmutablePropTypes from 'react-immutable-proptypes' -import { me } from '../../initial_state' +import { me, favouritesCount } from '../../initial_state' import { shortNumberFormat } from '../../utils/numbers' import PanelLayout from './panel_layout' import UserStat from '../user_stat' @@ -51,7 +51,7 @@ class ProfileStatsPanel extends ImmutablePureComponent { account.get('id') === me && } @@ -60,4 +60,4 @@ class ProfileStatsPanel extends ImmutablePureComponent { ) } -} \ No newline at end of file +} diff --git a/app/javascript/gabsocial/initial_state.js b/app/javascript/gabsocial/initial_state.js index 9d15fa03..88eedfcb 100644 --- a/app/javascript/gabsocial/initial_state.js +++ b/app/javascript/gabsocial/initial_state.js @@ -26,5 +26,6 @@ export const forceSingleColumn = !getMeta('advanced_layout'); export const promotions = initialState && initialState.promotions; export const unreadCount = getMeta('unread_count'); export const monthlyExpensesComplete = getMeta('monthly_expenses_complete'); +export const favouritesCount = getMeta('favourites_count'); export default initialState; diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index b9c09c08..9e5b042d 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -38,6 +38,7 @@ class InitialStateSerializer < ActiveModel::Serializer store[:is_staff] = object.current_account.user.staff? store[:unread_count] = unread_count object.current_account store[:monthly_expenses_complete] = Redis.current.get("monthly_funding_ammount") || 0 + store[:favourites_count] = object.current_account.favourites.count.to_s end store