Organize File Structure & Begin Top Navbar

main
jveebs 3 years ago
parent 23463c453c
commit 801760e8f8

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> <link rel="icon" href="%PUBLIC_URL%/BudgetBuddyLogo.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" /> <meta name="theme-color" content="#000000" />
<meta <meta
@ -15,6 +15,9 @@
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
--> -->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
<!-- <!--
Notice the use of %PUBLIC_URL% in the tags above. Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build. It will be replaced with the URL of the `public` folder during the build.
@ -24,7 +27,7 @@
work correctly both with client-side routing and a non-root public URL. work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`. Learn how to configure a non-root public URL by running `npm run build`.
--> -->
<title>React App</title> <title>Budget Buddy</title>
</head> </head>
<body> <body>
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

@ -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);
}
}

@ -1,23 +1,29 @@
import logo from './logo.svg'; import { createTheme, ThemeProvider } from '@material-ui/core';
import NavBar from './components/NavBar'
import './App.css'; import './App.css';
const theme = createTheme({
pallete: {
primary: {
},
secondary: {
},
},
typography: {
fontFamily: [
'Roboto'
],
}
});
function App() { function App() {
return ( return (
<div className="App"> <div className="App">
<header className="App-header"> <ThemeProvider theme={theme}>
<img src={logo} className="App-logo" alt="logo" /> <NavBar/>
<p> </ThemeProvider>
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> </div>
); );
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="112.70089mm"
height="131.97787mm"
viewBox="0 0 112.70089 131.97787"
version="1.1"
id="svg5"
xml:space="preserve"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><defs
id="defs2" /><g
id="layer2"
style="display:inline"><path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-opacity:0"
d="M 4.9905388e-7,64.859939 V 15.807259 H 10.751366 21.502731 v 4.892722 4.892723 H 16.12705 10.751366 v 16.058165 16.058169 h 5.375684 5.375681 v 4.516358 4.51636 h -5.377274 -5.377273 l 0.0641,18.755437 0.0641,18.755437 5.313175,0.0677 5.313174,0.0677 v 4.76228 4.76228 H 10.751366 4.9905388e-7 Z"
id="path8011" /><path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-opacity:0"
d="M 23.002921,65.98903 V 1.3154682e-7 L 38.44238,0.00682638 c 8.491705,0.00375709 17.070918,0.10966715 19.064921,0.23535481 3.476759,0.21914908 6.816836,0.75019693 7.875999,1.25223061 0.275036,0.1303628 1.493684,0.6410536 2.708107,1.1348667 4.570928,1.8586502 7.955169,4.7741971 11.219011,9.6652505 l 1.25575,1.881817 -6.058385,0.06725 -6.058388,0.06726 -1.0995,-1.017042 C 66.095595,12.133588 62.845312,10.515052 60.632699,9.9488704 57.814973,9.2278491 54.275627,9.0327136 44.015442,9.0327136 H 33.754286 V 33.388808 57.744899 L 45.193238,57.64059 c 10.485455,-0.09562 11.616105,-0.147421 13.564224,-0.621443 2.90057,-0.705779 4.329155,-1.282692 6.744227,-2.723565 4.189371,-2.499442 7.030224,-6.413656 8.266753,-11.390172 0.291457,-1.172999 0.661805,-2.584363 0.822994,-3.13636 0.42795,-1.465528 0.388359,-9.707137 -0.05397,-11.235368 -0.190871,-0.659458 -0.303384,-1.234842 -0.25003,-1.27863 0.161311,-0.132392 9.374451,0.283281 10.171251,0.458901 0.670388,0.147759 0.75715,0.283946 0.908021,1.425265 0.256218,1.938229 0.187817,7.546491 -0.121552,9.966402 -0.82078,6.420204 -3.400416,12.22044 -7.110235,15.987146 -2.112378,2.144768 -5.579895,4.489871 -8.030102,5.430798 -1.204848,0.462687 -1.766419,0.9491 -1.095749,0.9491 0.137685,0 1.6285,0.595392 3.312921,1.323094 3.614443,1.561507 7.109038,4.061447 9.063343,6.483675 0.687586,0.852218 1.700214,2.086658 2.250285,2.743203 1.900078,2.267873 4.758721,8.881099 5.580496,12.910007 0.749471,3.67442 0.982281,13.221325 0.389494,15.972167 -0.174256,0.80865 -0.358719,0.84948 -5.469925,1.21055 -2.062764,0.14573 -4.213307,0.30366 -4.778988,0.35097 l -1.028508,0.086 0.222973,-0.90623 c 0.122635,-0.49843 0.29283,-2.906888 0.378213,-5.352138 0.176245,-5.04748 -0.129363,-8.500615 -1.083219,-12.23953 C 75.754699,75.856411 69.689413,69.961696 60.88273,67.568103 l -2.500316,-0.679569 -12.315143,-0.08841 -12.315144,-0.08841 0.06359,28.179538 0.06359,28.179538 9.251175,0.0713 c 16.468652,0.12696 21.871739,-1.02366 27.4502,-5.84569 l 2.183131,-1.88711 6.104755,0.0671 6.104755,0.0671 -1.088815,1.63091 c -1.625243,2.43441 -4.336361,5.59543 -5.749583,6.7037 -4.917015,3.85604 -8.618363,5.64135 -14.388003,6.93992 -4.502355,1.01334 -7.533997,1.15557 -24.679455,1.15786 l -16.064542,0.002 z"
id="path8013" /><path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-opacity:0"
d="m 35.254477,109.19187 v -4.78306 l 24.81565,-0.11024 c 26.462918,-0.11756 25.901352,-0.0915 31.316477,-1.45461 2.919168,-0.73483 5.154946,-2.1131 6.589306,-4.062036 2.28496,-3.104697 2.765,-4.967123 2.95521,-11.465641 0.20753,-7.089849 -0.39148,-9.965664 -2.788242,-13.386179 -1.424629,-2.033151 -2.516528,-2.89312 -5.3811,-4.238103 -2.527889,-1.186903 -4.982957,-1.831359 -8.357635,-2.193883 -2.391371,-0.256889 -2.523593,-0.303691 -3.625459,-1.283269 -2.54744,-2.264714 -3.865875,-3.203345 -5.640233,-4.015433 -1.024102,-0.468712 -1.865857,-0.933982 -1.870572,-1.033939 -0.0047,-0.09996 0.356435,-0.371154 0.802558,-0.602662 0.446126,-0.231511 1.374367,-0.840441 2.062763,-1.353183 l 1.251626,-0.932254 4.750603,-0.283644 c 6.792368,-0.405555 8.680259,-0.965073 11.45523,-3.395019 2.811511,-2.46194 3.781537,-5.664044 3.770324,-12.446026 C 97.350251,35.660454 96.583528,32.847616 94.075245,30.098415 92.616273,28.49931 91.11875,27.611816 88.636254,26.875041 85.07295,25.817499 83.838699,25.766942 59.07,25.663969 l -23.815523,-0.09901 v -4.835125 -4.835126 l 5.313175,0.08042 c 2.922245,0.04423 14.145545,0.126431 24.940665,0.182668 21.540339,0.112218 21.52651,0.111334 26.443064,1.688809 4.346571,1.394595 6.2752,2.54127 10.436619,6.205127 1.93611,1.704616 4.5258,6.076236 5.74351,9.695508 1.15881,3.444227 1.40041,10.24595 0.50353,14.176351 -0.53493,2.344285 -2.32382,6.173431 -3.75768,8.043379 -1.74854,2.280324 -5.239859,4.749167 -7.802534,5.517459 -0.584449,0.17522 -1.062636,0.399891 -1.062636,0.499269 0,0.09938 0.7431,0.368006 1.651332,0.596947 3.204958,0.807882 6.929478,2.888525 9.450818,5.279533 3.97192,3.766632 5.92557,10.452759 5.53832,18.954284 -0.3127,6.86507 -1.11181,10.756681 -3.02338,14.723848 -1.88802,3.91825 -5.54257,7.25163 -10.233042,9.33373 -1.579391,0.70109 -7.183832,2.22535 -9.38481,2.55242 -1.233436,0.18329 -10.924627,0.32518 -28.316094,0.41456 l -26.440857,0.1359 z"
id="path8015" /></g></svg>

After

Width:  |  Height:  |  Size: 5.1 KiB

@ -0,0 +1,12 @@
.bar {
padding: 10px;
}
.logo {
height: 48px;
margin-right: 20px;
}
.nav-header {
font-weight: bold;
}

@ -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 (
<Toolbar position="sticky" className="bar">
<img src={logo} className="logo"/>
<Typography variant="h6" className="nav-header">
BudgetBuddy
</Typography>
</Toolbar>
)
}
export default NavBar

@ -2,7 +2,7 @@ import React from 'react';
import ReactDOM from 'react-dom/client'; import ReactDOM from 'react-dom/client';
import './index.css'; import './index.css';
import App from './App'; import App from './App';
import reportWebVitals from './reportWebVitals'; import reportWebVitals from './utils/reportWebVitals';
const root = ReactDOM.createRoot(document.getElementById('root')); const root = ReactDOM.createRoot(document.getElementById('root'));
root.render( root.render(

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

@ -1,5 +1,5 @@
import { render, screen } from '@testing-library/react'; import { render, screen } from '@testing-library/react';
import App from './App'; import App from '../../App';
test('renders learn react link', () => { test('renders learn react link', () => {
render(<App />); render(<App />);
Loading…
Cancel
Save