From 6f8580e31b2f49980058835a0cf7b1388cfc022d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= <joao.maker@gmail.com>
Date: Mon, 26 Feb 2024 14:45:55 -0300
Subject: [PATCH] core: frontend: Update models assets to /src location

---
 .../vehiclesetup/viewers/GenericViewer.vue           | 12 ++++++------
 core/frontend/src/components/wizard/Wizard.vue       |  9 +++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/core/frontend/src/components/vehiclesetup/viewers/GenericViewer.vue b/core/frontend/src/components/vehiclesetup/viewers/GenericViewer.vue
index 7b26aeaf5..afea5dccf 100755
--- a/core/frontend/src/components/vehiclesetup/viewers/GenericViewer.vue
+++ b/core/frontend/src/components/vehiclesetup/viewers/GenericViewer.vue
@@ -91,12 +91,12 @@ import { Dictionary, Indexed, Keyed } from '@/types/common'
 import { PingType } from '@/types/ping'
 import { sleep } from '@/utils/helper_functions'
 
-const models: Record<string, string> = import.meta.glob('/public/assets/vehicles/models/**', { eager: true })
+const models: Record<string, string> = import.meta.glob('/src/assets/vehicles/models/**', { eager: true })
 
 function get_model(vehicle_name: string, frame_name: string): undefined | string {
-  const release_path = `assets/vehicles/models/${vehicle_name}/${frame_name}.glb`
-  if (models[`/public/${release_path}`]) {
-    return `/assets/vehicles/models/${vehicle_name}/${frame_name}.glb`
+  const release_path = `/src/assets/vehicles/models/${vehicle_name}/${frame_name}.glb`
+  if (models[release_path]) {
+    return release_path
   }
   return undefined
 }
@@ -349,8 +349,8 @@ export default Vue.extend({
       const file = new File([await cropped_image.toBlob(mimeType)], 'viewer.png', { type: mimeType })
       saveAs(file)
     },
-    async reloadAnnotations() {
-      const json = await models[`./${this.vehicle_folder}/${this.frame_name}.json`]
+    reloadAnnotations() {
+      const json = models[`/src/assets/vehicles/models/${this.vehicle_folder}/${this.frame_name}.json`]
       if (json) {
         this.annotations = json.annotations ?? {}
       }
diff --git a/core/frontend/src/components/wizard/Wizard.vue b/core/frontend/src/components/wizard/Wizard.vue
index defa75d2d..e214d993c 100644
--- a/core/frontend/src/components/wizard/Wizard.vue
+++ b/core/frontend/src/components/wizard/Wizard.vue
@@ -287,14 +287,11 @@ import RequireInternet from './RequireInternet.vue'
 
 const WIZARD_VERSION = 4
 
-const models: Record<string, string> = import.meta.glob('/public/assets/vehicles/models/**', { eager: true })
+const models: Record<string, string> = import.meta.glob('/src/assets/vehicles/models/**', { eager: true })
 
 function get_model(vehicle_name: string, frame_name: string): undefined | string {
-  const release_path = `assets/vehicles/models/${vehicle_name}/${frame_name}.glb`
-  if (models[`/public/${release_path}`]) {
-    return `/assets/vehicles/models/${vehicle_name}/${frame_name}.glb`
-  }
-  return undefined
+  const release_path = `/src/assets/vehicles/models/${vehicle_name}/${frame_name}.glb`
+  return models?.[release_path] ? release_path : undefined
 }
 
 enum ApplyStatus {