diff --git a/functions/handlers/post.js b/functions/handlers/post.js index 48fbbcc..2be5bda 100644 --- a/functions/handlers/post.js +++ b/functions/handlers/post.js @@ -1,3 +1,4 @@ +/* eslint-disable prefer-arrow-callback */ /* eslint-disable promise/always-return */ const admin = require('firebase-admin'); @@ -63,3 +64,7 @@ exports.getallPosts = (req, res) => { res.status(500).send("Failed to retrieve posts from database.", err); }); }; + +exports.getFilteredPosts = (req, res) => { + admin.firestore().collection('posts').where('userHandle', '==', 'new user').where('microBlogTopics', '==') +}; \ No newline at end of file diff --git a/functions/handlers/topic.js b/functions/handlers/topic.js index 4d3dc3d..7a84488 100644 --- a/functions/handlers/topic.js +++ b/functions/handlers/topic.js @@ -1,52 +1,61 @@ -/* eslint-disable promise/always-return */ +/* eslint-disable promise/always-return */ const { admin, db } = require("../util/admin"); exports.putTopic = (req, res) => { + const newTopic = { + topic: req.body.topic + }; - const newTopic = { - topic: req.body.topic - }; - - admin.firestore().collection('topics').add(newTopic) - .then((doc) => { - const resTopic = newTopic; - newTopic.topicId = doc.id; - return res.status(200).json(resTopic); + admin + .firestore() + .collection("topics") + .add(newTopic) + .then(doc => { + const resTopic = newTopic; + return res.status(200).json(resTopic); }) - .catch((err) => { - console.error(err); - return res.status(500).json({ error: 'something is wrong'}); + .catch(err => { + console.error(err); + return res.status(500).json({ error: "something is wrong" }); }); }; exports.getAllTopics = (req, res) => { - admin.firestore().collection('topics').get() - .then((data) => { - let topics = []; - data.forEach(function(doc) { - topics.push(doc.data()); + admin + .firestore() + .collection("topics") + .get() + .then(data => { + let topics = []; + data.forEach(function(doc) { + topics.push({ + topic: doc.data().topic, + id: doc.id }); - return res.status(200).json(topics); - }) - .catch((err) => { - console.error(err); - return res.status(500).json({error: 'Failed to fetch all topics.'}) + }); + return res.status(200).json(topics); }) + .catch(err => { + console.error(err); + return res.status(500).json({ error: "Failed to fetch all topics." }); + }); }; exports.deleteTopic = (req, res) => { - const topic = db.doc(`/topics/${req.params.topicId}`); - topic.get().then((doc) => { - if (!doc.exists) { - return res.status(404).json({error: 'Topic not found'}); - } else { - return topic.delete(); - } + const topic = db.doc(`/topics/${req.params.topicId}`); + topic + .get() + .then(doc => { + if (!doc.exists) { + return res.status(404).json({ error: "Topic not found" }); + } else { + return topic.delete(); + } }) .then(() => { - res.json({ message: 'Topic successfully deleted!'}); + res.json({ message: "Topic successfully deleted!" }); }) - .catch((err) => { - console.error(err); - return res.status(500).json({error: 'Failed to delete topic.'}) - }) -} \ No newline at end of file + .catch(err => { + console.error(err); + return res.status(500).json({ error: "Failed to delete topic." }); + }); +}; diff --git a/functions/index.js b/functions/index.js index 12bb46d..51a59e2 100644 --- a/functions/index.js +++ b/functions/index.js @@ -56,11 +56,7 @@ app.post("/putPost", fbAuth, putPost); /*------------------------------------------------------------------* * handlers/topic.js * *------------------------------------------------------------------*/ -const { - putTopic, - getAllTopics, - deleteTopic -} = require("./handlers/topic"); +const { putTopic, getAllTopics, deleteTopic } = require("./handlers/topic"); // add topic to database app.post("/putTopic", fbAuth, putTopic); diff --git a/twistter-frontend/src/App.js b/twistter-frontend/src/App.js index d3a3163..bf05580 100644 --- a/twistter-frontend/src/App.js +++ b/twistter-frontend/src/App.js @@ -10,11 +10,11 @@ import jwtDecode from "jwt-decode"; // Redux import { Provider } from "react-redux"; import store from "./redux/store"; -import MuiThemeProvider from '@material-ui/core/styles/MuiThemeProvider'; -import createMuiTheme from '@material-ui/core/styles/createMuiTheme'; -import themeObject from './util/theme'; -import { SET_AUTHENTICATED } from './redux/types'; -import { logoutUser, getUserData } from './redux/actions/userActions'; +import MuiThemeProvider from "@material-ui/core/styles/MuiThemeProvider"; +import createMuiTheme from "@material-ui/core/styles/createMuiTheme"; +import themeObject from "./util/theme"; +import { SET_AUTHENTICATED } from "./redux/types"; +import { logoutUser, getUserData } from "./redux/actions/userActions"; // Components import AuthRoute from "./util/AuthRoute"; @@ -22,21 +22,20 @@ import AuthRoute from "./util/AuthRoute"; // axios.defaults.baseURL = 'http://localhost:5006/twistter-e4649/us-central1/api'; // Pages -import home from './pages/Home'; -import signup from './pages/Signup'; -import login from './pages/Login'; -import user from './pages/user'; -import logout from './pages/Logout'; -import Delete from './pages/Delete'; -import writeMicroblog from './Writing_Microblogs.js'; -import editProfile from './pages/editProfile'; -import userLine from './Userline.js'; +import home from "./pages/Home"; +import signup from "./pages/Signup"; +import login from "./pages/Login"; +import user from "./pages/user"; +import logout from "./pages/Logout"; +import Delete from "./pages/Delete"; +import writeMicroblog from "./Writing_Microblogs.js"; +import editProfile from "./pages/editProfile"; +import userLine from "./Userline.js"; const theme = createMuiTheme(themeObject); const token = localStorage.FBIdToken; if (token) { - try { const decodedToken = jwtDecode(token); if (decodedToken.exp * 1000 < Date.now()) { @@ -44,7 +43,7 @@ if (token) { window.location.href = "/login"; } else { store.dispatch({ type: SET_AUTHENTICATED }); - axios.defaults.headers.common['Authorization'] = token; + axios.defaults.headers.common["Authorization"] = token; store.dispatch(getUserData()); } } catch (invalidTokenError) { @@ -53,18 +52,19 @@ if (token) { } } - class App extends Component { render() { return ( -
+
+ + {/* AuthRoute checks if the user is logged in and if they are it redirects them to /home */} diff --git a/twistter-frontend/src/Writing_Microblogs.js b/twistter-frontend/src/Writing_Microblogs.js index 0734d1c..9cac7b7 100644 --- a/twistter-frontend/src/Writing_Microblogs.js +++ b/twistter-frontend/src/Writing_Microblogs.js @@ -1,107 +1,128 @@ import React, { Component } from "react"; -import { BrowserRouter as Router } from 'react-router-dom'; -import Route from 'react-router-dom/Route'; -import axios from 'axios'; - +import { BrowserRouter as Router } from "react-router-dom"; +import Route from "react-router-dom/Route"; +import axios from "axios"; class Writing_Microblogs extends Component { + constructor(props) { + super(props); + this.state = { + value: "", + title: "", + topics: "", + characterCount: 250 + }; - constructor(props) { - super(props); - this.state = { - value: '', - title: '', - topics: '', - characterCount: 250 - - }; + this.handleChange = this.handleChange.bind(this); + this.handleSubmit = this.handleSubmit.bind(this); + this.handleChangeforPost = this.handleChangeforPost.bind(this); + this.handleChangeforTopics = this.handleChangeforTopics.bind(this); + } - - this.handleChange = this.handleChange.bind(this); - this.handleSubmit = this.handleSubmit.bind(this); - this.handleChangeforPost = this.handleChangeforPost.bind(this); - this.handleChangeforTopics = this.handleChangeforTopics.bind(this); - - } + handleChange(event) { + this.setState({ title: event.target.value }); + } - handleChange(event) { - this.setState( {title: event.target.value }); - } + handleChangeforTopics(event) { + this.setState({ topics: event.target.value }); + } - handleChangeforTopics(event) { - this.setState( {topics: event.target.value}); - } + handleSubmit(event) { + // alert('A title for the microblog was inputted: ' + this.state.title + '\nA microblog was posted: ' + this.state.value); + const postData = { + body: this.state.value, + userImage: "bing-url", + microBlogTitle: this.state.title, + microBlogTopics: this.state.topics.split(", ") + }; + const headers = { + headers: { "Content-Type": "application/json" } + }; - handleSubmit(event) { + axios + .post("/putPost", postData, headers) + .then(res => { + alert("Post was shared successfully!"); + console.log(res.data); + }) + .catch(err => { + alert("An error occured."); + console.error(err); + }); + event.preventDefault(); + this.setState({ value: "", title: "", characterCount: 250, topics: "" }); + } - const postData = { - body: this.state.value, - userImage: "bing-url", - microBlogTitle: this.state.title, - microBlogTopics: this.state.topics.split(', ') - } - const headers = { - headers: { 'Content-Type': 'application/json'} - } - - axios - .post("/putPost", postData, headers) - .then((res) =>{ - alert('Post was shared successfully!') - console.log(res.data); - }) - .catch((err) => { - alert('An error occured.'); - console.error(err); - }) - event.preventDefault(); - this.setState({value: '', title: '',characterCount: 250, topics: ''}) - } + handleChangeforPost(event) { + this.setState({ value: event.target.value }); + } - handleChangeforPost(event) { - this.setState({value: event.target.value }) - } + handleChangeforCharacterCount(event) { + const charCount = event.target.value.length; + const charRemaining = 250 - charCount; + this.setState({ characterCount: charRemaining }); + } - handleChangeforCharacterCount(event) { - const charCount = event.target.value.length - const charRemaining = 250 - charCount - this.setState({characterCount: charRemaining }) - - } + render() { + return ( +
+
+
+