From 4487cd5c80fff4a61978337c0362c50ab00d9f7e Mon Sep 17 00:00:00 2001
From: Vera E <97448213+ZenonCodes@users.noreply.github.com>
Date: Sun, 1 May 2022 09:29:32 -0400
Subject: [PATCH 1/9] Logo fix

---
 demodb.mv.db                                  | Bin 53248 -> 40960 bytes
 flint/src/components/NavigationBar.js         |   5 ++---
 .../src}/static/images/brandLogo.png          | Bin
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename {src/main/resources => flint/src}/static/images/brandLogo.png (100%)

diff --git a/demodb.mv.db b/demodb.mv.db
index 01e92f6c5f1390eac3f8426d4ecdb287d16665d5..585a1bd7acc224559b60aebbb6cabbbba1c5bc9f 100644
GIT binary patch
literal 40960
zcmeHQOK%(36((ton>bbx*>Vi$fsV%y$quW|`@w8FB!?2kr}>a2pa44}hlv`QG9=n@
zQlQA9KOiX3T^e-JF8UX`N`ZFKMS-?xyX>w&i|z_^k+h4RdEA*hFPV&`L@urXksQu&
z=G^a|d*?j9duF4+=XduHhVK>>_r1IKfmPsGmdy{}c{F*qz{zrccxahZYgFJ=RvC_z
z@yKHH<AcKo=Cr`&A6th<dj}Ke!12B{9lm277KWP2SrR+EkRg8r0fGQQfFM8+AP5iy
z2m%BFf&f8)AV3fx2z=!TY!LtdEAIm$06~BtKoB4Z5CjMU1Ob8oL4Y7Y5FiK;1Wp?P
zl;jsZ766~$w;-3Fe_%c=@b=r2f+(>0iS=Y!5b_Vrx2+?H7#toPObe0*ECKlA$EuK@
z?me&y{Ak1pLl&b1i1~+mlhVPX$+W=IC;n%%3$ADXlgVZ?nH~77{3(;!{xEa?@$WBP
zqo4(AqfF*pJNM7brOb;?L)SQ&_df~FA>4WUK#q0a1ousJ--hnn$bGY%H=c8T=Kff8
zK1<H4?7XVZtLD6#&g<@vvIt~EwU8W;0qVWSRs#^`OpSFm+77-Vjy`7rpf2vRhr6oU
zuuGcA2Dq~_FXkUj9vxXDeY)jSGI*>nc&sme;>#rX^bfb=kxaNiEH03(4q-h|hqgRn
zJz&SfktdI@7IE<eOgzvoUsbM5Oi-tTht{NbXikpI;S?AqM{hXa?oCG4lQmxPSShHj
zBEDA;j@>Io_kP1U^VHnkx7LK{nK_Pi_q$gXff?iQVbGPM`}z2O+ByHD$>^Yd@b(%P
zJwUQ9Vgj%)IUD;2yAAW9|G8t0-Gku!vN<(h$9@rOExt3_91keBv0St<AsD%+q~h}<
z>D2Q3=lKzuF6pHWqfGboV%?ybcE4D!mY6lBr1y;VR%d6>>*&p{Ug}j_O=k6iJ)s8s
zs%3^QR@bY|9^Gugf4^SOyN6)E8YCQb;m*>+oAmX?gHp$U3(@UPwV`)*=$f&E$>4oE
zfNuv1L${jPzGV4AqUC8OA_iPFPv2VnB&*kZMrXD*(|Wl~ms-s(oXc(~29f`zEgjZ`
z)u)L;SDR&H8#`6FrArIn1S!9NB0~0SgGx`;%6eB-IKA8J89H08H26kulV|9DvwE*@
ztR~>J@G?y=es<35pA;p*;6=KDb#~dP=>0mVg|XeExAc17pewBo*6Qv~w`Vj4T?1rj
zmW)Bk5X*e2EDn@nNf?N%#t(|3RD@4OtzvM3Se7`(*EC1n2EEn*T?d`#S+C%!a2XVH
z(5i$60NtxLjBZbFw0$wWqbr?OW1yExt$wpNX!aXLqmw!|S}6x6j2*pUpOB%;MhQkp
zeH9EOn!ke%+-b)p+|oOx4ZX9<OVXXFkp7?vddWLgziV``fohM>g(dpN;sZ|sP6}HZ
z!0Ytr`_<kC&Cx}p-fFIQ?M`&&AGqixm=$U>&kB{utPoO223l#i<1!4U50VEHe*8=W
z9WEFe==LR!9nBR6Bv^*Aba?zwvO6GQ3`M3@qoG&p3=F2AkG&3T>J1~j!|B5-0B3n-
zIAKNzO|q^~2*+0d$D?E%odahA5H2wvfV>UhRcOW&uNm%~6$AaaiEiM`x3k_uFr~1E
zgsno?U?>#4>n99_jVcWHrafPvoeZw%GMwR60Pk-nbKj}d+RgQ1vC8(FTkXyAcDLJY
zGz6o#QCVl~8P=$-H|;xVd|Lm4pmmIj(XnUfE;hAdC^4&!iok3GrbMX*t$hvp3r!u-
zdtId_uv@IMz17oO_j`3w5qtMq{JOZwZ_n3H_-tl(((3^6Ur!3+R2d@>hlGgXJ5yT|
z;YH_-V|yL29eKJK$9BD1Q#$>fhT7qp;&yYrQ>vHbTD7|2VOwF4YZ&<7kA3G&%=>(L
zkspo)OBPPrg}#8Uk6cs1b4@Y-e;yAs5FYn7Pg-hpKJfpqys`YNb2l>_FNl(?P%ls~
zQWvO~sEgDh^)j_YU7{{i%hVO>73wN=je3=Oje4EBPBGLC>LzuIx=pQ6tJEFpF7;++
zY2iA3d%J7&Xty^9#eTJ3rg@fKT3~2q@rPM7<H5awu2!78xv^dC_Fx=#b(mscGNxCo
z@ko+Y&C*7Sw5w_63caCsH|Uk2X-SqMivq8XRMr$^Qyh&|MH{Q5u{@R(6BbJV&??8P
znx+avYb06PP~>HCJXB0}yaMxiquN|rxB+*sKju7HQY^uu-mD?3CgC=QOthIzK|?mQ
zA}{a*PN^7R0G8Q-rt#u{Rg7Y>BpF(z3;>|J;}<anXS#xSbM@`I*iANaKo2Z324(^9
zos5pRuc+5`m^%X-j?-)#&b~e0oX^6VNo4%SBPLi_w_y6Hd!32hiLsd-cSgY84p{`@
ze)cSb+c5E_cq^gfXEG4rikMj5oh3TYg+*LiSOFFN&hZ)=OsKAh8koSo8Xap&tpaWv
zGvg*ia0{;PVRi>FdoS6T@{gSfFSyctcnM%o-37dUFdJSW|AzzsNB{tj5`~Pw*tnW|
z)+Ye~+s+6@V@Lqt*svf80H9zH2>=`u>7388#AY=T0I;Jbi5@D3Qrt-;0RT6Raux#s
zVT(T8jmY*yde4BF`sb9G3jWJ<Q?*h{4N1%yN=ZGBAKFM(RMe)pmfirH{=1$T9Ca}&
zweGsI*=F@k`Chf%kyurd?^ool;(ac-UdT7X@mOV0MBR=|-2@bW_lzi}N)tiRzivV>
zD)k&eixP)A76-<He7C@f_zj9tq{Ib`?Y7bE8VMl*<hy%Lmz`~4g7gad*65Zx)wYv-
zOp1D=uEkOp-Y*dhUVhU1Hfl`;uK2?3x%@j0q7R|Y_Zy0$<tyn99y&IC&;<F$0i;;x
z^Y1`3P&wOOO;_#4)@DP}Iz~~dvWm3T7u4eYl74Sf_7oxN_9KbInN3@@Z9n!8DXNWr
zmEO)uEme|;TH`$(&$t|Oo}fjEs*TPYpB(N2f+(gCpBxlP-H^)b<zl_lzTeXIol>#U
z<h3drTrWjGkY?KGy$R_3_8HJil_G+kf6atRA@v+VOA?Vwm=u5zb!Yjb7tYziQ3!8x
zW%{k$-@mrBz?ZMTmHP-niGuy%rym1(DpS9D_eIK$qGpzIT(x9QM(;1>_;z>tXk<;M
zbp61bEaikv;Nv{D_Lp*E%h<Pu)5E>t-V_d$YEA1sx?~>OjI67dGg&w(FtMnQdkKuJ
z?=8QNGqPBpk>ygWPM?wWbD#ahdh90@_I@h+iD!Y1<*?zTC@ae$L4{aZLs1e<j0KfK
z(!y)#0Jq9#LH*1Zlk>z>J$Bwx#gq|ePm6N3#28m=C~-VHpOhRXCE;pWg)_<3%4D+t
zxYo{G%Q!T|k@IRfuj56VJhtZY**Fg0;)T$bf^P|-eS(DV6WP!f?{L-DJg%BUVzW08
zq0Rmbgf>TY)}k~&_opsD%{wb1tGU<kwq$&ZXYrqTg1QF^3cgGEy3=-_i+A4UvaSj4
zo9e!4E|(BpCqmZ?5$Is#gxP>00v#V?=4E%Y;~dB4I3dT0Ic}8WtgM_Bvr?AJ3RyEd
z%34`9#|^Vuj^{2)F4YsLm70Y%Bt;(b{)Wo2vdxwJKV(IUlGASmw;RqfE7BfmZ~Tjl
zwC8rDu@@!9Ayvaj1GcE7pu409BhA|oG*t%c=7j&^`FA{p?&tpn4)XuIr<ngoG;o)i
z9^?PdNcaw9$JyK{U4P>5F8}|(uC@6o&i}t0@c%#0RWg?Y{y%1I`gSMp+!asX?)=0z
z=#bs1MOFf&vhE$bGqMce#0}11RRA(L(Q=TP49<v>pfMDz4tYjPGro{wHv-?6zmS4h
zzh~6?CH#NF|96%!grj5$%MfBw7@W_dK=_XE{|W!!4tfuw0c*nlXYjE?(*Gp=?=4s(
z{C~p#C;b2PWV@Hm3Hbkk|Bd_5zW*=og8x50MgL#&G7PepVZiwR@de+o^4$IlFZ@?v
z(RCm@WJmlw#)<p==!CBS|GDG;?|eJi|6j;Zzr_82Z2iCQ|GUfhPv8HKJFwBb)0gkS
z20lMh!I_gxam6_KN&rC)ELb5kN1=lG>Q=Y~3Y>Zcwl>G>6^NLI<E1S~6yS_T0h|Yu
zkoEsT)c}l}<FB+J>;K96|22lJ{|^@m@JMPHkC6EP$5#a*{y*{miT_X5|2st*$ohZg
z7_xoL{}23c+=ur4f7u+4Me!8<e>qYH4)gzgE}<IX5^9Jt5oCBroT{jplO&&N7{K-a
zKXd*655fQc3u2ot`}zNcUr;Y+mV^9%qW|wl0^Cx5Bog305)zR?o|^q9kpNWWG6<&x
zBYKW_MVLa78fU`-74~?G2P!0N4C0|U5~w(%fePmlsv@cXhZXdLHAu0Vhv|z~uthqg
z{$IihFS7hUr8Xw1|3~WoMeD7)tEploG$N}cN&P>=t63VOP?7vU$^Vo5{~Y=M!2b^X
ze>tfCr;Nb=S5DFYS3)ZcdA#6zu;kH<EP2$N!tbFakE311QZVO3In4loTmSFZr2b!|
zTzII?n^z?atFSh=DL7lHJ9Kv>_5ZM<h**VXQvWaR+$A_FNR7PwTXH2OQvZ)U0DwFI
zATsS^sp^DrHTSGf>i^k1LsI{bJOCi=*%2fFKmq`e<s}aQfQJz=sCE-7R!0Z`GZ6s7
zh08*>@ED||{vWCTx8~F`j2B2F_5ZM<`KZ>NTd*EVyOH{T48kNmg?dcgzDNbT&|Du2
z{vUImr&O^+=Z&j3ssHCxJsdzS$hqqO{dm^;f8RR6`hTyujI2+g{@)fnnf24m`G0?O
z#b;zu)}^D&m6;h?J~zvK!0PF9vw|uu(TCzZl?OG?qjCZcj}tPFb9iJdjE+A|C!iRi
z6<dU-1rHvcZ^c#s;+f=W1<T%o#L$d1via$nb7>;Z=p<~iGs-5j3(~!|O$yRIw*~2-
z^rM?x^-4c_nO3*-qqkv~eq4hBbxu7?QfV_<hjX4vn_qqXzaak}<o}f*|F5x-|2Iz|
G|NlSvM|OGu

literal 53248
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
Kr}}4+|NsAxNTSOC

diff --git a/flint/src/components/NavigationBar.js b/flint/src/components/NavigationBar.js
index 88b2ec4b0..e66fe0739 100644
--- a/flint/src/components/NavigationBar.js
+++ b/flint/src/components/NavigationBar.js
@@ -1,13 +1,12 @@
 import React from 'react';
-
-
+import brandLogo from '../../../src/static/images/brandLogo.png';
 class NavigationBar extends React.Component {
 
 
 render(){
 return (<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
                 <div class="container-fluid">
-                  <img src="https://i.imgur.com/oZUMusi.png" alt="Fire Logo"/>
+                  <img src={brandLogo} alt="Fire Logo" />
                   <a class="navbar-brand" href="#">Flint</a>
                   <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
diff --git a/src/main/resources/static/images/brandLogo.png b/flint/src/static/images/brandLogo.png
similarity index 100%
rename from src/main/resources/static/images/brandLogo.png
rename to flint/src/static/images/brandLogo.png

From 80714e3dfce5c3776e0e3bd7cd14c935ce8c20d9 Mon Sep 17 00:00:00 2001
From: Vera E <97448213+ZenonCodes@users.noreply.github.com>
Date: Sun, 1 May 2022 09:46:25 -0400
Subject: [PATCH 2/9] Category comp

---
 flint/package.json                    |  1 +
 flint/src/Category.js                 | 16 ++++++++++++++++
 flint/src/components/NavigationBar.js |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 flint/src/Category.js

diff --git a/flint/package.json b/flint/package.json
index a16e997c5..b8232f6c5 100644
--- a/flint/package.json
+++ b/flint/package.json
@@ -17,6 +17,7 @@
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
+  "proxy":"http://localhost:8080",
   "eslintConfig": {
     "extends": [
       "react-app",
diff --git a/flint/src/Category.js b/flint/src/Category.js
new file mode 100644
index 000000000..2ac1d804f
--- /dev/null
+++ b/flint/src/Category.js
@@ -0,0 +1,16 @@
+import React, {Component} from 'react';
+
+class Category extends Component{
+  state = {
+    isLoading: true,
+    Categories: []
+  }
+
+  async componentDidMount(){
+    const response = await fetch('api/categories')
+  }
+  render(){
+    return( );
+  }
+}
+export default Category;
diff --git a/flint/src/components/NavigationBar.js b/flint/src/components/NavigationBar.js
index e66fe0739..6d4a0b900 100644
--- a/flint/src/components/NavigationBar.js
+++ b/flint/src/components/NavigationBar.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import brandLogo from '../../../src/static/images/brandLogo.png';
+import brandLogo from '../../src/static/images/brandLogo.png';
 class NavigationBar extends React.Component {
 
 

From 18f7ed52de527ea616a86bd02f890ecc3749354a Mon Sep 17 00:00:00 2001
From: Vera E <97448213+ZenonCodes@users.noreply.github.com>
Date: Sun, 1 May 2022 10:39:53 -0400
Subject: [PATCH 3/9] Home page

---
 flint/package-lock.json               | 184 ++++++++++++++++++++++++++
 flint/package.json                    |   4 +-
 flint/src/App.js                      |   3 +-
 flint/src/Category.js                 |  22 ++-
 flint/src/Expenses.js                 |  19 +++
 flint/src/Home.js                     |  14 ++
 flint/src/components/NavigationBar.js |   5 +-
 flint/src/index.js                    |   2 +
 8 files changed, 248 insertions(+), 5 deletions(-)
 create mode 100644 flint/src/Expenses.js
 create mode 100644 flint/src/Home.js

diff --git a/flint/package-lock.json b/flint/package-lock.json
index 099b76292..21d80efed 100644
--- a/flint/package-lock.json
+++ b/flint/package-lock.json
@@ -13,7 +13,9 @@
         "@testing-library/user-event": "^13.5.0",
         "react": "^18.1.0",
         "react-dom": "^18.1.0",
+        "react-router": "^6.3.0",
         "react-scripts": "5.0.1",
+        "reactstrap": "^9.0.2",
         "web-vitals": "^2.1.4"
       }
     },
@@ -2569,6 +2571,15 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@popperjs/core": {
+      "version": "2.11.5",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
+      "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
     "node_modules/@rollup/plugin-babel": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -4675,6 +4686,11 @@
       "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
       "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
     },
+    "node_modules/classnames": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
+      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+    },
     "node_modules/clean-css": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz",
@@ -5677,6 +5693,15 @@
         "utila": "~0.4"
       }
     },
+    "node_modules/dom-helpers": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+      "dependencies": {
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
+      }
+    },
     "node_modules/dom-serializer": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
@@ -7420,6 +7445,14 @@
         "he": "bin/he"
       }
     },
+    "node_modules/history": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
+      "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.7.6"
+      }
+    },
     "node_modules/hoopy": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
@@ -11630,11 +11663,30 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
+    "node_modules/react-fast-compare": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
+      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
+    },
     "node_modules/react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
+    "node_modules/react-popper": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
+      "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==",
+      "dependencies": {
+        "react-fast-compare": "^3.0.1",
+        "warning": "^4.0.2"
+      },
+      "peerDependencies": {
+        "@popperjs/core": "^2.0.0",
+        "react": "^16.8.0 || ^17 || ^18",
+        "react-dom": "^16.8.0 || ^17 || ^18"
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
@@ -11643,6 +11695,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/react-router": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz",
+      "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==",
+      "dependencies": {
+        "history": "^5.2.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8"
+      }
+    },
     "node_modules/react-scripts": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
@@ -11715,6 +11778,38 @@
         }
       }
     },
+    "node_modules/react-transition-group": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
+      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.6.0",
+        "react-dom": ">=16.6.0"
+      }
+    },
+    "node_modules/reactstrap": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-9.0.2.tgz",
+      "integrity": "sha512-vvSy/dX7UL5fsfu4WMLnPYfrBS/G2YQM37nff1caeAlMVqzg6NV8G7RRd8PWu8RqtCSeEjDn5ILF0ZmE2ZrHuw==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@popperjs/core": "^2.6.0",
+        "classnames": "^2.2.3",
+        "prop-types": "^15.5.8",
+        "react-popper": "^2.2.4",
+        "react-transition-group": "^4.4.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
     "node_modules/readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -13561,6 +13656,14 @@
         "makeerror": "1.0.12"
       }
     },
+    "node_modules/warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "node_modules/watchpack": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
@@ -16138,6 +16241,11 @@
         }
       }
     },
+    "@popperjs/core": {
+      "version": "2.11.5",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
+      "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw=="
+    },
     "@rollup/plugin-babel": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -17711,6 +17819,11 @@
       "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
       "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
     },
+    "classnames": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
+      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+    },
     "clean-css": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz",
@@ -18440,6 +18553,15 @@
         "utila": "~0.4"
       }
     },
+    "dom-helpers": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+      "requires": {
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
+      }
+    },
     "dom-serializer": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
@@ -19705,6 +19827,14 @@
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
     },
+    "history": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
+      "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
+      "requires": {
+        "@babel/runtime": "^7.7.6"
+      }
+    },
     "hoopy": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
@@ -22643,16 +22773,38 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
+    "react-fast-compare": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
+      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
+    },
     "react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
+    "react-popper": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
+      "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==",
+      "requires": {
+        "react-fast-compare": "^3.0.1",
+        "warning": "^4.0.2"
+      }
+    },
     "react-refresh": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
       "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="
     },
+    "react-router": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz",
+      "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==",
+      "requires": {
+        "history": "^5.2.0"
+      }
+    },
     "react-scripts": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
@@ -22708,6 +22860,30 @@
         "workbox-webpack-plugin": "^6.4.1"
       }
     },
+    "react-transition-group": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
+      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2"
+      }
+    },
+    "reactstrap": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-9.0.2.tgz",
+      "integrity": "sha512-vvSy/dX7UL5fsfu4WMLnPYfrBS/G2YQM37nff1caeAlMVqzg6NV8G7RRd8PWu8RqtCSeEjDn5ILF0ZmE2ZrHuw==",
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@popperjs/core": "^2.6.0",
+        "classnames": "^2.2.3",
+        "prop-types": "^15.5.8",
+        "react-popper": "^2.2.4",
+        "react-transition-group": "^4.4.2"
+      }
+    },
     "readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -24084,6 +24260,14 @@
         "makeerror": "1.0.12"
       }
     },
+    "warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "watchpack": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
diff --git a/flint/package.json b/flint/package.json
index b8232f6c5..478915872 100644
--- a/flint/package.json
+++ b/flint/package.json
@@ -8,7 +8,9 @@
     "@testing-library/user-event": "^13.5.0",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
+    "react-router": "^6.3.0",
     "react-scripts": "5.0.1",
+    "reactstrap": "^9.0.2",
     "web-vitals": "^2.1.4"
   },
   "scripts": {
@@ -17,7 +19,7 @@
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
-  "proxy":"http://localhost:8080",
+  "proxy": "http://localhost:8080",
   "eslintConfig": {
     "extends": [
       "react-app",
diff --git a/flint/src/App.js b/flint/src/App.js
index d74753680..5e4da82ac 100644
--- a/flint/src/App.js
+++ b/flint/src/App.js
@@ -1,12 +1,13 @@
 import logo from './logo.svg';
 import './App.css';
 import NavigationBar from './components/NavigationBar.js';
+import Home from './Home'
 
 function App() {
   return (
     <div className="App">
 
-    <NavigationBar/>
+    <Home/>
 
     </div>
   );
diff --git a/flint/src/Category.js b/flint/src/Category.js
index 2ac1d804f..753841bb3 100644
--- a/flint/src/Category.js
+++ b/flint/src/Category.js
@@ -1,4 +1,5 @@
 import React, {Component} from 'react';
+import NavigationBar from './components/NavigationBar.js';
 
 class Category extends Component{
   state = {
@@ -8,9 +9,28 @@ class Category extends Component{
 
   async componentDidMount(){
     const response = await fetch('api/categories')
+    const body = await response.json();
+    this.setState({Categories: body, isLoading:false});
   }
   render(){
-    return( );
+    const{Categories, isLoading} = this.state;
+    if(isLoading)
+      return(<div>Loading...</div> );
+
+    return (
+      <div>
+        {/*Every category should return a div*/}
+        <h2>Categories</h2>
+        {
+          Categories.map(category =>
+            <div id={category.id}>
+              {category.name}
+            </div>
+          )
+        }
+      </div>
+    )
+
   }
 }
 export default Category;
diff --git a/flint/src/Expenses.js b/flint/src/Expenses.js
new file mode 100644
index 000000000..eb9fdf1b8
--- /dev/null
+++ b/flint/src/Expenses.js
@@ -0,0 +1,19 @@
+// import React, {Component} from 'react';
+// import NavigationBar from './components/NavigationBar.js';
+//
+//
+// class Expenses extends Component{
+//   state = {
+//
+//   }
+//
+//   async componentDidMount(){
+//
+//   }
+//   render(){
+//
+//     return ();
+//
+//   }
+// }
+// export default Expenses;
diff --git a/flint/src/Home.js b/flint/src/Home.js
new file mode 100644
index 000000000..99f8cf4c1
--- /dev/null
+++ b/flint/src/Home.js
@@ -0,0 +1,14 @@
+import React, {Component} from 'react';
+import NavigationBar from './components/NavigationBar.js';
+
+
+class Home extends Component {
+  state = {}
+    render() {
+      return(
+        <NavigationBar/>
+      );
+
+  }
+}
+export default Home;
diff --git a/flint/src/components/NavigationBar.js b/flint/src/components/NavigationBar.js
index 6d4a0b900..23e998544 100644
--- a/flint/src/components/NavigationBar.js
+++ b/flint/src/components/NavigationBar.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import brandLogo from '../../src/static/images/brandLogo.png';
+
 class NavigationBar extends React.Component {
 
 
@@ -14,7 +15,7 @@ return (<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
                   <div class="collapse navbar-collapse" id="navbarNav">
                     <ul class="navbar-nav">
                       <li class="nav-item">
-                        <a class="nav-link active" aria-current="page" href="#">Home</a>
+                        <a class="nav-link active" aria-current="page" href="/home">Home</a>
                       </li>
                       <li class="nav-item">
                         <a class="nav-link" href="#">Accounts</a>
@@ -23,7 +24,7 @@ return (<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
                         <a class="nav-link" href="#">Transactions</a>
                       </li>
                       <li class="nav-item">
-                        <a class="nav-link" href="#">Expense Tracker</a>
+                        <a class="nav-link" href="/expenses">Expense Tracker</a>
                       </li>
                     </ul>
                   </div>
diff --git a/flint/src/index.js b/flint/src/index.js
index d563c0fb1..d302cac79 100644
--- a/flint/src/index.js
+++ b/flint/src/index.js
@@ -2,6 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import './index.css';
 import App from './App';
+import Category from './Category';
 import reportWebVitals from './reportWebVitals';
 
 const root = ReactDOM.createRoot(document.getElementById('root'));
@@ -11,6 +12,7 @@ root.render(
   </React.StrictMode>
 );
 
+
 // If you want to start measuring performance in your app, pass a function
 // to log results (for example: reportWebVitals(console.log))
 // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals

From a7b13d59e956e13dd8144bab4effa8db6f9e2fc1 Mon Sep 17 00:00:00 2001
From: Vera E <97448213+ZenonCodes@users.noreply.github.com>
Date: Sun, 1 May 2022 10:41:27 -0400
Subject: [PATCH 4/9] darkened nav bar

---
 flint/src/App.js                      | 2 +-
 flint/src/components/NavigationBar.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flint/src/App.js b/flint/src/App.js
index 5e4da82ac..5efb5d0b5 100644
--- a/flint/src/App.js
+++ b/flint/src/App.js
@@ -5,7 +5,7 @@ import Home from './Home'
 
 function App() {
   return (
-    <div className="App">
+    <div className="Home">
 
     <Home/>
 
diff --git a/flint/src/components/NavigationBar.js b/flint/src/components/NavigationBar.js
index 23e998544..d4e5d7699 100644
--- a/flint/src/components/NavigationBar.js
+++ b/flint/src/components/NavigationBar.js
@@ -5,7 +5,7 @@ class NavigationBar extends React.Component {
 
 
 render(){
-return (<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
+return (<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark">
                 <div class="container-fluid">
                   <img src={brandLogo} alt="Fire Logo" />
                   <a class="navbar-brand" href="#">Flint</a>

From 440fab5cf8f3d3eef2b908ea102d796489aab4c8 Mon Sep 17 00:00:00 2001
From: Vera E <97448213+ZenonCodes@users.noreply.github.com>
Date: Sun, 1 May 2022 10:46:36 -0400
Subject: [PATCH 5/9] Changes

---
 flint/src/App.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/flint/src/App.js b/flint/src/App.js
index 5efb5d0b5..8ee800495 100644
--- a/flint/src/App.js
+++ b/flint/src/App.js
@@ -6,7 +6,6 @@ import Home from './Home'
 function App() {
   return (
     <div className="Home">
-
     <Home/>
 
     </div>

From 1366256352f36fc042e7994d530574c416178190 Mon Sep 17 00:00:00 2001
From: Vera E <97448213+ZenonCodes@users.noreply.github.com>
Date: Sun, 1 May 2022 11:25:13 -0400
Subject: [PATCH 6/9] test

---
 flint/src/components/NavigationBar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flint/src/components/NavigationBar.js b/flint/src/components/NavigationBar.js
index d4e5d7699..9a00abd59 100644
--- a/flint/src/components/NavigationBar.js
+++ b/flint/src/components/NavigationBar.js
@@ -5,7 +5,7 @@ class NavigationBar extends React.Component {
 
 
 render(){
-return (<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark">
+return (<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-dark">
                 <div class="container-fluid">
                   <img src={brandLogo} alt="Fire Logo" />
                   <a class="navbar-brand" href="#">Flint</a>

From 4cf2eaf1a752a26e18e453396f5bf64aaefb8670 Mon Sep 17 00:00:00 2001
From: Vera E <97448213+ZenonCodes@users.noreply.github.com>
Date: Sun, 1 May 2022 11:25:34 -0400
Subject: [PATCH 7/9] test

---
 flint/src/components/NavigationBar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flint/src/components/NavigationBar.js b/flint/src/components/NavigationBar.js
index 9a00abd59..d4e5d7699 100644
--- a/flint/src/components/NavigationBar.js
+++ b/flint/src/components/NavigationBar.js
@@ -5,7 +5,7 @@ class NavigationBar extends React.Component {
 
 
 render(){
-return (<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-dark">
+return (<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark">
                 <div class="container-fluid">
                   <img src={brandLogo} alt="Fire Logo" />
                   <a class="navbar-brand" href="#">Flint</a>

From 5ead4065dc2e7a7eecd0fe4ad141d264ae87562c Mon Sep 17 00:00:00 2001
From: Vera E <97448213+ZenonCodes@users.noreply.github.com>
Date: Sun, 1 May 2022 11:26:39 -0400
Subject: [PATCH 8/9] test

---
 flint/src/components/NavigationBar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flint/src/components/NavigationBar.js b/flint/src/components/NavigationBar.js
index d4e5d7699..910ecb435 100644
--- a/flint/src/components/NavigationBar.js
+++ b/flint/src/components/NavigationBar.js
@@ -15,7 +15,7 @@ return (<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark">
                   <div class="collapse navbar-collapse" id="navbarNav">
                     <ul class="navbar-nav">
                       <li class="nav-item">
-                        <a class="nav-link active" aria-current="page" href="/home">Home</a>
+                        <a class="nav-link active" aria-current="page" href="#">Home</a>
                       </li>
                       <li class="nav-item">
                         <a class="nav-link" href="#">Accounts</a>

From 33eeae4756e5f9f78d83db19e576fc8beca5b75e Mon Sep 17 00:00:00 2001
From: Vera E <97448213+ZenonCodes@users.noreply.github.com>
Date: Sun, 1 May 2022 11:28:26 -0400
Subject: [PATCH 9/9] git ignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c2065bc26..dd0cdc741 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
-
+*.db
 ### STS ###
 .apt_generated
 .classpath