From df3d91ec8d9df7e9853df3f7d7b0c9e0b248789f Mon Sep 17 00:00:00 2001 From: cedric karungu Date: Sun, 31 Dec 2023 13:42:27 +0200 Subject: [PATCH 1/5] fix: remove scroll bar on Task Info of Team member card --- apps/web/lib/features/team/user-team-card/index.tsx | 2 +- apps/web/lib/features/team/user-team-card/task-info.tsx | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/web/lib/features/team/user-team-card/index.tsx b/apps/web/lib/features/team/user-team-card/index.tsx index e38354cbc..abf36816f 100644 --- a/apps/web/lib/features/team/user-team-card/index.tsx +++ b/apps/web/lib/features/team/user-team-card/index.tsx @@ -147,7 +147,7 @@ export function UserTeamCard({ diff --git a/apps/web/lib/features/team/user-team-card/task-info.tsx b/apps/web/lib/features/team/user-team-card/task-info.tsx index 6ede7fdbc..785027efa 100644 --- a/apps/web/lib/features/team/user-team-card/task-info.tsx +++ b/apps/web/lib/features/team/user-team-card/task-info.tsx @@ -12,7 +12,12 @@ type Props = IClassName & { export function TaskInfo({ className, memberInfo, edition, publicTeam }: Props) { return ( -
+
{/* task */}
{edition.task && ( From 244d9532146cae2727633542a8d2e6908d9bd52f Mon Sep 17 00:00:00 2001 From: cedric karungu Date: Tue, 2 Jan 2024 15:39:05 +0200 Subject: [PATCH 2/5] refactor: teeam member skeleton --- .../shared/skeleton/UserTeamCardSkeleton.tsx | 37 ++++++++++++++++--- .../lib/features/team-members-card-view.tsx | 4 +- apps/web/styles/globals.css | 4 +- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/apps/web/components/shared/skeleton/UserTeamCardSkeleton.tsx b/apps/web/components/shared/skeleton/UserTeamCardSkeleton.tsx index 8fd53544b..a35b04789 100644 --- a/apps/web/components/shared/skeleton/UserTeamCardSkeleton.tsx +++ b/apps/web/components/shared/skeleton/UserTeamCardSkeleton.tsx @@ -1,6 +1,7 @@ +import { clsxm } from '@app/utils'; import { Card, VerticalSeparator } from 'lib/components'; import { DraggerIcon } from 'lib/components/svgs'; -import Skeleton from 'react-loading-skeleton'; +// import Skeleton from 'react-loading-skeleton'; const UserTeamCardSkeletonCard = () => { return ( @@ -11,16 +12,16 @@ const UserTeamCardSkeletonCard = () => {
- +
-
-
- +
+
+
-
+
@@ -48,4 +49,28 @@ const UserTeamCardSkeletonCard = () => { ); }; +const Skeleton = ({ + height, + width, + borderRadius, + className +}: { + height: number; + width: number; + borderRadius: number; + className: string; +}) => { + console.log({ borderRadius }); + return ( +
+ ); +}; + export default UserTeamCardSkeletonCard; diff --git a/apps/web/lib/features/team-members-card-view.tsx b/apps/web/lib/features/team-members-card-view.tsx index 5c3f3df17..3a848ecb3 100644 --- a/apps/web/lib/features/team-members-card-view.tsx +++ b/apps/web/lib/features/team-members-card-view.tsx @@ -41,7 +41,7 @@ const TeamMembersCardView: React.FC = ({ handleChangeOrder(peopleClone[draggedOverTeamMember.current], dragTeamMember.current); } - const handleChangeOrder = (employee: OT_Member, order: number) => { + const handleChangeOrder = (employee: OT_Member, order: number) => { updateOrganizationTeamEmployeeOrderOnList(employee, order); }; @@ -122,7 +122,7 @@ const TeamMembersCardView: React.FC = ({ leaveFrom="opacity-100" leaveTo="opacity-0" > - {[1, 2].map((_, i) => { + {[0, 2].map((_, i) => { return (
  • diff --git a/apps/web/styles/globals.css b/apps/web/styles/globals.css index 6722ea21b..13a3584e6 100644 --- a/apps/web/styles/globals.css +++ b/apps/web/styles/globals.css @@ -295,7 +295,7 @@ html.dark { } } -@keyframes pulse { +/* @keyframes pulse { 0%, 100% { opacity: 1; @@ -304,7 +304,7 @@ html.dark { opacity: 1; transform: scale(1.2); } -} +} */ .progress-ring__circle { stroke-dasharray: 400, 400; From 71fd2a25feff3b4f9d46181ac578683deb1b067b Mon Sep 17 00:00:00 2001 From: cedric karungu Date: Tue, 2 Jan 2024 16:22:42 +0200 Subject: [PATCH 3/5] fix: refactor invite team member skeleton --- .../skeleton/InviteTeamCardSkeleton.tsx | 3 ++- .../components/shared/skeleton/Skeleton.tsx | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 apps/web/components/shared/skeleton/Skeleton.tsx diff --git a/apps/web/components/shared/skeleton/InviteTeamCardSkeleton.tsx b/apps/web/components/shared/skeleton/InviteTeamCardSkeleton.tsx index a29aa2500..f753f4375 100644 --- a/apps/web/components/shared/skeleton/InviteTeamCardSkeleton.tsx +++ b/apps/web/components/shared/skeleton/InviteTeamCardSkeleton.tsx @@ -1,4 +1,5 @@ -import Skeleton from 'react-loading-skeleton'; +// import Skeleton from 'react-loading-skeleton'; +import Skeleton from './Skeleton'; import { Card, VerticalSeparator } from 'lib/components'; import { DraggerIcon } from 'lib/components/svgs'; diff --git a/apps/web/components/shared/skeleton/Skeleton.tsx b/apps/web/components/shared/skeleton/Skeleton.tsx new file mode 100644 index 000000000..438226870 --- /dev/null +++ b/apps/web/components/shared/skeleton/Skeleton.tsx @@ -0,0 +1,27 @@ +import { clsxm } from '@app/utils'; + +const Skeleton = ({ + height, + width, + borderRadius, + className +}: { + height: number; + width: number; + borderRadius: number; + className: string; +}) => { + console.log({ borderRadius }); + return ( +
    + ); +}; + +export default Skeleton; From e596cc7a3213cea4a27ec0c3a2e9fa1706d38bd8 Mon Sep 17 00:00:00 2001 From: Ruslan K Date: Tue, 2 Jan 2024 16:11:22 +0100 Subject: [PATCH 4/5] Update UserTeamCardSkeleton.tsx --- apps/web/components/shared/skeleton/UserTeamCardSkeleton.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/web/components/shared/skeleton/UserTeamCardSkeleton.tsx b/apps/web/components/shared/skeleton/UserTeamCardSkeleton.tsx index a35b04789..59fa03c7d 100644 --- a/apps/web/components/shared/skeleton/UserTeamCardSkeleton.tsx +++ b/apps/web/components/shared/skeleton/UserTeamCardSkeleton.tsx @@ -1,7 +1,6 @@ import { clsxm } from '@app/utils'; import { Card, VerticalSeparator } from 'lib/components'; import { DraggerIcon } from 'lib/components/svgs'; -// import Skeleton from 'react-loading-skeleton'; const UserTeamCardSkeletonCard = () => { return ( @@ -59,8 +58,7 @@ const Skeleton = ({ width: number; borderRadius: number; className: string; -}) => { - console.log({ borderRadius }); +}) => { return (
    Date: Tue, 2 Jan 2024 16:23:16 +0100 Subject: [PATCH 5/5] Update InviteTeamCardSkeleton.tsx --- apps/web/components/shared/skeleton/InviteTeamCardSkeleton.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/web/components/shared/skeleton/InviteTeamCardSkeleton.tsx b/apps/web/components/shared/skeleton/InviteTeamCardSkeleton.tsx index f753f4375..3ce999fc9 100644 --- a/apps/web/components/shared/skeleton/InviteTeamCardSkeleton.tsx +++ b/apps/web/components/shared/skeleton/InviteTeamCardSkeleton.tsx @@ -1,4 +1,3 @@ -// import Skeleton from 'react-loading-skeleton'; import Skeleton from './Skeleton'; import { Card, VerticalSeparator } from 'lib/components'; import { DraggerIcon } from 'lib/components/svgs';