Skip to content

Commit 5b8f018

Browse files
authored
Merge pull request #122 from oslabs-beta/main
Merging OS Labs Beta main branch into Open Source Labs main branch
2 parents ec09e2a + f4b5d20 commit 5b8f018

File tree

103 files changed

+1807
-31073
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1807
-31073
lines changed

.DS_Store

0 Bytes
Binary file not shown.

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
.idea/
22
.vscode/
3-
.env/
3+
.env
44
node_modules/
55
build/
66
tmp/
77
temp/
88
.cert/
99
ca.crt/
1010
ca.key/
11+
coverage/

Contributors.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,24 @@
22

33
Below is a list of features and improvements to which you can contribute. If you have any additional ideas, please raise an issue or implement them as well!
44

5+
- When a user clicks "Show Data" in build database after creating a table, it will immediately crash the display page if the table does not have a primary and foreign key connected to another table. This is due to it not have its "nodes and edges" not being rendered in the "Flow.tsx" file. A future iteration team should consider making a conditional statement that will alert the user that they currently have no Entity Relationship establish within their schema. (see first bug in known bugs/issue)
56
- Logging needs a default settings list and direct reimport into live database.
6-
- The SQL code to import has been placed into the DB_Schemas folder along with SQL Schema dumps. Also, log setting functionality is currently limited to Postgres databases and the code needs to be expanded to query and display log setting info from MySQL databases.
7-
- Db-schemas
8-
- The schemas are saved under db_schemas and is saved in the server. Have a way to delete the schemas on the server from the front end. It would also be convenient to add these schemas to a list of existing schemas and be able to pull these schemas to display for the user to avoid having to make a new connection to the same database multiple times.
9-
- Complete the integration of SQLite as an optional database and expand compatibility with other SQL database such as IBM Db2, etc.
7+
- The SQL code to import has been placed into the DB_Schemas folder along with SQL Schema dumps. Also, log setting functionality is currently limited to Postgres databases and the code needs to be expanded to query and display log setting info from MySQL databases.
8+
- Increasing compatibility with other SQL-based databases: Although PostgreSQL and MySQL databases are perfectly compatible, dbSpy is currently not optimized to work with other SQL databases like Oracle SQL and Microsoft SQL.
9+
- Saving multiple databases per user: dbSpy allows users to save and load one database per account, but allowing users to store multiple databases would make the application more functional.
10+
- Allow users to delete one or more of their saved databases
1011
- Add additional themes and graphical options to canvas and tables
1112
- Live query feedback so users can see what their changes to the canvas look like as queries.
1213
- 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.
13-
- Limiting the data types to only those possible for the the database the user is currently working on.
14-
- Adding Account specific functionality and the ability to save data to your account.
14+
- Limiting the data types to only those possible for the database the user is currently working on.
1515
- TypeORM has been implemented to connect to multiple databases but can be modified to further universal database functions
16-
- Create login feature to save multiple databases to user account and be able to load multiple past databases.
1716

1817
Known bugs/issues
1918

19+
- Clicking show data after building a database by adding tables causes the app to crash. *-Urgent Fix Needed*
20+
- Clearing canvas after connecting a database and attempting to create a new table without refreshing causes the website to crash (blank screen).
2021
- Undo function will not revert the state of the canvas to the point where it is empty.
21-
- Attempting to change the name of a column while adding a foreign key will result in the page crashing and going all white. Changing the column name is currently disabled.
2222
- When creating a new foreign key on a column, if you click submit while there is no table selected, the display area will shrink to a very small square in the top left corner of the page.
23-
- Exporting your query has been affected in the course of adding additional databases and needs to be reorganized
23+
- Exporting your query has been affected in the course of adding additional databases and needs to be reorganized
24+
- The webpage reverts back to dark mode when it is refreshed even when if it is already in light mode
25+

README.md

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div align="center">
22

33
<a href="https://makeapullrequest.com">![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)</a>
4-
<a href="https://img.shields.io/badge/version-1.0.1-blue">![Version](https://img.shields.io/badge/version-4.0.0-blue)</a>
4+
<a href="https://img.shields.io/badge/version-1.0.1-blue">![Version](https://img.shields.io/badge/version-6.0.0-blue)</a>
55
![GitHub Stars](https://img.shields.io/github/stars/oslabs-beta/JAKT?color=%23fb7182)
66
![MIT License](https://img.shields.io/badge/license-MIT-yellow)
77

@@ -17,14 +17,17 @@
1717
<p align="center">An open-source data modeling tool to facilitate relational database development</p>
1818
<!-- <p align="center">dbSpy是一个促进关系数据库开发的开源数据建模工具。</p> -->
1919

20-
### New Features with Version 5.0
20+
### New Features with Version 6.0
2121

22-
- Enhanced support for SQL databases with expanded options.
23-
- Introduction of visualized DATA tables for improved data analysis.
22+
- Enchanced JWT-based user authentication to maintain user login sessions
23+
- Securely manage user-specific database storage and retrieval
24+
- Expanded database connnectivity to include MySQL databases for visualization.
2425
- Robust CRUD functionality enabling the addition, modification, and deletion of rows in DATA tables within the database.
25-
- Capability to remove and add tables as needed.
26+
- Redesigned the display page UI to produce a more mordern aesthetic
27+
- Redesigned the UI for the login and signup pages to create a more user-friendly login experience
28+
- Improved Undo/Redo functionality
2629
- Implementation of Google and GitHub OAuth log-ins for streamlined user authentication.
27-
30+
- Improve TDD coverage for Zustand stores.
2831

2932
### Use Cases
3033

@@ -59,11 +62,11 @@
5962

6063
8. **User Sessions:** Sign up/Log in securely with either Google/Github OAuth or JWTs/Bcrypt
6164

62-
9. **Save/Load:** Store and reload past database sessions through your user account *-CURRENTLY UNDER UPDATE*
65+
9. **Save/Load:** Store and reload past database sessions through your user accoun
6366

6467
10. **Dark Mode:** Visual settings to provide a more comfortable viewing experience in low-light environements
6568

66-
## <img src="images/Darkmode.png">
69+
## <img src="images/ConnectedToDB.png">
6770

6871

6972
### Getting started
@@ -175,8 +178,6 @@ npm run cert:linux
175178

176179

177180

178-
## <img src="images/LandingPageDemo.gif">
179-
180181

181182

182183
### Uploading your database's SQL file
@@ -197,8 +198,11 @@ npm run cert:linux
197198
4. Click on the confirm icon to save the column/row.
198199
5. The changes made in DATA table will be updated in your database.
199200
6. Click on the cancel icon to cancel the addition.
200-
<img src="images/Create%20tables.png">
201-
<img src="images/addRow.png">
201+
202+
203+
<img src="images/zuckOverWaz.png">
204+
205+
<img src="images/zuckTables.png">
202206

203207

204208
### Editing an existing row of a DATA table
@@ -215,7 +219,7 @@ npm run cert:linux
215219
3. Click on the cancel icon to cancel the deletion.
216220

217221

218-
## <img src="images/MakingEditsDemo.gif">
222+
## <img src="images/DbSpy Gif.gif">
219223

220224

221225
### Adding a foreign key reference to a column
@@ -258,6 +262,11 @@ npm run cert:linux
258262
---
259263

260264
### Credits/Contributors
265+
- David Jones • [LinkedIn](http://www.linkedin.com/in/davidjonesswe/)[Github](https://github.com/david-jones-git)
266+
- John Ruiz • [LinkedIn](https://www.linkedin.com/in/john-ruiz-profile/)[Github](https://github.com/johnruiz17)
267+
- Minh Chang • [LinkedIn](https://www.linkedin.com/in/minh-chang/)[Github](https://github.com/miha-cha)
268+
- Darius Okafor • [LinkedIn](https://www.linkedin.com/in/dariusokafor/)[Github](https://github.com/DE7741)
269+
- Parwinder Singh • [LinkedIn](http://www.linkedin.com/in/singh-parwinder/)[Github](https://github.com/PintaAE86)
261270
- Yichung Chiu • [LinkedIn](https://www.linkedin.com/in/yichung-chiu-b14a94272/)[Github](https://github.com/ychiu5896)
262271
- Joseph Tejeda • [LinkedIn](https://www.linkedin.com/in/atxjtejeda/)[Github](https://github.com/JosephTejeda)
263272
- Stephen Havig • [LinkedIn](https://www.linkedin.com/in/stephen-havig-199340145/)[Github](https://github.com/Stephen-Havig)

0 commit comments

Comments
 (0)