THRALLab · Joan-cris · Apr 3, 2024 · Apr 3, 2024 · Apr 3, 2024 · Apr 3, 2024
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^6.5.2",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
@@ -16,6 +17,8 @@
     "react": "^18.2.0",
     "react-bootstrap": "^2.10.1",
     "react-dom": "^18.2.0",
+    "react-dom-confetti": "^0.2.0",
+    "react-icons": "^5.1.0",
     "react-scripts": "5.0.1",
     "typescript": "^4.9.5",
     "web-vitals": "^2.1.4"

diff --git a/public/index.html b/public/index.html
@@ -25,6 +25,12 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
     <title>React App</title>
+    <link
+          rel="stylesheet"
+          href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"
+          integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"
+          crossorigin="anonymous"
+    />
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
@@ -40,4 +46,4 @@
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
   </body>
-</html>
+</html>
diff --git a/src/App.css b/src/App.css
@@ -1,38 +1,80 @@
-.App {
-  text-align: center;
+.footer {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  background-color: #6fb4fe; 
+  color: white;
+  display: flex; 
+  align-items: center; 
+  padding: 0.2vw; 
+}
+
+.header {
+  top: 0;
+  width: 100%;
+  height: 4vw; 
+  background-color: white;  
+  align-items: center; 
 }
 
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
+.footer-container {
+  display: flex;
+  cursor: pointer;
+  margin-right: 3vw; 
+  margin-left: 1vw; 
+  font-family: "Poppins Light", sans-serif;
+  font-weight: bold;
+  font-size: 1.6vw; 
 }
 
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
+.footer-container:hover {
+  opacity: 0.7;
 }
 
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
+.api-form {
   display: flex;
-  flex-direction: column;
   align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
+  margin-left: 20vw; 
+}
+
+.api-form .form-control {
+  width: 20vw; 
+}
+
+.api-form .Submit-Button {
+  width: 10vw; 
+  background-color: #0980ff;
+  border-color: #0980ff;
+}
+
+.api-form .Submit-Button:hover {
+  width: 10vw; 
+  background-color: #0053ac;
+  border-color: #0053ac;
+}
+
+.navBar {
+  background-color: #6fb4fe;
+  display: flex;
+  height: 4.5vw;
 }
 
-.App-link {
-  color: #61dafb;
+.search-bar {
+  margin: auto;
+  width: 19vw;
+  height: 2.7vw; /* Adjust the width as needed */
+  font-size: 1vw; /* Adjust the font size as needed */
+  margin-left: 44.5vw;
 }
 
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
+.career-search {
+  margin-top: 0.8vw;
+  margin-left: 1vw;
+  color: white;
+  font-family: "Poppins", sans-serif;
 }
+
+.career-search:hover {
+  opacity: 0.9;
+  cursor: pointer;
+}
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,7 +1,12 @@
 import React, { useState } from 'react';
-import logo from './logo.svg';
 import './App.css';
 import { Button, Form } from 'react-bootstrap';
+import Home from './Pages/Home';
+import Basic from './Pages/Basic';
+import Detailed from './Pages/Detailed';
+import NavHome from './navbar';
+import CareerSearchByInterest from './Pages/interests';
+import Results from './Pages/Results';
 
 //local storage and API Key: key should be entered in by the user and will be stored in local storage (NOT session storage)
 let keyData = "";
@@ -13,6 +18,7 @@ if (prevKey !== null) {
 
 function App() {
   const [key, setKey] = useState<string>(keyData); //for api key input
+  const [currPg, setCurrPg] = useState<string>('Home');
 
   //sets the local storage item to the api key the user inputed
   function handleSubmit() {
@@ -24,29 +30,32 @@ function App() {
   function changeKey(event: React.ChangeEvent<HTMLInputElement>) {
     setKey(event.target.value);
   }
+
+  const updatePageState = () => {
+  return currPg === 'Basic' ? <Basic handlePage={setCurrPg} />
+    : currPg === 'Detailed' ? <Detailed handlePage={setCurrPg} />
+    : currPg === 'interests' ? <CareerSearchByInterest handlePage={setCurrPg} />
+    : currPg === 'Results' ? <Results handlePage={setCurrPg} />
+    : <Home handlePage={setCurrPg} />;
+};
+
   return (
-    <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.tsx</code> and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
-      <Form>
-        <Form.Label>API Key:</Form.Label>
-        <Form.Control type="password" placeholder="Insert API Key Here" onChange={changeKey}></Form.Control>
-        <br></br>
-        <Button className="Submit-Button" onClick={handleSubmit}>Submit</Button>
-      </Form>
-    </div>
+    <>
+    <NavHome handlePage={setCurrPg}></NavHome>
+
+    {updatePageState()/* Renders the page */} 
+
+  <footer className="footer" /* Bottom of page */>
+    <h2 className="footer-container">Contact Us</h2>
+    <h2 className="footer-container">Help</h2>
+    <Form className="api-form">
+  <Form.Group controlId="apiKey" /* Form for API Key Input */>
+    <Form.Control type="password" placeholder="Insert API Key Here" onChange={changeKey} />
+  </Form.Group>
+  <Button className="Submit-Button" onClick={handleSubmit}>Submit</Button>
+</Form>
+</footer>
+    </>
   );
 }