From fe605d994095c01508f67057844068e11528ac22 Mon Sep 17 00:00:00 2001 From: Anish Date: Thu, 8 Feb 2024 14:38:40 +0500 Subject: [PATCH] 2139 fix home page design and skeleton structure (#2155) * working on home page * working on home page ui * fix the auth code issue * fix the home-page design and responsive * fix(Home): fixing the homepage design * fix(Home): fixing the homepage design * fix(Home): fixing the homepage design * fix(Home): align and size fix of dropdowns * fix(Home): align and size fix of dropdowns * fix(Timer): remove the timer default value * Update useTaskEstimation.ts * Update auth-user-task-input.tsx * fix the hidden value of inputs * fixed the css of auth input * fixed the css of auth input * fix the header of table in home page * fix(Header): ui of header and added
* fix(Header): ui of header and added
* fix(Header): ui of header and added
* fix(Header): ui of header and added
* deep scan issues fix --------- Co-authored-by: Ruslan K --- apps/web/app/[locale]/page.tsx | 43 ++++++----- .../app/hooks/features/useTaskEstimation.ts | 2 +- .../client/api/public-organization-team.ts | 4 +- .../requests/public-organization-team.ts | 1 + apps/web/lib/components/inputs/input.tsx | 2 +- .../web/lib/features/auth-user-task-input.tsx | 29 ++++---- apps/web/lib/features/task/task-estimate.tsx | 1 - .../team/user-team-card/task-skeleton.tsx | 49 ++++++------ apps/web/lib/features/timer/timer.tsx | 74 ++++++++++--------- 9 files changed, 113 insertions(+), 92 deletions(-) diff --git a/apps/web/app/[locale]/page.tsx b/apps/web/app/[locale]/page.tsx index a45d50da1..c92756061 100644 --- a/apps/web/app/[locale]/page.tsx +++ b/apps/web/app/[locale]/page.tsx @@ -37,6 +37,7 @@ import '../../styles/globals.css'; import { useRecoilValue } from 'recoil'; import { fullWidthState } from '@app/stores/fullWidth'; +import { ChevronDown } from 'lucide-react'; function MainPage() { const t = useTranslations(); @@ -60,14 +61,14 @@ function MainPage() { -
-
+
+
{/* */} -
+
- {/* Timer */} - {isTrackingEnabled ? : null} +
setShowInput((p) => !p)} + className="border dark:border-[#26272C] w-full rounded p-2 md:hidden flex justify-center mt-2" + > + + {showInput ? 'hide the issue input' : 'show the issue input'} + +
+ {isTrackingEnabled ? ( +
+ +
+ ) : null} ); } diff --git a/apps/web/app/hooks/features/useTaskEstimation.ts b/apps/web/app/hooks/features/useTaskEstimation.ts index 655a3871c..cd203d45f 100644 --- a/apps/web/app/hooks/features/useTaskEstimation.ts +++ b/apps/web/app/hooks/features/useTaskEstimation.ts @@ -17,7 +17,7 @@ export function useTaskEstimation(task?: Nullable) { useEffect(() => { const { h, m } = secondsToTime($task?.estimate || 0); setValue({ - hours: h.toString(), + hours: h ? h.toString() : '', minutes: pad(m).toString() }); }, [$task?.estimate]); diff --git a/apps/web/app/services/client/api/public-organization-team.ts b/apps/web/app/services/client/api/public-organization-team.ts index 9c9707ac8..d9838ee8e 100644 --- a/apps/web/app/services/client/api/public-organization-team.ts +++ b/apps/web/app/services/client/api/public-organization-team.ts @@ -26,8 +26,9 @@ export function getPublicOrganizationTeamsAPI(profile_link: string, team_id: str params[`relations[${i}]`] = rl; }); - const queries = qs.stringify(params); + const queries = qs.stringify(params); + const endpoint = GAUZY_API_BASE_SERVER_URL.value ? `/public/team/${profile_link}/${team_id}?${queries}` : `/public/team/${profile_link}/${team_id}?type=team`; @@ -48,6 +49,7 @@ export function getPublicOrganizationTeamsMiscDataAPI(profile_link: string, team params[`relations[${i}]`] = rl; }); + const queries = qs.stringify(params); const endpoint = GAUZY_API_BASE_SERVER_URL.value diff --git a/apps/web/app/services/server/requests/public-organization-team.ts b/apps/web/app/services/server/requests/public-organization-team.ts index da091a945..322742f55 100644 --- a/apps/web/app/services/server/requests/public-organization-team.ts +++ b/apps/web/app/services/server/requests/public-organization-team.ts @@ -31,6 +31,7 @@ export function getPublicOrganizationTeamRequest({ params[`relations[${i}]`] = rl; }); + const queries = qs.stringify(params || {}); return serverFetch({ diff --git a/apps/web/lib/components/inputs/input.tsx b/apps/web/lib/components/inputs/input.tsx index c1baa763c..de5e9d690 100644 --- a/apps/web/lib/components/inputs/input.tsx +++ b/apps/web/lib/components/inputs/input.tsx @@ -136,7 +136,7 @@ export const TimeInputField = forwardRef( /> {dash}
- {!loading ? label : } + {!loading ? label : }
); } diff --git a/apps/web/lib/features/auth-user-task-input.tsx b/apps/web/lib/features/auth-user-task-input.tsx index ab536698f..984030096 100644 --- a/apps/web/lib/features/auth-user-task-input.tsx +++ b/apps/web/lib/features/auth-user-task-input.tsx @@ -23,40 +23,39 @@ export function AuthUserTaskInput({ className }: IClassName) { showTaskNumber={true} autoAssignTaskAuth={isTrackingEnabled} /> - -
-
- {t('common.ESTIMATE')}: +
+
+ {t('common.ESTIMATE')}:
-
+
-
+ {/*
@@ -65,7 +64,7 @@ export function AuthUserTaskInput({ className }: IClassName) {
-
+
*/}
); diff --git a/apps/web/lib/features/task/task-estimate.tsx b/apps/web/lib/features/task/task-estimate.tsx index d4804d8e8..99afdb1c7 100644 --- a/apps/web/lib/features/task/task-estimate.tsx +++ b/apps/web/lib/features/task/task-estimate.tsx @@ -29,7 +29,6 @@ export function TaskEstimate({ _task, onCloseEdition, className, loadingRef, clo updateLoading, editableMode } = useTaskEstimation(_task); - const onCloseEditionRef = useCallbackRef(onCloseEdition); const closeable_fcRef = useCallbackRef(closeable_fc); diff --git a/apps/web/lib/features/team/user-team-card/task-skeleton.tsx b/apps/web/lib/features/team/user-team-card/task-skeleton.tsx index 186766258..343f6e391 100644 --- a/apps/web/lib/features/team/user-team-card/task-skeleton.tsx +++ b/apps/web/lib/features/team/user-team-card/task-skeleton.tsx @@ -43,29 +43,36 @@ export function InviteUserTeamSkeleton() { export function UserTeamCardHeader() { const t = useTranslations(); return ( -
- {/*
  • {t('common.STATUS')}
    • */} -
    {t('common.NAME')}
    -
    -
    {t('common.TASK')}
    -
    - -
    - {t('task.taskTableHead.TASK_WORK.TITLE')} -
    - {t('common.TASK')} +
    +
    +
    +

    {t('common.NAME')}

    - -
    -
    {t('common.ESTIMATE')}
    -
    - -
    - {t('task.taskTableHead.TOTAL_WORK.TITLE')} -
    - {t('common.TODAY')} + +
    {t('common.TASK')}
    + +
    + +
    +
    + +
    + {t('task.taskTableHead.TASK_WORK.TITLE')} +
    + {t('common.TASK')} +
    +     +
    +
    +
    {t('common.ESTIMATE')}
    +
    + + {t('task.taskTableHead.TOTAL_WORK.TITLE')} +
    + {t('common.TODAY')} +
    - +
    ); } diff --git a/apps/web/lib/features/timer/timer.tsx b/apps/web/lib/features/timer/timer.tsx index 4cf4a9b6a..108a17ec9 100644 --- a/apps/web/lib/features/timer/timer.tsx +++ b/apps/web/lib/features/timer/timer.tsx @@ -58,43 +58,51 @@ export function Timer({ className }: IClassName) { useHotkeys(HostKeys.START_STOP_TIMER, handleStartSTOPTimer); return ( -
    -
    -
    - - {pad(hours)}:{pad(minutes)}:{pad(seconds)} - :{pad(ms_p)} - - - -
    -
    - {timerStatus && timerStatus.running && ( - +
    +
    +
    + - - - )} + {pad(hours)}:{pad(minutes)}:{pad(seconds)} + :{pad(ms_p)} + + + +
    +
    + {timerStatus && timerStatus.running && ( + + + + )} +
    -
    + +