From 8eea77f9b5ab63a3bb57b62858fd1eaf13779870 Mon Sep 17 00:00:00 2001 From: Cedric Karungu Date: Tue, 14 May 2024 18:39:35 +0200 Subject: [PATCH 1/3] fix: assigned Team Members --- apps/web/lib/features/task/task-assign-button.tsx | 5 +++-- apps/web/lib/features/task/task-card.tsx | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/web/lib/features/task/task-assign-button.tsx b/apps/web/lib/features/task/task-assign-button.tsx index 95a5dc7de..f13f11414 100644 --- a/apps/web/lib/features/task/task-assign-button.tsx +++ b/apps/web/lib/features/task/task-assign-button.tsx @@ -7,9 +7,10 @@ import { MouseEventHandler } from 'react'; type Props = { onClick?: MouseEventHandler; disabled: boolean; + iconClassName?: string } & IClassName; -export function TaskAssignButton({ onClick, disabled, className }: Props) { +export function TaskAssignButton({ onClick, disabled, className, iconClassName }: Props) { return ( ); } diff --git a/apps/web/lib/features/task/task-card.tsx b/apps/web/lib/features/task/task-card.tsx index c8f7106e1..8f227ce01 100644 --- a/apps/web/lib/features/task/task-card.tsx +++ b/apps/web/lib/features/task/task-card.tsx @@ -35,7 +35,7 @@ import { Text, VerticalSeparator } from 'lib/components'; -import ImageComponent, { ImageOverlapperProps } from 'lib/components/image-overlapper'; +import { ImageOverlapperProps } from 'lib/components/image-overlapper'; import Link from 'next/link'; import { useRouter } from 'next/navigation'; import { useCallback, useState } from 'react'; @@ -169,7 +169,7 @@ export function TaskCard(props: Props) { {viewType === 'unassign' && (
- + {/* */}
)} @@ -197,6 +197,7 @@ export function TaskCard(props: Props) { task={task} assignTask={memberInfo.assignTask} className="w-11 h-11 border border-[#0000001A] dark:border-[0.125rem] dark:border-[#28292F]" + iconClassName='text-primary dark:text-white' /> )} @@ -385,11 +386,13 @@ function TimerButtonCall({ function AssignTaskButtonCall({ task, assignTask, - className + className, + iconClassName }: { task: ITeamTask; assignTask: (task: ITeamTask) => Promise; className?: string; + iconClassName?: string; }) { const { disabled, @@ -407,6 +410,7 @@ function AssignTaskButtonCall({ }} disabled={activeTaskStatus ? disabled : task.status === 'closed'} className={clsxm('h-9 w-9', className)} + iconClassName={iconClassName} /> ); } From 41ca88575cb908f89c59e74e677212df161966fe Mon Sep 17 00:00:00 2001 From: Cedric Karungu Date: Tue, 14 May 2024 18:50:15 +0200 Subject: [PATCH 2/3] fix: deepscan --- apps/mobile/app.json | 91 ++++++++++++++++++++++++ apps/web/lib/features/task/task-card.tsx | 10 --- 2 files changed, 91 insertions(+), 10 deletions(-) create mode 100644 apps/mobile/app.json diff --git a/apps/mobile/app.json b/apps/mobile/app.json new file mode 100644 index 000000000..789b30161 --- /dev/null +++ b/apps/mobile/app.json @@ -0,0 +1,91 @@ +{"name": "ever-teams-mobile", +"displayName": "Ever Teams Mobile", +"expo": { + "name": "Ever Teams Mobile", + "slug": "ever-teams-mobile", + "version": "0.1.0", + "orientation": "portrait", + "icon": "./assets/images/ever-teams-logo.png", + "splash": { + "image": "./assets/images/splash-ever-teams.png", + "resizeMode": "cover", + "backgroundColor": "#ffffff" + }, + "owner": "everco", + "updates": { + "fallbackToCacheTimeout": 0, + "url": "https://u.expo.dev/2ff924e4-7a91-4b23-9db9-7453a8063bb0" + }, + "jsEngine": "hermes", + "assetBundlePatterns": ["**/*"], + "plugins": [ + [ + "expo-media-library", + { + "photosPermission": "Allow $(PRODUCT_NAME) to access your photos.", + "savePhotosPermission": "Allow $(PRODUCT_NAME) to save photos.", + "isAccessMediaLocationEnabled": true + } + ], + "sentry-expo", + [ + "expo-build-properties", + { + "android": { + "enableProguardInReleaseBuilds": true, + "extraProguardRules": "-keep public class com.horcrux.svg.** {*;}", + "allowBackup": false + } + } + ] + ], + "android": { + "icon": "./assets/images/app-icon-android-legacy-ever-teams.png", + "package": "ever.team", + "adaptiveIcon": { + "foregroundImage": "./assets/images/app-icon-android-adaptive-foreground-ever.png", + "backgroundImage": "./assets/images/app-icon-android-adaptive-background.png" + }, + "splash": { + "image": "./assets/images/splash-ever-teams.png", + "resizeMode": "cover", + "backgroundColor": "#ffffff" + }, + "permissions": [ + "android.permission.READ_EXTERNAL_STORAGE", + "android.permission.WRITE_EXTERNAL_STORAGE", + "android.permission.ACCESS_MEDIA_LOCATION" + ] + }, + "ios": { + "icon": "./assets/images/app-icon-ios-ever-teams.png", + "supportsTablet": true, + "bundleIdentifier": "co.ever.teams", + "splash": { + "image": "./assets/images/splash-ever-teams.png", + "tabletImage": "./assets/images/splash-logo-ever-teams-ios-tablet.png", + "resizeMode": "cover", + "backgroundColor": "#ffffff" + }, + "infoPlist": { + "NSCameraUsageDescription": "This app uses the camera to scan barcodes on event tickets.", + "NSPhotoLibraryUsageDescription": "Allow $(PRODUCT_NAME) to access your photos.", + "NSPhotoLibraryAddUsageDescription": "Allow $(PRODUCT_NAME) to save photos." + } + }, + "web": { + "favicon": "./assets/images/app-icon-web-favicon.png", + "splash": { + "image": "./assets/images/splash-logo-web-ever-teams.png", + "resizeMode": "contain", + "backgroundColor": "#ffffff" + } + }, + "extra": { + "eas": { + "projectId": "2ff924e4-7a91-4b23-9db9-7453a8063bb0" + } + }, + "runtimeVersion": "exposdk:48.0.0" +} +} diff --git a/apps/web/lib/features/task/task-card.tsx b/apps/web/lib/features/task/task-card.tsx index 8f227ce01..a5d0b9282 100644 --- a/apps/web/lib/features/task/task-card.tsx +++ b/apps/web/lib/features/task/task-card.tsx @@ -35,7 +35,6 @@ import { Text, VerticalSeparator } from 'lib/components'; -import { ImageOverlapperProps } from 'lib/components/image-overlapper'; import Link from 'next/link'; import { useRouter } from 'next/navigation'; import { useCallback, useState } from 'react'; @@ -123,14 +122,6 @@ export function TaskCard(props: Props) { const memberInfo = useTeamMemberCard(currentMember || undefined); const taskEdition = useTMCardTaskEdit(task); - const taskAssignee: ImageOverlapperProps[] = - task?.members?.map((member: any) => { - return { - id: member.user.id, - url: member.user.imageUrl, - alt: member.user.firstName - }; - }) || []; return ( <> @@ -169,7 +160,6 @@ export function TaskCard(props: Props) { {viewType === 'unassign' && (
- {/* */}
)} From 9dcf33ed269a89a9f31b60c62c0e1a142ee61d29 Mon Sep 17 00:00:00 2001 From: cedric karungu Date: Tue, 14 May 2024 18:59:56 +0200 Subject: [PATCH 3/3] Delete app.json --- apps/mobile/app.json | 91 -------------------------------------------- 1 file changed, 91 deletions(-) delete mode 100644 apps/mobile/app.json diff --git a/apps/mobile/app.json b/apps/mobile/app.json deleted file mode 100644 index 789b30161..000000000 --- a/apps/mobile/app.json +++ /dev/null @@ -1,91 +0,0 @@ -{"name": "ever-teams-mobile", -"displayName": "Ever Teams Mobile", -"expo": { - "name": "Ever Teams Mobile", - "slug": "ever-teams-mobile", - "version": "0.1.0", - "orientation": "portrait", - "icon": "./assets/images/ever-teams-logo.png", - "splash": { - "image": "./assets/images/splash-ever-teams.png", - "resizeMode": "cover", - "backgroundColor": "#ffffff" - }, - "owner": "everco", - "updates": { - "fallbackToCacheTimeout": 0, - "url": "https://u.expo.dev/2ff924e4-7a91-4b23-9db9-7453a8063bb0" - }, - "jsEngine": "hermes", - "assetBundlePatterns": ["**/*"], - "plugins": [ - [ - "expo-media-library", - { - "photosPermission": "Allow $(PRODUCT_NAME) to access your photos.", - "savePhotosPermission": "Allow $(PRODUCT_NAME) to save photos.", - "isAccessMediaLocationEnabled": true - } - ], - "sentry-expo", - [ - "expo-build-properties", - { - "android": { - "enableProguardInReleaseBuilds": true, - "extraProguardRules": "-keep public class com.horcrux.svg.** {*;}", - "allowBackup": false - } - } - ] - ], - "android": { - "icon": "./assets/images/app-icon-android-legacy-ever-teams.png", - "package": "ever.team", - "adaptiveIcon": { - "foregroundImage": "./assets/images/app-icon-android-adaptive-foreground-ever.png", - "backgroundImage": "./assets/images/app-icon-android-adaptive-background.png" - }, - "splash": { - "image": "./assets/images/splash-ever-teams.png", - "resizeMode": "cover", - "backgroundColor": "#ffffff" - }, - "permissions": [ - "android.permission.READ_EXTERNAL_STORAGE", - "android.permission.WRITE_EXTERNAL_STORAGE", - "android.permission.ACCESS_MEDIA_LOCATION" - ] - }, - "ios": { - "icon": "./assets/images/app-icon-ios-ever-teams.png", - "supportsTablet": true, - "bundleIdentifier": "co.ever.teams", - "splash": { - "image": "./assets/images/splash-ever-teams.png", - "tabletImage": "./assets/images/splash-logo-ever-teams-ios-tablet.png", - "resizeMode": "cover", - "backgroundColor": "#ffffff" - }, - "infoPlist": { - "NSCameraUsageDescription": "This app uses the camera to scan barcodes on event tickets.", - "NSPhotoLibraryUsageDescription": "Allow $(PRODUCT_NAME) to access your photos.", - "NSPhotoLibraryAddUsageDescription": "Allow $(PRODUCT_NAME) to save photos." - } - }, - "web": { - "favicon": "./assets/images/app-icon-web-favicon.png", - "splash": { - "image": "./assets/images/splash-logo-web-ever-teams.png", - "resizeMode": "contain", - "backgroundColor": "#ffffff" - } - }, - "extra": { - "eas": { - "projectId": "2ff924e4-7a91-4b23-9db9-7453a8063bb0" - } - }, - "runtimeVersion": "exposdk:48.0.0" -} -}