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

Making everything look pretty

Browse Source
This commit is contained in:
Clayton Wilson 2019-10-01 20:39:21 -04:00
parent 07e9271132
commit c218081759
9 changed files with 274 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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,
@ -41,5 +40,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.'})
}) })
} }

164
functions/handlers/users.js
View File

@ -1,14 +1,11 @@
/* 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, email: req.body.email,
@ -18,76 +15,76 @@ exports.signup = (req, res) => {
createdAt: new Date().toISOString() createdAt: new Date().toISOString()
}; };
// console.log(newUser);
let errors = {}; 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,}))$/; 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 // Email check
if(newUser.email.trim() === '') { if (newUser.email.trim() === "") {
errors.email = 'Email must not be blank.'; errors.email = "Email must not be blank.";
} } else if (!newUser.email.match(emailRegEx)) {
else if(!newUser.email.match(emailRegEx)) { errors.email = "Email is invalid.";
errors.email = 'Email is invalid.';
} }
//handle check // handle check
if(newUser.handle.trim() === '') { if (newUser.handle.trim() === "") {
errors.handle = 'Username must not be blank.'; errors.handle = "Username must not be blank.";
} } else if (newUser.handle.length < 4 || newUser.handle.length > 30) {
else if(newUser.handle.length < 4 || newUser.handle.length > 30) { errors.handle = "Username must be between 4-30 characters long.";
errors.handle = 'Username must be between 4-30 characters long.';
} }
//Password check // Password check
if(newUser.password.trim() === '') { if (newUser.password.trim() === "") {
errors.password = 'Password must not be blank.'; errors.password = "Password must not be blank.";
} } else if (newUser.password.length < 8 || newUser.password.length > 20) {
else if(newUser.password.length < 8 || newUser.password.length > 20) { errors.password = "Password must be between 8-20 characters long.";
errors.password = 'Password must be between 8-20 characters long.';
} }
//Confirm password check // Confirm password check
if(newUser.confirmPassword !== newUser.password) { if (newUser.confirmPassword !== newUser.password) {
errors.confirmPassword = 'Passwords must match.'; errors.confirmPassword = "Passwords must match.";
} }
//Overall check // Overall check
if(Object.keys(errors).length > 0) { if (Object.keys(errors).length > 0) {
return res.status(400).json(errors); return res.status(400).json(errors);
} }
let idToken, userId; let idToken, userId;
db.doc(`/users/${newUser.handle}`).get() db.doc(`/users/${newUser.handle}`)
.then(doc => { .get()
if(doc.exists) { .then((doc) => {
return res.status(400).json({ handle: 'This username is already taken.' }); if (doc.exists) {
return res
.status(400)
.json({ handle: "This username is already taken." });
} }
return firebase.auth().createUserWithEmailAndPassword(newUser.email, newUser.password); return firebase
.auth()
.createUserWithEmailAndPassword(newUser.email, newUser.password);
}) })
.then(data => { .then((data) => {
userId = data.user.uid; userId = data.user.uid;
return data.user.getIdToken(); return data.user.getIdToken();
}) })
.then(token => { .then((token) => {
idToken = token; idToken = token;
const userCred = { const userCred = {
email: req.body.email, email: req.body.email,
handle: newUser.handle, handle: newUser.handle,
createdAt: newUser.createdAt, createdAt: newUser.createdAt,
userId userId
} };
return db.doc(`/users/${newUser.handle}`).set(userCred); 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 });
}); });
@ -97,45 +94,51 @@ 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()
.signInWithEmailAndPassword(user.email, user.password)
.then((data) => {
return data.user.getIdToken(); return data.user.getIdToken();
}) })
.then(token => { .then((token) => {
return res.json({token}); return res.json({ token });
}) })
.catch(err => { .catch((err) => {
console.error(err); console.error(err);
if(err.code === 'auth/wrong-password') { if (err.code === "auth/wrong-password") {
return res.status(403).json({ general: 'Invalid credentials. Please try again.' }); return res
.status(403)
.json({ general: "Invalid credentials. Please try again." });
} }
return res.status(500).json({ error: err.code }); return res.status(500).json({ error: err.code });
}); });
}; };
// Returns all data in the database for the user who is currently signed in
exports.getProfileInfo = (req, res) => { exports.getProfileInfo = (req, res) => {
db.collection("users")
db.collection('users').doc(req.user.handle).get() .doc(req.user.handle)
.get()
.then((data) => { .then((data) => {
return res.status(200).json(data.data()); return res.status(200).json(data.data());
}) })
@ -145,38 +148,49 @@ exports.getProfileInfo = (req, res) => {
}); });
}; };
// Updates the data in the database of the user who is currently logged in
exports.updateProfileInfo = (req, res) => { exports.updateProfileInfo = (req, res) => {
// TODO: Add functionality for adding/updating profile images // TODO: Add functionality for adding/updating profile images
// Data validation // Data validation
const {valid, errors, profileData} = validateUpdateProfileInfo(req.body); const { valid, errors, profileData } = validateUpdateProfileInfo(req.body);
if (!valid) return res.status(400).json(errors); if (!valid) return res.status(400).json(errors);
// Update the database entry for this user // Update the database entry for this user
db.collection('users').doc(req.user.handle).set(profileData, {merge: true}) db.collection("users")
.doc(req.user.handle)
.set(profileData, { merge: true })
.then(() => { .then(() => {
console.log(`${req.user.handle}'s profile info has been updated.`) console.log(`${req.user.handle}'s profile info has been updated.`);
return res.status(201).json({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}`)
.get()
.then((doc) => {
if (doc.exists) { if (doc.exists) {
userData.user = doc.data(); userData.user = doc.data();
return db.collection('post').where('userHandle', '==', req.params.handle) return db
.orderBy('createdAt', 'desc').get(); .collection("post")
.where("userHandle", "==", req.params.handle)
.orderBy("createdAt", "desc")
.get();
} else { } else {
return res.status(404).json({ return res.status(404).json({
error: 'User not found' error: "User not found"
}); });
} }
}) })
@ -197,6 +211,6 @@ exports.getUserDetails = (req, res) => {
}) })
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);
return res.status(500).json({ error: err.code}); return res.status(500).json({ error: err.code });
}); });
}; };

45
functions/index.js
View File

@ -1,48 +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 fbAuth = require('./util/fbAuth'); const { db } = require("./util/admin");
const {db} = require('./util/admin'); const fbAuth = require("./util/fbAuth");
const cors = require('cors'); const functions = require("firebase-functions");
app.use(cors()); app.use(cors());
/*------------------------------------------------------------------* /*------------------------------------------------------------------*
* handlers/users.js * * handlers/users.js *
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
const { const {
getUserDetails, getUserDetails,
getProfileInfo, getProfileInfo,
login, login,
signup, signup,
updateProfileInfo, updateProfileInfo
} = require('./handlers/users'); } = 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
app.get('/getProfileInfo', fbAuth, getProfileInfo); app.get("/getProfileInfo", fbAuth, getProfileInfo);
// Updates the currently logged in user's profile information // Updates the currently logged in user's profile information
app.post('/updateProfileInfo', fbAuth, updateProfileInfo); app.post("/updateProfileInfo", fbAuth, updateProfileInfo);
/*------------------------------------------------------------------* /*------------------------------------------------------------------*
* handlers/post.js * * handlers/post.js *
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
const { const { getallPostsforUser, putPost } = require("./handlers/post");
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();

18
functions/util/validator.js
View File

@ -1,13 +1,13 @@
const isEmpty = (str) => {
if (str.trim() === '') return true;
else return false;
};
const isEmail = (str) => { const isEmail = (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,}))$/; 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.match(emailRegEx)) return true; if (str.match(emailRegEx)) return true;
else return false; else return false;
} };
const isEmpty = (str) => {
if (str.trim() === "") return true;
else return false;
};
exports.validateUpdateProfileInfo = (data) => { exports.validateUpdateProfileInfo = (data) => {
let errors = {}; let errors = {};
@ -15,7 +15,7 @@ exports.validateUpdateProfileInfo = (data) => {
// ?: 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();
@ -23,7 +23,7 @@ exports.validateUpdateProfileInfo = (data) => {
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;
} }
@ -32,5 +32,5 @@ exports.validateUpdateProfileInfo = (data) => {
errors, errors,
valid: Object.keys(errors).length === 0 ? true : false, valid: Object.keys(errors).length === 0 ? true : false,
profileData profileData
} };
}; };

4
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;

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>