Merge pull request #46 from Shaurya0108/sessions

login page render
Shaurya0108 · Nov 8, 2023 · d522a34 · d522a34
2 parents 12a1c6b + f66b700
commit d522a34
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 21 deletions.
diff --git a/FrontEnd/index.html b/FrontEnd/index.html
@@ -5,6 +5,9 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Forum&family=Julius+Sans+One&family=PT+Serif&display=swap" rel="stylesheet">    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Forum&family=Julius+Sans+One&family=PT+Sans&family=PT+Serif&display=swap" rel="stylesheet">
     <title>Virtual TA</title>
   </head>
   <body>

diff --git a/FrontEnd/src/App.css b/FrontEnd/src/App.css
@@ -35,7 +35,7 @@
 .navbar-cap-2 {
   margin: 0;
   font-size: 20px;
-  margin-top: 40px;
+  margin-top: 30px;
   width: fit-content;
   margin-left: auto;
   margin-right: auto;

diff --git a/FrontEnd/src/App.jsx b/FrontEnd/src/App.jsx
@@ -8,6 +8,7 @@ export default function App() {
 
       <Routes>
         <Route path="/home" element={<Home/>} />
+        <Route path="/" element={<Login/>} />
       </Routes>
   );
 }
diff --git a/FrontEnd/src/Home.jsx b/FrontEnd/src/Home.jsx
@@ -3,6 +3,7 @@ import TextBox2 from './components/TextBox2';
 import Sessions from './components/SessionBar';
 import Navbar  from './components/Navbar';
 export default function Home() {
+
   function toggleSessions(){
     var sessionContainer = document.querySelector('.session-container');
     var chatContainer = document.querySelector('.chat-container');

diff --git a/FrontEnd/src/Login.jsx b/FrontEnd/src/Login.jsx
@@ -13,33 +13,39 @@ export default function Login() {
   const [password, setPassword] = useState('');
 
 
-  // async function authorizeUser() {
-  //   try{
-  //     var credentials = JSON.stringify({
-  //       "username": username,
-  //       "password": password
-  //     });
-  //     var myHeaders = new Headers();
-  //     myHeaders.append("Content-Type", "application/json");
-
-      var requestOptions = {
+  async function authorizeUser() {
+    try {
+      const credentials = JSON.stringify({
+        username,
+        password
+      });
+      const myHeaders = {
+        "Content-Type": "application/json"
+      };
+
+      const requestOptions = {
         method: 'POST',
         headers: myHeaders,
         body: credentials,
         redirect: 'follow',
-        credentials: 'include' //Make sure to have this line for every Request. Or else the cookie won't be included in the requests
+        credentials: 'include'
       };
-      const response = fetch("http://18.189.195.246:443/auth/login", requestOptions);
+
+      const response = await fetch("http://18.189.195.246:443/auth/login", requestOptions);
+
       if (response.ok) {
-        navigator('home');
-      }
-      else {
+        navigator('/home');
+      } else {
         alert('Invalid Credentials');
       }
+    } catch (err) {
+      alert(err.message);
+    }
+  }
+
 
 
   return (
-
       <div className="Login">
         <button className="student-login">
           STUDENT LOGIN
@@ -57,12 +63,11 @@ export default function Login() {
             placeholder="Password"
             onChange={(e) => setPassword(e.target.value)} />
           {/* <button className="login-button" onClick={authorizeUser}> */}
-          <button className="login-button" onClick={"hello"}>  
+          <button className="login-button" onClick={authorizeUser}>
             LOGIN
           </button>
+
         </div>
       </div>
-
-
   )
 }
diff --git a/FrontEnd/tailwind.config.js b/FrontEnd/tailwind.config.js
@@ -7,7 +7,7 @@ export default {
   theme: {
     extend: {
       fontFamily: {
-        sans: ['PT Serif', 'Roboto', 'sans-serif'],
+        sans: ['PT Sans', 'PT Serif', 'Roboto', 'sans-serif'],
       },
     },
   },