Rating frontend

gamersnet_backend/persistence/tokens.js

@@ -49,12 +49,12 @@ async function tokenValid(cookie) {
     return result.toArray();
 }
 
-async function getUserIDFromToken(token) {
+async function getTokenDocument(token) {
     await connect();
 
     let result = await tokens.findOne({token: token});
 
     return result;
 }
 
-module.exports = {addUserToken, TOKEN_LIFE_SPAN, updateUserToken, tokenValid, getUserIDFromToken};
+module.exports = {addUserToken, TOKEN_LIFE_SPAN, updateUserToken, tokenValid, getTokenDocument};

gamersnet_backend/routes/messages/addMessage.js

@@ -4,7 +4,7 @@
 let {addMessage} = require('../../persistence/messages');
 let {verifyUserLoggedIn} = require('../utilities/tokenUtility')
 
-let {getUserIDFromToken} = require('../../persistence/tokens.js')
+let {getTokenDocument} = require('../../persistence/tokens.js')
 
 async function newMessage(request, response) {
 
@@ -24,7 +24,7 @@ async function newMessage(request, response) {
     }
 
     if (loggedIn && message) {
-        let tokenDocument = await getUserIDFromToken(cookie);
+        let tokenDocument = await getTokenDocument(cookie);
 
         let sender = tokenDocument.userID;    
 

gamersnet_backend/routes/messages/getInteractions.js

@@ -4,7 +4,7 @@ let {getInteractions} = require('../../persistence/messages');
 
 let {verifyUserLoggedIn} = require('../utilities/tokenUtility');
 
-let {getUserIDFromToken} = require('../../persistence/tokens.js');
+let {getTokenDocument} = require('../../persistence/tokens.js');
 const { getUserByID } = require('../../persistence/users');
 
 async function listInteractedIDs(request, response) {
@@ -15,7 +15,7 @@ async function listInteractedIDs(request, response) {
         cookie = cookie.split('=')[1];
         loggedIn = await verifyUserLoggedIn(cookie);
     }
-    let tokenDocument = await getUserIDFromToken(cookie);
+    let tokenDocument = await getTokenDocument(cookie);
     //console.log("[listInteractedIDs.tokenDocument] ",tokenDocument); //for debugging
 
     //get logged in user id from token

gamersnet_backend/routes/posts/createPost.js

@@ -4,7 +4,7 @@
 let {addPost} = require('../../persistence/posts');
 let {verifyUserLoggedIn} = require('../utilities/tokenUtility')
 
-let {getUserIDFromToken} = require('../../persistence/tokens.js')
+let {getTokenDocument} = require('../../persistence/tokens.js')
 
 // this function handles the /post/createPost/ endpoint
 async function createPost(request, response) {
@@ -21,7 +21,7 @@ async function createPost(request, response) {
     }
 
     if (loggedIn && verifyBody) {
-        let tokenDocument = await getUserIDFromToken(cookie);
+        let tokenDocument = await getTokenDocument(cookie);
 
         //input type are verified here
         let userID = tokenDocument.userID;

gamersnet_backend/routes/posts/deletePost.js

@@ -4,7 +4,7 @@
 let {deletePost} = require('../../persistence/posts');
 let {verifyUserLoggedIn} = require('../utilities/tokenUtility')
 
-let {getUserIDFromToken} = require('../../persistence/tokens.js')
+let {getTokenDocument} = require('../../persistence/tokens.js')
 
 // this function handles the /posts/deletePost endpoint
 async function removePost(request, response) {
@@ -19,7 +19,7 @@ async function removePost(request, response) {
     }
 
     if (loggedIn) {
-        let tokenDocument = await getUserIDFromToken(cookie);
+        let tokenDocument = await getTokenDocument(cookie);
 
         //input type are verified here
         let userID = tokenDocument.userID;

gamersnet_backend/routes/posts/getPosts.js

@@ -6,7 +6,7 @@ let {getUserPosts, getPost, getAllPosts, getValidPosts} = require('../../persist
 
 let {verifyUserLoggedIn} = require('../utilities/tokenUtility')
 
-let {getUserIDFromToken} = require('../../persistence/tokens.js')
+let {getTokenDocument} = require('../../persistence/tokens.js')
 
 // this function handles the /posts/listUserPosts/ endpoint
 async function listUserPosts(request, response) {
@@ -21,7 +21,7 @@ async function listUserPosts(request, response) {
     }
 
     if (loggedIn){
-        let tokenDocument = await getUserIDFromToken(cookie);
+        let tokenDocument = await getTokenDocument(cookie);
 
         // Note: when fetching users' posts, an empty string is passed in URL if it is requested by the user that's logged in
         // As lucas already has userID in the frontend, this will be changed after that pr is merged

gamersnet_backend/routes/posts/updatePost.js

@@ -3,7 +3,7 @@
 // include our function from the database to add post
 let {updatePostDB, getPost} = require('../../persistence/posts');
 let {verifyUserLoggedIn} = require('../utilities/tokenUtility')
-let {getUserIDFromToken} = require('../../persistence/tokens.js')
+let {getTokenDocument} = require('../../persistence/tokens.js')
 
 
 /**
@@ -50,7 +50,7 @@ async function updatePost(request, response) {
     }
 
     if (loggedIn) {
-        let tokenDocument = await getUserIDFromToken(cookie);
+        let tokenDocument = await getTokenDocument(cookie);
 
         //get logged in user id from token
         let loggedUserID = tokenDocument.userID;

gamersnet_backend/routes/ratings/addRatings.js

@@ -4,7 +4,7 @@
 let {addRatingsDB} = require('../../persistence/ratings');
 let {verifyUserLoggedIn} = require('../utilities/tokenUtility')
 
-let {getUserIDFromToken} = require('../../persistence/tokens.js')
+let {getTokenDocument} = require('../../persistence/tokens.js')
 const { ObjectID } = require('bson');
 
 // this function handles the /ratings/addRatings/ endpoint
@@ -13,8 +13,7 @@ async function addRatings(request, response) {
     let body = request.body;
     let queryUserID = request.query.userID;
     let cookie = request.headers.cookie;
-    let verifyBody = queryUserID && body.strength && body.punctuality 
-                        && body.friendliness &&  body.fun && body.playAgain // commenting on profile is optional
+    let verifyBody = queryUserID && body.strength && body.punctuality && body.friendliness && body.fun && (body.playAgain !== undefined);
     let userID = ObjectID(queryUserID);
 
     let loggedIn = false;
@@ -25,7 +24,7 @@ async function addRatings(request, response) {
     }
 
     if (loggedIn && verifyBody) {
-        let tokenDocument = await getUserIDFromToken(cookie);
+        let tokenDocument = await getTokenDocument(cookie);
         let raterID = tokenDocument.userID;
 
         // users can't rate their own profiles.

gamersnet_backend/routes/users/getUsername.js

@@ -0,0 +1,19 @@
+let {getUserByID} = require('../../persistence/users');
+
+async function getUsername(request, response) {
+    let id = request.params.id
+    let result = null;
+
+    // for some reason, an invalid id parameter will be the string "undefined"
+    if (id !== 'undefined') {
+        result = await getUserByID(id);
+    }
+
+    if (result === null) {
+        response.status(404).end();
+    } else {
+        response.status(200).end(JSON.stringify({username: result.username}));
+    }
+}
+
+module.exports = getUsername;

gamersnet_backend/routes/users/index.js

@@ -11,13 +11,15 @@ let getUserDetails = require('./getUserDetails');
 let updateDetailsCallback = require('./updateDetails');
 let getAchievements = require('./getAchievements');
 let updateRank = require('./updateRank');
+let getUsername = require('./getUsername');
 
 app.post('/createAccount', createAccount)
 app.post('/authenticate', authenticate)
 
 app.get('/getAvatar/:id', getAvatar);
 app.get('/getUserDetails/:id', getUserDetails);
 app.get('/getAchievements/:id', getAchievements);
+app.get('/getUsername/:id', getUsername);
 
 app.patch('/updatePassword', updatePassword)
 app.patch('/updateAvatar', upload.single('image'), updateAvatar);

gamersnet_backend/routes/users/updateAvatar.js

@@ -2,7 +2,7 @@
 
 let {upsertAvatar} = require('../../persistence/avatar');
 let {verifyUserLoggedIn} = require('../utilities/tokenUtility');
-let {getUserIDFromToken} = require('../../persistence/tokens');
+let {getTokenDocument} = require('../../persistence/tokens');
 
 let imageSize = require('image-size');
 
@@ -25,7 +25,7 @@ async function updateAvatar(request, response) {
             let size = imageSize(request.file.buffer);
 
             if (size.height <= 256 && size.width <= 256) {
-                let tokenDocument = await getUserIDFromToken(token);
+                let tokenDocument = await getTokenDocument(token);
                 let userID = tokenDocument.userID;
 
                 await upsertAvatar(userID, request.file.buffer, request.file.mimetype);

gamersnet_backend/routes/users/updateDetails.js

@@ -1,6 +1,6 @@
 'use strict';
 
-let { getUserIDFromToken } = require('../../persistence/tokens');
+let { getTokenDocument } = require('../../persistence/tokens');
 let { updateDetails } = require('../../persistence/users');
 let {verifyUserLoggedIn} = require('../utilities/tokenUtility');
 
@@ -40,7 +40,7 @@ async function updateDetailsCallback(request, response) {
 
     //invalid cookie
     if (await verifyUserLoggedIn(token)) {
-        let tokenDocument = await getUserIDFromToken(token);
+        let tokenDocument = await getTokenDocument(token);
 
         await updateDetails(tokenDocument.userID, body);
 

gamersnet_backend/routes/users/updatePassword.js

@@ -2,7 +2,7 @@
 
 const bcrypt = require('bcrypt');
 
-let {getUserIDFromToken, updateUserToken, TOKEN_LIFE_SPAN} = require('../../persistence/tokens');
+let {getTokenDocument, updateUserToken, TOKEN_LIFE_SPAN} = require('../../persistence/tokens');
 let {updateUserPassword, getUserByID} = require('../../persistence/users');
 const alphaNumericize = require('../utilities/alphaNumericize');
 let makeHash = require('../utilities/makeHash');
@@ -30,7 +30,7 @@ async function updatePassword(request, response) {
 
     if (isValid) {
         // get the token document of this user
-        let tokenDocument = await getUserIDFromToken(token);
+        let tokenDocument = await getTokenDocument(token);
         let userID = tokenDocument.userID;
 
         // get the user document to validate old password

gamersnet_backend/routes/users/updateRank.js

@@ -1,6 +1,6 @@
 'use strict';
 
-let { getUserIDFromToken } = require('../../persistence/tokens');
+let { getTokenDocument } = require('../../persistence/tokens');
 let { updateRankByUserID } = require('../../persistence/users');
 let {verifyUserLoggedIn} = require('../utilities/tokenUtility');
 
@@ -33,7 +33,7 @@ async function updateRank(request, response) {
 
     //invalid cookie
     if (await verifyUserLoggedIn(token)) {
-        let tokenDocument = await getUserIDFromToken(token);
+        let tokenDocument = await getTokenDocument(token);
 
         await updateRankByUserID(tokenDocument.userID, body);
 

gamersnet_frontend/src/__tests__/profile/testAvatar.js

@@ -1,5 +1,5 @@
 import { render, screen, waitFor } from '@testing-library/react';
-import ProfileChangeAvatar from '../../components/profileChangeAvatar';
+import ProfileChangeAvatar from '../../components/profileComponents/profileChangeAvatar';
 import '@testing-library/jest-dom';
 import { Simulate } from 'react-dom/test-utils';
 

gamersnet_frontend/src/app.js

@@ -13,7 +13,7 @@ import SignIn from './components/signin';
 import Register from './components/register';
 import Logout from './components/logout';
 import AddPost from './components/createPost';
-import Profile from './components/profile';
+import Profile from './components/profileComponents/profileMain';
 import GameSearch from './components/gameSearch'
 import RecentChats from './components/recentChats';
 

gamersnet_frontend/src/components/button/styles.css

@@ -1,7 +1,7 @@
 button {
     color: white;
     padding: 0.5rem;
-    border-radius: 15px;
+    border-radius: 10px;
     cursor: pointer;
     font-size: 1rem;
     outline: none;

gamersnet_frontend/src/components/displayPosts/index.js

@@ -22,20 +22,20 @@ export default class DisplayPosts extends React.Component{
 	}
 
 	componentDidMount() {
-			let userID = "";
+		let userID = this.props.userID || '';
 
-			let fetchPosts = APIFetch('/posts/listUserPosts?userID=' + userID, null, 'GET');
+		let fetchPosts = APIFetch('/posts/listUserPosts?userID=' + userID, null, 'GET');
 
-			fetchPosts.then(async (data) => {
-				if (await data.ok) {
-					let posts = await data.json();
-					this.setState({items: posts, status : ""});
-				} else if (await data.status === 404){
-					this.setState({status : "No posts found"});
-				} else {
-					this.setState({status : "Network Problem"});
-				}
-			});
+		fetchPosts.then(async (data) => {
+			if (await data.ok) {
+				let posts = await data.json();
+				this.setState({items: posts, status : ""});
+			} else if (await data.status === 404){
+				this.setState({status : "No posts found"});
+			} else {
+				this.setState({status : "Network Problem"});
+			}
+		});
 	}
 
 	render() {

gamersnet_frontend/src/components/profileAchievements/index.js → gamersnet_frontend/src/components/profileComponents/profileAchievements/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import APIFetch from '../../utilities/api';
+import APIFetch from '../../../utilities/api';
 
 import './styles.css';
 
@@ -26,9 +26,11 @@ export default class ProfileAchievements extends React.Component {
         this.state = {
             achievements: []
         };
+
+        this.localFetch = this.localFetch.bind(this);
     }
 
-    componentDidMount() {
+    localFetch() {
         let fetchData = APIFetch('/users/getAchievements/' + this.props.userID);
 
         fetchData.then(async (data) => {
@@ -49,6 +51,16 @@ export default class ProfileAchievements extends React.Component {
             }
         });
     }
+
+    componentDidMount() {
+        this.localFetch();
+    }
+
+    componentDidUpdate(prevProps) {
+        if (prevProps.userID !== this.props.userID) {
+            this.localFetch();
+        }
+    }
 
     render() {
         return (