Merge branch 'feature/dushyanth' of...

Merge branch 'feature/dushyanth' of gitlab.niveussolutions.com:prajakta.sathwane/sample_argon into feature/sharath/header

src/assets/img/theme/index.jsx

-//import noImg from './noimg.png'
-import team1 from "./team-1.jpg"
-import hand1 from "./hand1.png"
 
+import team4 from "./team-4.jpg"
 
 
-export {team1,hand1}
+
+
+export {team4}

src/components/Avatar/index.jsx

+import React from "react";
+import PropTypes from "prop-types";
+
+function Avatar(props) {
+  const { customClass, src, alt, width,height,id} = props;
+
+  return (
+    <img
+    id={id}
+      className={customClass}
+      src={src}
+      alt={alt}
+      height={height}
+      width={width}
+    />
+  );
+}
+
+Avatar.propTypes = {
+  src: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired,
+  alt: PropTypes.string.isRequired,
+  customClass: PropTypes.string,
+  height: PropTypes.string,
+  width: PropTypes.string,
+  id:PropTypes.string
+};
+
+Avatar.defaultProps = {
+  src: require("../../assets/img/theme/noImg.png"),
+  alt: "Image",
+  height: "36px",
+  width: "36px",
+  customClass:"rounded-circle"
+}
+export default Avatar;

src/containers/Login/index.jsx

 import React from "react";
 import PropTypes from "prop-types";
-import Table from "components/Table";
+
 function Login(props) {
   return <div>
-    <Table/>
+    Login
   </div>;
 }