Merge pull request #100 from simon-wg/main

Made the navbar slimmer, and removed dependency on digit-react-components

README.md

@@ -40,6 +40,7 @@ Frontend
 
 ```sh
 cd frontend
+source dev_setup.sh
 npm i
 npm start
 ```

backend/package.json

@@ -16,7 +16,7 @@
     "@graphql-tools/load-files": "^6.3.2",
     "@graphql-tools/merge": "^7.0.0",
     "@graphql-tools/schema": "^8.0.3",
-    "@prisma/client": "^3.15.0",
+    "@prisma/client": "^5.9.0-dev.58",
     "axios": "^0.21.1",
     "connect-redis": "^6.0.0",
     "express": "^4.17.1",
@@ -49,8 +49,8 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
     "mocha": "^9.0.3",
-    "prisma": "^3.15.2",
+    "prisma": "^5.9.0-dev.58",
     "ts-node-dev": "^1.1.8",
     "typescript": "^4.3.5"
   }
-}
+}

frontend/dev_setup.sh

@@ -0,0 +1,3 @@
+export NODE_OPTIONS=--openssl-legacy-provider
+
+npm i

frontend/src/common/components/header/index.jsx

@@ -8,11 +8,15 @@ const Header = ({ children }) => {
       title=""
       mainPadding="0"
       renderHeader={() => (
-        <Link to="/" style={{ textDecoration: "none", color: "white" }}>
-          <DigitText.Heading5 text="BookIT" />
-        </Link>
+        <div style={{ width: "100%", flexDirection: "row", display: "flex", placeItems: "center"}}>
+          <Link to="/" style={{ textDecoration: "none", color: "white" }}>
+            <DigitText.Heading5 text="BookIT" />
+          </Link>
+          <div style={{marginLeft: "2em"}}>
+            <Tabs/>
+          </div>
+        </div>
       )}
-      renderToolbar={Tabs}
       renderMain={() => <>{children}</>}
     />
   );