Merge pull request #18 from ubclaunchpad/MelanieKent/manual-entry

Manual Entry Page
ubclaunchpad · Dec 6, 2024 · cf9508e · cf9508e
2 parents 4d59ef8 + 4b6861f
commit cf9508e
Show file tree

Hide file tree

Showing 24 changed files with 1,507 additions and 61 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -14,8 +14,9 @@
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
     "@heroicons/react": "^2.2.0",
-    "@mui/icons-material": "^6.1.2",
+    "@mui/icons-material": "^6.1.9",
     "@mui/material": "^6.1.2",
+    "@mui/x-date-pickers": "^7.23.0",
     "@supabase/supabase-js": "^2.45.5",
     "axios": "^1.7.7",
     "pdfjs-dist": "^4.7.76",

diff --git a/frontend/src/assets/labs-fishbones.png b/frontend/src/assets/labs-fishbones.png
diff --git a/frontend/src/assets/pulses.png b/frontend/src/assets/pulses.png
diff --git a/frontend/src/components/Buttons/CLButtons.jsx b/frontend/src/components/Buttons/CLButtons.jsx
@@ -1,12 +1,12 @@
-import "./CLButtons.css";
+import "./CLButtons.css"
 
-const DEFAULT_PRIMARY_CLASSNAME = "primary-variant-button";
-const DEFAULT_SECONDARY_CLASSNAME = "secondary-variant-button";
+const DEFAULT_PRIMARY_CLASSNAME = "primary-variant-button"
+const DEFAULT_SECONDARY_CLASSNAME = "secondary-variant-button"
 
-const DEFAULT_HEIGHT = "54px";
-const DEFAULT_WIDTH = "fit-content";
-const DEFAULT_TYPE = "button";
-const DEFAULT_ON_CLICK = () => {};
+const DEFAULT_HEIGHT = "54px"
+const DEFAULT_WIDTH = "fit-content"
+const DEFAULT_TYPE = "button"
+const DEFAULT_ON_CLICK = () => {}
 
 /**
  * PRIMARY variant of the clinical logging button.
@@ -21,12 +21,13 @@ export const CLButtonPrimary = ({
   type = DEFAULT_TYPE,
   onClick = DEFAULT_ON_CLICK,
 }) => {
+
   const updatedClassName = className
     ? DEFAULT_PRIMARY_CLASSNAME + " " + className
-    : DEFAULT_PRIMARY_CLASSNAME;
+    : DEFAULT_PRIMARY_CLASSNAME
 
   return (
-    <button
+    <button 
       className={updatedClassName}
       type={type}
       onClick={onClick}
@@ -53,10 +54,11 @@ export const CLButtonSecondary = ({
   type = DEFAULT_TYPE,
   onClick = DEFAULT_ON_CLICK,
 }) => {
-  const updatedClassName = className
-    ? DEFAULT_SECONDARY_CLASSNAME + " " + className
-    : DEFAULT_SECONDARY_CLASSNAME;
 
+  const updatedClassName = className
+  ? DEFAULT_SECONDARY_CLASSNAME + " " + className
+  : DEFAULT_SECONDARY_CLASSNAME
+
   return (
     <button
       className={updatedClassName}

diff --git a/frontend/src/components/Home/MainContent.jsx b/frontend/src/components/Home/MainContent.jsx
@@ -11,7 +11,7 @@ export default function MainContent() {
   const [setSelectedLog] = useState(null);
 
   const handleAddLogbook = () => {
-    navigate("/newLog");
+    navigate("/home");
   };
 
   const handleViewHistory = () => {