Merge branch 'master' of git.keannu1.duckdns.org:keannu125/Borrowing-TrackerFrontend

src/Components/Drawer/Drawer.tsx

@@ -65,7 +65,7 @@ export default function Drawer() {
             style={{
               width: "48px",
               height: "48px",
-              color: "white",
+              color: "3fb860",
               marginRight: "2px",
               alignSelf: "center",
               justifySelf: "center",
@@ -96,7 +96,7 @@ export default function Drawer() {
             style={{
               width: "48px",
               height: "48px",
-              color: "white",
+              color: "3fb860",
               marginRight: "2px",
               alignSelf: "center",
               justifySelf: "center",

src/Components/Header/Header.tsx

@@ -18,6 +18,7 @@ export default function Header(props: props) {
         backgroundColor: colors.header_color,
         display: "flex",
         flexDirection: "row",
+        
       }}
     >
       <div

src/Pages/DashboardPage/DashboardPage.tsx

@@ -5,6 +5,58 @@ import TechnicianWidgets from "../../Components/DashboardPage/TechnicianWidgets"
 import TechnicianEquipmentButtons from "../../Components/DashboardPage/TechnicianEquipmentButtons";
 import TechnicianLogButtons from "../../Components/DashboardPage/TechnicianLogButtons";
 export default function Dashboard() {
+<<<<<<< HEAD
+  const queries = useQueries({
+    queries: [
+      {
+        queryKey: ["equipments"],
+        queryFn: EquipmentsAPI,
+      },
+      {
+        queryKey: ["equipment_instances"],
+        queryFn: EquipmentInstancesAPI,
+      },
+      {
+        queryKey: ["user"],
+        queryFn: UserAPI,
+      },
+    ],
+  });
+  const isLoading = queries.some((result) => result.isLoading);
+
+  const [addSKUmodalOpen, SetAddSKUModalOpen] = useState(false);
+  const [additemmodalOpen, SetAddItemModalOpen] = useState(false);
+
+  if (isLoading) {
+    return (
+      <div style={styles.background}>
+        <Header label={"Dashboard"} />
+        <div
+          style={{
+            ...styles.flex_column,
+            ...{
+              alignItems: "center",
+              justifyContent: "center",
+              paddingTop: "64px",
+           
+            },
+          }}
+        >
+          <CircularProgress style={{ height: "128px", width: "128px" }} />
+          <p
+            style={{
+              ...styles.text_dark,
+              ...styles.text_L,
+            }}
+          >
+            Loading
+          </p>
+        </div>
+      </div>
+    );
+  }
+=======
+>>>>>>> be6e1ba229d5ab71d64626e470d43ab9169f1758
   return (
     <div style={styles.background}>
       <Header  label={"Dashboard"} />

src/Pages/LandingPage/LandingPage.tsx

@@ -63,9 +63,9 @@ export default function LandingPage() {
             }}
           >
             <p style={{ ...styles.text_dark, ...styles.text_L }}>
-              CSM BORROWING
+              Gwapo 
               <br />
-              SYSTEM
+              Jophiel
             </p>
             <div style={{ ...styles.flex_column }}>
               <Button

src/styles.tsx

@@ -1,11 +1,11 @@
 export const colors = {
   background: "#FFFFFF",
-  header_color: "#141762",
+  header_color: "#b2dfab",
-  font_dark: "#141762",
+  font_dark: "#2e482e",
-  font_light: "#FFFFFF",
+  font_light: "#0e410d",
-  button_dark: "#141762",
+  button_dark: "#92b88d",
   button_light: "#FFFFFF",
-  button_border: "#141762",
+  button_border: "#b2dfab",
   red: "#a44141",
   orange: "#c57331",
   green: "#80b28a",
@@ -25,6 +25,7 @@ const styles: { [key: string]: React.CSSProperties } = {
   text_dark: {
     color: colors.font_dark,
     fontWeight: "bold",
+    
   },
   text_light: {
     color: colors.font_light,