Merge pull request #4 from acceleratedscience/wip

Moved API segments to @/api

Author: themoenen

src/App.vue

@@ -77,7 +77,7 @@ const commandLineStore = useCommandLineStore()
 const assistantStore = useAssistantStore()
 
 // API
-import { fileSystemApi } from '@/api/ApiService'
+import { fileSystemApi } from '@/api'
 // import webSocketClient from '@/api/WebSocketClient'// Experimental
 // webSocketClient()
 

src/api/ApiService.ts src/api/index.tssrc/api/ApiService.ts renamed to src/api/index.ts

@@ -1,11 +1,11 @@
 import type { Ref } from 'vue'
 // import domLog from '@/utils/dom-log'
 
-import FileSystemApi from '@/api/FileSystemApi'
-import MoleculesApi from '@/api/MoleculesApi'
-import MainApi from '@/api/MainApi'
-import ResultApi from '@/api/ResultApi'
-import DataframeApi from '@/api/DataframeApi'
+import FileSystemApi from '@/api/segments/FileSystemApi'
+import MoleculesApi from '@/api/segments/MoleculesApi'
+import MainApi from '@/api/segments/MainApi'
+import ResultApi from '@/api/segments/ResultApi'
+import DataframeApi from '@/api/segments/DataframeApi'
 
 export const fileSystemApi = new FileSystemApi()
 export const moleculesApi = new MoleculesApi()

src/api/DataframeApi.ts src/api/segments/DataframeApi.tssrc/api/DataframeApi.ts renamed to src/api/segments/DataframeApi.ts

@@ -1,15 +1,15 @@
 API calls should be implementyed as such:
 
     // API
-    import { apiFetch, generalApi } from '@/api/ApiService'
+    import { apiFetch, generalApi } from '@/api'
 
     // Definitions
     const loading = ref<boolean>(false)
     const loadingError = ref<string | null>(null)
     const status = ref<number | null>(null)
 
     const filePath: string = route.path.replace(/(^\/headless)?\/~(\/)?/, '')
-    
+
     apiFetch(generalApi.fetchFoobar(param1, param2), {
         onSuccess: (response) => {
             //
@@ -21,9 +21,9 @@ API calls should be implementyed as such:
         loadingError,
         status,
 
-        // When called from within Pinia, we use 
+        // When called from within Pinia, we use
         // callback functions instead of references.
         setLoading: this.setLoading,
-	    setLoadingError: this.setLoadingError,
-	    setStatus: this.setStatus,
-    })
+        setLoadingError: this.setLoadingError,
+        setStatus: this.setStatus,
+    })

src/api/FileSystemApi.ts src/api/segments/FileSystemApi.tssrc/api/FileSystemApi.ts renamed to src/api/segments/FileSystemApi.ts

@@ -16,7 +16,7 @@
 import { watch, onMounted, ref } from 'vue'
 
 // API
-import { apiFetch, moleculesApi } from '@/api/ApiService'
+import { apiFetch, moleculesApi } from '@/api'
 
 // Components
 import BaseIconButtonToggle from '@/components/BaseIconButtonToggle.vue'