final clean up, edited readme, removed old code

Author: Stephen-Havig

.cert/ca.crt

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDXjCCAkagAwIBAgIFODk4NDAwDQYJKoZIhvcNAQELBQAwXjEQMA4GA1UEAxMH
+VGVzdCBDQTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNV
+BAcTDVNhbiBGcmFuY2lzY28xEDAOBgNVBAoTB1Rlc3QgQ0EwHhcNMjMwNTE2MTcw
+NDU3WhcNMjQwNTE1MTcwNDU3WjBeMRAwDgYDVQQDEwdUZXN0IENBMQswCQYDVQQG
+EwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj
+bzEQMA4GA1UEChMHVGVzdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKW0Pn146jzobSeRPRYa89bC5eLGerl1gJC8QaMegCjzNKbc9c6D3LLWd6rc
+I81Drb64wV7fBzpJy1VWq4tAFw1KUKS8J5UKug8HbpPSTdfSq0HyFWKlKXjHOhCw
+FknwdiY2ttlQBQXPhVXUEX50WQp/4q4YY3oJmkLEE2GhcVGG9M8usR6I8uQ0k5WD
+oO4Zl4SIP2KAUChEsBOoConAwYK5Z+4H6COujCQZ1KnbhkMbd6aNHpyTntHtVseF
+HxLYKcbKepllme2AAo1TPln758BWoruLueL7Ck3qczBWYICYil1g3WnBjn+oyIAp
+ARwzQ54hsQfJ+JrF3Qfa8tpQNV0CAwEAAaMjMCEwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAgQwDQYJKoZIhvcNAQELBQADggEBAC3XvlQfqmb64r2m+igx
+LJS4QuLUM/RiNrAj+7kM5h9LxsJDNUi2X4/jBqIGaoCUtugE3UxDhhYtjnvC2OWv
++gXJncQ8+5gYHpYhj8g4JYe+PCOvhrLEMRHM04/ArYLUqeM2eGdkg+4kQtmiDwUO
+qXm9ppt5DfEHYii14Iq+dQ9w7lPaNO+lOf+L4guD6Bfbkni4m7IIl3SwLcylJob+
++MQNI6i6eyZavPvR/JP5NdBj0cTTHB4KZN8DYQA+Lztf+n3Cj7MkAgE2V0ew9MNi
+mRBtSzgn0fwZkiNyVZ0jxIl1ZiEmnhihTr09znGgliDQcSpMqRpVBB0FFFYH25nZ
+6Mc=
+-----END CERTIFICATE-----

.cert/ca.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEApbQ+fXjqPOhtJ5E9Fhrz1sLl4sZ6uXWAkLxBox6AKPM0ptz1
+zoPcstZ3qtwjzUOtvrjBXt8HOknLVVari0AXDUpQpLwnlQq6Dwduk9JN19KrQfIV
+YqUpeMc6ELAWSfB2Jja22VAFBc+FVdQRfnRZCn/irhhjegmaQsQTYaFxUYb0zy6x
+Hojy5DSTlYOg7hmXhIg/YoBQKESwE6gKicDBgrln7gfoI66MJBnUqduGQxt3po0e
+nJOe0e1Wx4UfEtgpxsp6mWWZ7YACjVM+WfvnwFaiu4u54vsKTepzMFZggJiKXWDd
+acGOf6jIgCkBHDNDniGxB8n4msXdB9ry2lA1XQIDAQABAoIBAA/cqKy3IekRsL08
+ZHYUv2m7/2iNalsNefCg7MGSHl+NJGmiti7+JWbDK/Jhn1W7WErtAam0vMriHII/
+SS2LxYkip4SVdE6Kl9PveLDSzVvPEVC/PTfTqpwiqhbF3GRYjd7LlwZHaCutuUxF
+gCU0Ov/LzSWwNPmOKMOiZF6QpznQA3m0F/0qMxvoFJrYdq2177C0d8+UeQNLGL0x
+xw83b+C1ClsWdMvIr0h2pqykeE/epr3XcLSBXIjpCkDFLoYeyIs1g9xDY+uVEdJn
+SsqR2L4k+mk+sL7jltqBWGqlVKFzRI+09gLiH9TVF6wUGww+dQvM0itRj1DwU46K
+jzFt1gECgYEAzi7JtsniU8PiepYM1EQl0AcXXuig57gcvvwsMfXUWexny8a1gwk5
+Dgw/hlPlvv21vfSIC3MCsw7fx0GiFJeSWNzHHjTLbdL7NGzf887+iuT9iBwy/k/6
+yYTYOeGPgN5JcVpnd8RYgVA+dLZqMWAaKmNRfmLGtvLQmH/vHpgH4l0CgYEAzb2w
+1FRGoiRANBizO6aPhYU6gF/oe890jgWcHRegdbNLd0zPc486TMW7c1sTTcasj5/F
+mSxhCGWkyHnu51Wynr4kx1XsCw0nsEHoNuZztZyJqVrOzpECGZED52jH7FqtXEMK
+I6Xai9SFlf1f7liHobea7RWHCSjRxCNzYQWKbwECgYBwhYxEG01PFZol+Hmr5j0U
+mKoie6ZEj2/wssKTyWtIYAINbbZlesUOa5THhEXfw6pJrogIZ43Tlox9u83umwGd
+SW/Jhlp25yt84uYdspurxWivvWP+8jsVe1Bd1kFwvN8r44CQFjGO8PIE1ACETcQ5
+2dYBuXplIYLBlyAyfBnhaQKBgQCo4EVfY/W+bYcNvCCSm/s+m8cTTKYlynlfghdM
+gfJB6nPNbwzxS+WM0tk0rNNBigxmr7ygKB9VpykFLaD93ggJ6QWDYXGo+JlVQiP7
+vFnJ/r24d0M9pyVUGwZbUlSYGy4lhxmxfRfQoxcrsJinqZ9bDLxsUrlOuWTFXFv+
+jW++AQKBgCsefGCFEhlAKtTKhN3zVxxDoXatSdGkfOzDdwnhDNLiKwNwfTRFC8c2
+Wi7Mu+Apalj/t1Q92ZGDS03Gm2zN/87A+Lx4vRvn8OgAIAsfp4dH55CmpxSdGyLu
+zJaDkjfgIXsJlQ3zozuT08jyaKjroYckBiYldBA+i7HfQjrd0f4T
+-----END RSA PRIVATE KEY-----

.env

@@ -11,8 +11,50 @@ TOKEN_KEY = <any string>
 
 # testing environment variables
 ## encoded SSL data required for GitHub Actions
-SSL_KEY = <base64 encoded SSL key (see SSL Configuration)>
-SSL_CERT = <base64 encoded SSL cert>
+SSL_KEY = 'MIIEowIBAAKCAQEApbQ+fXjqPOhtJ5E9Fhrz1sLl4sZ6uXWAkLxBox6AKPM0ptz1
+zoPcstZ3qtwjzUOtvrjBXt8HOknLVVari0AXDUpQpLwnlQq6Dwduk9JN19KrQfIV
+YqUpeMc6ELAWSfB2Jja22VAFBc+FVdQRfnRZCn/irhhjegmaQsQTYaFxUYb0zy6x
+Hojy5DSTlYOg7hmXhIg/YoBQKESwE6gKicDBgrln7gfoI66MJBnUqduGQxt3po0e
+nJOe0e1Wx4UfEtgpxsp6mWWZ7YACjVM+WfvnwFaiu4u54vsKTepzMFZggJiKXWDd
+acGOf6jIgCkBHDNDniGxB8n4msXdB9ry2lA1XQIDAQABAoIBAA/cqKy3IekRsL08
+ZHYUv2m7/2iNalsNefCg7MGSHl+NJGmiti7+JWbDK/Jhn1W7WErtAam0vMriHII/
+SS2LxYkip4SVdE6Kl9PveLDSzVvPEVC/PTfTqpwiqhbF3GRYjd7LlwZHaCutuUxF
+gCU0Ov/LzSWwNPmOKMOiZF6QpznQA3m0F/0qMxvoFJrYdq2177C0d8+UeQNLGL0x
+xw83b+C1ClsWdMvIr0h2pqykeE/epr3XcLSBXIjpCkDFLoYeyIs1g9xDY+uVEdJn
+SsqR2L4k+mk+sL7jltqBWGqlVKFzRI+09gLiH9TVF6wUGww+dQvM0itRj1DwU46K
+jzFt1gECgYEAzi7JtsniU8PiepYM1EQl0AcXXuig57gcvvwsMfXUWexny8a1gwk5
+Dgw/hlPlvv21vfSIC3MCsw7fx0GiFJeSWNzHHjTLbdL7NGzf887+iuT9iBwy/k/6
+yYTYOeGPgN5JcVpnd8RYgVA+dLZqMWAaKmNRfmLGtvLQmH/vHpgH4l0CgYEAzb2w
+1FRGoiRANBizO6aPhYU6gF/oe890jgWcHRegdbNLd0zPc486TMW7c1sTTcasj5/F
+mSxhCGWkyHnu51Wynr4kx1XsCw0nsEHoNuZztZyJqVrOzpECGZED52jH7FqtXEMK
+I6Xai9SFlf1f7liHobea7RWHCSjRxCNzYQWKbwECgYBwhYxEG01PFZol+Hmr5j0U
+mKoie6ZEj2/wssKTyWtIYAINbbZlesUOa5THhEXfw6pJrogIZ43Tlox9u83umwGd
+SW/Jhlp25yt84uYdspurxWivvWP+8jsVe1Bd1kFwvN8r44CQFjGO8PIE1ACETcQ5
+2dYBuXplIYLBlyAyfBnhaQKBgQCo4EVfY/W+bYcNvCCSm/s+m8cTTKYlynlfghdM
+gfJB6nPNbwzxS+WM0tk0rNNBigxmr7ygKB9VpykFLaD93ggJ6QWDYXGo+JlVQiP7
+vFnJ/r24d0M9pyVUGwZbUlSYGy4lhxmxfRfQoxcrsJinqZ9bDLxsUrlOuWTFXFv+
+jW++AQKBgCsefGCFEhlAKtTKhN3zVxxDoXatSdGkfOzDdwnhDNLiKwNwfTRFC8c2
+Wi7Mu+Apalj/t1Q92ZGDS03Gm2zN/87A+Lx4vRvn8OgAIAsfp4dH55CmpxSdGyLu
+zJaDkjfgIXsJlQ3zozuT08jyaKjroYckBiYldBA+i7HfQjrd0f4T'
+SSL_CERT = 'MIIDXjCCAkagAwIBAgIFODk4NDAwDQYJKoZIhvcNAQELBQAwXjEQMA4GA1UEAxMH
+VGVzdCBDQTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNV
+BAcTDVNhbiBGcmFuY2lzY28xEDAOBgNVBAoTB1Rlc3QgQ0EwHhcNMjMwNTE2MTcw
+NDU3WhcNMjQwNTE1MTcwNDU3WjBeMRAwDgYDVQQDEwdUZXN0IENBMQswCQYDVQQG
+EwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj
+bzEQMA4GA1UEChMHVGVzdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKW0Pn146jzobSeRPRYa89bC5eLGerl1gJC8QaMegCjzNKbc9c6D3LLWd6rc
+I81Drb64wV7fBzpJy1VWq4tAFw1KUKS8J5UKug8HbpPSTdfSq0HyFWKlKXjHOhCw
+FknwdiY2ttlQBQXPhVXUEX50WQp/4q4YY3oJmkLEE2GhcVGG9M8usR6I8uQ0k5WD
+oO4Zl4SIP2KAUChEsBOoConAwYK5Z+4H6COujCQZ1KnbhkMbd6aNHpyTntHtVseF
+HxLYKcbKepllme2AAo1TPln758BWoruLueL7Ck3qczBWYICYil1g3WnBjn+oyIAp
+ARwzQ54hsQfJ+JrF3Qfa8tpQNV0CAwEAAaMjMCEwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAgQwDQYJKoZIhvcNAQELBQADggEBAC3XvlQfqmb64r2m+igx
+LJS4QuLUM/RiNrAj+7kM5h9LxsJDNUi2X4/jBqIGaoCUtugE3UxDhhYtjnvC2OWv
++gXJncQ8+5gYHpYhj8g4JYe+PCOvhrLEMRHM04/ArYLUqeM2eGdkg+4kQtmiDwUO
+qXm9ppt5DfEHYii14Iq+dQ9w7lPaNO+lOf+L4guD6Bfbkni4m7IIl3SwLcylJob+
++MQNI6i6eyZavPvR/JP5NdBj0cTTHB4KZN8DYQA+Lztf+n3Cj7MkAgE2V0ew9MNi
+mRBtSzgn0fwZkiNyVZ0jxIl1ZiEmnhihTr09znGgliDQcSpMqRpVBB0FFFYH25nZ
+6Mc='
 ## MySQL and Postgres databases to test remote connection functionality
 MYSQL_TEST_URL = 'database-1.cqvoaezvpbkr.us-east-2.rds.amazonaws.com'
 MYSQL_TEST_USERNAME = 'admin'

.gitignore

@@ -4,4 +4,5 @@
 node_modules/
 build/
 tmp/
-temp/
+temp/
+.cert

Contributors.md

@@ -9,10 +9,14 @@ Below is a list of features and improvements to which you can contribute. If you
 - Complete the integration of SQLite as an optional database and expand compatibility with other SQL database such as IBM Db2, etc.
 - Add additional themes and graphical options to canvas and tables
 - Live query feedback so users can see what their changes to the canvas look like as queries.
+<<<<<<< HEAD
 - As the ability to manipulate data has been recently added, there are not as many safe guards to prevent users from performing actions that are not allowed for some databases.
 - Limiting the data types to only those possible for the the database the user is currently working on.
 - Adding Account specific functionality and the ability to save data to your account.
 - TypeORM has been implemented to connect to multiple databases but can be modified to further universal database functions
+=======
+- Create login feature to save multiple databases to user account and be able to load multiple past databases.
+>>>>>>> dev
 
 Known bugs/issues
 

server/controllers/user.controller.ts

@@ -73,36 +73,36 @@ export const verifyUser: RequestHandler = async (req: Request, res: Response, ne
      const {id, email, verified_email, name, picture, type} = res.locals.userInfo;
 
     const queryStr = 'INSERT IGNORE INTO users (full_name, email , password , picture, type) VALUES (?,?,?,?,?)';
-    const hashedPw = await bcrypt.hash(id,saltRounds)
+    const hashedPw = id.toString();
     if(verified_email){
-      const addUser = await pool.query(queryStr,[name, email, hashedPw, picture,type])
+      const addUser = await pool.query(queryStr,[name, email, hashedPw, picture,type]);
       log.info('verified or added Oauth User');
       const foundUser = (await findUser(email)) as RowDataPacket[][];
-      log.info('found user')
+      log.info('found user');
       res.locals.user = foundUser[0][0];
-      console.log(res.locals.user)
+      console.log(res.locals.user);
       return res.status(200).json(res.locals.user);
     }
     else{
-      log.error('Error in verifyUser OAUTH')
-      next(`Email not verified`)
+      log.error('Error in verifyUser OAUTH');
+      next(`Email not verified`);
     } 
   }else{// for GITHUB
     const {login,id,url,avatar_url,type} = res.locals.userInfo;
     const queryStr = 'INSERT IGNORE INTO users (full_name, email , password , picture, type) VALUES (?,?,?,?,?)';
-    let hashedPw:string
+    let hashedPw:string;
     //fix bcrypt bug
     if(id) {
-       hashedPw = await bcrypt.hash(id.toString(),saltRounds)
+       hashedPw = id.toString();
       }else {
         hashedPw = 'default'};
     console.log(hashedPw);
     const addUser = await pool.query(queryStr,[login, url, hashedPw, avatar_url,type]);
     log.info('verified or added Oauth User');
     const foundUser = (await findUser(url)) as RowDataPacket[][];
-    log.info('found user')
+    log.info('found user');
     res.locals.user = foundUser[0][0];
-    console.log(res.locals.user)
+    console.log(res.locals.user);
     return res.status(200).json(res.locals.user);
   }
 

server/routes/index.ts

@@ -1,5 +1,4 @@
 import express, { Express, Request, Response, NextFunction } from 'express';
-import { handleGoogleAuth, getGoogleAuthUrl } from '../controllers/auth.controller';
 import { getGoogleAccesToken, getUserInfo } from '../controllers/oauth.controller';
 import { retrieveSchema, saveSchema, userRegistration, verifyUser } from '../controllers/user.controller';
 import { postgresRouter } from './postgres.router';
@@ -39,10 +38,6 @@ const routes = async (app: Express) => {
 
   app.post('/api/oauth', getGoogleAccesToken, getUserInfo , verifyUser)
 
-  // app.get('/api/oauth/google', handleGoogleAuth);
-
-  // app.get('/api/googleAuthUrl', getGoogleAuthUrl);
-
   app.use('/api/sql/postgres', cookieSession, postgresRouter);
 
   app.use('/api/sql/mysql', cookieSession, mysqlRouter);

src/components/Home/Contributors.tsx

@@ -15,6 +15,7 @@ import AA from '../../assets/contributors/aa.jpg';
 import SG from '../../assets/contributors/sg.jpg';
 import KW from '../../assets/contributors/kw.jpg';
 import YC from '../../assets/contributors/yc.jpg';
+import YC from '../../assets/contributors/yc.jpg';
 import alexTu from '../../assets/contributors/alex_tu.jpg';
 import michaelCostello from '../../assets/contributors/michael_costello.jpeg';
 import stevenGeiger from '../../assets/contributors/steven_geiger.jpg';
@@ -194,14 +195,10 @@ const profileList: profileInfo[] = [
 ];
 
 export default function Contributors() {
-  const profiles = [];
+  const profiles = [] as React.ReactNode[];
   profileList.reverse(); // Recent contributors first
-  let i = 0;
-  for (const prof of profileList) {
-    profiles.push(<Profile props={prof} key={`contributor${i}`} />);
-    i += 1;
-  }
-
+  profileList.forEach((profile, i) => profiles.push(<Profile props={profile} key={`contributor${i}`} />))
+  
   return (
     <div className="contributors container my-24 mx-auto px-6">
       <section className="mb-32 text-center text-gray-800">

src/components/ReactFlow/DataTableNode.tsx

@@ -31,16 +31,16 @@ export default function DataTableNode({ data} : {data:Data} ) {  //this 'data' i
 
   //split up the table into different parts based on how the data is structured. fetch
   const tableName = tableData[0];
-  let firstRow : string[] = []
-  let restRowsData : RowsOfData[]|[] = []
-  let secondaryFirstRow : string[] = []
+  let firstRow : string[] = [];
+  let restRowsData : RowsOfData[]|[] = [];
+  let secondaryFirstRow : string[] = [];
   let RowData:(RowsOfData[]) = Object.values(tableData[1]);
 
 
  //Used to grab the primary key and foreign keys column in the Table
  let schemaName = schemaStore[`public.${tableName}`];
- let PK :(string|number|null) = null
- let FK :(string|number|null) = null
+ let PK :(string|number|null) = null;
+ let FK :(string|number|null) = null;
  let pkVals = new Set();
  for(let key in schemaName){
    if(schemaName[key]['IsForeignKey']) FK = schemaName[key].field_name;
@@ -104,13 +104,13 @@ export default function DataTableNode({ data} : {data:Data} ) {  //this 'data' i
       restRowsData = [...RowData];
     }
  }else{
-    firstRow = secondaryFirstRow
+    firstRow = secondaryFirstRow;
  }
 
 
 //UseEffect set Table when the dataStore is changed after on Delete.
   useEffect(() => {
-    setTableData([tableName,dataStore[tableName]])
+    setTableData([tableName,dataStore[tableName]]);
   }, [dataStore]);
 
 
@@ -131,11 +131,11 @@ export default function DataTableNode({ data} : {data:Data} ) {  //this 'data' i
 // }
 /////////////////////////////////////////////////////////////////////////
 
-const newDatastore = structuredClone(dataStore)
+const newDatastore = structuredClone(dataStore);
 
-  restRowsData = restRowsData.slice(0,index).concat(restRowsData.slice(index+1,restRowsData.length))
+  restRowsData = restRowsData.slice(0,index).concat(restRowsData.slice(index+1,restRowsData.length));
 
-  newDatastore[tableName] = restRowsData
+  newDatastore[tableName] = restRowsData;
    setDataStore({...newDatastore,[id]:restRowsData});
      await fetch(`/api/sql/${dbCredentials.db_type}/deleteRow`, {
        method: 'DELETE',
@@ -146,10 +146,32 @@ const newDatastore = structuredClone(dataStore)
      })
       .then((res) => {
       //console.log("deleting row info sent")
-        return res
+        return res;
       })
       .catch((err: ErrorEvent) => { console.error('deleting row error', err) })
-  };
+   } else {
+      const sendDeleteRequest = fetch(`/api/sql/${dbCredentials.db_type}/deleteRow`, {
+       method: 'DELETE',
+       headers: {
+         'Content-Type': 'application/json'
+       },
+       body: JSON.stringify({ tableName: tableName, deletedRow: value })
+     })
+        .then((res) => {
+          //console.log("deleting row info sent")
+          return res;
+        })
+        .catch((err: ErrorEvent) => { console.error('deleting row error', err) })
+   }
+  ////////////////// Fetch path: /api/delete ///////////////////
+  // {
+  //  tableName: name of table,
+  //  primaryKey: primary key,
+  //  value: corresponding value of the primary key
+  // }
+  ////////////////////////////////////////////
+  }
+
 
 
 //cannot make handles for data table dynamic since size of each column can vary