From d40174dfeacab417ce68af389f0ee6eb7dd3e959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Bl=C3=A9nessy?= <peter.blenessy@gmail.com>
Date: Fri, 3 Jan 2025 10:21:09 -0500
Subject: [PATCH] Added support for the  alias in  and updated import paths.

---
 src/App.vue                                   | 26 +++++++++----------
 src/components/History.vue                    |  4 +--
 src/components/Messages.vue                   | 12 ++++-----
 src/components/OpenAI.vue                     | 11 ++++----
 src/components/Personas.vue                   |  4 +--
 src/components/Settings/CloudSyncSettings.vue |  6 ++---
 src/components/Settings/GeneralSettings.vue   |  2 +-
 .../Settings/ImageGenerationSettings.vue      |  4 +--
 .../Settings/OllamaModelManager.vue           |  2 +-
 src/components/Settings/ProviderSettings.vue  | 16 ++++++------
 src/components/Settings/QuickSettings.vue     | 10 +++----
 src/components/Settings/SettingsDialog.vue    | 12 ++++-----
 .../Settings/TextGenerationSettings.vue       |  6 ++---
 .../Settings/UserAvatarSettings.vue           |  2 +-
 src/components/UserInput.vue                  |  6 ++---
 src/composables/useCloudSync.js               |  9 +++----
 src/composables/useOllama.js                  |  4 +--
 src/main.js                                   |  6 ++---
 src/services/databaseUpgrader.js              |  6 ++---
 src/services/helpers.js                       |  2 +-
 src/services/iCloudService.js                 |  2 +-
 src/services/localforage.js                   |  2 +-
 src/services/ollama.service.js                |  2 +-
 src/services/openai.js                        |  8 +++---
 src/stores/teams-store.js                     |  4 +--
 vite.config.js                                |  8 ++++++
 26 files changed, 91 insertions(+), 85 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f74e378..b886890 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -82,24 +82,24 @@
 
 <script>
 import { computed, onBeforeMount, onMounted, ref, watch } from 'vue';
-import SettingsDialog from "./components/Settings/SettingsDialog.vue";
-import QuickSettings from "./components/Settings/QuickSettings.vue";
-import UserInput from "./components/UserInput.vue";
-import Messages from "./components/Messages.vue";
-import OpenAI from './components/OpenAI.vue';
-import History from './components/History.vue';
-import Information from './components/Information.vue';
-import Personas from './components/Personas.vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { storeToRefs } from 'pinia';
-import { useSettingsStore } from './stores/settings-store.js';
-import { useTeamsStore } from './stores/teams-store.js';
 import { check } from '@tauri-apps/plugin-updater'
 import { relaunch } from '@tauri-apps/plugin-process';
-import DatabaseUpgrader from './services/databaseUpgrader.js';
-import logger from './services/logger';
-import iCloudService from './services/iCloudService';
+import SettingsDialog from "@/components/Settings/SettingsDialog.vue";
+import QuickSettings from "@/components/Settings/QuickSettings.vue";
+import UserInput from "@/components/UserInput.vue";
+import Messages from "@/components/Messages.vue";
+import OpenAI from '@/components/OpenAI.vue';
+import History from '@/components/History.vue';
+import Information from '@/components/Information.vue';
+import Personas from '@/components/Personas.vue';
+import { useSettingsStore } from '@/stores/settings-store.js';
+import { useTeamsStore } from '@/stores/teams-store.js';
+import DatabaseUpgrader from '@/services/databaseUpgrader.js';
+import logger from '@/services/logger';
+import iCloudService from '@/services/iCloudService';
 
 // This starter template is using Vue 3 <script setup> SFCs
 // Check out https://vuejs.org/api/sfc-script-setup.html#script-setup
diff --git a/src/components/History.vue b/src/components/History.vue
index 13f84ef..81ef981 100644
--- a/src/components/History.vue
+++ b/src/components/History.vue
@@ -81,12 +81,12 @@
 
 <script>
 
-import { useTeamsStore } from '../stores/teams-store.js';
 import { storeToRefs } from 'pinia';
 import { useQuasar } from 'quasar';
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { exportConversation } from '../services/helpers.js';
+import { useTeamsStore } from '@/stores/teams-store.js';
+import { exportConversation } from '@/services/helpers.js';
 
 export default {
     name: 'History',
diff --git a/src/components/Messages.vue b/src/components/Messages.vue
index 2af4c0e..958ff56 100644
--- a/src/components/Messages.vue
+++ b/src/components/Messages.vue
@@ -156,17 +156,17 @@
 </template>
 
 <script>
-import { useTeamsStore } from "../stores/teams-store.js";
-import { useSettingsStore } from "../stores/settings-store.js";
 import { storeToRefs } from "pinia";
 import { useQuasar } from "quasar";
 import { computed, ref, watch } from "vue";
 import { scroll } from "quasar";
 import { useI18n } from 'vue-i18n';
-import { imageDB } from "../services/localforage";
-import openaiConfig from '../services/openai.config.json';
-import logger from '../services/logger.js';
-import { useMarkdown } from '../composables/markdown.js'
+import { useTeamsStore } from "@/stores/teams-store.js";
+import { useSettingsStore } from "@/stores/settings-store.js";
+import { imageDB } from "@/services/localforage";
+import openaiConfig from '@/services/openai.config.json';
+import logger from '@/services/logger.js';
+import { useMarkdown } from '@/composables/markdown.js'
 
 export default {
     name: "Messages",
diff --git a/src/components/OpenAI.vue b/src/components/OpenAI.vue
index 169bbb4..424c0ea 100644
--- a/src/components/OpenAI.vue
+++ b/src/components/OpenAI.vue
@@ -3,15 +3,14 @@
 <script>
 
 import { watch, nextTick } from 'vue';
-import { useTeamsStore } from '../stores/teams-store.js';
-import { useSettingsStore } from '../stores/settings-store.js';
 import { storeToRefs } from 'pinia';
-import OpenAI from '../services/openai.js';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useMarkdown } from '../composables/markdown.js'
-
-import logger from '../services/logger.js';
+import { useTeamsStore } from '@/stores/teams-store.js';
+import { useSettingsStore } from '@/stores/settings-store.js';
+import { useMarkdown } from '@/composables/markdown.js'
+import OpenAI from '@/services/openai.js';
+import logger from '@/services/logger.js';
 
 export default {
     name: 'OpenAI',
diff --git a/src/components/Personas.vue b/src/components/Personas.vue
index 01811ea..b2262ae 100644
--- a/src/components/Personas.vue
+++ b/src/components/Personas.vue
@@ -227,9 +227,9 @@
 import { computed, ref } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useTeamsStore } from '../stores/teams-store.js';
 import { storeToRefs } from 'pinia';
-import logger from '../services/logger.js';
+import { useTeamsStore } from '@/stores/teams-store.js';
+import logger from '@/services/logger.js';
 
 export default {
     name: 'Personas',
diff --git a/src/components/Settings/CloudSyncSettings.vue b/src/components/Settings/CloudSyncSettings.vue
index 468e533..5ad55cd 100644
--- a/src/components/Settings/CloudSyncSettings.vue
+++ b/src/components/Settings/CloudSyncSettings.vue
@@ -156,11 +156,11 @@
 <script>
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { storeToRefs } from 'pinia';
-import { useSettingsStore } from '../../stores/settings-store';
 import { platform } from '@tauri-apps/plugin-os';
 import { useQuasar } from 'quasar';
-import { useCloudSync } from '../../composables/useCloudSync';
+import { storeToRefs } from 'pinia';
+import { useSettingsStore } from '@/stores/settings-store';
+import { useCloudSync } from '@/composables/useCloudSync';
 
 export default {
     name: 'CloudSync',
diff --git a/src/components/Settings/GeneralSettings.vue b/src/components/Settings/GeneralSettings.vue
index 31dbd56..887b615 100644
--- a/src/components/Settings/GeneralSettings.vue
+++ b/src/components/Settings/GeneralSettings.vue
@@ -134,10 +134,10 @@
 
 <script>
 import { computed } from 'vue';
-import { useSettingsStore } from '../../stores/settings-store.js';
 import { storeToRefs } from "pinia";
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
+import { useSettingsStore } from '@/stores/settings-store.js';
 
 export default {
     name: 'GeneralSettings',
diff --git a/src/components/Settings/ImageGenerationSettings.vue b/src/components/Settings/ImageGenerationSettings.vue
index c0e2c85..b7465e7 100644
--- a/src/components/Settings/ImageGenerationSettings.vue
+++ b/src/components/Settings/ImageGenerationSettings.vue
@@ -67,10 +67,10 @@
 <script>
 import { computed, ref, watch } from 'vue';
 import { storeToRefs } from "pinia";
-import { useSettingsStore } from '../../stores/settings-store.js';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import openaiConfig from '../../services/openai.config.json';
+import { useSettingsStore } from '@/stores/settings-store.js';
+import openaiConfig from '@/services/openai.config.json';
 
 export default {
     setup() {
diff --git a/src/components/Settings/OllamaModelManager.vue b/src/components/Settings/OllamaModelManager.vue
index 1806ef1..337629e 100644
--- a/src/components/Settings/OllamaModelManager.vue
+++ b/src/components/Settings/OllamaModelManager.vue
@@ -115,8 +115,8 @@
 
 <script>
 import { ref, computed, onMounted } from 'vue';
-import { useOllama } from '../../composables/useOllama';
 import { useQuasar } from 'quasar';
+import { useOllama } from '@/composables/useOllama';
 
 export default {
     name: 'OllamaModelManager',
diff --git a/src/components/Settings/ProviderSettings.vue b/src/components/Settings/ProviderSettings.vue
index 368030e..5a61f6a 100644
--- a/src/components/Settings/ProviderSettings.vue
+++ b/src/components/Settings/ProviderSettings.vue
@@ -213,16 +213,16 @@
 
 <script>
 import { ref, computed, onMounted, watch } from 'vue';
-import { storeToRefs } from "pinia";
-import { useSettingsStore } from '../../stores/settings-store.js';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import defaultProviders from '../../services/providers.config.json';
-import { ollamaService } from '../../services/ollama.service';
-import ollamaLogo from '../../assets/ollama-logo.png';
-import openaiLogo from '../../assets/openai-logo.png';
-import { useOllama } from '../../composables/useOllama';
-import OllamaModelManager from './OllamaModelManager.vue';
+import { storeToRefs } from "pinia";
+import { useSettingsStore } from '@/stores/settings-store.js';
+import defaultProviders from '@/services/providers.config.json';
+import { ollamaService } from '@/services/ollama.service';
+import ollamaLogo from '@/assets/ollama-logo.png';
+import openaiLogo from '@/assets/openai-logo.png';
+import { useOllama } from '@/composables/useOllama';
+import OllamaModelManager from '@/components/Settings/OllamaModelManager.vue';
 
 export default {
     components: {
diff --git a/src/components/Settings/QuickSettings.vue b/src/components/Settings/QuickSettings.vue
index ccf7d74..1ffce2e 100644
--- a/src/components/Settings/QuickSettings.vue
+++ b/src/components/Settings/QuickSettings.vue
@@ -208,14 +208,14 @@
 <script>
 
 import { computed, ref, watch } from 'vue';
-import { useSettingsStore } from '../../stores/settings-store.js';
-import { useTeamsStore } from '../../stores/teams-store.js';
 import { storeToRefs } from "pinia";
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import openaiConfig from '../../services/openai.config.json';
-import { exportConversation } from '../../services/helpers.js';
-import logger from '../../services/logger.js';
+import { useSettingsStore } from '@/stores/settings-store.js';
+import { useTeamsStore } from '@/stores/teams-store.js';
+import openaiConfig from '@/services/openai.config.json';
+import { exportConversation } from '@/services/helpers.js';
+import logger from '@/services/logger.js';
 
 export default {
     name: "QuickSettings",
diff --git a/src/components/Settings/SettingsDialog.vue b/src/components/Settings/SettingsDialog.vue
index 2425163..90e65f4 100644
--- a/src/components/Settings/SettingsDialog.vue
+++ b/src/components/Settings/SettingsDialog.vue
@@ -54,12 +54,12 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 
-import UserAvatarSettings from './UserAvatarSettings.vue';
-import GeneralSettings from './GeneralSettings.vue';
-import ProviderSettings from "./ProviderSettings.vue";
-import TextGenerationSettings from "./TextGenerationSettings.vue";
-import ImageGenerationSettings from "./ImageGenerationSettings.vue";
-import CloudSyncSettings from './CloudSyncSettings.vue';
+import UserAvatarSettings from '@/components/Settings/UserAvatarSettings.vue';
+import GeneralSettings from '@/components/Settings/GeneralSettings.vue';
+import ProviderSettings from "@/components/Settings/ProviderSettings.vue";
+import TextGenerationSettings from "@/components/Settings/TextGenerationSettings.vue";
+import ImageGenerationSettings from "@/components/Settings/ImageGenerationSettings.vue";
+import CloudSyncSettings from '@/components/Settings/CloudSyncSettings.vue';
 
 export default {
     name: "AppSettings",
diff --git a/src/components/Settings/TextGenerationSettings.vue b/src/components/Settings/TextGenerationSettings.vue
index b89534c..fb84932 100644
--- a/src/components/Settings/TextGenerationSettings.vue
+++ b/src/components/Settings/TextGenerationSettings.vue
@@ -109,11 +109,11 @@
 
 <script>
 import { computed, ref, watch } from 'vue';
-import { storeToRefs } from "pinia";
-import { useSettingsStore } from '../../stores/settings-store.js';
-import { useTeamsStore } from '../../stores/teams-store.js';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { storeToRefs } from "pinia";
+import { useSettingsStore } from '@/stores/settings-store.js';
+import { useTeamsStore } from '@/stores/teams-store.js';
 
 export default {
     setup() {
diff --git a/src/components/Settings/UserAvatarSettings.vue b/src/components/Settings/UserAvatarSettings.vue
index d899a08..ab44da4 100644
--- a/src/components/Settings/UserAvatarSettings.vue
+++ b/src/components/Settings/UserAvatarSettings.vue
@@ -29,10 +29,10 @@
 
 <script>
 import { computed, ref } from 'vue';
-import { useSettingsStore } from '../../stores/settings-store.js';
 import { storeToRefs } from "pinia";
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
+import { useSettingsStore } from '@/stores/settings-store.js';
 
 export default {
     name: 'UserAvatarSettings',
diff --git a/src/components/UserInput.vue b/src/components/UserInput.vue
index a114f09..f8c9296 100644
--- a/src/components/UserInput.vue
+++ b/src/components/UserInput.vue
@@ -60,12 +60,12 @@
 
 <script>
 import { ref, computed, onMounted, watch } from 'vue';
-import { useTeamsStore } from '../stores/teams-store.js';
-import { useSettingsStore } from "../stores/settings-store.js";
 import { storeToRefs } from 'pinia';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import logger from '../services/logger';
+import logger from '@/services/logger';
+import { useTeamsStore } from '@/stores/teams-store.js';
+import { useSettingsStore } from "@/stores/settings-store.js";
 
 export default {
     name: 'UserInput',
diff --git a/src/composables/useCloudSync.js b/src/composables/useCloudSync.js
index f02e1cf..6546c97 100644
--- a/src/composables/useCloudSync.js
+++ b/src/composables/useCloudSync.js
@@ -1,11 +1,10 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import { storeToRefs } from 'pinia';
-import { useSettingsStore } from '../stores/settings-store';
-import { useTeamsStore } from '../stores/teams-store';
-import iCloudService from '../services/iCloudService';
-import logger from '../services/logger';
+import { useSettingsStore } from '@/stores/settings-store';
+import { useTeamsStore } from '@/stores/teams-store';
+import iCloudService from '@/services/iCloudService';
+import logger from '@/services/logger';
 
 export function useCloudSync() {
     const { t } = useI18n();
diff --git a/src/composables/useOllama.js b/src/composables/useOllama.js
index 352cf91..abba514 100644
--- a/src/composables/useOllama.js
+++ b/src/composables/useOllama.js
@@ -1,8 +1,8 @@
-import { ref, computed } from 'vue';
+import { ref } from 'vue';
 import { useQuasar } from 'quasar';
-import { ollamaService } from '../services/ollama.service';
 import { Command } from '@tauri-apps/plugin-shell';
 import { platform } from '@tauri-apps/plugin-os';
+import { ollamaService } from '@/services/ollama.service';
 
 export function useOllama() {
     const $q = useQuasar();
diff --git a/src/main.js b/src/main.js
index 1e6f2ea..1eb15cd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,5 +1,5 @@
 import { createApp } from "vue";
-import App from "./App.vue";
+import App from "@/App.vue";
 
 // Quasar stuff
 import { Quasar, Dark, Dialog, Notify } from 'quasar';
@@ -13,11 +13,11 @@ import "./styles.css";
 
 // Pinia stuff
 import { createPinia } from 'pinia';
-import { localForagePlugin } from './services/localforage';
+import { localForagePlugin } from '@/services/localforage';
 
 // i18n stuff
 import { createI18n } from 'vue-i18n';
-import messages from './i18n';
+import messages from '@/i18n';
 
 // ---------------------------------------------------------------------------------------------
 // Create the app
diff --git a/src/services/databaseUpgrader.js b/src/services/databaseUpgrader.js
index 22d04a7..cf3a345 100644
--- a/src/services/databaseUpgrader.js
+++ b/src/services/databaseUpgrader.js
@@ -1,8 +1,8 @@
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { imageDB, settingsDB, teamsDB } from '../services/localforage.js';
-import { useSettingsStore } from '../stores/settings-store.js';
-import logger from './logger.js';
+import { imageDB, settingsDB, teamsDB } from '@/services/localforage.js';
+import { useSettingsStore } from '@/stores/settings-store.js';
+import logger from '@/services/logger.js';
 
 const databaseUpgrader = () => {
 
diff --git a/src/services/helpers.js b/src/services/helpers.js
index e02768e..1a2b821 100644
--- a/src/services/helpers.js
+++ b/src/services/helpers.js
@@ -1,4 +1,4 @@
-import { useTeamsStore } from '../stores/teams-store.js';
+import { useTeamsStore } from '@/stores/teams-store.js';
 
 // Converts an epoch timestamp to a localized date and time string.
 const epochStringToDate = (timestamp) => {
diff --git a/src/services/iCloudService.js b/src/services/iCloudService.js
index 1d49aac..6389992 100644
--- a/src/services/iCloudService.js
+++ b/src/services/iCloudService.js
@@ -2,7 +2,7 @@ import { join } from '@tauri-apps/api/path';
 import { homeDir } from '@tauri-apps/api/path';
 import { platform } from '@tauri-apps/plugin-os';
 import { readFile, create, readDir, mkdir, remove } from '@tauri-apps/plugin-fs';
-import logger from './logger';
+import logger from '@/services/logger';
 
 const iCloudService = {
     VERSION: '1.0',
diff --git a/src/services/localforage.js b/src/services/localforage.js
index 5cf2c83..5fac3bc 100644
--- a/src/services/localforage.js
+++ b/src/services/localforage.js
@@ -1,5 +1,5 @@
 import localforage from 'localforage';
-import logger from './logger.js';
+import logger from '@/services/logger.js';
 
 const dbName = 'TeamAI';
 
diff --git a/src/services/ollama.service.js b/src/services/ollama.service.js
index 9b26365..bf021bd 100644
--- a/src/services/ollama.service.js
+++ b/src/services/ollama.service.js
@@ -1,7 +1,7 @@
 import { Ollama } from 'ollama/browser';
 import { Command, open } from '@tauri-apps/plugin-shell';
 import { platform } from '@tauri-apps/plugin-os';
-import logger from './logger';
+import logger from '@/services/logger';
 
 class OllamaService {
     constructor() {
diff --git a/src/services/openai.js b/src/services/openai.js
index 377a087..4aa4639 100644
--- a/src/services/openai.js
+++ b/src/services/openai.js
@@ -1,8 +1,8 @@
-import { useSettingsStore } from '../stores/settings-store.js';
 import { storeToRefs } from 'pinia';
-import { imageDB } from './localforage.js';
-import logger from './logger.js';
-import providersConfig from '../services/providers.config.json';
+import { useSettingsStore } from '@/stores/settings-store.js';
+import { imageDB } from '@/services/localforage.js';
+import logger from '@/services/logger.js';
+import providersConfig from '@/services/providers.config.json';
 
 const openAI = () => {
     const settingsStore = useSettingsStore()
diff --git a/src/stores/teams-store.js b/src/stores/teams-store.js
index 7b131a1..3567fa3 100644
--- a/src/stores/teams-store.js
+++ b/src/stores/teams-store.js
@@ -1,7 +1,7 @@
 import { ref } from 'vue';
 import { defineStore } from 'pinia';
-import { imageDB } from '../services/localforage';
-import logger from '../services/logger';
+import { imageDB } from '@/services/localforage';
+import logger from '@/services/logger';
 
 // The teams-store holds the teams creeated by the user in a list. A team is a list of AI assistants, bots
 // Each team object has an array of team member objects and an array of messages.
diff --git a/vite.config.js b/vite.config.js
index c71ccf8..9da67ef 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,6 +2,7 @@ import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
 import { quasar, transformAssetUrls } from '@quasar/vite-plugin';
 import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
+import path from 'path';
 
 // https://vitejs.dev/config/
 export default defineConfig(async () => ({
@@ -11,6 +12,13 @@ export default defineConfig(async () => ({
         VueI18nPlugin({ /* options */ })
     ],
 
+    // Configuration of the @ alias for better readability and maintainability. 
+    // Cleaner imports: @/components/Foo.vue instead of ../../components/Foo.vue.
+    resolve: {
+        alias: {
+          '@': path.resolve(__dirname, './src'),
+        },
+    },
     // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
     // prevent vite from obscuring rust errors
     clearScreen: false,