Merge pull request #1915 from ever-co/develop

Release
ever-co · Nov 30, 2023 · 4458d93 · 4458d93
2 parents 3f22817 + d86276b
commit 4458d93
Show file tree

Hide file tree

Showing 16 changed files with 85 additions and 24 deletions.
diff --git a/apps/mobile/app/components/TimerCard.tsx b/apps/mobile/app/components/TimerCard.tsx
@@ -43,8 +43,10 @@ const TimerCard: FC<Props> = observer(() => {
 	return (
 		<View style={[styles.mainContainer, { borderTopColor: colors.border }]}>
 			<View style={styles.horizontal}>
-				<View style={styles.timeAndProgressBarWrapper}>
-					<Text style={[styles.timerText, { color: colors.primary }]}>
+				<View
+					style={[styles.timeAndProgressBarWrapper, { borderRightColor: colors.border, borderRightWidth: 2 }]}
+				>
+					<Text style={[styles.timerText, { color: colors.primary }]} numberOfLines={1}>
 						{pad(hours)}:{pad(minutes)}:{pad(seconds)}
 						<Text style={{ fontSize: screenWidth * 0.03, fontWeight: '600' }}>:{pad(ms_p)}</Text>
 					</Text>
@@ -56,7 +58,6 @@ const TimerCard: FC<Props> = observer(() => {
 						/>
 					</View>
 				</View>
-				<View style={{ height: '100%', width: 2, backgroundColor: colors.border }} />
 				<View style={[styles.timerBtn, { borderLeftColor: colors.border }]}>
 					<TimerButton />
 				</View>
@@ -84,7 +85,8 @@ const styles = EStyleSheet.create({
 		flexDirection: 'column',
 		justifyContent: 'space-between',
 		height: 70,
-		paddingBottom: 0
+		paddingBottom: 0,
+		flex: 0.9
 	},
 	horizontal: {
 		flexDirection: 'row',
@@ -101,10 +103,10 @@ const styles = EStyleSheet.create({
 	timerText: {
 		fontWeight: '600',
 		fontSize: screenWidth * 0.082,
-		color: '#1B005D',
 		marginTop: 0,
 		paddingTop: 0,
-		fontFamily: typography.fonts.PlusJakartaSans.semiBold
+		fontFamily: typography.fonts.PlusJakartaSans.semiBold,
+		width: '100%'
 	}
 });
 

diff --git a/apps/mobile/app/components/svgs/icons.tsx b/apps/mobile/app/components/svgs/icons.tsx
@@ -587,6 +587,11 @@ export const onlineAndTrackingTimeStatusIcon = `<svg
 			/>
 		</svg>`;
 
+export const onlineAndTrackingTimeAlternate = `<svg width="8" height="8" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+				<path d="M6.8838 4.17641L2.8039 6.6367C2.56371 6.78082 2.25488 6.60925 2.25488 6.32788V3.58278C2.25488 2.38523 3.54851 1.63719 4.58822 2.23425L6.16322 3.14013L6.88037 3.5519C7.11714 3.69258 7.12057 4.03572 6.8838 4.17641Z" fill="#307D50"/>
+				<path d="M7.08967 6.18718L5.69996 6.99012L4.31369 7.78963C3.81614 8.07444 3.25339 8.0161 2.84506 7.72787C2.64604 7.59061 2.67006 7.28522 2.87937 7.16169L7.24065 4.54699C7.44653 4.42346 7.71761 4.54012 7.75536 4.77689C7.84114 5.30875 7.62153 5.88179 7.08967 6.18718Z" fill="#307D50"/>
+				</svg>`;
+
 export const pauseStatusIcon = `<svg
 			width="8"
 			height="8"

diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx
@@ -264,6 +264,7 @@ const SidePopUp: FC<IMenuProps> = ({ props, setShowMenu, setEditTitle, setEnable
 				{isAssigned && (
 					<ListItem
 						textStyle={[styles.dropdownTxt, { color: colors.primary }]}
+						TextProps={{ numberOfLines: 1 }}
 						onPress={() => {
 							profile.unassignTask(task);
 							setShowMenu();

diff --git a/apps/mobile/app/screens/Authenticated/SettingScreen/Personal/index.tsx b/apps/mobile/app/screens/Authenticated/SettingScreen/Personal/index.tsx
@@ -88,7 +88,8 @@ export default PersonalSettings;
 
 const $contentContainer: ViewStyle = {
 	width: '100%',
-	alignItems: 'center'
+	alignItems: 'center',
+	zIndex: 10
 };
 
 const $dangerZoneContainer: ViewStyle = {

diff --git a/apps/mobile/app/screens/Authenticated/SettingScreen/Team/index.tsx b/apps/mobile/app/screens/Authenticated/SettingScreen/Team/index.tsx
@@ -118,7 +118,8 @@ export default TeamSettings;
 
 const $contentContainer: ViewStyle = {
 	width: '100%',
-	alignItems: 'center'
+	alignItems: 'center',
+	zIndex: 10
 };
 
 const $dangerZoneContainer: ViewStyle = {

diff --git a/apps/mobile/app/screens/Authenticated/SettingScreen/components/UpdateFullNameForm.tsx b/apps/mobile/app/screens/Authenticated/SettingScreen/components/UpdateFullNameForm.tsx
@@ -101,7 +101,8 @@ const UpdateFullNameForm = observer(
 					paddingHorizontal: 25,
 					paddingTop: 26,
 					paddingBottom: 40,
-					height: 349
+					height: 349,
+					zIndex: 100
 				}}
 			>
 				<View style={{ flex: 3 }}>

diff --git a/apps/mobile/app/screens/Authenticated/SettingScreen/components/UserRemoveAccount.tsx b/apps/mobile/app/screens/Authenticated/SettingScreen/components/UserRemoveAccount.tsx
@@ -88,7 +88,7 @@ const styles = StyleSheet.create({
 		shadowOffset: { width: 0, height: 5 },
 		shadowOpacity: 1,
 		width: 84,
-		zIndex: 1000
+		zIndex: 99
 	},
 	container: {
 		width: '100%'
@@ -100,7 +100,7 @@ const styles = StyleSheet.create({
 		height: '100%',
 		paddingHorizontal: 25,
 		paddingTop: 56,
-		zIndex: 999
+		zIndex: 99
 	},
 	title: {
 		fontFamily: typography.primary.semiBold,
@@ -110,7 +110,7 @@ const styles = StyleSheet.create({
 	},
 	transparentContainer: {
 		height: '5%',
-		zIndex: 1000
+		zIndex: 100
 	},
 	warningMessage: {
 		color: '#6C7278',

diff --git a/apps/mobile/app/screens/Authenticated/SettingScreen/index.tsx b/apps/mobile/app/screens/Authenticated/SettingScreen/index.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable react-native/no-inline-styles */
 import React, { FC, useState } from 'react';
-import { View, ViewStyle, Dimensions, TouchableWithoutFeedback, LogBox, StatusBar } from 'react-native';
+import { View, ViewStyle, Dimensions, TouchableWithoutFeedback, LogBox, StatusBar, Keyboard } from 'react-native';
 import Animated from 'react-native-reanimated';
 import BottomSheet from 'reanimated-bottom-sheet';
 import { BlurView } from 'expo-blur';
@@ -70,6 +70,7 @@ export const AuthenticatedSettingScreen: FC<AuthenticatedDrawerScreenProps<'Sett
 						<TouchableWithoutFeedback
 							onPress={() => {
 								setIsOpen(false);
+								Keyboard.dismiss();
 								sheetRef.current.snapTo(2);
 							}}
 						>
@@ -80,7 +81,7 @@ export const AuthenticatedSettingScreen: FC<AuthenticatedDrawerScreenProps<'Sett
 						<SettingHeader {..._props} />
 						<SectionTab activeTabId={activeTab} toggleTab={setActiveTab} />
 					</View>
-					<View style={{ flex: 4, paddingHorizontal: 20 }}>
+					<View style={{ flex: 4, paddingHorizontal: 20, zIndex: 10 }}>
 						{isLoading ? (
 							<View style={{ flex: 1, justifyContent: 'center', alignItems: 'center', width: '100%' }}>
 								<ActivityIndicator size={'small'} />
@@ -106,6 +107,7 @@ export const AuthenticatedSettingScreen: FC<AuthenticatedDrawerScreenProps<'Sett
 								onDismiss={() => {
 									setIsOpen(false);
 									sheetRef.current.snapTo(2);
+									Keyboard.dismiss();
 								}}
 								openBottomSheet={openBottomSheet}
 							/>
@@ -135,5 +137,5 @@ const $blurContainer: ViewStyle = {
 	width: '100%',
 	position: 'absolute',
 	top: 0,
-	zIndex: 1001
+	zIndex: 99
 };
diff --git a/apps/mobile/app/screens/Authenticated/TaskLabelScreen/index.tsx b/apps/mobile/app/screens/Authenticated/TaskLabelScreen/index.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-inline-styles */
 import React, { FC, useState } from 'react';
-import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, FlatList, StatusBar } from 'react-native';
+import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, FlatList, StatusBar, Keyboard } from 'react-native';
 import { AntDesign, Ionicons } from '@expo/vector-icons';
 import { Screen } from '../../../components';
 import { AuthenticatedDrawerScreenProps } from '../../../navigators/AuthenticatedNavigator';
@@ -130,6 +130,7 @@ export const TaskLabelScreen: FC<AuthenticatedDrawerScreenProps<'TaskLabelScreen
 							onDismiss={() => {
 								setEditMode(false);
 								setIsSheetOpen(false);
+								Keyboard.dismiss();
 								sheetRef.current.snapTo(1);
 							}}
 							onUpdateLabel={updateLabel}

diff --git a/apps/mobile/app/screens/Authenticated/TaskSizeScreen/index.tsx b/apps/mobile/app/screens/Authenticated/TaskSizeScreen/index.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-inline-styles */
 import React, { FC, useState } from 'react';
-import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, FlatList, StatusBar } from 'react-native';
+import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, FlatList, StatusBar, Keyboard } from 'react-native';
 import { AntDesign, Ionicons } from '@expo/vector-icons';
 import { Screen } from '../../../components';
 import { AuthenticatedDrawerScreenProps } from '../../../navigators/AuthenticatedNavigator';
@@ -131,6 +131,7 @@ export const TaskSizeScreen: FC<AuthenticatedDrawerScreenProps<'TaskSizeScreen'>
 						onDismiss={() => {
 							setEditMode(false);
 							setIsSheetOpen(false);
+							Keyboard.dismiss();
 							sheetRef.current.snapTo(1);
 						}}
 						onUpdateSize={updateSize}

diff --git a/apps/mobile/app/screens/Authenticated/TaskStatusScreen/index.tsx b/apps/mobile/app/screens/Authenticated/TaskStatusScreen/index.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-inline-styles */
 import React, { FC, useState } from 'react';
-import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, FlatList, StatusBar } from 'react-native';
+import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, FlatList, StatusBar, Keyboard } from 'react-native';
 import { AntDesign, Ionicons } from '@expo/vector-icons';
 import { Screen } from '../../../components';
 import { AuthenticatedDrawerScreenProps } from '../../../navigators/AuthenticatedNavigator';
@@ -128,6 +128,7 @@ export const TaskStatusScreen: FC<AuthenticatedDrawerScreenProps<'TaskStatus'>>
 						onDismiss={() => {
 							setEditMode(false);
 							setIsSheetOpen(false);
+							Keyboard.dismiss();
 							sheetRef.current.snapTo(1);
 						}}
 						onUpdateStatus={updateStatus}

diff --git a/apps/mobile/app/screens/Authenticated/TaskVersionScreen/index.tsx b/apps/mobile/app/screens/Authenticated/TaskVersionScreen/index.tsx
@@ -9,7 +9,8 @@ import {
 	StyleSheet,
 	ActivityIndicator,
 	FlatList,
-	StatusBar
+	StatusBar,
+	Keyboard
 } from 'react-native';
 import { AntDesign, Ionicons } from '@expo/vector-icons';
 import { Screen } from '../../../components';
@@ -137,6 +138,7 @@ export const TaskVersionScreen: FC<AuthenticatedDrawerScreenProps<'TaskVersion'>
 						onDismiss={() => {
 							setEditMode(false);
 							setIsSheetOpen(false);
+							Keyboard.dismiss();
 							sheetRef.current.snapTo(1);
 						}}
 						onUpdateVersion={updateTaskVersion}

diff --git a/apps/mobile/app/screens/Authenticated/TeamScreen/components/UserHeaderCard.tsx b/apps/mobile/app/screens/Authenticated/TeamScreen/components/UserHeaderCard.tsx
@@ -14,7 +14,8 @@ import { getTimerStatusValue } from '../../../../helpers/get-timer-status';
 import { SvgXml } from 'react-native-svg';
 import {
 	idleStatusIcon,
-	onlineAndTrackingTimeStatusIcon,
+	onlineAndTrackingTimeAlternate,
+	// onlineAndTrackingTimeStatusIcon,
 	pauseStatusIcon,
 	suspendedStatusIcon
 } from '../../../../components/svgs/icons';
@@ -27,7 +28,7 @@ const TimerStatus: FC<ITimerStatus> = ({ status }) => {
 
 	switch (status) {
 		case 'online':
-			iconSvgXml = onlineAndTrackingTimeStatusIcon;
+			iconSvgXml = onlineAndTrackingTimeAlternate;
 			break;
 		case 'pause':
 			iconSvgXml = pauseStatusIcon;

diff --git a/apps/web/lib/components/Kanban.tsx b/apps/web/lib/components/Kanban.tsx
@@ -46,7 +46,8 @@ function headerStyleChanger(snapshot: DraggableStateSnapshot, bgColor: any){
  * @param param0 
  * @returns 
  */
-function InnerItemList({items}: {
+function InnerItemList({items, title}: {
+    title: string,
     items: any[]
 }) {
     return (
@@ -61,6 +62,11 @@ function InnerItemList({items}: {
                     isDragging={dragSnapshot.isDragging}
                     isGroupedOver={Boolean(dragSnapshot.combineTargetFor)}
                     provided={dragProvided}
+                    style={title === 'review' && {
+                        borderWidth: '1px',
+                        borderColor: '#6FCF97',
+                        borderStyle: 'solid'
+                    }}
                 />
                 )}
             </Draggable>
@@ -82,14 +88,14 @@ function InnerList(props: {
     dropProvided: DroppableProvided,
     dropSnapshot: DroppableStateSnapshot
 }) {
-    const { items, dropProvided, dropSnapshot } = props;
+    const { items, dropProvided, dropSnapshot, title } = props;
 
     return (
 
         <div 
         style={getBackgroundColor(dropSnapshot)}
         ref={dropProvided.innerRef}>
-          <InnerItemList items={items} />
+          <InnerItemList items={items} title={title} />
             <>
             {dropProvided.placeholder}
             </>

diff --git a/apps/web/lib/components/kanban-card.tsx b/apps/web/lib/components/kanban-card.tsx
@@ -16,6 +16,27 @@ function getStyle(provided: DraggableProvided, style: any) {
     };
 }
 
+function setCommentIconColor(commentType: "tagged" | "untagged") {
+
+    let style;
+
+    if(commentType === "tagged"){
+        style = {
+            backgroundColor: '#D95F5F'
+        }
+    }else if(commentType === "untagged"){
+        style = {
+            backgroundColor: '#27AE60'
+        }
+    } else {
+        style = {
+
+        }
+    }
+
+    return style
+}
+
 function Tag({title, backgroundColor, color}: {
     title: string,
     backgroundColor: string,
@@ -170,6 +191,15 @@ export default function Item(props: any) {
                </div>
             </div>
         </div>
+        {item.hasComment !== "none" &&
+            (<div className="flex flex-row items-center justify-center rounded-full w-5 h-5 z-10 bg-[#e5e7eb] dark:bg-[#181920] absolute top-0 right-0">
+                <div 
+                    className="w-3.5 h-3.5 rounded-full"
+                    style={setCommentIconColor(item.hasComment)}
+                >
+                </div>
+            </div>)
+        }
       </section>
     );
 }

diff --git a/apps/web/pages/kanban/index.tsx b/apps/web/pages/kanban/index.tsx
@@ -29,6 +29,7 @@ const demoData = {
         {
             id: '1',
             content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+            hasComment: "tagged",
             tags: [
                 {
                     id: 'tag-1',
@@ -48,6 +49,7 @@ const demoData = {
         {
             id: '4',
             content: 'demo content2',
+            hasComment: "none",
             tags: [
                 {
                     id: 'tag-1',
@@ -69,6 +71,7 @@ const demoData = {
         {
             id: '2',
             content: 'another content',
+            hasComment: "untagged",
             tags: [
                 {
                     id: 'tag-1',
@@ -88,6 +91,7 @@ const demoData = {
         {
             id: '5',
             content: 'another content2',
+            hasComment: "none",
             tags: [
                 {
                     id: 'tag-1',
@@ -109,6 +113,7 @@ const demoData = {
         {
             id: '3',
             content: 'a simple tes',
+            hasComment: "none",
             tags: [
                 {
                     id: 'tag-1',
@@ -128,6 +133,7 @@ const demoData = {
         {
             id: '6',
             content: 'a simple tes',
+            hasComment: "none",
             tags: [
                 {
                     id: 'tag-1',