done searchbar but not final

few changes, mobile searchbar not done
Final
2026-03-31 14:49:20 +08:00 · 2026-03-30 17:21:09 +08:00 · 2026-03-26 17:22:32 +08:00 · 2026-03-26 15:17:54 +08:00 · 2026-03-25 10:48:32 +08:00 · 2026-03-25 10:17:10 +08:00
139 changed files with 7111 additions and 3651 deletions
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -10,7 +10,8 @@
      "dependencies": {
        "next": "16.1.6",
        "react": "19.2.3",
-        "react-dom": "19.2.3"
+        "react-dom": "19.2.3",
+        "react-hook-form": "^7.71.2"
      },
      "devDependencies": {
        "@svgr/webpack": "^8.1.0",
@@ -6934,6 +6935,22 @@
        "react": "^19.2.3"
      }
    },
+    "node_modules/react-hook-form": {
+      "version": "7.71.2",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.71.2.tgz",
+      "integrity": "sha512-1CHvcDYzuRUNOflt4MOq3ZM46AronNJtQ1S7tnX6YN4y72qhgiUItpacZUAQ0TyWYci3yz1X+rXaSxiuEm86PA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/react-hook-form"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17 || ^18 || ^19"
+      }
+    },
    "node_modules/react-is": {
      "version": "16.13.1",
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -11,7 +11,8 @@
  "dependencies": {
    "next": "16.1.6",
    "react": "19.2.3",
-    "react-dom": "19.2.3"
+    "react-dom": "19.2.3",
+    "react-hook-form": "^7.71.2"
  },
  "devDependencies": {
    "@svgr/webpack": "^8.1.0",
--- a/frontend/public/images/idp.png
+++ b/frontend/public/images/idp.png
--- a/frontend/src/app/agents/[agentsId]/page.jsx
+++ b/frontend/src/app/agents/[agentsId]/page.jsx
@@ -6,101 +6,197 @@ import TopToolTip from "@/app/components/topToolTip/TopToolTip";
 import globalStyle from "../../globalStyle.module.css";
 import createAgentStyle from "./styles.module.css";
 import Prompts from "@/app/components/prompts/Prompts";
+import useAgentForm from "@/app/hooks/useAgentForm";
+import Alert from "@/app/components/alerts/Alert";
+import Checkbox from "@/app/components/customCheckbox/Checkbox";
+import useIsMobile from "@/app/hooks/useIsMobile";

-const Page = () => {
-  const [isChecked, setIsChecked] = useState(false);
+const ViewAgentPage = () => {
+  const [useVpn, setUseVpn] = useState(false);
+  const [enableLoki, setEnableLoki] = useState(false);
+  const isMobile = useIsMobile();

-  const handleCheckboxChange = (e) => {
-    setIsChecked(e.target.checked);
-  };
+  const {
+    register,
+    handleSubmit,
+    errors,
+    onSubmit,
+    triggerAlert,
+    setTriggerAlert,
+  } = useAgentForm();

  return (
    <div className={globalStyle.section}>
+      {triggerAlert && (
+        <Alert
+          setTriggerAlert={setTriggerAlert}
+          onClick={() => setEditState(true)}
+          title="Create New Agent"
+        />
+      )}
      <div className={globalStyle.mainContainer}>
        <div className={globalStyle.container}>
          <TopHeader
-            buttonText="Save"
-            cancelButtonText="Cancel"
-            topbarTitle="Update Agent"
+            topbarTitle="View Agent"
            state="add"
-            requiredButtons={["update", "title"]}
+            requiredButtons={["edit", "back"]}
          />
          {/* Create agent Container */}
+          <form
+            className={createAgentStyle.formContainer}
+            id="form"
+            onSubmit={handleSubmit(onSubmit)}
+          >
            <div className={createAgentStyle.createAgentContainer}>
-            <TopToolTip />
+              <div className={createAgentStyle.div}></div>
              <div className={createAgentStyle.inputMainContainer}>
-              {/* Header */}
+                {/* AGENT FORM */}
                <div className={createAgentStyle.headerContainer}>
                  <div className={createAgentStyle.headerTxt}>
-                  <p>Agent Details</p>
+                    {isMobile ? "" : <p>Agent Details</p>}
                  </div>
                </div>
-              {/* Agent name input */}
                <div className={createAgentStyle.inputContainer}>
-                {/* Label */}
                  <div className={createAgentStyle.labelContainer}>
                    <p>Agent Name</p>
                    {/* <p className={createAgentStyle.required}>*</p> */}
                  </div>
-                {/* Input Field */}
-                <TextField placeHolder="Enter agent name" />
+                  <TextField
+                    placeHolder="Enter agent name"
+                    {...register("agentName", { required: true })}
+                    hasError={!!errors.agentName}
+                  />
                  <Prompts show={false} />
                </div>
-              {/* Kubernetes API input */}
                <div className={createAgentStyle.inputContainer}>
-                {/* Label */}
                  <div className={createAgentStyle.labelContainer}>
                    <p>Kubernetes API Proxy Name</p>
                    {/* <p className={createAgentStyle.required}>*</p> */}
                  </div>
-                {/* Input Field */}
-                <TextField placeHolder="Enter proxy name" />
+                  <TextField
+                    placeHolder="Enter proxy name"
+                    {...register("proxyName", { required: true })}
+                    hasError={!!errors.proxyName}
+                  />
                  <Prompts show={false} />
                </div>
-              {/* Checkbox */}
-              <div className={createAgentStyle.checkboxMainContainer}>
-                <div className={createAgentStyle.checkboxContainer}>
-                  <div className={createAgentStyle.checkbox}>
-                    {/* Checkbox */}
-                    <div className={createAgentStyle.check}>
-                      <input
-                        type="checkbox"
-                        checked={isChecked}
-                        onChange={handleCheckboxChange}
-                        className={createAgentStyle.hiddenCheckbox}
-                      />
-                    </div>
-                    {/* List */}
-                    <div className={createAgentStyle.list}>
-                      <p className={createAgentStyle.placeholderTxt}>
-                        Use Tailscale VPN
-                      </p>
-                      <p className={createAgentStyle.secondaryTxt}>
+                <Checkbox
+                  checked={useVpn}
+                  onChange={(e) => setUseVpn(e.target.checked)}
+                  label="Use Tailscale VPN"
+                  description={
+                    <>
                      Enable Tailscale for secure private networking. When
-                        enabled, <br /> the endpoint will be automatically
-                        resolved from Tailscale.
-                      </p>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              {/* Agent endpoint */}
+                      enabled, <br />
+                      the endpoint will be automatically resolved from
+                      Tailscale.
+                    </>
+                  }
+                />
+                {useVpn ? (
+                  <>
                    <div className={createAgentStyle.inputContainer}>
-                {/* Label */}
+                      <div className={createAgentStyle.labelContainer}>
+                        <p>Tailscale Device Prefix</p>
+                        <p className={createAgentStyle.required}>*</p>
+                      </div>
+                      <TextField
+                        placeHolder="doks-onecbdev-agent"
+                        {...register("agentEndpoint", { required: true })}
+                        hasError={!!errors.agentEndpoint}
+                      />
+                      <Prompts show={false} />
+                    </div>
+
+                    <div className={createAgentStyle.inputContainer}>
+                      <div className={createAgentStyle.labelContainer}>
+                        <p>Tailscale Port</p>
+                        <p className={createAgentStyle.required}>*</p>
+                      </div>
+                      <TextField
+                        placeHolder="6969"
+                        {...register("agentEndpoint", { required: true })}
+                        hasError={!!errors.agentEndpoint}
+                      />
+                      <Prompts show={false} />
+                    </div>
+                  </>
+                ) : (
+                  <div className={createAgentStyle.agentInputContainer}>
                    <div className={createAgentStyle.labelContainer}>
                      <p>Agent Endpoint</p>
-                  {/* <p className={createAgentStyle.required}>*</p> */}
+                      <p className={createAgentStyle.required}>*</p>
                    </div>
-                {/* Input Field */}
-                <TextField placeHolder="e.g., http://agent-01.example.com:8080" />
+                    <TextField
+                      placeHolder="e.g., http://agent-01.example.com:8080"
+                      {...register("agentEndpoint", { required: true })}
+                      hasError={!!errors.agentEndpoint}
+                    />
                    <Prompts show={false} />
                  </div>
+                )}
+              </div>
+
+              <div className={createAgentStyle.lokiContainer}>
+                <div className={createAgentStyle.headerContainer}>
+                  <div className={createAgentStyle.headerTxt}>
+                    <p>Loki Integration (Optional)</p>
                  </div>
                </div>
+                <Checkbox
+                  checked={enableLoki}
+                  onChange={(e) => setEnableLoki(e.target.checked)}
+                  label="Enable Loki Logging"
+                  description="Configure Loki for centralized logging and log streaming."
+                />
+
+                {enableLoki && (
+                  <>
+                    <div className={createAgentStyle.inputContainer}>
+                      <div className={createAgentStyle.labelContainer}>
+                        <p>Loki Endpoint</p>
+                        {/* <p className={createAgentStyle.required}>*</p> */}
+                      </div>
+                      <TextField
+                        placeHolder="https://loki.project-moonshot.com/"
+                        {...register("endpoint", { required: true })}
+                        hasError={!!errors.endpoint}
+                      />
+                      <Prompts show={false} />
+                    </div>
+                    <div className={createAgentStyle.inputContainer}>
+                      <div className={createAgentStyle.labelContainer}>
+                        <p>Tenant Name</p>
+                        {/* <p className={createAgentStyle.required}>*</p> */}
+                      </div>
+                      <TextField
+                        placeHolder="doks-dev"
+                        {...register("tenantName", { required: true })}
+                        hasError={!!errors.tenantName}
+                      />
+                      <Prompts show={false} />
+                    </div>
+                    <div className={createAgentStyle.inputContainer}>
+                      <div className={createAgentStyle.labelContainer}>
+                        <p>Password</p>
+                        {/* <p className={createAgentStyle.required}>*</p> */}
+                      </div>
+                      <TextField
+                        placeHolder="Enter Password"
+                        {...register("password", { required: true })}
+                        hasError={!!errors.password}
+                      />
+                      <Prompts show={false} />
+                    </div>
+                  </>
+                )}
+              </div>
+            </div>
+          </form>
        </div>
      </div>
    </div>
  );
 };

-export default Page;
+export default ViewAgentPage;
--- a/frontend/src/app/agents/[agentsId]/styles.module.css
+++ b/frontend/src/app/agents/[agentsId]/styles.module.css
@@ -1,11 +1,23 @@
-.createAgentContainer {
+.formContainer {
  display: flex;
  flex-direction: column;
-  align-items: center;
-  gap: 48px;
+  align-items: flex-start;
+  gap: 10px;
  flex: 1 0 0;
  align-self: stretch;
 }
+.createAgentContainer {
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
+  align-self: stretch;
+  gap: 16px;
+  flex: 1 1 auto;
+  padding-top: 48px;
+  height: calc(100vh - 100px - 70px);
+  overflow-y: auto;
+  scrollbar-width: none;
+}

 .inputMainContainer {
  display: flex;
@@ -13,16 +25,11 @@
  flex-direction: column;
  align-items: flex-start;
  gap: 24px;
-  border-radius: 8px;
-  height: calc(100vh - 260px);
-  position: relative;
-  overflow: auto;
-  scrollbar-width: none;
 }
 .headerContainer {
  display: flex;
  align-items: flex-start;
-  gap: 17px;
+  gap: 50px;
  align-self: stretch;
 }
 .headerContainer > div {
@@ -34,16 +41,17 @@
  flex: 1 0 0;
 }
 .headerTxt > p {
-  width: 163px;
+  /* width: 163px; */
+  align-self: stretch;
  color: #d2d3e1;
-  color: color(display-p3 0.8235 0.8275 0.8784);
  font-family: Inter;
  font-size: 20px;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
 }
-.inputContainer {
+.inputContainer,
+.agentInputContainer {
  display: flex;
  width: 500px;
  flex-direction: column;
@@ -58,7 +66,6 @@
 }
 .labelContainer > p {
  color: #d2d3e1;
-  color: color(display-p3 0.8235 0.8275 0.8784);
  font-family: Inter;
  font-size: 16px;
  font-style: normal;
@@ -70,112 +77,65 @@
  font-weight: 600;
 }

-.checkboxMainContainer {
+.lokiContainer {
  display: flex;
+  width: 100%;
+  width: 548px;
+  padding: 24px;
  flex-direction: column;
  align-items: flex-start;
-  gap: 10px;
-  align-self: stretch;
-}
-.checkboxContainer {
-  display: flex;
-  align-items: flex-start;
-  align-self: stretch;
-}
-.checkbox {
-  display: flex;
-  padding: var(--Basic-Forms-Checkbox-Input-Sizing-Y-SM, 10px)
-    var(--Basic-Forms-Checkbox-Input-Sizing-X-SM, 12px);
-  align-items: flex-start;
-  gap: var(--Basic-Forms-Checkbox-Gap-Between, 16px);
-  flex: 1 0 0;
-  border-radius: var(--Basic-Forms-Checkbox-Border-Radius, 8px);
-  background: #1d1e2a;
-  background: color(display-p3 0.1137 0.1176 0.1608);
-}
-.check {
-  display: flex;
-  padding-top: var(--Basic-Forms-Checkbox-Inline-Y, 4px);
-  align-items: flex-start;
-  gap: var(--Basic-Forms-Checkbox-Inline-Gap-Between, 10px);
-}
-.hiddenCheckbox {
-  appearance: none;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  width: 16px;
-  height: 16px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-radius: var(--Basic-Forms-Checkbox-Check-Icon-Border-Radius, 4px);
-  border: 1px solid
-    var(--Basic-Forms-Checkbox-Check-Icon-Border-Border-Active-Color, #0067fd);
-  border: 1px solid
-    var(
-      --Basic-Forms-Checkbox-Check-Icon-Border-Border-Active-Color,
-      color(display-p3 0.1451 0.3882 0.9216)
-    );
-  cursor: pointer;
-  position: relative;
-}
-.hiddenCheckbox:checked {
-  border-radius: var(--Basic-Forms-Checkbox-Check-Icon-Border-Radius, 4px);
-  border: 1px solid
-    var(--Basic-Forms-Checkbox-Check-Icon-Border-Border-Active-Color, #0067fd);
-  border: 1px solid
-    var(
-      --Basic-Forms-Checkbox-Check-Icon-Border-Border-Active-Color,
-      color(display-p3 0.1451 0.3882 0.9216)
-    );
-  background: var(
-    --Basic-Forms-Checkbox-Check-Icon-Background-Bg-Active-Color,
-    #0067fd
-  );
-  background: var(
-    --Basic-Forms-Checkbox-Check-Icon-Background-Bg-Active-Color,
-    color(display-p3 0.1451 0.3882 0.9216)
-  );
-}
-.hiddenCheckbox::after {
-  content: "";
-  position: absolute;
-  inset: 0;
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='11' height='8' viewBox='0 0 11 8' fill='none'%3E%3Cpath d='M9.83333 0.5L3.41667 6.91667L0.5 4' stroke='white' style='stroke:white;stroke-opacity:1;' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
-  background-repeat: no-repeat;
-  background-position: center;
-  opacity: 0;
-}
-.hiddenCheckbox:checked::after {
-  opacity: 1;
+  gap: 24px;
 }

-.list {
+@media (max-width: 1024px) {
+  .createAgentContainer {
+    display: flex;
+    padding: 16px 16px; /*did some math 32 ang orig top*/
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: flex-start;
+    gap: 24px;
+    height: calc(100vh - 100px - 60px);
+    align-self: stretch;
+  }
+  .div {
+    display: none;
+  }
+  .inputMainContainer {
    display: flex;
    flex-direction: column;
    align-items: flex-start;
-  gap: 4px;
-  flex: 1 0 0;
-}
-.placeholderTxt {
+    gap: 16px;
+    padding: 0px;
+    /* align-self: stretch;   */
+  }
+  .lokiContainer {
+    display: flex;
+    gap: 16px;
    align-self: stretch;
-  color: #d2d3e1;
-  color: color(display-p3 0.8235 0.8275 0.8784);
-  font-family: Inter;
+    border-radius: 8px;
+    width: 500px;
+    padding: 24px 0 0 0;
+  }
+}
+
+@media (max-width: 768px) {
+  .inputMainContainer {
+    align-self: stretch;
+    width: 100%;
+  }
+  .lokiContainer {
+    width: 100%;
+  }
+  .inputContainer,
+  .agentInputContainer {
+    width: 100%;
+  }
+  .agentInputContainer {
+    padding-top: 8px;
+  }
+  .headerTxt > p {
    font-size: 16px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: 24px; /* 150% */
-  letter-spacing: 0.08px;
-}
-.secondaryTxt {
-  align-self: stretch;
-  color: #697281;
-  color: color(display-p3 0.4196 0.4471 0.502);
-  font-family: Inter;
-  font-size: 14px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: 20px; /* 142.857% */
-  letter-spacing: 0.07px;
+    font-weight: 400;
+  }
 }
--- a/frontend/src/app/agents/add/page.jsx
+++ b/frontend/src/app/agents/add/page.jsx
@@ -6,16 +6,33 @@ import TopToolTip from "@/app/components/topToolTip/TopToolTip";
 import globalStyle from "../../globalStyle.module.css";
 import createAgentStyle from "./styles.module.css";
 import Prompts from "@/app/components/prompts/Prompts";
+import useAgentForm from "@/app/hooks/useAgentForm";
+import Alert from "@/app/components/alerts/Alert";
+import Checkbox from "@/app/components/customCheckbox/Checkbox";
+import useIsMobile from "@/app/hooks/useIsMobile";

-const Page = () => {
-  const [isChecked, setIsChecked] = useState(false);
-
-  const handleCheckboxChange = (e) => {
-    setIsChecked(e.target.checked);
-  };
+const AddAgentPage = () => {
+  const [useVpn, setUseVpn] = useState(false);
+  const [enableLoki, setEnableLoki] = useState(false);
+  const isMobile = useIsMobile();
+  const {
+    register,
+    handleSubmit,
+    errors,
+    onSubmit,
+    triggerAlert,
+    setTriggerAlert,
+  } = useAgentForm();

  return (
    <div className={globalStyle.section}>
+      {triggerAlert && (
+        <Alert
+          setTriggerAlert={setTriggerAlert}
+          onClick={() => setEditState(true)}
+          title="Create New Agent"
+        />
+      )}
      <div className={globalStyle.mainContainer}>
        <div className={globalStyle.container}>
          <TopHeader
@@ -25,82 +42,163 @@ const Page = () => {
            state="add"
            requiredButtons={["title", "save"]}
          />
+          {isMobile ? "" : <TopToolTip />}
          {/* Create agent Container */}
+          <form
+            className={createAgentStyle.formContainer}
+            id="form"
+            onSubmit={handleSubmit(onSubmit)}
+          >
            <div className={createAgentStyle.createAgentContainer}>
-            <TopToolTip />
              <div className={createAgentStyle.inputMainContainer}>
+                {/* AGENT FORM */}
+                <div className={createAgentStyle.headerContainer}>
+                  <div className={createAgentStyle.headerTxt}>
+                    {isMobile ? "" : <p>Agent Details</p>}
+                  </div>
+                </div>
+                <div className={createAgentStyle.inputContainer}>
+                  <div className={createAgentStyle.labelContainer}>
+                    <p>Agent Name</p>
+                    <p className={createAgentStyle.required}>*</p>
+                  </div>
+                  <TextField
+                    placeHolder="Enter agent name"
+                    {...register("agentName", { required: true })}
+                    hasError={!!errors.agentName}
+                  />
+                  <Prompts show={false} />
+                </div>
+                <div className={createAgentStyle.inputContainer}>
+                  <div className={createAgentStyle.labelContainer}>
+                    <p>Kubernetes API Proxy Name</p>
+                    <p className={createAgentStyle.required}>*</p>
+                  </div>
+                  <TextField
+                    placeHolder="Enter proxy name"
+                    {...register("proxyName", { required: true })}
+                    hasError={!!errors.proxyName}
+                  />
+                  <Prompts show={false} />
+                </div>
+                <Checkbox
+                  checked={useVpn}
+                  onChange={(e) => setUseVpn(e.target.checked)}
+                  label="Use Tailscale VPN"
+                  description={
+                    <>
+                      Enable Tailscale for secure private networking. When
+                      enabled, <br />
+                      the endpoint will be automatically resolved from
+                      Tailscale.
+                    </>
+                  }
+                />
+                {useVpn ? (
+                  <>
+                    <div className={createAgentStyle.inputContainer}>
+                      <div className={createAgentStyle.labelContainer}>
+                        <p>Tailscale Device Prefix</p>
+                        <p className={createAgentStyle.required}>*</p>
+                      </div>
+                      <TextField
+                        placeHolder="doks-onecbdev-agent"
+                        {...register("agentEndpoint", { required: true })}
+                        hasError={!!errors.agentEndpoint}
+                      />
+                      <Prompts show={false} />
+                    </div>
+
+                    <div className={createAgentStyle.inputContainer}>
+                      <div className={createAgentStyle.labelContainer}>
+                        <p>Tailscale Port</p>
+                        <p className={createAgentStyle.required}>*</p>
+                      </div>
+                      <TextField
+                        placeHolder="6969"
+                        {...register("agentEndpoint", { required: true })}
+                        hasError={!!errors.agentEndpoint}
+                      />
+                      <Prompts show={false} />
+                    </div>
+                  </>
+                ) : (
+                  <div className={createAgentStyle.agentInputContainer}>
+                    <div className={createAgentStyle.labelContainer}>
+                      <p>Agent Endpoint</p>
+                      <p className={createAgentStyle.required}>*</p>
+                    </div>
+                    <TextField
+                      placeHolder="e.g., http://agent-01.example.com:8080"
+                      {...register("agentEndpoint", { required: true })}
+                      hasError={!!errors.agentEndpoint}
+                    />
+                    <Prompts show={false} />
+                  </div>
+                )}
+              </div>
+
+              <div className={createAgentStyle.lokiContainer}>
                {/* Header */}
                <div className={createAgentStyle.headerContainer}>
                  <div className={createAgentStyle.headerTxt}>
-                  <p>Agent Details</p>
+                    <p>Loki Integration (Optional)</p>
                  </div>
                </div>
-              {/* Agent name input */}
-              <div className={createAgentStyle.inputContainer}>
-                {/* Label */}
-                <div className={createAgentStyle.labelContainer}>
-                  <p>Agent Name</p>
-                  {/* <p className={createAgentStyle.required}>*</p> */}
-                </div>
-                {/* Input Field */}
-                <TextField placeHolder="Enter agent name" />
-                <Prompts show={false} />
-              </div>
-              {/* Kubernetes API input */}
-              <div className={createAgentStyle.inputContainer}>
-                {/* Label */}
-                <div className={createAgentStyle.labelContainer}>
-                  <p>Kubernetes API Proxy Name</p>
-                  {/* <p className={createAgentStyle.required}>*</p> */}
-                </div>
-                {/* Input Field */}
-                <TextField placeHolder="Enter proxy name" />
-                <Prompts show={false} />
-              </div>
-              {/* Checkbox */}
-              <div className={createAgentStyle.checkboxMainContainer}>
-                <div className={createAgentStyle.checkboxContainer}>
-                  <div className={createAgentStyle.checkbox}>
-                    {/* Checkbox */}
-                    <div className={createAgentStyle.check}>
-                      <input
-                        type="checkbox"
-                        checked={isChecked}
-                        onChange={handleCheckboxChange}
-                        className={createAgentStyle.hiddenCheckbox}
+                <Checkbox
+                  checked={enableLoki}
+                  onChange={(e) => setEnableLoki(e.target.checked)}
+                  label="Enable Loki Logging"
+                  description="Configure Loki for centralized logging and log streaming."
                />
-                    </div>
-                    {/* List */}
-                    <div className={createAgentStyle.list}>
-                      <p className={createAgentStyle.placeholderTxt}>
-                        Use Tailscale VPN
-                      </p>
-                      <p className={createAgentStyle.secondaryTxt}>
-                        Enable Tailscale for secure private networking. When
-                        enabled, <br /> the endpoint will be automatically
-                        resolved from Tailscale.
-                      </p>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              {/* Agent endpoint */}
+
+                {enableLoki && (
+                  <>
                    <div className={createAgentStyle.inputContainer}>
-                {/* Label */}
                      <div className={createAgentStyle.labelContainer}>
-                  <p>Agent Endpoint</p>
+                        <p>Loki Endpoint</p>
                        {/* <p className={createAgentStyle.required}>*</p> */}
                      </div>
-                {/* Input Field */}
-                <TextField placeHolder="e.g., http://agent-01.example.com:8080" />
+                      <TextField
+                        placeHolder="https://loki.project-moonshot.com/"
+                        {...register("endpoint", { required: true })}
+                        hasError={!!errors.endpoint}
+                      />
                      <Prompts show={false} />
                    </div>
+                    <div className={createAgentStyle.inputContainer}>
+                      <div className={createAgentStyle.labelContainer}>
+                        <p>Tenant Name</p>
+                        {/* <p className={createAgentStyle.required}>*</p> */}
+                      </div>
+                      <TextField
+                        placeHolder="doks-dev"
+                        {...register("tenantName", { required: true })}
+                        hasError={!!errors.tenantName}
+                      />
+                      <Prompts show={false} />
+                    </div>
+                    <div className={createAgentStyle.inputContainer}>
+                      <div className={createAgentStyle.labelContainer}>
+                        <p>Password</p>
+                        {/* <p className={createAgentStyle.required}>*</p> */}
+                      </div>
+                      <TextField
+                        placeHolder="Enter Password"
+                        {...register("password", { required: true })}
+                        hasError={!!errors.password}
+                      />
+                      <Prompts show={false} />
+                    </div>
+                  </>
+                )}
              </div>
            </div>
+          </form>
        </div>
      </div>
    </div>
  );
 };

-export default Page;
+export default AddAgentPage;
--- a/frontend/src/app/agents/add/styles.module.css
+++ b/frontend/src/app/agents/add/styles.module.css
@@ -1,50 +1,51 @@
-.createAgentContainer {
+.formContainer {
  display: flex;
  flex-direction: column;
-  align-items: center;
-  gap: 48px;
+  align-items: flex-start;
+  gap: 10px;
  flex: 1 0 0;
  align-self: stretch;
 }

+.createAgentContainer {
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
+  align-self: stretch;
+  /* Ibalhin ni ang padding sa formcontainer maoang nasa figma */
+  padding-top: 48px;
+  gap: 16px;
+  flex: 1 1 auto;
+  height: calc(100vh - 100px - 5px - 110px);
+  overflow-y: auto;
+  scrollbar-width: none;
+}
+
 .inputMainContainer {
  display: flex;
  padding: 24px;
  flex-direction: column;
  align-items: flex-start;
  gap: 24px;
-  border-radius: 8px;
-  /* Remove ni kung mo ingon si sir grills */
-  height: calc(100vh - 260px);
-  position: relative;
-  overflow: auto;
-  scrollbar-width: none;
 }
 .headerContainer {
  display: flex;
  align-items: flex-start;
-  gap: 17px;
  align-self: stretch;
 }
-.headerContainer > div {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: flex-start;
-  gap: 5px;
-  flex: 1 0 0;
-}
+
 .headerTxt > p {
-  width: 163px;
+  /* width: 163px; */
+  align-self: stretch;
  color: #d2d3e1;
-  color: color(display-p3 0.8235 0.8275 0.8784);
  font-family: Inter;
  font-size: 20px;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
 }
-.inputContainer {
+.inputContainer,
+.agentInputContainer {
  display: flex;
  width: 500px;
  flex-direction: column;
@@ -59,7 +60,6 @@
 }
 .labelContainer > p {
  color: #d2d3e1;
-  color: color(display-p3 0.8235 0.8275 0.8784);
  font-family: Inter;
  font-size: 16px;
  font-style: normal;
@@ -71,112 +71,64 @@
  font-weight: 600;
 }

-.checkboxMainContainer {
+.lokiContainer {
  display: flex;
+  width: 548px;
+  padding: 24px;
  flex-direction: column;
  align-items: flex-start;
-  gap: 10px;
-  align-self: stretch;
-}
-.checkboxContainer {
-  display: flex;
-  align-items: flex-start;
-  align-self: stretch;
-}
-.checkbox {
-  display: flex;
-  padding: var(--Basic-Forms-Checkbox-Input-Sizing-Y-SM, 10px)
-    var(--Basic-Forms-Checkbox-Input-Sizing-X-SM, 12px);
-  align-items: flex-start;
-  gap: var(--Basic-Forms-Checkbox-Gap-Between, 16px);
-  flex: 1 0 0;
-  border-radius: var(--Basic-Forms-Checkbox-Border-Radius, 8px);
-  background: #1d1e2a;
-  background: color(display-p3 0.1137 0.1176 0.1608);
-}
-.check {
-  display: flex;
-  padding-top: var(--Basic-Forms-Checkbox-Inline-Y, 4px);
-  align-items: flex-start;
-  gap: var(--Basic-Forms-Checkbox-Inline-Gap-Between, 10px);
-}
-.hiddenCheckbox {
-  appearance: none;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  width: 16px;
-  height: 16px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-radius: var(--Basic-Forms-Checkbox-Check-Icon-Border-Radius, 4px);
-  border: 1px solid
-    var(--Basic-Forms-Checkbox-Check-Icon-Border-Border-Active-Color, #0067fd);
-  border: 1px solid
-    var(
-      --Basic-Forms-Checkbox-Check-Icon-Border-Border-Active-Color,
-      color(display-p3 0.1451 0.3882 0.9216)
-    );
-  cursor: pointer;
-  position: relative;
-}
-.hiddenCheckbox:checked {
-  border-radius: var(--Basic-Forms-Checkbox-Check-Icon-Border-Radius, 4px);
-  border: 1px solid
-    var(--Basic-Forms-Checkbox-Check-Icon-Border-Border-Active-Color, #0067fd);
-  border: 1px solid
-    var(
-      --Basic-Forms-Checkbox-Check-Icon-Border-Border-Active-Color,
-      color(display-p3 0.1451 0.3882 0.9216)
-    );
-  background: var(
-    --Basic-Forms-Checkbox-Check-Icon-Background-Bg-Active-Color,
-    #0067fd
-  );
-  background: var(
-    --Basic-Forms-Checkbox-Check-Icon-Background-Bg-Active-Color,
-    color(display-p3 0.1451 0.3882 0.9216)
-  );
-}
-.hiddenCheckbox::after {
-  content: "";
-  position: absolute;
-  inset: 0;
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='11' height='8' viewBox='0 0 11 8' fill='none'%3E%3Cpath d='M9.83333 0.5L3.41667 6.91667L0.5 4' stroke='white' style='stroke:white;stroke-opacity:1;' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
-  background-repeat: no-repeat;
-  background-position: center;
-  opacity: 0;
-}
-.hiddenCheckbox:checked::after {
-  opacity: 1;
+  gap: 24px;
 }

-.list {
+@media (max-width: 1024px) {
+  .createAgentContainer {
+    display: flex;
+    padding: 16px 16px; /*did some math 32 ang orig top*/
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: flex-start;
+    height: calc(100vh - 100px - 5px - 50px);
+    gap: 24px;
+    align-self: stretch;
+  }
+  .div {
+    display: none;
+  }
+  .inputMainContainer {
    display: flex;
    flex-direction: column;
    align-items: flex-start;
-  gap: 4px;
-  flex: 1 0 0;
-}
-.placeholderTxt {
+    gap: 16px;
+    padding: 0px;
+    /* align-self: stretch;   */
+  }
+  .lokiContainer {
+    display: flex;
+    gap: 16px;
    align-self: stretch;
-  color: #d2d3e1;
-  color: color(display-p3 0.8235 0.8275 0.8784);
-  font-family: Inter;
+    border-radius: 8px;
+    width: 500px;
+    padding: 24px 0 0 0;
+  }
+}
+
+@media (max-width: 768px) {
+  .inputMainContainer {
+    align-self: stretch;
+    width: 100%;
+  }
+  .lokiContainer {
+    width: 100%;
+  }
+  .inputContainer,
+  .agentInputContainer {
+    width: 100%;
+  }
+  .agentInputContainer {
+    padding-top: 8px;
+  }
+  .headerTxt > p {
    font-size: 16px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: 24px; /* 150% */
-  letter-spacing: 0.08px;
-}
-.secondaryTxt {
-  align-self: stretch;
-  color: #697281;
-  color: color(display-p3 0.4196 0.4471 0.502);
-  font-family: Inter;
-  font-size: 14px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: 20px; /* 142.857% */
-  letter-spacing: 0.07px;
+    font-weight: 400;
+  }
 }
--- a/frontend/src/app/agents/card/Card.jsx
+++ b/frontend/src/app/agents/card/Card.jsx
@@ -0,0 +1,37 @@
+import DeleteIcon from "@/app/components/icons/delete";
+import React from "react";
+import styles from "./styles.module.css";
+
+const Card = (props) => {
+  return (
+    <div className={styles.cardContainer} {...props}>
+      <div className={styles.cardDetails}>
+        <div className={styles.list}>
+          <p>Name</p>
+          <p>{props?.data?.name}</p>
+        </div>
+        <div className={styles.list}>
+          <p>Endpoint</p>
+          <p>{props?.data?.endPoint}</p>
+        </div>
+        <div className={styles.list}>
+          <p>Type</p>
+          <p>{props?.data?.type}</p>
+        </div>
+        <div className={styles.list}>
+          <p>Proxy Name</p>
+          <p>{props?.data?.proxyName}</p>
+        </div>
+        <div className={styles.list}>
+          <p>Date Created</p>
+          <p>{props?.data?.dateCreated}</p>
+        </div>
+      </div>
+      <div className={styles.cardAction}>
+        <DeleteIcon />
+      </div>
+    </div>
+  );
+};
+
+export default Card;
--- a/frontend/src/app/agents/card/styles.module.css
+++ b/frontend/src/app/agents/card/styles.module.css
@@ -0,0 +1,42 @@
+.cardContainer {
+  display: flex;
+  padding: 16px 0;
+  align-items: flex-start;
+  gap: 16px;
+  align-self: stretch;
+  border-bottom: 1px solid #2c2d3d;
+}
+.cardDetails {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 8px;
+  flex: 1 0 0;
+}
+.list {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 5px;
+  align-self: stretch;
+}
+.list p {
+  color: #85869b;
+  font-family: Inter;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.list p:nth-child(2) {
+  color: #eeeffd;
+  font-family: Inter;
+  font-size: 16px;
+  font-weight: 500;
+}
+.cardAction {
+  display: flex;
+  align-items: center;
+  gap: 17px;
+}
--- a/frontend/src/app/agents/page.jsx
+++ b/frontend/src/app/agents/page.jsx
@@ -5,6 +5,13 @@ import styles from "./styles.module.css";
 import TopHeader from "../components/topHeader/TopHeader";
 import globalStyle from "../globalStyle.module.css";
 import { useRouter } from "next/navigation";
+import ActionButton from "../components/actionButton/ActionButton";
+import DeleteIcon from "../components/icons/delete";
+import ViewIcon from "../components/icons/view";
+import useIsMobile from "../hooks/useIsMobile";
+import Card from "./card/Card";
+import SearchIcon from "../components/icons/search";
+import MobileSearchBar from "../components/mobileSearchBar/MobileSearchBar";

 const AgentsPage = () => {
  const router = useRouter();
@@ -95,6 +102,7 @@ const AgentsPage = () => {
      dateCreated: "2/11/2026",
    },
  ];
+  const isMobile = useIsMobile();
  return (
    <div className={globalStyle.section}>
      <div className={globalStyle.mainContainer}>
@@ -104,6 +112,21 @@ const AgentsPage = () => {
            topbarTitle="Agents"
            requiredButtons={["title", "add", "search"]}
          />
+
+          <div className={styles.cardContainer}>
+            <MobileSearchBar />
+            {isMobile &&
+              sampleData.map((data, key) => {
+                return (
+                  <Card
+                    data={data}
+                    key={key}
+                    onClick={() => router.push(`/agents/${key}`)}
+                  />
+                );
+              })}
+          </div>
+
          <div className={styles.tableContainer}>
            <table className={styles.table}>
              <thead>
@@ -119,7 +142,8 @@ const AgentsPage = () => {
              </thead>

              <tbody>
-                {sampleData.map((org, index) => {
+                {!isMobile &&
+                  sampleData.map((org, index) => {
                    return (
                      <tr
                        key={index}
@@ -135,70 +159,10 @@ const AgentsPage = () => {
                        <td>
                          <div className={styles.actions}>
                            <div>
-                            <button className={styles.iconButton}>
-                              <svg
-                                xmlns="http://www.w3.org/2000/svg"
-                                width={20}
-                                height={20}
-                                viewBox="0 0 20 20"
-                                fill="none"
-                              >
-                                <path
-                                  d="M8.40234 9.99957C8.40234 10.4232 8.57062 10.8294 8.87016 11.129C9.1697 11.4285 9.57596 11.5968 9.99957 11.5968C10.4232 11.5968 10.8294 11.4285 11.129 11.129C11.4285 10.8294 11.5968 10.4232 11.5968 9.99957C11.5968 9.57596 11.4285 9.1697 11.129 8.87016C10.8294 8.57062 10.4232 8.40234 9.99957 8.40234C9.57596 8.40234 9.1697 8.57062 8.87016 8.87016C8.57062 9.1697 8.40234 9.57596 8.40234 9.99957Z"
-                                  stroke="#969AF9"
-                                  strokeLinecap="round"
-                                  strokeLinejoin="round"
-                                />
-                                <path
-                                  d="M17.1875 9.99967C15.2708 13.1941 12.875 14.7913 10 14.7913C7.125 14.7913 4.72917 13.1941 2.8125 9.99967C4.72917 6.80523 7.125 5.20801 10 5.20801C12.875 5.20801 15.2708 6.80523 17.1875 9.99967Z"
-                                  stroke="#969AF9"
-                                  strokeLinecap="round"
-                                  strokeLinejoin="round"
-                                />
-                              </svg>
-                            </button>
+                              <ActionButton icon={<ViewIcon />} />
                            </div>
                            <div>
-                            <button className={styles.iconButton}>
-                              <svg
-                                xmlns="http://www.w3.org/2000/svg"
-                                width={20}
-                                height={20}
-                                viewBox="0 0 20 20"
-                                fill="none"
-                              >
-                                <path
-                                  d="M3.61133 6.00684H16.3891"
-                                  stroke="#969AF9"
-                                  strokeLinecap="round"
-                                  strokeLinejoin="round"
-                                />
-                                <path
-                                  d="M8.40234 9.20117V13.9928"
-                                  stroke="#969AF9"
-                                  strokeLinecap="round"
-                                  strokeLinejoin="round"
-                                />
-                                <path
-                                  d="M11.5977 9.20117V13.9928"
-                                  stroke="#969AF9"
-                                  strokeLinecap="round"
-                                  strokeLinejoin="round"
-                                />
-                                <path
-                                  d="M4.41016 6.00684L5.20877 15.5902C5.20877 16.0138 5.37705 16.42 5.67658 16.7196C5.97612 17.0191 6.38238 17.1874 6.80599 17.1874H13.1949C13.6185 17.1874 14.0247 17.0191 14.3243 16.7196C14.6238 16.42 14.7921 16.0138 14.7921 15.5902L15.5907 6.00684"
-                                  stroke="#969AF9"
-                                  strokeLinecap="round"
-                                  strokeLinejoin="round"
-                                />
-                                <path
-                                  d="M7.60352 6.00694V3.61111C7.60352 3.39931 7.68765 3.19618 7.83742 3.04641C7.98719 2.89664 8.19032 2.8125 8.40213 2.8125H11.5966C11.8084 2.8125 12.0115 2.89664 12.1613 3.04641C12.311 3.19618 12.3952 3.39931 12.3952 3.61111V6.00694"
-                                  stroke="#969AF9"
-                                  strokeLinecap="round"
-                                  strokeLinejoin="round"
-                                />
-                              </svg>
-                            </button>
+                              <ActionButton icon={<DeleteIcon />} />
                            </div>
                          </div>
                        </td>
--- a/frontend/src/app/agents/styles.module.css
+++ b/frontend/src/app/agents/styles.module.css
@@ -31,7 +31,7 @@
 .tableContainer > table > tbody > tr > td {
  color: #eeeffd;
  font-family: Inter;
-  font-size: 13px;
+  font-size: 0.8rem;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
@@ -65,32 +65,11 @@
 .tableContainer > table > thead > tr > th {
  color: #85869b;
  font-family: Inter;
-  font-size: 13px;
+  font-size: 0.8rem;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
 }
-.iconButton {
-  display: flex;
-  padding: 6px;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  flex-shrink: 0;
-  aspect-ratio: 1/1;
-  background-color: rgba(255, 255, 255, 0);
-  outline: none;
-  border: 1px solid #959aff00;
-  cursor: pointer;
-  border-radius: 50%;
-}
-.iconButton:hover {
-  border: 1px solid #959aff;
-  background: linear-gradient(180deg, #696b95 0%, #20202d 100%);
-}
-.iconButton:hover path {
-  stroke: white;
-}
 .actions {
  display: flex;
  justify-content: start;
@@ -98,3 +77,49 @@
  gap: 12px;
  align-self: stretch;
 }
+.cardContainer {
+  display: flex;
+  padding: 0 16px;
+  padding-bottom: 50px;
+  height: calc(100vh - 170px);
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 12px;
+  align-self: stretch;
+  display: none;
+}
+@media (max-width: 768px) {
+  .cardContainer {
+    display: flex;
+  }
+  .tableContainer {
+    display: none;
+  }
+}
+.searchBarContainer {
+  display: flex;
+
+  align-items: center;
+  gap: 10px;
+  align-self: stretch;
+  position: relative;
+}
+.searchBarContainer > input {
+  width: 100%;
+  padding: 11px 12px;
+  padding-left: 30px;
+  background-color: transparent;
+  border: none;
+  outline: none;
+  color: white;
+  font-family: Inter;
+  font-size: 1rem;
+  outline: none;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  caret-color: #575bc7;
+}
+.searchIcon {
+  position: absolute;
+}
--- a/frontend/src/app/components/actionButton/ActionButton.jsx
+++ b/frontend/src/app/components/actionButton/ActionButton.jsx
@@ -0,0 +1,8 @@
+import React from "react";
+import styles from "./styles.module.css";
+
+const ActionButton = ({ icon }) => {
+  return <button className={styles.iconButton}>{icon}</button>;
+};
+
+export default ActionButton;
--- a/frontend/src/app/components/actionButton/styles.module.css
+++ b/frontend/src/app/components/actionButton/styles.module.css
@@ -0,0 +1,21 @@
+.iconButton {
+  display: flex;
+  padding: 3px;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  flex-shrink: 0;
+  aspect-ratio: 1/1;
+  background-color: rgba(255, 255, 255, 0);
+  outline: none;
+  border: 1px solid #959aff00;
+  cursor: pointer;
+  border-radius: 50%;
+}
+.iconButton:hover {
+  border: 1px solid #959aff;
+  background: linear-gradient(180deg, #696b95 0%, #20202d 100%);
+}
+.iconButton:hover path {
+  stroke: white;
+}
--- a/frontend/src/app/components/alerts/Alert.jsx
+++ b/frontend/src/app/components/alerts/Alert.jsx
@@ -1,14 +1,25 @@
 import React, { useState } from "react";
 import styles from "./styles.module.css";
 import BoxedCheckIcon from "../icons/boxedCheck";
+import SecondaryButton from "../buttons/secondaryButton/SecondaryButton";
+import PrimaryButton from "../buttons/primarybutton/PrimaryButton";
 const Alert = (props) => {
  const [hide, setHide] = useState(false);
+  const body = props?.body;
  const handleHide = () => {
    setHide(true);
    setTimeout(() => {
      props.setTriggerAlert(false);
    }, 250);
  };
+
+  const handleConfirm = () => {
+    setHide(true);
+    setTimeout(() => {
+      props.setTriggerAlert(false);
+      props?.setEditState?.(false);
+    }, 250);
+  };
  return (
    <div className={styles.container}>
      <div
@@ -18,17 +29,17 @@ const Alert = (props) => {
          <div className={styles.iconContainer}>
            <BoxedCheckIcon />
          </div>
-          <p>Create New Service</p>
+          <p>{props.title}</p>
        </div>
        <div className={styles.alertBody}>
          <p>
-            You are about to add a new record. Please review the details before
-            continuing. Do you want to proceed?
+            {body ||
+              " You are about to add a new record. Please review the details before continuing. Do you want to proceed?"}
          </p>
        </div>
        <div className={styles.actionButtons}>
-          <button onClick={handleHide}>Confirm</button>
-          <button onClick={handleHide}>Cancel</button>
+          <PrimaryButton text="Confirm" onClick={handleConfirm} />
+          <SecondaryButton text="Cancel" onClick={handleHide} />
        </div>
      </div>
    </div>
--- a/frontend/src/app/components/alerts/styles.module.css
+++ b/frontend/src/app/components/alerts/styles.module.css
@@ -75,7 +75,7 @@
 .headers > p {
  color: #fff;
  font-family: Inter;
-  font-size: 20px;
+  font-size: 1.25rem;
  font-style: normal;
  font-weight: 700;
  line-height: normal;
@@ -91,7 +91,7 @@
 .body > p {
  color: #fff;
  font-family: Inter;
-  font-size: 14px;
+  font-size: 0.75rem;
  font-style: normal;
  font-weight: 500;
  line-height: 20px;
@@ -101,30 +101,10 @@
  padding-top: 12px;
  justify-content: center;
  align-items: flex-end;
+
  gap: 10px;
  align-self: stretch;
 }
 .actionButtons > button {
-  display: flex;
-  height: 36px;
-  padding: 8px 16px;
-  justify-content: center;
-  align-items: center;
-  gap: 10px;
-  flex: 1 0 0;
-  border-radius: 6px;
-  border: 0.5px solid #8187ff;
-  background: rgba(83, 89, 242, 0.25);
-  color: #fff;
-  font-family: Inter;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-  cursor: pointer;
-}
-.actionButtons > button:nth-child(2) {
-  border-radius: 6px;
-  border: 0.5px solid #4e537e;
-  background-color: transparent;
+  width: 100%;
 }
--- a/frontend/src/app/components/buttons/primarybutton/PrimaryButton.jsx
+++ b/frontend/src/app/components/buttons/primarybutton/PrimaryButton.jsx
@@ -3,7 +3,7 @@ import styles from "./styles.module.css";
 import AddIcon from "../../icons/add";
 const PrimaryButton = (props) => {
  return (
-    <button className={styles.button} {...props}>
+    <button className={styles.button} {...props} type="submit">
      {props?.icon}
      {props.text}
    </button>
--- a/frontend/src/app/components/buttons/primarybutton/styles.module.css
+++ b/frontend/src/app/components/buttons/primarybutton/styles.module.css
@@ -1,15 +1,14 @@
 .button {
  display: flex;
-  padding: 7px 15px;
+  padding: 8px 10px;
  justify-content: center;
  align-items: center;
  gap: 10px;
  border-radius: 6px;
-  border-radius: 6px;
  border: 0.5px solid #8187ff;
  background: rgba(83, 89, 242, 0.25);
  color: white;
-  font-size: 16px;
+  font-size: 1rem;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
--- a/frontend/src/app/components/buttons/secondaryButton/SecondaryButton.jsx
+++ b/frontend/src/app/components/buttons/secondaryButton/SecondaryButton.jsx
@@ -0,0 +1,11 @@
+import React from "react";
+import styles from "./styles.module.css";
+const SecondaryButton = (props) => {
+  return (
+    <button className={styles.button} {...props}>
+      <p>{props.text}</p>
+    </button>
+  );
+};
+
+export default SecondaryButton;
--- a/frontend/src/app/components/buttons/secondaryButton/styles.module.css
+++ b/frontend/src/app/components/buttons/secondaryButton/styles.module.css
@@ -0,0 +1,25 @@
+.button {
+  display: flex;
+  height: 36px;
+  padding: 9px 12px;
+  justify-content: center;
+  align-items: center;
+  gap: 8px;
+  border-radius: 6px;
+  border: 0.5px solid #4e537e;
+  cursor: pointer;
+  color: #d2d3e1;
+  font-size: 1rem;
+
+  font-style: normal;
+  font-weight: 500;
+  line-height: normal;
+  letter-spacing: 0.16px;
+  cursor: pointer;
+  background: transparent;
+}
+.button:hover {
+  border-radius: 6px;
+  border: 1px solid #8e98e7;
+  background: linear-gradient(180deg, #8e98e6 0%, #4d537e 100%);
+}
--- a/frontend/src/app/components/checkbox/CheckBox.jsx
+++ b/frontend/src/app/components/checkbox/CheckBox.jsx
@@ -6,7 +6,7 @@ import CloseIcon from "../icons/close";
 import CheckedIcon from "../icons/switchIcons/checked";
 import UnCheckedIcon from "../icons/switchIcons/unchecked";

-const CustomCheckbox = ({ checked, onChange, id }) => {
+const CustomCheckbox = ({ checked, setChecked, id, ...props }) => {
  const [isChecked, setIsChecked] = useState(false);
  return (
    <>
@@ -17,8 +17,9 @@ const CustomCheckbox = ({ checked, onChange, id }) => {
        checked={checked}
        onChange={() => {
          setIsChecked(!isChecked);
-          onChange;
+          setChecked();
        }}
+        {...props}
      />

      <label htmlFor={id} className={styles.switch}>
--- a/frontend/src/app/components/checkbox/styles.module.css
+++ b/frontend/src/app/components/checkbox/styles.module.css
@@ -1,8 +1,7 @@
 .switch {
  display: flex;
-  width: 53px;
-
-  height: 33px;
+  width: 50px;
+  height: 30px;
  align-items: center;
  background-color: white;
  cursor: pointer;
@@ -16,11 +15,9 @@
 .check {
  display: none;
 }
-
-/* The knob (replaces ::before) */
 .knob {
-  width: 25px;
-  height: 25px;
+  width: 22px;
+  height: 22px;
  background-color: #6d6d6d;
  border-radius: 50%;
  display: flex;
@@ -29,13 +26,13 @@

  transition: all 0.15s ease-in-out;
 }
-.knob:hover {
+.switch:hover > .knob {
  box-shadow: 0 0 0px 5px #33333327;
  background-color: #333;
 }

 .check:checked + .switch .knob {
-  transform: translateX(78%);
+  transform: translateX(90%);
  background-color: white;
 }

--- a/frontend/src/app/components/customCheckbox/Checkbox.jsx
+++ b/frontend/src/app/components/customCheckbox/Checkbox.jsx
@@ -0,0 +1,32 @@
+import React from "react";
+import styles from "./styles.module.css";
+
+const Checkbox = ({ checked, onChange, label, description }) => {
+  return (
+    <>
+      {/* Checkbox */}
+      <div className={styles.checkboxMainContainer}>
+        <div className={styles.checkboxContainer}>
+          <div className={styles.checkbox}>
+            {/* Checkbox */}
+            <div className={styles.check}>
+              <input
+                type="checkbox"
+                checked={checked}
+                onChange={onChange}
+                className={styles.hiddenCheckbox}
+              />
+            </div>
+            {/* List */}
+            <div className={styles.list}>
+              <p className={styles.placeholderTxt}>{label}</p>
+              <p className={styles.secondaryTxt}>{description}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default Checkbox;
--- a/frontend/src/app/components/customCheckbox/styles.module.css
+++ b/frontend/src/app/components/customCheckbox/styles.module.css
@@ -0,0 +1,88 @@
+.checkboxMainContainer {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 10px;
+  align-self: stretch;
+}
+.checkboxContainer {
+  display: flex;
+  align-items: flex-start;
+  align-self: stretch;
+}
+.checkbox {
+  display: flex;
+  padding: 10px 12px;
+  align-items: flex-start;
+  gap: 16px;
+  flex: 1 0 0;
+  border-radius: 8px;
+  background: #1d1e2a;
+}
+.check {
+  display: flex;
+  padding-top: 4px;
+  align-items: flex-start;
+  gap: 10px;
+}
+.hiddenCheckbox {
+  appearance: none;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  width: 16px;
+  height: 16px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+  position: relative;
+  border-radius: 4px;
+  border: 1px solid #e5e7eb;
+
+  background: #fff;
+}
+.hiddenCheckbox:checked {
+  border-radius: 4px;
+  border: 1px solid #0067fd;
+  background: #0067fd;
+}
+.hiddenCheckbox::after {
+  content: "";
+  position: absolute;
+  inset: 0;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='11' height='8' viewBox='0 0 11 8' fill='none'%3E%3Cpath d='M9.83333 0.5L3.41667 6.91667L0.5 4' stroke='white' style='stroke:white;stroke-opacity:1;' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
+  background-repeat: no-repeat;
+  background-position: center;
+  opacity: 0;
+}
+.hiddenCheckbox:checked::after {
+  opacity: 1;
+}
+
+.list {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 4px;
+  flex: 1 0 0;
+}
+.placeholderTxt {
+  align-self: stretch;
+  color: #d2d3e1;
+  font-family: Inter;
+  font-size: 1rem;
+  font-style: normal;
+  font-weight: 500;
+  line-height: 24px;
+  letter-spacing: 0.08px;
+}
+.secondaryTxt {
+  align-self: stretch;
+  color: #697281;
+  font-family: Inter;
+  font-size: 0.75rem;
+  font-style: normal;
+  font-weight: 500;
+  line-height: 20px;
+  letter-spacing: 0.07px;
+}
--- a/frontend/src/app/components/fields/styles.module.css
+++ b/frontend/src/app/components/fields/styles.module.css
@@ -12,24 +12,22 @@
  background-color: transparent;
  color: white;
  font-family: Inter;
-  font-size: 16px;
+  font-size: 1rem;
  outline: none;
  font-style: normal;
  font-weight: 400;
  line-height: normal;
  caret-color: #575bc7;
 }
-.input:focus,
-.input:active {
+.input:focus {
  border-radius: 6px;
  border: 1px solid #959aff;
  background: rgba(75, 79, 109, 0.25);
 }
-.input:active::placeholder,
 .input:focus::placeholder {
  color: #4b4f6d;
  font-family: Inter;
-  font-size: 16px;
+  font-size: 1rem;
  font-style: normal;
  font-weight: 400;
  line-height: normal;
@@ -40,8 +38,22 @@
 .input::placeholder {
  color: #85869b;
  font-family: Inter;
-  font-size: 16px;
+  font-size: 1rem;
  font-style: normal;
  font-weight: 400;
  line-height: normal;
 }
+
+.input:disabled {
+  background: rgba(75, 79, 109, 0.15);
+  border: 1px solid #616583;
+  color: #85869b;
+  cursor: not-allowed;
+  pointer-events: none;
+  user-select: none;
+}
+.error,
+.error:focus,
+.error:hover {
+  border: 1px solid #b43939;
+}
--- a/frontend/src/app/components/fields/textfield.jsx
+++ b/frontend/src/app/components/fields/textfield.jsx
@@ -1,8 +1,14 @@
-import React from "react";
+"use client";
 import styles from "./styles.module.css";
-const TextField = ({ placeHolder }) => {
+const TextField = ({ placeHolder, hasError, ...props }) => {
  return (
-    <input className={styles.input} type="text" placeholder={placeHolder} />
+    <input
+      className={`${styles.input} ${hasError ? styles.error : null}`}
+      type="text"
+      pattern="[a-z]*"
+      placeholder={placeHolder}
+      {...props}
+    />
  );
 };

--- a/frontend/src/app/components/header/Header.jsx
+++ b/frontend/src/app/components/header/Header.jsx
@@ -1,15 +0,0 @@
-"use client";
-
-import React from "react";
-import styles from "./styles.module.css";
-import HeaderDetails from "./components/HeaderDetails";
-
-const Header = () => {
-  return (
-    <div className={styles.mainContainer}>
-      <HeaderDetails />
-    </div>
-  );
-};
-
-export default Header;
--- a/frontend/src/app/components/header/components/HeaderDetails.jsx
+++ b/frontend/src/app/components/header/components/HeaderDetails.jsx
@@ -1,281 +0,0 @@
-"use client";
-
-import React from "react";
-import orgStyle from "./Organization.module.css";
-import profileStyle from "./Profile.module.css";
-
-import { useState } from "react";
-
-const HeaderDetails = () => {
-  const orgList = [
-    { name: "Project Moonshot Inc." },
-    { name: "Organization X" },
-    { name: "Organization Y" },
-    { name: "Organization Z" },
-  ];
-  const [openOrgDropdown, setOpenOrgDropdown] = useState(false);
-  const [openProfileDropdown, setOpenProfileDropdown] = useState(false);
-  const [selectedOrg, setSelectedOrg] = useState(null);
-
-  const handleOrgSelect = (index) => {
-    setSelectedOrg(index);
-  };
-
-  return (
-    <>
-      {/* Organization and Dropdown Section*/}
-      <div className={orgStyle.organizationContainer}>
-        <div className={orgStyle.orgContainer}>
-          {/* Logo */}
-          <div className={orgStyle.orgLogo}></div>
-          <div className={orgStyle.orgName}>
-            <p>Organization</p>
-            <div className={orgStyle.dropdownContainer}>
-              {/* Dropdown Menu*/}
-              {openOrgDropdown && (
-                <div className={orgStyle.dropdown}>
-                  {/* Organization Header and Search  */}
-                  <div className={orgStyle.orgSearchContainer}>
-                    {/* Header */}
-                    <div className={orgStyle.createBtnContainer}>
-                      <p>Organization</p>
-                      <div className={orgStyle.createBtn}>
-                        <p>Create</p>
-                        <svg
-                          xmlns="http://www.w3.org/2000/svg"
-                          width="16"
-                          height="16"
-                          viewBox="0 0 16 16"
-                          fill="none"
-                        >
-                          <g clipPath="url(#clip0_548_2226)">
-                            <path
-                              d="M8.00034 14.8718C11.7954 14.8718 14.8718 11.7954 14.8718 8.00034C14.8718 4.20535 11.7954 1.12891 8.00034 1.12891C4.20535 1.12891 1.12891 4.20535 1.12891 8.00034C1.12891 11.7954 4.20535 14.8718 8.00034 14.8718Z"
-                              stroke="#8287FF"
-                              strokeWidth="1.5"
-                              strokeLinecap="round"
-                              strokeLinejoin="round"
-                            />
-                            <path
-                              d="M8 4.8291V11.172"
-                              stroke="#8287FF"
-                              strokeWidth="1.5"
-                              strokeLinecap="round"
-                              strokeLinejoin="round"
-                            />
-                            <path
-                              d="M4.82812 8H11.171"
-                              stroke="#8287FF"
-                              strokeWidth="1.5"
-                              strokeLinecap="round"
-                              strokeLinejoin="round"
-                            />
-                          </g>
-                          <defs>
-                            <clipPath id="clip0_548_2226">
-                              <rect width="16" height="16" fill="white" />
-                            </clipPath>
-                          </defs>
-                        </svg>
-                      </div>
-                    </div>
-                    {/* Search */}
-                    <div className={orgStyle.srchInputContainer}>
-                      <div className={orgStyle.srchInputGroup}>
-                        <svg
-                          xmlns="http://www.w3.org/2000/svg"
-                          width="18"
-                          height="18"
-                          viewBox="0 0 18 18"
-                          fill="none"
-                        >
-                          <g clipPath="url(#clip0_23_1333)">
-                            <path
-                              d="M7.79548 14.424C11.4568 14.424 14.4249 11.4559 14.4249 7.7945C14.4249 4.13315 11.4568 1.16504 7.79548 1.16504C4.13412 1.16504 1.16602 4.13315 1.16602 7.7945C1.16602 11.4559 4.13412 14.424 7.79548 14.424Z"
-                              stroke="#858699"
-                              strokeWidth="1.5"
-                              strokeLinecap="round"
-                              strokeLinejoin="round"
-                            />
-                            <path
-                              d="M16.8359 16.835L12.6172 12.6162"
-                              stroke="#858699"
-                              strokeWidth="1.5"
-                              strokeLinecap="round"
-                              strokeLinejoin="round"
-                            />
-                          </g>
-                          <defs>
-                            <clipPath id="clip0_23_1333">
-                              <rect width="18" height="18" fill="white" />
-                            </clipPath>
-                          </defs>
-                        </svg>
-                        <input
-                          className={orgStyle.placeholderTxt}
-                          type="text"
-                          name="search"
-                          id=""
-                          placeholder="Search"
-                        />
-                      </div>
-                    </div>
-                  </div>
-
-                  {/* Select Options */}
-                  <div className={orgStyle.optionsContainer}>
-                    {orgList.map((org, index) => {
-                      return (
-                        <div
-                          className={orgStyle.orgList}
-                          key={index}
-                          onClick={() => handleOrgSelect(index)}
-                        >
-                          <div
-                            className={`${orgStyle.iconTxt} ${index === selectedOrg ? orgStyle.active : ""}`}
-                          >
-                            <svg
-                              xmlns="http://www.w3.org/2000/svg"
-                              width="20"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              fill="none"
-                            >
-                              <path
-                                d="M7.87565 14.8747L3.20898 10.208L4.10482 9.31217L7.87565 13.083L15.8757 5.08301L16.7715 5.97884L7.87565 14.8747Z"
-                                fill="#8287FF"
-                                style={{
-                                  fill: "#8287FF",
-                                  fillOpacity: 1,
-                                }}
-                              />
-                            </svg>
-                            <p>{org.name}</p>
-                          </div>
-                        </div>
-                      );
-                    })}
-                  </div>
-                </div>
-              )}
-              {/* Button */}
-              <div
-                className={orgStyle.dropdownBtn}
-                onClick={() => setOpenOrgDropdown(!openOrgDropdown)}
-              >
-                <p>Project Moonshot Inc.</p>
-                <div>
-                  <svg
-                    xmlns="http://www.w3.org/2000/svg"
-                    width="12"
-                    height="12"
-                    viewBox="0 0 12 12"
-                    fill="none"
-                  >
-                    <path
-                      d="M1.03906 3.51953L6.00031 8.48083L10.9616 3.51953"
-                      stroke="#969AF9"
-                      strokeLinecap="round"
-                      strokeLinejoin="round"
-                    />
-                  </svg>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      {/* Profile Section */}
-      <div
-        className={profileStyle.profileContainer}
-        onClick={() => setOpenProfileDropdown(!openProfileDropdown)}
-      >
-        {/* Profile */}
-        <div className={profileStyle.profileBadge}>
-          {/* Username and Role*/}
-          <div className={profileStyle.nameRole}>
-            <p className={profileStyle.userName}>JM Grills</p>
-            <p className={profileStyle.userRole}>Super Admin</p>
-          </div>
-
-          {/* User profile*/}
-          <div className={profileStyle.userImgContainer}>
-            <div className={profileStyle.userPic}></div>
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="24"
-              height="24"
-              viewBox="0 0 24 24"
-              fill="none"
-            >
-              <path
-                d="M12 16C13.1046 16 14 16.8954 14 18C14 19.1046 13.1046 20 12 20C10.8954 20 10 19.1046 10 18C10 16.8954 10.8954 16 12 16ZM12 10C13.1046 10 14 10.8954 14 12C14 13.1046 14 14 12 14C10.8954 14 10 13.1046 10 12C10 10.8954 10.8954 10 12 10ZM12 4C13.1046 4 14 4.89543 14 6C14 7.10457 13.1046 8 12 8C10.8954 8 10 7.10457 10 6C10 4.89543 10.8954 4 12 4Z"
-                fill="#858699"
-              />
-            </svg>
-          </div>
-        </div>
-
-        {/* Dropdown */}
-        {openProfileDropdown && (
-          <div className={profileStyle.dropdownContainer}>
-            {/* Settings */}
-            <div className={profileStyle.settingsBtn}>
-              {/* Icon */}
-              <div className={profileStyle.btn}>
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width={20}
-                  height={20}
-                  viewBox="0 0 20 20"
-                  fill="none"
-                >
-                  <path
-                    d="M8.60417 3.5975C8.95917 2.13417 11.0408 2.13417 11.3958 3.5975C11.4491 3.81733 11.5535 4.02148 11.7006 4.19333C11.8477 4.36518 12.0332 4.49988 12.2422 4.58645C12.4512 4.67303 12.6776 4.70904 12.9032 4.69156C13.1287 4.67407 13.3469 4.60359 13.54 4.48583C14.8258 3.7025 16.2983 5.17417 15.515 6.46083C15.3974 6.65388 15.327 6.87195 15.3096 7.09731C15.2922 7.32267 15.3281 7.54897 15.4146 7.75782C15.5011 7.96666 15.6356 8.15215 15.8073 8.29921C15.9789 8.44627 16.1829 8.55075 16.4025 8.60417C17.8658 8.95917 17.8658 11.0408 16.4025 11.3958C16.1827 11.4491 15.9785 11.5535 15.8067 11.7006C15.6348 11.8477 15.5001 12.0332 15.4135 12.2422C15.327 12.4512 15.291 12.6776 15.3084 12.9032C15.3259 13.1287 15.3964 13.3469 15.5142 13.54C16.2975 14.8258 14.8258 16.2983 13.5392 15.515C13.3461 15.3974 13.1281 15.327 12.9027 15.3096C12.6773 15.2922 12.451 15.3281 12.2422 15.4146C12.0333 15.5011 11.8479 15.6356 11.7008 15.8073C11.5537 15.9789 11.4492 16.1829 11.3958 16.4025C11.0408 17.8658 8.95917 17.8658 8.60417 16.4025C8.5509 16.1827 8.44648 15.9785 8.29941 15.8067C8.15233 15.6348 7.96676 15.5001 7.75779 15.4135C7.54882 15.327 7.32236 15.291 7.09685 15.3084C6.87133 15.3259 6.65313 15.3964 6.46 15.5142C5.17417 16.2975 3.70167 14.8258 4.485 13.5392C4.60258 13.3461 4.67296 13.1281 4.6904 12.9027C4.70785 12.6773 4.67187 12.451 4.58539 12.2422C4.49892 12.0333 4.36438 11.8479 4.19273 11.7008C4.02107 11.5537 3.81714 11.4492 3.5975 11.3958C2.13417 11.0408 2.13417 8.95917 3.5975 8.60417C3.81733 8.5509 4.02148 8.44648 4.19333 8.29941C4.36518 8.15233 4.49988 7.96676 4.58645 7.75779C4.67303 7.54882 4.70904 7.32236 4.69156 7.09685C4.67407 6.87133 4.60359 6.65313 4.48583 6.46C3.7025 5.17417 5.17417 3.70167 6.46083 4.485C7.29417 4.99167 8.37417 4.54333 8.60417 3.5975Z"
-                    stroke="currentColor"
-                    strokeWidth="1.5"
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                  />
-                  <path
-                    d="M7.5 10C7.5 10.663 7.76339 11.2989 8.23223 11.7678C8.70107 12.2366 9.33696 12.5 10 12.5C10.663 12.5 11.2989 12.2366 11.7678 11.7678C12.2366 11.2989 12.5 10.663 12.5 10C12.5 9.33696 12.2366 8.70107 11.7678 8.23223C11.2989 7.76339 10.663 7.5 10 7.5C9.33696 7.5 8.70107 7.76339 8.23223 8.23223C7.76339 8.70107 7.5 9.33696 7.5 10Z"
-                    stroke="currentColor"
-                    strokeWidth="1.5"
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                  />
-                </svg>
-              </div>
-              <p>Settings</p>
-            </div>
-            {/* Logout */}
-            <div className={profileStyle.logoutBtn}>
-              {/* Icon */}
-              <div className={profileStyle.btn}>
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width={20}
-                  height={20}
-                  viewBox="0 0 20 20"
-                  fill="none"
-                >
-                  <path
-                    d="M11.5625 6.875V5.3125C11.5625 4.8981 11.3979 4.50067 11.1049 4.20765C10.8118 3.91462 10.4144 3.75 10 3.75H4.53125C4.11685 3.75 3.71942 3.91462 3.4264 4.20765C3.13337 4.50067 2.96875 4.8981 2.96875 5.3125V14.6875C2.96875 15.1019 3.13337 15.4993 3.4264 15.7924C3.71942 16.0854 4.11685 16.25 4.53125 16.25H10C10.4144 16.25 10.8118 16.0854 11.1049 15.7924C11.3979 15.4993 11.5625 15.1019 11.5625 14.6875V13.125M7.65625 10H17.0312M17.0312 10L14.6875 7.65625M17.0312 10L14.6875 12.3437"
-                    stroke="currentColor"
-                    strokeWidth="1.5"
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                  />
-                </svg>
-              </div>
-              <p>Logout</p>
-            </div>
-          </div>
-        )}
-      </div>
-    </>
-  );
-};
-
-export default HeaderDetails;
--- a/frontend/src/app/components/header/styles.module.css
+++ b/frontend/src/app/components/header/styles.module.css
@@ -1,10 +0,0 @@
-.mainContainer {
-  display: flex;
-  height: 84px;
-  padding: 12px 24px;
-  justify-content: space-between;
-  align-items: center;
-  align-self: stretch;
-  border-bottom: 1px solid #2c2d3d;
-  border-bottom: 1px solid color(display-p3 0.1725 0.1765 0.2353);
-}
--- a/frontend/src/app/components/icons/check.jsx
+++ b/frontend/src/app/components/icons/check.jsx
@@ -11,8 +11,9 @@ const CheckIcon = (props) => {
      {...props}
    >
      <path
-        d="M4.53125 10L8.4375 13.9062L16.25 6.09375"
+        d="M14.625 6.14583V16.9375L10 13.8542L5.375 16.9375V6.14583C5.375 5.32808 5.69985 4.54382 6.27809 3.96559C6.85632 3.38735 7.64058 3.0625 8.45833 3.0625H11.5417C12.3594 3.0625 13.1437 3.38735 13.7219 3.96559C14.3001 4.54382 14.625 5.32808 14.625 6.14583Z"
        stroke="white"
+        strokeOpacity={1}
        strokeWidth={1.5}
        strokeLinecap="round"
        strokeLinejoin="round"
--- a/frontend/src/app/components/icons/copy.jsx
+++ b/frontend/src/app/components/icons/copy.jsx
@@ -0,0 +1,27 @@
+const CopyIcon = (props) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    {...props}
+  >
+    <path
+      d="M5.44531 4.16645C5.44531 3.82756 5.57994 3.50255 5.81957 3.26292C6.05919 3.02329 6.3842 2.88867 6.72309 2.88867H11.8342C12.1731 2.88867 12.4981 3.02329 12.7377 3.26292C12.9774 3.50255 13.112 3.82756 13.112 4.16645V9.27756C13.112 9.61645 12.9774 9.94146 12.7377 10.1811C12.4981 10.4207 12.1731 10.5553 11.8342 10.5553H6.72309C6.3842 10.5553 6.05919 10.4207 5.81957 10.1811C5.57994 9.94146 5.44531 9.61645 5.44531 9.27756V4.16645Z"
+      stroke="black"
+      strokeWidth="1.5"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+    <path
+      d="M10.5553 10.5554V11.8332C10.5553 12.1721 10.4207 12.4971 10.1811 12.7368C9.94146 12.9764 9.61645 13.111 9.27756 13.111H4.16645C3.82756 13.111 3.50255 12.9764 3.26292 12.7368C3.02329 12.4971 2.88867 12.1721 2.88867 11.8332V6.72211C2.88867 6.38323 3.02329 6.05822 3.26292 5.81859C3.50255 5.57896 3.82756 5.44434 4.16645 5.44434H5.44423"
+      stroke="black"
+      strokeWidth="1.5"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+  </svg>
+);
+
+export default CopyIcon;
--- a/frontend/src/app/components/icons/create.jsx
+++ b/frontend/src/app/components/icons/create.jsx
@@ -0,0 +1,44 @@
+import React from "react";
+
+const create = ({ width = "16", height = "16" }) => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width={width}
+      height={height}
+      viewBox="0 0 16 16"
+      fill="none"
+    >
+      <g clipPath="url(#clip0_548_2226)">
+        <path
+          d="M8.00034 14.8718C11.7954 14.8718 14.8718 11.7954 14.8718 8.00034C14.8718 4.20535 11.7954 1.12891 8.00034 1.12891C4.20535 1.12891 1.12891 4.20535 1.12891 8.00034C1.12891 11.7954 4.20535 14.8718 8.00034 14.8718Z"
+          stroke="#8287FF"
+          strokeWidth="1.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M8 4.8291V11.172"
+          stroke="#8287FF"
+          strokeWidth="1.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M4.82812 8H11.171"
+          stroke="#8287FF"
+          strokeWidth="1.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0_548_2226">
+          <rect width="16" height="16" fill="white" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+};
+
+export default create;
--- a/frontend/src/app/components/icons/ellipsis.jsx
+++ b/frontend/src/app/components/icons/ellipsis.jsx
@@ -0,0 +1,21 @@
+import React from "react";
+
+const ellipsis = ({ width = "24", height = "24", style }) => {
+  return (
+    <svg
+      className={style}
+      xmlns="http://www.w3.org/2000/svg"
+      width={width}
+      height={height}
+      viewBox="0 0 24 24"
+      fill="none"
+    >
+      <path
+        d="M12 16C13.1046 16 14 16.8954 14 18C14 19.1046 13.1046 20 12 20C10.8954 20 10 19.1046 10 18C10 16.8954 10.8954 16 12 16ZM12 10C13.1046 10 14 10.8954 14 12C14 13.1046 14 14 12 14C10.8954 14 10 13.1046 10 12C10 10.8954 10.8954 10 12 10ZM12 4C13.1046 4 14 4.89543 14 6C14 7.10457 13.1046 8 12 8C10.8954 8 10 7.10457 10 6C10 4.89543 10.8954 4 12 4Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+};
+
+export default ellipsis;
--- a/frontend/src/app/components/icons/file.jsx
+++ b/frontend/src/app/components/icons/file.jsx
@@ -0,0 +1,35 @@
+import React from "react";
+
+const FileIcon = (props) => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width={24}
+      height={24}
+      viewBox="0 0 24 24"
+      fill="none"
+      {...props}
+    >
+      <path
+        d="M13.834 3.75V7.41667C13.834 7.65978 13.9306 7.89294 14.1025 8.06485C14.2744 8.23676 14.5075 8.33333 14.7507 8.33333H18.4173"
+        stroke="#969AF9"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M16.584 20.25H7.41732C6.93109 20.25 6.46477 20.0568 6.12096 19.713C5.77714 19.3692 5.58398 18.9029 5.58398 18.4167V5.58333C5.58398 5.0971 5.77714 4.63079 6.12096 4.28697C6.46477 3.94315 6.93109 3.75 7.41732 3.75H13.834L18.4173 8.33333V18.4167C18.4173 18.9029 18.2242 19.3692 17.8803 19.713C17.5365 20.0568 17.0702 20.25 16.584 20.25Z"
+        stroke="#969AF9"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M9.25 14.7503L11.0833 16.5837L14.75 12.917"
+        stroke="#969AF9"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+};
+
+export default FileIcon;
--- a/frontend/src/app/components/icons/hamburger.jsx
+++ b/frontend/src/app/components/icons/hamburger.jsx
@@ -0,0 +1,22 @@
+import React from "react";
+
+const hamburger = (props) => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width={24}
+      height={24}
+      viewBox="0 0 24 24"
+      fill="none"
+      {...props}
+    >
+      <path
+        d="M3 4H21V6H3V4ZM3 11H15V13H3V11ZM3 18H21V20H3V18Z"
+        fill="currentColor"
+        style={{ fillOpacity: 1 }}
+      />
+    </svg>
+  );
+};
+
+export default hamburger;
--- a/frontend/src/app/components/icons/link.jsx
+++ b/frontend/src/app/components/icons/link.jsx
@@ -0,0 +1,37 @@
+import React from "react";
+
+const Link = ({ color = "#969AF9", width = "24", height = "24" }) => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width={height}
+      height={width}
+      viewBox="0 0 24 24"
+      fill="none"
+    >
+      <path
+        d="M9 15L15 9"
+        stroke={color}
+        strokeWidth={2}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M11 6.00031L11.463 5.46431C12.4008 4.52663 13.6727 3.99991 14.9989 4C16.325 4.00009 17.5968 4.527 18.5345 5.46481C19.4722 6.40261 19.9989 7.6745 19.9988 9.00066C19.9987 10.3268 19.4718 11.5986 18.534 12.5363L18 13.0003"
+        stroke={color}
+        strokeWidth={2}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M13.0001 18L12.6031 18.534C11.6544 19.4722 10.3739 19.9984 9.03964 19.9984C7.70535 19.9984 6.42489 19.4722 5.47614 18.534C5.0085 18.0716 4.63724 17.521 4.38385 16.9141C4.13047 16.3073 4 15.6561 4 14.9985C4 14.3408 4.13047 13.6897 4.38385 13.0829C4.63724 12.476 5.0085 11.9254 5.47614 11.463L6.00014 11"
+        stroke={color}
+        strokeWidth={2}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+};
+
+export default Link;
--- a/frontend/src/app/components/icons/logo.jsx
+++ b/frontend/src/app/components/icons/logo.jsx
@@ -0,0 +1,53 @@
+import React from "react";
+
+const LogoIcon = (props) => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="37"
+      height="36"
+      viewBox="0 0 37 36"
+      fill="none"
+      {...props}
+    >
+      <path
+        d="M15.465 11.0234C13.7773 12.2949 12.0608 13.7836 10.3874 15.457C2.90925 22.9352 -0.879626 31.2707 1.92467 34.0751C4.72895 36.8792 13.0645 33.0904 20.5426 25.6123C22.2161 23.9388 23.7048 22.2224 24.9762 20.5347"
+        stroke="#969AF9"
+        strokeWidth={2}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        style={{ strokeOpacity: 1 }}
+        fill="none"
+      />
+      <path
+        d="M24.9762 20.5353C29.3864 26.3895 31.1822 31.8988 29.0053 34.0757C26.201 36.88 17.8655 33.091 10.3874 25.6129C2.90925 18.1348 -0.879626 9.79927 1.92467 6.99498C4.10141 4.81824 9.61081 6.61397 15.465 11.0241"
+        stroke="#969AF9"
+        strokeWidth={2}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        style={{ strokeOpacity: 1 }}
+        fill="none"
+      />
+      <path
+        d="M14.1504 20.5347C14.1504 21.261 14.7391 21.8497 15.4654 21.8497C16.1916 21.8497 16.7804 21.261 16.7804 20.5347C16.7804 19.8085 16.1916 19.2197 15.4654 19.2197C14.7391 19.2197 14.1504 19.8085 14.1504 20.5347Z"
+        stroke="#969AF9"
+        strokeWidth={2}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        style={{ strokeOpacity: 1 }}
+        fill="none"
+      />
+      <path
+        d="M20.7505 9.08429C19.9243 8.94056 19.9243 7.75456 20.7505 7.61083C23.7436 7.09012 26.124 4.81039 26.7737 1.84263L26.8236 1.61514C27.0022 0.798617 28.1649 0.793535 28.3509 1.60847L28.4114 1.87358C29.0849 4.82732 31.4661 7.0878 34.4509 7.60707C35.2814 7.75154 35.2814 8.94358 34.4509 9.08805C31.4661 9.60732 29.0849 11.8678 28.4114 14.8216L28.3509 15.0867C28.1649 15.9016 27.0022 15.8965 26.8236 15.08L26.7737 14.8525C26.124 11.8848 23.7436 9.605 20.7505 9.08429Z"
+        stroke="#969AF9"
+        strokeWidth={2}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        style={{ strokeOpacity: 1 }}
+        fill="none"
+      />
+    </svg>
+  );
+};
+
+export default LogoIcon;
--- a/frontend/src/app/components/icons/logout.jsx
+++ b/frontend/src/app/components/icons/logout.jsx
@@ -0,0 +1,23 @@
+import React from "react";
+
+const logout = () => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width={20}
+      height={20}
+      viewBox="0 0 20 20"
+      fill="none"
+    >
+      <path
+        d="M11.5625 6.875V5.3125C11.5625 4.8981 11.3979 4.50067 11.1049 4.20765C10.8118 3.91462 10.4144 3.75 10 3.75H4.53125C4.11685 3.75 3.71942 3.91462 3.4264 4.20765C3.13337 4.50067 2.96875 4.8981 2.96875 5.3125V14.6875C2.96875 15.1019 3.13337 15.4993 3.4264 15.7924C3.71942 16.0854 4.11685 16.25 4.53125 16.25H10C10.4144 16.25 10.8118 16.0854 11.1049 15.7924C11.3979 15.4993 11.5625 15.1019 11.5625 14.6875V13.125M7.65625 10H17.0312M17.0312 10L14.6875 7.65625M17.0312 10L14.6875 12.3437"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+};
+
+export default logout;
--- a/frontend/src/app/components/icons/plus.jsx
+++ b/frontend/src/app/components/icons/plus.jsx
@@ -0,0 +1,32 @@
+import React from "react";
+
+const plus = () => {
+  return (
+    <>
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        width={24}
+        height={24}
+        viewBox="0 0 24 24"
+        fill="none"
+      >
+        <path
+          d="M12 5.29199V18.7087"
+          stroke="#333649"
+          strokeWidth={2}
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M5.29102 12H18.7077"
+          stroke="#333649"
+          strokeWidth={2}
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+      </svg>
+    </>
+  );
+};
+
+export default plus;
--- a/frontend/src/app/components/icons/publish.jsx
+++ b/frontend/src/app/components/icons/publish.jsx
@@ -0,0 +1,22 @@
+import React from "react";
+
+const PublishIcon = () => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+    >
+      <path
+        d="M20 8L20 6C20 5.46957 19.7893 4.96086 19.4142 4.58579C19.0391 4.21071 18.5304 4 18 4L6 4C5.46957 4 4.96086 4.21072 4.58579 4.58579C4.21071 4.96086 4 5.46957 4 6L4 8M17 14L12 9M12 9L7 14M12 9L12 21"
+        stroke="#D2D3E0"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+};
+
+export default PublishIcon;
--- a/frontend/src/app/components/icons/search.jsx
+++ b/frontend/src/app/components/icons/search.jsx
@@ -12,7 +12,7 @@ const SearchIcon = (props) => {
    >
      <path
        d="M19.5527 19.5536L14.7064 14.7074M9.16822 16.7847C13.3741 16.7847 16.7837 13.3751 16.7837 9.1692C16.7837 4.96328 13.3741 1.55371 9.16822 1.55371C4.9623 1.55371 1.55273 4.96328 1.55273 9.1692C1.55273 13.3751 4.9623 16.7847 9.16822 16.7847Z"
-        stroke="#858699"
+        stroke="currentColor" //858699
        strokeWidth={1.5}
        strokeLinecap="round"
        strokeLinejoin="round"
--- a/frontend/src/app/components/icons/settings.jsx
+++ b/frontend/src/app/components/icons/settings.jsx
@@ -0,0 +1,30 @@
+import React from "react";
+
+const settings = () => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width={20}
+      height={20}
+      viewBox="0 0 20 20"
+      fill="none"
+    >
+      <path
+        d="M8.60417 3.5975C8.95917 2.13417 11.0408 2.13417 11.3958 3.5975C11.4491 3.81733 11.5535 4.02148 11.7006 4.19333C11.8477 4.36518 12.0332 4.49988 12.2422 4.58645C12.4512 4.67303 12.6776 4.70904 12.9032 4.69156C13.1287 4.67407 13.3469 4.60359 13.54 4.48583C14.8258 3.7025 16.2983 5.17417 15.515 6.46083C15.3974 6.65388 15.327 6.87195 15.3096 7.09731C15.2922 7.32267 15.3281 7.54897 15.4146 7.75782C15.5011 7.96666 15.6356 8.15215 15.8073 8.29921C15.9789 8.44627 16.1829 8.55075 16.4025 8.60417C17.8658 8.95917 17.8658 11.0408 16.4025 11.3958C16.1827 11.4491 15.9785 11.5535 15.8067 11.7006C15.6348 11.8477 15.5001 12.0332 15.4135 12.2422C15.327 12.4512 15.291 12.6776 15.3084 12.9032C15.3259 13.1287 15.3964 13.3469 15.5142 13.54C16.2975 14.8258 14.8258 16.2983 13.5392 15.515C13.3461 15.3974 13.1281 15.327 12.9027 15.3096C12.6773 15.2922 12.451 15.3281 12.2422 15.4146C12.0333 15.5011 11.8479 15.6356 11.7008 15.8073C11.5537 15.9789 11.4492 16.1829 11.3958 16.4025C11.0408 17.8658 8.95917 17.8658 8.60417 16.4025C8.5509 16.1827 8.44648 15.9785 8.29941 15.8067C8.15233 15.6348 7.96676 15.5001 7.75779 15.4135C7.54882 15.327 7.32236 15.291 7.09685 15.3084C6.87133 15.3259 6.65313 15.3964 6.46 15.5142C5.17417 16.2975 3.70167 14.8258 4.485 13.5392C4.60258 13.3461 4.67296 13.1281 4.6904 12.9027C4.70785 12.6773 4.67187 12.451 4.58539 12.2422C4.49892 12.0333 4.36438 11.8479 4.19273 11.7008C4.02107 11.5537 3.81714 11.4492 3.5975 11.3958C2.13417 11.0408 2.13417 8.95917 3.5975 8.60417C3.81733 8.5509 4.02148 8.44648 4.19333 8.29941C4.36518 8.15233 4.49988 7.96676 4.58645 7.75779C4.67303 7.54882 4.70904 7.32236 4.69156 7.09685C4.67407 6.87133 4.60359 6.65313 4.48583 6.46C3.7025 5.17417 5.17417 3.70167 6.46083 4.485C7.29417 4.99167 8.37417 4.54333 8.60417 3.5975Z"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M7.5 10C7.5 10.663 7.76339 11.2989 8.23223 11.7678C8.70107 12.2366 9.33696 12.5 10 12.5C10.663 12.5 11.2989 12.2366 11.7678 11.7678C12.2366 11.2989 12.5 10.663 12.5 10C12.5 9.33696 12.2366 8.70107 11.7678 8.23223C11.2989 7.76339 10.663 7.5 10 7.5C9.33696 7.5 8.70107 7.76339 8.23223 8.23223C7.76339 8.70107 7.5 9.33696 7.5 10Z"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+};
+
+export default settings;
--- a/frontend/src/app/components/icons/sun.jsx
+++ b/frontend/src/app/components/icons/sun.jsx
@@ -0,0 +1,30 @@
+import React from "react";
+
+const sun = () => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width={24}
+      height={24}
+      viewBox="0 0 24 24"
+      fill="none"
+    >
+      <path
+        d="M8 12C8 13.0609 8.42143 14.0783 9.17157 14.8284C9.92172 15.5786 10.9391 16 12 16C13.0609 16 14.0783 15.5786 14.8284 14.8284C15.5786 14.0783 16 13.0609 16 12C16 10.9391 15.5786 9.92172 14.8284 9.17157C14.0783 8.42143 13.0609 8 12 8C10.9391 8 9.92172 8.42143 9.17157 9.17157C8.42143 9.92172 8 10.9391 8 12Z"
+        stroke="white"
+        strokeWidth={1.5}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M3 12H4M12 3V4M20 12H21M12 20V21M5.6 5.6L6.3 6.3M18.4 5.6L17.7 6.3M17.7 17.7L18.4 18.4M6.3 17.7L5.6 18.4"
+        stroke="white"
+        strokeWidth={1.5}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+};
+
+export default sun;
--- a/frontend/src/app/components/icons/viewLogs.jsx
+++ b/frontend/src/app/components/icons/viewLogs.jsx
@@ -0,0 +1,23 @@
+import React from "react";
+
+const ViewLogsIcon = () => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+    >
+      <path
+        d="M14.5 4H17C17.7956 4 18.5587 4.31607 19.1213 4.87868C19.6839 5.44129 20 6.20435 20 7V17C20 17.7956 19.6839 18.5587 19.1213 19.1213C18.5587 19.6839 17.7956 20 17 20H7C6.20435 20 5.44129 19.6839 4.87868 19.1213C4.31607 18.5587 4 17.7956 4 17V12M6 5L4 7L6 9M10 9L12 7L10 5"
+        stroke="#D2D3E0"
+        style={{ stroke: "#D2D3E0", strokeOpacity: 1 }}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+};
+
+export default ViewLogsIcon;
--- a/frontend/src/app/components/mobileSearchBar/MobileSearchBar.jsx
+++ b/frontend/src/app/components/mobileSearchBar/MobileSearchBar.jsx
@@ -0,0 +1,20 @@
+import React, { useState } from "react";
+import styles from "./styles.module.css";
+import SearchIcon from "../icons/search";
+
+const MobileSearchBar = (props) => {
+  const [open, setOpen] = useState(false);
+  return (
+    <form className={`${styles.searchBarContainer} ${open ? styles.open : ""}`}>
+      <input type="text" placeholder="Search" className={styles.searchBar} />
+      <div
+        className={styles.searchBtn}
+        onClick={() => setOpen((open) => !open)}
+      >
+        <SearchIcon />
+      </div>
+    </form>
+  );
+};
+
+export default MobileSearchBar;
--- a/frontend/src/app/components/mobileSearchBar/styles.module.css
+++ b/frontend/src/app/components/mobileSearchBar/styles.module.css
@@ -0,0 +1,68 @@
+.searchBarContainer {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  align-self: stretch;
+  position: relative;
+  width: 100%;
+  border: 1px solid #31324a00;
+  transition: width 0.35s ease;
+}
+.searchBar:focus-within {
+  background: #292a36;
+  border-radius: 6px;
+}
+
+.open {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  border-radius: 6px;
+  border: 1px solid #31324a;
+}
+
+.searchBar {
+  width: 100%;
+  padding: 11px 12px;
+  padding-left: 40px;
+  background-color: transparent;
+  border: none;
+  opacity: 0;
+  transition: opacity 0.35s ease;
+  outline: none;
+  color: #85869b;
+  text-align: start;
+  font-family: Inter;
+  font-size: 18px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  letter-spacing: -0.09px;
+  caret-color: #575bc7;
+}
+.searchBar::placeholder {
+  color: #85869b;
+  text-align: start;
+  font-family: Inter;
+  font-size: 18px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  letter-spacing: -0.09px;
+}
+
+.open > .searchBar {
+  opacity: 1;
+  transition-delay: 0.1s;
+}
+.searchBtn {
+  position: absolute;
+  top: 50%;
+  left: 10px;
+  transform: translateY(-40%);
+  cursor: pointer;
+  color: #858699;
+}
+.searchBtn:hover {
+  color: #959aff;
+}
--- a/frontend/src/app/components/mobileToggleTab/Toggle.jsx
+++ b/frontend/src/app/components/mobileToggleTab/Toggle.jsx
@@ -0,0 +1,39 @@
+import React from "react";
+import styles from "./styles.module.css";
+import MobileSearchBar from "@/app/components/mobileSearchBar/MobileSearchBar";
+import useIsMobile from "@/app/hooks/useIsMobile";
+import PlusIcon from "../icons/plus";
+
+const Toggle = ({ tabs = [], activeTab, onChange }) => {
+  const isMobile = useIsMobile();
+
+  return (
+    <div className={styles.toggleContainer}>
+      <div className={styles.buttonToggles}>
+        {tabs.map((tab) => (
+          <button
+            key={tab.value}
+            className={`${styles.buttonStyle} ${activeTab === tab.value ? styles.active : ""}`}
+            onClick={() => onChange(tab.value)}
+          >
+            {tab.label}
+          </button>
+        ))}
+      </div>
+
+      {isMobile && activeTab === "permissions" && (
+        <div className={styles.container}>
+          <div className={styles.searchBar}>
+            <MobileSearchBar />
+          </div>
+
+          <button>
+            <PlusIcon />
+          </button>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default Toggle;
--- a/frontend/src/app/components/mobileToggleTab/styles.module.css
+++ b/frontend/src/app/components/mobileToggleTab/styles.module.css
@@ -0,0 +1,61 @@
+.toggleContainer {
+  display: none;
+}
+
+@media (max-width: 950px) {
+  .toggleContainer {
+    display: flex;
+    flex-direction: column;
+    align-self: stretch;
+    gap: 16px;
+  }
+  .buttonToggles {
+    display: flex;
+    align-items: flex-start;
+    gap: 16px;
+    align-self: stretch;
+  }
+  .container {
+    display: flex;
+    align-items: center;
+    gap: 16px;
+    flex: 1 0 0;
+    padding: 8px 0;
+  }
+  .searchBar {
+    width: 100%;
+  }
+
+  .container > button {
+    display: flex;
+    padding: 8px;
+    border: none;
+    justify-content: center;
+    align-items: end;
+    gap: 12px;
+    border-radius: 6px;
+    background: #27293b;
+  }
+
+  .buttonStyle {
+    display: flex;
+    background: none;
+    border: none;
+    padding: 24px 4px 16px 4px;
+    flex-direction: column;
+    justify-content: center;
+    align-items: flex-start;
+    gap: 5px;
+    color: #85869b;
+    font-family: Inter;
+    font-size: 18px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: normal;
+    letter-spacing: 0.18px;
+  }
+  .active {
+    border-bottom: 1px solid #959aff;
+    color: #959aff;
+  }
+}
--- a/frontend/src/app/components/navbar/Navbar.jsx
+++ b/frontend/src/app/components/navbar/Navbar.jsx
@@ -0,0 +1,110 @@
+"use client";
+
+import React, { useState } from "react";
+import styles from "./styles.module.css";
+import NavLeft from "./navleft/Header";
+import NavRight from "./navright/Profile";
+import HamburgerIcon from "../../components/icons/hamburger";
+import useIsMobile from "@/app/hooks/useIsMobile";
+import LogoIcon from "../icons/logo";
+import HomeIcon from "../icons/home";
+import OrganizationIcon from "../icons/organization";
+import ProjectIcon from "../icons/project";
+import UserIcon from "../icons/user";
+import RolesIcon from "../icons/roles";
+import CredentialsIcon from "../icons/credentials";
+import AgentIcon from "../icons/agent";
+import DownloadIcon from "../icons/download";
+import useNavigations from "@/app/hooks/useNagivation";
+import { usePathname } from "next/navigation";
+
+const Navbar = () => {
+  const [triggerDropDown, setTriggerDropDown] = useState(false);
+  const {
+    navToAgents,
+    navToCredentials,
+    navToProject,
+    navToRoles,
+    navToHome,
+    navToOrganization,
+    navToUsers,
+  } = useNavigations(setTriggerDropDown);
+
+  const pathname = usePathname();
+
+  const isMobile = useIsMobile();
+  return (
+    <div
+      className={`${styles.mainContainer} ${pathname.includes("/add") ? styles.onAdd : ""}`}
+    >
+      {/* Mobile Hamburger Button */}
+      <div className={styles.mobileHamburger}>
+        <div className={styles.hamburgerMenu}>
+          <HamburgerIcon
+            onClick={() => setTriggerDropDown(!triggerDropDown)}
+            className={triggerDropDown ? styles.active : ""}
+          />
+          {triggerDropDown && (
+            <div className={styles.dropDownMenu}>
+              <div className={styles.headings}>
+                <div>
+                  <div className={styles.logoContainer}>
+                    <LogoIcon />
+                  </div>
+                  <div className={styles.info}>
+                    <p>Internal Developer Platform</p>
+                    <p>By Project Moonshot Inc.</p>
+                  </div>
+                </div>
+              </div>
+              <div className={styles.navs}>
+                <div className={styles.nav} onClick={navToHome}>
+                  <HomeIcon />
+                  <p>Home</p>
+                </div>
+                <div className={styles.nav} onClick={navToOrganization}>
+                  <OrganizationIcon />
+                  <p>Organization</p>
+                </div>
+                <div className={styles.nav} onClick={navToProject}>
+                  <ProjectIcon />
+                  <p>Project</p>
+                </div>
+                <div className={styles.nav} onClick={navToUsers}>
+                  <UserIcon />
+                  <p>Users</p>
+                </div>
+                <div className={styles.nav} onClick={navToRoles}>
+                  <RolesIcon />
+                  <p>Roles</p>
+                </div>
+                <div className={styles.nav} onClick={navToCredentials}>
+                  <CredentialsIcon />
+                  <p>Credentials</p>
+                </div>
+                <div className={styles.nav} onClick={navToAgents}>
+                  <AgentIcon />
+                  <p>Agents</p>
+                </div>
+              </div>
+              <div className={styles.footer}>
+                <div>
+                  <div>
+                    <p>Download ICTL v3</p>
+                    <DownloadIcon />
+                  </div>
+                </div>
+              </div>
+            </div>
+          )}
+        </div>
+
+        <NavLeft />
+      </div>
+      {/* Mobile Menu Button */}
+      <NavRight />
+    </div>
+  );
+};
+
+export default Navbar;
--- a/frontend/src/app/components/navbar/navleft/Header.jsx
+++ b/frontend/src/app/components/navbar/navleft/Header.jsx
@@ -0,0 +1,70 @@
+import React, { useState } from "react";
+import HeaderDropdown from "./HeaderDropdown";
+import styles from "./styles.module.css";
+import ArrowDownIcon from "../../icons/arrowDown";
+import useIsMobile from "@/app/hooks/useIsMobile";
+
+const Header = () => {
+  const [open, setOpen] = useState(false);
+  const [selectedOrg, setSelectedOrg] = useState(0);
+  const sampleData = [
+    { name: "Project Moonshot Inc." },
+    { name: "Organization X" },
+    { name: "Organization Y" },
+    { name: "Organization Z" },
+  ];
+
+  const isMobile = useIsMobile();
+  return (
+    <>
+      {/* Organization Header */}
+      <div className={styles.organizationContainer}>
+        <div
+          className={styles.orgContainer}
+          onClick={isMobile ? () => setOpen(!open) : null} //toggler entire header
+        >
+          {/* Logo */}
+          <div className={styles.orgLogo}></div>
+          <div className={styles.orgName}>
+            <p
+              className={`${styles.orgNameText} ${isMobile && open ? styles.orgNameActive : ""}`}
+            >
+              Organization
+            </p>
+            <div className={styles.dropdownContainer}>
+              {/* Dropdown Menu*/}
+              {open && (
+                <HeaderDropdown
+                  setOpen={setOpen}
+                  sampleData={sampleData}
+                  selectedOrg={selectedOrg}
+                  setSelectedOrg={setSelectedOrg}
+                />
+              )}
+              {/* Toggle Button */}
+              <div
+                className={styles.dropdownBtn}
+                onClick={() => {
+                  if (!isMobile) setOpen(!open); //toggle only org
+                }}
+              >
+                <p
+                  className={`${styles.projectName} ${isMobile && open ? styles.projectNameActive : ""}`}
+                >
+                  {sampleData[selectedOrg].name}
+                </p>
+                <div
+                  className={`${styles.arrowIcon} ${isMobile && open ? styles.arrowRotate : ""}`}
+                >
+                  <ArrowDownIcon width={12} height={12} color="#969AF9" />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default Header;
--- a/frontend/src/app/components/navbar/navleft/HeaderDropdown.jsx
+++ b/frontend/src/app/components/navbar/navleft/HeaderDropdown.jsx
@@ -0,0 +1,116 @@
+import React, { useState } from "react";
+import CreateIcon from "../../icons/create";
+import styles from "./styles.module.css";
+import useIsMobile from "@/app/hooks/useIsMobile";
+import SearchIcon from "../../icons/search";
+
+const HeaderDropdown = ({
+  setOpen,
+  sampleData,
+  selectedOrg,
+  setSelectedOrg,
+}) => {
+  const isMobile = useIsMobile();
+
+  const handleOrgSelect = (index) => {
+    setSelectedOrg(index);
+    setOpen(false);
+  };
+
+  return (
+    <div className={styles.dropdown}>
+      {/* Organization Header and Search  */}
+      <div className={styles.orgSearchContainer}>
+        {/* Header */}
+        <div className={styles.createBtnContainer}>
+          <p>Organization</p>
+          <div className={styles.createBtn}>
+            <p>Create</p>
+            {isMobile ? <CreateIcon width="24" height="24" /> : <CreateIcon />}
+          </div>
+        </div>
+        {/* Search */}
+        <div className={styles.srchInputContainer}>
+          <form className={styles.srchInputGroup}>
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="18"
+              height="18"
+              viewBox="0 0 18 18"
+              fill="none"
+            >
+              <g clipPath="url(#clip0_23_1333)">
+                <path
+                  d="M7.79548 14.424C11.4568 14.424 14.4249 11.4559 14.4249 7.7945C14.4249 4.13315 11.4568 1.16504 7.79548 1.16504C4.13412 1.16504 1.16602 4.13315 1.16602 7.7945C1.16602 11.4559 4.13412 14.424 7.79548 14.424Z"
+                  stroke="#858699"
+                  strokeWidth="1.5"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                />
+                <path
+                  d="M16.8359 16.835L12.6172 12.6162"
+                  stroke="#858699"
+                  strokeWidth="1.5"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                />
+              </g>
+              <defs>
+                <clipPath id="clip0_23_1333">
+                  <rect width="18" height="18" fill="white" />
+                </clipPath>
+              </defs>
+            </svg>
+            <input
+              className={styles.placeholderTxt}
+              type="text"
+              name="search"
+              id=""
+              placeholder="Search"
+            />
+          </form>
+        </div>
+      </div>
+
+      {/* Select Options */}
+      <div className={styles.optionsContainer}>
+        {sampleData.map((org, index) => {
+          return (
+            <div
+              className={styles.orgList}
+              key={index}
+              onClick={(e) => {
+                e.stopPropagation();
+                handleOrgSelect(index);
+              }}
+            >
+              <div
+                className={`${styles.iconTxt} ${index === selectedOrg ? styles.active : ""}`}
+              >
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  width="20"
+                  height="20"
+                  viewBox="0 0 20 20"
+                  fill="none"
+                >
+                  <path
+                    d="M7.87565 14.8747L3.20898 10.208L4.10482 9.31217L7.87565 13.083L15.8757 5.08301L16.7715 5.97884L7.87565 14.8747Z"
+                    fill="#8287FF"
+                    style={{
+                      fill: "#8287FF",
+                      fillOpacity: 1,
+                    }}
+                  />
+                </svg>
+                <p>{org.name}</p>
+              </div>
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+};
+
+export default HeaderDropdown;
--- a/frontend/src/app/components/header/components/Organization.module.css
+++ b/frontend/src/app/components/header/components/Organization.module.css
@@ -9,7 +9,9 @@
  align-items: center;
  gap: 16px;
  border-radius: 4px;
+  align-self: stretch;
 }
+
 .orgLogo {
  width: 38px;
  height: 38px;
@@ -29,9 +31,8 @@
  align-items: flex-start;
  gap: 4px;
 }
-.orgName > p {
+.orgNameText {
  color: #eeeffd;
-  color: color(display-p3 0.9333 0.9373 0.9882);
  font-family: Inter;
  font-size: 14px;
  font-style: normal;
@@ -51,16 +52,15 @@
  align-items: center;
  gap: 16px;
 }
-.dropdownBtn > p {
+.projectName {
  color: #85869b;
-  color: color(display-p3 0.5216 0.5255 0.6);
  font-family: Inter;
  font-size: 15px;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
 }
-.dropdownBtn > div {
+.arrowIcon {
  display: inline-flex;
  padding: 8px;
  justify-content: center;
@@ -68,8 +68,12 @@
  gap: 10px;
  border-radius: 100px;
  border: 1px solid #b8badc00;
+  transition: transform 0.3s ease;
 }
-.dropdownBtn > div:hover {
+.arrowRotate {
+  transform: rotate(180deg);
+}
+.arrowIcon:hover {
  border: 1px solid #b8badc;
  background: linear-gradient(
    180deg,
@@ -85,11 +89,9 @@
  gap: 12px;
  border-radius: 6px;
  background: #2d3143;
-  background: color(display-p3 0.1804 0.1922 0.2588);
  box-shadow: 0 2px 15px 0 rgba(0, 0, 0, 0.25);
-  box-shadow: 0 2px 15px 0 color(display-p3 0 0 0 / 0.25);
  position: absolute;
-  z-index: 1;
+  z-index: 30;
  top: 100%;
  margin-top: 8px;
  left: 0;
@@ -109,7 +111,8 @@

 .orgSearchContainer {
  display: flex;
-  width: 318px;
+  width: 100%;
+  min-width: 318px;
  flex-direction: column;
  align-items: flex-start;
  gap: 16px;
@@ -181,7 +184,6 @@
  flex: 1 0 0;
  border-radius: 4px;
  background: #282c3c;
-  background: color(display-p3 0.1593 0.1702 0.2316);
 }

 .placeholderTxt {
@@ -194,7 +196,6 @@
 }
 .placeholderTxt::placeholder {
  color: #85869b;
-  color: color(display-p3 0.5216 0.5255 0.6);
  font-family: Inter;
  font-size: 16px;
  font-style: normal;
@@ -205,18 +206,15 @@

 .optionsContainer {
  display: flex;
-  width: 318px;
  flex-direction: column;
  align-items: flex-start;
+  width: 100%;
 }
-
 .orgList:hover {
  border-radius: 4px;
  background: #3c4159;
  color: #acb0ff;
-  background: color(display-p3 0.2398 0.2548 0.3399);
 }
-
 .orgList {
  display: flex;
  padding: 6px;
@@ -243,10 +241,67 @@

 .iconTxt > p {
  color: #d2d3e1;
-  color: color(display-p3 0.8235 0.8275 0.8784);
  font-family: Inter;
  font-size: 14px;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
 }
+
+/* Mobile */
+@media (max-width: 768px) {
+  .dropdown {
+    display: flex;
+    background: linear-gradient(0deg, #2d3143 0%, #191a24 100%);
+    border-radius: 0;
+    position: fixed;
+    top: 80px;
+    left: 0;
+    width: 100%;
+    margin-top: 0;
+    box-shadow: none;
+  }
+  .orgSearchContainer {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 10px;
+    align-self: stretch;
+  }
+  .createBtnContainer {
+    padding: 8px 0;
+  }
+  .createBtnContainer > p {
+    font-size: 16px;
+  }
+  .createBtn {
+    gap: 8px;
+  }
+  .createBtn > p {
+    font-size: 16px;
+  }
+  .srchInputGroup {
+    display: flex;
+    width: 358px;
+    height: 38px;
+    padding: 10px 12px;
+    border-radius: 6px;
+  }
+  .optionsContainer {
+    align-self: stretch;
+  }
+  .iconTxt > p {
+    font-size: 16px;
+    font-weight: 400;
+  }
+
+  .orgNameText {
+    color: #85869b;
+  }
+  .orgNameActive {
+    color: #eeeffd;
+  }
+  .projectNameActive {
+    color: #959aff;
+  }
+}
--- a/frontend/src/app/components/navbar/navright/Profile.jsx
+++ b/frontend/src/app/components/navbar/navright/Profile.jsx
@@ -0,0 +1,59 @@
+import React, { useState } from "react";
+import EllipsisIcon from "../../icons/ellipsis";
+import ProfileDropdown from "./ProfileDropdown";
+import styles from "./styles.module.css";
+import useIsMobile from "@/app/hooks/useIsMobile";
+const Profile = () => {
+  const isMobile = useIsMobile();
+  const [open, setOpen] = useState(false);
+  const sampleData = [
+    {
+      name: "JM Grills",
+      role: "Super Admin",
+    },
+  ];
+
+  return (
+    <>
+      {/* Profile Section */}
+      <div className={styles.profileContainer}>
+        {/* Profile */}
+
+        <div
+          className={styles.profileBadgeButton}
+          onClick={() => setOpen(!open)}
+        >
+          {/* Username and Role*/}
+          {sampleData.map((data, index) => {
+            return (
+              <div className={styles.nameRole} key={index}>
+                <p className={styles.userName}>{data.name}</p>
+                <p className={styles.userRole}>{data.role}</p>
+              </div>
+            );
+          })}
+
+          {/* User profile*/}
+          <div className={styles.userImgContainer}>
+            <div className={styles.userPic}></div>
+            <EllipsisIcon />
+          </div>
+        </div>
+
+        {/* Mobile Ellipsis */}
+
+        <div
+          className={`${styles.mobileEllipsis} ${open ? styles.active : ""}`}
+          onClick={() => setOpen(!open)}
+        >
+          <EllipsisIcon style={isMobile ? styles.rotated : ""} />
+        </div>
+
+        {/* Dropdown */}
+        {open && <ProfileDropdown isMobile={isMobile} user={sampleData[0]} />}
+      </div>
+    </>
+  );
+};
+
+export default Profile;
--- a/frontend/src/app/components/navbar/navright/ProfileDropdown.jsx
+++ b/frontend/src/app/components/navbar/navright/ProfileDropdown.jsx
@@ -0,0 +1,51 @@
+import React from "react";
+import styles from "./styles.module.css";
+import SettingsIcon from "../../icons/settings";
+import LogoutIcon from "../../icons/logout";
+
+const ProfileDropdown = ({ isMobile, user }) => {
+  return (
+    <div className={styles.dropdownContainer}>
+      {/* Settings */}
+
+      {/* Mobile View */}
+      {isMobile && (
+        <>
+          <div className={styles.profileBadge}>
+            {/* User profile*/}
+            <div className={styles.userImgContainer}>
+              <div className={styles.userPic}></div>
+            </div>
+
+            {/* Username and Role*/}
+            <div className={styles.nameRole}>
+              <p className={styles.userName}>{user.name}</p>
+              <p className={styles.userRole}>{user.role}</p>
+            </div>
+          </div>
+          <div className={styles.divider}></div>
+        </>
+      )}
+
+      <div className={styles.actionButtons}>
+        <div className={styles.settingsBtn}>
+          {/* Icon */}
+          <div className={styles.btn}>
+            <SettingsIcon />
+          </div>
+          <p>Settings</p>
+        </div>
+        {/* Logout */}
+        <div className={styles.logoutBtn}>
+          {/* Icon */}
+          <div className={styles.btn}>
+            <LogoutIcon />
+          </div>
+          <p>Logout</p>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default ProfileDropdown;
--- a/frontend/src/app/components/header/components/Profile.module.css
+++ b/frontend/src/app/components/header/components/Profile.module.css
@@ -7,7 +7,8 @@
  cursor: pointer;
  position: relative;
 }
-.profileBadge {
+.profileBadge,
+.profileBadgeButton {
  display: flex;
  padding: 6px 0 6px 8px;
  justify-content: flex-end;
@@ -15,12 +16,10 @@
  gap: 10px;
  border-radius: 6px;
 }
-.profileBadge:hover {
+.profileBadgeButton:hover {
  border-radius: 6px;
  background: #21232f;
-  background: color(display-p3 0.1294 0.1373 0.1804);
 }
-
 .nameRole {
  display: flex;
  flex-direction: column;
@@ -31,7 +30,6 @@
 .userName {
  align-self: stretch;
  color: #d2d3e1;
-  color: color(display-p3 0.8235 0.8275 0.8784);
  text-align: right;
  leading-trim: both;
  text-edge: cap;
@@ -46,7 +44,6 @@
 .userRole {
  align-self: stretch;
  color: #85869b;
-  color: color(display-p3 0.5216 0.5255 0.6);
  text-align: right;
  leading-trim: both;
  text-edge: cap;
@@ -81,12 +78,10 @@
  left: 0;
  border-radius: 6px;
  background: #2d3144;
-  background: color(display-p3 0.1787 0.1913 0.2605);
  box-shadow: 0 2px 15px 0 rgba(0, 0, 0, 0.25);
-  box-shadow: 0 2px 15px 0 color(display-p3 0 0 0 / 0.25);
  cursor: pointer;
  position: absolute;
-  z-index: 10;
+  z-index: 30;
  top: 100%;
  margin-top: 3px;
  animation-name: dropDownAnimation;
@@ -103,6 +98,13 @@
  }
 }

+.actionButtons {
+  display: flex;
+  flex-direction: column;
+
+  gap: 6px;
+  width: 100%;
+}
 .settingsBtn,
 .logoutBtn {
  display: flex;
@@ -113,13 +115,14 @@
  color: #acb0ff;
  border-radius: 4px;
 }
-.settingsBtn:hover,
+
+.settingsBtn:hover {
+  background: #3c4159;
+  color: #d2d3e1;
+}
 .logoutBtn:hover {
  background: #3c4159;
-  background: color(display-p3 0.2392 0.2549 0.3412);
-
  color: #d2d3e1;
-  color: color(display-p3 0.8235 0.8275 0.8784);
 }
 .btn {
  display: flex;
@@ -128,13 +131,102 @@
  gap: 12px;
 }

-.settingsBtn,
-.logoutBtn > p {
-  color: #acb0ff;
-  color: color(display-p3 0.678 0.6895 1);
+.settingsBtn > p {
+  color: inherit;
  font-family: Inter;
  font-size: 16px;
  font-style: normal;
  font-weight: 400;
  line-height: normal;
 }
+
+.logoutBtn > p {
+  color: inherit;
+  font-family: Inter;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+.rotated {
+  transform: rotate(90deg);
+}
+.mobileEllipsis {
+  display: none;
+}
+.mobileEllipsis.active {
+  color: #959aff;
+}
+/* Mobile */
+@media (max-width: 768px) {
+  .dropdownContainer {
+    display: flex;
+    width: 390px;
+    padding: 16px;
+    border-radius: 0;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 16px;
+    background: linear-gradient(0deg, #2d3143 0%, #191a24 100%);
+    position: fixed;
+    top: 80px;
+    left: 0;
+    width: 100%;
+    margin-top: 0;
+    box-shadow: none;
+  }
+  .mobileEllipsis {
+    display: flex;
+    height: 61px;
+    align-items: center;
+    gap: 10px;
+    padding-right: 10px;
+    cursor: pointer;
+    color: #85869b;
+  }
+  .profileBadgeButton {
+    display: none;
+  }
+  .profileBadge {
+    display: flex;
+    padding: 12px 16px;
+    align-items: center;
+    gap: 24px;
+  }
+  .userImgContainer {
+    width: 50px;
+    height: 50px;
+    aspect-ratio: 1/1;
+  }
+  .userPic {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+  }
+
+  .nameRole {
+    align-items: flex-start;
+    gap: 10px;
+  }
+
+  .userName {
+    text-align: start;
+    font-size: 18px;
+    letter-spacing: -0.18px;
+  }
+  .userRole {
+    font-size: 14px;
+  }
+  .divider {
+    height: 1px;
+    align-self: stretch;
+    background: #393d53;
+  }
+  .actionButtons {
+    border-radius: 6px;
+    padding: 6px;
+    align-items: center;
+    gap: 6px;
+    align-self: stretch;
+  }
+}
--- a/frontend/src/app/components/navbar/styles.module.css
+++ b/frontend/src/app/components/navbar/styles.module.css
@@ -0,0 +1,174 @@
+.mainContainer {
+  display: flex;
+  height: 84px;
+  padding: 12px 24px;
+  justify-content: space-between;
+  align-items: center;
+  align-self: stretch;
+  border-bottom: 1px solid #2c2d3d;
+}
+
+/* Mobile */
+
+.hamburgerMenu {
+  display: none;
+  height: 61px;
+  padding-left: 16px;
+  align-items: center;
+  gap: 10px;
+  flex-shrink: 0;
+  cursor: pointer;
+}
+.active path {
+  color: #8187ff;
+}
+.dropDownMenu {
+  display: flex;
+  width: 100vw;
+  flex-direction: column;
+  align-items: center;
+  position: absolute;
+  background: linear-gradient(0deg, #2d3143 0%, #191a24 100%);
+  left: 0;
+  z-index: 2;
+  top: 60px;
+  animation-name: dropDownAnimation;
+  animation-duration: 200ms;
+}
+.headings {
+  display: flex;
+  padding: 32px 16px 16px 16px;
+  flex-direction: column;
+  align-items: center;
+  gap: 24px;
+  align-self: stretch;
+}
+.headings > div {
+  display: flex;
+  padding-right: 6px;
+  align-items: center;
+  gap: 8px;
+  align-self: stretch;
+}
+.logoContainer {
+  display: flex;
+  width: 50px;
+  height: 50px;
+  justify-content: center;
+  align-items: center;
+  gap: 9px;
+  aspect-ratio: 1/1;
+}
+
+.info {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: flex-start;
+  gap: 4px;
+  flex: 1 0 0;
+}
+
+.info p {
+  color: #85869b;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  letter-spacing: 0.07px;
+}
+.info > p:nth-child(1) {
+  color: #fff;
+  font-size: 18px;
+  font-weight: 500;
+  line-height: 18px; /* 100% */
+}
+.navs {
+  display: flex;
+  padding: 16px 0;
+  flex-direction: column;
+  align-items: flex-start;
+  align-self: stretch;
+}
+.nav {
+  display: flex;
+  padding: 8px 16px;
+  align-items: center;
+  gap: 16px;
+  align-self: stretch;
+}
+.nav:hover {
+  background: rgba(149, 154, 255, 0.05);
+}
+.nav path {
+  stroke: #858699;
+}
+.nav:hover path {
+  stroke: #d2d3e0;
+}
+.nav p {
+  color: #d2d3e1;
+  font-size: 18px;
+  font-weight: 400;
+  line-height: normal;
+}
+.footer {
+  display: flex;
+  padding: 16px;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 10px;
+  align-self: stretch;
+}
+.footer > div {
+  display: flex;
+  padding: 12px 16px;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 24px;
+  align-self: stretch;
+  border-radius: 8px;
+  background: #1d1e2c;
+}
+.footer > div > div {
+  display: flex;
+  height: 24px;
+  justify-content: space-between;
+  align-items: center;
+  align-self: stretch;
+}
+
+@keyframes dropDownAnimation {
+  0% {
+    opacity: 0;
+    transform: translateY(-5%);
+  }
+  100% {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+@media (max-width: 768px) {
+  .mobileHamburger {
+    display: flex;
+    height: 61px;
+
+    align-items: center;
+    gap: 10px;
+    flex-shrink: 0;
+    position: relative;
+  }
+
+  .mainContainer {
+    display: flex;
+    padding: 12px 0px;
+    align-items: center;
+    border-bottom: none;
+  }
+  .hamburgerMenu {
+    display: flex;
+  }
+  .onAdd {
+    display: none;
+  }
+}
--- a/frontend/src/app/components/permissions/Permissions.jsx
+++ b/frontend/src/app/components/permissions/Permissions.jsx
@@ -0,0 +1,49 @@
+import ActionButton from "../actionButton/ActionButton";
+import DeleteIcon from "../icons/delete";
+import FileIcon from "../icons/file";
+import editUserStyle from "./styles.module.css";
+import React from "react";
+import PlusIcon from "../icons/plus";
+
+const Permissions = ({ sampleData = [] }) => {
+  return (
+    <>
+      {/* Permissions */}
+      <div className={editUserStyle.permissionsContainer}>
+        <div className={editUserStyle.permissionsHeader}>
+          <p>Permissions</p>
+          <div className={editUserStyle.svgContainer}>
+            {/* Button ni */}
+            <button>
+              <PlusIcon />
+            </button>
+          </div>
+        </div>
+
+        {sampleData.length === 0 ? (
+          <div className={editUserStyle.permissionDefaultState}>
+            <p>No permission added yet</p>
+          </div>
+        ) : (
+          <div className={editUserStyle.permissionsList}>
+            {sampleData.map((perm, index) => {
+              return (
+                <div className={editUserStyle.permissions} key={index}>
+                  <div className={editUserStyle.permissionsItem}>
+                    <FileIcon />
+                    <p>{perm.permission}</p>
+                  </div>
+                  <div className={editUserStyle.deleteBtn}>
+                    <ActionButton icon={<DeleteIcon />} />
+                  </div>
+                </div>
+              );
+            })}
+          </div>
+        )}
+      </div>
+    </>
+  );
+};
+
+export default Permissions;
--- a/frontend/src/app/components/permissions/styles.module.css
+++ b/frontend/src/app/components/permissions/styles.module.css
@@ -0,0 +1,168 @@
+.permissionsContainer {
+  display: flex;
+  padding: 24px;
+  flex-direction: column;
+  align-items: flex-start;
+  align-self: stretch;
+  border-radius: 6px;
+  background: #1d1e2a;
+}
+.permissionsHeader {
+  display: flex;
+  padding-bottom: 24px;
+  align-items: flex-start;
+  gap: 17px;
+  align-self: stretch;
+}
+
+.permissionsHeader > p {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: flex-start;
+  gap: 5px;
+  flex: 1 0 0;
+  color: #d2d3e1;
+  font-family: Inter;
+  font-size: 20px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: normal;
+  width: 163px;
+}
+.svgContainer {
+  display: flex;
+  width: 40px;
+  height: 40px;
+  flex-direction: column;
+  align-items: flex-end;
+  gap: 5px;
+  border-radius: 6px;
+  background: #27293b;
+}
+
+.svgContainer > button {
+  display: flex;
+  padding: 8px;
+  border: none;
+  justify-content: center;
+  align-items: center;
+  gap: 12px;
+  border-radius: 6px;
+  background: #27293b;
+}
+
+.permissionDefaultState {
+  align-items: center;
+  gap: 12px;
+  flex: 1 0 0;
+  align-self: stretch;
+  height: 43.813px;
+  padding: 8px 16px;
+}
+.permissionDefaultState p {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 12px;
+  flex: 1 0 0;
+  align-self: stretch;
+  color: #85869b;
+  font-family: Inter;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+.permissionsList {
+  width: 100%;
+}
+.permissions {
+  display: flex;
+  height: 43.813px;
+  padding: 8px 8px 8px 16px;
+  justify-content: space-between;
+  align-items: center;
+  align-self: stretch;
+  border-bottom: 0.5px solid #2e3042;
+}
+
+.permissions:hover {
+  border-bottom: 1px solid rgba(129, 135, 255, 0.25);
+  background: rgba(129, 135, 255, 0.05);
+}
+.permissionsItem {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  flex: 1 0 0;
+  align-self: stretch;
+}
+.permissionsItem > p {
+  color: #d2d3e1;
+  font-family: Inter;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+.deleteBtn {
+  display: flex;
+  align-items: center;
+  align-self: stretch;
+}
+.deleteSvg {
+  display: flex;
+  padding: 6px;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  border: 1px solid #959aff00;
+  color: #969af9;
+  aspect-ratio: 1/1;
+  border-radius: 100px;
+}
+
+.deleteSvg:hover {
+  color: #fff;
+  stroke-width: 1px;
+  stroke: color(display-p3 1 1 1);
+  border-radius: 100px;
+  border: 1px solid #959aff;
+  background: linear-gradient(180deg, #696b95 0%, #20202d 100%);
+}
+
+@media (max-width: 768px) {
+  .permissionsContainer {
+    border-radius: 4px;
+    padding: 0 0 24px 0;
+  }
+  .permissionsHeader {
+    padding: 12px 16px;
+  }
+
+  .permissionsHeader > p {
+    color: #fff;
+    font-size: 18px;
+    align-self: stretch;
+  }
+
+  .svgContainer {
+    display: none;
+  }
+  .permissionDefaultState {
+    gap: 12px;
+    align-self: stretch;
+    padding: 24px 16px 0 16px;
+  }
+  .permissionsList {
+    padding-top: 16px;
+  }
+  .permissions {
+    padding: 8px 16px;
+  }
+  .permissionDefaultState > p {
+    font-weight: 500;
+    text-align: center;
+  }
+}
--- a/frontend/src/app/components/prompts/Prompts.jsx
+++ b/frontend/src/app/components/prompts/Prompts.jsx
@@ -1,4 +1,3 @@
-import React, { useState } from "react";
 import styles from "./styles.module.css";

 const Prompts = ({ show }) => {
--- a/frontend/src/app/components/radio-button/RadioButton.jsx
+++ b/frontend/src/app/components/radio-button/RadioButton.jsx
@@ -0,0 +1,15 @@
+import React from "react";
+import styles from "./styles.module.css";
+const RadioButton = (props) => {
+  return (
+    <div className={styles.container}>
+      <label className={styles.radio}>
+        <input type="radio" {...props} />
+        <span className={styles.custom}></span>
+        <span className={styles.labelText}>{props?.label}</span>
+      </label>
+    </div>
+  );
+};
+
+export default RadioButton;
--- a/frontend/src/app/components/radio-button/styles.module.css
+++ b/frontend/src/app/components/radio-button/styles.module.css
@@ -0,0 +1,44 @@
+.radioButtonsContainer > div > div > div {
+  display: flex;
+  padding: 12px 4px;
+  align-items: center;
+  gap: 12px;
+}
+.radio {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  gap: 8px;
+}
+.radio input {
+  display: none;
+}
+
+.radio .custom {
+  width: 20px;
+  height: 20px;
+  border: 2px solid #4b4f6d;
+  border-radius: 50%;
+  position: relative;
+  background-color: #fff;
+}
+
+.radio .custom::after {
+  content: "";
+  width: 10px;
+  height: 10px;
+  background: #5980f1;
+  border-radius: 50%;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%) scale(0);
+}
+
+.radio input:checked + .custom::after {
+  transform: translate(-50%, -50%) scale(1);
+}
+.radio input:not(:checked) + .custom + span,
+.radio input:not(:checked) + .custom + * {
+  color: #85869b;
+}
--- a/frontend/src/app/components/searchbar/SearchBar.jsx
+++ b/frontend/src/app/components/searchbar/SearchBar.jsx
@@ -0,0 +1,29 @@
+import React, { useState } from "react";
+import searchBarStyle from "./styles.module.css";
+import SearchIcon from "../icons/search";
+
+const SearchBar = () => {
+  const [open, setOpen] = useState(false);
+
+  return (
+    <form
+      className={`${searchBarStyle.searchBarContainer} ${open ? searchBarStyle.open : ""}`}
+    >
+      <input
+        className={searchBarStyle.input}
+        type="text"
+        name=""
+        id=""
+        placeholder="Search"
+      />
+      <div
+        className={searchBarStyle.searchBtn}
+        onClick={() => setOpen((open) => !open)}
+      >
+        <SearchIcon />
+      </div>
+    </form>
+  );
+};
+
+export default SearchBar;
--- a/frontend/src/app/components/searchbar/styles.module.css
+++ b/frontend/src/app/components/searchbar/styles.module.css
@@ -0,0 +1,65 @@
+.searchBarContainer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 40px;
+  border-radius: 6px;
+  padding: 6px;
+  height: auto;
+  overflow: hidden;
+  transition: width 0.35s ease;
+  position: absolute;
+}
+.searchBarContainer:focus-within {
+  background: #292a36;
+}
+.open {
+  width: 260px;
+  padding: 6px 6px 6px 12px;
+  justify-content: space-between;
+  border: 1px solid #31324a;
+  border-radius: 6px;
+}
+.input {
+  background: transparent;
+  outline: none;
+  border: none;
+  width: 100%;
+  opacity: 0; /*hide input kung collapse*/
+  transition: opacity 0.35s ease;
+  color: #85869b;
+  font-family: Inter;
+  font-size: 1.18rem;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  letter-spacing: -0.09px;
+  caret-color: #575bc7;
+}
+
+.open > .input {
+  opacity: 1; /*show input when open*/
+  transition-delay: 0.1s;
+}
+
+.input::placeholder {
+  color: #85869b;
+  text-align: start;
+  font-family: Inter;
+  font-size: 1.18rem;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  letter-spacing: -0.09px;
+}
+
+.searchBtn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  color: #858699;
+}
+.searchBtn:hover {
+  color: #959aff;
+}
--- a/frontend/src/app/components/select/SelectField.jsx
+++ b/frontend/src/app/components/select/SelectField.jsx
@@ -15,24 +15,22 @@ const SelectField = ({ label, options, ...props }) => {
  });

  useEffect(() => {
-    if (showOptions && selectRef.current) {
+    if (!showOptions || !selectRef.current) return;
+
    const rect = selectRef.current.getBoundingClientRect();
+
    const spaceBelow = window.innerHeight - rect.bottom;
    const spaceAbove = rect.top;
+
    const dropdownHeight = 150;

-      if (spaceBelow < dropdownHeight && spaceAbove > dropdownHeight) {
-        setDropUp(true);
-      } else {
-        setDropUp(false);
-      }
-    }
+    setDropUp(spaceBelow < dropdownHeight && spaceAbove > dropdownHeight);
  }, [showOptions]);

  return (
    <div
      ref={selectRef}
-      className={styles.select}
+      className={`${styles.select} ${showOptions ? styles.isFocused : ""}`}
      onClick={() => setShowOptions(!showOptions)}
      {...props}
    >
--- a/frontend/src/app/components/select/styles.module.css
+++ b/frontend/src/app/components/select/styles.module.css
@@ -32,12 +32,16 @@
  width: 100%;
  left: 0;
  border-radius: 6px;
-  border: 1px solid #353a4c;
+  border: 1px solid #4e5474;
  background: #282b39;
  animation-name: showDD;
  animation-duration: 200ms;
  z-index: 20;
 }
+.isFocused {
+  border: 1px solid #969af9;
+  background: #282b39;
+}

@keyframes showDD {
  0% {
@@ -60,7 +64,7 @@
 .optionsContainer p {
  color: #acb0ff;
  font-family: Inter;
-  font-size: 18px;
+  font-size: 16px;
  font-style: normal;
  font-weight: 400;
  line-height: normal;
--- a/frontend/src/app/components/sidebar/Sidebar.jsx
+++ b/frontend/src/app/components/sidebar/Sidebar.jsx
@@ -1,5 +1,5 @@
 "use client";
-import React from "react";
+import React, { useState } from "react";
 import styles from "./styles.module.css";

 import { usePathname, useRouter } from "next/navigation";
@@ -11,86 +11,45 @@ import RolesIcon from "../icons/roles";
 import CredentialsIcon from "../icons/credentials";
 import AgentIcon from "../icons/agent";
 import DownloadIcon from "../icons/download";
+import LogoIcon from "../icons/logo";
+import ArrowDownIcon from "../icons/arrowDown";
+import useNavigations from "@/app/hooks/useNagivation";

 const Sidebar = () => {
-  const router = useRouter();
-  const navToHome = () => {
-    router.push("/home");
-  };
-  const navToOrganization = () => {
-    router.push("/organization");
-  };
-  const navToProject = () => {
-    router.push("/projects");
-  };
-  const navToUsers = () => {
-    router.push("/users");
-  };
-  const navToRoles = () => {
-    router.push("/roles");
-  };
-  const navToCredentials = () => {
-    router.push("/credentials");
-  };
-  const navToAgents = () => {
-    router.push("/agents");
-  };
+  const [isCollapsed, setIsCollapsed] = useState(false);
+  const {
+    navToAgents,
+    navToCredentials,
+    navToProject,
+    navToRoles,
+    navToHome,
+    navToOrganization,
+    navToUsers,
+  } = useNavigations();

  const pathname = usePathname();
-  console.log(pathname);
  return (
-    <div className={styles.mainContainer}>
+    <div
+      className={`${styles.mainContainer} ${isCollapsed ? styles.collapsed : ""}`}
+    >
      <div className={styles.topContainer}>
        {/* Logo Container */}
        <div className={styles.logoContainer}>
+          <div
+            className={styles.toggleContainer}
+            onClick={() => setIsCollapsed(!isCollapsed)}
+          >
+            <ArrowDownIcon
+              className={`${styles.arrowIcon} ${isCollapsed ? styles.notToggle : styles.toggle}`}
+            />
+          </div>
          <div>
            <div className={styles.logoIconContainer}>
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                width="37"
-                height="36"
-                viewBox="0 0 37 36"
-                fill="none"
-              >
-                <path
-                  d="M15.465 11.0234C13.7773 12.2949 12.0608 13.7836 10.3874 15.457C2.90925 22.9352 -0.879626 31.2707 1.92467 34.0751C4.72895 36.8792 13.0645 33.0904 20.5426 25.6123C22.2161 23.9388 23.7048 22.2224 24.9762 20.5347"
-                  stroke="#969AF9"
-                  strokeWidth={2}
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  style={{ strokeOpacity: 1 }}
-                  fill="none"
-                />
-                <path
-                  d="M24.9762 20.5353C29.3864 26.3895 31.1822 31.8988 29.0053 34.0757C26.201 36.88 17.8655 33.091 10.3874 25.6129C2.90925 18.1348 -0.879626 9.79927 1.92467 6.99498C4.10141 4.81824 9.61081 6.61397 15.465 11.0241"
-                  stroke="#969AF9"
-                  strokeWidth={2}
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  style={{ strokeOpacity: 1 }}
-                  fill="none"
-                />
-                <path
-                  d="M14.1504 20.5347C14.1504 21.261 14.7391 21.8497 15.4654 21.8497C16.1916 21.8497 16.7804 21.261 16.7804 20.5347C16.7804 19.8085 16.1916 19.2197 15.4654 19.2197C14.7391 19.2197 14.1504 19.8085 14.1504 20.5347Z"
-                  stroke="#969AF9"
-                  strokeWidth={2}
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  style={{ strokeOpacity: 1 }}
-                  fill="none"
-                />
-                <path
-                  d="M20.7505 9.08429C19.9243 8.94056 19.9243 7.75456 20.7505 7.61083C23.7436 7.09012 26.124 4.81039 26.7737 1.84263L26.8236 1.61514C27.0022 0.798617 28.1649 0.793535 28.3509 1.60847L28.4114 1.87358C29.0849 4.82732 31.4661 7.0878 34.4509 7.60707C35.2814 7.75154 35.2814 8.94358 34.4509 9.08805C31.4661 9.60732 29.0849 11.8678 28.4114 14.8216L28.3509 15.0867C28.1649 15.9016 27.0022 15.8965 26.8236 15.08L26.7737 14.8525C26.124 11.8848 23.7436 9.605 20.7505 9.08429Z"
-                  stroke="#969AF9"
-                  strokeWidth={2}
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  style={{ strokeOpacity: 1 }}
-                  fill="none"
-                />
-              </svg>
+              <LogoIcon />
            </div>
-            <div className={styles.logoDescription}>
+            <div
+              className={`${styles.logoDescription} ${styles.label} ${isCollapsed ? styles.noDisplay : styles.blockDisplay}`}
+            >
              <p>Internal Developer Platform</p>
              <p>By Project Moonshot Inc.</p>
            </div>
@@ -103,49 +62,77 @@ const Sidebar = () => {
            onClick={navToHome}
          >
            <HomeIcon />
-            <p>Home</p>
+            <p
+              className={`${styles.label} ${isCollapsed ? styles.noDisplay : styles.blockDisplay}`}
+            >
+              Home
+            </p>
          </div>
          <div
            className={`${styles.nav} ${pathname.includes("/organization") ? styles.active : ""}`}
            onClick={navToOrganization}
          >
            <OrganizationIcon />
-            <p>Organization</p>
+            <p
+              className={`${styles.label} ${isCollapsed ? styles.noDisplay : styles.blockDisplay}`}
+            >
+              Organization
+            </p>
          </div>
          <div
            onClick={navToProject}
            className={`${styles.nav} ${pathname.includes("/projects") ? styles.active : ""}`}
          >
            <ProjectIcon />
-            <p>Project</p>
+            <p
+              className={`${styles.label} ${isCollapsed ? styles.noDisplay : styles.blockDisplay}`}
+            >
+              Project
+            </p>
          </div>
          <div
            onClick={navToUsers}
            className={`${styles.nav} ${pathname.includes("/users") ? styles.active : ""}`}
          >
            <UserIcon />
-            <p>Users</p>
+            <p
+              className={`${styles.label} ${isCollapsed ? styles.noDisplay : styles.blockDisplay}`}
+            >
+              Users
+            </p>
          </div>
          <div
            onClick={navToRoles}
            className={`${styles.nav} ${pathname.includes("/roles") ? styles.active : ""}`}
          >
            <RolesIcon />
-            <p>Roles</p>
+            <p
+              className={`${styles.label} ${isCollapsed ? styles.noDisplay : styles.blockDisplay}`}
+            >
+              Roles
+            </p>
          </div>
          <div
            onClick={navToCredentials}
            className={`${styles.nav} ${pathname.includes("/credentials") ? styles.active : ""}`}
          >
            <CredentialsIcon />
-            <p>Credentials</p>
+            <p
+              className={`${styles.label} ${isCollapsed ? styles.noDisplay : styles.blockDisplay}`}
+            >
+              Credentials
+            </p>
          </div>
          <div
            onClick={navToAgents}
            className={`${styles.nav} ${pathname.includes("/agents") ? styles.active : ""}`}
          >
            <AgentIcon />
-            <p>Agents</p>
+            <p
+              className={`${styles.label} ${isCollapsed ? styles.noDisplay : styles.blockDisplay}`}
+            >
+              Agents
+            </p>
          </div>
        </div>
      </div>
@@ -153,7 +140,11 @@ const Sidebar = () => {
      <div className={styles.navFooterContainer}>
        <div>
          <div>
-            <p>Download ICTL v3</p>
+            <p
+              className={`${styles.label} ${isCollapsed ? styles.noDisplay : styles.blockDisplay}`}
+            >
+              Download ICTL v3
+            </p>
            <DownloadIcon />
          </div>
        </div>
--- a/frontend/src/app/components/sidebar/styles.module.css
+++ b/frontend/src/app/components/sidebar/styles.module.css
@@ -11,12 +11,14 @@
  user-select: none;
  border-right: 1px solid #2c2d3d;
  background: #191a24;
+  transition: all 150ms;
 }
 .topContainer {
  display: flex;
  flex-direction: column;
  align-items: flex-start;
  gap: 16px;
+
  align-self: stretch;
 }
 .logoContainer {
@@ -26,8 +28,10 @@
  flex-direction: column;
  justify-content: center;
  align-items: flex-start;
+  position: relative;
  gap: 12px;
  align-self: stretch;
+
  border-bottom: 1px solid #2c2d3d;
  border-bottom: 1px solid color(display-p3 0.1725 0.1765 0.2353);
 }
@@ -60,18 +64,14 @@
 .logoDescription > p:nth-child(1) {
  color: #fff;
  color: color(display-p3 1 1 1);
-  font-size: 15px;
-  font-style: normal;
+  font-size: 0.94rem;
  font-weight: 500;
  line-height: 18px;
 }
 .logoDescription > p:nth-child(2) {
  color: #85869b;
  color: color(display-p3 0.5216 0.5255 0.6);
-  font-size: 10px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
+  font-size: 0.63rem;
  letter-spacing: 0.05px;
  align-self: stretch;
 }
@@ -87,11 +87,7 @@
  align-items: center;
  cursor: pointer;
  gap: 16px;
-  font-family: Inter;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
+  font-size: 1rem;
  border-left: 2px solid #959aff00;
  align-self: stretch;
 }
@@ -108,11 +104,7 @@
  border-left: 2px solid #959aff;
  background: rgba(149, 154, 255, 0.05);
  color: #959aff;
-  font-family: Inter;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
+  font-size: 1rem;
 }
 .active:hover path {
  stroke: #969af9;
@@ -142,16 +134,73 @@
 }
 .navFooterContainer > div > div {
  display: flex;
-  width: 186px;
+  width: 100%;
  justify-content: space-between;
  align-items: center;
  flex: 1 0 0;
 }
 .navFooterContainer > div > div > p {
  color: #d2d3e1;
-  font-family: Inter;
-  font-size: 16px;
-  font-style: normal;
+  font-size: 1rem;
  font-weight: 500;
-  line-height: normal;
+}
+.collapsed {
+  width: 80px;
+}
+.noDisplay {
+  display: none;
+}
+.blockDisplay {
+  display: block;
+}
+
+.logoContainer .toggleContainer {
+  position: absolute;
+  right: -15px;
+  bottom: 50%;
+  transform: translateY(50%);
+  background-color: #191a24;
+  padding: 5px;
+  border-radius: 50%;
+  border: 1px solid #292b43;
+  transition: all 150ms;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.arrowIcon {
+  transition: all 400ms;
+}
+.arrowIcon path {
+  stroke: rgba(255, 255, 255, 0.858);
+}
+.toggle {
+  transform: rotate(90deg) scale(0.8);
+}
+.notToggle {
+  transform: rotate(-90deg) scale(0.8);
+}
+
+.toggleContainer:hover {
+  background-color: #333652;
+}
+@media (max-width: 1050px) {
+  .mainContainer {
+    width: 80px;
+  }
+  .label {
+    display: none;
+  }
+  .logoContainer .toggleContainer {
+    display: none;
+  }
+}
+@media (max-width: 768px) {
+  .mainContainer {
+    display: none;
+  }
+  .label {
+    display: none;
+  }
 }
--- a/frontend/src/app/components/toast/success/styles.module.css
+++ b/frontend/src/app/components/toast/success/styles.module.css
@@ -9,7 +9,20 @@
  position: absolute;
  bottom: 25px;
  z-index: 11;
-  right: 20px;
+  right: 10px;
+  animation-name: showToast;
+  animation-duration: 0.15s;
+  animation-timing-function: ease-in-out;
+}
+@keyframes showToast {
+  0% {
+    opacity: 0;
+    transform: translateX(100%);
+  }
+  100% {
+    opacity: 1;
+    transform: translateX(0%);
+  }
 }
 .messageContainer {
  display: flex;
@@ -28,7 +41,7 @@
 .messageContainer p {
  color: #006929;
  font-family: Inter;
-  font-size: 16px;
+  font-size: 1rem;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
--- a/frontend/src/app/components/topHeader/TopHeader.jsx
+++ b/frontend/src/app/components/topHeader/TopHeader.jsx
@@ -19,21 +19,40 @@ import RestartIcon from "../icons/restart";
 import PrimaryButton from "../buttons/primarybutton/PrimaryButton";
 import EditIcon from "../icons/edit";
 import UpdateIcon from "../icons/update";
+import SecondaryButton from "../buttons/secondaryButton/SecondaryButton";
+import SearchBar from "../searchbar/SearchBar";
+import ViewLogsIcon from "../icons/viewLogs";
+import PublishIcon from "../icons/publish";
+import useIsMobile from "@/app/hooks/useIsMobile";

 const TopHeader = (props) => {
  const [triggerDropDownMenu, setTriggerDropDownMenu] = useState(false);
  const [triggerAlert, setTriggerAlert] = useState(false);
  const pathName = usePathname();
  const router = useRouter();
+  const [editState, setEditState] = useState(false);
  const params = useParams();
  const handleNavigateToAdd = () => {
    router.push(`${pathName}/add`);
  };
+  const isMobile = useIsMobile();
  return (
    <>
-      {triggerAlert && <Alert setTriggerAlert={setTriggerAlert} />}
-      <div className={styles.container}>
-        <div className={styles.title}>
+      {triggerAlert && (
+        <Alert
+          setTriggerAlert={setTriggerAlert}
+          setEditState={setEditState}
+          title={!editState ? props.topbarTitle : "Save Changes"}
+          body="You are about to save the changes. Do you want to continue?"
+          editState={editState}
+        />
+      )}
+      <div
+        className={`${styles.container} ${pathName.includes("/add") ? styles.column : ""}`}
+      >
+        <div
+          className={`${styles.title} ${pathName.includes("/add") ? styles.fullWidth : ""}`}
+        >
          {props.requiredButtons.includes("back") && (
            <div onClick={() => router.back()}>
              <BackIcon />
@@ -41,68 +60,72 @@ const TopHeader = (props) => {
          )}
          <p>{props.topbarTitle}</p>
        </div>
-        <div className={styles.actionBar}>
-          {props.requiredButtons.includes("search") && (
+        <div
+          className={`${styles.actionBar}  ${pathName.includes("/add") ? styles.fullWidth : ""}`}
+        >
+          {props?.requiredButtons.includes("search") && (
            <div className={styles.searchBarContainer}>
-              <SearchIcon />
+              {!isMobile && <SearchBar />}
            </div>
          )}
-          {props.requiredButtons.includes("env") && (
+          {props?.requiredButtons.includes("env") && (
            <div className={styles.mngEnvKeyButton}>
              <EnviromentIcon />
-              <p>Manage Env. Key</p>
+              {!isMobile && <p>Manage Env. Key</p>}
            </div>
          )}
-          {props.requiredButtons.includes("add-services") && (
+          {props?.requiredButtons.includes("add-services") && (
            <PrimaryButton
              icon={<AddIcon />}
-              text={props.buttonText}
-              onClick={() => props.trigger(!props.triggerState)}
+              text={isMobile ? "" : props.buttonText}
+              onClick={() => props?.trigger(!props?.triggerState)}
            />
          )}
-          {props.requiredButtons.includes("edit") && (
+          {!editState && props?.requiredButtons.includes("edit") && (
            <PrimaryButton
              icon={<EditIcon />}
              text="Edit"
-              onClick={() => props.trigger(!props.triggerState)}
+              onClick={() => {
+                setEditState(true);
+              }}
            />
          )}
-          {props.requiredButtons.includes("add") && (
+          {props?.requiredButtons.includes("add") && (
            <PrimaryButton
              icon={<AddIcon />}
-              text={props.buttonText}
+              text={isMobile ? "" : props?.buttonText}
              onClick={handleNavigateToAdd}
            />
          )}
-          {props.requiredButtons.includes("save") && (
+          {editState || props?.requiredButtons?.includes("save") ? (
            <>
-              <div
-                className={styles.button}
-                onClick={() => setTriggerAlert(!triggerAlert)}
-              >
-                <CheckIcon width={20} height={20} />
-                <p>{props.buttonText}</p>
-              </div>
-              <div
-                className={styles.cancelButton}
-                onClick={() => router.back()}
-              >
-                <p>{props.cancelButtonText}</p>
-              </div>
+              <PrimaryButton
+                text="Save"
+                form="form"
+                type="submit"
+                onClick={() =>
+                  editState ? setTriggerAlert(!triggerAlert) : ""
+                }
+                icon={<CheckIcon width={20} height={20} />}
+              />
+
+              <SecondaryButton
+                text="Cancel"
+                onClick={
+                  editState
+                    ? () => setEditState(!editState)
+                    : () => router.back()
+                }
+              />
            </>
-          )}
-          {props.requiredButtons.includes("update") && (
+          ) : null}
+          {props?.requiredButtons.includes("update") && (
            <>
              <PrimaryButton
                icon={<UpdateIcon color="white" />}
                text="Update"
              />
-              <div
-                className={styles.cancelButton}
-                onClick={() => router.back()}
-              >
-                <p>{props.cancelButtonText}</p>
-              </div>
+              <SecondaryButton text="Cancel" onClick={() => router.back()} />
            </>
          )}
          {props?.requiredButtons?.includes("services-drop-down") && (
@@ -144,7 +167,7 @@ const TopHeader = (props) => {
            </div>
          )}

-          {props.requiredButtons.includes("download") && (
+          {props?.requiredButtons.includes("download") && !editState && (
            <div
              className={styles.menu}
              onClick={() => setTriggerDropDownMenu(!triggerDropDownMenu)}
@@ -154,6 +177,18 @@ const TopHeader = (props) => {
              </div>
              {triggerDropDownMenu && (
                <div className={styles.dropDown}>
+                  <div onClick={() => props?.setTriggerLogsModal?.(true)}>
+                    <div>
+                      <ViewLogsIcon />
+                      <p>View Logs</p>
+                    </div>
+                  </div>
+                  <div>
+                    <div>
+                      <PublishIcon />
+                      <p>Publish Service</p>
+                    </div>
+                  </div>
                  <div>
                    <div>
                      <OutlineDownloadIcon />
--- a/frontend/src/app/components/topHeader/styles.module.css
+++ b/frontend/src/app/components/topHeader/styles.module.css
@@ -3,8 +3,11 @@
  padding: 24px;
  justify-content: space-between;
  align-items: center;
+
  align-self: stretch;
  background: #21232f;
+  transition: all 0.15s;
+  position: relative;
 }
 .title {
  display: flex;
@@ -33,9 +36,9 @@
 .title > div:hover path {
  stroke: white;
 }
-.title > p {
+.title p {
  color: #d2d3e1;
-  font-size: 24px;
+  font-size: var(--title-font-size);
  font-style: normal;
  font-weight: 400;
  line-height: normal;
@@ -44,6 +47,7 @@
  display: flex;
  justify-content: flex-end;
  align-items: center;
+
  gap: 5px;
 }
 .searchBarContainer {
@@ -53,22 +57,7 @@
  align-items: center;
  gap: 10px;
 }
-.button {
-  display: flex;
-  padding: 7px 15px;
-  justify-content: center;
-  align-items: center;
-  gap: 10px;
-  border-radius: 6px;
-  border-radius: 6px;
-  border: 0.5px solid #8187ff;
-  background: rgba(83, 89, 242, 0.25);
-  color: white;
-  cursor: pointer;
-}
-.button:hover {
-  background: linear-gradient(180deg, #5359f2 0%, #2e3288 100%);
-}
+
 .mngEnvKeyButton {
  display: inline-flex;
  padding: 8px 12px;
@@ -99,22 +88,7 @@
 .mngEnvKeyButton:hover path {
  stroke: white;
 }
-.cancelButton {
-  display: flex;
-  height: 36px;
-  padding: 9px 12px;
-  justify-content: center;
-  align-items: center;
-  gap: 8px;
-  border-radius: 6px;
-  border: 0.5px solid #4e537e;
-  cursor: pointer;
-}
-.cancelButton:hover {
-  border-radius: 6px;
-  border: 1px solid #8e98e7;
-  background: linear-gradient(180deg, #8e98e6 0%, #4d537e 100%);
-}
+
 .menu {
  display: flex;
  width: 36px;
@@ -148,7 +122,7 @@
  flex-direction: column;
  align-items: flex-start;
  gap: 6px;
-  z-index: 2;
+  z-index: 11;
  border-radius: 6px;
  background: #2d3144;
  box-shadow: 0 2px 15px 0 rgba(0, 0, 0, 0.25);
@@ -195,4 +169,23 @@
  font-style: normal;
  font-weight: 500;
  line-height: normal;
+  z-index: 13;
+}
+@media (max-width: 768px) {
+  .container {
+    background: linear-gradient(180deg, #1c1d2b 0%, #191a24 100%);
+
+    padding: 16px;
+  }
+  .column {
+    flex-direction: column;
+    gap: 10px;
+  }
+  .fullWidth {
+    width: 100%;
+    justify-content: flex-start;
+  }
+  .fullWidth > button {
+    width: 100%;
+  }
 }
--- a/frontend/src/app/credentials/add/page.jsx
+++ b/frontend/src/app/credentials/add/page.jsx
@@ -6,9 +6,23 @@ import createCredStyle from "./styles.module.css";
 import TopToolTip from "@/app/components/topToolTip/TopToolTip";
 import TextField from "@/app/components/fields/textfield";
 import Prompts from "@/app/components/prompts/Prompts";
+import useRoleForm from "@/app/hooks/useRolesForm";
+import Alert from "@/app/components/alerts/Alert";
+import useIsMobile from "@/app/hooks/useIsMobile";
+
+const AddCredentialPage = () => {
+  const {
+    register,
+    handleSubmit,
+    errors,
+    onSubmit,
+    triggerAlert,
+    setTriggerAlert,
+  } = useRoleForm();

-const Page = () => {
  const [selectedFile, setSelectedFile] = useState(null);
+  const isMobile = useIsMobile();
+
  // Click
  const handleFileChange = (e) => {
    const file = e.target.files[0];
@@ -17,6 +31,7 @@ const Page = () => {
      console.log(file); //send this to backend later
    }
  };
+
  // Drag/Drop
  const handleDrop = (e) => {
    e.preventDefault();
@@ -29,8 +44,16 @@ const Page = () => {
  const handleDragOver = (e) => {
    e.preventDefault();
  };
+
  return (
    <div className={globalStyle.section}>
+      {triggerAlert && (
+        <Alert
+          setTriggerAlert={setTriggerAlert}
+          onClick={() => setEditState(true)}
+          title="Create Credential"
+        />
+      )}
      <div className={globalStyle.mainContainer}>
        <div className={globalStyle.container}>
          <TopHeader
@@ -42,27 +65,33 @@ const Page = () => {
          />
          {/* Create Crediantial Container */}
          <div className={createCredStyle.createCredContainer}>
-            <TopToolTip />
-            <div className={createCredStyle.inputFieldContainer}>
+            {isMobile ? "" : <TopToolTip />}
+            <form
+              className={createCredStyle.inputFieldContainer}
+              id="form"
+              onSubmit={handleSubmit(onSubmit)}
+            >
              {/* Project Name Input Container */}
              <div className={createCredStyle.projectName}>
                <div className={createCredStyle.label}>
                  <p className={createCredStyle.labelTxt}>Project Name</p>
-                  {/* <p className={createCredStyle.required}>*</p> */}
+                  <p className={createCredStyle.required}>*</p>
                </div>
                {/* Content */}
                <div className={createCredStyle.credInputField}>
-                  <TextField placeHolder="Enter Credential Name" />
+                  <TextField
+                    placeHolder="Enter Credential Name"
+                    {...register("projectName", { required: true })}
+                    hasError={!!errors.projectName}
+                  />
                  <Prompts show={false} />
                </div>
              </div>
-              {/* Upload File */}
              <div className={createCredStyle.uploadFile}>
-                {/* Label */}
                <div className={createCredStyle.label}>
-                  <p>Upload File</p>
+                  <p className={createCredStyle.labelTxt}>Upload File</p>
                  {/* Optional or Required */}
-                  {/* <p className={createCredStyle.optionalTxt}>(Optional)</p> */}{" "}
+                  {/* <p className={createCredStyle.optionalTxt}>(Optional)</p>{" "} */}
                </div>
                {/* Upload File */}
                <label
@@ -92,7 +121,7 @@ const Page = () => {
                  )}
                </label>
              </div>
-            </div>
+            </form>
          </div>
        </div>
      </div>
@@ -100,4 +129,4 @@ const Page = () => {
  );
 };

-export default Page;
+export default AddCredentialPage;
--- a/frontend/src/app/credentials/add/styles.module.css
+++ b/frontend/src/app/credentials/add/styles.module.css
@@ -22,6 +22,7 @@
  flex-direction: column;
  align-items: flex-start;
  gap: 12px;
+  align-self: stretch;
 }
 .label {
  display: flex;
@@ -31,7 +32,6 @@
 }
 .labelTxt {
  color: #d2d3e1;
-  color: color(display-p3 0.8235 0.8275 0.8784);
  font-family: Inter;
  font-size: 16px;
  font-style: normal;
@@ -60,9 +60,8 @@
 }
 .label > .optionalTxt {
  color: #85869b;
-  color: color(display-p3 0.5216 0.5255 0.6);
  font-family: Inter;
-  font-size: 16 px;
+  font-size: 16px;
  font-style: normal;
  font-weight: 300;
  line-height: normal;
@@ -77,22 +76,18 @@
  gap: 10px;
  align-self: stretch;
  border-radius: 4px;
-  border: 1px dashed #5980f1;
-  border: 2px dashed color(display-p3 0.3804 0.4959 0.9137);
+  border: 2px dashed #5980f1;
  cursor: pointer;
 }
 .upload:hover {
  background: rgba(129, 135, 255, 0.25);
-  background: color(display-p3 0.5098 0.5294 1 / 0.25);
 }
 .upload:hover .chooseTxt {
  color: #fff;
-  color: color(display-p3 1 1 1);
 }

 .chooseTxt {
  color: #5980f1;
-  color: color(display-p3 0.3804 0.4959 0.9137);
  text-align: center;
  font-family: Inter;
  font-size: 16px;
@@ -104,7 +99,6 @@

 .dragTxt {
  color: #85869b;
-  color: color(display-p3 0.5216 0.5255 0.6);
  text-align: center;
  font-family: Inter;
  font-size: 14px;
@@ -113,3 +107,28 @@
  line-height: normal;
  align-self: stretch;
 }
+
+/* Mobile */
+@media (max-width: 768px) {
+  .createCredContainer {
+    padding: 32px 16px 0 16px;
+    align-items: flex-start;
+    gap: 16px;
+  }
+
+  .inputFieldContainer {
+    display: flex;
+    align-items: flex-start;
+    padding: 0px;
+    gap: 24px;
+    align-self: stretch;
+  }
+
+  .projectName {
+    width: 100%;
+  }
+
+  .upload {
+    height: 100px;
+  }
+}
--- a/frontend/src/app/credentials/card/Card.jsx
+++ b/frontend/src/app/credentials/card/Card.jsx
@@ -0,0 +1,25 @@
+import DeleteIcon from "@/app/components/icons/delete";
+import React from "react";
+import styles from "./styles.module.css";
+
+const Card = (props) => {
+  return (
+    <div className={styles.cardContainer}>
+      <div className={styles.cardDetails}>
+        <div className={styles.list}>
+          <p>Name</p>
+          <p>{props?.data?.name}</p>
+        </div>
+        <div className={styles.list}>
+          <p>Organization ID</p>
+          <p>{props?.data?.organizationID}</p>
+        </div>
+      </div>
+      <div className={styles.cardAction}>
+        <DeleteIcon />
+      </div>
+    </div>
+  );
+};
+
+export default Card;
--- a/frontend/src/app/credentials/card/styles.module.css
+++ b/frontend/src/app/credentials/card/styles.module.css
@@ -0,0 +1,42 @@
+.cardContainer {
+  display: flex;
+  padding: 16px 0;
+  align-items: flex-start;
+  gap: 16px;
+  align-self: stretch;
+  border-bottom: 1px solid #2c2d3d;
+}
+.cardDetails {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 8px;
+  flex: 1 0 0;
+}
+.list {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 5px;
+  align-self: stretch;
+}
+.list p {
+  color: #85869b;
+  font-family: Inter;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.list p:nth-child(2) {
+  color: #eeeffd;
+  font-family: Inter;
+  font-size: 16px;
+  font-weight: 500;
+}
+.cardAction {
+  display: flex;
+  align-items: center;
+  gap: 17px;
+}
--- a/frontend/src/app/credentials/page.jsx
+++ b/frontend/src/app/credentials/page.jsx
@@ -1,10 +1,16 @@
+"use client";
 import React from "react";
 import TopHeader from "../components/topHeader/TopHeader";
 import globalStyle from "../globalStyle.module.css";
 import styles from "./styles.module.css";
 import DeleteIcon from "../components/icons/delete";
 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 = [
    {
      name: "mongo tls ca crt",
@@ -65,6 +71,14 @@ const CredentialsPage = () => {
            topbarTitle="Credentials"
            requiredButtons={["title", "add", "search", "env"]}
          />
+          {isMobile ? (
+            <div className={styles.cardContainer}>
+              <MobileSearchBar />
+              {sampleData.map((data, key) => (
+                <Card data={data} key={key} />
+              ))}
+            </div>
+          ) : (
            <div className={styles.tableContainer}>
              <table className={styles.table}>
                <thead>
@@ -83,9 +97,7 @@ const CredentialsPage = () => {
                        <td>{org.organizationID}</td>
                        <td className={styles.actions}>
                          <div>
-                          <button className={styles.iconButton}>
-                            <DeleteIcon />
-                          </button>
+                            <ActionButton icon={<DeleteIcon />} />
                          </div>
                        </td>
                      </tr>
@@ -94,6 +106,7 @@ const CredentialsPage = () => {
                </tbody>
              </table>
            </div>
+          )}
        </div>
      </div>
    </div>
--- a/frontend/src/app/credentials/styles.module.css
+++ b/frontend/src/app/credentials/styles.module.css
@@ -31,7 +31,7 @@
 .tableContainer > table > tbody > tr > td {
  color: #eeeffd;
  font-family: Inter;
-  font-size: 13px;
+  font-size: 0.8rem;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
@@ -47,29 +47,19 @@
 .tableContainer > table > thead > tr > th {
  color: #85869b;
  font-family: Inter;
-  font-size: 13px;
+  font-size: 0.8rem;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
 }
-.iconButton {
+.cardContainer {
  display: flex;
-  padding: 6px;
+  padding: 0 16px;
+  padding-bottom: 50px;
+  height: calc(100vh - 170px);
  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  flex-shrink: 0;
-  aspect-ratio: 1/1;
-  background-color: rgba(255, 255, 255, 0);
-  outline: none;
-  border: 1px solid #959aff00;
-  cursor: pointer;
-  border-radius: 50%;
-}
-.iconButton:hover {
-  border: 1px solid #959aff;
-  background: linear-gradient(180deg, #696b95 0%, #20202d 100%);
-}
-.iconButton:hover path {
-  stroke: white;
+  align-items: flex-start;
+  gap: 12px;
+  align-self: stretch;
+  overflow: auto;
 }
--- a/frontend/src/app/globals.css
+++ b/frontend/src/app/globals.css
@@ -1,6 +1,8 @@
 :root {
  --background: #d2d3e0;
  --foreground: #191a24;
+  --table-font-size: 13px;
+  --title-font-size: 24px;
 }

@media (prefers-color-scheme: dark) {
@@ -42,7 +44,7 @@ a {
  }
 }
 ::-webkit-scrollbar {
-  width: 8px;
+  width: 6px;
  height: 8px;
  background-color: transparent;
 }
@@ -51,3 +53,13 @@ a {
  border-radius: 2px;
  background: #34384c;
 }
+@media (max-width: 900px) {
+  :root {
+    --table-font-size: 10px;
+  }
+}
+@media (max-width: 500px) {
+  :root {
+    --title-font-size: 18px;
+  }
+}
--- a/frontend/src/app/home/page.jsx
+++ b/frontend/src/app/home/page.jsx
@@ -1,7 +1,13 @@
+"use client";
+
 import React from "react";
 import userDashboardStyle from "./styles.module.css";
-
+import LinkIcon from "../components/icons/link";
+import SunIcon from "../components/icons/sun";
+import Link from "next/link";
+import useIsMobile from "../hooks/useIsMobile";
 const HomePage = () => {
+  const isMobile = useIsMobile();
  return (
    // Main
    <div className={userDashboardStyle.mainWrapper}>
@@ -9,32 +15,11 @@ const HomePage = () => {
        <div className={userDashboardStyle.userDashContainer}>
          {/* User Name */}
          <div className={userDashboardStyle.userNameContainer}>
-            {/* Name and Welcome Msg */}
+            {/* Name and Welcome Msg Section */}
            <div className={userDashboardStyle.nameSection}>
              {/* Weather */}
              <div className={userDashboardStyle.weather}>
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width={24}
-                  height={24}
-                  viewBox="0 0 24 24"
-                  fill="none"
-                >
-                  <path
-                    d="M8 12C8 13.0609 8.42143 14.0783 9.17157 14.8284C9.92172 15.5786 10.9391 16 12 16C13.0609 16 14.0783 15.5786 14.8284 14.8284C15.5786 14.0783 16 13.0609 16 12C16 10.9391 15.5786 9.92172 14.8284 9.17157C14.0783 8.42143 13.0609 8 12 8C10.9391 8 9.92172 8.42143 9.17157 9.17157C8.42143 9.92172 8 10.9391 8 12Z"
-                    stroke="white"
-                    strokeWidth={1.5}
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                  />
-                  <path
-                    d="M3 12H4M12 3V4M20 12H21M12 20V21M5.6 5.6L6.3 6.3M18.4 5.6L17.7 6.3M17.7 17.7L18.4 18.4M6.3 17.7L5.6 18.4"
-                    stroke="white"
-                    strokeWidth={1.5}
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                  />
-                </svg>
+                <SunIcon />
                <p>
                  Friday, Feb 23
                  <span className={userDashboardStyle.ordinal}>rd</span>
@@ -48,7 +33,7 @@ const HomePage = () => {
                </p>
              </div>
            </div>
-            {/* Logo */}
+            {/* Image Section*/}
            <div className={userDashboardStyle.logoSection}>
              <div className={userDashboardStyle.gradientGlass}></div>
            </div>
@@ -57,36 +42,15 @@ const HomePage = () => {
          <div className={userDashboardStyle.linkMainContainer}>
            <div className={userDashboardStyle.linkContainer}>
              <div className={userDashboardStyle.link}>
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width={24}
-                  height={24}
-                  viewBox="0 0 24 24"
-                  fill="none"
-                >
-                  <path
-                    d="M9 15L15 9"
-                    stroke="#969AF9"
-                    strokeWidth={2}
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                  />
-                  <path
-                    d="M11 6.00031L11.463 5.46431C12.4008 4.52663 13.6727 3.99991 14.9989 4C16.325 4.00009 17.5968 4.527 18.5345 5.46481C19.4722 6.40261 19.9989 7.6745 19.9988 9.00066C19.9987 10.3268 19.4718 11.5986 18.534 12.5363L18 13.0003"
-                    stroke="#969AF9"
-                    strokeWidth={2}
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                  />
-                  <path
-                    d="M13.0001 18L12.6031 18.534C11.6544 19.4722 10.3739 19.9984 9.03964 19.9984C7.70535 19.9984 6.42489 19.4722 5.47614 18.534C5.0085 18.0716 4.63724 17.521 4.38385 16.9141C4.13047 16.3073 4 15.6561 4 14.9985C4 14.3408 4.13047 13.6897 4.38385 13.0829C4.63724 12.476 5.0085 11.9254 5.47614 11.463L6.00014 11"
-                    stroke="#969AF9"
-                    strokeWidth={2}
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                  />
-                </svg>
-                <p>Connected to https://isaac.dev.onecoopbank.com</p>
+                <div className={userDashboardStyle.linkIcon}>
+                  {isMobile ? (
+                    <LinkIcon color="#D2D3E1" width="18" height="18" />
+                  ) : (
+                    <LinkIcon />
+                  )}
+                  <p>Connected to</p>
+                </div>
+                <Link href="#">https://isaac.dev.onecoopbank.com</Link>
              </div>
            </div>
          </div>
--- a/frontend/src/app/home/styles.module.css
+++ b/frontend/src/app/home/styles.module.css
@@ -11,7 +11,6 @@
  flex: 1 0 0;
  align-self: stretch;
  background: #191a24;
-  background: color(display-p3 0.098 0.102 0.1373);
 }
 .userDashContainer {
  display: flex;
@@ -20,7 +19,6 @@
  flex: 1 0 0;
  align-self: stretch;
  background: #191a24;
-  background: color(display-p3 0.098 0.102 0.1373);
 }
 .userNameContainer {
  display: flex;
@@ -29,9 +27,7 @@
  align-items: center;
  align-self: stretch;
  border-radius: 8px;
-  background: #21232f;
-  background: color(display-p3 0.1294 0.1373 0.1804);
-  position: relative;
+  background: linear-gradient(180deg, #21232f 0%, #34366f 100%);
  overflow: hidden;
 }
 .nameSection {
@@ -43,21 +39,24 @@
 }
 .logoSection {
  display: flex;
-  padding-right: 16px;
+  padding-right: 0.157px;
  flex-direction: column;
  justify-content: flex-end;
  align-items: center;
  align-self: stretch;
+  position: relative;
+}
+
+.gradientGlass {
+  max-width: 345.503px;
+  height: 345.503px;
+  transform: rotate(3.836deg);
+  aspect-ratio: 1/1;
+  background: url(/images/idp.png) 50% / cover no-repeat;
+  pointer-events: none;
  position: absolute;
  right: 0;
-}
-.gradientGlass {
-  width: 210px;
-  height: 339px;
-  /* aspect-ratio: 75/75; */
-  background: url(/images/gradientnormal.png) rgba(211, 211, 211, 0) 50% / cover
-    no-repeat;
-  transform: translate(-15px, -60px);
+  top: 0;
 }
 .weather {
  display: flex;
@@ -127,19 +126,90 @@
  align-self: stretch;
 }
 .link {
+  display: flex;
+  gap: 5px;
+  align-items: center;
+}
+.linkIcon {
  display: flex;
  align-items: center;
  gap: 10px;
  align-self: stretch;
 }
-.link > p {
+.link,
+.linkIcon > p {
  color: #959aff;
-  color: color(display-p3 0.5892 0.6031 0.9766);
  font-family: Inter;
  font-size: 18px;
  font-style: normal;
  font-weight: 400;
  line-height: normal;
  letter-spacing: -0.18px;
-  width: 463px;
+  /* width: 463px; */
+}
+
+/* Mobile */
+@media (max-width: 768px) {
+  .mainContainer {
+    padding: 16px;
+  }
+  .userDashContainer {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 16px;
+    flex: 1 0 0;
+  }
+  .userNameContainer {
+    border-radius: 12px;
+    flex-direction: column;
+    gap: 24px;
+  }
+  .linkMainContainer {
+    padding: 10px;
+    border-radius: 12px;
+    background: #1e202e;
+  }
+  .welcomeMsg {
+    align-self: stretch;
+    font-size: 36px;
+    line-height: normal;
+    letter-spacing: 0.36px;
+  }
+
+  .logoSection {
+    display: flex;
+    height: 144px;
+    justify-content: flex-end;
+    align-items: flex-end;
+    gap: 10px;
+    align-self: stretch;
+  }
+  .gradientGlass {
+    left: -29.114px;
+  }
+
+  .link {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: flex-start;
+    gap: 10px;
+    align-self: stretch;
+  }
+  .linkIcon > p {
+    color: #d2d3e1;
+    font-size: 14px;
+  }
+}
+
+/* Tablet */
+@media (max-width: 1199px) {
+  .userNameContainer {
+    align-items: flex-start;
+  }
+  /* Pwede butngan ani pero modako lagi ang card */
+  /* .logoSection {
+    padding-right: 369px;
+  } */
 }
--- a/frontend/src/app/hooks/useAgentForm.jsx
+++ b/frontend/src/app/hooks/useAgentForm.jsx
@@ -0,0 +1,32 @@
+"use client";
+
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+
+const useAgentForm = () => {
+  const [triggerAlert, setTriggerAlert] = useState(false);
+
+  const {
+    register,
+    handleSubmit,
+    watch,
+    formState: { errors },
+  } = useForm();
+
+  const onSubmit = (data) => {
+    setTriggerAlert(true);
+    console.log("Submitted data:", data);
+  };
+
+  return {
+    register,
+    handleSubmit,
+    watch,
+    errors,
+    onSubmit,
+    triggerAlert,
+    setTriggerAlert,
+  };
+};
+
+export default useAgentForm;
--- a/frontend/src/app/hooks/useCredentialForm.jsx
+++ b/frontend/src/app/hooks/useCredentialForm.jsx
@@ -0,0 +1,33 @@
+"use client";
+
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+
+const useCredentialForm = () => {
+  const [triggerAlert, setTriggerAlert] = useState(false);
+
+  const {
+    register,
+    handleSubmit,
+    watch,
+    formState: { errors },
+  } = useForm();
+
+  const onSubmit = (data) => {
+    setTriggerAlert(true);
+
+    console.log("Submitted data:", data);
+  };
+
+  return {
+    register,
+    handleSubmit,
+    watch,
+    errors,
+    onSubmit,
+    triggerAlert,
+    setTriggerAlert,
+  };
+};
+
+export default useCredentialForm;
--- a/frontend/src/app/hooks/useIsMobile.jsx
+++ b/frontend/src/app/hooks/useIsMobile.jsx
@@ -0,0 +1,19 @@
+import { useState, useEffect } from "react";
+
+export default function useIsMobile(breakpoint = 768) {
+  const [isMobile, setIsMobile] = useState(true);
+
+  useEffect(() => {
+    const checkScreen = () => {
+      setIsMobile(window.innerWidth <= breakpoint);
+    };
+
+    checkScreen(); // run once on mount
+
+    window.addEventListener("resize", checkScreen);
+
+    return () => window.removeEventListener("resize", checkScreen);
+  }, [breakpoint]);
+
+  return isMobile;
+}
--- a/frontend/src/app/hooks/useNagivation.jsx
+++ b/frontend/src/app/hooks/useNagivation.jsx
@@ -0,0 +1,22 @@
+import { useRouter } from "next/navigation";
+
+export default function useNavigations(setTriggerDropDown) {
+  const router = useRouter();
+
+  const handleNav = (path) => {
+    if (setTriggerDropDown) {
+      setTriggerDropDown(false);
+    }
+    router.push(path);
+  };
+
+  return {
+    navToHome: () => handleNav("/home"),
+    navToAgents: () => handleNav("/agents"),
+    navToCredentials: () => handleNav("/credentials"),
+    navToProject: () => handleNav("/projects"),
+    navToRoles: () => handleNav("/roles"),
+    navToOrganization: () => handleNav("/organization"),
+    navToUsers: () => handleNav("/users"),
+  };
+}
--- a/frontend/src/app/hooks/useOrganizationForm.jsx
+++ b/frontend/src/app/hooks/useOrganizationForm.jsx
@@ -0,0 +1,46 @@
+"use client";
+import { useState } from "react";
+
+const useOrganizationForm = () => {
+  const [organizationName, setOrganizationName] = useState("");
+  const [error, setError] = useState(false);
+  const [triggerAlert, setTriggerAlert] = useState(false);
+
+  const handleChange = (e) => {
+    const value = e.target.value;
+    setOrganizationName(value);
+
+    if (value.trim() !== "") {
+      setError(false);
+    }
+  };
+
+  const handleValidation = (e) => {
+    e.preventDefault();
+    setError(true);
+  };
+
+  const handleSubmit = (e) => {
+    e.preventDefault();
+
+    if (!organizationName.trim()) {
+      setError(true);
+      return;
+    }
+    setTriggerAlert(true);
+
+    console.log("Submitted organization:", organizationName);
+  };
+
+  return {
+    organizationName,
+    error,
+    triggerAlert,
+    handleChange,
+    handleValidation,
+    handleSubmit,
+    setTriggerAlert,
+  };
+};
+
+export default useOrganizationForm;
--- a/frontend/src/app/hooks/useProjectForm.jsx
+++ b/frontend/src/app/hooks/useProjectForm.jsx
@@ -0,0 +1,33 @@
+"use client";
+
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+
+const useProjectForm = () => {
+  const [triggerAlert, setTriggerAlert] = useState(false);
+
+  const {
+    register,
+    handleSubmit,
+    watch,
+    formState: { errors },
+  } = useForm();
+
+  const onSubmit = (data) => {
+    setTriggerAlert(true);
+
+    console.log("Submitted data:", data);
+  };
+
+  return {
+    register,
+    handleSubmit,
+    watch,
+    errors,
+    onSubmit,
+    triggerAlert,
+    setTriggerAlert,
+  };
+};
+
+export default useProjectForm;
--- a/frontend/src/app/hooks/useRolesForm.jsx
+++ b/frontend/src/app/hooks/useRolesForm.jsx
@@ -0,0 +1,33 @@
+"use client";
+
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+
+const useRoleForm = () => {
+  const [triggerAlert, setTriggerAlert] = useState(false);
+
+  const {
+    register,
+    handleSubmit,
+    watch,
+    formState: { errors },
+  } = useForm();
+
+  const onSubmit = (data) => {
+    setTriggerAlert(true);
+
+    console.log("Submitted data:", data);
+  };
+
+  return {
+    register,
+    handleSubmit,
+    watch,
+    errors,
+    onSubmit,
+    triggerAlert,
+    setTriggerAlert,
+  };
+};
+
+export default useRoleForm;
--- a/frontend/src/app/hooks/useServicesForm.jsx
+++ b/frontend/src/app/hooks/useServicesForm.jsx
@@ -0,0 +1,64 @@
+"use client";
+
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+
+const useServicesForm = () => {
+  const [triggerAlert, setTriggerAlert] = useState(false);
+  const [disableScaling, setDisableScaling] = useState(true);
+  const [disableReadiness, setDisableReadiness] = useState(true);
+  const [disableLiveness, setDisableLiveness] = useState(true);
+  const {
+    register,
+    handleSubmit,
+    watch,
+    reset,
+    formState: { errors },
+  } = useForm({
+    defaultValues: {
+      minPods: "",
+      maxPods: "",
+      readinessPath: "",
+      readinessPort: "",
+      livenessPath: "",
+      livenessPort: "",
+    },
+  });
+
+  const minPods = watch("minPods");
+  const maxPods = watch("maxPods");
+  const readinessPath = watch("readinessPath");
+  const readinessPort = watch("readinessPort");
+  const livenessPath = watch("livenessPath");
+  const livenessPort = watch("livenessPort");
+
+  const onSubmit = (data) => {
+    setTriggerAlert(true);
+
+    console.log("Submitted data:", data);
+  };
+
+  return {
+    register,
+    handleSubmit,
+    watch,
+    errors,
+    onSubmit,
+    triggerAlert,
+    setTriggerAlert,
+    setDisableScaling,
+    disableScaling,
+    setDisableReadiness,
+    disableReadiness,
+    setDisableLiveness,
+    disableLiveness,
+    minPods,
+    maxPods,
+    readinessPath,
+    readinessPort,
+    livenessPort,
+    livenessPath,
+  };
+};
+
+export default useServicesForm;
--- a/frontend/src/app/hooks/useUserForm.jsx
+++ b/frontend/src/app/hooks/useUserForm.jsx
@@ -0,0 +1,33 @@
+"use client";
+
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+
+const useUserForm = () => {
+  const [triggerAlert, setTriggerAlert] = useState(false);
+
+  const {
+    register,
+    handleSubmit,
+    watch,
+    formState: { errors },
+  } = useForm();
+
+  const onSubmit = (data) => {
+    setTriggerAlert(true);
+
+    console.log("Submitted data:", data);
+  };
+
+  return {
+    register,
+    handleSubmit,
+    watch,
+    errors,
+    onSubmit,
+    triggerAlert,
+    setTriggerAlert,
+  };
+};
+
+export default useUserForm;
--- a/frontend/src/app/layout.js
+++ b/frontend/src/app/layout.js
@@ -1,8 +1,8 @@
 import { Inter } from "next/font/google";
 import Sidebar from "./components/sidebar/Sidebar";
-import Header from "./components/header/Header";
 import "./globals.css";
 import styles from "./page.module.css";
+import Navbar from "./components/navbar/Navbar";

 const inter = Inter({
  variable: "--font-inter",
@@ -22,7 +22,7 @@ export default function RootLayout({ children }) {
          <Sidebar />

          <div className={styles.mainContainer}>
-            <Header />
+            <Navbar />
            {children}
          </div>
        </div>
--- a/frontend/src/app/organization/add/page.jsx
+++ b/frontend/src/app/organization/add/page.jsx
@@ -1,24 +1,49 @@
-import React from "react";
+"use client";
+import React, { useRef, useState } from "react";
 import globalStyle from "../../globalStyle.module.css";
 import TopHeader from "@/app/components/topHeader/TopHeader";
 import styles from "./styles.module.css";
 import Image from "next/image";
 import TopToolTip from "@/app/components/topToolTip/TopToolTip";
 import TextField from "@/app/components/fields/textfield";
+import Alert from "@/app/components/alerts/Alert";
+import Prompts from "@/app/components/prompts/Prompts";
+import useOrganizationForm from "@/app/hooks/useOrganizationForm";
 const AddCredentials = () => {
+  const {
+    organizationName,
+    error,
+    triggerAlert,
+    handleChange,
+    handleValidation,
+    handleSubmit,
+    setTriggerAlert,
+  } = useOrganizationForm();
+
  return (
    <div className={globalStyle.section}>
+      {triggerAlert && (
+        <Alert
+          setTriggerAlert={setTriggerAlert}
+          onClick={() => setEditState(true)}
+          title="Create Organization"
+        />
+      )}
      <div className={globalStyle.mainContainer}>
        <div className={globalStyle.container}>
          <TopHeader
            buttonText="Save"
            cancelButtonText="Cancel"
-            state="add"
            topbarTitle="Create New Organization"
+            requiredButtons={["title", "save"]}
          />
          <div className={styles.contentContainer}>
            <TopToolTip />
-            <div className={styles.createOrganizationFormContainer}>
+            <form
+              className={styles.createOrganizationFormContainer}
+              id="form"
+              onSubmit={handleSubmit}
+            >
              <div className={styles.organizationBadgeContainer}>
                <div className={styles.organizationBadge}>
                  <div className={styles.organizationBadgeDetails}>
@@ -31,7 +56,8 @@ const AddCredentials = () => {
                          alt="badge image"
                        />
                      </div>
-                      <div className={styles.addIconContainer}>
+                      <input type="file" id="file" hidden accept="image/*" />
+                      <label className={styles.addIconContainer} htmlFor="file">
                        <svg
                          xmlns="http://www.w3.org/2000/svg"
                          width={20}
@@ -54,7 +80,7 @@ const AddCredentials = () => {
                            strokeLinejoin="round"
                          />
                        </svg>
-                      </div>
+                      </label>
                    </div>
                  </div>
                  <div className={styles.labels}>
@@ -71,42 +97,18 @@ const AddCredentials = () => {
                  </p>
                </div>
                <div className={styles.inputField}>
-                  <TextField placeHolder="Enter organization name" />
-                  <div className={styles.prompts}>
-                    <svg
-                      xmlns="http://www.w3.org/2000/svg"
-                      width="20"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      fill="none"
-                    >
-                      <path
-                        d="M2.5 10C2.5 10.9849 2.69399 11.9602 3.0709 12.8701C3.44781 13.7801 4.00026 14.6069 4.6967 15.3033C5.39314 15.9997 6.21993 16.5522 7.12987 16.9291C8.03982 17.306 9.01509 17.5 10 17.5C10.9849 17.5 11.9602 17.306 12.8701 16.9291C13.7801 16.5522 14.6069 15.9997 15.3033 15.3033C15.9997 14.6069 16.5522 13.7801 16.9291 12.8701C17.306 11.9602 17.5 10.9849 17.5 10C17.5 8.01088 16.7098 6.10322 15.3033 4.6967C13.8968 3.29018 11.9891 2.5 10 2.5C8.01088 2.5 6.10322 3.29018 4.6967 4.6967C3.29018 6.10322 2.5 8.01088 2.5 10Z"
-                        stroke="#CCA04F"
-                        strokeWidth="1.5"
-                        strokeLinecap="round"
-                        strokeLinejoin="round"
+                  <TextField
+                    placeHolder="Enter organization name"
+                    required
+                    hasError={error}
+                    value={organizationName}
+                    onChange={handleChange}
+                    onInvalid={handleValidation}
                  />
-                      <path
-                        d="M10 6.66699V10.0003"
-                        stroke="#CCA04F"
-                        strokeWidth="1.5"
-                        strokeLinecap="round"
-                        strokeLinejoin="round"
-                      />
-                      <path
-                        d="M10 13.333H10.0083"
-                        stroke="#CCA04F"
-                        strokeWidth="1.5"
-                        strokeLinecap="round"
-                        strokeLinejoin="round"
-                      />
-                    </svg>
-                    <p>The name is already in used. You can try another.</p>
-                  </div>
-                </div>
+                  <Prompts show={true} />
                </div>
              </div>
+            </form>
          </div>
        </div>
      </div>
--- a/frontend/src/app/organization/add/styles.module.css
+++ b/frontend/src/app/organization/add/styles.module.css
@@ -3,7 +3,8 @@
  flex-direction: column;
  align-items: center;
  gap: 48px;
-  flex: 1 0 0;
+
+  height: calc(100vh - 170px);
  align-self: stretch;
 }
 .upperToolTips {
@@ -24,7 +25,7 @@
  color: #191a24;
  text-align: center;
  font-family: Inter;
-  font-size: 16px;
+  font-size: 1rem;
  font-style: normal;
  font-weight: 400;
  line-height: normal;
@@ -36,6 +37,7 @@
  justify-content: center;
  align-items: center;
  gap: 32px;
+  width: min(100%, 500px);
 }
 .organizationBadgeContainer {
  display: flex;
@@ -89,6 +91,13 @@
  box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.25);
  border-radius: 100px;
  background: #696b95;
+  transition: all 0.1;
+  cursor: pointer;
+}
+.addIconContainer:hover {
+  border-radius: 100px;
+  border: 1px solid #959aff;
+  background: linear-gradient(180deg, #696b95 0%, #20202d 100%);
 }
 .labels {
  display: flex;
@@ -98,9 +107,8 @@
 }
 .labels > p {
  color: #d2d3e1;
-  color: color(display-p3 0.8235 0.8275 0.8784);
  font-family: Inter;
-  font-size: 16px;
+  font-size: 1rem;
  font-style: normal;
  font-weight: 400;
  line-height: normal;
@@ -108,17 +116,17 @@
 .labels > p span {
  color: #85869b;
  font-family: Inter;
-  font-size: 16px;
+  font-size: 1rem;
  font-style: normal;
  font-weight: 300;
  line-height: normal;
 }
 .inputGroup {
  display: flex;
-  width: 500px;
  flex-direction: column;
  align-items: flex-start;
  gap: 12px;
+  width: 100%;
 }
 .inputLabel {
  display: flex;
@@ -129,7 +137,7 @@
 .inputLabel > p {
  color: #d2d3e1;
  font-family: Inter;
-  font-size: 16px;
+  font-size: 1rem;
  font-style: normal;
  font-weight: 400;
  line-height: normal;
@@ -147,42 +155,7 @@
  gap: 8px;
  align-self: stretch;
 }
-.inputField > input {
-  display: flex;
-  padding: 12px;
-  flex-direction: column;
-  justify-content: center;
-  align-items: flex-start;
-  gap: 10px;
-  align-self: stretch;
-  border-radius: 6px;
-  border: 1px solid #616583;
-  background-color: transparent;
-  color: white;
-  font-family: Inter;
-  font-size: 16px;
-  outline: none;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-  caret-color: #575bc7;
-}
-.inputField > input:focus {
-  border-radius: 6px;
-  border: 1px solid #a8aac1;
-  background: rgba(75, 79, 109, 0.25);
-}
-.inputField > input:hover {
-  background: rgba(75, 79, 109, 0.25);
-}
-.inputField > input::placeholder {
-  color: #85869b;
-  font-family: Inter;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-}
+
 .prompts {
  display: flex;
  align-items: center;
@@ -192,7 +165,7 @@
 .prompts > p {
  color: #d49e3d;
  font-family: Inter;
-  font-size: 14px;
+  font-size: 0.85rem;
  font-style: normal;
  font-weight: 400;
  line-height: normal;
--- a/frontend/src/app/organization/card/Card.jsx
+++ b/frontend/src/app/organization/card/Card.jsx
@@ -0,0 +1,25 @@
+import DeleteIcon from "@/app/components/icons/delete";
+import React from "react";
+import styles from "./styles.module.css";
+
+const Card = (props) => {
+  return (
+    <div className={styles.cardContainer}>
+      <div className={styles.cardDetails}>
+        <div className={styles.list}>
+          <p>Organization Name</p>
+          <p>{props?.data?.organizationName}</p>
+        </div>
+        <div className={styles.list}>
+          <p>Date Created</p>
+          <p>{props?.data?.dateCreated}</p>
+        </div>
+      </div>
+      <div className={styles.cardAction}>
+        <DeleteIcon />
+      </div>
+    </div>
+  );
+};
+
+export default Card;
--- a/frontend/src/app/organization/card/styles.module.css
+++ b/frontend/src/app/organization/card/styles.module.css
@@ -0,0 +1,42 @@
+.cardContainer {
+  display: flex;
+  padding: 16px 0;
+  align-items: flex-start;
+  gap: 16px;
+  align-self: stretch;
+  border-bottom: 1px solid #2c2d3d;
+}
+.cardDetails {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 8px;
+  flex: 1 0 0;
+}
+.list {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 5px;
+  align-self: stretch;
+}
+.list p {
+  color: #85869b;
+  font-family: Inter;
+  font-size: 0.85rem;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.list p:nth-child(2) {
+  color: #eeeffd;
+  font-family: Inter;
+  font-size: 1rem;
+  font-weight: 500;
+}
+.cardAction {
+  display: flex;
+  align-items: center;
+  gap: 17px;
+}
--- a/frontend/src/app/organization/page.jsx
+++ b/frontend/src/app/organization/page.jsx
@@ -1,12 +1,17 @@
-"use-client";
-import React from "react";
+"use client";
+import React, { useEffect, useState } from "react";
 import styles from "./styles.module.css";
 import TopHeader from "../components/topHeader/TopHeader";
 import globalStyle from "../globalStyle.module.css";
 import SuccessToast from "../components/toast/success/successToast";
 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();
  const sampleData = [
    {
      organizationName: "Project Moonshot Inc.",
@@ -63,6 +68,13 @@ const OrganizationPage = () => {
            topbarTitle="Organization"
            requiredButtons={["title", "add", "search"]}
          />
+
+          <div className={styles.cardContainer}>
+            <MobileSearchBar />
+            {isMobile &&
+              sampleData.map((data, key) => <Card data={data} key={key} />)}
+          </div>
+
          <div className={styles.tableContainer}>
            <table className={styles.table}>
              <thead>
@@ -74,16 +86,15 @@ const OrganizationPage = () => {
              </thead>

              <tbody>
-                {sampleData.map((org, index) => {
+                {!isMobile &&
+                  sampleData.map((org, index) => {
                    return (
                      <tr key={index}>
                        <td>{org.organizationName}</td>
                        <td>{org.dateCreated}</td>
                        <td className={styles.actions}>
                          <div>
-                          <button className={styles.iconButton}>
-                            <DeleteIcon />
-                          </button>
+                            <ActionButton icon={<DeleteIcon />} />
                          </div>
                        </td>
                      </tr>
--- a/frontend/src/app/organization/styles.module.css
+++ b/frontend/src/app/organization/styles.module.css
@@ -30,7 +30,7 @@
 .tableContainer > table > tbody > tr > td {
  color: #eeeffd;
  font-family: Inter;
-  font-size: 13px;
+  font-size: 0.8rem;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
@@ -46,29 +46,28 @@
 .tableContainer > table > thead > tr > th {
  color: #85869b;
  font-family: Inter;
-  font-size: 13px;
+  font-size: 0.8rem;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
 }
-.iconButton {
+.cardContainer {
  display: flex;
-  padding: 6px;
+  padding: 0 16px;
+  padding-bottom: 50px;
+  height: calc(100vh - 170px);
  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  flex-shrink: 0;
-  aspect-ratio: 1/1;
-  background-color: rgba(255, 255, 255, 0);
-  outline: none;
-  border: 1px solid #959aff00;
-  cursor: pointer;
-  border-radius: 50%;
+  align-items: flex-start;
+  gap: 12px;
+  align-self: stretch;
+  overflow: auto;
+  display: none;
 }
-.iconButton:hover {
-  border: 1px solid #959aff;
-  background: linear-gradient(180deg, #696b95 0%, #20202d 100%);
-}
-.iconButton:hover path {
-  stroke: white;
+@media (max-width: 768px) {
+  .cardContainer {
+    display: flex;
+  }
+  .tableContainer {
+    display: none;
+  }
 }
--- a/frontend/src/app/projects/add/page.jsx
+++ b/frontend/src/app/projects/add/page.jsx
@@ -1,3 +1,4 @@
+"use client";
 import React from "react";
 import globalStyle from "../../globalStyle.module.css";
 import TopHeader from "@/app/components/topHeader/TopHeader";
@@ -5,10 +6,27 @@ import styles from "./styles.module.css";
 import TopToolTip from "@/app/components/topToolTip/TopToolTip";
 import TextField from "@/app/components/fields/textfield";
 import SelectField from "@/app/components/select/SelectField";
-import WarningIcon from "@/app/components/icons/warning";
+import Prompts from "@/app/components/prompts/Prompts";
+import Alert from "@/app/components/alerts/Alert";
+import useProjectForm from "@/app/hooks/useProjectForm";
 const AddProject = () => {
+  const {
+    register,
+    handleSubmit,
+    errors,
+    onSubmit,
+    triggerAlert,
+    setTriggerAlert,
+  } = useProjectForm();
  return (
    <div className={globalStyle.section}>
+      {triggerAlert && (
+        <Alert
+          setTriggerAlert={setTriggerAlert}
+          onClick={() => setEditState(true)}
+          title="Create Organization"
+        />
+      )}
      <div className={globalStyle.mainContainer}>
        <div className={globalStyle.container}>
          <TopHeader
@@ -20,7 +38,11 @@ const AddProject = () => {
          />
          <div className={styles.contentContainer}>
            <TopToolTip />
-            <div className={styles.createProjectFormContainer}>
+            <form
+              className={styles.createProjectFormContainer}
+              id="form"
+              onSubmit={handleSubmit(onSubmit)}
+            >
              <div className={styles.inputGroup}>
                <div className={styles.label}>
                  <p>
@@ -28,11 +50,12 @@ const AddProject = () => {
                  </p>
                </div>
                <div className={styles.inputField}>
-                  <TextField placeHolder="Enter project name" />
-                  <div className={styles.prompts}>
-                    <WarningIcon />
-                    <p>The name is already in used. You can try another.</p>
-                  </div>
+                  <TextField
+                    placeHolder="Enter project name"
+                    {...register("projectName", { required: true })}
+                    hasError={!!errors.projectName}
+                  />
+                  <Prompts show={false} />
                </div>
              </div>
              <div className={styles.inputGroup}>
@@ -42,7 +65,11 @@ const AddProject = () => {
                  </p>
                </div>
                <div className={styles.inputField}>
-                  <TextField placeHolder="Version" />
+                  <TextField
+                    placeHolder="Version"
+                    {...register("projectVersion", { required: true })}
+                    hasError={!!errors.projectVersion}
+                  />
                </div>
              </div>
              <div className={styles.inputGroup}>
@@ -79,7 +106,7 @@ const AddProject = () => {
                  />
                </div>
              </div>
-            </div>
+            </form>
          </div>
        </div>
      </div>
--- a/frontend/src/app/projects/add/styles.module.css
+++ b/frontend/src/app/projects/add/styles.module.css
@@ -14,10 +14,12 @@
  align-items: center;
  gap: 24px;
  border-radius: 8px;
+
+  width: min(100%, 500px);
 }
 .inputGroup {
  display: flex;
-  width: 500px;
+  width: 100%;
  flex-direction: column;
  align-items: flex-start;
  gap: 12px;
@@ -32,7 +34,7 @@
  color: #d2d3e1;
  color: color(display-p3 0.8235 0.8275 0.8784);
  font-family: Inter;
-  font-size: 16px;
+  font-size: 1rem;
  font-style: normal;
  font-weight: 400;
  line-height: normal;
@@ -40,7 +42,7 @@
 .label > p span {
  color: #cfb000;
  font-family: Inter;
-  font-size: 16px;
+  font-size: 1rem;
  font-style: normal;
  font-weight: 600;
  line-height: normal;
@@ -52,45 +54,7 @@
  gap: 8px;
  align-self: stretch;
 }
-.inputField > input,
-.inputField > select {
-  display: flex;
-  height: 44px;
-  padding: 12px 16px;
-  flex-direction: column;
-  justify-content: center;
-  align-items: flex-start;
-  gap: 10px;
-  align-self: stretch;
-  border-radius: 6px;
-  border: 1px solid #616583;
-  background-color: transparent;
-  color: white;
-  font-family: Inter;
-  font-size: 16px;
-  outline: none;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-  caret-color: #575bc7;
-}
-.inputField > input:focus {
-  border-radius: 6px;
-  border: 1px solid #959aff;
-  background: rgba(75, 79, 109, 0.25);
-}
-.inputField > input:hover {
-  background: rgba(75, 79, 109, 0.25);
-}
-.inputField > input::placeholder,
-.inputField > select {
-  color: #85869b;
-  font-family: Inter;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-}
+
 .prompts {
  display: flex;
  align-items: center;
@@ -100,7 +64,7 @@
 .prompts > p {
  color: #d49e3d;
  font-family: Inter;
-  font-size: 14px;
+  font-size: 0.85rem;
  font-style: normal;
  font-weight: 400;
  line-height: normal;
--- a/frontend/src/app/projects/page.jsx
+++ b/frontend/src/app/projects/page.jsx
@@ -7,8 +7,13 @@ import { useRouter } from "next/navigation";
 import SuccessToast from "../components/toast/success/successToast";
 import DeleteIcon from "../components/icons/delete";
 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();
  const sampleData = [
    {
      name: "DOKS One Cooperative Bank Backend Develop",
@@ -168,7 +173,7 @@ const ProjectsPage = () => {

  return (
    <div className={globalStyle.section}>
-      <SuccessToast message="Project successfully added!" />
+      <SuccessToast message="New Project added successfully!" />
      <div className={globalStyle.mainContainer}>
        <div className={globalStyle.container}>
          <TopHeader
@@ -176,6 +181,19 @@ const ProjectsPage = () => {
            topbarTitle="Project"
            requiredButtons={["title", "add", "search"]}
          />
+
+          <div className={styles.cardContainer}>
+            <MobileSearchBar />
+            {isMobile &&
+              sampleData.map((data, key) => (
+                <Card
+                  data={data}
+                  key={key}
+                  onClick={() => router.push("/projects/view")}
+                />
+              ))}
+          </div>
+
          <div className={styles.tableContainer}>
            <table className={styles.table}>
              <thead>
@@ -190,17 +208,23 @@ const ProjectsPage = () => {
                </tr>
              </thead>
              <tbody>
-                {sampleData.map((project, index) => {
+                {!isMobile &&
+                  sampleData.map((project, index) => {
                    return (
                      <tr
                        key={index}
                        onClick={() => router.push("/projects/view")}
                      >
                        <td>{project.name}</td>
-                      <td style={{ textAlign: "center" }}>{project.version}</td>
+                        <td style={{ textAlign: "center" }}>
+                          {project.version}
+                        </td>
                        <td>
-                        <span className={styles.used}>{project.cpuUsed}</span> /{" "}
-                        <span className={styles.limit}>{project.cpuLimit}</span>
+                          <span className={styles.used}>{project.cpuUsed}</span>{" "}
+                          /{" "}
+                          <span className={styles.limit}>
+                            {project.cpuLimit}
+                          </span>
                        </td>
                        <td>
                          <span className={styles.used}>
@@ -224,14 +248,10 @@ const ProjectsPage = () => {
                        <td>
                          <div className={styles.actions}>
                            <div>
-                            <button className={styles.iconButton}>
-                              <ViewIcon />
-                            </button>
+                              <ActionButton icon={<ViewIcon />} />
                            </div>
                            <div>
-                            <button className={styles.iconButton}>
-                              <DeleteIcon />
-                            </button>
+                              <ActionButton icon={<DeleteIcon />} />
                            </div>
                          </div>
                        </td>
--- a/frontend/src/app/projects/project-card/Card.jsx
+++ b/frontend/src/app/projects/project-card/Card.jsx
@@ -0,0 +1,46 @@
+import DeleteIcon from "@/app/components/icons/delete";
+import React from "react";
+import styles from "./styles.module.css";
+
+const Card = (props) => {
+  return (
+    <div className={styles.cardContainer} {...props}>
+      <div className={styles.cardDetails}>
+        <div className={styles.list}>
+          <p>Name</p>
+          <p>{props?.data?.name}</p>
+        </div>
+        <div className={styles.list}>
+          <p>CPU Used/Limit</p>
+          <p>
+            <span className={styles.used}>{props?.data?.cpuUsed}</span> /{" "}
+            <span className={styles.limit}>{props?.data?.cpuLimit}</span>
+          </p>
+        </div>
+        <div className={styles.list}>
+          <p>Memory Used/Limit</p>
+          <p>
+            <span className={styles.used}>{props?.data?.memoryUsed}</span> /{" "}
+            <span className={styles.limit}>{props?.data?.memoryLimit}</span>
+          </p>
+        </div>
+        <div className={styles.list}>
+          <p>Storage Used/Limit</p>
+          <p>
+            <span className={styles.used}>{props?.data?.storageUsed}</span> /{" "}
+            <span className={styles.limit}>{props?.data?.storageLimit}</span>
+          </p>
+        </div>
+        <div className={styles.list}>
+          <p>Date Created</p>
+          <p>{props?.data?.dateCreated}</p>
+        </div>
+      </div>
+      <div className={styles.cardAction}>
+        <DeleteIcon />
+      </div>
+    </div>
+  );
+};
+
+export default Card;
--- a/frontend/src/app/projects/project-card/styles.module.css
+++ b/frontend/src/app/projects/project-card/styles.module.css
@@ -0,0 +1,49 @@
+.cardContainer {
+  display: flex;
+  padding: 16px 0;
+  align-items: flex-start;
+  gap: 16px;
+  align-self: stretch;
+  border-bottom: 1px solid #2c2d3d;
+  cursor: pointer;
+}
+.cardDetails {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 8px;
+  flex: 1 0 0;
+}
+.list {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 5px;
+  align-self: stretch;
+}
+.list p {
+  color: #85869b;
+  font-family: Inter;
+  font-size: 0.85rem;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.list p:nth-child(2) {
+  color: #eeeffd;
+  font-family: Inter;
+  font-size: 1rem;
+  font-weight: 500;
+}
+.cardAction {
+  display: flex;
+  align-items: center;
+  gap: 17px;
+}
+.used {
+  color: #50d85f;
+}
+.limit {
+  color: #85869b;
+}
--- a/frontend/src/app/projects/styles.module.css
+++ b/frontend/src/app/projects/styles.module.css
@@ -19,7 +19,7 @@
 }

 .tableContainer > table > thead > tr > th {
-  text-wrap: nowrap;
+  text-wrap: wrap;
 }

 .tableContainer > table > thead > tr > th,
@@ -36,7 +36,7 @@
 .tableContainer > table > tbody > tr > td {
  color: #eeeffd;
  font-family: Inter;
-  font-size: 13px;
+  font-size: 0.8rem;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
@@ -52,7 +52,7 @@
 .tableContainer > table > thead > tr > th {
  color: #85869b;
  font-family: Inter;
-  font-size: 13px;
+  font-size: 0.8rem;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
@@ -63,31 +63,12 @@
  gap: 10px;
  align-self: stretch;
 }
-.iconButton {
-  display: flex;
-  padding: 6px;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  flex-shrink: 0;
-  aspect-ratio: 1/1;
-  background-color: rgba(255, 255, 255, 0);
-  outline: none;
-  border: 1px solid #959aff00;
-  cursor: pointer;
-  border-radius: 50%;
-}
-.iconButton:hover {
-  border: 1px solid #959aff;
-  background: linear-gradient(180deg, #696b95 0%, #20202d 100%);
-}
-.iconButton:hover path {
-  stroke: white;
-}
+
 .used {
  color: #50d85f;
  font-family: Inter;
-  font-size: 13px;
+
+  font-size: 0.8rem;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
@@ -95,8 +76,29 @@
 .limit {
  color: #85869b;
  font-family: Inter;
-  font-size: 13px;
+
+  font-size: 0.8rem;
  font-style: normal;
  font-weight: 500;
  line-height: normal;
 }
+.cardContainer {
+  display: flex;
+  padding: 0 16px;
+  padding-bottom: 50px;
+  height: calc(100vh - 170px);
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 12px;
+  align-self: stretch;
+  overflow: auto;
+  display: none;
+}
+@media (max-width: 768px) {
+  .cardContainer {
+    display: flex;
+  }
+  .tableContainer {
+    display: none;
+  }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
benzbarquilla	a4675c843d	done searchbar but not final	2026-03-31 14:49:20 +08:00
benzbarquilla	02d53f69ad	few changes, mobile searchbar not done	2026-03-30 17:21:09 +08:00
Laux Dev	992d01ba9b	Final	2026-03-26 17:22:32 +08:00
benzbarquilla	9f0392c9c2	fixed	2026-03-26 15:17:54 +08:00
benzbarquilla	6e54a9468b	fixed padding	2026-03-25 10:48:32 +08:00
Laux Dev	18524971f8	fixed	2026-03-25 10:17:10 +08:00
Laux Dev	395de5ef88	Merge branch 'DEVELOPMENT' of https://gitea.internship.project-moonshot.com/Laux/Frontend-Internal-Developer-Platform into DEVELOPMENT	2026-03-25 10:16:40 +08:00
benzbarquilla	cc2a18c4d7	done credentials and agents mobile/responsive need review	2026-03-24 17:04:16 +08:00
Laux Dev	2c9f2d612b	Refactor	2026-03-19 18:57:20 +08:00
benzbarquilla	c9d5faebb0	done users and roles page responsive view review nalang ang polish	2026-03-19 16:27:37 +08:00
benzbarquilla	8c776a5491	fixed agents add and view desktop	2026-03-19 09:29:25 +08:00
benzbarquilla	14884f6b3a	done user and role table, and add user	2026-03-18 17:24:15 +08:00
Laux Dev	f84894b6d7	Merge branch 'DEVELOPMENT' of https://gitea.internship.project-moonshot.com/Laux/Frontend-Internal-Developer-Platform into DEVELOPMENT	2026-03-18 16:19:01 +08:00
Laux Dev	6fd78aa92f	Add feature	2026-03-18 16:18:55 +08:00
benzbarquilla	7c0d7011ae	Merge branch 'DEVELOPMENT' of https://gitea.internship.project-moonshot.com/Laux/Frontend-Internal-Developer-Platform into DEVELOPMENT	2026-03-18 08:59:57 +08:00
benzbarquilla	3487a71153	added loki form to agents	2026-03-18 08:59:54 +08:00
Laux Dev	d7f65cb1a7	fixed	2026-03-17 20:13:43 +08:00
Laux Dev	a220230d0b	add	2026-03-17 17:02:41 +08:00
benzbarquilla	7745c83bbd	added active state	2026-03-16 17:33:05 +08:00
benzbarquilla	cbaff15d72	few adjustments	2026-03-16 17:08:10 +08:00
benzbarquilla	dfad22a03f	thats all for today!!	2026-03-16 16:45:39 +08:00
benzbarquilla	925804021a	done mobile navbar and users	2026-03-16 16:29:16 +08:00
Laux Dev	62bb558706	progress	2026-03-16 15:25:01 +08:00
Laux Dev	fbeb3a509a	progress	2026-03-16 14:42:04 +08:00
benzbarquilla	dcddc14d7e	done home mobile	2026-03-16 10:21:18 +08:00
Laux Dev	e1ec8a90c1	Fixed	2026-03-16 10:19:36 +08:00
benzbarquilla	30534eb169	thats all for today!!	2026-03-13 16:54:36 +08:00
benzbarquilla	cb850b4cd0	changed navbar	2026-03-13 14:40:00 +08:00
Laux Dev	f44258d134	add responsiveness	2026-03-13 14:38:46 +08:00
benzbarquilla	4478a74ece	Added label for forms	2026-03-13 09:21:27 +08:00
benzbarquilla	bd20f5a5cf	Merge branch 'DEVELOPMENT' of https://gitea.internship.project-moonshot.com/Laux/Frontend-Internal-Developer-Platform into DEVELOPMENT	2026-03-06 09:28:26 +08:00
benzbarquilla	deea4905b0	changes on hover	2026-03-06 09:28:23 +08:00
Laux Dev	8f3595cf5d	fixed	2026-03-06 09:24:41 +08:00
Laux Dev	c1e11d7f1c	fixed	2026-03-06 09:21:17 +08:00
Laux Dev	9b23841876	fixed	2026-03-06 09:10:10 +08:00
Laux Dev	278c256805	fixed	2026-03-06 09:06:26 +08:00
Laux Dev	4ecb6f8167	Merge branch 'DEVELOPMENT' of https://gitea.internship.project-moonshot.com/Laux/Frontend-Internal-Developer-Platform into DEVELOPMENT	2026-03-06 09:03:01 +08:00
Laux Dev	7b7b15738b	Fixed	2026-03-06 09:02:55 +08:00
benzbarquilla	fcaa310502	changed names	2026-03-05 16:20:00 +08:00
Laux Dev	b3f7427e95	add more validations	2026-03-05 16:03:31 +08:00
Laux Dev	dae12d74ee	Validations added temporarily	2026-03-05 11:52:21 +08:00
Laux Dev	7f42f61431	Fixed text	2026-03-04 16:44:54 +08:00
Laux Dev	00336349be	FIxed	2026-03-04 16:33:39 +08:00
Laux Dev	eb37c2f6f8	Added feature	2026-03-04 16:26:53 +08:00
benzbarquilla	ed3fee5b81	updated asset position	2026-03-04 16:01:10 +08:00
benzbarquilla	3f138e7bf5	Merge branch 'DEVELOPMENT' of https://gitea.internship.project-moonshot.com/Laux/Frontend-Internal-Developer-Platform into DEVELOPMENT	2026-03-04 14:27:39 +08:00
benzbarquilla	b2a1fc0f9e	changed home image	2026-03-04 14:27:33 +08:00
Laux Dev	803da7f722	Dynamic alert title	2026-03-04 14:23:58 +08:00
benzbarquilla	c6c8496d9a	few changes on home page	2026-03-04 10:51:25 +08:00
benzbarquilla	b02796955a	done expanding search	2026-03-04 10:43:01 +08:00
benzbarquilla	0a2bae59ff	imported components	2026-03-03 20:42:12 +08:00
benzbarquilla	cafd273f90	added components	2026-03-03 16:52:13 +08:00
Laux Dev	b054ee1867	Added new component	2026-03-03 16:40:24 +08:00
Laux Dev	e1c6b4bfc4	fixed	2026-03-03 15:50:07 +08:00
Laux Dev	41184ee716	Fixed	2026-03-03 15:23:58 +08:00
Laux Dev	62c438eed0	new component	2026-03-03 14:07:22 +08:00
Laux Dev	f0b3c443c0	fixed	2026-03-03 12:40:05 +08:00
Laux Dev	b4fb80c750	fixed	2026-03-03 11:58:17 +08:00
benzbarquilla	6633744911	edited roles	2026-03-03 11:57:33 +08:00
Laux Dev	e47424771f	fixed	2026-03-03 10:17:48 +08:00
Laux Dev	1b3b669d58	Fixed	2026-03-03 10:15:07 +08:00