From e96caad892dde7dd0b47a281abe7424fbe2176cc Mon Sep 17 00:00:00 2001
From: Danie1T <82688216+Danie1T@users.noreply.github.com>
Date: Fri, 9 Aug 2024 02:24:26 -0400
Subject: [PATCH 1/2] Feat: home page card added to schedule page atm
---
.../components/pages/home/HomeRoomCard.tsx | 88 +++++++++++++++++++
.../pages/schedule/SchedulePage.tsx | 25 +++++-
2 files changed, 111 insertions(+), 2 deletions(-)
create mode 100644 frontend/src/components/pages/home/HomeRoomCard.tsx
diff --git a/frontend/src/components/pages/home/HomeRoomCard.tsx b/frontend/src/components/pages/home/HomeRoomCard.tsx
new file mode 100644
index 00000000..91002692
--- /dev/null
+++ b/frontend/src/components/pages/home/HomeRoomCard.tsx
@@ -0,0 +1,88 @@
+import React from "react"
+import {
+ Flex,
+ Heading,
+ Text,
+ Box,
+ Circle
+ } from "@chakra-ui/react";
+
+type Props = {
+ room: string | number;
+ residentId: number;
+ };
+
+const RoomCard = ({
+ room,
+ residentId
+}: Props): React.ReactElement => {
+
+ return (
+
+ {/* */}
+
+
+ Room {room} — ID{residentId}
+
+
+
+
+
+ 1
+
+
+
+ Pending Tasks
+
+
+
+
+
+ 2
+
+
+
+ Tasks Assigned
+
+
+
+
+
+ 2
+
+
+
+ Active Warnings
+
+
+
+
+
+ )
+}
+
+export default RoomCard;
diff --git a/frontend/src/components/pages/schedule/SchedulePage.tsx b/frontend/src/components/pages/schedule/SchedulePage.tsx
index cd1fcb7e..3e73bc95 100644
--- a/frontend/src/components/pages/schedule/SchedulePage.tsx
+++ b/frontend/src/components/pages/schedule/SchedulePage.tsx
@@ -1,10 +1,31 @@
import React from "react";
+import {
+ Flex,
+} from "@chakra-ui/react";
+
+import RoomCard from "../home/HomeRoomCard"
+import { residentsMockData } from "../../../mocks/residents";
+
+const renderRoomCards = residentsMockData.map(resident =>
+
+)
+
const SchedulePage = (): React.ReactElement => {
return (
-
+
Schedule Page
-
+
+ {renderRoomCards}
+
+
);
};
From 744e1b0c9ec3ecc04ee8acf18a24708c9e8d73d9 Mon Sep 17 00:00:00 2001
From: KathleenX7
Date: Sat, 21 Sep 2024 12:03:32 -0400
Subject: [PATCH 2/2] Run linter and remove comment
---
.../components/pages/home/HomeRoomCard.tsx | 153 ++++++++----------
1 file changed, 71 insertions(+), 82 deletions(-)
diff --git a/frontend/src/components/pages/home/HomeRoomCard.tsx b/frontend/src/components/pages/home/HomeRoomCard.tsx
index 91002692..8b29c76f 100644
--- a/frontend/src/components/pages/home/HomeRoomCard.tsx
+++ b/frontend/src/components/pages/home/HomeRoomCard.tsx
@@ -1,88 +1,77 @@
-import React from "react"
-import {
- Flex,
- Heading,
- Text,
- Box,
- Circle
- } from "@chakra-ui/react";
+import React from "react";
+import { Flex, Heading, Text, Box, Circle } from "@chakra-ui/react";
type Props = {
- room: string | number;
- residentId: number;
- };
+ room: string | number;
+ residentId: number;
+};
-const RoomCard = ({
- room,
- residentId
-}: Props): React.ReactElement => {
-
- return (
-
- {/* */}
-
-
- Room {room} — ID{residentId}
-
-
-
-
-
- 1
-
-
-
- Pending Tasks
-
-
-
-
-
- 2
-
-
-
- Tasks Assigned
-
-
-
-
-
- 2
-
-
-
- Active Warnings
-
-
-
+const RoomCard = ({ room, residentId }: Props): React.ReactElement => {
+ return (
+
+
+
+ Room {room} — ID{residentId}
+
+
+
+
+
+ 1
+
+
+
+ Pending Tasks
+
+
+
+
+
+ 2
+
+
+
+ Tasks Assigned
+
+
+
+
+
+ 2
+
+
+
+ Active Warnings
-
- )
-}
+
+
+
+
+ );
+};
export default RoomCard;