Reconciled with new pull from master

2026-03-10 21:25:04 +00:00 · 2019-09-30 23:22:09 -04:00
parent 201f5d8949 7969d3b10b
commit 4517bc6756
36 changed files with 6582 additions and 9171 deletions
--- a/twistter-frontend/package.json
+++ b/twistter-frontend/package.json
@@ -5,10 +5,16 @@
  "dependencies": {
    "@material-ui/core": "^4.4.3",
    "axios": "^0.19.0",
+    "create-react-app": "^3.1.2",
+    "install": "^0.13.0",
+    "node-pre-gyp": "^0.13.0",
    "react": "^16.9.0",
    "react-dom": "^16.9.0",
-    "react-router-dom": "^5.0.1",
-    "react-scripts": "^3.1.2"
+    "react-redux": "^7.1.1",
+    "react-router-dom": "^5.1.0",
+    "react-scripts": "0.9.5",
+    "redux": "^4.0.4",
+    "redux-thunk": "^2.3.0"
  },
  "devDependencies": {},
  "scripts": {