Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions frontend/src/DBInteractions.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,19 @@ const save = async (roomId, userId, operation) => {

const saveUser = async (name, username, email, password, recommendation, classroom) => {
try{
const responseBody = await apiRequest('/update-user', {name, email, username, classroom, recommendation, onboarded :null});
const payload = {};
if (name !== null && name !== undefined) payload.name = name;
if (username !== null && username !== undefined) payload.username = username;
if (email !== null && email !== undefined) payload.email = email;
if (recommendation !== null && recommendation !== undefined) payload.recommendation = recommendation;
if (classroom !== null && classroom !== undefined) payload.classroom = classroom;

const responseBody = await apiRequest('/update-user', payload);
if (responseBody.success) {
console.log("User saved successfully");
} else {
console.error("User save unsuccessful");
return responseBody;
}
throw new Error(responseBody.message || "User save unsuccessful");
} catch(error){
console.error("Error saving user");
throw error;
Expand Down
16 changes: 10 additions & 6 deletions frontend/src/components/AcccountSettings/AccountSettings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,34 +132,38 @@ function AccountSettings({ userInfo }) {
setEmail(e.target.value);
};

const saveUsername = () => {
const saveUsername = async () => {
if (editUsername){
try{
saveUser(null, username, null, null, null, null);
await saveUser(null, username, null, null, null, null);
setInitialUsername(username);
await validateToken();
addNotification({title: 'Username saved', message: 'Your username has been changed successfully', type: 'success'});
} catch (error) {
addNotification({title: 'Error saving user', message: error.message, type: 'error'});
return;
}
}
setEditUsername(!editUsername);
};

const saveName = () => {
const saveName = async () => {
try{
saveUser(name, null, null, null, null, null);
await saveUser(name, null, null, null, null, null);
setInitialName(name);
setEditName(false);
await validateToken();
addNotification({title: 'Name saved', message: 'Your name has been changed successfully', type: 'success'});
} catch (error) {
addNotification({title: 'Error saving user', message: error.message, type: 'error'});
}
};

const saveEmail = () => {
const saveEmail = async () => {
try{
saveUser(null, null, email, null, null, null);
await saveUser(null, null, email, null, null, null);
setEditEmail(false);
await validateToken();
addNotification({title: 'Email saved', message: 'Your email has been changed successfully', type: 'success'});
} catch (error) {
addNotification({title: 'Error saving user', message: error.message, type: 'error'});
Expand Down