Skip to content

Commit 7d185fd

Browse files
committed
Sign Up functionality fully converted to DB
Co-authored-by: Jon Cruz [email protected] Co-authored-by: Elena Atencio [email protected] Co-authored-by: John Donato [email protected]
1 parent 8c0b433 commit 7d185fd

File tree

2 files changed

+50
-21
lines changed

2 files changed

+50
-21
lines changed

app/components/SignUp.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ const SignUp:React.FC = React.memo(() => {
4343

4444
ipcRenderer.invoke('addUser', { username, email, password})
4545
.then((message) => {
46-
if (message === true) {
46+
console.log('message', message)
47+
if (message === false) {
48+
setFailedSignUp(<p>Sorry, your sign up failed. Please try a different username or email</p>)
49+
} else {
50+
console.log('in frontend', username)
4751
setUser(username);
48-
console.log(username)
4952
navigate('/');
50-
} else {
51-
setFailedSignUp(<p>Sorry, your sign up failed. Please try a different username or email</p>)
5253
}
5354
}).catch(error => {
5455
console.error('Failed to sign up:', error);

electron/routes/dashboard.ts

Lines changed: 45 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const mongoose = require('mongoose');
99
// const db = require('../databases/mongo')
1010

1111
const MONGO_URI = ''
12+
1213
mongoose.connect(MONGO_URI, {
1314
useNewUrlParser: true,
1415
useUnifiedtopology: true,
@@ -39,14 +40,19 @@ function hashPassword(password: string) {
3940
const salt = bcrypt.genSaltSync(saltRounds);
4041
return bcrypt.hashSync(password, salt);
4142
}
43+
44+
// function checkUser(username): any {
45+
// const userExist = User.findOne({ username })
46+
// .then((data) => {
47+
// console.log('User found', data);
48+
// return true;
49+
// })
50+
// .catch((error) => {
51+
// console.log(`checkUser failed : ${error}`)
52+
// // return false;
53+
// })
54+
// // console.log('heeeeere', userExist)
4255
// }
43-
function checkUser(username) {
44-
const userExist = User.findOne({ username })
45-
.then(() => console.log('heeere', userExist))
46-
.catch((error) => console.log('checkUser failed'))
47-
// console.log('heeeeere', userExist)
48-
// return userExist ? true : false;
49-
}
5056

5157
function addUser(username, password, email) {
5258
console.log('inside addUser', username)
@@ -196,12 +202,33 @@ ipcMain.handle(
196202
console.log('in ipcMainhandle', user)
197203

198204
// Verify that username and email have not been taken
199-
const settings = JSON.parse(fs.readFileSync(settingsLocation).toString('utf8'));
200-
if (settings[username]) {
201-
message.returnValue = false;
202-
return message.returnValue;
203-
}
205+
// const settings = JSON.parse(fs.readFileSync(settingsLocation).toString('utf8'));
206+
// if (settings[username]) {
207+
// message.returnValue = false;
208+
// return message.returnValue;
209+
// }
210+
211+
212+
// checks if username exist in DB, if not, addUser is invoked
213+
return User.findOne({ username:username })
214+
.then((data) => {
215+
console.log('User found', data);
216+
if (data) {
217+
message.returnValue = false;
218+
return message.returnValue;
219+
} else {
220+
addUser(username, password, email)
221+
message.returnValue = true;
222+
return message.returnValue;
223+
}
224+
})
225+
.catch((error) => {
226+
console.log(`checkUser failed : ${error}`)
227+
// return false;
228+
})
229+
204230
// if (checkUser(username) === true) {
231+
// console.log('checkUser invoked', checkUser(username))
205232
// message.returnValue = false;
206233
// return message.returnValue;
207234
// }
@@ -215,11 +242,12 @@ ipcMain.handle(
215242
// message.returnValue = true;
216243
// return message.returnValue;
217244
// }
218-
else {
219-
addUser(username, password, email)
220-
message.returnValue = true;
221-
return message.returnValue;
222-
}
245+
// if (!checkUser(username)) {
246+
// addUser(username, password, email)
247+
// message.returnValue = true;
248+
// return message.returnValue;
249+
// }
250+
// return false;
223251
}
224252
);
225253

0 commit comments

Comments
 (0)