Merge branch 'main' of https://github.com/joshi008/sunhacks-project i…

…nto main
joshi008 · Oct 11, 2020 · c9ff08e · c9ff08e
2 parents 73e7c87 + b1201d9
commit c9ff08e
Show file tree

Hide file tree

Showing 14 changed files with 1,778 additions and 284 deletions.
diff --git a/src/App.js b/src/App.js
@@ -16,8 +16,9 @@ import Dash from "./Screens/Dasboard/Dash";
 
 import AddCourse from "./Screens/AddCourse/AddCourse";
 import UserList from './Components1/UserList/UserList';
-
-
+import ResponsiveDrawer from "./Components1/SideBar/SideBar";
+import { BrowserRouter, Route } from "react-router-dom";
+import Course from "./Components1/SideBarC/SideBarC";
 // Initialize Google Analytics
 ReactGA.initialize(process.env.REACT_APP_GA_CODE);
 
@@ -49,8 +50,12 @@ const App = () => {
           <AppRoute exact path="/" component={Home} layout={LayoutDefault} />
           <AppRoute exact path="/login" component={Login} />
           <AppRoute exact path="/signup" component={Signup} />
-          <AppRoute exact path="/dashboard" component={Dash} />
+          <Route
+            path="/dashboard"
+            render={(props) => <Dash page={<ResponsiveDrawer />} />}
+          />
           <AppRoute exact path="/addcourse" component={AddCourse} />
+          <AppRoute exact path="/course" component={Course} />
           <AppRoute exact path="/allusers" component={UserList} />
 
         </Switch>

diff --git a/src/Components1/AddComp/AddComp.css b/src/Components1/AddComp/AddComp.css
@@ -2,9 +2,6 @@
     background-color: white;
     border-radius: 20rem;
     box-shadow: 1rem;
-    max-width: 100%;
-    max-height: 100%;
-    height: max-content;
 }
 
 .btn {
@@ -14,32 +11,53 @@
 
 .add-app {
     display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: start;
-  width: 45%;
-  min-height: 600px;
-  background: #909fe4;
-  text-align: center;
-  margin: 2% auto;
-  border-radius: 10px;
-  padding-bottom: 32px;
-  transition: 1;
+    flex-direction: column;
+    align-items: center;
+    justify-content: start;
+    text-align: center;
+    margin: 2% auto;
+    transition: 1;
+    overflow-y: auto;
+}
+
+.form {
+    width: 40vw;
+}
+
+.div1 {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-evenly;
+    align-items: baseline;
 }
 
 .add-container {
     display: flex;
     flex-direction: row;
-    position: relative;
-  }
+    justify-content: space-evenly;
+    align-items: flex-start;
+    margin-top: 2%;
+}
 
-  @media only screen and (max-width: 900px) {
+@media only screen and (max-width: 900px) {
     .add-app {
-      width: 80%;
+        width: 80%;
     }
-  }
-  @media only screen and (max-width: 600px) {
+}
+
+@media only screen and (max-width: 600px) {
     .add-app {
-      width: 90%;
+        width: 90%;
+    }
+    .form {
+        width: 70vw;
+    }
+    .add-container {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-evenly;
+    }
+    .div1 {
+        flex-direction: column;
     }
-  }
+}