Merge pull request #1952 from ever-co/develop

Release

apps/web/app/hooks/features/useTeamTasks.ts

@@ -112,7 +112,7 @@ export function useTeamTasks() {
 				});
 			}
 
-			if (!user || activeTeamRef.current?.id) {
+			if (!user || !activeTeamRef.current?.id) {
 				return new Promise((response) => {
 					response(true);
 				});

apps/web/app/stores/task-filter.ts

@@ -0,0 +1,6 @@
+import { atom } from 'recoil';
+
+export const taskBlockFilterState = atom<'all' | 'running' | 'online' | 'pause' | 'idle' | 'suspended'>({
+	key: 'taskBlockFilterState',
+	default: 'all'
+});

apps/web/lib/components/radial-progress.tsx

@@ -0,0 +1,52 @@
+export default function RadialProgress({
+	radius = 24,
+	cx = 24,
+	cy = 24,
+	percentage = 55
+}: {
+	radius?: number;
+	cx?: number;
+	cy?: number;
+	percentage: number;
+}) {
+	const circumference = radius * 2 * Math.PI;
+
+	return (
+		<>
+			<div
+				x-data="{ scrollProgress: 0 }"
+				className="relative -rotate-90 inline-flex items-center justify-center overflow-hidden rounded-full"
+			>
+				<svg className="w-12 h-12">
+					<circle
+						className="text-gray-300"
+						strokeWidth="8"
+						stroke="currentColor"
+						fill="transparent"
+						r={radius}
+						cx={cx}
+						cy={cy}
+					/>
+					<circle
+						className="text-[#27AE60]"
+						strokeWidth="8"
+						strokeDasharray={circumference}
+						strokeDashoffset={`calc(${circumference} - ${(percentage / 100) * circumference})`}
+						strokeLinecap="round"
+						stroke="currentColor"
+						fill="transparent"
+						r={radius}
+						cx={cx}
+						cy={cy}
+					/>
+				</svg>
+				<span
+					className="absolute text-xs font-normal text-black dark:text-white rotate-90"
+					x-text={`${percentage}%`}
+				>
+					{percentage}%
+				</span>
+			</div>
+		</>
+	);
+}

apps/web/lib/components/separator.tsx

@@ -4,3 +4,11 @@ import { clsxm } from '@app/utils';
 export const VerticalSeparator = ({ className }: IClassName) => {
 	return <div className={clsxm('w-1 self-stretch border-l-[0.125rem] dark:border-l-[#FFFFFF14]', className)} />;
 };
+
+export const HorizontalSeparator = ({ className }: IClassName) => {
+	return (
+		<div className="px-4 w-full">
+			<div className={clsxm('h-1 w-full border-t-[0.125rem] dark:border-l-[#FFFFFF14]', className)} />
+		</div>
+	);
+};

apps/web/lib/components/svgs/icons.tsx

@@ -1305,6 +1305,46 @@ export function StopCircleIcon({ className }: IClassName) {
 	);
 }
 
+export function NotWorkingIcon({ className }: IClassName) {
+	return (
+		<svg
+			aria-hidden="true"
+			fill="none"
+			stroke="currentColor"
+			strokeWidth="1.5"
+			viewBox="0 0 24 24"
+			xmlns="http://www.w3.org/2000/svg"
+			className={clsxm('stroke-[#282048]', className)}
+		>
+			<path
+				d="M9.75 9.75l4.5 4.5m0-4.5l-4.5 4.5M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+				strokeLinecap="round"
+				strokeLinejoin="round"
+			></path>
+		</svg>
+	);
+}
+
+export function OnlineIcon({ className }: IClassName) {
+	return (
+		<svg
+			aria-hidden="true"
+			fill="none"
+			stroke="currentColor"
+			strokeWidth="1.5"
+			viewBox="0 0 24 24"
+			xmlns="http://www.w3.org/2000/svg"
+			className={clsxm('stroke-[#282048]', className)}
+		>
+			<path
+				d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+				strokeLinecap="round"
+				strokeLinejoin="round"
+			></path>
+		</svg>
+	);
+}
+
 //  ============================= Settings 4 Icon ============================= //
 
 export function Settings4Icon({ className }: IClassName) {
@@ -2221,13 +2261,13 @@ export function QuoteBlockIcon({ className }: IClassName) {
 	);
 }
 
-export function AddIcon({ 
+export function AddIcon({
 	className,
-	width=14,
-	height=14
+	width = 14,
+	height = 14
 }: IClassName<{
-	width?: number,
-	height?: number,
+	width?: number;
+	height?: number;
 }>) {
 	return (
 		<svg

apps/web/lib/features/index.ts

@@ -17,6 +17,8 @@ export * from './task/task-labels';
 export * from './task/task-displays';
 
 export * from './team/user-team-card';
+export * from './team/user-team-block';
+export * from './team/user-team-block/user-team-block-header';
 export * from './team-members';
 export * from './team/create-team-modal';
 export * from './team/teams-dropdown';

apps/web/lib/features/task/task-all-status-type.tsx

@@ -10,7 +10,15 @@ import {
 	useTaskStatusValue
 } from './task-status';
 
-export function TaskAllStatusTypes({ task, showStatus = false }: { task?: Nullable<ITeamTask>; showStatus?: boolean }) {
+export function TaskAllStatusTypes({
+	task,
+	showStatus = false,
+	toBlockCard = false
+}: {
+	task?: Nullable<ITeamTask>;
+	showStatus?: boolean;
+	toBlockCard?: boolean;
+}) {
 	const taskPriorities = useTaskPrioritiesValue();
 	const taskSizes = useTaskSizesValue();
 	const taskLabels = useTaskLabelsValue();
@@ -64,7 +72,7 @@ export function TaskAllStatusTypes({ task, showStatus = false }: { task?: Nullab
 						/>
 					)}
 
-					{task?.size && (
+					{task?.size && !toBlockCard && (
 						<TaskStatus
 							{...taskSizes[task?.size || 'Medium']}
 							className="rounded-[0.625rem]"

apps/web/lib/features/task/task-displays.tsx

@@ -29,7 +29,7 @@ export function TaskNameInfoDisplay({ task, className, taskTitleClassName, taskN
 					<span className={clsxm('text-gray-500 mr-1 font-normal', taskNumberClassName)}>
 						#{task?.taskNumber} {dash && '-'}
 					</span>
-					{task?.title}
+					<span>{task?.title.slice(0, 90)}</span>
 				</span>
 			</span>
 		</Tooltip>

apps/web/lib/features/task/task-filters.tsx

@@ -396,14 +396,16 @@ function TaskStatusFilter({ hook }: { hook: I_TaskFilter }) {
 	);
 }
 
-function TaskNameFilter({
+export function TaskNameFilter({
 	value,
 	setValue,
-	close
+	close,
+	fullWidth = false
 }: {
 	value: string;
 	setValue: (v: string) => void;
 	close: () => void;
+	fullWidth?: boolean;
 }) {
 	const { t } = useTranslation();
 
@@ -426,7 +428,7 @@ function TaskNameFilter({
 	};
 
 	return (
-		<div className="flex flex-row w-1/2 gap-2 mt-3 ml-auto">
+		<div className={clsxm('flex flex-row w-1/2 gap-2 mt-3 ml-auto', fullWidth && '!w-full')}>
 			<InputField
 				value={tempValue}
 				autoFocus={true}

apps/web/lib/features/task/task-progress-bar.tsx

@@ -3,19 +3,22 @@ import { ITeamTask, Nullable } from '@app/interfaces';
 import { timerSecondsState } from '@app/stores';
 import { ProgressBar } from 'lib/components';
 import { useRecoilValue } from 'recoil';
+import RadialProgress from 'lib/components/radial-progress';
 
 export function TaskProgressBar({
 	isAuthUser,
 	task,
 	activeAuthTask,
-	showPercents
+	showPercents,
+	radial
 }: // memberInfo,
 {
 	isAuthUser: boolean | undefined;
 	task: Nullable<ITeamTask>;
 	activeAuthTask: boolean;
 	showPercents?: boolean;
 	memberInfo?: I_TeamMemberCardHook;
+	radial?: boolean;
 }) {
 	const seconds = useRecoilValue(timerSecondsState);
 	const { getEstimation /*, addSeconds*/ } = useTaskStatistics(isAuthUser && activeAuthTask ? seconds : 0);
@@ -36,9 +39,13 @@ export function TaskProgressBar({
 	const progress = getEstimation(
 		null,
 		task,
-		/*addSeconds || */ totalWorkedTasksTimer || 0,
+		/*addSeconds || */ totalWorkedTasksTimer || 1,
 		task?.estimate || 0 //<-- task?.estimate || currentMember?.lastWorkedTask?.estimate || 0 - removed as when certain task's timer was active it was affecting the timers with no estimations. Was taking user's previous task's estimation
 	);
 
-	return <ProgressBar width="100%" progress={`${progress || 0}%`} showPercents={showPercents} />;
+	return radial ? (
+		<RadialProgress percentage={progress} />
+	) : (
+		<ProgressBar width="100%" progress={`${progress || 0}%`} showPercents={showPercents} />
+	);
 }

apps/web/lib/features/task/task-times.tsx

@@ -12,9 +12,10 @@ type Props = {
 	memberInfo?: I_TeamMemberCardHook | OT_Member | any;
 	showDaily?: boolean;
 	showTotal?: boolean;
+	isBlock?: boolean;
 } & IClassName;
 
-export function TaskTimes({ className, task, memberInfo, showDaily = true, showTotal = true }: Props) {
+export function TaskTimes({ className, task, memberInfo, showDaily = true, showTotal = true, isBlock = false }: Props) {
 	// For public page
 	const { activeTeam } = useOrganizationTeams();
 	const currentMember = activeTeam?.members.find((member) => member.id === memberInfo?.member?.id || memberInfo?.id);
@@ -38,7 +39,11 @@ export function TaskTimes({ className, task, memberInfo, showDaily = true, showT
 
 	return (
 		<div className={clsxm(className)}>
-			<TimeInfo showDaily={showDaily} showTotal={showTotal} daily={{ h: dh, m: dm }} total={{ h, m }} />
+			{isBlock ? (
+				<TimeBlockInfo showDaily={showDaily} showTotal={showTotal} daily={{ h: dh, m: dm }} total={{ h, m }} />
+			) : (
+				<TimeInfo showDaily={showDaily} showTotal={showTotal} daily={{ h: dh, m: dm }} total={{ h, m }} />
+			)}
 		</div>
 	);
 }
@@ -83,6 +88,46 @@ function TimeInfo({
 	);
 }
 
+function TimeBlockInfo({
+	daily,
+	total,
+	showDaily = true,
+	showTotal = true
+}: {
+	daily: { h: number; m: number };
+	total: { h: number; m: number };
+	showDaily?: boolean;
+	showTotal?: boolean;
+}) {
+	const { t } = useTranslation();
+	return (
+		<div className="flex gap-3">
+			{showDaily && (
+				<div className=" text-base font-normal flex flex-col items-center ">
+					<span className="text-[#7B8089]">{t('common.TODAY')}:</span>
+					<Text className="text-lg font-semibold">
+						{daily.h}h : {daily.m}m
+					</Text>
+				</div>
+			)}
+
+			{showTotal && (
+				<div
+					className={clsxm(
+						'font-normal text-base flex flex-col items-center '
+						// showDaily && ['text-sm']
+					)}
+				>
+					<span className="text-[#7B8089]">{t('common.TOTAL')}:</span>
+					<Text className="text-lg font-semibold">
+						{total.h}h : {total.m}m
+					</Text>
+				</div>
+			)}
+		</div>
+	);
+}
+
 export function TodayWorkedTime({ className, memberInfo }: Omit<Props, 'task' | 'activeAuthTask'>) {
 	// Get current timer seconds
 	const { activeTeam } = useOrganizationTeams();

apps/web/lib/features/team-members-block-view.tsx

@@ -0,0 +1,52 @@
+import * as React from 'react';
+import { OT_Member } from '@app/interfaces';
+import { Transition } from '@headlessui/react';
+import { UserTeamBlock } from './team/user-team-block';
+
+interface Props {
+	teamMembers: OT_Member[];
+	publicTeam: boolean;
+	currentUser: OT_Member | undefined;
+	teamsFetching: boolean;
+}
+
+const TeamMembersBlockView: React.FC<Props> = ({ teamMembers: members, publicTeam = false, currentUser }) => {
+	return (
+		<div className="mt-7">
+			{/* Current authenticated user members */}
+			<Transition
+				show={!!currentUser}
+				enter="transition-opacity duration-75"
+				enterFrom="opacity-0"
+				enterTo="opacity-100"
+				leave="transition-opacity duration-150"
+				leaveFrom="opacity-100"
+				leaveTo="opacity-0"
+			>
+				{/* <UserTeamBlock member={currentUser} publicTeam={publicTeam} /> */}
+			</Transition>
+			<div className="flex w-full items-center">
+				{members.map((member) => {
+					return (
+						<div className="p-1 w-full md:w-1/2  lg:w-1/4" key={member.id}>
+							<Transition
+								key={member.id}
+								show={true}
+								enter="transition-opacity duration-75"
+								enterFrom="opacity-0"
+								enterTo="opacity-100"
+								leave="transition-opacity duration-150"
+								leaveFrom="opacity-100"
+								leaveTo="opacity-0"
+							>
+								<UserTeamBlock member={member} publicTeam={publicTeam} />
+							</Transition>
+						</div>
+					);
+				})}
+			</div>
+		</div>
+	);
+};
+
+export default TeamMembersBlockView;