merging into devMerge branch 'dev' of https://github.com/oslabs-beta/Chronos into dev

Author: elenaatencio

app/components/SignUp.tsx

@@ -10,6 +10,10 @@ const SignUp:React.FC = React.memo(() => {
   const navigate = useNavigate();
   const { setUser } = useContext(DashboardContext);
   const [failedSignUp, setFailedSignUp] = useState<JSX.Element>(<>hey</>);
+  const [username, setUsername] = useState('');
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
 
   function handleSubmit(e: any) {
     e.preventDefault();
@@ -18,6 +22,12 @@ const SignUp:React.FC = React.memo(() => {
     const email = inputFields[1].value;
     const password = inputFields[2].value;
     const confirmPassword = inputFields[3].value;
+    // setUsername(inputFields[0].value);
+    // setEmail(inputFields[1].value);
+    // setPassword(inputFields[2].value);
+    // setConfirmPassword(inputFields[3].value);
+
+
 
     // eslint-disable-next-line no-return-assign
     inputFields.forEach(input => (input.value = ''));

electron/databases/mongo.ts

@@ -2,7 +2,7 @@ import mongoose from 'mongoose';
 // import { MongoError } from 'mongodb';
 
 // Mongoose connection wrapped in function that takes the index of the selected database as the parameter. This index is used to target the correct database for querying.
-const connectMongoose = async (i: number, URI: string) => {
+const connectMongoose = async (URI: string) => {
   try {
     await mongoose.connection.close();
     const db = await mongoose.connect(URI);

electron/databases/mongoDB.js

@@ -0,0 +1,23 @@
+// import mongoose, { Schema, Document } from 'mongoose';
+
+// export interface IService extends Document {
+//   microservice: string;
+//   interval: number;
+// }
+const mongoose = require('mongoose')
+
+const userSchema = new mongoose.Schema({
+	// User: {
+		username: {type: String, required:true, unique: true},
+		password: {type: String, required:true},
+		email: String,
+    services: [],
+    mode: {type: String, default: 'light'}
+	// },
+});
+
+// export default mongoose.model<IService>('services', ServicesSchema);
+
+// export default mongoose.model('User', userSchema);
+
+module.exports = mongoose.model('users', userSchema)

electron/models/UserModel.ts

@@ -4,30 +4,59 @@ import path from 'path';
 import fs from 'fs';
 const bcrypt = require('bcrypt');
 const saltRounds = 12;
+const User = require('../models/UserModel')
+const mongoose = require('mongoose');
+// const db = require('../databases/mongo')
+
+const MONGO_URI = ''
+mongoose.connect(MONGO_URI, {
+  useNewUrlParser: true, 
+  useUnifiedtopology: true,
+})
 
 // GLOBAL VARIABLES
 let currentUser = 'guest';
 const settingsLocation = path.resolve(__dirname, '../../settings.json');
 
-class User {
-  username: string;
-  password: string;
-  email: string;
-  services: string[][];
-  mode: string;
-
-  constructor(username: string, password: string, email: string) {
-    this.username = username;
-    this.password = this.hashPassword(password);
-    this.email = email;
-    this.services = [];
-    this.mode = 'light';
-  }
 
-  hashPassword(password: string) {
+
+// class User {
+//   username: string;
+//   password: string;
+//   email: string;
+//   services: string[][];
+//   mode: string;
+
+//   constructor(username: string, password: string, email: string) {
+//     this.username = username;
+//     this.password = this.hashPassword(password);
+//     this.email = email;
+//     this.services = [];
+//     this.mode = 'light';
+//   }
+
+function hashPassword(password: string) {
     const salt = bcrypt.genSaltSync(saltRounds);
     return bcrypt.hashSync(password, salt);
   }
+// }
+function checkUser(username) {
+  const userExist = User.findOne({ username })
+    .then(() => console.log('heeere', userExist))
+    .catch((error) => console.log('checkUser failed'))
+  // console.log('heeeeere', userExist)
+  // return userExist ? true : false;
+}
+
+function addUser(username, password, email) {
+  console.log('inside addUser', username)
+  const newUser = new User({ username: username, password: hashPassword(password), email: email})
+  console.log('after calling new User')
+
+  newUser.save()
+    .then((data) => {
+    console.log('data hurr', data)
+  })
 }
 
 function clearGuestSettings() {
@@ -164,22 +193,31 @@ ipcMain.handle(
   'addUser',
   (message: IpcMainEvent, user: { username: string; password: string; email: string }) => {
     const { username, password, email } = user;
-    console.log(user)
+    console.log('in ipcMainhandle', user)
 
     // Verify that username and email have not been taken
     const settings = JSON.parse(fs.readFileSync(settingsLocation).toString('utf8'));
     if (settings[username]) {
       message.returnValue = false;
       return message.returnValue;
     }
+    // if (checkUser(username) === true) {
+    //   message.returnValue = false; 
+    //   return message.returnValue;
+    // }
 
     // Add the new user to the local storage
+    // else {
+    //   const newUser = new User(username, password, email);
+    //   settings[username] = newUser;
+    //   fs.writeFileSync(settingsLocation, JSON.stringify(settings, null, '\t'));
+    //   currentUser = username;
+    //   message.returnValue = true;
+    //   return message.returnValue;
+    // }
     else {
-      const newUser = new User(username, password, email);
-      settings[username] = newUser;
-      fs.writeFileSync(settingsLocation, JSON.stringify(settings, null, '\t'));
-      currentUser = username;
-      message.returnValue = true;
+      addUser(username, password, email)
+      message.returnValue = true; 
       return message.returnValue;
     }
   }

electron/routes/dashboard.ts

@@ -47,7 +47,7 @@ ipcMain.on('connect', async (message: Electron.IpcMainEvent, username: string, i
     const [databaseType, URI] = [userDatabase[1], userDatabase[2]];
 
     // Connect to the proper database
-    if (databaseType === 'MongoDB') await connectMongo(index, URI);
+    if (databaseType === 'MongoDB') await connectMongo(URI);
     if (databaseType === 'SQL') pool = await connectPostgres(index, URI);
 
     // Currently set to a global variable