Compare commits

...

5 Commits

Author SHA1 Message Date
Aditya Sankaran
83052f0a80 user Feed 2019-11-08 17:09:57 -05:00
Aditya Sankaran
cc20e30990 work 2019-11-01 13:20:34 -04:00
Aditya Sankaran
6dbca16ace connecting 2019-11-01 04:42:44 -04:00
Aditya Sankaran
12938e8e9a comment out redux 2019-10-30 21:55:48 -04:00
Aditya Sankaran
84ad61b954 liking and quoting work 2019-10-30 18:31:55 -04:00
12 changed files with 605 additions and 7 deletions

View File

@@ -8,7 +8,6 @@
}, },
"functions": { "functions": {
"predeploy": [ "predeploy": [
"npm --prefix \"$RESOURCE_DIR\" run lint"
] ]
}, },
"hosting": { "hosting": {

View File

@@ -1,5 +1,7 @@
/* eslint-disable promise/always-return */ /* eslint-disable promise/always-return */
const admin = require('firebase-admin'); const admin = require('firebase-admin');
const { db } = require('../util/admin');
exports.putPost = (req, res) => { exports.putPost = (req, res) => {
const newPost = { const newPost = {
@@ -27,6 +29,134 @@ exports.putPost = (req, res) => {
}); });
}; };
exports.getPost = (req, res) => {
let postData = {};
db.doc(`/posts/${req.params.postId}`)
.get()
.then((doc) => {
if (!doc.exists) {
return res.status(404).json({error: 'Post is not found'});
}
postData = doc.data();
postData.postId = doc.id;
return res.status(200).json(postData);
})
.catch((err) => {
console.error(err);
return res.status(500).json({error: 'Something is wrong'});
})
}
exports.likePost = (req, res) => {
const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.userData.handle)
.where('postId', '==', req.params.postId).limit(1);
const postDoc = db.doc(`/posts/${req.params.postId}`);
likeDoc.get()
.then((data) => {
if (data.empty) {
admin.firestore().collection('likes').add({
postId : req.params.postId,
userHandle: req.userData.handle
})
.then(() => {
return postDoc.update({likeCount : firebase.firestore.FieldValue.increment(1) })
})
.then(() => {
return res.status(200).json(postDoc);
})
}
else {
return res.status(400).json({error: 'Post has already been liked.'})
}
})
.catch((err) => {
console.error(err);
return res.status(500).json({error: 'Something is wrong'});
})
}
exports.unlikePost = (re, res) => {
let postData;
const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.userData.handle)
.where('postId', '==', req.params.postId).limit(1);
const postDoc = db.doc(`/posts/${req.params.postId}`);
likeDoc.get()
.then((data) => {
if (data.empty) {
return res.status(400).json({ error: 'Post cannot be unliked because it is not liked at the moment.' });
} else {
return db
.doc(`/likes/${data.docs[0].id}`)
.delete()
.then(() => {
postData.likeCount--;
return postDoc.update({ likeCount: postData.likeCount });
})
.then(() => {
res.status(200).json(postData);
});
}
})
.catch((err) => {
console.error(err);
return res.status(500).json({error: 'Something is wrong'});
})
}
exports.quotePost = (req, res) => {
const likeDoc = admin.firestore().collection('posts').where('postId', '==', req.params.postId).limit(1);
const quotedPost = {
quotingUser : req.userData.handle,
quotedAt: new Date().toISOString(),
body: req.body.body,
}
admin.firestore().collection('posts').add(quotedPost)
.then((doc) => {
const resPost = quotedPost;
resPost.postId = doc.id;
return res.status(200).json(resPost);
}
)
.catch((err) => {
console.error(err);
return res.status(500).json({error: 'Something is wrong'});
})
}
exports.getallPostsforFeed = (req, res) => {
admin.firestore().collection('posts').get()
.then((data) => {
let posts = [];
data.forEach(function(doc) {
posts.push( {
microBlogs: doc.data(),
id: doc.id,
})
});
return res.status(200).json(posts);
})
.catch((err) => {
console.error(err);
return res.status(500).json({error: 'Failed to fetch all posts written by all other users.'})
})
};
exports.getallPostsforUser = (req, res) => { exports.getallPostsforUser = (req, res) => {
admin.firestore().collection('posts').where('userHandle', '==', req.userData.handle ).get() admin.firestore().collection('posts').where('userHandle', '==', req.userData.handle ).get()
.then((data) => { .then((data) => {

View File

@@ -44,10 +44,19 @@ app.get("/user", fbAuth, getAuthenticatedUser);
/*------------------------------------------------------------------* /*------------------------------------------------------------------*
* handlers/post.js * * handlers/post.js *
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
const { getallPostsforUser, putPost const { getallPostsforUser, putPost, getPost, getallPostsforFeed, likePost, unlikePost, quotePost
} = require("./handlers/post"); } = require("./handlers/post");
app.get("/getallPostsforUser", getallPostsforUser); app.get("/getallPostsforUser", fbAuth, getallPostsforUser);
app.get("/getallPostsforFeed", fbAuth, getallPostsforFeed);
app.get("/putPost/:postId", fbAuth, getPost);
app.get("/putPost/:postId/like", fbAuth, likePost);
app.get("/putPost/:postId/unlike", fbAuth, unlikePost);
app.post("/putPost/:postId/quote", fbAuth, quotePost);
// Adds one post to the database // Adds one post to the database
app.post("/putPost", fbAuth, putPost); app.post("/putPost", fbAuth, putPost);

View File

@@ -121,6 +121,16 @@
"react-is": "^16.8.6" "react-is": "^16.8.6"
} }
}, },
"@restart/context": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
"integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q=="
},
"@restart/hooks": {
"version": "0.3.15",
"resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.15.tgz",
"integrity": "sha512-rVNba1A2oMzKBg16fCrrHmCf4JjOzFhT9TWR8J+Y8iOcY4zffxtP3ke7mEsakvghHZT+9//uDOPSSeuBDW41GQ=="
},
"@types/prop-types": { "@types/prop-types": {
"version": "15.7.3", "version": "15.7.3",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",
@@ -1419,6 +1429,11 @@
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
}, },
"bootstrap": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
"integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
},
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1704,6 +1719,11 @@
} }
} }
}, },
"classnames": {
"version": "2.2.6",
"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
"integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
},
"clean-css": { "clean-css": {
"version": "4.2.1", "version": "4.2.1",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
@@ -2228,6 +2248,15 @@
} }
} }
}, },
"create-react-context": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz",
"integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==",
"requires": {
"gud": "^1.0.0",
"warning": "^4.0.3"
}
},
"cross-spawn": { "cross-spawn": {
"version": "4.0.2", "version": "4.0.2",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
@@ -3092,6 +3121,11 @@
"merge": "^1.2.0" "merge": "^1.2.0"
} }
}, },
"exenv": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
"integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
},
"exit-hook": { "exit-hook": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz", "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
@@ -5290,6 +5324,11 @@
"resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz", "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz",
"integrity": "sha1-fYa9VmefWM5qhHBKZX3TkruoGnk=" "integrity": "sha1-fYa9VmefWM5qhHBKZX3TkruoGnk="
}, },
"keycode": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz",
"integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ="
},
"kind-of": { "kind-of": {
"version": "3.2.2", "version": "3.2.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -6998,6 +7037,25 @@
"react-is": "^16.8.1" "react-is": "^16.8.1"
} }
}, },
"prop-types-extra": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.0.tgz",
"integrity": "sha512-QFyuDxvMipmIVKD2TwxLVPzMnO4e5oOf1vr3tJIomL8E7d0lr6phTHd5nkPhFIzTD1idBLLEPeylL9g+rrTzRg==",
"requires": {
"react-is": "^16.3.2",
"warning": "^3.0.0"
},
"dependencies": {
"warning": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
"integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
"requires": {
"loose-envify": "^1.0.0"
}
}
}
},
"proxy-addr": { "proxy-addr": {
"version": "2.0.5", "version": "2.0.5",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
@@ -7134,6 +7192,43 @@
"prop-types": "^15.6.2" "prop-types": "^15.6.2"
} }
}, },
"react-bootstrap": {
"version": "1.0.0-beta.14",
"resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.0.0-beta.14.tgz",
"integrity": "sha512-UGK5f78FE8wAei1YL/oSwFlJZLqxJ/h4S8DCwHyY8hQjFCrjEW5PoEBTOOhQ6PQL6WOsZe1jkiOJG7L5TZWu+w==",
"requires": {
"@babel/runtime": "^7.4.2",
"@restart/context": "^2.1.4",
"@restart/hooks": "^0.3.11",
"@types/react": "^16.8.23",
"classnames": "^2.2.6",
"dom-helpers": "^3.4.0",
"invariant": "^2.2.4",
"keycode": "^2.2.0",
"popper.js": "^1.14.7",
"prop-types": "^15.7.2",
"prop-types-extra": "^1.1.0",
"react-overlays": "^1.2.0",
"react-transition-group": "^4.0.0",
"uncontrollable": "^7.0.0",
"warning": "^4.0.3"
},
"dependencies": {
"dom-helpers": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
"integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
"requires": {
"@babel/runtime": "^7.1.2"
}
}
}
},
"react-context-toolbox": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/react-context-toolbox/-/react-context-toolbox-2.0.2.tgz",
"integrity": "sha512-tY4j0imkYC3n5ZlYSgFkaw7fmlCp3IoQQ6DxpqeNHzcD0hf+6V+/HeJxviLUZ1Rv1Yn3N3xyO2EhkkZwHn0m1A=="
},
"react-dev-utils": { "react-dev-utils": {
"version": "0.5.2", "version": "0.5.2",
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-0.5.2.tgz", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-0.5.2.tgz",
@@ -7162,11 +7257,82 @@
"scheduler": "^0.15.0" "scheduler": "^0.15.0"
} }
}, },
"react-dropdown": {
"version": "1.6.4",
"resolved": "https://registry.npmjs.org/react-dropdown/-/react-dropdown-1.6.4.tgz",
"integrity": "sha512-zTlNRZ6vzjEPsodBNgh6Xjp9IempEx9sReH3crT2Jw4S6KW2wS/BRIH3d/grYf/iXARadDRD91//uUCs9yjoLg==",
"requires": {
"classnames": "^2.2.3"
}
},
"react-is": { "react-is": {
"version": "16.9.0", "version": "16.9.0",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz",
"integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==" "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw=="
}, },
"react-lifecycles-compat": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
"react-modal": {
"version": "3.11.1",
"resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.11.1.tgz",
"integrity": "sha512-8uN744Yq0X2lbfSLxsEEc2UV3RjSRb4yDVxRQ1aGzPo86QjNOwhQSukDb8U8kR+636TRTvfMren10fgOjAy9eA==",
"requires": {
"exenv": "^1.2.0",
"prop-types": "^15.5.10",
"react-lifecycles-compat": "^3.0.0",
"warning": "^4.0.3"
}
},
"react-overlays": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-1.2.0.tgz",
"integrity": "sha512-i/FCV8wR6aRaI+Kz/dpJhOdyx+ah2tN1RhT9InPrexyC4uzf3N4bNayFTGtUeQVacj57j1Mqh1CwV60/5153Iw==",
"requires": {
"classnames": "^2.2.6",
"dom-helpers": "^3.4.0",
"prop-types": "^15.6.2",
"prop-types-extra": "^1.1.0",
"react-context-toolbox": "^2.0.2",
"react-popper": "^1.3.2",
"uncontrollable": "^6.0.0",
"warning": "^4.0.2"
},
"dependencies": {
"dom-helpers": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
"integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
"requires": {
"@babel/runtime": "^7.1.2"
}
},
"uncontrollable": {
"version": "6.2.3",
"resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-6.2.3.tgz",
"integrity": "sha512-VgOAoBU2ptCL2bfTG2Mra0I8i1u6Aq84AFonD5tmCAYSfs3hWvr2Rlw0q2ntoxXTHjcQOmZOh3FKaN+UZVyREQ==",
"requires": {
"@babel/runtime": "^7.4.5",
"invariant": "^2.2.4"
}
}
}
},
"react-popper": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.4.tgz",
"integrity": "sha512-9AcQB29V+WrBKk6X7p0eojd1f25/oJajVdMZkywIoAV6Ag7hzE1Mhyeup2Q1QnvFRtGQFQvtqfhlEoDAPfKAVA==",
"requires": {
"@babel/runtime": "^7.1.2",
"create-react-context": "^0.3.0",
"popper.js": "^1.14.4",
"prop-types": "^15.6.1",
"typed-styles": "^0.0.7",
"warning": "^4.0.2"
}
},
"react-redux": { "react-redux": {
"version": "7.1.1", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.1.1.tgz", "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.1.1.tgz",
@@ -8155,6 +8321,15 @@
} }
} }
}, },
"react-simple-dropdown": {
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/react-simple-dropdown/-/react-simple-dropdown-3.2.3.tgz",
"integrity": "sha512-NmyyvA0D4wph5ctzkn8U4wmblOacavJMl9gTOhQR3v8I997mc1FL1NFKkj3Mx+HNysBKRD/HI+kpxXCAgXumPw==",
"requires": {
"classnames": "^2.1.2",
"prop-types": "^15.5.8"
}
},
"react-transition-group": { "react-transition-group": {
"version": "4.3.0", "version": "4.3.0",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz", "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz",
@@ -9720,6 +9895,11 @@
"mime-types": "~2.1.24" "mime-types": "~2.1.24"
} }
}, },
"typed-styles": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz",
"integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q=="
},
"typedarray": { "typedarray": {
"version": "0.0.6", "version": "0.0.6",
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -9761,6 +9941,16 @@
"resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz", "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
"integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=" "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
}, },
"uncontrollable": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.0.2.tgz",
"integrity": "sha512-7fa8OBQ5+X4VAcp0os6BD74bCeUPQSHmr4Rqy75Me98NnlD5kNShCqqx4xWo4OmlAMiT2/YSMklLFC4FCuoGYg==",
"requires": {
"@babel/runtime": "^7.4.5",
"invariant": "^2.2.4",
"react-lifecycles-compat": "^3.0.4"
}
},
"union-value": { "union-value": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -9991,6 +10181,14 @@
"makeerror": "1.0.x" "makeerror": "1.0.x"
} }
}, },
"warning": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
"integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
"requires": {
"loose-envify": "^1.0.0"
}
},
"watch": { "watch": {
"version": "0.10.0", "version": "0.10.0",
"resolved": "https://registry.npmjs.org/watch/-/watch-0.10.0.tgz", "resolved": "https://registry.npmjs.org/watch/-/watch-0.10.0.tgz",

View File

@@ -8,16 +8,21 @@
"@material-ui/styles": "^4.5.0", "@material-ui/styles": "^4.5.0",
"@material-ui/system": "^4.5.0", "@material-ui/system": "^4.5.0",
"axios": "^0.19.0", "axios": "^0.19.0",
"bootstrap": "^4.3.1",
"clsx": "^1.0.4", "clsx": "^1.0.4",
"create-react-app": "^3.1.2", "create-react-app": "^3.1.2",
"install": "^0.13.0", "install": "^0.13.0",
"jwt-decode": "^2.2.0", "jwt-decode": "^2.2.0",
"node-pre-gyp": "^0.13.0", "node-pre-gyp": "^0.13.0",
"react": "^16.9.0", "react": "^16.9.0",
"react-bootstrap": "^1.0.0-beta.14",
"react-dom": "^16.9.0", "react-dom": "^16.9.0",
"react-dropdown": "^1.6.4",
"react-modal": "^3.11.1",
"react-redux": "^7.1.1", "react-redux": "^7.1.1",
"react-router-dom": "^5.1.0", "react-router-dom": "^5.1.0",
"react-scripts": "0.9.5", "react-scripts": "0.9.5",
"react-simple-dropdown": "^3.2.3",
"redux": "^4.0.4", "redux": "^4.0.4",
"redux-thunk": "^2.3.0", "redux-thunk": "^2.3.0",
"typeface-roboto": "0.0.75" "typeface-roboto": "0.0.75"

View File

@@ -15,4 +15,14 @@ const reducers = combineReducers({
UI: uiReducer UI: uiReducer
}); });
//const store = createStore(reducers, ) const store = createStore(
reducers,
initialState,
compose(
applyMiddleware(...middleware),
window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()
)
)
export default store;

View File

@@ -12,6 +12,12 @@ body {
height: 200px; height: 200px;
} }
.userhome{
display:flex;
flex-direction:row;
}
.authButtons { .authButtons {
border-radius: 100px; border-radius: 100px;
box-shadow: none; box-shadow: none;

View File

@@ -6,6 +6,8 @@ import axios from "axios";
import { BrowserRouter as Router, Route, Switch } from "react-router-dom"; import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
import Navbar from "./components/layout/NavBar"; import Navbar from "./components/layout/NavBar";
import jwtDecode from "jwt-decode"; import jwtDecode from "jwt-decode";
import 'bootstrap/dist/css/bootstrap.min.css';
import { Button } from 'react-bootstrap';
// Redux // Redux
import { Provider } from "react-redux"; import { Provider } from "react-redux";
@@ -32,6 +34,8 @@ import writeMicroblog from './Writing_Microblogs.js';
import editProfile from './pages/editProfile'; import editProfile from './pages/editProfile';
import userLine from './Userline.js'; import userLine from './Userline.js';
import feed from './Feed.js';
const theme = createMuiTheme(themeObject); const theme = createMuiTheme(themeObject);
const token = localStorage.FBIdToken; const token = localStorage.FBIdToken;
@@ -70,11 +74,14 @@ class App extends Component {
<AuthRoute exact path="/login" component={login} /> <AuthRoute exact path="/login" component={login} />
<Route exact path="/logout" component={logout} /> <Route exact path="/logout" component={logout} />
<Route exact path="/delete" component={Delete} /> <Route exact path="/delete" component={Delete} />
<Route exact path="/user" component={user} /> <Route exact path="/user" component={user} />
<Route exact path="/home" component={writeMicroblog} /> <div className="userhome">
<Route exact path="/home" component={writeMicroblog} />
<Route exact path="/home" component={feed} />
</div>
<Route exact path="/edit" component={editProfile} /> <Route exact path="/edit" component={editProfile} />
{/* <Route exact path="/user" component={userLine} /> */} <Route exact path="/userline" component={userLine} />
<AuthRoute exact path="/" component={home}/> <AuthRoute exact path="/" component={home}/>
</Switch> </Switch>

View File

@@ -0,0 +1,97 @@
import React, { Component } from "react";
import axios from 'axios';
import Box from '@material-ui/core/Box';
//import {connect } from 'react-redux';
//import { likePost, unlikePost } from '../redux/actions/dataActions';
//import PropTypes from 'prop-types';
import Like from "./Like.js";
import Route from 'react-router-dom/Route';
import Quote from "./Quote.js";
class Feed extends Component {
constructor(props) {
super(props);
this.state = {
microBlogs: [],
};
}
componentDidMount() {
axios.get("/getallPostsforFeed")
.then((res) => {
const post = res.data;
this.setState({microBlogs : post})
})
}
render() {
const sortedPosts = (this.state.microBlogs).sort((a,b) =>
-a.createdAt.localeCompare(b.createdAt)
)
return(
<div>
<div style={{fontsize: "13px", marginLeft: "30%", textAlign: "left", }}>
<p>Feed</p>
</div>
<Box width="25%" flex="1" height="auto" marginLeft= "30%" m={2} fontSize="13px" padding="5px" flexWrap= "wrap" flexDirection= "row" >
<div style={{flexWrap: "wrap", flex: "1", flexDirection: "row", wordBreak: "break-word", textAlign: "left"}}>
<p>
{sortedPosts.map((microBlog) => <p>Microblog Title: {microBlog.microBlogTitle}
<br></br>When post was created: {microBlog.createdAt.substring(0,10) +
" " + microBlog.createdAt.substring(11,19)}
<br></br>Who wrote the microBlog: {microBlog.userHandle}
<br></br>Body of post: {microBlog.body}
<br></br>Tagged topics: {microBlog.microBlogTopics.join("," + " ")}
<br></br><br></br><br></br>
<div className="buttons">
<Like></Like>
<span>Likes: {microBlog.likeCount}</span>
<Quote></Quote>
<br></br><br></br><br></br><br></br>
</div>
</p>)}
</p>
</div>
</Box>
</div>
)
}
}
/* Feed.propTypes = {
likePost: PropTypes.func.isRequired,
unlikePost: PropTypes.func.isRequired,
user: PropTypes.object.isRequired,
post: PropTypes.object.isRequired
}
const mapStateToProps = state => ({
user: state.user
})
const mapActionsToProps = {
likePost,
unlikePost
}
export default connect(mapStateToProps, mapActionsToProps)(Feed); */
export default Feed;

View File

@@ -0,0 +1,54 @@
import React, { Component } from "react";
import { BrowserRouter as Router } from 'react-router-dom';
import Route from 'react-router-dom/Route';
import axios from 'axios';
class Like extends Component {
constructor(props) {
super(props);
this.state = {
like : false,
};
this.handleSubmit = this.handleSubmit.bind(this);
}
handleSubmit(){
this.setState({
like: !this.state.like
});
const postId = "AJdhYAE4diocF8UcrHDq"
if(this.state.like == false)
{
axios.get(`/putPost/${postId}/like`)
.then((res) => {
console.log(res.data);
})
}
else
{
axios.get(`/putPost/${postId}/unlike`)
.then((res) => {
console.log(res.data);
})
}
}
render() {
const label = this.state.like ? 'Unlike' : 'Like'
return (
<button onClick = {{backgroundColor: "lightBlue" }} onClick={this.handleSubmit}>{label}</button>
)
}
}
export default Like;

View File

@@ -0,0 +1,78 @@
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 Modal from "react-modal";
class Quote extends Component {
constructor(props) {
super(props);
this.state = {
post: null
};
this.handleSubmit = this.handleSubmit.bind(this);
this.handleSubmit2 = this.handleSubmit2.bind(this);
}
handleSubmit2() {
const postId = "AJdhYAE4diocF8UcrHDq";
const postNoComment = {
body : ""
}
const headers = {
headers: { 'Content-Type': 'application/json'}
}
axios.post(`/putPost/${postId}/quote`, postNoComment, headers)
.then((res) =>{
alert('Quoting was successful!')
console.log(res.data);
})
.catch((err) => {
alert('An error occured.');
console.error(err);
})
event.preventDefault();
}
handleSubmit() {
const postId = "AJdhYAE4diocF8UcrHDq";
const postComment = {
body : ""
}
const headers = {
headers: { 'Content-Type': 'application/json'}
}
axios
.post(`/putPost/${postId}/quote`, postComment, headers)
.then((res) =>{
alert('Quoting was successful!')
console.log(res.data);
})
.catch((err) => {
alert('An error occured.');
console.error(err);
})
event.preventDefault();
}
render() {
return(
<div>
<button onClick={this.handleSubmit}>Quote with comment</button>
<button onClick={this.handleSubmit2}>Quote without comment</button>
</div>
)
}
}
export default Quote

View File

@@ -4,6 +4,7 @@ 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 {
constructor(props) { constructor(props) {
@@ -70,8 +71,11 @@ class Writing_Microblogs extends Component {
} }
render() { render() {
return ( return (
<div> <div>
<div style={{ width: "200px", height: "50px", marginTop: "180px", marginLeft: "50px" }}> <div style={{ width: "200px", height: "50px", marginTop: "180px", marginLeft: "50px" }}>
<form> <form>
<textarea placeholder="Enter Microblog Title" value={this.state.title} required onChange={this.handleChange} cols={30} rows={1} /> <textarea placeholder="Enter Microblog Title" value={this.state.title} required onChange={this.handleChange} cols={30} rows={1} />
@@ -96,6 +100,7 @@ class Writing_Microblogs extends Component {
</div> </div>
</form> </form>
</div> </div>
</div> </div>
); );