From 5f629f901bcc9fe963a9e4b3226f7b3c68a39793 Mon Sep 17 00:00:00 2001 From: Aaron Sun Date: Wed, 2 Oct 2019 20:18:47 -0400 Subject: [PATCH] Renamed UI diretory back to twistter-frontend --- {twistter-client => twistter-frontend}/.gitignore | 0 {twistter-client => twistter-frontend}/README.md | 0 .../package-lock.json | 0 {twistter-client => twistter-frontend}/package.json | 0 .../public/index.html | 0 {twistter-client => twistter-frontend}/src/App.css | 0 {twistter-client => twistter-frontend}/src/App.js | 0 .../src/App.test.js | 0 .../src/components/Navbar.js | 0 .../src/images/twistter-logo.png | Bin {twistter-client => twistter-frontend}/src/index.js | 0 .../src/pages/home.js | 12 ++++++------ .../src/pages/login.js | 0 .../src/pages/signup.js | 4 ++-- .../src/serviceWorker.js | 0 15 files changed, 8 insertions(+), 8 deletions(-) rename {twistter-client => twistter-frontend}/.gitignore (100%) rename {twistter-client => twistter-frontend}/README.md (100%) rename {twistter-client => twistter-frontend}/package-lock.json (100%) rename {twistter-client => twistter-frontend}/package.json (100%) rename {twistter-client => twistter-frontend}/public/index.html (100%) rename {twistter-client => twistter-frontend}/src/App.css (100%) rename {twistter-client => twistter-frontend}/src/App.js (100%) rename {twistter-client => twistter-frontend}/src/App.test.js (100%) rename {twistter-client => twistter-frontend}/src/components/Navbar.js (100%) rename {twistter-client => twistter-frontend}/src/images/twistter-logo.png (100%) rename {twistter-client => twistter-frontend}/src/index.js (100%) rename {twistter-client => twistter-frontend}/src/pages/home.js (80%) rename {twistter-client => twistter-frontend}/src/pages/login.js (100%) rename {twistter-client => twistter-frontend}/src/pages/signup.js (95%) rename {twistter-client => twistter-frontend}/src/serviceWorker.js (100%) diff --git a/twistter-client/.gitignore b/twistter-frontend/.gitignore similarity index 100% rename from twistter-client/.gitignore rename to twistter-frontend/.gitignore diff --git a/twistter-client/README.md b/twistter-frontend/README.md similarity index 100% rename from twistter-client/README.md rename to twistter-frontend/README.md diff --git a/twistter-client/package-lock.json b/twistter-frontend/package-lock.json similarity index 100% rename from twistter-client/package-lock.json rename to twistter-frontend/package-lock.json diff --git a/twistter-client/package.json b/twistter-frontend/package.json similarity index 100% rename from twistter-client/package.json rename to twistter-frontend/package.json diff --git a/twistter-client/public/index.html b/twistter-frontend/public/index.html similarity index 100% rename from twistter-client/public/index.html rename to twistter-frontend/public/index.html diff --git a/twistter-client/src/App.css b/twistter-frontend/src/App.css similarity index 100% rename from twistter-client/src/App.css rename to twistter-frontend/src/App.css diff --git a/twistter-client/src/App.js b/twistter-frontend/src/App.js similarity index 100% rename from twistter-client/src/App.js rename to twistter-frontend/src/App.js diff --git a/twistter-client/src/App.test.js b/twistter-frontend/src/App.test.js similarity index 100% rename from twistter-client/src/App.test.js rename to twistter-frontend/src/App.test.js diff --git a/twistter-client/src/components/Navbar.js b/twistter-frontend/src/components/Navbar.js similarity index 100% rename from twistter-client/src/components/Navbar.js rename to twistter-frontend/src/components/Navbar.js diff --git a/twistter-client/src/images/twistter-logo.png b/twistter-frontend/src/images/twistter-logo.png similarity index 100% rename from twistter-client/src/images/twistter-logo.png rename to twistter-frontend/src/images/twistter-logo.png diff --git a/twistter-client/src/index.js b/twistter-frontend/src/index.js similarity index 100% rename from twistter-client/src/index.js rename to twistter-frontend/src/index.js diff --git a/twistter-client/src/pages/home.js b/twistter-frontend/src/pages/home.js similarity index 80% rename from twistter-client/src/pages/home.js rename to twistter-frontend/src/pages/home.js index 93a760f..db44923 100644 --- a/twistter-client/src/pages/home.js +++ b/twistter-frontend/src/pages/home.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import axios from 'axios'; +//import axios from 'axios'; import Grid from '@material-ui/core/Grid'; @@ -8,7 +8,7 @@ import Grid from '@material-ui/core/Grid'; class home extends Component { - state = { + /*state = { screams: null } componentDidMount() { @@ -20,15 +20,15 @@ class home extends Component { }); }) .catch(err => console.log(err)); - } + }*/ render() { - let recentScreamsMarkup = this.state.screams ? ( + /*let recentScreamsMarkup = this.state.screams ? ( this.state.screams.map(scream =>

{scream.body}

) - ) : (

Loading...

) + ) : (

Loading...

)*/ return ( - {recentScreamsMarkup} +

Posts

Profile

diff --git a/twistter-client/src/pages/login.js b/twistter-frontend/src/pages/login.js similarity index 100% rename from twistter-client/src/pages/login.js rename to twistter-frontend/src/pages/login.js diff --git a/twistter-client/src/pages/signup.js b/twistter-frontend/src/pages/signup.js similarity index 95% rename from twistter-client/src/pages/signup.js rename to twistter-frontend/src/pages/signup.js index e779540..29bd185 100644 --- a/twistter-client/src/pages/signup.js +++ b/twistter-frontend/src/pages/signup.js @@ -83,11 +83,11 @@ class signup extends Component { Sign up
-
-
diff --git a/twistter-client/src/serviceWorker.js b/twistter-frontend/src/serviceWorker.js similarity index 100% rename from twistter-client/src/serviceWorker.js rename to twistter-frontend/src/serviceWorker.js