Merge branch 'main' into 466-feat-popup-on-edit-wheel-when-user-leaves

apps/mobile/src/libs/components/components.tsx

@@ -43,6 +43,7 @@ export {
 	ActivityIndicator,
 	FlatList,
 	Image,
+	ImageBackground,
 	KeyboardAvoidingView,
 	Pressable,
 	ScrollView,

apps/mobile/src/libs/components/page-switcher/page-switcher.tsx

@@ -9,13 +9,15 @@ import { styles } from "./style";
 
 type PageSwitcherProperties = {
 	activeTab: string;
+	isDisabled?: boolean;
 	onTabChange: (tab: string) => void;
 	style?: StyleProp<ViewStyle>;
 	tabs: string[];
 };
 
 const PageSwitcher: React.FC<PageSwitcherProperties> = ({
 	activeTab,
+	isDisabled = false,
 	onTabChange,
 	style,
 	tabs,
@@ -38,6 +40,7 @@ const PageSwitcher: React.FC<PageSwitcherProperties> = ({
 
 		return (
 			<TouchableOpacity
+				disabled={isDisabled}
 				key={tab}
 				onPress={handlePress(tab)}
 				style={[
@@ -46,6 +49,7 @@ const PageSwitcher: React.FC<PageSwitcherProperties> = ({
 					globalStyles.pv8,
 					styles.tab,
 					isActive ? styles.activeTab : styles.inactiveTab,
+					isDisabled && styles.disabledTab,
 				]}
 			>
 				<Text

apps/mobile/src/libs/components/page-switcher/style.ts

@@ -13,6 +13,9 @@ const styles = StyleSheet.create({
 		backgroundColor: BaseColor.BG_LIGHT,
 		borderRadius: 30,
 	},
+	disabledTab: {
+		opacity: 0.5,
+	},
 	inactive: {
 		color: BaseColor.GRAY,
 	},

apps/mobile/src/libs/components/task-card/styles.ts

@@ -16,6 +16,7 @@ const styles = StyleSheet.create({
 		backgroundColor: BaseColor.BG_WHITE,
 	},
 	container: {
+		backgroundColor: BaseColor.BG_WHITE,
 		borderColor: BaseColor.BG_LIGHT,
 		borderRadius: 16,
 		borderWidth: 1,

apps/mobile/src/libs/helpers/get-active-and-expired-tasks/get-active-and-expired-tasks.helper.ts

@@ -0,0 +1,34 @@
+import { TaskStatus } from "~/libs/enums/enums";
+import { type TaskDto } from "~/packages/tasks/tasks";
+
+type ActiveAndExpiredTasks = {
+	activeTasks: TaskDto[];
+	expiredTasks: TaskDto[];
+};
+
+const MILLISECONDS_PER_MINUTE = 60_000;
+
+const getActiveAndExpiredTasks = (tasks: TaskDto[]): ActiveAndExpiredTasks => {
+	const currentTimestamp = Date.now();
+	const expiredTasks: TaskDto[] = [];
+	const activeTasks: TaskDto[] = [];
+
+	for (const task of tasks) {
+		const { dueDate, status } = task;
+		const deadlineTimestamp = new Date(dueDate).getTime();
+		const timeToDeadline = deadlineTimestamp - currentTimestamp;
+
+		if (
+			timeToDeadline < MILLISECONDS_PER_MINUTE &&
+			status === TaskStatus.CURRENT
+		) {
+			expiredTasks.push(task);
+		} else {
+			activeTasks.push(task);
+		}
+	}
+
+	return { activeTasks, expiredTasks };
+};
+
+export { getActiveAndExpiredTasks };

apps/mobile/src/libs/helpers/helpers.ts

@@ -2,6 +2,7 @@ export { checkIfAndroid, checkIfIos } from "./check-platform/check-platform";
 export { createRadioButtonProperties } from "./create-radio-button-properties/create-radio-button-properties.helper";
 export { generateSliderGradientColors } from "./generate-slider-gradient-colors/generate-slider-gradient-colors.helper";
 export { generateSliderGradientLocations } from "./generate-slider-gradient-locations/generate-slider-gradient-locations.helper";
+export { getActiveAndExpiredTasks } from "./get-active-and-expired-tasks/get-active-and-expired-tasks.helper";
 export { getGradientColorsForCategory } from "./get-gradient-colors-for-category/get-gradient-colors-for-category.helper";
 export { getScreenWidth } from "./get-screen-width/get-screen-width.helper";
 export { getSecurityInputIconName } from "./get-security-input-icon-name/get-security-input-icon-name.helper";

apps/mobile/src/libs/hooks/hooks.ts

@@ -2,7 +2,7 @@ export { useAppDispatch } from "./use-app-dispatch/use-app-dispatch.hook";
 export { useAppForm } from "./use-app-form/use-app-form.hook";
 export { useAppRoute } from "./use-app-route/use-app-route.hook";
 export { useAppSelector } from "./use-app-selector/use-app-selector.hook";
-export { useNavigation } from "@react-navigation/native";
+export { useFocusEffect, useNavigation } from "@react-navigation/native";
 export { useCallback, useEffect, useMemo, useRef, useState } from "react";
 export { useController as useFormController } from "react-hook-form";
 export { useWindowDimensions } from "react-native";

apps/mobile/src/screens/tasks/libs/components/components.tsx

@@ -0,0 +1 @@
+export { EmptyTasksHeader } from "./empty-tasks-header/empty-tasks-header";

apps/mobile/src/screens/tasks/libs/components/empty-tasks-header/empty-tasks-header.tsx

@@ -0,0 +1,32 @@
+import React from "react";
+
+import { Text, View } from "~/libs/components/components";
+import { globalStyles } from "~/libs/styles/styles";
+
+import { styles } from "./styles";
+
+type Properties = {
+	content: string;
+};
+
+const EmptyTasksHeader: React.FC<Properties> = ({ content }) => {
+	return (
+		<View
+			style={[
+				globalStyles.flex1,
+				globalStyles.alignItemsCenter,
+				globalStyles.justifyContentCenter,
+			]}
+		>
+			<Text
+				preset="subheading"
+				style={[globalStyles.ph32, styles.content]}
+				weight="bold"
+			>
+				{content}
+			</Text>
+		</View>
+	);
+};
+
+export { EmptyTasksHeader };

apps/mobile/src/screens/tasks/libs/components/empty-tasks-header/styles.ts

@@ -0,0 +1,9 @@
+import { StyleSheet } from "react-native";
+
+const styles = StyleSheet.create({
+	content: {
+		textAlign: "center",
+	},
+});
+
+export { styles };

apps/mobile/src/screens/tasks/libs/enums/enums.ts

@@ -1,3 +1,2 @@
 export { TaskTab } from "./task-tab.enum";
-export { TasksMode } from "./tasks-mode.enum";
 export { TaskStatus } from "shared";

apps/mobile/src/screens/tasks/styles.ts

@@ -3,9 +3,19 @@ import { StyleSheet } from "react-native";
 import { BaseColor } from "~/libs/enums/enums";
 
 const styles = StyleSheet.create({
+	background: {
+		backgroundColor: "rgba(255, 255, 255, 0.9)",
+	},
+	backgroundContainer: {
+		marginVertical: -10,
+	},
 	container: {
 		backgroundColor: BaseColor.BG_WHITE,
 	},
+	empty: {
+		opacity: 1,
+		textAlign: "center",
+	},
 	switch: {
 		maxWidth: "50%",
 	},

apps/mobile/src/screens/tasks/tasks.tsx

@@ -2,10 +2,11 @@ import React from "react";
 
 import {
 	ExpiredTasksModal,
+	FlatList,
+	ImageBackground,
 	LoaderWrapper,
 	PageSwitcher,
 	ScreenWrapper,
-	ScrollView,
 	TaskCard,
 	Text,
 	View,
@@ -16,82 +17,49 @@ import {
 	useAppSelector,
 	useCallback,
 	useEffect,
+	useFocusEffect,
 	useState,
 } from "~/libs/hooks/hooks";
 import { globalStyles } from "~/libs/styles/styles";
-import { type ValueOf } from "~/libs/types/types";
+import { type ImageSourcePropType } from "~/libs/types/types";
 import { type TaskDto } from "~/packages/tasks/tasks";
 import { type UserDto } from "~/packages/users/users";
 import { actions as taskActions } from "~/slices/task/task";
 import { actions as userActions } from "~/slices/users/users";
 
-import { TasksMode, TaskStatus, TaskTab } from "./libs/enums/enums";
-import { getMillisecondsLeft } from "./libs/helpers/helpers";
+import { EmptyTasksHeader } from "./libs/components/components";
+import { TaskStatus, TaskTab } from "./libs/enums/enums";
 import { styles } from "./styles";
 
-const MILLISECONDS_PER_MINUTE = 60_000;
-
 const Tasks: React.FC = () => {
 	const dispatch = useAppDispatch();
 
 	const authenticatedUser = useAppSelector(({ auth }) => auth.user);
-	const { activeTasks, dataStatus, expiredTasks, tasks } = useAppSelector(
+	const { activeTasks, dataStatus, expiredTasks, pastTasks } = useAppSelector(
 		({ tasks }) => tasks,
 	);
 
-	const [mode, setMode] = useState<ValueOf<typeof TasksMode>>(
-		TasksMode.CURRENT,
-	);
+	const [isCurrentMode, setIsCurrentMode] = useState<boolean>(true);
 
 	const hasExpiredTasks = expiredTasks.length > NumericalValue.ZERO;
-	const taskbarTasks = mode === TasksMode.CURRENT ? activeTasks : tasks;
+	const taskbarTasks = isCurrentMode ? activeTasks : pastTasks;
 
 	useEffect(() => {
 		void dispatch(
 			userActions.getById({ id: (authenticatedUser as UserDto).id }),
 		);
 	}, [dispatch, authenticatedUser]);
 
-	useEffect(() => {
-		if (mode === TasksMode.CURRENT) {
+	useFocusEffect(
+		useCallback(() => {
 			void dispatch(taskActions.getCurrentTasks());
-		}
-
-		if (mode === TasksMode.PAST) {
 			void dispatch(taskActions.getPastTasks());
-		}
-	}, [dispatch, mode]);
-
-	useEffect(() => {
-		const currentTime = Date.now();
-		const expired: TaskDto[] = [];
-		const active: TaskDto[] = [];
-
-		for (const task of tasks) {
-			const { dueDate, status } = task;
-			const timeToDeadline = getMillisecondsLeft(currentTime, dueDate);
-
-			if (
-				timeToDeadline < MILLISECONDS_PER_MINUTE &&
-				status === TaskStatus.CURRENT
-			) {
-				expired.push(task);
-			} else {
-				active.push(task);
-			}
-		}
-
-		void dispatch(taskActions.setActiveTasks(active));
-		void dispatch(taskActions.setExpiredTasks(expired));
-	}, [tasks, dispatch]);
+		}, [dispatch]),
+	);
 
 	const handleModeToggle = useCallback(() => {
-		setMode((previousState) => {
-			return previousState === TasksMode.CURRENT
-				? TasksMode.PAST
-				: TasksMode.CURRENT;
-		});
-	}, []);
+		setIsCurrentMode(!isCurrentMode);
+	}, [isCurrentMode]);
 
 	const handleSkip = useCallback(
 		(id: number): void => {
@@ -116,6 +84,34 @@ const Tasks: React.FC = () => {
 		[dispatch],
 	);
 
+	const handleRenderTask = useCallback(
+		({ item }: { item: TaskDto }) => {
+			return (
+				<TaskCard
+					key={item.id}
+					onComplete={handleComplete}
+					onExpire={handleExpired}
+					onSkip={handleSkip}
+					task={item}
+				/>
+			);
+		},
+		[handleComplete, handleExpired, handleSkip],
+	);
+
+	const handleKeyExtractor = useCallback(
+		(item: TaskDto) => item.id.toString(),
+		[],
+	);
+
+	const emptyTasksComponent = useCallback(() => {
+		const content = isCurrentMode
+			? "You don't have any active tasks"
+			: "You don't have any past tasks";
+
+		return <EmptyTasksHeader content={content} />;
+	}, [isCurrentMode]);
+
 	return (
 		<ScreenWrapper edges={["top", "left", "right"]} style={styles.container}>
 			<LoaderWrapper isLoading={dataStatus === DataStatus.PENDING}>
@@ -136,27 +132,31 @@ const Tasks: React.FC = () => {
 								My Tasks
 							</Text>
 							<PageSwitcher
-								activeTab={
-									mode === TasksMode.CURRENT ? TaskTab.ACTIVE : TaskTab.PAST
-								}
+								activeTab={isCurrentMode ? TaskTab.ACTIVE : TaskTab.PAST}
 								onTabChange={handleModeToggle}
 								style={[globalStyles.flex1, styles.switch]}
 								tabs={[TaskTab.ACTIVE, TaskTab.PAST]}
 							/>
 						</View>
-						<ScrollView
-							contentContainerStyle={[globalStyles.gap8, globalStyles.p16]}
+						<ImageBackground
+							resizeMode="cover"
+							source={
+								require("~/assets/images/background.png") as ImageSourcePropType
+							}
+							style={[globalStyles.flex1, styles.backgroundContainer]}
 						>
-							{taskbarTasks.map((task) => (
-								<TaskCard
-									key={task.id}
-									onComplete={handleComplete}
-									onExpire={handleExpired}
-									onSkip={handleSkip}
-									task={task}
-								/>
-							))}
-						</ScrollView>
+							<FlatList
+								contentContainerStyle={[
+									globalStyles.gap8,
+									globalStyles.ph16,
+									globalStyles.pv24,
+								]}
+								data={taskbarTasks}
+								keyExtractor={handleKeyExtractor}
+								ListEmptyComponent={emptyTasksComponent}
+								renderItem={handleRenderTask}
+							/>
+						</ImageBackground>
 					</>
 				)}
 			</LoaderWrapper>