fix merge conflicts. tweak type declarations on src/store

open-source-labs · Oct 26, 2022 · 53306d7 · 53306d7
1 parent 3426b8d
commit 53306d7
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 47 deletions.
diff --git a/src/components/DBDisplay/Sidebar.tsx b/src/components/DBDisplay/Sidebar.tsx
@@ -43,10 +43,6 @@ 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 +73,17 @@ 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>

diff --git a/src/store/credentialsStore.ts b/src/store/credentialsStore.ts
@@ -5,22 +5,24 @@
 import create from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 
-let credentialsStore = (set) => ({
+let credentialsStore = (set: (arg0: { (state: any): any; (state: any): any; }) => any) => ({
   //user state
   user: null,
   //user
-  setUser: (userObject) => set((state) => ({ ...state, user: userObject })),
+  setUser: (userObject: any) => set((state: any) => ({ ...state, user: userObject })),
 
   //dbCredentials state
   dbCredentials: null,
   //dbFormInput is an object
-  setDbCredentials: (dbFormInput) =>
-    set((state) => ({ ...state, dbCredentials: dbFormInput })),
+  setDbCredentials: (dbFormInput: any) =>
+    set((state: any) => ({ ...state, dbCredentials: dbFormInput })),
 });
 
-credentialsStore = devtools(credentialsStore);
-credentialsStore = persist(credentialsStore);
-const useCredentialsStore = create(credentialsStore);
+// credentialsStore = devtools(credentialsStore);
+// credentialsStore = persist(credentialsStore);
+// const useCredentialsStore = create(credentialsStore);
+
+const useCredentialsStore = create(persist(devtools(credentialsStore)))
 
 export default useCredentialsStore;
 

diff --git a/src/store/displayStore.ts b/src/store/displayStore.ts
@@ -7,17 +7,19 @@ import { devtools, persist } from 'zustand/middleware';
 
 
 
-const displayStore = (set) => ({
+const displayStore = (set: (arg0: (state: any) => any) => any) => ({
   //displayStore state
   displayStore: null,
   //schema is an object
-  setDisplayStore: (schema) =>
-    set((state) => ({ ...state, displayStore: schema })),
+  setDisplayStore: (schema: any) =>
+    set((state: any) => ({ ...state, displayStore: schema })),
 });
 
-displayStore = devtools(displayStore);
-displayStore = persist(displayStore);
-const useDisplayStore = create(displayStore);
+// displayStore = devtools(displayStore);
+// displayStore = persist(displayStore);
+// const useDisplayStore = create(displayStore);
+
+const useDisplayStore = create(persist(devtools(displayStore)))
 
 export default useDisplayStore;
 

diff --git a/src/store/logStore.ts b/src/store/logStore.ts
@@ -5,16 +5,18 @@
 import create from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 
-let logStore = (set) => ({
+let logStore = (set: (arg0: (state: any) => any) => any) => ({
   //logs state
   logs: null,
   //logEntries is an array
-  setLogs: (logEntries) => set((state) => ({ ...state, logs: logEntries })),
+  setLogs: (logEntries: any) => set((state: any) => ({ ...state, logs: logEntries })),
 });
 
-logStore = devtools(logStore);
-logStore = persist(logStore);
-const useLogStore = create(logStore);
+// logStore = devtools(logStore);
+// logStore = persist(logStore);
+// const useLogStore = create(logStore);
+
+const useLogStore = create(persist(devtools(logStore)))
 
 export default useLogStore;
 

diff --git a/src/store/schemaStore.ts b/src/store/schemaStore.ts
@@ -5,17 +5,19 @@
 import create from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 
-let schemaStore = (set) => ({
+let schemaStore = (set: (arg0: (state: any) => any) => any) => ({
   //schemaStore state
   schemaStore: null,
   //schema is an object
-  setSchemaStore: (schema) =>
-    set((state) => ({ ...state, schemaStore: schema })),
+  setSchemaStore: (schema: any) =>
+    set((state: any) => ({ ...state, schemaStore: schema })),
 });
 
-schemaStore = devtools(schemaStore);
-schemaStore = persist(schemaStore);
-const useSchemaStore = create(schemaStore);
+// schemaStore = devtools(schemaStore);
+// schemaStore = persist(schemaStore);
+// const useSchemaStore = create(schemaStore);
+
+const useSchemaStore = create(persist(devtools(schemaStore)));
 
 export default useSchemaStore;
 

diff --git a/src/store/settingsStore.ts b/src/store/settingsStore.ts
@@ -1,19 +1,26 @@
-//
-// State Management for settings (button toggles, view toggles, etc.)
-//
-
+// //
+// // State Management for settings (button toggles, view toggles, etc.)
+// //
+// export default useSettingsStore;
 import create from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 
-let settingsStore = (set) => ({
-  //darkMode state defaults to true
+let settingsStore = (set: (arg0: { (state: any): any; (state: any): any; (state: any): any; }) => any) => ({
   darkMode: true,
-  //toggles darkMode
-  setSchemaStore: () => set((state) => ({ darkMode: !state.darkMode })),
+  setDarkMode: () => set((state: { darkMode: any; }) => ({ ...state, darkMode: !state.darkMode })),
+
+  sidebarDisplayState: false,
+
+  welcome: true,
+  setWelcome: (input: any) => set((state: any) => ({ ...state, welcome: input })),
+
+  editRefMode: false,
+  setEditRefMode: (input: any) => set((state: any) => ({ ...state, editRefMode: input })),
 });
 
-settingsStore = devtools(settingsStore);
-settingsStore = persist(settingsStore);
-const useSettingsStore = create(settingsStore);
+// settingsStore = devtools(settingsStore);
+const useSettingsStore = create(devtools(settingsStore));
 
 export default useSettingsStore;
+
+