From 015f1c1e9fbd46db2c9e483b54a376ec05629b83 Mon Sep 17 00:00:00 2001
From: Leon Liang <liang268@purdue.edu>
Date: Fri, 27 Sep 2019 21:59:57 -0400
Subject: [PATCH] change the location of logo.png so that it displays correctly

---
 twistter-frontend/package-lock.json | 32 +++++++++++++++++++++++++++++
 twistter-frontend/package.json      |  1 +
 twistter-frontend/src/App.js        |  1 +
 twistter-frontend/src/Home.js       |  2 +-
 twistter-frontend/src/Login.js      |  3 ++-
 twistter-frontend/src/Register.js   |  2 +-
 6 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/twistter-frontend/package-lock.json b/twistter-frontend/package-lock.json
index 50aedd0..2fb6aa4 100644
--- a/twistter-frontend/package-lock.json
+++ b/twistter-frontend/package-lock.json
@@ -428,6 +428,38 @@
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
       "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
+    "axios": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
+      "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
+      "requires": {
+        "follow-redirects": "1.5.10",
+        "is-buffer": "^2.0.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.5.10",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+          "requires": {
+            "debug": "=3.1.0"
+          }
+        },
+        "is-buffer": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
+          "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
+        }
+      }
+    },
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
diff --git a/twistter-frontend/package.json b/twistter-frontend/package.json
index f5b8736..8176b1a 100644
--- a/twistter-frontend/package.json
+++ b/twistter-frontend/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "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",
diff --git a/twistter-frontend/src/App.js b/twistter-frontend/src/App.js
index 378bf7f..84c05ac 100644
--- a/twistter-frontend/src/App.js
+++ b/twistter-frontend/src/App.js
@@ -10,6 +10,7 @@ import Route from 'react-router-dom/Route';
 import home from './Home.js';
 import register from './Register.js';
 import login from './Login.js';
+import user from './pages/user';
 
 class App extends Component {
   render() {
diff --git a/twistter-frontend/src/Home.js b/twistter-frontend/src/Home.js
index 7371429..dfd653c 100644
--- a/twistter-frontend/src/Home.js
+++ b/twistter-frontend/src/Home.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import './App.css';
 
-import logo from './twistter-logo.png';
+import logo from './images/twistter-logo.png';
 
 
 class Home extends Component {
diff --git a/twistter-frontend/src/Login.js b/twistter-frontend/src/Login.js
index 86c8d98..1c615b7 100644
--- a/twistter-frontend/src/Login.js
+++ b/twistter-frontend/src/Login.js
@@ -1,7 +1,8 @@
+/* eslint-disable */
 import React, { Component } from 'react';
 import './App.css';
 
-import logo from './twistter-logo.png';
+import logo from './images/twistter-logo.png';
 import TextField from '@material-ui/core/TextField';
 
 import axios from 'axios';
diff --git a/twistter-frontend/src/Register.js b/twistter-frontend/src/Register.js
index a04dde4..7f06806 100644
--- a/twistter-frontend/src/Register.js
+++ b/twistter-frontend/src/Register.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import './App.css';
 
-import logo from './twistter-logo.png';
+import logo from './images/twistter-logo.png';
 import TextField from '@material-ui/core/TextField';
 
 //import axios from 'axios';