diff --git a/frontend/src/app/credentials/page.jsx b/frontend/src/app/credentials/page.jsx
index 30a55d8..5ece895 100644
--- a/frontend/src/app/credentials/page.jsx
+++ b/frontend/src/app/credentials/page.jsx
@@ -8,6 +8,7 @@ import SuccessToast from "../components/toast/success/successToast";
import ActionButton from "../components/actionButton/ActionButton";
import useIsMobile from "../hooks/useIsMobile";
import Card from "./card/Card";
+import MobileSearchBar from "../components/mobileSearchBar/MobileSearchBar";
const CredentialsPage = () => {
const isMobile = useIsMobile();
const sampleData = [
@@ -72,11 +73,10 @@ const CredentialsPage = () => {
/>
{isMobile ? (
diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css
index 2bac78e..2f708a5 100644
--- a/frontend/src/app/globals.css
+++ b/frontend/src/app/globals.css
@@ -55,7 +55,7 @@ a {
}
@media (max-width: 900px) {
:root {
- --table-font-size: 11px;
+ --table-font-size: 12px;
}
}
@media (max-width: 500px) {
diff --git a/frontend/src/app/hooks/useIsMobile.jsx b/frontend/src/app/hooks/useIsMobile.jsx
index 3ab084c..32b0027 100644
--- a/frontend/src/app/hooks/useIsMobile.jsx
+++ b/frontend/src/app/hooks/useIsMobile.jsx
@@ -1,14 +1,18 @@
import { useState, useEffect } from "react";
export default function useIsMobile(breakpoint = 768) {
- const [isMobile, setIsMobile] = useState(window.innerWidth <= breakpoint);
+ const [isMobile, setIsMobile] = useState(false);
useEffect(() => {
- const handleResize = () => {
+ const checkScreen = () => {
setIsMobile(window.innerWidth <= breakpoint);
};
- window.addEventListener("resize", handleResize);
- return () => window.removeEventListener("resize", handleResize);
+
+ checkScreen(); // run once on mount
+
+ window.addEventListener("resize", checkScreen);
+
+ return () => window.removeEventListener("resize", checkScreen);
}, [breakpoint]);
return isMobile;
diff --git a/frontend/src/app/organization/card/Card.jsx b/frontend/src/app/organization/card/Card.jsx
index fa1b170..730e448 100644
--- a/frontend/src/app/organization/card/Card.jsx
+++ b/frontend/src/app/organization/card/Card.jsx
@@ -8,11 +8,11 @@ const Card = (props) => {
Organization Name
-
ProjectMoonShot Inc.
+
{props?.data?.organizationName}
Date Created
-
2024-10-21 08:01:30.556 +0000 UTC
+
{props?.data?.dateCreated}
diff --git a/frontend/src/app/organization/page.jsx b/frontend/src/app/organization/page.jsx
index 6c25a31..8ea1c70 100644
--- a/frontend/src/app/organization/page.jsx
+++ b/frontend/src/app/organization/page.jsx
@@ -8,6 +8,7 @@ import DeleteIcon from "../components/icons/delete";
import ActionButton from "../components/actionButton/ActionButton";
import Card from "./card/Card";
import useIsMobile from "../hooks/useIsMobile";
+import MobileSearchBar from "../components/mobileSearchBar/MobileSearchBar";
const OrganizationPage = () => {
const isMobile = useIsMobile();
@@ -69,13 +70,10 @@ const OrganizationPage = () => {
/>
{isMobile ? (
-
-
-
-
-
-
-
+
+ {sampleData.map((data, key) => (
+
+ ))}
) : (
diff --git a/frontend/src/app/projects/page.jsx b/frontend/src/app/projects/page.jsx
index ba50b51..d4227ad 100644
--- a/frontend/src/app/projects/page.jsx
+++ b/frontend/src/app/projects/page.jsx
@@ -10,6 +10,7 @@ import ViewIcon from "../components/icons/view";
import ActionButton from "../components/actionButton/ActionButton";
import useIsMobile from "../hooks/useIsMobile";
import Card from "./project-card/Card";
+import MobileSearchBar from "../components/mobileSearchBar/MobileSearchBar";
const ProjectsPage = () => {
const router = useRouter();
const isMobile = useIsMobile();
@@ -182,10 +183,10 @@ const ProjectsPage = () => {
/>
{isMobile ? (
-
-
-
-
+
+ {sampleData.map((data, key) => (
+
+ ))}
) : (
diff --git a/frontend/src/app/projects/project-card/Card.jsx b/frontend/src/app/projects/project-card/Card.jsx
index a6571b0..8f32326 100644
--- a/frontend/src/app/projects/project-card/Card.jsx
+++ b/frontend/src/app/projects/project-card/Card.jsx
@@ -2,38 +2,38 @@ import DeleteIcon from "@/app/components/icons/delete";
import React from "react";
import styles from "./styles.module.css";
-const Card = () => {
+const Card = (props) => {
return (
Name
-
DOKS One Cooperative Bank Backend Develop
+
{props?.data?.name}
CPU Used/Limit
- 13500 /{" "}
- 20000
+ {props?.data?.cpuUsed} /{" "}
+ {props?.data?.cpuLimit}
Memory Used/Limit
- 13500 /{" "}
- 20000
+ {props?.data?.memoryUsed} /{" "}
+ {props?.data?.memoryLimit}
Storage Used/Limit
- 10000 /{" "}
- 1000000
+ {props?.data?.storageUsed} /{" "}
+ {props?.data?.storageLimit}
Date Created
-
2025-11-07 01:43:18.313 +0000 UTC
+
{props?.data?.dateCreated}
diff --git a/frontend/src/app/projects/view/styles.module.css b/frontend/src/app/projects/view/styles.module.css
index 7c09cfd..97d0388 100644
--- a/frontend/src/app/projects/view/styles.module.css
+++ b/frontend/src/app/projects/view/styles.module.css
@@ -177,6 +177,7 @@
box-shadow: 0 0 10px 0 #000;
color: black;
opacity: 0;
+ text-wrap: nowrap;
}
.imageText > p {
height: 100%;