Skip to content

Commit b8feeff

Browse files
urlDevurlDev
committed
Added logo, favicon and searchIcon. Created Nav and FinanceBar components. Created barebones of components needed for home page
1 parent 0c8bc1b commit b8feeff

32 files changed

+379
-47
lines changed

‎package-lock.json

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
"@testing-library/react": "^11.1.0",
1010
"@testing-library/user-event": "^12.1.10",
1111
"axios": "^0.21.0",
12+
"moment": "^2.29.1",
1213
"normalize.css": "^8.0.1",
1314
"react": "^17.0.1",
15+
"react-clock": "^3.0.0",
1416
"react-dom": "^17.0.1",
1517
"react-redux": "^7.2.2",
1618
"react-router": "^5.2.0",

‎public/favicon.ico

-3.78 KB
Binary file not shown.

‎public/favicon.svg

Lines changed: 6 additions & 0 deletions
Loading

‎public/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<head>
55
<meta charset="utf-8" />
6-
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
6+
<link rel="icon" href="%PUBLIC_URL%/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1" />
88
<meta name="theme-color" content="#000000" />
99
<meta name="description" content="Full stack finance app made with MERN stack." />

‎public/manifest.json

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
{
2-
"short_name": "React App",
3-
"name": "Create React App Sample",
4-
"icons": [
5-
{
6-
"src": "favicon.ico",
7-
"sizes": "64x64 32x32 24x24 16x16",
8-
"type": "image/x-icon"
9-
},
10-
{
11-
"src": "logo192.png",
12-
"type": "image/png",
13-
"sizes": "192x192"
14-
},
15-
{
16-
"src": "logo512.png",
17-
"type": "image/png",
18-
"sizes": "512x512"
19-
}
20-
],
21-
"start_url": ".",
22-
"display": "standalone",
23-
"theme_color": "#000000",
24-
"background_color": "#ffffff"
25-
}
2+
"short_name": "MERN App",
3+
"name": "Finance/News app made with MERN stack",
4+
"icons": [{
5+
"src": "favicon.svg",
6+
"sizes": "64x64 32x32 24x24 16x16",
7+
"type": "image/x-icon"
8+
},
9+
{
10+
"src": "logo192.png",
11+
"type": "image/png",
12+
"sizes": "192x192"
13+
},
14+
{
15+
"src": "logo512.png",
16+
"type": "image/png",
17+
"sizes": "512x512"
18+
}
19+
],
20+
"start_url": ".",
21+
"display": "standalone",
22+
"theme_color": "#000000",
23+
"background_color": "#ffffff"
24+
}

‎src/App.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { useEffect } from 'react';
22
import { useSelector, useDispatch } from 'react-redux';
33

44
import Nav from './components/nav/Nav';
5+
import FinanceBar from './components/financeBar/FinanceBar';
6+
import Home from './components/home/Home';
57

68
import { fetchChart } from './redux/actions/chart';
79
import { fetchTopStories } from './redux/actions/news';
@@ -21,6 +23,8 @@ const App = () => {
2123
return (
2224
<div className="App">
2325
<Nav />
26+
<FinanceBar />
27+
<Home />
2428
</div>
2529
);
2630
};

‎src/assets/logo.svg

Lines changed: 7 additions & 0 deletions
Loading

‎src/assets/searchIcon.svg

Lines changed: 17 additions & 0 deletions
Loading

‎src/components/featuredStocks/FeaturedStocks.jsx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { FeaturedStocksContainer } from './FeaturedStocks.styles';
2+
3+
const FeaturedStocks = () => {
4+
return (
5+
<FeaturedStocksContainer>
6+
<h1>Featured Stocks</h1>
7+
</FeaturedStocksContainer>
8+
);
9+
};
10+
11+
export default FeaturedStocks;

0 commit comments

Comments
 (0)