ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-16 10:18:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix login-frontend merge conflicts

Browse Source
This commit is contained in:
Clayton Wilson 2019-10-11 17:46:38 -04:00
commit b337277aa4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
twistter-frontend/src/App.js
View File

@ -24,10 +24,10 @@ import home from './pages/Home';
import signup from './pages/Signup'; import signup from './pages/Signup';
import login from './pages/Login'; import login from './pages/Login';
import user from './pages/user'; import user from './pages/user';
import writeMicroblog from "./Writing_Microblogs.js";
import edit from "./pages/edit.js";
import userLine from "./Userline.js";
import logout from './pages/Logout'; import logout from './pages/Logout';
import writeMicroblog from './Writing_Microblogs.js';
import editProfile from './pages/editProfile';
import userLine from './Userline.js';
const theme = createMuiTheme(themeObject); const theme = createMuiTheme(themeObject);
@ -64,7 +64,7 @@ class App extends Component {
<Route exact path="/user" component={user} /> <Route exact path="/user" component={user} />
<Route exact path="/home" component={writeMicroblog} /> <Route exact path="/home" component={writeMicroblog} />
<Route exact path="/edit" component={edit} /> <Route exact path="/edit" component={editProfile} />
<Route exact path="/user" component={userLine} /> <Route exact path="/user" component={userLine} />
<AuthRoute exact path="/" component={home}/> <AuthRoute exact path="/" component={home}/>

0
twistter-frontend/src/pages/edit.js → twistter-frontend/src/pages/editProfile.js
View File