Nikhil (#23)

* addseat changed * commit * added homepage, changes in profile * added logout btn * changed navbars, added logout and cards * updated homepage * updated dashboard * added eureka * bug fixes * Fixed bugs * Removed book seats * Even better UI now Co-authored-by: Betke <[email protected]> Co-authored-by: kavink98 <[email protected]>
shreyateeza · Dec 23, 2020 · 3f194e4 · 3f194e4
1 parent f68ecc1
commit 3f194e4
Show file tree

Hide file tree

Showing 45 changed files with 1,708 additions and 776 deletions.
diff --git a/FrontPart/package-lock.json b/FrontPart/package-lock.json
diff --git a/FrontPart/package.json b/FrontPart/package.json
@@ -11,6 +11,7 @@
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "axios": "^0.20.0",
+    "history": "^5.0.0",
     "moment": "^2.29.0",
     "react": "16.13.1",
     "react-dom": "16.13.1",

diff --git a/FrontPart/src/App.js b/FrontPart/src/App.js
@@ -1,8 +1,10 @@
 import React from 'react';
-import { BrowserRouter as Router, Route } from 'react-router-dom';
+import { BrowserRouter as Router, Redirect, Route } from 'react-router-dom';
 import './styles.css';
+import ViewProfile from './component/ViewProfile'
+import Home from './component/Home'
 import AddSeat from './component/AddSeat';
-import Admin from './component/Admin';
+import Admin from './component/ManageBookings';
 import Bookings from './component/Bookings';
 import DeleteSeat from './component/DeleteSeat';
 import SearchSeat from './component/SearchSeat';
@@ -13,39 +15,43 @@ import AdminDashboard from './component/AdminDashboard';
 import UserDashboard from './component/UserDashboard';
 import LoginPage from './component/LoginPage';
 import { ThemeProvider, createMuiTheme } from '@material-ui/core';
+import axios from 'axios'
+import SignUp from './component/signUp';
 
 export default function App() {
+	let flag = false;
+	axios.interceptors.response.use(
+		function (response) {
+			return response;
+		},
+		function (error) {
+			if (error.response.status === 403 || 401) return Promise.reject(error);
+		}
+	);
+
 	return (
 		<div className="App">
 			<ThemeProvider theme={theme}>
 				<Router>
 					<Route path="/login" exact component={LoginPage} />
+					<Route path="/" exact component={Home} />
+					<Route path="/signup" exact component={SignUp} />
+
+					<Route path="/userdashboard" exact strict component={UserDashboard} />
+					<Route path="/admindashboard" exact strict component={AdminDashboard} />
+					<Route path="/updateprofile" exact strict component={UpdateProfile} />
+					<Route path="/userprofile" exact strict component={ViewProfile} />
+
+					<Route path="/updatebookings" exact strict component={Admin} />
+
 					<Route path="/add" exact strict component={AddSeat} />
-					<Route path="/admin" exact strict component={Admin} />
 					<Route path="/bookings" exact strict component={Bookings} />
 					<Route path="/delete" exact strict component={DeleteSeat} />
 					<Route path="/addseat" exact strict component={AddSeat} />
 					<Route path="/searchseat" exact strict component={SearchSeat} />
-					<Route
-						path="/swapseatrequest"
-						exact
-						strict
-						component={SwapSeatRequest}
-					/>
-					<Route path="/updateprofile" exact strict component={UpdateProfile} />
-					<Route
-						path="/userseatbooking"
-						exact
-						strict
-						component={UserSeatBooking}
-					/>
-					<Route
-						path="/admindashboard"
-						exact
-						strict
-						component={AdminDashboard}
-					/>
-					<Route path="/userdashboard" exact strict component={UserDashboard} />
+					<Route path="/swapseatrequest" exact strict component={SwapSeatRequest}/>
+					<Route	path="/userseatbooking" exact strict component={UserSeatBooking} />
+
 				</Router>
 			</ThemeProvider>
 		</div>

diff --git a/FrontPart/src/a.css b/FrontPart/src/a.css
@@ -8,4 +8,54 @@
 .d-inline-flex{
     padding: 20px;
 
+}
+a:hover{
+text-decoration: none;
+}
+.card{
+    box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
+    transition: 0.3s;
+    padding: 30px;
+    width: 90%;
+
+}
+#logo{
+    background-color: ivory;
+    color:#404040;
+    box-shadow: 0 0 1px 1px black;
+}
+#logo:hover{
+    background-color: #666666;
+    color:ivory;
+    box-shadow: 0 0 0px 0px white;
+}
+.display-5{
+    /* color: honeydew; */
+    color:rgb(82, 80, 80);
+    text-align: left;
+    margin-left: 20px;
+    margin-top: 5x;
+
+    /* text-shadow: 0px 0px 7px rgb(93, 106, 119); */
+}
+/* rgb(241, 243, 245) */
+
+#lg{
+    color:rgb(82, 80, 80);
+    margin:10px;
+    text-shadow: none;
+}
+header{
+    box-shadow: 0px 3px 3px #27272780;
+    padding: 10px;
+}
+#a{
+    color: rgb(82, 80, 80);
+}
+#b{
+    background-color: #4d4d4d;
+    color:ivory;
+}
+#b:hover{
+    background-color: #636262;
 }