Converted to DB to load microservices examples

Updated signup requirements
User prompted to log in after sign up

Co-authored-by: Jon Cruz
<[email protected]>
Co-authored-by: Elena Atencio
<[email protected]>
Co-authored-by: John Donato
<[email protected]>

Author: wiris316

app/components/SignUp.tsx

@@ -48,8 +48,9 @@ const SignUp:React.FC = React.memo(() => {
           setFailedSignUp(<p>Sorry, your sign up failed. Please try a different username or email</p>)
         } else {
           console.log('in frontend', username)
-          setUser(username);
-          navigate('/');
+          // setUser(username);
+          navigate('/login');
+          alert('USER CREATED: PLEASE LOG IN')
         }
       }).catch(error => {
       console.error('Failed to sign up:', error);
@@ -66,13 +67,13 @@ const SignUp:React.FC = React.memo(() => {
 
         <form className="form" onSubmit={handleSubmit}>
           <label className="username">
-            <input type="text" name="username" id="username" placeholder="enter username" />
+            <input type="text" name="username" id="username" minLength={4} placeholder="enter username" />
           </label>
           <label className="email">
             <input type="email" name="email" id="email" placeholder="[email protected]" />
           </label>
           <label className="password">
-            <input type="password" name="password" id="password" placeholder="enter password" />
+            <input type="password" name="password" id="password" minLength={9} placeholder="enter password" />
           </label>
           <label className="passwordConfirm">
             <input type="password" name="passwordConfirm" id="passwordConfirm" placeholder="confirm password" />

app/context/ApplicationContext.tsx

@@ -53,9 +53,9 @@ const ApplicationContextProvider: React.FC<AppContextProps> = React.memo(props =
     });
   }, []);
 
-  const connectToDB = useCallback((username: string, index: number, application: string) => {
+  const connectToDB = useCallback((username: string, index: number, application: string, URI: string) => {
     ipcRenderer.removeAllListeners('databaseConnected');
-    ipcRenderer.send('connect', username, index);
+    ipcRenderer.send('connect', username, index, URI);
 
     ipcRenderer.on('databaseConnected', (event: Electron.Event, data: any) => {
       fetchServicesNames(application);

app/modals/ServicesModal.tsx

@@ -18,7 +18,9 @@ interface IService {
 }
 
 const ServicesModal: React.FC<ServicesModalProps> = React.memo(({ i, app }) => {
-  const { user } = useContext(DashboardContext)
+  const { user, applications } = useContext(DashboardContext)
+  console.log('hereerer', useContext(DashboardContext))
+  console.log('aappp', applications[i][2])
   const { servicesData, connectToDB } = useContext(ApplicationContext);
   const [services, setServices] = useState<Array<string>>([]);
 
@@ -32,7 +34,7 @@ const ServicesModal: React.FC<ServicesModalProps> = React.memo(({ i, app }) => {
   };
 
   useEffect(() => {
-    connectToDB(user, i, app);
+    connectToDB(user, i, app, applications[i][2]);
   }, [i]);
 
   return (

electron/routes/dashboard.ts

@@ -159,12 +159,7 @@ ipcMain.on('getApps', (message: IpcMainEvent) => {
     .then((data) => {
       console.log('User found', data);
         services = data.services; 
-        const dashboardList: string[][] = services.map((arr: string[]) => [
-          arr[0],
-          arr[1],
-          arr[3],
-          arr[4],
-          arr[5],
+        const dashboardList: string[][] = services.map((arr: string[]) => [...arr
         ]);
       message.returnValue = dashboardList;
     })

electron/routes/data.ts

@@ -16,6 +16,10 @@ import { fetchData } from './dataHelpers';
 import MetricsModel from '../models/MetricsModel';
 const log = require('electron-log');
 
+
+const mongoose = require('mongoose');
+const User = require('../models/UserModel')
+
 const mongoFetch = fetchData.mongoFetch;
 const postgresFetch = fetchData.postgresFetch;
 const AWS = require('aws-sdk');
@@ -37,24 +41,60 @@ const settingsLocation = path.resolve(__dirname, '../../settings.json');
  * @desc    Connects user to database and sets global currentDatabaseType which
  *          is accessed in info.commsData and info.healthData
  */
-ipcMain.on('connect', async (message: Electron.IpcMainEvent, username: string, index: number) => {
+ipcMain.on('connect', async (message: Electron.IpcMainEvent, username: string, index: number, URI: string) => {
   try {
     // Extract databaseType and URI from settings.json at particular index
     // get index from application context
-    const fileContents = JSON.parse(fs.readFileSync(settingsLocation, 'utf8'));
-    const userDatabase = fileContents[username].services[index];
-    // We get index from sidebar container: which is the mapplication (DEMO)
-    const [databaseType, URI] = [userDatabase[1], userDatabase[2]];
 
-    // Connect to the proper database
-    if (databaseType === 'MongoDB') await connectMongo(index,URI);
-    if (databaseType === 'SQL') pool = await connectPostgres(index, URI);
+    // Connect to User database instantiated in 'dashboard.ts'
+    if (username !== 'guest') {
+      
+      const MONGO_URI = URI
+      mongoose.connect(MONGO_URI, {
+        useNewUrlParser: true, 
+        useUnifiedtopology: true,
+      })
+  
+      // Check for existing user in DB, if found, connect to load application based on database type
+      return User.findOne({ username: username })
+      .then(async (data) => {
+        const databaseType = data.services[index][1]
+        const appURI = data.services[index][2]
+        console.log('database type', databaseType)
+        if (databaseType === 'MongoDB') {
+          await connectMongo(index, appURI)
+          currentDatabaseType = databaseType;
+          message.sender.send('databaseConnected', 'connected!');
+        } else if (databaseType === 'SQL') {
+          pool = await connectPostgres(index, appURI);
+          currentDatabaseType = databaseType;
+          message.sender.send('databaseConnected', 'connected!');
+        }
+      })
+      .catch((error) => {
+        console.log(` Error in connect, failed to load application : ${error}`)
+        // return false;
+      })
+    }
 
-    // Currently set to a global variable
-    currentDatabaseType = databaseType;
+    //LOCAL INSTANCE: SETTINGS.JSON
+    else {
 
-    message.sender.send('databaseConnected', 'connected!');
-    // eslint-disable-next-line no-shadow
+      const fileContents = JSON.parse(fs.readFileSync(settingsLocation, 'utf8'));
+      const userDatabase = fileContents[username].services[index];
+      // We get index from sidebar container: which is the mapplication (DEMO)
+      const [databaseType, URI] = [userDatabase[1], userDatabase[2]];
+  
+      // Connect to the proper database
+      if (databaseType === 'MongoDB') await connectMongo(index,URI);
+      if (databaseType === 'SQL') pool = await connectPostgres(index, URI);
+  
+      // Currently set to a global variable
+      currentDatabaseType = 'MongoDB';
+  
+      message.sender.send('databaseConnected', 'connected!');
+      // eslint-disable-next-line no-shadow
+    }
   } catch ({ message }) {
     console.log('Error in "connect" event', message);
   }