frontend part only

joshi008 · Oct 11, 2020 · 51bd4f1 · 51bd4f1
1 parent 1e6eee6
commit 51bd4f1
Show file tree

Hide file tree

Showing 16 changed files with 82 additions and 81 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,19 +4,14 @@
   "private": true,
   "dependencies": {
     "@material-ui/core": "^4.11.0",
-<<<<<<< HEAD
     "axios": "^0.20.0",
-=======
-    "@material-ui/icons": "^4.9.1",
->>>>>>> b385ae5cb520e1453ae369a4eab7b9a1bdd3e553
     "classnames": "^2.2.6",
     "lodash": "^4.17.20",
     "node-sass": "^4.14.1",
     "package.json": "^2.0.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-ga": "^2.7.0",
-    "react-icons": "^3.11.0",
     "react-router-dom": "^5.1.2",
     "react-scripts": "^3.4.3"
   },

diff --git a/src/Components1/AddComp/AddComp.js b/src/Components1/AddComp/AddComp.js
@@ -193,7 +193,7 @@ class AddComp extends React.Component {
 		let { courses } = this.state;
 		return (
 			<div>
-				<h1 style={{ marginRight: "50%", whiteSpace: "nowrap" }}>
+				<h1 style={{ marginRight: "50%", whiteSpace: "nowrap", color: "#000" }}>
 					Add a Roadmap
 				</h1>
 				<div className="add-app">

diff --git a/src/Components1/PersonBar/PersonBar.js b/src/Components1/PersonBar/PersonBar.js
@@ -23,7 +23,7 @@ import Card from "../Card/Card";
 import CircleUnchecked from "@material-ui/icons/RadioButtonUnchecked";
 import CheckCircleOutlineOutlinedIcon from "@material-ui/icons/CheckCircleOutlineOutlined";
 import Checkbox from "@material-ui/core/Checkbox";
-const drawerWidth = 220;
+const drawerWidth = 230;
 
 const useStyles = makeStyles((theme) => ({
 	root: {
@@ -95,14 +95,14 @@ function ResponsiveDrawer(props, { data }) {
 
 			{/* <img src="https://images.unsplash.com/flagged/photo-1570612861542-284f4c12e75f?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1050&q=80" alt="Avatar" class={styles.avatar} /> */}
 			<div className={styles.div1}>
-				<h2
+				<h3
 					style={{
 						marginTop: "25%",
-						marginLeft: "5%",
+						marginLeft: "5%", color: "#000"
 					}}
 				>
 					Hello User!
-				</h2>
+				</h3>
 				<div className={styles.container}>
 					<div className={styles.circle}>
 						<img src="https://images.unsplash.com/flagged/photo-1570612861542-284f4c12e75f?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1050&q=80" />
@@ -193,7 +193,7 @@ function ResponsiveDrawer(props, { data }) {
 					borderTop: "1px solid #F6F7F8",
 				}}
 			></hr>
-			<h2 style={{ marginLeft: "5%" }}>Keep Growing !!🐱‍🏍</h2>
+			<h3 style={{ marginLeft: "5%", color: "#000" }}>Keep Growing !!🐱‍🏍</h3>
 		</div>
 	);
 	const container =

diff --git a/src/Components1/PersonBarC/PBC.js b/src/Components1/PersonBarC/PBC.js
@@ -24,7 +24,7 @@ import CircleUnchecked from "@material-ui/icons/RadioButtonUnchecked";
 import CheckCircleOutlineOutlinedIcon from "@material-ui/icons/CheckCircleOutlineOutlined";
 import Checkbox from "@material-ui/core/Checkbox";
 import "./person.css"
-const drawerWidth = 220;
+const drawerWidth = 230;
 
 const useStyles = makeStyles((theme) => ({
 	root: {
@@ -98,15 +98,15 @@ function ResponsiveDrawer(props, { data }) {
 
 			{/* <img src="https://images.unsplash.com/flagged/photo-1570612861542-284f4c12e75f?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1050&q=80" alt="Avatar" class={styles.avatar} /> */}
 			<div className={styles.div1}>
-				<h2
+				<h3
 					style={{
 						marginTop: "25%",
 						marginLeft: "5%",
 						color: "#000"
 					}}
 				>
 					Hello User!
-				</h2>
+				</h3>
 				<div className={styles.container}>
 					<div className={styles.circle}>
 						<img src="https://images.unsplash.com/flagged/photo-1570612861542-284f4c12e75f?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1050&q=80" />
@@ -200,7 +200,7 @@ function ResponsiveDrawer(props, { data }) {
 					color: "#000"
 				}}
 			></hr>
-			<h2 style={{ marginLeft: "5%", color: "#000" }}>Keep Growing !!🐱‍🏍</h2>
+			<h3 style={{ marginLeft: "5%", color: "#000" }}>Keep Growing !!🐱‍🏍</h3>
 		</div>
 	);
 	const container =

diff --git a/src/Components1/PersonBarC/person.css b/src/Components1/PersonBarC/person.css
@@ -1,3 +0,0 @@
-* {
-    color: black;
-}

diff --git a/src/Components1/PersonBarP/PersonBarP.js b/src/Components1/PersonBarP/PersonBarP.js
@@ -23,7 +23,7 @@ import Card from "../ProfileC/ProfileC";
 import CircleUnchecked from "@material-ui/icons/RadioButtonUnchecked";
 import CheckCircleOutlineOutlinedIcon from "@material-ui/icons/CheckCircleOutlineOutlined";
 import Checkbox from "@material-ui/core/Checkbox";
-const drawerWidth = 220;
+const drawerWidth = 230;
 
 const useStyles = makeStyles((theme) => ({
     root: {
@@ -95,14 +95,15 @@ function ResponsiveDrawer(props, { data }) {
 
             {/* <img src="https://images.unsplash.com/flagged/photo-1570612861542-284f4c12e75f?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1050&q=80" alt="Avatar" class={styles.avatar} /> */}
             <div className={styles.div1}>
-                <h2
+                <h3
                     style={{
                         marginTop: "25%",
                         marginLeft: "5%",
+                        color: "#000"
                     }}
                 >
                     Hello User!
-				</h2>
+				</h3>
                 <div className={styles.container}>
                     <div className={styles.circle}>
                         <img src="https://images.unsplash.com/flagged/photo-1570612861542-284f4c12e75f?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1050&q=80" />
@@ -193,17 +194,11 @@ function ResponsiveDrawer(props, { data }) {
                     borderTop: "1px solid #F6F7F8",
                 }}
             ></hr>
-            <h2 style={{ marginLeft: "5%" }}>Keep Growing !!🐱‍🏍</h2>
+            <h3 style={{ marginLeft: "5%", color: "#000" }}>Keep Growing !!🐱‍🏍</h3>
         </div>
     );
     const container =
         window !== undefined ? () => window().document.body : undefined;
-    var k = 1;
-    if (props.data == true && k == 1) {
-        handleDrawerToggle();
-        console.log(k);
-        return;
-    }
 
     return (
         <div className={classes.root}>

diff --git a/src/Components1/ProfileC/ProfileC.js b/src/Components1/ProfileC/ProfileC.js
@@ -23,7 +23,7 @@ import CallMergeIcon from "@material-ui/icons/CallMerge";
 
 const useStyles = makeStyles((theme) => ({
     root: {
-        maxWidth: 290,
+        maxWidth: 285,
     },
     media: {
         height: 0,

diff --git a/src/Components1/SideBar/SideBar.js b/src/Components1/SideBar/SideBar.js
@@ -28,6 +28,7 @@ import ExitToAppIcon from "@material-ui/icons/ExitToApp";
 import PeopleIcon from "@material-ui/icons/People";
 import Link from "@material-ui/core/Link";
 import HomeIcon from "@material-ui/icons/Home";
+import { Avatar } from "@material-ui/core";
 const drawerWidth = 240;
 
 const useStyles = makeStyles((theme) => ({
@@ -214,14 +215,14 @@ export default function MiniDrawer() {
 							<ListItemIcon>
 								<HomeIcon />
 							</ListItemIcon>
-							<ListItemText primary="Dashboard" />
+							<ListItemText primary="Dashboard" style={{ color: "#000" }} />
 						</ListItem>
 					</Link>
 					<ListItem button key="Roadmap">
 						<ListItemIcon>
 							<AddIcon onClick={handleCourseOpen} />
 						</ListItemIcon>
-						<ListItemText primary="Add Roadmap" />
+						<ListItemText primary="Add Roadmap" style={{ color: "#000" }} />
 					</ListItem>
 					<Link
 						href="/users"
@@ -234,7 +235,7 @@ export default function MiniDrawer() {
 							<ListItemIcon>
 								<PeopleIcon />
 							</ListItemIcon>
-							<ListItemText primary="Users" />
+							<ListItemText primary="Users" style={{ color: "#000" }} />
 						</ListItem>
 					</Link>
 
@@ -243,16 +244,25 @@ export default function MiniDrawer() {
 					) : (
 							<ListItem button key="Primary">
 								<ListItemIcon>
-									<PersonIcon onClick={profileBar} />
+									<Avatar
+										onClick={profileBar}
+										alt="Remy Sharp"
+										src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1050&q=80"
+										className={classes.small}
+										style={{
+											marginLeft: "-10%",
+										}}
+									/>
+
 								</ListItemIcon>
-								<ListItemText primary="Profile" />
+								<ListItemText primary="Profile" style={{ color: "#000" }} />
 							</ListItem>
 						)}
 					<ListItem button key="Logout">
 						<ListItemIcon>
 							<ExitToAppIcon />
 						</ListItemIcon>
-						<ListItemText primary="Logout" />
+						<ListItemText primary="Logout" style={{ color: "#000" }} />
 					</ListItem>
 				</List>
 				<Modal

diff --git a/src/Components1/SideBar/SideBar2.js b/src/Components1/SideBar/SideBar2.js
@@ -20,6 +20,7 @@ import MailIcon from "@material-ui/icons/Mail";
 import ResponsiveDrawer from "../PersonBar/PersonBar2";
 import PersonIcon from "@material-ui/icons/Person";
 import AddCircleIcon from '@material-ui/icons/AddCircle';
+import { Avatar } from "@material-ui/core";
 const drawerWidth = 240;
 
 const useStyles = makeStyles((theme) => ({
@@ -185,7 +186,15 @@ export default function MiniDrawer() {
                     ) : (
                             <ListItem button key="Primary" onClick={profileBar}>
                                 <ListItemIcon>
-                                    <PersonIcon />
+                                    <Avatar
+
+                                        alt="Remy Sharp"
+                                        src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1050&q=80"
+                                        className={classes.small}
+                                        style={{
+                                            marginLeft: "-10%",
+                                        }}
+                                    />
                                 </ListItemIcon>
                                 <ListItemText primary="Profile" />
                             </ListItem>

diff --git a/src/Components1/SideBarC/SideBarC.js b/src/Components1/SideBarC/SideBarC.js
@@ -28,6 +28,7 @@ import ExitToAppIcon from "@material-ui/icons/ExitToApp";
 import Link from "@material-ui/core/Link";
 import HomeIcon from "@material-ui/icons/Home";
 import PeopleIcon from "@material-ui/icons/People";
+import { Avatar } from "@material-ui/core";
 const drawerWidth = 240;
 
 
@@ -215,14 +216,14 @@ export default function MiniDrawer() {
 							<ListItemIcon>
 								<HomeIcon />
 							</ListItemIcon>
-							<ListItemText primary="Dashboard" />
+							<ListItemText primary="Dashboard" style={{ color: "#000" }} />
 						</ListItem>
 					</Link>
 					<ListItem button key="Roadmap">
 						<ListItemIcon>
 							<AddIcon onClick={handleCourseOpen} />
 						</ListItemIcon>
-						<ListItemText primary="Add Roadmap" />
+						<ListItemText primary="Add Roadmap" style={{ color: "#000" }} />
 					</ListItem>
 					<Link
 						href="/users"
@@ -235,7 +236,7 @@ export default function MiniDrawer() {
 							<ListItemIcon>
 								<PeopleIcon />
 							</ListItemIcon>
-							<ListItemText primary="Users" />
+							<ListItemText primary="Users" style={{ color: "#000" }} />
 						</ListItem>
 					</Link>
 
@@ -244,16 +245,25 @@ export default function MiniDrawer() {
 					) : (
 							<ListItem button key="Primary">
 								<ListItemIcon>
-									<PersonIcon onClick={profileBar} />
+
+									<Avatar
+										onClick={profileBar}
+										alt="Remy Sharp"
+										src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1050&q=80"
+										className={classes.small}
+										style={{
+											marginLeft: "-10%",
+										}}
+									/>
 								</ListItemIcon>
-								<ListItemText primary="Profile" />
+								<ListItemText primary="Profile" style={{ color: "#000" }} />
 							</ListItem>
 						)}
 					<ListItem button key="Logout">
 						<ListItemIcon>
 							<ExitToAppIcon />
 						</ListItemIcon>
-						<ListItemText primary="Logout" />
+						<ListItemText primary="Logout" style={{ color: "#000" }} />
 					</ListItem>
 				</List>