Merge branch 'master' into master

package.json

@@ -3,6 +3,8 @@
  "version": "0.1.0",
  "private": true,
  "dependencies": {
+ "@material-ui/core": "^4.11.0",
+ "@material-ui/icons": "^4.9.1",
  "@testing-library/jest-dom": "^4.2.4",
  "@testing-library/react": "^9.3.2",
  "@testing-library/user-event": "^7.1.2",

src/App.js

@@ -6,6 +6,12 @@ import Main from "./main";
 import HomepageMain from "./Homepage/HomepageMain/Mainhome";
 import Doctormainpage from "./HomepageSubparts/Doctors/doctorsmainpage";
 
+import Footer from "../src/Components/Footer";
+import Navbar from "../src/Components/Navbar/Navbar";
+import Img from "../src/Components/Img.png";
+import background from "../src/Components/images/show_everyone.jpeg";
+import Maincard from "../src/MainpageCards/Maincard";
+import SignInSide from "./Components/login/logIn"; // Login Page Component
 
 function App() {
  return (
@@ -16,6 +22,33 @@ function App() {
  <Route path='/homepage' component={HomepageMain}></Route>
  <Route path='/expertdoctors' component={Doctormainpage}></Route>
 
+ <div className="forNavbar">
+ <Navbar></Navbar>
+ <img className="image" src={background} alt="background-image" />
+ </div>
+
+ <div>
+ <Maincard></Maincard>
+ <br></br>
+ </div>
+
+ <div>
+ <SignInSide></SignInSide>
+ </div>
+
+ <div className="page-container">
+ <div className="content-wrap"></div>
+ <div className="Footer-img" style={{backgroundImage: `url(${Img})`}}>
+ <div className="Footer-img-content">
+ <p>Get in touch</p>
+ <button type="button" class="btn btn-outline-info btn-sm">
+ Contact us
+ </button>
+ </div>
+ </div>
+ <Footer />
+ </div>
+
  </div>