Skip to content

Commit

Permalink
✨ add pending state to comment form and user search
Browse files Browse the repository at this point in the history
  • Loading branch information
@timbryandev
timbryandev committed Dec 15, 2023
1 parent e7aacb6 commit 130af55
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 60 deletions.
19 changes: 12 additions & 7 deletions lib/Comment/CommentText.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React, { useContext } from "react";
import Linkify from "linkifyjs/react";
import cx from "classnames";
import { Comment } from "lib";
import TooltipWrapper from "../TooltipWrapper";

// eslint-disable-next-line react/prop-types
function BlurBottom({ className }: any) {
Expand Down Expand Up @@ -36,18 +37,22 @@ function CommentText({
const username = subStr.substr(1);
const matches = users.filter((user: any) => user.display === username);
if (matches.length) {
const { display, name, pending } = matches[0];
const mentionsClass = cx("font-semi-bold", {
"text-purple-primary":
matches[0].display === (currentUser ? currentUser.display : ""),
display === (currentUser ? currentUser.display : ""),
"border-0 border-b-[1px] border-dashed": pending,
});

return (
<span
key={subStr}
title={matches[0].name}
className={mentionsClass}
>
{subStr}
<span key={subStr} title={name} className={mentionsClass}>
{pending ? (
<TooltipWrapper tooltipText="Invite pending">
{subStr}
</TooltipWrapper>
) : (
subStr
)}
</span>
);
}
Expand Down
119 changes: 66 additions & 53 deletions lib/Conversation/stories/mockData.ts
View file
Original file line number Diff line number Diff line change
@@ -1,92 +1,105 @@
import { action } from '@storybook/addon-actions';
import { action } from "@storybook/addon-actions";

export const mockUser = {
id: 2,
name: 'Bruce',
name: "Bruce",
avatar:
'https://gathercontent-production-avatars.s3-us-west-2.amazonaws.com/208205_yHGd7vA5HRxsnMQpES4UzjJ7Yxgn6Bp54165gqksRXyDJhuOnW88H6djhLJeE2BZ.jpg',
initials: 'BB',
display: 'brucebanner'
"https://gathercontent-production-avatars.s3-us-west-2.amazonaws.com/208205_yHGd7vA5HRxsnMQpES4UzjJ7Yxgn6Bp54165gqksRXyDJhuOnW88H6djhLJeE2BZ.jpg",
initials: "BB",
display: "brucebanner",
};

export const mockUserNoAvatar = {
id: 5,
name: 'Lynda',
initials: 'LC',
display: 'lyndacarter'
name: "Lynda",
initials: "LC",
display: "lyndacarter",
};

export const mockUserPending = {
id: 1337,
name: "Alan Turing",
initials: "AT",
display: "AlanT",
email: "[email protected]",
pending: "true",
};

export const mockUsers = [
mockUser,
mockUserNoAvatar,
mockUserPending,
{
id: 'saul',
display: 'saulgoodman',
name: 'Saul Goodman',
initials: 'SG',
email: '[email protected]'
id: "saul",
display: "saulgoodman",
name: "Saul Goodman",
initials: "SG",
email: "[email protected]",
},
{
id: '456',
display: 'jessepinkman',
name: 'Jesse Pinkman',
email: '[email protected]',
initials: 'JP',
url:
'https://d3iw72m71ie81c.cloudfront.net/2eae47ef-6f37-46fe-a02b-52cff401a8f9-me.jpg'
}
id: "456",
display: "jessepinkman",
name: "Jesse Pinkman",
email: "[email protected]",
initials: "JP",
url: "https://d3iw72m71ie81c.cloudfront.net/2eae47ef-6f37-46fe-a02b-52cff401a8f9-me.jpg",
},
];

export const mockComments = [
{
id: 'comment-id-1',
body:
'Here is a decent size comment that was created by someone who wanted to comment.',
createdAt: 'Just now',
id: "comment-id-1",
body: "Here is a decent size comment that was created by someone who wanted to comment.",
createdAt: "Just now",
author: mockUser,
createdBy: 2
createdBy: 2,
},
{
id: 'comment-id-4',
body: 'Here is another comment in reply to the original.',
createdAt: 'Just now',
id: "comment-id-4",
body: "Here is another comment in reply to the original.",
createdAt: "Just now",
author: mockUser,
createdBy: 2
createdBy: 2,
},
{
id: 'comment-id-2',
body:
'Comment body and a link to http://google.com and a mention @lyndacarter, another link to @saulgoodman',
createdAt: 'Just now',
id: "comment-pending-user",
body: "Hey @AlanT, tagging you for visibility",
createdAt: "2017-06-08 10:56:41",
author: mockUser,
createdBy: 2,
},
{
id: "comment-id-2",
body: "Comment body and a link to http://google.com and a mention @lyndacarter, another link to @saulgoodman",
createdAt: "Just now",
author: {
avatar:
'https://gathercontent-production-avatars.s3-us-west-2.amazonaws.com/26263_nH1Vuciy3psgQEUCVXZPTVU2RzUyMJ2arUIH7le8U4RrJ9LjFrtvEmyzf2XFgnZ7.png',
name: 'Ricardo',
initials: 'RB',
type: 'Guest user'
"https://gathercontent-production-avatars.s3-us-west-2.amazonaws.com/26263_nH1Vuciy3psgQEUCVXZPTVU2RzUyMJ2arUIH7le8U4RrJ9LjFrtvEmyzf2XFgnZ7.png",
name: "Ricardo",
initials: "RB",
type: "Guest user",
},
createdBy: 4
createdBy: 4,
},
{
id: 'comment-id-long',
body:
"Hey @lyndacarter here is a really long comment for you to read. Meow to be let in human is washing you why halp oh the horror flee scratch hiss bite annoy owner until he gives you food say meow repeatedly until belly rubs, feels good this human feeds me, i should be a god vommit food and eat it again for jump five feet high and sideways when a shadow moves climb a tree, wait for a fireman jump to fireman then scratch his face. Take a big fluffing crap 💩 kitten is playing with dead mouse pelt around the house and up and down stairs chasing phantoms but run around the house at 4 in the morning nap all day kitty kitty so check cat door for ambush 10 times before coming in. Leave fur on owners clothes. Hide when guests come over yowling nonstop the whole night and pose purrfectly to show my beauty and no, you can't close the door, i haven't decided whether or not i wanna go out. Hide at bottom of staircase to trip human cat fur is the new black , and it's 3am, time to create some chaos for jump around on couch, meow constantly until given food, why must they do that. Favor packaging over toy meow loudly just to annoy owners. Lie on your belly and purr when you are asleep spend all night ensuring people don't sleep sleep all day. Toilet paper attack claws fluff everywhere meow miao french ciao litterbox shove bum in owner's face like camera lens for caticus cuteicus yet lick face hiss at owner, pee a lot, and meow repeatedly scratch at fence purrrrrr eat muffins and poutine until owner comes back. Munch on tasty moths cats making all the muffins, so scamper. Weigh eight pounds but take up a full-size bed sleep everywhere, but not in my bed and meow walk on car leaving trail of paw prints on hood and windshield but eat from dog's food but meow meow and scratch the box. Chase ball of string the door is opening! how exciting oh, it's you, meh if human is on laptop sit on the keyboard or find empty spot in cupboard and sleep all day sleep on dog bed, force dog to sleep on floor. Lick the plastic bag mesmerizing birds why use post when this sofa is here purrrrrr. Roll on the floor purring your whiskers off find empty spot in cupboard and sleep all day attack feet, kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff but bleghbleghvomit my furball really tie the room together yet sleep everywhere, but not in my bed. Kitty scratches couch bad kitty stand in front of the computer screen, or pose purrfectly to show my beauty ask to be pet then attack owners hand you call this cat food. Annoy the old grumpy cat, start a fight and then retreat to wash when i lose sit by the fire so the door is opening!",
createdAt: '2017-06-08 09:56:41',
id: "comment-id-long",
body: "Hey @lyndacarter here is a really long comment for you to read. Meow to be let in human is washing you why halp oh the horror flee scratch hiss bite annoy owner until he gives you food say meow repeatedly until belly rubs, feels good this human feeds me, i should be a god vommit food and eat it again for jump five feet high and sideways when a shadow moves climb a tree, wait for a fireman jump to fireman then scratch his face. Take a big fluffing crap 💩 kitten is playing with dead mouse pelt around the house and up and down stairs chasing phantoms but run around the house at 4 in the morning nap all day kitty kitty so check cat door for ambush 10 times before coming in. Leave fur on owners clothes. Hide when guests come over yowling nonstop the whole night and pose purrfectly to show my beauty and no, you can't close the door, i haven't decided whether or not i wanna go out. Hide at bottom of staircase to trip human cat fur is the new black , and it's 3am, time to create some chaos for jump around on couch, meow constantly until given food, why must they do that. Favor packaging over toy meow loudly just to annoy owners. Lie on your belly and purr when you are asleep spend all night ensuring people don't sleep sleep all day. Toilet paper attack claws fluff everywhere meow miao french ciao litterbox shove bum in owner's face like camera lens for caticus cuteicus yet lick face hiss at owner, pee a lot, and meow repeatedly scratch at fence purrrrrr eat muffins and poutine until owner comes back. Munch on tasty moths cats making all the muffins, so scamper. Weigh eight pounds but take up a full-size bed sleep everywhere, but not in my bed and meow walk on car leaving trail of paw prints on hood and windshield but eat from dog's food but meow meow and scratch the box. Chase ball of string the door is opening! how exciting oh, it's you, meh if human is on laptop sit on the keyboard or find empty spot in cupboard and sleep all day sleep on dog bed, force dog to sleep on floor. Lick the plastic bag mesmerizing birds why use post when this sofa is here purrrrrr. Roll on the floor purring your whiskers off find empty spot in cupboard and sleep all day attack feet, kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff but bleghbleghvomit my furball really tie the room together yet sleep everywhere, but not in my bed. Kitty scratches couch bad kitty stand in front of the computer screen, or pose purrfectly to show my beauty ask to be pet then attack owners hand you call this cat food. Annoy the old grumpy cat, start a fight and then retreat to wash when i lose sit by the fire so the door is opening!",
createdAt: "2017-06-08 09:56:41",
author: mockUser,
createdBy: 2
}
createdBy: 2,
},
];

export const mockConversation = {
id: '1234567',
comments: mockComments
id: "1234567",
comments: mockComments,
};

export const mockActions = {
resolveConversation: action('resolveConversation'),
unresolveConversation: action('unresolveConversation'),
removeComment: action('removeComment'),
addComment: action('addComment'),
editComment: action('editComment'),
onSubscribeChange: action('onSubscriptionChange')
resolveConversation: action("resolveConversation"),
unresolveConversation: action("unresolveConversation"),
removeComment: action("removeComment"),
addComment: action("addComment"),
editComment: action("editComment"),
onSubscribeChange: action("onSubscriptionChange"),
};

0 comments on commit 130af55

Please sign in to comment.