From b9909c1616864ef6b285be1d4db931a9a3b174f4 Mon Sep 17 00:00:00 2001
From: Leon Liang <liang268@purdue.edu>
Date: Tue, 1 Oct 2019 18:44:49 -0400
Subject: [PATCH 1/2] move home.js and so on into according folders

---
 twistter-frontend/src/App.js                         | 8 ++++----
 twistter-frontend/src/components/topic/ChipsArray.js | 4 +++-
 twistter-frontend/src/{ => pages}/Home.js            | 0
 twistter-frontend/src/{ => pages}/Login.js           | 4 ++--
 twistter-frontend/src/{ => pages}/Register.js        | 0
 5 files changed, 9 insertions(+), 7 deletions(-)
 rename twistter-frontend/src/{ => pages}/Home.js (100%)
 rename twistter-frontend/src/{ => pages}/Login.js (90%)
 rename twistter-frontend/src/{ => pages}/Register.js (100%)

diff --git a/twistter-frontend/src/App.js b/twistter-frontend/src/App.js
index e6efa6c..44f3e12 100644
--- a/twistter-frontend/src/App.js
+++ b/twistter-frontend/src/App.js
@@ -8,10 +8,10 @@ import Route from 'react-router-dom/Route';
 
 import NavBar, { Navbar } from './components/layout/NavBar';
 
-import home from './Home.js';
-import register from './Register.js';
-import login from './Login.js';
-import user from './pages/user';
+import home from './pages/Home';
+import register from './pages/Register';
+import login from './pages/Login';
+import user from './pages/User';
 import writeMicroblog from './Writing_Microblogs.js';
 import userLine from './Userline.js';
 
diff --git a/twistter-frontend/src/components/topic/ChipsArray.js b/twistter-frontend/src/components/topic/ChipsArray.js
index a99afd1..2bb2013 100644
--- a/twistter-frontend/src/components/topic/ChipsArray.js
+++ b/twistter-frontend/src/components/topic/ChipsArray.js
@@ -3,7 +3,9 @@ import { makeStyles } from '@material-ui/core/styles';
 import Chip from '@material-ui/core/Chip';
 import Paper from '@material-ui/core/Paper';
 
-const useStyles = makeStyles(theme => ({
+
+// TODO: fix the style
+const styles = makeStyles(theme => ({
   root: {
     display: 'flex',
     justifyContent: 'center',
diff --git a/twistter-frontend/src/Home.js b/twistter-frontend/src/pages/Home.js
similarity index 100%
rename from twistter-frontend/src/Home.js
rename to twistter-frontend/src/pages/Home.js
diff --git a/twistter-frontend/src/Login.js b/twistter-frontend/src/pages/Login.js
similarity index 90%
rename from twistter-frontend/src/Login.js
rename to twistter-frontend/src/pages/Login.js
index 550ed54..76531d2 100644
--- a/twistter-frontend/src/Login.js
+++ b/twistter-frontend/src/pages/Login.js
@@ -1,8 +1,8 @@
 /* eslint-disable */
 import React, { Component } from 'react';
-import './App.css';
+import '../App.css';
 
-import logo from './images/twistter-logo.png';
+import logo from '../images/twistter-logo.png';
 import TextField from '@material-ui/core/TextField';
 
 class Login extends Component {
diff --git a/twistter-frontend/src/Register.js b/twistter-frontend/src/pages/Register.js
similarity index 100%
rename from twistter-frontend/src/Register.js
rename to twistter-frontend/src/pages/Register.js

From 89e894262438dd2fd708bbfcafcac460f4beafbb Mon Sep 17 00:00:00 2001
From: Leon Liang <liang268@purdue.edu>
Date: Tue, 1 Oct 2019 18:54:26 -0400
Subject: [PATCH 2/2] file organization for twistter frontend

---
 twistter-frontend/src/App.css           | 1 +
 twistter-frontend/src/App.js            | 2 +-
 twistter-frontend/src/pages/Home.js     | 4 ++--
 twistter-frontend/src/pages/Register.js | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/twistter-frontend/src/App.css b/twistter-frontend/src/App.css
index 5935fb8..6b2ecb1 100644
--- a/twistter-frontend/src/App.css
+++ b/twistter-frontend/src/App.css
@@ -45,4 +45,5 @@
 .container {
   margin: 80px auto 0 auto;
   max-width: 1200px;
+  color: #1da1f2;
 }
\ No newline at end of file
diff --git a/twistter-frontend/src/App.js b/twistter-frontend/src/App.js
index 44f3e12..57c7672 100644
--- a/twistter-frontend/src/App.js
+++ b/twistter-frontend/src/App.js
@@ -19,7 +19,7 @@ class App extends Component {
   render() {
     return (
       <Router>
-        <div className='container'>
+        <div className='container' >
           <Navbar />
         </div>
 
diff --git a/twistter-frontend/src/pages/Home.js b/twistter-frontend/src/pages/Home.js
index dfd653c..43bf100 100644
--- a/twistter-frontend/src/pages/Home.js
+++ b/twistter-frontend/src/pages/Home.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
-import './App.css';
+import '../App.css';
 
-import logo from './images/twistter-logo.png';
+import logo from '../images/twistter-logo.png';
 
 
 class Home extends Component {
diff --git a/twistter-frontend/src/pages/Register.js b/twistter-frontend/src/pages/Register.js
index c67d8c2..3d5db00 100644
--- a/twistter-frontend/src/pages/Register.js
+++ b/twistter-frontend/src/pages/Register.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
-import './App.css';
+import '../App.css';
 
-import logo from './images/twistter-logo.png';
+import logo from '../images/twistter-logo.png';
 import TextField from '@material-ui/core/TextField';
 
 class Register extends Component {