Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 4 additions & 8 deletions backend/routes/users.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
const router = require("express").Router();

let User = require("../models/user.model")
let user = require("../models/user.model")

router.route('/').get((req, res) => {
User.find()
user.find()
.then((users) => res.json(users))
.catch((err) => res.status(400).json('Error'+ err))
})

router.route('/add').post((req, res) => {
const username = req.body.username
console.log(req.body);

const newUser = new User({username})

const username = req.body.username
const newUser = new user({username})
newUser.save()
.then(() => res.json("User Added"))
.catch((err) => res.status(400).json('Error' + err))
Expand Down
10 changes: 7 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
import React from 'react';
import {BrowserRouter as Router, Route} from "react-router-dom"
//routing
import {BrowserRouter, Route} from "react-router-dom"
//components
import Navbar from "./components/navbar.component"
import ExerciseList from "./components/exercise-list.component"
import EditExercise from "./components/edit-exercise.component"
import CreateExercise from "./components/create-exercise.component"
import CreateUser from "./components/create-user.component"
//styling
import "bootstrap/dist/css/bootstrap.min.css"
//stateless component
function App() {
return (
<Router>
<BrowserRouter>
<div className="container">
<Navbar/>
<Route path="/" exact component={ExerciseList} />
<Route path="/edit/:id" component={EditExercise} />
<Route path="/create" component={CreateExercise} />
<Route path="/user" component={CreateUser} />
</div>
</Router>
</BrowserRouter>
);
}

Expand Down
14 changes: 7 additions & 7 deletions src/components/create-exercise.component.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, {Component} from "react"
import React from "react"
import DatePicker from "react-datepicker"
import axios from "axios"
import "react-datepicker/dist/react-datepicker.css"
export default class CreateExercise extends Component{
export default class CreateExercise extends React.Component{

constructor(props){
super(props)
Expand All @@ -19,8 +19,8 @@ import "react-datepicker/dist/react-datepicker.css"
this.onChangeDate = this.onChangeDate.bind(this)
this.onSubmit = this.onSubmit.bind(this)
}
onChangeUsername(e){
this.setState({username:e.target.value})
onChangeUsername(event){
this.setState({username:event.target.value})
}

onChangeDescription(e){
Expand All @@ -33,15 +33,15 @@ import "react-datepicker/dist/react-datepicker.css"
this.setState({date:date})
}

onSubmit(e){
onSubmit =(e)=>{
e.preventDefault()
const exercise = {
username : this.state.username,
description : this.state.description,
duration : this.state.duration,
date : this.state.date,
}
console.log(exercise);
//console.log(exercise);

axios.post("http://localhost:5000/exercise/add", exercise)
.then((res) => {console.log(res.data);})
Expand All @@ -65,7 +65,7 @@ import "react-datepicker/dist/react-datepicker.css"
render(){
return(
<div>
<h3>Create New Exercise Log</h3>
<h4>Create New Exercise Log</h4>
<form onSubmit={this.onSubmit}>
<div className="form-group">
<label>Username:</label>
Expand Down
14 changes: 7 additions & 7 deletions src/components/create-user.component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component} from "react"
import React from "react"
import axios from "axios";
export default class CreateUser extends Component{
export default class CreateUser extends React.Component{

constructor(props){
super(props)
Expand All @@ -10,16 +10,16 @@ import axios from "axios";
this.onChangeUsername = this.onChangeUsername.bind(this)
this.onSubmit = this.onSubmit.bind(this)
}
onChangeUsername(e){
this.setState({username:e.target.value})
onChangeUsername=(event)=>{
this.setState({username:event.target.value})
}

onSubmit(e){
e.preventDefault()
onSubmit=(event)=>{
event.preventDefault()
const user = {
username : this.state.username,
}
console.log(user);
// console.log(user);

axios.post("http://localhost:5000/users/add",user)
.then((res) => console.log(res.data))
Expand Down