Merge pull request #126 from oslabs-beta/main

SeeQR V14.0 Launch

Author: lovelyjoy1991

Diff for: .eslintrc.json

@@ -35,6 +35,9 @@
   "rules": {
     "react/jsx-filename-extension": [1, { "extensions": [".jsx", ".tsx"] }],
 
+    "no-shadow": "off",
+    "@typescript-eslint/no-shadow": ["error"],
+
     "no-use-before-define": "off",
     "@typescript-eslint/no-use-before-define": ["error"],
 
@@ -69,10 +72,7 @@
     "react/jsx-props-no-spreading": "off",
 
     "camelcase": "off"
-
-    // "import/no-extraneous-dependencies": ["error", { "devDependencies": true }], **trying to resolve the electron issue
   },
-  // "settings": "import/core-modules: [ electron ]",  **trying to resolve the electron issue
   "settings": {
     "react": {
       "version": "detect"
@@ -84,7 +84,8 @@
       "typescript": {
         "alwaysTryTypes": true
       }
-    }
+    },
+    "import/core-modules": ["electron"] // resolves "electron s/b listed in proj dep, not devDep https://github.com/SimulatedGREG/electron-vue/issues/423
   },
   "root": true
 }

Diff for: .vscode/launch.json

@@ -1,9 +1,50 @@
+// {
+//   // Use IntelliSense to learn about possible attributes.
+//   // Hover to view descriptions of existing attributes.
+//   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+//   "version": "0.2.0",
+//   "configurations": [
+//     {
+//       "type": "chrome",
+//       "request": "launch",
+//       "name": "Launch Chrome against localhost",
+//       "url": "http://localhost:8080",
+//       "webRoot": "${workspaceFolder}"
+//     }
+//   ]
+// }
+
+// New Electron tutorial launch.json code
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
+  "compounds": [
+    {
+      "name": "Main + renderer",
+      "configurations": ["Main", "Renderer"],
+      "stopAll": true
+    }
+  ],
   "configurations": [
+    {
+      "name": "Renderer",
+      "port": 9222,
+      "request": "attach",
+      "type": "chrome",
+      "webRoot": "${workspaceFolder}"
+    },
+    {
+      "name": "Main",
+      "type": "node",
+      "request": "launch",
+      "cwd": "${workspaceFolder}",
+      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+      "windows": {
+        "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
+      },
+      "args": [".", "--remote-debugging-port=9222"],
+      "outputCapture": "std",
+      "console": "integratedTerminal"
+    },
     {
       "type": "chrome",
       "request": "launch",
@@ -12,4 +53,4 @@
       "webRoot": "${workspaceFolder}"
     }
   ]
-}
+}

Diff for: DEV_README.md

@@ -3,7 +3,7 @@
 <img src="./assets/readmeImages/logo_readme.png" height=300/>
 
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/oslabs-beta/SeeQR)
-![Release: 13.0.0](https://img.shields.io/badge/Release-13.0.0-red)
+![Release: 14.0.0](https://img.shields.io/badge/Release-14.0.0-red)
 ![License: MIT](https://img.shields.io/badge/License-MIT-orange.svg)
 ![Contributions Welcome](https://img.shields.io/badge/Contributions-welcome-blue.svg)
 [![Twitter](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2Ftheseeqr)](https://twitter.com/theseeqr)
@@ -15,7 +15,7 @@
 
 </div>
 
-### For the latest in-depth docs for v13.0.0, please visit our [docs site](http://www.seeqrapp.com/docs).
+### For the latest in-depth docs for v14.0.0, please visit our [docs site](http://www.seeqrapp.com/docs).
 
 ## Table of Contents
 
@@ -41,6 +41,7 @@ To get started on contributing and editing databases to this project:
 
 - [Electron](https://www.electronjs.org/docs)
 - [React](https://reactjs.org/)
+- [React-Redux](https://react-redux.js.org/)
 - [Typescript](https://www.typescriptlang.org/)
 - [PostgreSQL](https://www.postgresql.org/)
 - [MySQL](https://www.mysql.com/)
@@ -76,14 +77,14 @@ To get started on contributing and editing databases to this project:
 - Databases
 
   - In the 'DATABASES' view, an interactive Entity Relationship Diagram (`ER DIAGRAM`) is displayed for the selected database.
+
     - Users can now save table layout in version 13.
       <br>
 
       <div align="center">
         <img src="./assets/readmeImages/gifs/save_db_layout.gif" width=800/>
       </div>
 
-
   - Users can select `TABLE` to see selected database in tabular form.
 
     - Users can select a table from a list of all the tables in the schema of the currently selected database.
@@ -126,11 +127,12 @@ To get started on contributing and editing databases to this project:
   </div>
 
 <br>
+
 - Create/Edit Database
 
-- Users can create a new database from scratch by clicking the `Create New Database` button at the bottom of the sidebar.
-- Users can modify the newly created database as well as any existing databases using the `ER Diagram` to create/change/delete tables and columns.
-- The `Export` button will write a .sql file on the user's desktop of the selected database.
+  - Users can create a new database from scratch by clicking the `Create New Database` button at the bottom of the sidebar.
+  - Users can modify the newly created database as well as any existing databases using the `ER Diagram` to create/change/delete tables and columns.
+  - The `Export` button will write a .sql file on the user's desktop of the selected database.
 
 <br>
 <div align="center">
@@ -146,11 +148,11 @@ To get started on contributing and editing databases to this project:
   - To execute the query, simply select the 'RUN QUERY' button at the bottom of the panel or press 'Ctrl-Enter' on the keyboard.
   - Users have the option to run multiple queries, allowing users to obtain more reliable testing results.
   - Version 13 introduces a new feature that enables users to access and view previous queries. Upon selecting a previous query, it populates the query input field, allowing users to make edits before executing.
-  </br>
-  <br>
-  <div align="center">
+    </br>
+    <br>
+    <div align="center">
 
-    <img src="./assets/readmeImages/gifs/query.gif" width=800/>
+      <img src="./assets/readmeImages/gifs/query.gif" width=800/>
 
   </div>
    <br />
@@ -206,11 +208,13 @@ The outcome results from each query, both retrieved data and analytics, are stor
 
 ## Contributing
 
-We've released SeeQR because it's a useful tool to help optimize SQL databases. Additional features, extensions, and improvements will continue to be introduced. We are thankful for any contributions from the community and we encourage you to try SeeQR out to make or suggest improvements where you see fit! If you encounter any issues with the application, please report them in the issues tab or submit a PR. Thank you for your interest!
+We've released SeeQR because it's a useful tool to help optimize SQL databases. Additional features, extensions, and improvements will continue to be introduced. Please refer to the [DEV_README](https://github.com/open-source-labs/SeeQR/blob/main/DEV_README.md) for a list of improvements we are looking to implement and that are open to contributors.
+
+We are thankful for any contributions from the community and we encourage you to try SeeQR out to make or suggest improvements where you see fit! If you encounter any issues with the application, please report them in the issues tab or submit a PR. Thank you for your interest!
 
 ## Core Team
 
-[Kevin Chou](https://github.com/choukevin612) |[Zoren Labrador](https://github.com/zorenal) |[Elaine Wong](https://github.com/user-byte123) | [Cathy Luong](https://github.com/cyliang93) | [Derek Koh](https://github.com/derekoko) | [Peter Zepf](https://github.com/peterzepf) | [Tony Gao](https://github.com/tgao17) | [Ching-Yuan Lai (Eric)](https://github.com/paranoidFrappe) | [Jamie Zhang](https://github.com/haemie) | [Julian Macalalag](https://github.com/juzi3) | [Nathan Chong](https://github.com/nathanhchong) | [Junaid Ahmed](https://github.com/junaid-ahmed7) | [Chase Sizemore](https://github.com/ChaseSizemore) | [Oscar Romero](https://github.com/creaturenex) | [Anthony Deng](https://github.com/anthonyadeng) | [Aya Moosa](https://github.com/Hiya-its-Aya) | [Trevor Ferguson](https://github.com/TrevorJFerguson) | [Pauline Nguyen](https://github.com/paulinekpn) | [Utkarsh Uppal](https://github.com/utyvert) | [Fred Jeong](https://github.com/fred-jeong) | [Gabriel Kime](https://github.com/wizardbusiness) | [Chris Fryer](github.com/frynoceros) | [Ian Grepo](https://github.com/RadiantGH) | [Michelle Chang](https://github.com/mkchang168) | [Jake Bradbeer](https://github.com/JBradbeer) | [Bryan Santos](https://github.com/santosb93) | [William Trey Lewis](https://github.com/treyfrog128) | [Brandon Lee](https://github.com/BrandonW-Lee) | [Casey Escovedo](https://github.com/caseyescovedo) | [Casey Walker](https://github.com/cwalker3011) | [Catherine Chiu](https://github.com/catherinechiu) | [Chris Akinrinade](https://github.com/chrisakinrinade) | [Cindy Chau](https://github.com/cindychau) | [Claudio Santos](https://github.com/Claudiohbsantos) | [Eric Han](https://github.com/ericJH92) | [Faraz Akhtar](https://github.com/faraza22) | [Frank Norton](https://github.com/FrankNorton32) | [Harrison Nam](https://github.com/harrynam07) | [James Kolotouros](https://github.com/dkolotouros) | [Jennifer Courtner](https://github.com/jcourtner) | [John Wagner](https://github.com/jwagner988) | [Justin Dury-Agri](https://github.com/justinD-A) | [Justin Hicks](https://github.com/JuiceBawks) | [Katie Klochan](https://github.com/kklochan) | [May Wirapa Boonyasurat](https://github.com/mimiwrp) | [Mercer Stronck](https://github.com/mercerstronck) | [Muhammad Trad](https://github.com/muhammadtrad) | [Richard Guo](https://github.com/richardguoo) | [Richard Lam](https://github.com/rlam108) | [Sam Frakes](https://github.com/frakes413) | [Serena Kuo](https://github.com/serenackuo) | [Timothy Sin](https://github.com/timothysin) | [Vincent Trang](https://github.com/vincentt114)
+[Zhijiao Li](https://github.com/lovelyjoy1991) | [Ting Li](https://github.com/Tingg-v1) | [Michael Ma](https://github.com/michaelma7) | [Ivan Navarro](https://github.com/navaiva) | [Joseph Cho](https://github.com/jocho5) | [Kevin Chou](https://github.com/choukevin612) |[Zoren Labrador](https://github.com/zorenal) |[Elaine Wong](https://github.com/user-byte123) | [Cathy Luong](https://github.com/cyliang93) | [Derek Koh](https://github.com/derekoko) | [Peter Zepf](https://github.com/peterzepf) | [Tony Gao](https://github.com/tgao17) | [Ching-Yuan Lai (Eric)](https://github.com/paranoidFrappe) | [Jamie Zhang](https://github.com/haemie) | [Julian Macalalag](https://github.com/juzi3) | [Nathan Chong](https://github.com/nathanhchong) | [Junaid Ahmed](https://github.com/junaid-ahmed7) | [Chase Sizemore](https://github.com/ChaseSizemore) | [Oscar Romero](https://github.com/creaturenex) | [Anthony Deng](https://github.com/anthonyadeng) | [Aya Moosa](https://github.com/Hiya-its-Aya) | [Trevor Ferguson](https://github.com/TrevorJFerguson) | [Pauline Nguyen](https://github.com/paulinekpn) | [Utkarsh Uppal](https://github.com/utyvert) | [Fred Jeong](https://github.com/fred-jeong) | [Gabriel Kime](https://github.com/wizardbusiness) | [Chris Fryer](github.com/frynoceros) | [Ian Grepo](https://github.com/RadiantGH) | [Michelle Chang](https://github.com/mkchang168) | [Jake Bradbeer](https://github.com/JBradbeer) | [Bryan Santos](https://github.com/santosb93) | [William Trey Lewis](https://github.com/treyfrog128) | [Brandon Lee](https://github.com/BrandonW-Lee) | [Casey Escovedo](https://github.com/caseyescovedo) | [Casey Walker](https://github.com/cwalker3011) | [Catherine Chiu](https://github.com/catherinechiu) | [Chris Akinrinade](https://github.com/chrisakinrinade) | [Cindy Chau](https://github.com/cindychau) | [Claudio Santos](https://github.com/Claudiohbsantos) | [Eric Han](https://github.com/ericJH92) | [Faraz Akhtar](https://github.com/faraza22) | [Frank Norton](https://github.com/FrankNorton32) | [Harrison Nam](https://github.com/harrynam07) | [James Kolotouros](https://github.com/dkolotouros) | [Jennifer Courtner](https://github.com/jcourtner) | [John Wagner](https://github.com/jwagner988) | [Justin Dury-Agri](https://github.com/justinD-A) | [Justin Hicks](https://github.com/JuiceBawks) | [Katie Klochan](https://github.com/kklochan) | [May Wirapa Boonyasurat](https://github.com/mimiwrp) | [Mercer Stronck](https://github.com/mercerstronck) | [Muhammad Trad](https://github.com/muhammadtrad) | [Richard Guo](https://github.com/richardguoo) | [Richard Lam](https://github.com/rlam108) | [Sam Frakes](https://github.com/frakes413) | [Serena Kuo](https://github.com/serenackuo) | [Timothy Sin](https://github.com/timothysin) | [Vincent Trang](https://github.com/vincentt114)
 
 ## License
 

Diff for: README.md

@@ -0,0 +1,50 @@
+// import mysql from 'mysql2/promise';
+import databaseConnections from '../../../../backend/src/db/databaseConnections';
+const { PG_DBConnect, PG_DBDisconnect, MSQL_DBConnect, MSQL_DBQuery, RDS_PG_DBConnect, RDS_MSQL_DBConnect, RDS_MSQL_DBQuery, SQLite_DBConnect } = databaseConnections
+// import { PoolConfig } from 'pg';
+
+
+
+
+describe('Database Connection Tests', () => {
+    it('should fail to connect with invalid credentials', async () => {
+      try {
+        await PG_DBConnect('postgres://invalid:credentials@localhost/dbname', 'dbname');
+      } catch (error) {
+        expect(error).toBeDefined();
+      }
+    });
+  });
+
+  describe('MySQL', () => {
+    const MYSQL_CREDS = {
+      host: 'localhost',
+      user: 'username',
+      password: 'password',
+      database: 'dbname',
+      waitForConnections: true,
+      connectionLimit: 10,
+      queueLimit: 0,
+      multipleStatements: true,
+    };
+
+    it('should connect and perform a query successfully', async () => {
+      await MSQL_DBConnect(MYSQL_CREDS);
+      await MSQL_DBQuery('dbname');
+    });
+
+    it('should fail to connect with invalid credentials', async () => {
+      const invalidCreds = {...MYSQL_CREDS, user: 'invalid', password: 'credentials' };
+      try {
+        await MSQL_DBConnect(invalidCreds);
+      } catch (error) {
+        expect(error).toBeDefined();
+      }
+    });
+  });
+
+  describe('SQLite', () => {
+    it('should connect successfully', () => {
+      SQLite_DBConnect(':memory:');
+    });
+  });

Diff for: __tests__/backend/src/db/databaseConnection.spec.ts

@@ -0,0 +1 @@
+// tests for mainmenu file

Diff for: __tests__/backend/src/mainMenu.spec.ts

@@ -0,0 +1,2 @@
+// test for config file
+

Diff for: __tests__/backend/src/models/configModel.spec.ts

@@ -0,0 +1 @@
+// tess for connection model file