Adapts some imports (#342)

* Adapts some imports * Adapts further imports --------- Co-authored-by: Aaron Zielstorff <[email protected]>
eclipse-basyx · Mar 1, 2025 · 2c9c118 · 2c9c118
1 parent e123845
commit 2c9c118
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 21 deletions.
diff --git a/aas-web-ui/src/authService.ts b/aas-web-ui/src/authService.ts
@@ -6,7 +6,7 @@
 
 import Keycloak from 'keycloak-js';
 import { KeycloakOnLoad } from 'keycloak-js';
-import { useAuthStore } from './store/AuthStore';
+import { useAuthStore } from '@/store/AuthStore';
 
 /**
  * Logs in a user with direct grant using Keycloak

diff --git a/aas-web-ui/src/components/UIComponents/SubmodelElementGroup.vue b/aas-web-ui/src/components/UIComponents/SubmodelElementGroup.vue
@@ -258,10 +258,10 @@
 // TODO Transfer to composition API
 <script lang="ts">
     import { defineComponent } from 'vue';
+    import DescriptionElement from '@/components/UIComponents/DescriptionElement.vue';
     import { useConceptDescriptionHandling } from '@/composables/AAS/ConceptDescriptionHandling';
     import { useReferableUtils } from '@/composables/AAS/ReferableUtils';
     import { useAASStore } from '@/store/AASDataStore';
-    import DescriptionElement from './DescriptionElement.vue';
 
     export default defineComponent({
         name: 'SubmodelElementGroup',

diff --git a/aas-web-ui/src/composables/AAS/AASHandling.ts b/aas-web-ui/src/composables/AAS/AASHandling.ts
@@ -1,10 +1,10 @@
+import { useSMHandling } from '@/composables/AAS/SMHandling';
 import { useAASRegistryClient } from '@/composables/Client/AASRegistryClient';
 import { useAASRepositoryClient } from '@/composables/Client/AASRepositoryClient';
 import { useAASStore } from '@/store/AASDataStore';
 import { extractEndpointHref } from '@/utils/AAS/DescriptorUtils';
 import { extractId as extractIdFromReference } from '@/utils/AAS/ReferenceUtil';
 import { formatDate } from '@/utils/DateUtils';
-import { useSMHandling } from './SMHandling';
 
 export function useAASHandling() {
     // Composables

diff --git a/aas-web-ui/src/composables/AAS/SubmodelTemplates/ContactInformation_v1_0Utils.ts b/aas-web-ui/src/composables/AAS/SubmodelTemplates/ContactInformation_v1_0Utils.ts
@@ -1,11 +1,11 @@
+import { useAASHandling } from '@/composables/AAS/AASHandling';
 import { useReferableUtils } from '@/composables/AAS/ReferableUtils';
 import { useSMHandling } from '@/composables/AAS/SMHandling';
 import { useSMEFile } from '@/composables/AAS/SubmodelElements/File';
 import { useSME } from '@/composables/AAS/SubmodelElements/SubmodelElement';
 import { firstLangStringSetText } from '@/utils/AAS/SubmodelElements/MultiLanguagePropertyUtils';
 import { getCountryName } from '@/utils/LocaleUtils';
 import { firstLetterToLowerCase } from '@/utils/StringUtils';
-import { useAASHandling } from '../AASHandling';
 
 export function useContactInformation_v1_0Utils() {
     const { getSmIdOfAasIdBySemanticId } = useAASHandling();

diff --git a/aas-web-ui/src/composables/AAS/SubmodelTemplates/TechnicalData_v1_2Utils.ts b/aas-web-ui/src/composables/AAS/SubmodelTemplates/TechnicalData_v1_2Utils.ts
@@ -1,9 +1,9 @@
+import { useAASHandling } from '@/composables/AAS/AASHandling';
 import { useReferableUtils } from '@/composables/AAS/ReferableUtils';
 import { useSMEHandling } from '@/composables/AAS/SMEHandling';
 import { useSMHandling } from '@/composables/AAS/SMHandling';
 import { useSMEFile } from '@/composables/AAS/SubmodelElements/File';
 import { checkSemanticId } from '@/utils/AAS/SemanticIdUtils';
-import { useAASHandling } from '../AASHandling';
 
 export function useTechnicalData_v1_2Utils() {
     // Composables

diff --git a/aas-web-ui/src/composables/JumpHandling.ts b/aas-web-ui/src/composables/JumpHandling.ts
@@ -1,10 +1,10 @@
 import { useRouter } from 'vue-router';
 import { useAASHandling } from '@/composables/AAS/AASHandling';
 import { useReferenceComposable } from '@/composables/AAS/ReferenceComposable';
+import { useSMHandling } from '@/composables/AAS/SMHandling';
 import { useNavigationStore } from '@/store/NavigationStore';
 import { extractEndpointHref } from '@/utils/AAS/DescriptorUtils';
 import { extractId as extractIdFromReference } from '@/utils/AAS/ReferenceUtil';
-import { useSMHandling } from './AAS/SMHandling';
 
 export function useJumpHandling() {
     // Stores

diff --git a/aas-web-ui/src/composables/UrlUtils.ts b/aas-web-ui/src/composables/UrlUtils.ts
@@ -1,4 +1,4 @@
-import { useRequestHandling } from './RequestHandling';
+import { useRequestHandling } from '@/composables/RequestHandling';
 
 export function useUrlUtils() {
     const { getRequest } = useRequestHandling();

diff --git a/aas-web-ui/src/main.ts b/aas-web-ui/src/main.ts
@@ -13,13 +13,13 @@ import { createPinia } from 'pinia';
 import { createApp } from 'vue';
 import { defineComponent } from 'vue';
 import VueApexCharts from 'vue3-apexcharts';
+import App from '@/App.vue';
+import { initKeycloak, loginWithDirectGrant } from '@/authService';
 // Plugins
 import { registerVuetify } from '@/plugins';
-import App from './App.vue';
-import { initKeycloak, loginWithDirectGrant } from './authService';
-import { createAppRouter } from './router';
-import { useEnvStore } from './store/EnvironmentStore';
-import { useNavigationStore } from './store/NavigationStore';
+import { createAppRouter } from '@/router';
+import { useEnvStore } from '@/store/EnvironmentStore';
+import { useNavigationStore } from '@/store/NavigationStore';
 
 initialize();
 

diff --git a/aas-web-ui/src/pages/SubmodelViewer.vue b/aas-web-ui/src/pages/SubmodelViewer.vue
@@ -17,8 +17,3 @@
         </div>
     </v-container>
 </template>
-
-<script lang="ts" setup>
-    import ComponentVisualization from '../components/ComponentVisualization.vue';
-    import SubmodelList from '../components/SubmodelList.vue';
-</script>
diff --git a/aas-web-ui/src/plugins/index.ts b/aas-web-ui/src/plugins/index.ts
@@ -7,9 +7,9 @@
 // Plugins
 // Types
 import type { App } from 'vue';
+import { loadFonts } from '@/plugins//webfontloader';
+import { initializeVuetify } from '@/plugins/vuetify';
 import { useEnvStore } from '@/store/EnvironmentStore'; // replace with the path to your store file
-import { initializeVuetify } from './vuetify';
-import { loadFonts } from './webfontloader';
 
 export async function registerVuetify(app: App) {
     loadFonts();

diff --git a/aas-web-ui/src/router.ts b/aas-web-ui/src/router.ts
@@ -5,17 +5,17 @@ import ComponentVisualization from '@/components/ComponentVisualization.vue';
 import SubmodelList from '@/components/SubmodelList.vue';
 import { useAASHandling } from '@/composables/AAS/AASHandling';
 import { useSMEHandling } from '@/composables/AAS/SMEHandling';
+import { useRouteHandling } from '@/composables/routeHandling';
 import AASEditor from '@/pages/AASEditor.vue';
 import AASViewer from '@/pages/AASViewer.vue';
 import About from '@/pages/About.vue';
 import Dashboard from '@/pages/Dashboard.vue';
 import DashboardGroup from '@/pages/DashboardGroup.vue';
 import Page404 from '@/pages/Page404.vue';
 import SubmodelViewer from '@/pages/SubmodelViewer.vue';
+import { useAASStore } from '@/store/AASDataStore';
 import { useEnvStore } from '@/store/EnvironmentStore';
 import { useNavigationStore } from '@/store/NavigationStore';
-import { useRouteHandling } from './composables/routeHandling';
-import { useAASStore } from './store/AASDataStore';
 
 // Static routes
 const staticRoutes: Array<RouteRecordRaw> = [