Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#4 Build homepage for app #13

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 6 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
"version": "0.1.0",
"private": false,
"dependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"node-sass": "^4.14.1",
"materialize-css": "^1.0.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router-dom": "^5.2.0",
Expand All @@ -26,18 +23,13 @@
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
"production": [">0.2%", "not dead", "not op_mini all"],
"development": ["last 1 chrome version", "last 1 firefox version", "last 1 safari version"]
},
"devDependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"eslint-config-airbnb": "^18.1.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
Expand Down
41 changes: 4 additions & 37 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,41 +1,8 @@
import React from 'react';
import { BrowserRouter, Switch, Route } from 'react-router-dom';
import logo from './assets/logo.svg';
import './App.css';
import login from './pages/login';
// import Artboard20200510180323Jpg from './containers/Artboard20200510180323Jpg';
// import homepage from './pages/homepage';
import homepage from './pages/homepage';
import HomePage from './pages/homepage/homepage';

// function App() {
// return (
// <div className="App">
// <header className="App-header">
// <img src={logo} className="App-logo" alt="logo" />
// <p>
// Edit <code>src/App.js</code> and save to reload.
// </p>
// <a
// className="App-link"
// href="https://reactjs.org"
// target="_blank"
// rel="noopener noreferrer"
// >
// Learn React
// </a>
// </header>
// </div>
// );
// }

const App = () => (
<BrowserRouter>
<Switch>
<Route path="/" exact component={login} />
{/* <Route path="/" exact component={Artboard20200510180323Jpg} /> */}
<Route path="/home" component={homepage} />
</Switch>
</BrowserRouter>
);
function App() {
return HomePage();
}

export default App;
41 changes: 0 additions & 41 deletions src/app.js

This file was deleted.

1 change: 1 addition & 0 deletions src/images/bars.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/happy-farmer.webp
Binary file not shown.
Binary file added src/images/woman-preparing-garri.webp
Binary file not shown.
Binary file added src/images/woman-watering-garden.webp
Binary file not shown.
20 changes: 5 additions & 15 deletions src/index.css
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
body {
margin: 0;
font-family:
-apple-system,
BlinkMacSystemFont,
'Segoe UI',
'Roboto',
'Oxygen',
'Ubuntu',
'Cantarell',
'Fira Sans',
'Droid Sans',
'Helvetica Neue',
sans-serif;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
'Droid Sans', 'Helvetica Neue', sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}




code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
}
8 changes: 4 additions & 4 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Compiled and minified CSS -->
<title>Document</title>
</head>
<body>

<h2 data-app-name></h2>

<body>
<script src="./index.js"></script>

</body>

</html>
Loading