ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-16 10:18:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into profile_display

Browse Source
This commit is contained in:
Leon Liang 2019-10-02 23:24:21 -04:00
commit 5168de65c1
15 changed files with 509 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
functions/handlers/post.js
View File

@ -1,8 +1,7 @@
const admin = require('firebase-admin');
/* eslint-disable promise/always-return */ /* eslint-disable promise/always-return */
const admin = require('firebase-admin');
exports.putPost = (req, res) => { exports.putPost = (req, res) => {
const newPost = { const newPost = {
body: req.body.body, body: req.body.body,
userHandle: req.body.userHandle, userHandle: req.body.userHandle,
@ -11,6 +10,7 @@ exports.putPost = (req, res) => {
createdAt: new Date().toISOString(), createdAt: new Date().toISOString(),
likeCount: 0, likeCount: 0,
commentCount: 0, commentCount: 0,
microBlogTopics: req.body.microBlogTopics
}; };
@ -28,7 +28,7 @@ exports.putPost = (req, res) => {
exports.getallPostsforUser = (req, res) => { exports.getallPostsforUser = (req, res) => {
admin.firestore().collection('posts').where('userHandle', '==', 'user' ).get() admin.firestore().collection('posts').where('userHandle', '==', 'new user' ).get()
.then((data) => { .then((data) => {
let posts = []; let posts = [];
data.forEach(function(doc) { data.forEach(function(doc) {
@ -41,5 +41,3 @@ exports.getallPostsforUser = (req, res) => {
return res.status(500).json({error: 'Failed to fetch all posts written by specific user.'}) return res.status(500).json({error: 'Failed to fetch all posts written by specific user.'})
}) })
} }

370
functions/handlers/users.js
View File

@ -1,210 +1,216 @@
/* eslint-disable promise/catch-or-return */ /* eslint-disable promise/catch-or-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'); const firebase = require("firebase");
const firebase = require('firebase');
firebase.initializeApp(config); firebase.initializeApp(config);
exports.signup = (req, res) => { exports.signup = (req, res) => {
const newUser = { const newUser = {
email: req.body.email,
handle: req.body.handle,
password: req.body.password,
confirmPassword: req.body.confirmPassword,
createdAt: new Date().toISOString()
};
let errors = {};
const emailRegEx = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
// Email check
if (newUser.email.trim() === "") {
errors.email = "Email must not be blank.";
} else if (!newUser.email.match(emailRegEx)) {
errors.email = "Email is invalid.";
}
// handle check
if (newUser.handle.trim() === "") {
errors.handle = "Username must not be blank.";
} else if (newUser.handle.length < 4 || newUser.handle.length > 30) {
errors.handle = "Username must be between 4-30 characters long.";
}
// Password check
if (newUser.password.trim() === "") {
errors.password = "Password must not be blank.";
} else if (newUser.password.length < 8 || newUser.password.length > 20) {
errors.password = "Password must be between 8-20 characters long.";
}
// Confirm password check
if (newUser.confirmPassword !== newUser.password) {
errors.confirmPassword = "Passwords must match.";
}
// Overall check
if (Object.keys(errors).length > 0) {
return res.status(400).json(errors);
}
let idToken, userId;
db.doc(`/users/${newUser.handle}`)
.get()
.then((doc) => {
if (doc.exists) {
return res
.status(400)
.json({ handle: "This username is already taken." });
}
return firebase
.auth()
.createUserWithEmailAndPassword(newUser.email, newUser.password);
})
.then((data) => {
userId = data.user.uid;
return data.user.getIdToken();
})
.then((token) => {
idToken = token;
const userCred = {
email: req.body.email, email: req.body.email,
handle: req.body.handle, handle: newUser.handle,
password: req.body.password, createdAt: newUser.createdAt,
confirmPassword: req.body.confirmPassword, userId
createdAt: new Date().toISOString() };
}; return db.doc(`/users/${newUser.handle}`).set(userCred);
// console.log(newUser);
let errors = {};
const emailRegEx = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
//Email check
if(newUser.email.trim() === '') {
errors.email = 'Email must not be blank.';
}
else if(!newUser.email.match(emailRegEx)) {
errors.email = 'Email is invalid.';
}
//handle check
if(newUser.handle.trim() === '') {
errors.handle = 'Username must not be blank.';
}
else if(newUser.handle.length < 4 || newUser.handle.length > 30) {
errors.handle = 'Username must be between 4-30 characters long.';
}
//Password check
if(newUser.password.trim() === '') {
errors.password = 'Password must not be blank.';
}
else if(newUser.password.length < 8 || newUser.password.length > 20) {
errors.password = 'Password must be between 8-20 characters long.';
}
//Confirm password check
if(newUser.confirmPassword !== newUser.password) {
errors.confirmPassword = 'Passwords must match.';
}
//Overall check
if(Object.keys(errors).length > 0) {
return res.status(400).json(errors);
}
let idToken, userId;
db.doc(`/users/${newUser.handle}`).get()
.then(doc => {
if(doc.exists) {
return res.status(400).json({ handle: 'This username is already taken.' });
}
return firebase.auth().createUserWithEmailAndPassword(newUser.email, newUser.password);
})
.then(data => {
userId = data.user.uid;
return data.user.getIdToken();
})
.then(token => {
idToken = token;
const userCred = {
email: req.body.email,
handle: newUser.handle,
createdAt: newUser.createdAt,
userId
}
return db.doc(`/users/${newUser.handle}`).set(userCred);
}) })
.then(() => { .then(() => {
return res.status(201).json({ idToken }); return res.status(201).json({ idToken });
}) })
.catch(err => { .catch((err) => {
console.error(err); console.error(err);
if(err.code === 'auth/email-already-in-use') { if (err.code === "auth/email-already-in-use") {
return res.status(500).json({ email: 'This email is already taken.' }); return res.status(500).json({ email: "This email is already taken." });
} }
return res.status(500).json({ error: err.code }); return res.status(500).json({ error: err.code });
}); });
}; };
exports.login = (req, res) => { exports.login = (req, res) => {
const user = { const user = {
email: req.body.email, email: req.body.email,
password: req.body.password password: req.body.password
} };
//Auth validation // Auth validation
let errors = {}; let errors = {};
//Email check // Email check
if(user.email.trim() === '') { if (user.email.trim() === "") {
errors.email = 'Email must not be blank.'; errors.email = "Email must not be blank.";
} }
//Password check // Password check
if(user.password.trim() === '') { if (user.password.trim() === "") {
errors.password = 'Password must not be blank.'; errors.password = "Password must not be blank.";
} }
//Overall check // Checking if any errors have been raised
if(Object.keys(errors).length > 0) { if (Object.keys(errors).length > 0) {
return res.status(400).json(errors); return res.status(400).json(errors);
} }
firebase.auth().signInWithEmailAndPassword(user.email, user.password) firebase
.then(data => { .auth()
return data.user.getIdToken(); .signInWithEmailAndPassword(user.email, user.password)
}) .then((data) => {
.then(token => { return data.user.getIdToken();
return res.json({token}); })
}) .then((token) => {
.catch(err => { return res.json({ token });
console.error(err); })
if(err.code === 'auth/wrong-password') { .catch((err) => {
return res.status(403).json({ general: 'Invalid credentials. Please try again.' }); console.error(err);
} if (err.code === "auth/wrong-password") {
return res.status(500).json({ error: err.code }); return res
}); .status(403)
}; .json({ general: "Invalid credentials. Please try again." });
}
exports.getProfileInfo = (req, res) => { return res.status(500).json({ error: err.code });
// FIXME: Delete this after login is implemented });
req.user = {};
req.user.handle = 'itsjimmy';
db.collection('users').doc(req.user.handle).get()
.then((data) => {
return res.status(200).json(data.data());
})
.catch((err) => {
console.error(err);
return res.status(500).json(err);
});
}; };
// Returns all data in the database for the user who is currently signed in
exports.getProfileInfo = (req, res) => {
db.collection("users")
.doc(req.user.handle)
.get()
.then((data) => {
return res.status(200).json(data.data());
})
.catch((err) => {
console.error(err);
return res.status(500).json(err);
});
};
// Updates the data in the database of the user who is currently logged in
exports.updateProfileInfo = (req, res) => { exports.updateProfileInfo = (req, res) => {
// FIXME: Delete this after login is implemented // TODO: Add functionality for adding/updating profile images
req.user = {};
req.user.handle = 'itsjimmy';
// TODO: Add functionality for adding/updating profile images // Data validation
const { valid, errors, profileData } = validateUpdateProfileInfo(req.body);
if (!valid) return res.status(400).json(errors);
// Update the database entry for this user
// Data validation db.collection("users")
const {valid, errors, profileData} = validateUpdateProfileInfo(req.body); .doc(req.user.handle)
if (!valid) return res.status(400).json(errors); .set(profileData, { merge: true })
.then(() => {
console.log(`${req.user.handle}'s profile info has been updated.`);
// Update the database entry for this user return res
db.collection('users').doc(req.user.handle).set(profileData, {merge: true}) .status(201)
.then(() => { .json({
console.log(`${req.user.handle}'s profile info has been updated.`) general: `${req.user.handle}'s profile info has been updated.`
return res.status(201).json({general: `${req.user.handle}'s profile info has been updated.`}); });
}) })
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);
return res.status(500).json({ return res.status(500).json({
error: 'Error updating profile data' error: "Error updating profile data"
}); });
}) });
}; };
exports.getUserDetails = (req, res) => { exports.getUserDetails = (req, res) => {
let userData = {}; let userData = {};
db.doc(`/users/${req.params.handle}`).get().then((doc) => { db.doc(`/users/${req.params.handle}`)
if (doc.exists) { .get()
userData.user = doc.data(); .then((doc) => {
return db.collection('post').where('userHandle', '==', req.params.handle) if (doc.exists) {
.orderBy('createdAt', 'desc').get(); userData.user = doc.data();
} else { return db
return res.status(404).json({ .collection("post")
error: 'User not found' .where("userHandle", "==", req.params.handle)
}); .orderBy("createdAt", "desc")
} .get();
}) } else {
.then((data) => { return res.status(404).json({
userData.posts = []; error: "User not found"
data.forEach((doc) => {
userData.posts.push({
body: doc.data().body,
createAt: doc.data().createAt,
userHandle: doc.data().userHandle,
userImage: doc.data().userImage,
likeCount: doc.data().likeCount,
commentCount: doc.data().commentCount,
postId: doc.id
});
});
return res.json(userData);
})
.catch((err) => {
console.error(err);
return res.status(500).json({ error: err.code});
}); });
}
})
.then((data) => {
userData.posts = [];
data.forEach((doc) => {
userData.posts.push({
body: doc.data().body,
createAt: doc.data().createAt,
userHandle: doc.data().userHandle,
userImage: doc.data().userImage,
likeCount: doc.data().likeCount,
commentCount: doc.data().commentCount,
postId: doc.id
});
});
return res.json(userData);
})
.catch((err) => {
console.error(err);
return res.status(500).json({ error: err.code });
});
}; };

56
functions/index.js
View File

@ -1,49 +1,47 @@
/* eslint-disable promise/always-return */ /* eslint-disable promise/always-return */
const functions = require('firebase-functions'); const app = require("express")();
const app = require('express')(); const cors = require("cors");
const cors = require('cors'); const { db } = require("./util/admin");
const fbAuth = require("./util/fbAuth");
const functions = require("firebase-functions");
app.use(cors()); app.use(cors());
const fbAuth = require('./util/fbAuth');
const {db} = require('./util/admin');
// const firebase = require('firebase');
// firebase.initializeApp(config);
/*------------------------------------------------------------------* /*------------------------------------------------------------------*
* handlers/users.js * * handlers/users.js *
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
const {getUserDetails, getProfileInfo, updateProfileInfo, signup, login} = require('./handlers/users'); const {
getUserDetails,
getProfileInfo,
login,
signup,
updateProfileInfo
} = require("./handlers/users");
app.post('/signup', signup); // Adds a user to the database and registers them in firebase with
// an email and password pair
// Returns a token for the new user
app.post("/signup", signup);
app.post('/login', login); // Returns a token for the user that matches the provided username
// and password
app.post("/login", login);
app.get('/getUser/:handle', getUserDetails); app.get("/getUser/:handle", getUserDetails);
// Returns all profile data of the currently logged in user // Returns all profile data of the currently logged in user
// TODO: Add fbAuth app.get("/getProfileInfo", fbAuth, getProfileInfo);
app.get('/getProfileInfo', getProfileInfo);
// Updates the currently logged in user's profile information // Updates the currently logged in user's profile information
// TODO: Add fbAuth app.post("/updateProfileInfo", fbAuth, updateProfileInfo);
app.post('/updateProfileInfo', updateProfileInfo);
/*------------------------------------------------------------------* /*------------------------------------------------------------------*
* handlers/post.js * * handlers/post.js *
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
const {putPost, getallPostsforUser} = require('./handlers/post'); const { getallPostsforUser, putPost } = require("./handlers/post");
app.get('/getallPostsforUser', getallPostsforUser); app.get("/getallPostsforUser", getallPostsforUser);
// Adds one post to the database // Adds one post to the database
app.post('/putPost', fbAuth, putPost); app.post("/putPost", fbAuth, putPost);
exports.api = functions.https.onRequest(app); exports.api = functions.https.onRequest(app);

1
functions/util/admin.js
View File

@ -1,5 +1,4 @@
const admin = require('firebase-admin'); const admin = require('firebase-admin');
admin.initializeApp(); admin.initializeApp();
const db = admin.firestore(); const db = admin.firestore();

54
functions/util/validator.js
View File

@ -1,36 +1,36 @@
const isEmpty = (str) => { const isEmail = (str) => {
if (str.trim() === '') return true; const emailRegEx = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
else return false; if (str.match(emailRegEx)) return true;
else return false;
}; };
const isEmail = (str) => { const isEmpty = (str) => {
const emailRegEx = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; if (str.trim() === "") return true;
if (str.match(emailRegEx)) return true; else return false;
else return false; };
}
exports.validateUpdateProfileInfo = (data) => { exports.validateUpdateProfileInfo = (data) => {
let errors = {}; let errors = {};
let profileData = {}; let profileData = {};
// ?: Should users be able to change their handles and emails? // ?: Should users be able to change their handles and emails?
// Only adds the key to the DB if the values are not empty // Only adds the key to the database if the values are not empty
if (!isEmpty(data.firstName)) profileData.firstName = data.firstName.trim(); if (!isEmpty(data.firstName)) profileData.firstName = data.firstName.trim();
if (!isEmpty(data.lastName)) profileData.lastName = data.lastName.trim(); if (!isEmpty(data.lastName)) profileData.lastName = data.lastName.trim();
if (!isEmpty(data.bio)) profileData.bio = data.bio.trim(); if (!isEmpty(data.bio)) profileData.bio = data.bio.trim();
if (isEmpty(data.email)) { if (isEmpty(data.email)) {
errors.email = "Must not be empty."; errors.email = "Must not be empty.";
} else if (!isEmail(data.email)) { } else if (!isEmail(data.email)) {
errors.email = "Must be a valid email." errors.email = "Must be a valid email.";
} else { } else {
profileData.email = data.email; profileData.email = data.email;
} }
return { return {
errors, errors,
valid: Object.keys(errors).length === 0 ? true : false, valid: Object.keys(errors).length === 0 ? true : false,
profileData profileData
} };
}; };

96
twistter-frontend/package-lock.json generated
View File

@ -62,9 +62,9 @@
} }
}, },
"@material-ui/styles": { "@material-ui/styles": {
"version": "4.4.3", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.4.3.tgz", "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.5.0.tgz",
"integrity": "sha512-kNUdHFWsrvWKIEPx8Xy2/qayqsGMrYmCMq+FIiJiYczVZl5hiS8j5+KayonnpVta/O+Dktk+cxWkVcgwtxMrHg==", "integrity": "sha512-O0NSAECHK9f3DZK6wy56PZzp8b/7KSdfpJs8DSC7vnXUAoMPCTtchBKLzMtUsNlijiJFeJjSxNdQfjWXgyur5A==",
"requires": { "requires": {
"@babel/runtime": "^7.4.4", "@babel/runtime": "^7.4.4",
"@emotion/hash": "^0.7.1", "@emotion/hash": "^0.7.1",
@ -74,21 +74,21 @@
"csstype": "^2.5.2", "csstype": "^2.5.2",
"deepmerge": "^4.0.0", "deepmerge": "^4.0.0",
"hoist-non-react-statics": "^3.2.1", "hoist-non-react-statics": "^3.2.1",
"jss": "10.0.0-alpha.25", "jss": "^10.0.0",
"jss-plugin-camel-case": "10.0.0-alpha.25", "jss-plugin-camel-case": "^10.0.0",
"jss-plugin-default-unit": "10.0.0-alpha.25", "jss-plugin-default-unit": "^10.0.0",
"jss-plugin-global": "10.0.0-alpha.25", "jss-plugin-global": "^10.0.0",
"jss-plugin-nested": "10.0.0-alpha.25", "jss-plugin-nested": "^10.0.0",
"jss-plugin-props-sort": "10.0.0-alpha.25", "jss-plugin-props-sort": "^10.0.0",
"jss-plugin-rule-value-function": "10.0.0-alpha.25", "jss-plugin-rule-value-function": "^10.0.0",
"jss-plugin-vendor-prefixer": "10.0.0-alpha.25", "jss-plugin-vendor-prefixer": "^10.0.0",
"prop-types": "^15.7.2" "prop-types": "^15.7.2"
} }
}, },
"@material-ui/system": { "@material-ui/system": {
"version": "4.4.3", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.4.3.tgz", "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.5.0.tgz",
"integrity": "sha512-Cb05vLXsaCzssXD/iZKa0/qC6YOwbFWnYdnOEdkXZ3Fn2Ytz7rsnMgFejUSQV1luVhUBlEIm8DVz40N25WwW7w==", "integrity": "sha512-vR0PbMTzLnuuVCoYNQ13zyhLa/4s/UA9P9JbNuHBOOkfrHn53ShINiG0v05EgfwizfULLtc7mNvsGAgIyyp/hQ==",
"requires": { "requires": {
"@babel/runtime": "^7.4.4", "@babel/runtime": "^7.4.4",
"deepmerge": "^4.0.0", "deepmerge": "^4.0.0",
@ -119,9 +119,9 @@
"integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
}, },
"@types/react": { "@types/react": {
"version": "16.9.3", "version": "16.9.4",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.3.tgz", "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.4.tgz",
"integrity": "sha512-Ogb2nSn+2qQv5opoCv7Ls5yFxtyrdUYxp5G+SWTrlGk7dmFKw331GiezCgEZj9U7QeXJi1CDtws9pdXU1zUL4g==", "integrity": "sha512-ItGNmJvQ0IvWt8rbk5PLdpdQhvBVxAaXI9hDlx7UMd8Ie1iMIuwMNiKeTfmVN517CdplpyXvA22X4zm4jGGZnw==",
"requires": { "requires": {
"@types/prop-types": "*", "@types/prop-types": "*",
"csstype": "^2.2.0" "csstype": "^2.2.0"
@ -5196,9 +5196,9 @@
} }
}, },
"jss": { "jss": {
"version": "10.0.0-alpha.25", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.25.tgz", "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0.tgz",
"integrity": "sha512-zqKnXv181B9vue2yYhmVhc+6ggbbxHF/33rjXfXEjaa22nOvknTI21QDfq3oZ8uCC50kcFp3Z8KU1ghUXdFvIA==", "integrity": "sha512-TPpDFsiBjuERiL+dFDq8QCdiF9oDasPcNqCKLGCo/qED3fNYOQ8PX2lZhknyTiAt3tZrfOFbb0lbQ9lTjPZxsQ==",
"requires": { "requires": {
"@babel/runtime": "^7.3.1", "@babel/runtime": "^7.3.1",
"csstype": "^2.6.5", "csstype": "^2.6.5",
@ -5207,69 +5207,69 @@
} }
}, },
"jss-plugin-camel-case": { "jss-plugin-camel-case": {
"version": "10.0.0-alpha.25", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0-alpha.25.tgz", "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0.tgz",
"integrity": "sha512-J5ZEGDTy9ddqdTUPAF4SJQ25u5kiG1ORP8F+ZPEZAkkiMQJp+/Aol4I7xhTS2aW1Lhg8xNxdhdRfBi5yU7wOvg==", "integrity": "sha512-yALDL00+pPR4FJh+k07A8FeDvfoPPuXU48HLy63enAubcVd3DnS+2rgqPXglHDGixIDVkCSXecl/l5GAMjzIbA==",
"requires": { "requires": {
"@babel/runtime": "^7.3.1", "@babel/runtime": "^7.3.1",
"hyphenate-style-name": "^1.0.3", "hyphenate-style-name": "^1.0.3",
"jss": "10.0.0-alpha.25" "jss": "10.0.0"
} }
}, },
"jss-plugin-default-unit": { "jss-plugin-default-unit": {
"version": "10.0.0-alpha.25", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0-alpha.25.tgz", "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0.tgz",
"integrity": "sha512-auOG459B+yEqkojgaXH02SYO9+xjmAxlmP+WbzhVpXqOFJ2CN/kaxd8P4NJZLdj3BQxHiM7WIyMVh786StE+EA==", "integrity": "sha512-sURozIOdCtGg9ap18erQ+ijndAfEGtTaetxfU3H4qwC18Bi+fdvjlY/ahKbuu0ASs7R/+WKCP7UaRZOjUDMcdQ==",
"requires": { "requires": {
"@babel/runtime": "^7.3.1", "@babel/runtime": "^7.3.1",
"jss": "10.0.0-alpha.25" "jss": "10.0.0"
} }
}, },
"jss-plugin-global": { "jss-plugin-global": {
"version": "10.0.0-alpha.25", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.0.0-alpha.25.tgz", "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.0.0.tgz",
"integrity": "sha512-cS98Q8X8jwltuaBZd9eYuxMXxkUL+mJGl2Ok3/nmJzH9nLzj6i7kLxSoDtuJNqsRmbP7ogIXVozJUq9lUu2hlQ==", "integrity": "sha512-80ofWKSQUo62bxLtRoTNe0kFPtHgUbAJeOeR36WEGgWIBEsXLyXOnD5KNnjPqG4heuEkz9eSLccjYST50JnI7Q==",
"requires": { "requires": {
"@babel/runtime": "^7.3.1", "@babel/runtime": "^7.3.1",
"jss": "10.0.0-alpha.25" "jss": "10.0.0"
} }
}, },
"jss-plugin-nested": { "jss-plugin-nested": {
"version": "10.0.0-alpha.25", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.0.0-alpha.25.tgz", "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.0.0.tgz",
"integrity": "sha512-7sk7/6mX1YTgXe+AyeD1zEyKTgIGbbhYtg+wWQcHJlE1flW2JHfcQ5mw84FgHcHQRQ8Dq3l9I3aEY51ev0J1Wg==", "integrity": "sha512-waxxwl/po1hN3azTyixKnr8ReEqUv5WK7WsO+5AWB0bFndML5Yqnt8ARZ90HEg8/P6WlqE/AB2413TkCRZE8bA==",
"requires": { "requires": {
"@babel/runtime": "^7.3.1", "@babel/runtime": "^7.3.1",
"jss": "10.0.0-alpha.25", "jss": "10.0.0",
"tiny-warning": "^1.0.2" "tiny-warning": "^1.0.2"
} }
}, },
"jss-plugin-props-sort": { "jss-plugin-props-sort": {
"version": "10.0.0-alpha.25", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0-alpha.25.tgz", "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0.tgz",
"integrity": "sha512-8B/6QLQuUX8cIlZbXdjEm5l0jCX4EgacYMcFJhdKwDKEZYeAghpgQQrCKl0/CYHW7iFge5wim67P+uL6QxMzyw==", "integrity": "sha512-41mf22CImjwNdtOG3r+cdC8+RhwNm616sjHx5YlqTwtSJLyLFinbQC/a4PIFk8xqf1qpFH1kEAIw+yx9HaqZ3g==",
"requires": { "requires": {
"@babel/runtime": "^7.3.1", "@babel/runtime": "^7.3.1",
"jss": "10.0.0-alpha.25" "jss": "10.0.0"
} }
}, },
"jss-plugin-rule-value-function": { "jss-plugin-rule-value-function": {
"version": "10.0.0-alpha.25", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0-alpha.25.tgz", "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0.tgz",
"integrity": "sha512-CQQtWO+/OZRGaFRBSGQUgAci9YlVtdoXcWQKBNo70tmpp+kaXKlFNCYaL3jmHbJHMiwKQYG2RYFQNIrwJ9SGmA==", "integrity": "sha512-Jw+BZ8JIw1f12V0SERqGlBT1JEPWax3vuZpMym54NAXpPb7R1LYHiCTIlaJUyqvIfEy3kiHMtgI+r2whGgRIxQ==",
"requires": { "requires": {
"@babel/runtime": "^7.3.1", "@babel/runtime": "^7.3.1",
"jss": "10.0.0-alpha.25" "jss": "10.0.0"
} }
}, },
"jss-plugin-vendor-prefixer": { "jss-plugin-vendor-prefixer": {
"version": "10.0.0-alpha.25", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0-alpha.25.tgz", "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0.tgz",
"integrity": "sha512-5FXpB/TiwckbrkoDCmd27YsWCESl1K4hAX/oro2/geEXgnVQvDgQOf2eWCsjYO2K1lYPPXtskMfws/Q3eKmbYg==", "integrity": "sha512-qslqvL0MUbWuzXJWdUxpj6mdNUX8jr4FFTo3aZnAT65nmzWL7g8oTr9ZxmTXXgdp7ANhS1QWE7036/Q2isFBpw==",
"requires": { "requires": {
"@babel/runtime": "^7.3.1", "@babel/runtime": "^7.3.1",
"css-vendor": "^2.0.6", "css-vendor": "^2.0.6",
"jss": "10.0.0-alpha.25" "jss": "10.0.0"
} }
}, },
"jsx-ast-utils": { "jsx-ast-utils": {

4
twistter-frontend/package.json
View File

@ -4,6 +4,8 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@material-ui/core": "^4.4.3", "@material-ui/core": "^4.4.3",
"@material-ui/styles": "^4.5.0",
"@material-ui/system": "^4.5.0",
"axios": "^0.19.0", "axios": "^0.19.0",
"clsx": "^1.0.4", "clsx": "^1.0.4",
"create-react-app": "^3.1.2", "create-react-app": "^3.1.2",
@ -36,5 +38,5 @@
"last 1 safari version" "last 1 safari version"
] ]
}, },
"proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api" "proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api"
} }

5
twistter-frontend/src/App.css
View File

@ -1,7 +1,3 @@
/* body {
} */
.app { .app {
font-family: "Segoe UI"; font-family: "Segoe UI";
font-size: large; font-size: large;
@ -51,3 +47,4 @@
max-width: 1200px; max-width: 1200px;
color: #1da1f2; color: #1da1f2;
} }

2
twistter-frontend/src/App.js
View File

@ -12,7 +12,7 @@ import Navbar from './components/layout/NavBar';
import home from './pages/Home'; import home from './pages/Home';
import register from './pages/Register'; import register from './pages/Register';
import login from './pages/Login'; import login from './pages/Login';
import user from './pages/User'; import user from './pages/user';
import writeMicroblog from './Writing_Microblogs.js'; import writeMicroblog from './Writing_Microblogs.js';
import edit from './pages/edit.js'; import edit from './pages/edit.js';

45
twistter-frontend/src/Userline.js
View File

@ -2,6 +2,12 @@ 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 {borders} from '@material-ui/system';
import { sizing } from '@material-ui/system';
// var moment = require('moment');
class Userline extends Component { class Userline extends Component {
@ -9,7 +15,8 @@ class Userline extends Component {
{ {
super(props); super(props);
this.state = { this.state = {
microBlogs : [] microBlogs : [],
} }
} }
@ -22,16 +29,36 @@ class Userline extends Component {
this.setState({microBlogs : post}) this.setState({microBlogs : post})
}) })
}
}
render() { render() {
const sortedPosts = (this.state.microBlogs).sort((a,b) =>
-a.createdAt.localeCompare(b.createdAt)
)
return ( return (
<ul> <div>
{ this.state.microBlogs.map(microBlog => <p>{microBlog.body}</p>)} <div style={{fontsize: "13px", textAlign: "left", marginLeft: "14px"}}>
</ul> <p>Userline</p>
) </div>
} <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"}}>
<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>Number of comments: {microBlog.commentCount}
<br></br>Number of likes: {microBlog.likeCount}
<br></br>Body of post: {microBlog.body}
<br></br>Tagged topics: {microBlog.microBlogTopics.join("," + " ")}
</p>)}
</p>
</div>
</Box>
</div>
)
}
} }
export default Userline; export default Userline;

30
twistter-frontend/src/Writing_Microblogs.js
View File

@ -11,7 +11,8 @@ class Writing_Microblogs extends Component {
this.state = { this.state = {
value: '', value: '',
title: '', title: '',
characterCount: 10 topics: '',
characterCount: 250
}; };
@ -19,12 +20,18 @@ class Writing_Microblogs extends Component {
this.handleChange = this.handleChange.bind(this); this.handleChange = this.handleChange.bind(this);
this.handleSubmit = this.handleSubmit.bind(this); this.handleSubmit = this.handleSubmit.bind(this);
this.handleChangeforPost = this.handleChangeforPost.bind(this); this.handleChangeforPost = this.handleChangeforPost.bind(this);
this.handleChangeforTopics = this.handleChangeforTopics.bind(this);
} }
handleChange(event) { handleChange(event) {
this.setState( {title: event.target.value }); this.setState( {title: event.target.value });
} }
handleChangeforTopics(event) {
this.setState( {topics: event.target.value});
}
handleSubmit(event) { handleSubmit(event) {
// alert('A title for the microblog was inputted: ' + this.state.title + '\nA microblog was posted: ' + this.state.value); // alert('A title for the microblog was inputted: ' + this.state.title + '\nA microblog was posted: ' + this.state.value);
@ -33,15 +40,17 @@ class Writing_Microblogs extends Component {
{ body: this.state.value, { body: this.state.value,
userHandle: "new user", userHandle: "new user",
userImage: "bing-url", userImage: "bing-url",
microBlogTitle: this.state.title microBlogTitle: this.state.title,
microBlogTopics: this.state.topics.split(', ')
}, },
{ headers: { 'Content-Type': 'application/json'} } { headers: { 'Content-Type': 'application/json'} }
) )
console.log(response.data); console.log(response.data);
alert('Post was shared successfully!');
event.preventDefault(); event.preventDefault();
this.setState({value: '', title: '',characterCount: 10}) this.setState({value: '', title: '',characterCount: 250, topics: ''})
} }
handleChangeforPost(event) { handleChangeforPost(event) {
@ -50,24 +59,29 @@ class Writing_Microblogs extends Component {
handleChangeforCharacterCount(event) { handleChangeforCharacterCount(event) {
const charCount = event.target.value.length const charCount = event.target.value.length
const charRemaining = 10 - charCount const charRemaining = 250 - charCount
this.setState({characterCount: charRemaining }) this.setState({characterCount: charRemaining })
} }
render() { render() {
return ( return (
<div> <div>
<div style={{ width: "200px", height: "50px", marginTop: "180px", marginLeft: "30px" }}> <div style={{ width: "200px", height: "50px", marginTop: "180px", marginLeft: "50px" }}>
<form> <form>
<input type="text" placeholder="Enter Microblog Title" value={this.state.title} onChange={this.handleChange} /> <textarea placeholder="Enter Microblog Title" value={this.state.title} required onChange={this.handleChange} cols={30} rows={1} />
</form>
</div>
<div style={{ width: "200px", height: "50px", marginLeft: "50px"}} >
<form>
<textarea placeholder="Enter topics seperated by a comma" value={this.state.topics} required onChange={this.handleChangeforTopics} cols={40} rows={1} />
</form> </form>
</div> </div>
<div style={{ width: "200px", marginLeft: "50px"}}> <div style={{ width: "200px", marginLeft: "50px"}}>
<form onSubmit={this.handleSubmit}> <form onSubmit={this.handleSubmit}>
<textarea value={this.state.value} required maxLength="10" placeholder= "Write Microblog here..." <textarea value={this.state.value} required maxLength="250" placeholder= "Write Microblog here..."
onChange = { (e) => { this.handleChangeforPost(e); this.handleChangeforCharacterCount(e) } } cols={40} rows={20} /> onChange = { (e) => { this.handleChangeforPost(e); this.handleChangeforCharacterCount(e) } } cols={40} rows={20} />
<div style={{ fontSize: "14px", marginRight: "-100px"}} > <div style={{ fontSize: "14px", marginRight: "-100px"}} >
<p2>Characters Left: {this.state.characterCount}</p2> <p2>Characters Left: {this.state.characterCount}</p2>

35
twistter-frontend/src/pages/edit.js
View File

@ -1,41 +1,41 @@
import React, { Component } from "react"; import React, { Component } from "react";
import axios from "axios"; import axios from "axios";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
// TODO: Fix font, so that it is roboto
// TODO: Add a read-only '@' in the left side of the handle input // TODO: Add a read-only '@' in the left side of the handle input
// TODO: Add a cancel button, that takes the user back to their profile page // TODO: Add a cancel button, that takes the user back to their profile page
// TODO: Sort imports
// TODO: Add comments
// Material-UI stuff // Material-UI stuff
import Button from "@material-ui/core/Button";
import CircularProgress from "@material-ui/core/CircularProgress";
import Grid from "@material-ui/core/Grid";
import TextField from "@material-ui/core/TextField"; import TextField from "@material-ui/core/TextField";
import Typography from "@material-ui/core/Typography"; import Typography from "@material-ui/core/Typography";
import withStyles from "@material-ui/core/styles/withStyles"; import withStyles from "@material-ui/core/styles/withStyles";
import Grid from "@material-ui/core/Grid";
import Button from "@material-ui/core/Button";
import CircularProgress from '@material-ui/core/CircularProgress';
const styles = { const styles = {
form: { form: {
textAlign: "center" textAlign: "center"
}, },
textField: { textField: {
marginBottom: 40 marginBottom: 30
}, },
pageTitle: { pageTitle: {
marginTop: 40, // marginTop: 20,
marginBottom: 40 marginBottom: 40
}, },
button: { button: {
positon: 'relative', positon: "relative",
marginBottom: 30
}, },
progress: { progress: {
position: 'absolute', position: "absolute"
} }
}; };
export class edit extends Component { export class edit extends Component {
// Runs as soon as the page loads.
// Sets the default values of all the textboxes to the data
// that is stored in the database for the user.
componentDidMount() { componentDidMount() {
axios axios
.get("/getProfileInfo") .get("/getProfileInfo")
@ -53,6 +53,7 @@ export class edit extends Component {
}); });
} }
// Constructor for the state
constructor() { constructor() {
super(); super();
this.state = { this.state = {
@ -66,6 +67,9 @@ export class edit extends Component {
}; };
} }
// Runs whenever the submit button is clicked.
// Updates the database entry of the signed in user with the
// data stored in the state.
handleSubmit = (event) => { handleSubmit = (event) => {
event.preventDefault(); event.preventDefault();
this.setState({ this.setState({
@ -95,11 +99,14 @@ export class edit extends Component {
}); });
}; };
// Updates the state whenever one of the textboxes changes.
// The key is the name of the textbox and the value is the
// value in the text box.
handleChange = (event) => { handleChange = (event) => {
this.setState({ this.setState({
[event.target.name]: event.target.value, [event.target.name]: event.target.value,
errors: { errors: {
[event.target.name]: null, [event.target.name]: null
} }
}); });
}; };
@ -154,6 +161,7 @@ export class edit extends Component {
value={this.state.email} value={this.state.email}
disabled disabled
helperText="(disabled)" helperText="(disabled)"
// INFO: These will be uncommented if changing emails is allowed
// helperText={errors.email} // helperText={errors.email}
// error={errors.email ? true : false} // error={errors.email ? true : false}
variant="outlined" variant="outlined"
@ -168,6 +176,7 @@ export class edit extends Component {
value={this.state.handle} value={this.state.handle}
disabled disabled
helperText="(disabled)" helperText="(disabled)"
// INFO: These will be uncommented if changing usernames is allowed
// helperText={errors.handle} // helperText={errors.handle}
// error={errors.handle ? true : false} // error={errors.handle ? true : false}
variant="outlined" variant="outlined"
@ -197,7 +206,7 @@ export class edit extends Component {
> >
Submit Submit
{loading && ( {loading && (
<CircularProgress size={30} className={classes.progress}/> <CircularProgress size={30} className={classes.progress} />
)} )}
</Button> </Button>
</form> </form>

45
twistter-frontend/src/pages/user.js
View File

@ -1,40 +1,35 @@
/* eslint-disable */ /* eslint-disable */
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; //import '../App.css';
import StaticProfile from '../components/profile/StaticProfile'; import { makeStyles, styled } from '@material-ui/core/styles';
import Grid from '@material-ui/core/Grid'; import Grid from '@material-ui/core/Grid';
import Card from '@material-ui/core/Card';
import CardMedia from '@material-ui/core/CardMedia';
import CardContent from '@material-ui/core/CardContent';
import PostSkeleton from '../util/PostSkeleton'; const PostCard = styled(Card)({
background: 'linear-gradient(45deg, #1da1f2 90%)',
import { connect } from 'react-redux'; border: 3,
borderRadius: 3,
height:225,
width: 645,
padding: '0 30px',
});
class user extends Component { class user extends Component {
render() { render() {
const postMarkup = PostSkeleton;
return ( return (
<b>User page</b> <div>
// <Grid container spacing={16}> <h1>User Profile</h1>
// <Grid item sm={8} xs={12}> <br/><br/>
// <b>postMarkup</b> <PostCard>Some card and content</PostCard>
// {postMarkup} <br/><br/>
// </Grid> </div>
// {/* <Grid item sm={4} xs={12}>
// <StaticProfile profile={this.state.profile} />
// </Grid> */}
// </Grid>
) )
} }
} }
user.propTypes = {
// getUserData: PropTypes.func.isRequired,
//data: PropTypes.object.isRequired
};
const mapStateToProps = (state) => ({
data: state.data
});
export default connect(user); export default user;

99
twistter-frontend/src/util/theme.js
View File

@ -1,4 +1,5 @@
export default { export default {
<<<<<<< HEAD
palette: { palette: {
primary: { primary: {
main: '#1976d2', main: '#1976d2',
@ -88,3 +89,101 @@ palette: {
} }
}; };
} }
=======
palette: {
primary: {
light: '#1da1f2',
main: '#1da1f2',
dark: '#008394',
contrastText: '#fff'
},
secondary: {
light: '#ff6333',
main: '#ff3d00',
dark: '#b22a00',
contrastText: '#fff'
}
},
typography: {
useNextVariants: true
},
form: {
textAlign: 'center'
},
image: {
margin: '20px auto 20px auto'
},
pageTitle: {
margin: '10px auto 10px auto'
},
textField: {
margin: '10px auto 10px auto'
},
button: {
marginTop: 20,
position: 'relative'
},
customError: {
color: 'red',
fontSize: '0.8rem',
marginTop: 10
},
progress: {
position: 'absolute'
},
invisibleSeparator: {
border: 'none',
margin: 4
},
visibleSeparator: {
width: '100%',
borderBottom: '1px solid rgba(0,0,0,0.1)',
marginBottom: 20
},
paper: {
padding: 20
},
profile: {
'& .image-wrapper': {
textAlign: 'center',
position: 'relative',
'& button': {
position: 'absolute',
top: '80%',
left: '70%'
}
},
'& .profile-image': {
width: 200,
height: 200,
objectFit: 'cover',
maxWidth: '100%',
borderRadius: '50%'
},
'& .profile-details': {
textAlign: 'center',
'& span, svg': {
verticalAlign: 'middle'
},
'& a': {
color: '#00bcd4'
}
},
'& hr': {
border: 'none',
margin: '0 0 10px 0'
},
'& svg.button': {
'&:hover': {
cursor: 'pointer'
}
}
},
buttons: {
textAlign: 'center',
'& a': {
margin: '20px 10px'
}
}
};
>>>>>>> master