Merge pull request #9 from oslabs-beta/convertToDB

Convert to db

Author: wiris316

app/components/Login.tsx

@@ -23,7 +23,8 @@ const Login = React.memo(() => {
     // eslint-disable-next-line no-return-assign
     // inputFields.forEach(input => (input.value = ''));
     const response: boolean | string = ipcRenderer.sendSync('login', { username, password });
-    if (typeof(response) === 'string') {
+    if (typeof (response) === 'string') {
+      console.log('response', response)
       setUser(username);
       setMode(response);
       navigate('/');

app/components/SignUp.tsx

@@ -43,12 +43,14 @@ const SignUp:React.FC = React.memo(() => {
 
     ipcRenderer.invoke('addUser', { username, email, password})
       .then((message) => {
-        if (message === true) {
-          setUser(username);
-          console.log(username)
-          navigate('/');
-        } else {
+        console.log('message', message)
+        if (message === false) {
           setFailedSignUp(<p>Sorry, your sign up failed. Please try a different username or email</p>)
+        } else {
+          console.log('in frontend', username)
+          // setUser(username);
+          navigate('/login');
+          alert('USER CREATED: PLEASE LOG IN')
         }
       }).catch(error => {
       console.error('Failed to sign up:', error);
@@ -65,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/components/Splash.tsx

@@ -5,7 +5,7 @@ const Splash: React.FC = React.memo(props => {
   const [visible, setVisible] = useState(true);
 
   useEffect(() => {
-    setTimeout(() => setVisible(false), 4000);
+    setTimeout(() => setVisible(false), 1000);
   }, []);
 
   return (

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/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 (URI: string) => {
+const connectMongoose = async (i:number, URI: string) => {
   try {
     await mongoose.connection.close();
     const db = await mongoose.connect(URI);