Skip to content

Commit

Permalink
chore: clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
makyinmars committed Dec 31, 2023
1 parent 16840fd commit 13a199f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
8 changes: 4 additions & 4 deletions apps/expo/src/app/(main)/portal/(modals)/tasks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export default function TasksPage() {
/>

<View className="flex items-center justify-center">
<Button className="w-64" onPress={onCreateTask}>
<Button className="w-64 bg-purple-600" onPress={onCreateTask}>
Add Task
</Button>
</View>
Expand Down Expand Up @@ -150,14 +150,14 @@ export default function TasksPage() {
className={`my-4 flex flex-col gap-4 rounded px-4 py-2 ${JSON.parse(item.name).status === "requested"
? "bg-red-500"
: JSON.parse(item.name).status === "cancelled"
? "bg-yellow-800"
: "bg-green-800"
? "bg-yellow-500"
: "bg-green-500"
}`}
>
<Text className="font-medium text-white">
{format(new Date(item.day), "h:mm a")}
</Text>
<Text className="text-gray-300">
<Text className="text-white">
{JSON.parse(item.name).description}
</Text>
<Text className="font-bold capitalize text-white">
Expand Down
15 changes: 7 additions & 8 deletions apps/expo/src/components/tasks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export default function Tasks() {
<Button
onPress={() => {
setTaskStatus("");
router.push("/portal/(modals)/tasks");
router.push("/portal/tasks");
}}
textClass="text-center"
>
Expand All @@ -92,13 +92,12 @@ export default function Tasks() {
})}
renderItem={({ item }) => (
<View
className={`ml-4 flex w-52 flex-col gap-4 rounded-xl p-2 ${
item.resource.status === "requested"
? "bg-red-500"
: item.resource.status === "cancelled"
? "bg-yellow-800"
: "bg-green-800"
}`}
className={`ml-4 flex w-52 flex-col gap-4 rounded-xl p-2 ${item.resource.status === "requested"
? "bg-red-500"
: item.resource.status === "cancelled"
? "bg-yellow-800"
: "bg-green-800"
}`}
>
<Text className="font-medium text-white">
{formatDateTime(item.resource.authoredOn!)}
Expand Down

0 comments on commit 13a199f

Please sign in to comment.