Skip to content

Commit

Permalink
Merge pull request #306 from TogetherCrew/feat/copy-changes
Browse files Browse the repository at this point in the history
Feat/copy changes
  • Loading branch information
mehdi-torabiv authored May 3, 2024
2 parents a2caafc + 5ec586c commit cf9ae9b
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,23 @@ function TcAvailableIntegrationsItem({
data-testid='integration-icon'
/>
</div>
<TcButton
text='Connect'
startIcon={<BsPlus />}
className='max-w-full'
size='small'
onClick={() => integratePlatform()}
/>
{
disabled ? (
<TcText text='Coming soon...' variant='body2' color='gray' className='pt-1' />
) : <TcButton
text='Connect'
startIcon={<BsPlus />}
className='max-w-full'
size='small'
onClick={() => integratePlatform()}
/>
}
</div>
</TcIntegrationCard>

{disabled && (
<div
className='absolute inset-0 bg-gray-50 opacity-30'
className='absolute inset-0 bg-gray-50 opacity-30 cursor-not-allowed'
aria-hidden='true'
/>
)}
Expand Down
8 changes: 4 additions & 4 deletions src/components/pages/pageIndex/ActiveMemberComposition.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const ActiveMemberComposition = () => {
setStatistics([
{
label: 'Active Members',
description: 'Interacted at least once in the last 7 days',
description: 'Posted at least once in the last 7 days.',
percentageChange: activeMembers.totActiveMembersPercentageChange
? activeMembers.totActiveMembersPercentageChange
: 0,
Expand All @@ -56,7 +56,7 @@ const ActiveMemberComposition = () => {
{
label: 'Newly Active',
description:
'Started interacting for the first time in the last 7 days',
'Started posting for the first time in the last 7 days.',
percentageChange: activeMembers.newlyActivePercentageChange
? activeMembers.newlyActivePercentageChange
: 0,
Expand All @@ -66,7 +66,7 @@ const ActiveMemberComposition = () => {
},
{
label: 'Consistently Active',
description: 'Interacted weekly for at least 3 out of 4 weeks',
description: 'Posted weekly for at least 3 out of 4 weeks.',
percentageChange: activeMembers.consistentlyActivePercentageChange
? activeMembers.consistentlyActivePercentageChange
: 0,
Expand All @@ -93,7 +93,7 @@ const ActiveMemberComposition = () => {
},
{
label: 'Became Disengaged',
description: "Were active, but didn't interact in the last 2 weeks",
description: "Were active, but didn't post in the last 2 weeks",
percentageChange: activeMembers.becameDisengagedPercentageChange
? activeMembers.becameDisengagedPercentageChange
: 0,
Expand Down
8 changes: 4 additions & 4 deletions src/components/pages/statistics/ActiveMembersComposition.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export default function ActiveMembersComposition({
setStatistics([
{
label: 'Active Members',
description: 'Interacted at least once in the last 7 days',
description: 'Posted at least once in the last 7 days.',
percentageChange: activeMembers.totActiveMembersPercentageChange
? activeMembers.totActiveMembersPercentageChange
: 0,
Expand All @@ -151,7 +151,7 @@ export default function ActiveMembersComposition({
{
label: 'Newly Active',
description:
'Started interacting for the first time in the last 7 days',
'Started posting for the first time in the last 7 days.',
percentageChange: activeMembers.newlyActivePercentageChange
? activeMembers.newlyActivePercentageChange
: 0,
Expand All @@ -161,7 +161,7 @@ export default function ActiveMembersComposition({
},
{
label: 'Consistently Active',
description: 'Interacted weekly for at least 3 out of 4 weeks',
description: 'Posted weekly for at least 3 out of 4 weeks.',
percentageChange: activeMembers.consistentlyActivePercentageChange
? activeMembers.consistentlyActivePercentageChange
: 0,
Expand All @@ -188,7 +188,7 @@ export default function ActiveMembersComposition({
},
{
label: 'Became Disengaged',
description: "Were active, but didn't interact in the last 2 weeks",
description: "Were active, but didn't post in the last 2 weeks",
percentageChange: activeMembers.becameDisengagedPercentageChange
? activeMembers.becameDisengagedPercentageChange
: 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export default function DisengagedMembersComposition({
setStatistics([
{
label: 'Became Disengaged',
description: "Were active, but didn't interact in the last 2 weeks",
description: "Were active, but didn't post in the last 2 weeks",
percentageChange: disengagedMembers.becameDisengagedPercentageChange
? disengagedMembers.becameDisengagedPercentageChange
: 0,
Expand All @@ -132,7 +132,7 @@ export default function DisengagedMembersComposition({
{
label: 'Were Newly Active',
description:
'Started interacting for the first time in the last 7 days',
'Started posting for the first time in the last 7 days',
percentageChange: disengagedMembers.wereNewlyActivePercentageChange
? disengagedMembers.wereNewlyActivePercentageChange
: 0,
Expand All @@ -155,7 +155,7 @@ export default function DisengagedMembersComposition({
{
label: 'Were consistenly active',
description:
'Were interacting every week for at least 3 out of the last 4 weeks',
'Were posting every week for at least 3 out of the last 4 weeks',
percentageChange:
disengagedMembers.wereConsistentlyActivePercentageChange
? disengagedMembers.wereConsistentlyActivePercentageChange
Expand Down
6 changes: 3 additions & 3 deletions src/components/pages/statistics/Onboarding.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ describe('Onboarding component', () => {
'All members that joined in the last 7 days'
);
const stillActiveDescriptionElement = screen.getByText(
'Started interacting for the first time in the last 7 days'
'Started posting for the first time in the last 7 days'
);
const droppedDescriptionElement = screen.getByText(
'New members that remain interacting 2 weeks after their first interaction'
'New members that remain posting 2 weeks after their first interaction'
);
const newlyActiveDescriptionElement = screen.getByText(
"Were newly active within the last 2 weeks, but didn't interact in the last 7 days"
"Were newly active within the last 2 weeks, but didn't post in the last 7 days"
);

expect(joinedDescriptionElement).toBeInTheDocument();
Expand Down
6 changes: 3 additions & 3 deletions src/components/pages/statistics/Onboarding.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export default function Onboarding({
{
label: 'Newly Active',
description:
'Started interacting for the first time in the last 7 days',
'Started posting for the first time in the last 7 days',
percentageChange: onboardingMembers.newlyActivePercentageChange,
value: onboardingMembers.newlyActive,
colorBadge: 'bg-warning-500',
Expand All @@ -143,7 +143,7 @@ export default function Onboarding({
{
label: 'Still Active',
description:
'New members that remain interacting 2 weeks after their first interaction',
'New members that remain posting 2 weeks after their first interaction',
percentageChange: onboardingMembers.stillActivePercentageChange,
value: onboardingMembers.stillActive,
colorBadge: 'bg-secondary-75',
Expand All @@ -152,7 +152,7 @@ export default function Onboarding({
{
label: 'Dropped',
description:
"Were newly active within the last 2 weeks, but didn't interact in the last 7 days",
"Were newly active within the last 2 weeks, but didn't post in the last 7 days",
percentageChange: onboardingMembers.droppedPercentageChange,
value: onboardingMembers.dropped,
colorBadge: 'bg-error-500',
Expand Down

0 comments on commit cf9ae9b

Please sign in to comment.