Skip to content

Full Refactor #2; Removed Redux and dependencies not needed. #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CampbellD84 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Full Refactor #2; Removed Redux and dependencies not needed. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,10 @@
"private": true,
"dependencies": {
"axios": "^0.19.0",
"bootstrap": "^4.3.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-redux": "^7.1.0",
"react-router-dom": "^5.0.1",
"react-scripts": "3.0.1",
"reactstrap": "^8.0.1",
"recharts": "^1.6.2",
"redux": "^4.0.4",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.3.0"
"react-scripts": "3.0.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
85 changes: 44 additions & 41 deletions src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,32 @@
.App h1 {
text-align: center;
}

nav {
display: flex;
justify-content: space-between;
align-content: center;
max-width: 100%;
/* margin-top: 1.0rem; */
padding-bottom: 1.5rem;
border-bottom: 0.1rem solid #000;
}
/*
.logo {
margin-left: 1rem;
align-items: center;
padding: 0 15px;
}

nav .nav-links {
.links {
display: flex;
justify-content: center;
justify-content: space-between;
}

a {
.links a {
text-decoration: none;
margin-right: 1.0rem;
} */
color: #000;
font-weight: bold;
margin-right: 10px;
}

.controls {
margin-top: 2.5rem;
.links a.active {
border-bottom: 1px solid #000;
}

.bear {
position: absolute;
top: 23rem;
left: 1rem;
height: 15rem;
width: 15rem;
left: 1rem;
top: 28rem;
}

.forest {
Expand All @@ -45,35 +36,47 @@ nav .nav-links {
left: 0;
}

.hidden {
display: none;
.sessionInfo {
margin-top: 1.5rem;
margin-bottom: 1.5rem;
display: flex;
justify-content: space-around;
flex-direction: row;
align-items: space-around;
flex-wrap: wrap;
}

.btn-contain {
margin-top: 0.5rem;
.login-form {
margin: 0 auto;
display: flex;
justify-content: center;
flex-direction: column;
width: 20rem;
}

.btn-contain button {
margin-right: 0.5rem;
.login-form input {
margin-bottom: 1rem;
}

.mic-btn {
margin-bottom: 1rem;
margin-top: 1rem;
.register-form {
margin: 0 auto;
width: 20rem;
display: flex;
justify-content: flex-end;
flex-direction: column;
}

.Stopwatch {
margin-top: 1rem;
.register-form input {
margin-bottom: 1rem;
}

.link {
text-decoration: none;
color: #fff;
margin-right: 0.5rem;
.session-form {
display: flex;
justify-content: flex-end;
flex-direction: column;
align-content: baseline;
}

.link:hover {
text-decoration: none;
color: #fff;
margin-right: 0.5rem;
.session-form input {
margin-bottom: 1rem;
}
149 changes: 89 additions & 60 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,105 @@
import React from "react";
import React, { Component } from "react";
import API from "./api";

import { Route, NavLink } from "react-router-dom";
import {
Collapse,
Navbar,
NavbarToggler,
NavbarBrand,
Nav,
NavItem
} from "reactstrap";

import PrivateRoute from "./components/PrivateRoute";
// import PrivateRoute from "./components/PrivateRoute";

import Login from "./components/Login";
import SignUp from "./components/SignUp";
import Teacher from "./components/Teacher";
import Classroom from "./components/Classroom";
import LoginForm from "./components/LoginForm";
import RegisterForm from "./components/RegisterForm";
import AppHome from "./components/AppHome";
import UserDashboard from "./components/UserDashboard";

import './App.css';
import "./App.css";

class App extends React.Component {
constructor(props) {
super(props);
class App extends Component {
state = {
users: []
};

this.toggle = this.toggle.bind(this);
this.state = {
isOpen: false
};
}
toggle() {
this.setState({
isOpen: !this.state.isOpen
});
componentDidMount() {
API.get("users")
.then(res =>
this.setState({
users: res.data
})
)
.catch(err => console.log(err));
}

addUser = user => {
API.post("register", user, {
headers: { Authorization: localStorage.getItem("token") }
})
.then(res => res.data)
.catch(err => console.log(err));
};

login = creds => {
API.post("login", creds)
.then(res => {
localStorage.setItem("token", res.data.token);
})
.catch(err => console.log(err));
};

getSessions = user => {
API.get(`users/${user.id}/sessions`, {
headers: { Authorization: localStorage.getItem("token") }
})
.then(res => {
console.log(res.data);
})
.catch(err => console.log(err));
};

render() {
return (
<>
<div>
<Navbar color="dark" dark expand="md">
<NavbarBrand href="/">
{/* <NavLink to="/" className="link"> */}
Noise Controller
{/* </NavLink> */}
</NavbarBrand>
<NavbarToggler onClick={this.toggle} />
<Collapse isOpen={this.state.isOpen} navbar>
<Nav className="ml-auto" navbar>
<NavItem>
<NavLink className="link" to="/login">Login</NavLink>
</NavItem>
<NavItem>
<NavLink className="link" to="/register">Sign Up</NavLink>
</NavItem>
<NavItem>
<NavLink className="link" to="/protected">Teacher</NavLink>
</NavItem>
<NavItem>
<NavLink className="link" to="/protected/session">Classroom</NavLink>
</NavItem>
</Nav>
</Collapse>
</Navbar>
<div>
<nav>
<h1>Noise Controller</h1>
<div className="links">
<NavLink exact to="/">
Home
</NavLink>
<NavLink to="/users/">User Dashboard</NavLink>
<NavLink to="/register">Register</NavLink>
<NavLink to="/login">Log in</NavLink>
</div>
{/* <Login /> */}
<Route exact path="/login" component={Login} />
</nav>

{/* <SignUp /> */}
<Route path="/register" component={SignUp} />
<Route exact path="/" component={AppHome} />
<Route
path="/register"
render={props => <RegisterForm {...props} adduser={this.addUser} />}
/>
<Route
path="/login"
render={props => <LoginForm {...props} login={this.login} />}
/>
{/*
<PrivateRoute
path="/users"
render={props => (
<UserDashboard
{...props}
getSessions={this.getSessions}
users={this.state.users}
/>
)}
/> */}

<PrivateRoute exact path="/protected" component={Teacher} />
<PrivateRoute exact path="/protected/session" component={Classroom} />
</>
<Route
path="/users/"
render={props => (
<UserDashboard
{...props}
getSessions={this.getSessions}
users={this.state.users}
/>
)}
/>
</div>
);
}
}
Expand Down
85 changes: 0 additions & 85 deletions src/actions/index.js
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions src/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import axios from "axios";

export default axios.create({
baseURL: "https://noise-controller-buildweek.herokuapp.com/"
});
Loading