Skip to content

Commit

Permalink
Merge pull request #125 from oslabs-beta/main
Browse files Browse the repository at this point in the history
Adjusted to include default usernames in quick start
  • Loading branch information
choukevin612 authored Feb 9, 2024
2 parents c5dcab0 + f816576 commit 703fb91
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions backend/src/models/configModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ const configPath = `${home}/${configFile}`;

// ideally, we want to keep this config in a seperate file as well
export const defaultFile: DocConfigFile = {
mysql_options: { user: '', password: '', port: 3306 },
pg_options: { user: '', password: '', port: 5432 },
mysql_options: { user: 'root', password: '', port: 3306 },
pg_options: { user: 'postgres', password: '', port: 5432 },
rds_mysql_options: {
user: '',
password: '',
Expand Down
2 changes: 1 addition & 1 deletion config.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"mysql_options":{"user":"root","password":"","port":"3306"},"pg_options":{"user":"postgres","password":"Skittle5$s","port":"5434"},"rds_mysql_options":{"user":"","password":"","port":"","host":""},"rds_pg_options":{"user":"","password":"","port":"","host":""},"sqlite_options":{"filename":""},"directPGURI_options":{"connectionString":""}}
{"mysql_options":{"user":"root","password":"","port":"3306"},"pg_options":{"user":"postgres","password":"","port":"5434"},"rds_mysql_options":{"user":"","password":"","port":"","host":""},"rds_pg_options":{"user":"","password":"","port":"","host":""},"sqlite_options":{"filename":""},"directPGURI_options":{"connectionString":""}}
14 changes: 8 additions & 6 deletions frontend/components/views/QuickStartView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,15 @@ function getStepContent(step: number) {
<li> Run server(s) in the background</li>
<li>Ensure that PATH is enabled</li>
<li>
If existing user - sign in with user and password using gear icon
- top of left panel
MySQL username defaults to 'root' and postgres username defaults to 'postgres'

</li>
<li>
Ports for PostgresSQL and MySQL are defaulted to ‘5432’ and
‘3306’, respectively
MySQL and postgres password will be your password to log into mySQL and postgres database
</li>
<li>
Postgres new user: create user and password: eg. CREATE USER
davide WITH PASSWORD 'jw8s0F4’;
Ports for PostgresSQL and MySQL are defaulted to ‘5432’ and
‘3306’, respectively
</li>
<li>Enable full permissions for database manipulation</li>
</StepList>
Expand Down Expand Up @@ -150,6 +149,9 @@ function getStepContent(step: number) {
Use the brush icon on the top-right to automatically format the
query
</li>
<li>
Use the previous queries dropdown to view and select previously inputted queries
</li>
<li>Select &quot;RUN QUERY&quot; button to execute</li>
<li>
The planning time, execution time, and actual total time now show
Expand Down

0 comments on commit 703fb91

Please sign in to comment.