diff --git a/src/App.js b/src/App.js index edd42036862c4a7eff2fcb200c815fc6791c663e..8e79aaf10be7f7bf9ac0a71c19c1b95837cafa9b 100644 --- a/src/App.js +++ b/src/App.js @@ -1,5 +1,4 @@ -import Footer from './components/Footer/Footer' import Button from './components/Button/index' import React, { lazy, Suspense } from "react"; import { BrowserRouter, Route, Routes } from "react-router-dom"; @@ -10,18 +9,19 @@ function App() { return ( <div className="App"> - {/* <BrowserRouter> + { <BrowserRouter> <Suspense fallback={<div> loading</div>}> <Routes> <Route exact path="/login" element={<Login />} /> <Route path="/" element={<Login />} /> </Routes> </Suspense> - </BrowserRouter> */} - + </BrowserRouter> + } + - <Footer/> + </div> ); diff --git a/src/components/Button/Button.module.scss b/src/components/Button/Button.module.scss index 01690d459a8020f8cd7c2dfff08fe8efc453ce0d..f9ea37546ff6fcd7fe8bb3f8df7a8c4573356811 100644 --- a/src/components/Button/Button.module.scss +++ b/src/components/Button/Button.module.scss @@ -1,5 +1,5 @@ .customButton { background-color: red; -} +} diff --git a/src/components/Button/index.jsx b/src/components/Button/index.jsx index afee0bad4344e3887667f851a4fe01395f84d8c0..0975c524369040eaca5afa1c1c71cc125ad560af 100644 --- a/src/components/Button/index.jsx +++ b/src/components/Button/index.jsx @@ -4,7 +4,8 @@ import cs from "classnames"; import styles from "./Button.module.scss"; function Button(props) { - return <div className={cs(styles.customButton)}>here</div>; + return <div onClick={props.handleClick} className={`btn btn-${props.color} btn-${props.size}`}> {props.buttonName}</div> + // "btn btn-primary btn-lg" } Button.propTypes = {}; diff --git a/src/containers/Login/index.jsx b/src/containers/Login/index.jsx index eef0abf04c6b797c6a7d201447959caea3848e74..c9f3883716a2818f4fc0743610a1f4e8c3b91deb 100644 --- a/src/containers/Login/index.jsx +++ b/src/containers/Login/index.jsx @@ -2,14 +2,16 @@ import React from "react"; import PropTypes from "prop-types"; import Button from "components/Button"; + + function Login(props) { - // return <div>login</div>; - return <> - <Button buttonName="pwe"/> - {/* <Button type="password" name="password" /> */} - </> -} + return <div>login</div>; + + -Login.propTypes = {}; + + +Login.propTypes = {}; +} export default Login;