From ddb731c9f5e5e6bee4e546f4cd4f13682a1f8681 Mon Sep 17 00:00:00 2001
From: kwang929 <kevin.gm.wang@gmail.com>
Date: Wed, 26 Oct 2022 11:03:34 -0700
Subject: [PATCH] minor changes

---
 package-lock.json                    | 19 -------------------
 src/components/DBDisplay/Sidebar.tsx | 15 ---------------
 2 files changed, 34 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 55bce479..a30b1cd1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23928,16 +23928,6 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-<<<<<<< HEAD
-      "dev": true,
-      "requires": {}
-    },
-    "ansi-align": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
-=======
->>>>>>> 32e7c4a04bec20ed2641db162db17af56d72fcc2
       "dev": true,
       "requires": {}
     },
@@ -33618,15 +33608,6 @@
       "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
       "dev": true,
       "requires": {}
-<<<<<<< HEAD
-    },
-    "xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true
-=======
->>>>>>> 32e7c4a04bec20ed2641db162db17af56d72fcc2
     },
     "xmlchars": {
       "version": "2.2.0",
diff --git a/src/components/DBDisplay/Sidebar.tsx b/src/components/DBDisplay/Sidebar.tsx
index 9255521a..40a2c5e2 100644
--- a/src/components/DBDisplay/Sidebar.tsx
+++ b/src/components/DBDisplay/Sidebar.tsx
@@ -43,10 +43,7 @@ const Sidebar = (props:any) => {
     setDbCredentials(values);
     setConnectPressed(true);
    
-<<<<<<< HEAD
-=======
     // const dbSchema = await axios.post(`api/sql/${dbType}/getSchema`, values, config)
->>>>>>> dev2
     const dbSchema = await axios.post(`api/sql/${values.db_type}/getSchema`, values,{
       baseURL: 'http://localhost:8080'
     })
@@ -77,25 +74,13 @@ const Sidebar = (props:any) => {
         <br></br>
         <span className='form-item'>
           <label htmlFor="db_type" className='dark:text-white'>Database Type</label>
-<<<<<<< HEAD
-          <select className='form-box rounded bg-[#f8f4eb] focus:shadow-inner focus:shadow-[#eae7dd]/75 hover:shadow-sm dark:hover:shadow-[#f8f4eb]' id='db_type' name='db_type' 
-            onChange={(e)=>{
-              setFormValues({...formValues, db_type: e.target.value});
-              handleChange(e);
-            }} >
-=======
           <select className='form-box rounded bg-[#f8f4eb] focus:shadow-inner focus:shadow-[#eae7dd]/75 hover:shadow-sm dark:hover:shadow-[#f8f4eb]' id='db_type' name='db_type' onChange={(e)=>setFormValues({...formValues, db_type: e.target.value})} >
->>>>>>> dev2
             <option value='postgres'>PostgreSQL</option>
             <option value='mysql'>MySQL</option>
           </select>
         </span>
         <br></br>
-<<<<<<< HEAD
-        {selected === 'postgres' ? 
-=======
         {selected === 'PostgreSQL' ? 
->>>>>>> dev2
         <div>
           <span className='form-item'>
             <label htmlFor="database_link" className='dark:text-[#f8f4eb]'>Full Database Link</label>