mirror of
https://github.com/ClaytonWWilson/CS307-Team24.git
synced 2025-12-16 02:08:47 +00:00
Fixing errors and warnings
This commit is contained in:
parent
7c7256acbd
commit
72d099e05e
@ -153,8 +153,8 @@ exports.quoteWithoutPost = (req, res) => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
return res.status(500).json({error: 'Something is wrong'});
|
// return res.status(500).json({error: 'Something is wrong'});
|
||||||
|
return res.status(500).json({error: err});
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -195,7 +195,8 @@ exports.likePost = (req, res) => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
return res.status(500).json({error: 'Something is wrong'});
|
// return res.status(500).json({error: 'Something is wrong'});
|
||||||
|
return res.status(500).json({error: err});
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
/* eslint-disable promise/catch-or-return */
|
/* eslint-disable promise/always-return */
|
||||||
|
|
||||||
const { admin, db } = require("../util/admin");
|
const { admin, db } = require("../util/admin");
|
||||||
const config = require("../util/config");
|
const config = require("../util/config");
|
||||||
const { validateUpdateProfileInfo } = require("../util/validator");
|
const { validateUpdateProfileInfo } = require("../util/validator");
|
||||||
@ -304,12 +305,19 @@ exports.deleteUser = (req, res) => {
|
|||||||
})
|
})
|
||||||
.then(() => {
|
.then(() => {
|
||||||
resolve();
|
resolve();
|
||||||
|
return;
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.log("error " + err);
|
console.log("error " + err);
|
||||||
reject(err);
|
reject(err);
|
||||||
|
return;
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.log(err);
|
||||||
|
return res.status(500).json({error: err});
|
||||||
|
})
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -327,10 +335,12 @@ exports.deleteUser = (req, res) => {
|
|||||||
})
|
})
|
||||||
.then(() => {
|
.then(() => {
|
||||||
resolve();
|
resolve();
|
||||||
|
return;
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
reject(err);
|
reject(err);
|
||||||
|
return;
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -558,7 +568,11 @@ exports.addSubscription = (req, res) => {
|
|||||||
return res.status(500).json({ err });
|
return res.status(500).json({ err });
|
||||||
});
|
});
|
||||||
return res.status(500).json({ error: "shouldn't execute" });
|
return res.status(500).json({ error: "shouldn't execute" });
|
||||||
});
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.log(err);
|
||||||
|
return res.status(500).json({error: err});
|
||||||
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
exports.getSubs = (req, res) => {
|
exports.getSubs = (req, res) => {
|
||||||
@ -598,5 +612,9 @@ exports.removeSub = (req, res) => {
|
|||||||
return res.status(500).json({ err });
|
return res.status(500).json({ err });
|
||||||
});
|
});
|
||||||
return res.status(500).json({ error: "shouldn't execute" });
|
return res.status(500).json({ error: "shouldn't execute" });
|
||||||
});
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.log(err);
|
||||||
|
return res.status(500).json({error: err});
|
||||||
|
})
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
import React, { Component } from "react";
|
import React, { Component } from "react";
|
||||||
import { BrowserRouter as Router } from 'react-router-dom';
|
// import { BrowserRouter as Router } from 'react-router-dom';
|
||||||
import Route from 'react-router-dom/Route';
|
// import Route from 'react-router-dom/Route';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import Box from '@material-ui/core/Box'
|
import Box from '@material-ui/core/Box'
|
||||||
import {borders} from '@material-ui/system';
|
// import {borders} from '@material-ui/system';
|
||||||
import { sizing } from '@material-ui/system';
|
// import { sizing } from '@material-ui/system';
|
||||||
// var moment = require('moment');
|
// var moment = require('moment');
|
||||||
|
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ class Userline extends Component {
|
|||||||
<div style={{fontsize: "13px", textAlign: "left", marginLeft: "14px"}}>
|
<div style={{fontsize: "13px", textAlign: "left", marginLeft: "14px"}}>
|
||||||
<p>Userline</p>
|
<p>Userline</p>
|
||||||
</div>
|
</div>
|
||||||
<Box border={1} width="25%" flex="1" height="auto" m={2} fontSize="13px" textAlign= "left" padding="5px" flexWrap= "wrap" flexDirection= "row" >
|
<Box border={1} width="25%" flex="1" height="auto" m={2} fontSize="13px" textAlign="left" padding="5px" flexWrap="wrap" flexDirection="row" >
|
||||||
<div style={{flexWrap: "wrap", flex: "1", flexDirection: "row", wordBreak: "break-word"}}>
|
<div style={{flexWrap: "wrap", flex: "1", flexDirection: "row", wordBreak: "break-word"}}>
|
||||||
<p>
|
<p>
|
||||||
{sortedPosts.map((microBlog) => <p>Microblog Title: {microBlog.microBlogTitle}
|
{sortedPosts.map((microBlog) => <p>Microblog Title: {microBlog.microBlogTitle}
|
||||||
@ -50,7 +50,7 @@ class Userline extends Component {
|
|||||||
<br></br>Number of comments: {microBlog.commentCount}
|
<br></br>Number of comments: {microBlog.commentCount}
|
||||||
<br></br>Number of likes: {microBlog.likeCount}
|
<br></br>Number of likes: {microBlog.likeCount}
|
||||||
<br></br>Body of post: {microBlog.body}
|
<br></br>Body of post: {microBlog.body}
|
||||||
<br></br>Tagged topics: {microBlog.microBlogTopics.join("," + " ")}
|
<br></br>Tagged topics: {microBlog.microBlogTopics.join(", ")}
|
||||||
</p>)}
|
</p>)}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import React, { Component } from "react";
|
import React, { Component } from "react";
|
||||||
import { BrowserRouter as Router } from "react-router-dom";
|
// import { BrowserRouter as Router } from "react-router-dom";
|
||||||
import Route from "react-router-dom/Route";
|
// import Route from "react-router-dom/Route";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
|
|
||||||
class Writing_Microblogs extends Component {
|
class Writing_Microblogs extends Component {
|
||||||
@ -113,10 +113,10 @@ class Writing_Microblogs extends Component {
|
|||||||
rows={20}
|
rows={20}
|
||||||
/>
|
/>
|
||||||
<div style={{ fontSize: "14px", marginRight: "-100px" }}>
|
<div style={{ fontSize: "14px", marginRight: "-100px" }}>
|
||||||
<p2>Characters Left: {this.state.characterCount}</p2>
|
<p>Characters Left: {this.state.characterCount}</p>
|
||||||
</div>
|
</div>
|
||||||
<div style={{ marginRight: "-100px" }}>
|
<div style={{ marginRight: "-100px" }}>
|
||||||
<button onClick>Share Post</button>
|
<button onClick={this.handleSubmit}>Share Post</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -28,7 +28,7 @@ class Home extends Component {
|
|||||||
axios
|
axios
|
||||||
.get("/getallPosts")
|
.get("/getallPosts")
|
||||||
.then(res => {
|
.then(res => {
|
||||||
console.log(res.data);
|
// console.log(res.data);
|
||||||
this.setState({
|
this.setState({
|
||||||
posts: res.data
|
posts: res.data
|
||||||
})
|
})
|
||||||
@ -45,7 +45,7 @@ class Home extends Component {
|
|||||||
|
|
||||||
let postMarkup = this.state.posts ? (
|
let postMarkup = this.state.posts ? (
|
||||||
this.state.posts.map(post =>
|
this.state.posts.map(post =>
|
||||||
<Card>
|
<Card key={post.postId}>
|
||||||
<CardContent>
|
<CardContent>
|
||||||
<Typography>
|
<Typography>
|
||||||
{
|
{
|
||||||
@ -53,7 +53,7 @@ class Home extends Component {
|
|||||||
(<img src={noImage} height="50" width="50"/>)
|
(<img src={noImage} height="50" width="50"/>)
|
||||||
}
|
}
|
||||||
</Typography>
|
</Typography>
|
||||||
<Typography variant="h7"><b>{post.userHandle}</b></Typography>
|
<Typography variant="h6"><b>{post.userHandle}</b></Typography>
|
||||||
<Typography variant="body2" color={"textSecondary"}>{post.createdAt.substring(0,10) +
|
<Typography variant="body2" color={"textSecondary"}>{post.createdAt.substring(0,10) +
|
||||||
" " + post.createdAt.substring(11,19)}</Typography>
|
" " + post.createdAt.substring(11,19)}</Typography>
|
||||||
<br />
|
<br />
|
||||||
@ -72,7 +72,7 @@ class Home extends Component {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
authenticated ?
|
authenticated ?
|
||||||
<Grid container spacing={16}>
|
<Grid container>
|
||||||
<Grid item sm={4} xs={8}>
|
<Grid item sm={4} xs={8}>
|
||||||
<Writing_Microblogs />
|
<Writing_Microblogs />
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@ -110,7 +110,7 @@ export class Login extends Component {
|
|||||||
<Grid item sm>
|
<Grid item sm>
|
||||||
<img src={logo} className="app-logo" alt="logo" />
|
<img src={logo} className="app-logo" alt="logo" />
|
||||||
<br></br>
|
<br></br>
|
||||||
<Typography variant="p" className={classes.pageTitle} fontFamily = "Georgia, serif">
|
<Typography variant="h6" className={classes.pageTitle} fontFamily = "Georgia, serif">
|
||||||
<b>Log in to Twistter</b>
|
<b>Log in to Twistter</b>
|
||||||
<br></br>
|
<br></br>
|
||||||
</Typography>
|
</Typography>
|
||||||
|
|||||||
@ -89,7 +89,7 @@ export class verify extends Component {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { classes } = this.props;
|
const { classes } = this.props;
|
||||||
const { errors, loading } = this.state;
|
const { loading } = this.state;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Grid container className={classes.form}>
|
<Grid container className={classes.form}>
|
||||||
|
|||||||
@ -1,6 +1,18 @@
|
|||||||
import {SET_USER, SET_ERRORS, CLEAR_ERRORS, LOADING_UI, SET_AUTHENTICATED, SET_UNAUTHENTICATED} from '../types';
|
import {
|
||||||
|
SET_USER,
|
||||||
|
SET_ERRORS,
|
||||||
|
CLEAR_ERRORS,
|
||||||
|
LOADING_UI,
|
||||||
|
// SET_AUTHENTICATED,
|
||||||
|
SET_UNAUTHENTICATED
|
||||||
|
} from '../types';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
|
||||||
|
const setAuthorizationHeader = (token) => {
|
||||||
|
const FBIdToken = `Bearer ${token}`;
|
||||||
|
localStorage.setItem('FBIdToken', FBIdToken);
|
||||||
|
axios.defaults.headers.common['Authorization'] = FBIdToken;
|
||||||
|
}
|
||||||
|
|
||||||
export const getUserData = () => (dispatch) => {
|
export const getUserData = () => (dispatch) => {
|
||||||
axios.get('/user')
|
axios.get('/user')
|
||||||
@ -80,9 +92,3 @@ export const deleteUser = () => (dispatch) => {
|
|||||||
delete axios.defaults.headers.common['Authorization'];
|
delete axios.defaults.headers.common['Authorization'];
|
||||||
dispatch({ type: SET_UNAUTHENTICATED });
|
dispatch({ type: SET_UNAUTHENTICATED });
|
||||||
}
|
}
|
||||||
|
|
||||||
const setAuthorizationHeader = (token) => {
|
|
||||||
const FBIdToken = `Bearer ${token}`;
|
|
||||||
localStorage.setItem('FBIdToken', FBIdToken);
|
|
||||||
axios.defaults.headers.common['Authorization'] = FBIdToken;
|
|
||||||
}
|
|
||||||
@ -1,4 +1,11 @@
|
|||||||
import {SET_USER, SET_ERRORS, CLEAR_ERRORS, LOADING_UI, SET_AUTHENTICATED, SET_UNAUTHENTICATED} from '../types';
|
import {
|
||||||
|
SET_USER,
|
||||||
|
// SET_ERRORS,
|
||||||
|
// CLEAR_ERRORS,
|
||||||
|
// LOADING_UI,
|
||||||
|
SET_AUTHENTICATED,
|
||||||
|
SET_UNAUTHENTICATED
|
||||||
|
} from '../types';
|
||||||
|
|
||||||
const initialState = {
|
const initialState = {
|
||||||
authenticated: false,
|
authenticated: false,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user