From 577b88fa4e8503a6bfeadd1519435f789d03839e Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 27 Jul 2019 12:18:22 -0500
Subject: [PATCH] swap axios for isomorphic-fetch

closes #882
---
 src/FilterLists.Web/package-lock.json         | Bin 510676 -> 511285 bytes
 src/FilterLists.Web/package.json              |   2 +-
 .../src/modules/home/HomeContainer.tsx        |  48 +++++++-----------
 3 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json
index 1fdb6ae31224acbe8944fe431f9ec6086f8bc92b..0afdf1f95e55a7b69e4c161a0d903b6f080b802d 100644
GIT binary patch
delta 622
zcmWlT&u`LT0ER<bFzPblu(%n`md$K2Y_wm0z%bER1P1GXcB4=@sD)A}Eu$?33h|&j
z$idS>^h><(7kDsn;oxNlFCLdI(X-yob}{i{+z#*aB+uzRd$)M>Ve!>x&p<`A_82V8
zV?+o<p+I`*fUC7T_y#UtdE+XN11tAM(Cu*+Cpa?2#oY7|&`GjKgxN%@j4SDOjZ-W6
zU7Z67rfoIj``tv%-f5Nc_3aqLYC<`+T{W6!9pt;aL!}wtCBjx#C*tG7Pb>G-wqdmU
z8+J|6>{`|7EI(XY1|cQ{h~@Pg@OXmWhS>uQK>s<i1fQq9v+#V?w+@L0>WA3DC5~-m
zLCi^;lEp`GAV;f~?w0!GK<ab=qmtn)SB#l)Nl*y9%i$bvDMG`o@NzUtH};3kYJx0S
zf*J1^D#Jubs><<VZfmcVDNzu-^#q~$2MNKKDtZV0D|-C!#a*8l0t*SlA1b<vULG9_
zZ`MSjz!>yXZ8+>%4il$oIWJX`<zX=C45R|++3{@HvTKIxs3n0b5?qcbl6kzLCpO*Q
zmW(qrv7?s_T^5@;TGotGKIx<i@b#fD2p?y#>&PPt25zFO@Y@8Pfz4;w%=^EHA3nj5
zSvdKEK7i~`bPfhS`qrTT7vdEGBSbP%zFRiz%AlnUqYS@omfh}V+R#kaq!nk6>gSX?
zFS%69itTp{yC?!$chyuZ$Pe%!$rrdin~EqIww@tby35*qD167}A%B5<9rabuw67vn
jV{~$gOixbH^U&x5#ikdi_xG(4Gv~dWZ_3PFn;iWI=AF*D

delta 445
zcmdlwOa97K`Gzfwm1*taIgH!GbC?oyn3D6SKMZG<o_=8)JL~j|OpHe2sd>ryDVcfc
z`nvisrmlgW;WQpbMOj1LP?M5e3vJWPs-Qwck7D1f^a6vl98VXIVC~}Rf+8$R(<e+}
z=Vhrg&@-7lK}fQF+YP4e+ioy_(&Na_%`Ym*$V{HTe+s+oWQS{J%9+J5G2OJ(lH?4a
zh3G<)7hY45G1QF=D#|Dda0`gY_b~Pjb23QIcTY2m@HGtgp3ZoQNr@{jKP44n#`KSw
zOk%?28Hpw3=@1bmD+MJxTZ8Ebni-|rm$9>KU&hY*fq(kJDeThIIf~fLrmvT0Wfg-t
z0AZ4@p`Q8VjovDuei>0F&c)sp=E;${MrFZ8PL4%J0cCFfsb<CDE@=j#kv>6%j%LMW
zp^@q4+WH~EX<?3~CYD)|&L&P}fhNJZ#g@TQ=_!ToPU%JYg=sDsUMV4!-jgS8R2GH>
lFUW~;z#!H$G@O1xk6C8=j{ru=_6g#wK+Lv%f;juqtpM~+nb80M

diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json
index 7fe369556..3c65d389f 100644
--- a/src/FilterLists.Web/package.json
+++ b/src/FilterLists.Web/package.json
@@ -9,9 +9,9 @@
     "@types/react-dom": "16.8.5",
     "@types/react-router-dom": "^4.3.4",
     "@types/react-table": "^6.8.5",
+    "axios": "^0.19.0",
     "bootstrap": "^4.3.1",
     "es6-promise": "^4.2.8",
-    "isomorphic-fetch": "^2.2.1",
     "moment": "^2.24.0",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
diff --git a/src/FilterLists.Web/src/modules/home/HomeContainer.tsx b/src/FilterLists.Web/src/modules/home/HomeContainer.tsx
index 5e6c2b558..30c403eb5 100644
--- a/src/FilterLists.Web/src/modules/home/HomeContainer.tsx
+++ b/src/FilterLists.Web/src/modules/home/HomeContainer.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import "isomorphic-fetch";
+import axios from "axios";
 import { ILanguage } from "./interfaces/ILanguage";
 import { ILicense } from "./interfaces/ILicense";
 import { IList } from "./interfaces/IList";
@@ -36,62 +36,48 @@ export class HomeContainer extends React.Component<{}, IState> {
     }
 
     componentDidMount() {
-        this.fetchLanguages();
-        this.fetchLicenses();
         this.fetchLists();
+        this.fetchLanguages();
+        this.fetchLicenses();        
         this.fetchMaintainers();
         this.fetchSoftware();
         this.fetchSyntaxes();
         this.fetchTags();
-        // this.fetchRuleCount();
     };
 
     fetchLanguages() {
-        fetch("/api/v1/languages")
-            .then(r => r.json() as Promise<ILanguage[]>)
-            .then(p => { this.setState({ languages: p }); });
+        axios.request<ILanguage[]>({ url: "/api/v1/languages" })
+            .then(l => { this.setState({ languages: l.data }); })
     };
 
     fetchLicenses() {
-        fetch("/api/v1/licenses")
-            .then(r => r.json() as Promise<ILicense[]>)
-            .then(p => { this.setState({ licenses: p }); });
+        axios.request<ILicense[]>({ url: "/api/v1/licenses" })
+            .then(l => { this.setState({ licenses: l.data }); })
     };
 
     fetchLists() {
-        fetch("/api/v1/lists")
-            .then(r => r.json() as Promise<IList[]>)
-            .then(p => { this.setState({ lists: p }); });
+        axios.request<IList[]>({ url: "/api/v1/lists" })
+            .then(l => { this.setState({ lists: l.data }); })
     };
 
     fetchMaintainers() {
-        fetch("/api/v1/maintainers")
-            .then(r => r.json() as Promise<IMaintainer[]>)
-            .then(p => { this.setState({ maintainers: p }); });
+        axios.request<IMaintainer[]>({ url: "/api/v1/maintainers" })
+            .then(l => { this.setState({ maintainers: l.data }); })
     };
 
     fetchSoftware() {
-        fetch("/api/v1/software")
-            .then(r => r.json() as Promise<ISoftware[]>)
-            .then(p => { this.setState({ software: p }); });
+        axios.request<ISoftware[]>({ url: "/api/v1/software" })
+            .then(l => { this.setState({ software: l.data }); })
     };
 
     fetchSyntaxes() {
-        fetch("/api/v1/syntaxes")
-            .then(r => r.json() as Promise<ISyntax[]>)
-            .then(p => { this.setState({ syntaxes: p }); });
+        axios.request<ISyntax[]>({ url: "/api/v1/syntaxes" })
+            .then(l => { this.setState({ syntaxes: l.data }); })
     };
 
     fetchTags() {
-        fetch("/api/v1/tags")
-            .then(r => r.json() as Promise<ITag[]>)
-            .then(p => { this.setState({ tags: p }); });
-    };
-
-    fetchRuleCount() {
-        fetch("/api/v1/rules")
-            .then(r => r.json() as Promise<number>)
-            .then(p => { this.setState({ ruleCount: p }); });
+        axios.request<ITag[]>({ url: "/api/v1/tags" })
+            .then(l => { this.setState({ tags: l.data }); })
     };
 
     render() {