mirror of
https://github.com/ClaytonWWilson/CS307-Team24.git
synced 2026-03-10 21:25:04 +00:00
Revert "Can successfully register and login in UI"
This reverts commit 893cad7e7e.
reverting commit
This commit is contained in:
@@ -1,55 +1,41 @@
|
||||
/* eslint-disable */
|
||||
import React, { Component } from 'react';
|
||||
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
|
||||
|
||||
import MuiThemeProvider from '@material-ui/core/styles/MuiThemeProvider';
|
||||
import createMuiTheme from '@material-ui/core/styles/createMuiTheme';
|
||||
|
||||
import './App.css';
|
||||
import Navbar from './components/Navbar';
|
||||
import home from './pages/home';
|
||||
import login from './pages/login';
|
||||
import signup from './pages/signup';
|
||||
|
||||
import { BrowserRouter as Router } from 'react-router-dom';
|
||||
import Route from 'react-router-dom/Route';
|
||||
import Navbar from './components/layout/NavBar';
|
||||
|
||||
import home from './pages/Home';
|
||||
import register from './pages/Register';
|
||||
import login from './pages/Login';
|
||||
import user from './pages/user';
|
||||
|
||||
|
||||
|
||||
const theme = createMuiTheme({
|
||||
palette: {
|
||||
primary: {
|
||||
light: '#33c9dc',
|
||||
main: '#00bcd4',
|
||||
dark: '#008394',
|
||||
contrastText: "#fff"
|
||||
},
|
||||
secondary: {
|
||||
light: '#ff6333',
|
||||
main: '#ff3d00',
|
||||
dark: '#b22a00',
|
||||
contrastText: '#fff'
|
||||
}
|
||||
}
|
||||
})
|
||||
import writeMicroblog from './Writing_Microblogs.js';
|
||||
import edit from './pages/edit.js';
|
||||
import userLine from './Userline.js';
|
||||
|
||||
class App extends Component {
|
||||
render() {
|
||||
return (
|
||||
<MuiThemeProvider theme={theme}>
|
||||
<div className="App">
|
||||
<Router>
|
||||
<Navbar />
|
||||
<div className="container">
|
||||
<Switch>
|
||||
<Route exact path="/" component={home} />
|
||||
<Route exact path="/login" component={login} />
|
||||
<Route exact path="/signup" component={signup} />
|
||||
</Switch>
|
||||
</div>
|
||||
</Router>
|
||||
<Router>
|
||||
<div className='container' >
|
||||
<Navbar />
|
||||
</div>
|
||||
</MuiThemeProvider>
|
||||
<div className="app">
|
||||
<Route exact path="/" component={home}/>
|
||||
<Route exact path="/register" component={register}/>
|
||||
<Route exact path="/login" component={login}/>
|
||||
<Route exact path="/user" component={user}/>
|
||||
<Route exact path="/home" component={writeMicroblog}/>
|
||||
<Route exact path="/edit" component={edit}/>
|
||||
<Route exact path="/userline" component={userLine}/>
|
||||
</div>
|
||||
|
||||
</Router>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default App;
|
||||
export default App;
|
||||
|
||||
Reference in New Issue
Block a user