diff --git a/public/BudgetBuddyLogo.ico b/public/BudgetBuddyLogo.ico new file mode 100644 index 0000000..128e490 Binary files /dev/null and b/public/BudgetBuddyLogo.ico differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index a11777c..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/index.html b/public/index.html index aa069f2..9bbc1a8 100644 --- a/public/index.html +++ b/public/index.html @@ -2,7 +2,7 @@ - + + + + - React App + Budget Buddy diff --git a/public/logo192.png b/public/logo192.png deleted file mode 100644 index fc44b0a..0000000 Binary files a/public/logo192.png and /dev/null differ diff --git a/public/logo512.png b/public/logo512.png deleted file mode 100644 index a4e47a6..0000000 Binary files a/public/logo512.png and /dev/null differ diff --git a/src/App.css b/src/App.css index 74b5e05..e69de29 100644 --- a/src/App.css +++ b/src/App.css @@ -1,38 +0,0 @@ -.App { - text-align: center; -} - -.App-logo { - height: 40vmin; - pointer-events: none; -} - -@media (prefers-reduced-motion: no-preference) { - .App-logo { - animation: App-logo-spin infinite 20s linear; - } -} - -.App-header { - background-color: #282c34; - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: calc(10px + 2vmin); - color: white; -} - -.App-link { - color: #61dafb; -} - -@keyframes App-logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} diff --git a/src/App.js b/src/App.js index 3784575..278c87e 100644 --- a/src/App.js +++ b/src/App.js @@ -1,23 +1,29 @@ -import logo from './logo.svg'; +import { createTheme, ThemeProvider } from '@material-ui/core'; +import NavBar from './components/NavBar' import './App.css'; +const theme = createTheme({ + pallete: { + primary: { + + }, + secondary: { + + }, + }, + typography: { + fontFamily: [ + 'Roboto' + ], + } +}); + function App() { return (
-
- logo -

- Edit src/App.js and save to reload. -

- - Learn React - -
+ + +
); } diff --git a/src/assets/BudgetBuddyLogo.png b/src/assets/BudgetBuddyLogo.png new file mode 100644 index 0000000..99362e6 Binary files /dev/null and b/src/assets/BudgetBuddyLogo.png differ diff --git a/src/assets/BudgetBuddyLogo.svg b/src/assets/BudgetBuddyLogo.svg new file mode 100644 index 0000000..784caf0 --- /dev/null +++ b/src/assets/BudgetBuddyLogo.svg @@ -0,0 +1,24 @@ + + + + diff --git a/src/components/NavBar.css b/src/components/NavBar.css new file mode 100644 index 0000000..2e5fd15 --- /dev/null +++ b/src/components/NavBar.css @@ -0,0 +1,12 @@ +.bar { + padding: 10px; +} + +.logo { + height: 48px; + margin-right: 20px; +} + +.nav-header { + font-weight: bold; +} \ No newline at end of file diff --git a/src/components/NavBar.js b/src/components/NavBar.js new file mode 100644 index 0000000..bade033 --- /dev/null +++ b/src/components/NavBar.js @@ -0,0 +1,19 @@ +import { makeStyles, Toolbar, Typography } from "@material-ui/core"; +import { mergeClasses } from "@material-ui/styles"; +import React from "react"; +import "./NavBar.css" + +import logo from "../assets/BudgetBuddyLogo.png" + +function NavBar() { + return ( + + + + BudgetBuddy + + + ) +} + +export default NavBar \ No newline at end of file diff --git a/src/index.js b/src/index.js index d563c0f..9d7b688 100644 --- a/src/index.js +++ b/src/index.js @@ -2,7 +2,7 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; import './index.css'; import App from './App'; -import reportWebVitals from './reportWebVitals'; +import reportWebVitals from './utils/reportWebVitals'; const root = ReactDOM.createRoot(document.getElementById('root')); root.render( diff --git a/src/logo.svg b/src/logo.svg deleted file mode 100644 index 9dfc1c0..0000000 --- a/src/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/App.test.js b/src/utils/_tests_/App.test.js similarity index 88% rename from src/App.test.js rename to src/utils/_tests_/App.test.js index 1f03afe..7649823 100644 --- a/src/App.test.js +++ b/src/utils/_tests_/App.test.js @@ -1,5 +1,5 @@ import { render, screen } from '@testing-library/react'; -import App from './App'; +import App from '../../App'; test('renders learn react link', () => { render(); diff --git a/src/setupTests.js b/src/utils/_tests_/setupTests.js similarity index 100% rename from src/setupTests.js rename to src/utils/_tests_/setupTests.js diff --git a/src/reportWebVitals.js b/src/utils/reportWebVitals.js similarity index 100% rename from src/reportWebVitals.js rename to src/utils/reportWebVitals.js