diff --git a/src/App.vue b/src/App.vue
index 5ae0ebe3..c6c68f81 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,7 +25,7 @@
import { Toaster } from './components/ui/sonner';
import { TooltipProvider } from './components/ui/tooltip';
import { createGlobalStores } from './stores';
- import { initNoty } from './plugin/noty';
+ import { initNoty } from './plugins/noty';
import { getGameLogTable } from './coordinators/gameLogCoordinator';
import { runCheckVRChatDebugLoggingFlow } from './coordinators/gameCoordinator';
diff --git a/src/api/__tests__/entityQuerySync.test.js b/src/api/__tests__/entityQuerySync.test.js
index f76d592b..3d0fbe99 100644
--- a/src/api/__tests__/entityQuerySync.test.js
+++ b/src/api/__tests__/entityQuerySync.test.js
@@ -7,7 +7,7 @@ const mockApplyCurrentUser = vi.fn((json) => ({ id: json.id || 'usr_me', ...json
const mockApplyUser = vi.fn((json) => ({ ...json }));
const mockApplyWorld = vi.fn((json) => ({ ...json }));
-vi.mock('../../service/request', () => ({
+vi.mock('../../services/request', () => ({
request: (...args) => mockRequest(...args)
}));
diff --git a/src/api/__tests__/favoriteQuerySync.test.js b/src/api/__tests__/favoriteQuerySync.test.js
index 471bd7bc..2906635f 100644
--- a/src/api/__tests__/favoriteQuerySync.test.js
+++ b/src/api/__tests__/favoriteQuerySync.test.js
@@ -6,7 +6,7 @@ const mockHandleFavoriteAdd = vi.fn();
const mockHandleFavoriteDelete = vi.fn();
const mockHandleFavoriteGroupClear = vi.fn();
-vi.mock('../../service/request', () => ({
+vi.mock('../../services/request', () => ({
request: (...args) => mockRequest(...args)
}));
diff --git a/src/api/__tests__/friendQuerySync.test.js b/src/api/__tests__/friendQuerySync.test.js
index 81b0bd1c..2b1c3312 100644
--- a/src/api/__tests__/friendQuerySync.test.js
+++ b/src/api/__tests__/friendQuerySync.test.js
@@ -4,7 +4,7 @@ const mockRequest = vi.fn();
const mockInvalidateQueries = vi.fn().mockResolvedValue();
const mockApplyUser = vi.fn((json) => json);
-vi.mock('../../service/request', () => ({
+vi.mock('../../services/request', () => ({
request: (...args) => mockRequest(...args)
}));
diff --git a/src/api/__tests__/groupQuerySync.test.js b/src/api/__tests__/groupQuerySync.test.js
index b14d5956..091b0340 100644
--- a/src/api/__tests__/groupQuerySync.test.js
+++ b/src/api/__tests__/groupQuerySync.test.js
@@ -4,7 +4,7 @@ const mockRequest = vi.fn();
const mockInvalidateQueries = vi.fn().mockResolvedValue();
const mockApplyGroup = vi.fn((json) => json);
-vi.mock('../../service/request', () => ({
+vi.mock('../../services/request', () => ({
request: (...args) => mockRequest(...args)
}));
diff --git a/src/api/__tests__/mediaQuerySync.test.js b/src/api/__tests__/mediaQuerySync.test.js
index 18186d6a..f2dbb87c 100644
--- a/src/api/__tests__/mediaQuerySync.test.js
+++ b/src/api/__tests__/mediaQuerySync.test.js
@@ -4,7 +4,7 @@ const mockRequest = vi.fn();
const mockInvalidateQueries = vi.fn().mockResolvedValue();
const mockRemoveQueries = vi.fn();
-vi.mock('../../service/request', () => ({
+vi.mock('../../services/request', () => ({
request: (...args) => mockRequest(...args)
}));
diff --git a/src/api/auth.js b/src/api/auth.js
index cca0dc91..fc9209ed 100644
--- a/src/api/auth.js
+++ b/src/api/auth.js
@@ -1,4 +1,4 @@
-import { request } from '../service/request';
+import { request } from '../services/request';
import { handleConfig } from '../coordinators/userCoordinator';
const loginReq = {
diff --git a/src/api/avatar.js b/src/api/avatar.js
index e60b2926..02287ca6 100644
--- a/src/api/avatar.js
+++ b/src/api/avatar.js
@@ -1,5 +1,5 @@
import { patchAndRefetchActiveQuery, queryKeys } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
import { useUserStore } from '../stores';
import { applyCurrentUser } from '../coordinators/userCoordinator';
diff --git a/src/api/avatarModeration.js b/src/api/avatarModeration.js
index 5176fc93..9eb959a8 100644
--- a/src/api/avatarModeration.js
+++ b/src/api/avatarModeration.js
@@ -1,4 +1,4 @@
-import { request } from '../service/request';
+import { request } from '../services/request';
const avatarModerationReq = {
getAvatarModerations() {
diff --git a/src/api/favorite.js b/src/api/favorite.js
index 53dc95ba..983341eb 100644
--- a/src/api/favorite.js
+++ b/src/api/favorite.js
@@ -5,7 +5,7 @@ import {
handleFavoriteGroupClear
} from '../coordinators/favoriteCoordinator';
import { queryClient } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
/**
*
diff --git a/src/api/friend.js b/src/api/friend.js
index 7f9750be..d639f7ef 100644
--- a/src/api/friend.js
+++ b/src/api/friend.js
@@ -1,5 +1,5 @@
import { queryClient } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
import { useUserStore } from '../stores/user';
import { applyUser } from '../coordinators/userCoordinator';
diff --git a/src/api/group.js b/src/api/group.js
index 8e03725c..2e853019 100644
--- a/src/api/group.js
+++ b/src/api/group.js
@@ -1,7 +1,7 @@
import { useUserStore } from '../stores';
import { applyGroup } from '../coordinators/groupCoordinator';
import { queryClient } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
/**
*
diff --git a/src/api/image.js b/src/api/image.js
index 4d435f34..917d9757 100644
--- a/src/api/image.js
+++ b/src/api/image.js
@@ -1,6 +1,6 @@
import { useAvatarStore, useWorldStore } from '../stores';
import { applyWorld } from '../coordinators/worldCoordinator';
-import { request } from '../service/request';
+import { request } from '../services/request';
const imageReq = {
async uploadAvatarFailCleanup(id) {
diff --git a/src/api/index.js b/src/api/index.js
index 8a9f26ba..62bb8e48 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -3,7 +3,7 @@
* Export all API requests from here
*/
-import { request } from '../service/request';
+import { request } from '../services/request';
import authRequest from './auth';
import avatarModerationRequest from './avatarModeration';
diff --git a/src/api/instance.js b/src/api/instance.js
index 682380a7..c0e99c6a 100644
--- a/src/api/instance.js
+++ b/src/api/instance.js
@@ -1,7 +1,7 @@
import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
-import { request } from '../service/request';
+import { i18n } from '../plugins/i18n';
+import { request } from '../services/request';
import { useInstanceStore } from '../stores';
const instanceReq = {
diff --git a/src/api/inventory.js b/src/api/inventory.js
index 5318290a..53ff5159 100644
--- a/src/api/inventory.js
+++ b/src/api/inventory.js
@@ -1,5 +1,5 @@
import { queryClient } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
/**
*
diff --git a/src/api/inviteMessages.js b/src/api/inviteMessages.js
index e3450c56..d5242c27 100644
--- a/src/api/inviteMessages.js
+++ b/src/api/inviteMessages.js
@@ -1,4 +1,4 @@
-import { request } from '../service/request';
+import { request } from '../services/request';
import { useUserStore } from '../stores';
function getCurrentUserId() {
diff --git a/src/api/misc.js b/src/api/misc.js
index 510bbfc6..3e9b23e2 100644
--- a/src/api/misc.js
+++ b/src/api/misc.js
@@ -1,5 +1,5 @@
import { queryClient, queryKeys } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
import { useUserStore } from '../stores';
/**
diff --git a/src/api/notification.js b/src/api/notification.js
index 81b82107..23c7a0a7 100644
--- a/src/api/notification.js
+++ b/src/api/notification.js
@@ -1,4 +1,4 @@
-import { request } from '../service/request';
+import { request } from '../services/request';
import { useGalleryStore } from '../stores';
const notificationReq = {
diff --git a/src/api/playerModeration.js b/src/api/playerModeration.js
index 2906d15a..1b215c69 100644
--- a/src/api/playerModeration.js
+++ b/src/api/playerModeration.js
@@ -1,4 +1,4 @@
-import { request } from '../service/request';
+import { request } from '../services/request';
const playerModerationReq = {
getPlayerModerations() {
diff --git a/src/api/prop.js b/src/api/prop.js
index f2de5ca1..2ddd4067 100644
--- a/src/api/prop.js
+++ b/src/api/prop.js
@@ -1,4 +1,4 @@
-import { request } from '../service/request';
+import { request } from '../services/request';
const propReq = {
/**
diff --git a/src/api/user.js b/src/api/user.js
index 44bb0a50..218f7d4d 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,5 +1,5 @@
import { patchAndRefetchActiveQuery, queryKeys } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
import { useUserStore } from '../stores';
import { applyUser, applyCurrentUser } from '../coordinators/userCoordinator';
diff --git a/src/api/vrcPlusIcon.js b/src/api/vrcPlusIcon.js
index f7f5e02f..72a1d503 100644
--- a/src/api/vrcPlusIcon.js
+++ b/src/api/vrcPlusIcon.js
@@ -1,5 +1,5 @@
import { queryClient } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
/**
*
diff --git a/src/api/vrcPlusImage.js b/src/api/vrcPlusImage.js
index 330cab9a..abfa2c89 100644
--- a/src/api/vrcPlusImage.js
+++ b/src/api/vrcPlusImage.js
@@ -1,5 +1,5 @@
import { queryClient } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
import { useUserStore } from '../stores';
/**
diff --git a/src/api/world.js b/src/api/world.js
index 4d159ee5..08322e9e 100644
--- a/src/api/world.js
+++ b/src/api/world.js
@@ -1,5 +1,5 @@
import { patchAndRefetchActiveQuery, queryKeys } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
import { applyWorld } from '../coordinators/worldCoordinator';
const worldReq = {
diff --git a/src/app.js b/src/app.js
index 8508c448..c4ae35dd 100644
--- a/src/app.js
+++ b/src/app.js
@@ -7,7 +7,7 @@ import {
initPlugins,
initRouter,
initSentry
-} from './plugin';
+} from './plugins';
import { initPiniaPlugins, pinia } from './stores';
import { queryClient } from './queries';
diff --git a/src/components/NavMenu.vue b/src/components/NavMenu.vue
index ab223eb6..b0d98926 100644
--- a/src/components/NavMenu.vue
+++ b/src/components/NavMenu.vue
@@ -399,7 +399,7 @@
import { THEME_CONFIG, links, navDefinitions } from '../shared/constants';
import { openExternalLink } from '../shared/utils';
- import configRepository from '../service/config';
+ import configRepository from '../services/config';
const CustomNavDialog = defineAsyncComponent(() => import('./dialogs/CustomNavDialog.vue'));
diff --git a/src/components/StatusBar.vue b/src/components/StatusBar.vue
index 62b28e10..a8ce13e2 100644
--- a/src/components/StatusBar.vue
+++ b/src/components/StatusBar.vue
@@ -284,7 +284,7 @@
import { useIntervalFn, useNow } from '@vueuse/core';
import { TooltipWrapper } from '@/components/ui/tooltip';
import { useI18n } from 'vue-i18n';
- import { wsState } from '@/service/websocket';
+ import { wsState } from '@/services/websocket';
import dayjs from 'dayjs';
import timezone from 'dayjs/plugin/timezone';
@@ -299,7 +299,7 @@
parseClockOffset
} from './statusBarUtils';
- import configRepository from '../service/config';
+ import configRepository from '../services/config';
dayjs.extend(utc);
dayjs.extend(timezone);
diff --git a/src/components/__tests__/AvatarInfo.test.js b/src/components/__tests__/AvatarInfo.test.js
index d00807e2..04a4e607 100644
--- a/src/components/__tests__/AvatarInfo.test.js
+++ b/src/components/__tests__/AvatarInfo.test.js
@@ -13,7 +13,7 @@ vi.mock('../../views/Feed/Feed.vue', () => ({
vi.mock('../../views/Feed/columns.jsx', () => ({
columns: []
}));
-vi.mock('../../plugin/router', () => ({
+vi.mock('../../plugins/router', () => ({
router: {
beforeEach: vi.fn(),
push: vi.fn(),
@@ -34,10 +34,10 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../plugin/interopApi', () => ({
+vi.mock('../../plugins/interopApi', () => ({
initInteropApi: vi.fn()
}));
-vi.mock('../../service/database', () => ({
+vi.mock('../../services/database', () => ({
database: new Proxy(
{},
{
@@ -48,7 +48,7 @@ vi.mock('../../service/database', () => ({
}
)
}));
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi
@@ -74,10 +74,10 @@ vi.mock('../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../service/jsonStorage', () => ({
+vi.mock('../../services/jsonStorage', () => ({
default: vi.fn()
}));
-vi.mock('../../service/watchState', () => ({
+vi.mock('../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
diff --git a/src/components/__tests__/Location.test.js b/src/components/__tests__/Location.test.js
index b102a044..45bf5bc3 100644
--- a/src/components/__tests__/Location.test.js
+++ b/src/components/__tests__/Location.test.js
@@ -16,7 +16,7 @@ vi.mock('../../views/Feed/Feed.vue', () => ({
vi.mock('../../views/Feed/columns.jsx', () => ({
columns: []
}));
-vi.mock('../../plugin/router', () => ({
+vi.mock('../../plugins/router', () => ({
router: {
beforeEach: vi.fn(),
push: vi.fn(),
@@ -39,11 +39,11 @@ vi.mock('vue-router', async (importOriginal) => {
};
});
-vi.mock('../../plugin/interopApi', () => ({
+vi.mock('../../plugins/interopApi', () => ({
initInteropApi: vi.fn()
}));
-vi.mock('../../service/database', () => ({
+vi.mock('../../services/database', () => ({
database: new Proxy(
{},
{
@@ -55,7 +55,7 @@ vi.mock('../../service/database', () => ({
)
}));
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi
@@ -81,10 +81,10 @@ vi.mock('../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../service/jsonStorage', () => ({
+vi.mock('../../services/jsonStorage', () => ({
default: vi.fn()
}));
-vi.mock('../../service/watchState', () => ({
+vi.mock('../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
diff --git a/src/components/__tests__/OtpDialogModal.test.js b/src/components/__tests__/OtpDialogModal.test.js
index 1767b135..1502da75 100644
--- a/src/components/__tests__/OtpDialogModal.test.js
+++ b/src/components/__tests__/OtpDialogModal.test.js
@@ -12,7 +12,7 @@ vi.mock('../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../plugin/router', () => ({
+vi.mock('../../plugins/router', () => ({
router: {
beforeEach: vi.fn(),
push: vi.fn(),
@@ -33,8 +33,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../service/database', () => ({
+vi.mock('../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../services/database', () => ({
database: new Proxy(
{},
{
@@ -45,7 +45,7 @@ vi.mock('../../service/database', () => ({
}
)
}));
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -63,8 +63,8 @@ vi.mock('../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../service/watchState', () => ({
+vi.mock('../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
diff --git a/src/components/__tests__/StatusBar.test.js b/src/components/__tests__/StatusBar.test.js
index 016f136c..9eaf8f16 100644
--- a/src/components/__tests__/StatusBar.test.js
+++ b/src/components/__tests__/StatusBar.test.js
@@ -9,7 +9,7 @@ import en from '../../localization/en.json';
// --- Mocks ---
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi
@@ -36,14 +36,14 @@ vi.mock('../../service/config', () => ({
}
}));
-vi.mock('../../service/websocket', () => ({
+vi.mock('../../services/websocket', () => ({
wsState: { connected: false, messageCount: 0, bytesReceived: 0 },
initWebsocket: vi.fn(),
closeWebSocket: vi.fn(),
reconnectWebSocket: vi.fn()
}));
-vi.mock('../../service/webapi', () => ({
+vi.mock('../../services/webapi', () => ({
default: {
execute: vi.fn().mockResolvedValue({
status: 200,
@@ -62,13 +62,13 @@ vi.mock('worker-timers', () => ({
clearTimeout: vi.fn()
}));
-vi.mock('../../service/jsonStorage', () => ({
+vi.mock('../../services/jsonStorage', () => ({
default: vi.fn()
}));
-vi.mock('../../service/watchState', () => ({
+vi.mock('../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
-vi.mock('../../service/database', () => ({
+vi.mock('../../services/database', () => ({
database: new Proxy(
{},
{
@@ -79,7 +79,7 @@ vi.mock('../../service/database', () => ({
}
)
}));
-vi.mock('../../plugin/router', () => ({
+vi.mock('../../plugins/router', () => ({
router: {
beforeEach: vi.fn(),
push: vi.fn(),
@@ -100,7 +100,7 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../plugin/interopApi', () => ({
+vi.mock('../../plugins/interopApi', () => ({
initInteropApi: vi.fn()
}));
diff --git a/src/components/dialogs/AvatarDialog/AvatarDialog.vue b/src/components/dialogs/AvatarDialog/AvatarDialog.vue
index fb735c44..bf4d73d2 100644
--- a/src/components/dialogs/AvatarDialog/AvatarDialog.vue
+++ b/src/components/dialogs/AvatarDialog/AvatarDialog.vue
@@ -597,7 +597,7 @@
} from '../../ui/dropdown-menu';
import { Badge } from '../../ui/badge';
import { avatarRequest } from '../../../api';
- import { database } from '../../../service/database';
+ import { database } from '../../../services/database';
import { formatJsonVars } from '../../../shared/utils/base/ui';
import { handleImageUploadInput } from '../../../shared/utils/imageUpload';
import { runDeleteVRChatCacheFlow as deleteVRChatCache } from '../../../coordinators/gameCoordinator';
diff --git a/src/components/dialogs/GroupDialog/__tests__/GroupDialogPhotosTab.test.js b/src/components/dialogs/GroupDialog/__tests__/GroupDialogPhotosTab.test.js
index 51f9df77..fc97c706 100644
--- a/src/components/dialogs/GroupDialog/__tests__/GroupDialogPhotosTab.test.js
+++ b/src/components/dialogs/GroupDialog/__tests__/GroupDialogPhotosTab.test.js
@@ -15,7 +15,7 @@ vi.mock('vue-i18n', () => ({
})
}));
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
const { ref } = require('vue');
return {
router: {
@@ -40,8 +40,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
database: new Proxy(
{},
{
@@ -52,7 +52,7 @@ vi.mock('../../../../service/database', () => ({
}
)
}));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -70,11 +70,11 @@ vi.mock('../../../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
request: vi.fn().mockResolvedValue({ json: {} }),
processBulk: vi.fn(),
buildRequestInit: vi.fn(),
diff --git a/src/components/dialogs/GroupDialog/__tests__/GroupDialogPostsTab.test.js b/src/components/dialogs/GroupDialog/__tests__/GroupDialogPostsTab.test.js
index 21946a0e..3da175af 100644
--- a/src/components/dialogs/GroupDialog/__tests__/GroupDialogPostsTab.test.js
+++ b/src/components/dialogs/GroupDialog/__tests__/GroupDialogPostsTab.test.js
@@ -19,7 +19,7 @@ vi.mock('vue-i18n', () => {
};
});
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
const { ref } = require('vue');
return {
router: {
@@ -44,8 +44,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
database: new Proxy(
{},
{
@@ -56,7 +56,7 @@ vi.mock('../../../../service/database', () => ({
}
)
}));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -74,11 +74,11 @@ vi.mock('../../../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
request: vi.fn().mockResolvedValue({ json: {} }),
processBulk: vi.fn(),
buildRequestInit: vi.fn(),
diff --git a/src/components/dialogs/GroupDialog/__tests__/useGroupMembers.test.js b/src/components/dialogs/GroupDialog/__tests__/useGroupMembers.test.js
index 01dfc682..bc817a50 100644
--- a/src/components/dialogs/GroupDialog/__tests__/useGroupMembers.test.js
+++ b/src/components/dialogs/GroupDialog/__tests__/useGroupMembers.test.js
@@ -10,7 +10,7 @@ vi.mock('../../../../api', () => ({
},
userRequest: {}
}));
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
const { ref } = require('vue');
return {
router: {
@@ -35,8 +35,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
database: new Proxy(
{},
{
@@ -47,7 +47,7 @@ vi.mock('../../../../service/database', () => ({
}
)
}));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -65,11 +65,11 @@ vi.mock('../../../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
request: vi.fn().mockResolvedValue({ json: {} }),
processBulk: vi.fn(),
buildRequestInit: vi.fn(),
diff --git a/src/components/dialogs/GroupDialog/__tests__/useGroupModerationData.test.js b/src/components/dialogs/GroupDialog/__tests__/useGroupModerationData.test.js
index 283e7dad..f0422ae1 100644
--- a/src/components/dialogs/GroupDialog/__tests__/useGroupModerationData.test.js
+++ b/src/components/dialogs/GroupDialog/__tests__/useGroupModerationData.test.js
@@ -13,7 +13,7 @@ vi.mock('vue-i18n', () => ({
install: vi.fn()
})
}));
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
const { ref: vRef } = require('vue');
return {
router: {
@@ -38,8 +38,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
database: new Proxy(
{},
{
@@ -50,7 +50,7 @@ vi.mock('../../../../service/database', () => ({
}
)
}));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -68,11 +68,11 @@ vi.mock('../../../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
request: vi.fn().mockResolvedValue({ json: {} }),
processBulk: vi.fn(),
buildRequestInit: vi.fn(),
diff --git a/src/components/dialogs/GroupDialog/groupMemberModerationBansColumns.jsx b/src/components/dialogs/GroupDialog/groupMemberModerationBansColumns.jsx
index 802a190d..dd5e6656 100644
--- a/src/components/dialogs/GroupDialog/groupMemberModerationBansColumns.jsx
+++ b/src/components/dialogs/GroupDialog/groupMemberModerationBansColumns.jsx
@@ -1,5 +1,5 @@
import { Checkbox } from '@/components/ui/checkbox';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
import { formatDateFilter } from '@/shared/utils';
import { Button } from '@/components/ui/button';
import { ArrowUpDown } from 'lucide-vue-next';
diff --git a/src/components/dialogs/GroupDialog/groupMemberModerationBlockedColumns.jsx b/src/components/dialogs/GroupDialog/groupMemberModerationBlockedColumns.jsx
index ea319628..ac07eff0 100644
--- a/src/components/dialogs/GroupDialog/groupMemberModerationBlockedColumns.jsx
+++ b/src/components/dialogs/GroupDialog/groupMemberModerationBlockedColumns.jsx
@@ -1,5 +1,5 @@
import { Checkbox } from '@/components/ui/checkbox';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
import { ArrowUpDown } from 'lucide-vue-next';
import { Button } from '@/components/ui/button';
diff --git a/src/components/dialogs/GroupDialog/groupMemberModerationInvitesColumns.jsx b/src/components/dialogs/GroupDialog/groupMemberModerationInvitesColumns.jsx
index ea319628..ac07eff0 100644
--- a/src/components/dialogs/GroupDialog/groupMemberModerationInvitesColumns.jsx
+++ b/src/components/dialogs/GroupDialog/groupMemberModerationInvitesColumns.jsx
@@ -1,5 +1,5 @@
import { Checkbox } from '@/components/ui/checkbox';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
import { ArrowUpDown } from 'lucide-vue-next';
import { Button } from '@/components/ui/button';
diff --git a/src/components/dialogs/GroupDialog/groupMemberModerationJoinRequestsColumns.jsx b/src/components/dialogs/GroupDialog/groupMemberModerationJoinRequestsColumns.jsx
index ea319628..ac07eff0 100644
--- a/src/components/dialogs/GroupDialog/groupMemberModerationJoinRequestsColumns.jsx
+++ b/src/components/dialogs/GroupDialog/groupMemberModerationJoinRequestsColumns.jsx
@@ -1,5 +1,5 @@
import { Checkbox } from '@/components/ui/checkbox';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
import { ArrowUpDown } from 'lucide-vue-next';
import { Button } from '@/components/ui/button';
diff --git a/src/components/dialogs/GroupDialog/groupMemberModerationLogsColumns.jsx b/src/components/dialogs/GroupDialog/groupMemberModerationLogsColumns.jsx
index f15b117a..c605fb3e 100644
--- a/src/components/dialogs/GroupDialog/groupMemberModerationLogsColumns.jsx
+++ b/src/components/dialogs/GroupDialog/groupMemberModerationLogsColumns.jsx
@@ -1,5 +1,5 @@
import Location from '@/components/Location.vue';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
import { formatDateFilter } from '@/shared/utils';
import { ArrowUpDown } from 'lucide-vue-next';
import { Button } from '@/components/ui/button';
diff --git a/src/components/dialogs/GroupDialog/groupMemberModerationMembersColumns.jsx b/src/components/dialogs/GroupDialog/groupMemberModerationMembersColumns.jsx
index a8a0902f..996209d0 100644
--- a/src/components/dialogs/GroupDialog/groupMemberModerationMembersColumns.jsx
+++ b/src/components/dialogs/GroupDialog/groupMemberModerationMembersColumns.jsx
@@ -1,5 +1,5 @@
import { Checkbox } from '@/components/ui/checkbox';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
import { formatDateFilter } from '@/shared/utils';
import { ArrowUpDown } from 'lucide-vue-next';
import { Button } from '@/components/ui/button';
diff --git a/src/components/dialogs/InviteDialog/sendInviteColumns.jsx b/src/components/dialogs/InviteDialog/sendInviteColumns.jsx
index aacdaf41..df11c091 100644
--- a/src/components/dialogs/InviteDialog/sendInviteColumns.jsx
+++ b/src/components/dialogs/InviteDialog/sendInviteColumns.jsx
@@ -1,6 +1,6 @@
import CountdownTimer from '@/components/CountdownTimer.vue';
import { Button } from '@/components/ui/button';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
import { SquarePen } from 'lucide-vue-next';
const { t } = i18n.global;
diff --git a/src/components/dialogs/InviteGroupDialog.vue b/src/components/dialogs/InviteGroupDialog.vue
index f829f24f..d8633b1b 100644
--- a/src/components/dialogs/InviteGroupDialog.vue
+++ b/src/components/dialogs/InviteGroupDialog.vue
@@ -101,7 +101,7 @@
import { groupRequest, queryRequest } from '../../api';
import { VirtualCombobox } from '../ui/virtual-combobox';
- import configRepository from '../../service/config';
+ import configRepository from '../../services/config';
const { vipFriends, onlineFriends, activeFriends, offlineFriends } = storeToRefs(useFriendStore());
const { currentUserGroups, inviteGroupDialog } = storeToRefs(useGroupStore());
diff --git a/src/components/dialogs/LaunchDialog.vue b/src/components/dialogs/LaunchDialog.vue
index 382ce41d..90e93237 100644
--- a/src/components/dialogs/LaunchDialog.vue
+++ b/src/components/dialogs/LaunchDialog.vue
@@ -165,7 +165,7 @@
import { instanceRequest, queryRequest } from '../../api';
import InviteDialog from './InviteDialog/InviteDialog.vue';
- import configRepository from '../../service/config';
+ import configRepository from '../../services/config';
const { t } = useI18n();
diff --git a/src/components/dialogs/NewInstanceDialog.vue b/src/components/dialogs/NewInstanceDialog.vue
index a1f453d5..b55cc0a7 100644
--- a/src/components/dialogs/NewInstanceDialog.vue
+++ b/src/components/dialogs/NewInstanceDialog.vue
@@ -585,7 +585,7 @@
import { VirtualCombobox } from '../ui/virtual-combobox';
import InviteDialog from './InviteDialog/InviteDialog.vue';
- import configRepository from '../../service/config';
+ import configRepository from '../../services/config';
const props = defineProps({
newInstanceDialogLocationTag: {
diff --git a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue
index 44438bc6..3b6c0add 100644
--- a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue
+++ b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue
@@ -41,7 +41,7 @@
import { DataTableLayout } from '../../ui/data-table';
import { InputGroupField } from '../../../components/ui/input-group';
import { createColumns } from './previousInstancesInfoColumns.jsx';
- import { database } from '../../../service/database';
+ import { database } from '../../../services/database';
import { useVrcxVueTable } from '../../../lib/table/useVrcxVueTable';
import { lookupUser } from '../../../coordinators/userCoordinator';
diff --git a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesListDialog.vue b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesListDialog.vue
index 3f108a77..5a6c95a5 100644
--- a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesListDialog.vue
+++ b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesListDialog.vue
@@ -56,7 +56,7 @@
} from '../../../shared/utils';
import { DataTableLayout } from '../../ui/data-table';
import { createPreviousInstancesColumns } from './previousInstancesColumns.jsx';
- import { database } from '../../../service/database';
+ import { database } from '../../../services/database';
import { useVrcxVueTable } from '../../../lib/table/useVrcxVueTable';
const props = defineProps({
diff --git a/src/components/dialogs/PreviousInstancesDialog/previousInstancesColumns.jsx b/src/components/dialogs/PreviousInstancesDialog/previousInstancesColumns.jsx
index ff01eeb4..fac1160e 100644
--- a/src/components/dialogs/PreviousInstancesDialog/previousInstancesColumns.jsx
+++ b/src/components/dialogs/PreviousInstancesDialog/previousInstancesColumns.jsx
@@ -4,7 +4,7 @@ import DisplayName from '../../DisplayName.vue';
import Location from '../../Location.vue';
import LocationWorld from '../../LocationWorld.vue';
import { Button } from '../../ui/button';
-import { i18n } from '../../../plugin';
+import { i18n } from '../../../plugins';
import { formatDateFilter } from '../../../shared/utils';
const { t } = i18n.global;
diff --git a/src/components/dialogs/PreviousInstancesDialog/previousInstancesInfoColumns.jsx b/src/components/dialogs/PreviousInstancesDialog/previousInstancesInfoColumns.jsx
index d8d1be84..6098148f 100644
--- a/src/components/dialogs/PreviousInstancesDialog/previousInstancesInfoColumns.jsx
+++ b/src/components/dialogs/PreviousInstancesDialog/previousInstancesInfoColumns.jsx
@@ -1,7 +1,7 @@
import { ArrowUpDown } from 'lucide-vue-next';
import { Button } from '../../ui/button';
-import { i18n } from '../../../plugin';
+import { i18n } from '../../../plugins';
import { formatDateFilter } from '../../../shared/utils';
const { t } = i18n.global;
diff --git a/src/components/dialogs/UserDialog/UserDialogMutualFriendsTab.vue b/src/components/dialogs/UserDialog/UserDialogMutualFriendsTab.vue
index 852d15a8..89af0a26 100644
--- a/src/components/dialogs/UserDialog/UserDialogMutualFriendsTab.vue
+++ b/src/components/dialogs/UserDialog/UserDialogMutualFriendsTab.vue
@@ -67,8 +67,8 @@
compareByLastActiveRef,
userImage
} from '../../../shared/utils';
- import { database } from '../../../service/database';
- import { processBulk } from '../../../service/request';
+ import { database } from '../../../services/database';
+ import { processBulk } from '../../../services/request';
import { useOptionKeySelect } from '../../../composables/useOptionKeySelect';
import { useUserStore } from '../../../stores';
import { userDialogMutualFriendSortingOptions } from '../../../shared/constants';
diff --git a/src/components/dialogs/UserDialog/__tests__/UserDialogAvatarsTab.test.js b/src/components/dialogs/UserDialog/__tests__/UserDialogAvatarsTab.test.js
index 9e555e39..c74322a9 100644
--- a/src/components/dialogs/UserDialog/__tests__/UserDialogAvatarsTab.test.js
+++ b/src/components/dialogs/UserDialog/__tests__/UserDialogAvatarsTab.test.js
@@ -19,7 +19,7 @@ vi.mock('vue-i18n', () => {
};
});
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
const { ref } = require('vue');
return {
router: {
@@ -44,8 +44,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
database: new Proxy(
{},
{
@@ -56,7 +56,7 @@ vi.mock('../../../../service/database', () => ({
}
)
}));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -74,8 +74,8 @@ vi.mock('../../../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
diff --git a/src/components/dialogs/UserDialog/__tests__/UserDialogInfoTab.test.js b/src/components/dialogs/UserDialog/__tests__/UserDialogInfoTab.test.js
index 33adde3d..9965bd63 100644
--- a/src/components/dialogs/UserDialog/__tests__/UserDialogInfoTab.test.js
+++ b/src/components/dialogs/UserDialog/__tests__/UserDialogInfoTab.test.js
@@ -16,7 +16,7 @@ vi.mock('vue-i18n', () => ({
})
}));
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
const { ref } = require('vue');
return {
router: {
@@ -43,8 +43,8 @@ vi.mock('vue-router', async (importOriginal) => {
};
});
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
database: new Proxy(
{},
{
@@ -56,7 +56,7 @@ vi.mock('../../../../service/database', () => ({
)
}));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -75,11 +75,11 @@ vi.mock('../../../../service/config', () => ({
}
}));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
request: vi.fn().mockResolvedValue({ json: {} }),
processBulk: vi.fn(),
buildRequestInit: vi.fn(),
diff --git a/src/components/dialogs/UserDialog/__tests__/UserDialogMutualFriendsTab.test.js b/src/components/dialogs/UserDialog/__tests__/UserDialogMutualFriendsTab.test.js
index 60ec5ce1..fb5a92cd 100644
--- a/src/components/dialogs/UserDialog/__tests__/UserDialogMutualFriendsTab.test.js
+++ b/src/components/dialogs/UserDialog/__tests__/UserDialogMutualFriendsTab.test.js
@@ -15,7 +15,7 @@ vi.mock('vue-i18n', () => ({
})
}));
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
const { ref } = require('vue');
return {
router: {
@@ -40,8 +40,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
database: new Proxy(
{},
{
@@ -52,7 +52,7 @@ vi.mock('../../../../service/database', () => ({
}
)
}));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -70,11 +70,11 @@ vi.mock('../../../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
request: vi.fn().mockResolvedValue({ json: {} }),
processBulk: vi.fn(),
buildRequestInit: vi.fn(),
diff --git a/src/components/dialogs/UserDialog/__tests__/UserDialogWorldsTab.test.js b/src/components/dialogs/UserDialog/__tests__/UserDialogWorldsTab.test.js
index 590d41ba..a0336d31 100644
--- a/src/components/dialogs/UserDialog/__tests__/UserDialogWorldsTab.test.js
+++ b/src/components/dialogs/UserDialog/__tests__/UserDialogWorldsTab.test.js
@@ -19,7 +19,7 @@ vi.mock('vue-i18n', () => {
};
});
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
const { ref } = require('vue');
return {
router: {
@@ -44,8 +44,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
database: new Proxy(
{},
{
@@ -56,7 +56,7 @@ vi.mock('../../../../service/database', () => ({
}
)
}));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -74,11 +74,11 @@ vi.mock('../../../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
request: vi.fn().mockResolvedValue({ json: {} }),
processBulk: vi.fn(),
buildRequestInit: vi.fn(),
diff --git a/src/components/dialogs/UserDialog/__tests__/useUserDialogCommands.test.js b/src/components/dialogs/UserDialog/__tests__/useUserDialogCommands.test.js
index 1081c0d2..8c492ea4 100644
--- a/src/components/dialogs/UserDialog/__tests__/useUserDialogCommands.test.js
+++ b/src/components/dialogs/UserDialog/__tests__/useUserDialogCommands.test.js
@@ -33,7 +33,7 @@ vi.mock('../../../../shared/utils', () => ({
parseLocation: vi.fn(() => ({ worldId: 'wrld_test', tag: 'wrld_test~123' }))
}));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../services/database', () => ({
database: {
addFriendLogHistory: vi.fn()
}
@@ -48,7 +48,7 @@ const {
playerModerationRequest,
miscRequest
} = await import('../../../../api');
-const { database } = await import('../../../../service/database');
+const { database } = await import('../../../../services/database');
function createMockUserDialog() {
return ref({
diff --git a/src/components/dialogs/UserDialog/sendInviteRequestColumns.jsx b/src/components/dialogs/UserDialog/sendInviteRequestColumns.jsx
index 29625fa5..872fd631 100644
--- a/src/components/dialogs/UserDialog/sendInviteRequestColumns.jsx
+++ b/src/components/dialogs/UserDialog/sendInviteRequestColumns.jsx
@@ -1,6 +1,6 @@
import CountdownTimer from '@/components/CountdownTimer.vue';
import { Button } from '@/components/ui/button';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
import { SquarePen } from 'lucide-vue-next';
const { t } = i18n.global;
diff --git a/src/components/dialogs/UserDialog/useUserDialogCommands.js b/src/components/dialogs/UserDialog/useUserDialogCommands.js
index 8b5bb3d4..9db5c470 100644
--- a/src/components/dialogs/UserDialog/useUserDialogCommands.js
+++ b/src/components/dialogs/UserDialog/useUserDialogCommands.js
@@ -9,7 +9,7 @@ import {
queryRequest
} from '../../../api';
import { copyToClipboard, parseLocation } from '../../../shared/utils';
-import { database } from '../../../service/database';
+import { database } from '../../../services/database';
/**
* Composable for UserDialog command dispatch.
diff --git a/src/components/dialogs/WorldDialog/__tests__/useWorldDialogInfo.test.js b/src/components/dialogs/WorldDialog/__tests__/useWorldDialogInfo.test.js
index 44c8ce7b..835f1921 100644
--- a/src/components/dialogs/WorldDialog/__tests__/useWorldDialogInfo.test.js
+++ b/src/components/dialogs/WorldDialog/__tests__/useWorldDialogInfo.test.js
@@ -9,14 +9,14 @@ vi.mock('../../../../shared/utils', () => ({
timeToText: vi.fn((ms) => `${Math.floor(ms / 1000)}s`)
}));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../services/database', () => ({
database: {
setWorldMemo: vi.fn(),
deleteWorldMemo: vi.fn()
}
}));
-const { database } = await import('../../../../service/database');
+const { database } = await import('../../../../services/database');
const { compareUnityVersion } = await import('../../../../shared/utils');
/**
diff --git a/src/components/dialogs/WorldDialog/useWorldDialogInfo.js b/src/components/dialogs/WorldDialog/useWorldDialogInfo.js
index bd27e9f8..fda5c3e7 100644
--- a/src/components/dialogs/WorldDialog/useWorldDialogInfo.js
+++ b/src/components/dialogs/WorldDialog/useWorldDialogInfo.js
@@ -5,7 +5,7 @@ import {
formatDateFilter,
timeToText
} from '../../../shared/utils';
-import { database } from '../../../service/database';
+import { database } from '../../../services/database';
/**
* Composable for WorldDialogInfoTab computed properties and actions.
diff --git a/src/components/dialogs/__tests__/DialogJsonTab.test.js b/src/components/dialogs/__tests__/DialogJsonTab.test.js
index 5472c56f..7008b19d 100644
--- a/src/components/dialogs/__tests__/DialogJsonTab.test.js
+++ b/src/components/dialogs/__tests__/DialogJsonTab.test.js
@@ -26,7 +26,7 @@ vi.mock('../../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
router: {
beforeEach: vi.fn(),
push: vi.fn(),
@@ -47,8 +47,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../service/database', () => ({
+vi.mock('../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../services/database', () => ({
database: new Proxy(
{},
{
@@ -59,7 +59,7 @@ vi.mock('../../../service/database', () => ({
}
)
}));
-vi.mock('../../../service/config', () => ({
+vi.mock('../../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -77,8 +77,8 @@ vi.mock('../../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../service/watchState', () => ({
+vi.mock('../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
diff --git a/src/coordinators/authAutoLoginCoordinator.js b/src/coordinators/authAutoLoginCoordinator.js
index 99bf0247..90e64d8d 100644
--- a/src/coordinators/authAutoLoginCoordinator.js
+++ b/src/coordinators/authAutoLoginCoordinator.js
@@ -1,7 +1,7 @@
import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
-import { AppDebug } from '../service/appConfig';
+import { AppDebug } from '../services/appConfig';
import { useAdvancedSettingsStore } from '../stores/settings/advanced';
import { useAuthStore } from '../stores/auth';
diff --git a/src/coordinators/authCoordinator.js b/src/coordinators/authCoordinator.js
index 285dedf9..27d60593 100644
--- a/src/coordinators/authCoordinator.js
+++ b/src/coordinators/authCoordinator.js
@@ -1,8 +1,8 @@
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
import Noty from 'noty';
-import { closeWebSocket, initWebsocket } from '../service/websocket';
+import { closeWebSocket, initWebsocket } from '../services/websocket';
import { escapeTag } from '../shared/utils';
import { queryClient } from '../queries';
import { useAuthStore } from '../stores/auth';
@@ -10,10 +10,10 @@ import { useNotificationStore } from '../stores/notification';
import { useUpdateLoopStore } from '../stores/updateLoop';
import { useUserStore } from '../stores/user';
import { applyCurrentUser } from './userCoordinator';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
-import configRepository from '../service/config';
-import webApiService from '../service/webapi';
+import configRepository from '../services/config';
+import webApiService from '../services/webapi';
/**
* Runs the shared logout side effects (including goodbye notification).
diff --git a/src/coordinators/avatarCoordinator.js b/src/coordinators/avatarCoordinator.js
index 77f48203..15a747d3 100644
--- a/src/coordinators/avatarCoordinator.js
+++ b/src/coordinators/avatarCoordinator.js
@@ -1,6 +1,6 @@
import { nextTick } from 'vue';
import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
import {
createDefaultAvatarRef,
@@ -13,10 +13,10 @@ import {
storeAvatarImage
} from '../shared/utils';
import { avatarRequest, miscRequest, queryRequest } from '../api';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
import { patchAvatarFromEvent } from '../queries';
-import { processBulk } from '../service/request';
+import { processBulk } from '../services/request';
import { applyFavorite } from './favoriteCoordinator';
import { refreshUserDialogAvatars, showUserDialog } from './userCoordinator';
import { useAdvancedSettingsStore } from '../stores/settings/advanced';
@@ -28,7 +28,7 @@ import { useUiStore } from '../stores/ui';
import { useUserStore } from '../stores/user';
import { useVRCXUpdaterStore } from '../stores/vrcxUpdater';
-import webApiService from '../service/webapi';
+import webApiService from '../services/webapi';
/**
* @param {object} json
diff --git a/src/coordinators/favoriteCoordinator.js b/src/coordinators/favoriteCoordinator.js
index 355cce90..b94decc1 100644
--- a/src/coordinators/favoriteCoordinator.js
+++ b/src/coordinators/favoriteCoordinator.js
@@ -10,10 +10,10 @@ import { useWorldStore } from '../stores/world';
import { applyWorld } from './worldCoordinator';
import { runUpdateFriendFlow } from './friendPresenceCoordinator';
import { avatarRequest, favoriteRequest, queryRequest } from '../api';
-import { database } from '../service/database';
-import { i18n } from '../plugin/i18n';
-import { processBulk } from '../service/request';
-import { watchState } from '../service/watchState';
+import { database } from '../services/database';
+import { i18n } from '../plugins/i18n';
+import { processBulk } from '../services/request';
+import { watchState } from '../services/watchState';
import {
compareByName,
createDefaultFavoriteCachedRef,
diff --git a/src/coordinators/friendPresenceCoordinator.js b/src/coordinators/friendPresenceCoordinator.js
index 8a7f8ce0..a38bd201 100644
--- a/src/coordinators/friendPresenceCoordinator.js
+++ b/src/coordinators/friendPresenceCoordinator.js
@@ -1,13 +1,13 @@
import { getGroupName, getWorldName, isRealInstance } from '../shared/utils';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
import { useFeedStore } from '../stores/feed';
import { useFriendStore } from '../stores/friend';
import { useNotificationStore } from '../stores/notification';
import { useSharedFeedStore } from '../stores/sharedFeed';
import { useUserStore } from '../stores/user';
import { userRequest } from '../api';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
/**
* @param {object} ctx
diff --git a/src/coordinators/friendRelationshipCoordinator.js b/src/coordinators/friendRelationshipCoordinator.js
index 4929fceb..46b0b0bc 100644
--- a/src/coordinators/friendRelationshipCoordinator.js
+++ b/src/coordinators/friendRelationshipCoordinator.js
@@ -1,6 +1,6 @@
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
-import { database } from '../service/database';
+import { database } from '../services/database';
import { friendRequest, userRequest } from '../api';
import { getNameColour } from '../shared/utils';
import { handleFavoriteDelete } from './favoriteCoordinator';
@@ -12,9 +12,9 @@ import { useNotificationStore } from '../stores/notification';
import { useSharedFeedStore } from '../stores/sharedFeed';
import { useUiStore } from '../stores/ui';
import { useUserStore } from '../stores/user';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
/**
* @param {object} args
diff --git a/src/coordinators/friendSyncCoordinator.js b/src/coordinators/friendSyncCoordinator.js
index 79888cf8..764a8f7c 100644
--- a/src/coordinators/friendSyncCoordinator.js
+++ b/src/coordinators/friendSyncCoordinator.js
@@ -1,16 +1,16 @@
import { toast } from 'vue-sonner';
-import { AppDebug } from '../service/appConfig';
+import { AppDebug } from '../services/appConfig';
import { migrateMemos } from '../shared/utils';
-import { reconnectWebSocket } from '../service/websocket';
+import { reconnectWebSocket } from '../services/websocket';
import { useAuthStore } from '../stores/auth';
import { useFriendStore } from '../stores/friend';
import { useUpdateLoopStore } from '../stores/updateLoop';
import { useUserStore } from '../stores/user';
import { getCurrentUser } from './userCoordinator';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
/**
* Runs friend list refresh orchestration.
diff --git a/src/coordinators/gameCoordinator.js b/src/coordinators/gameCoordinator.js
index 73b6793b..0a850c8c 100644
--- a/src/coordinators/gameCoordinator.js
+++ b/src/coordinators/gameCoordinator.js
@@ -4,7 +4,7 @@ import {
deleteVRChatCache as _deleteVRChatCache,
isRealInstance
} from '../shared/utils';
-import { database } from '../service/database';
+import { database } from '../services/database';
import { useAdvancedSettingsStore } from '../stores/settings/advanced';
import { useAvatarStore } from '../stores/avatar';
import { addAvatarWearTime } from './avatarCoordinator';
@@ -21,7 +21,7 @@ import { useUserStore } from '../stores/user';
import { useVrStore } from '../stores/vr';
import { useWorldStore } from '../stores/world';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
import * as workerTimers from 'worker-timers';
diff --git a/src/coordinators/gameLogCoordinator.js b/src/coordinators/gameLogCoordinator.js
index ef2e078b..709ada33 100644
--- a/src/coordinators/gameLogCoordinator.js
+++ b/src/coordinators/gameLogCoordinator.js
@@ -11,13 +11,13 @@ import {
parsePrintFromUrl,
replaceBioSymbols
} from '../shared/utils';
-import { i18n } from '../plugin/i18n';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { i18n } from '../plugins/i18n';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
import { runLastLocationResetFlow, runUpdateCurrentUserLocationFlow } from './locationCoordinator';
import { getGroupName } from '../shared/utils';
import { userRequest } from '../api';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
import { toast } from 'vue-sonner';
import { useAdvancedSettingsStore } from '../stores/settings/advanced';
@@ -36,7 +36,7 @@ import { useUserStore } from '../stores/user';
import { useVrStore } from '../stores/vr';
import { useVrcxStore } from '../stores/vrcx';
-import gameLogService from '../service/gameLog.js';
+import gameLogService from '../services/gameLog.js';
import * as workerTimers from 'worker-timers';
@@ -579,4 +579,4 @@ export async function disableGameLogDialog() {
}
}
-import configRepository from '../service/config';
+import configRepository from '../services/config';
diff --git a/src/coordinators/groupCoordinator.js b/src/coordinators/groupCoordinator.js
index 3ab9f00b..d9539df5 100644
--- a/src/coordinators/groupCoordinator.js
+++ b/src/coordinators/groupCoordinator.js
@@ -1,6 +1,6 @@
import { nextTick } from 'vue';
import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
import {
convertFileUrlToImageUrl,
@@ -9,7 +9,7 @@ import {
replaceBioSymbols
} from '../shared/utils';
import { groupRequest, instanceRequest, queryRequest } from '../api';
-import { database } from '../service/database';
+import { database } from '../services/database';
import { groupDialogFilterOptions } from '../shared/constants/';
import { patchGroupFromEvent } from '../queries';
import { useGameStore } from '../stores/game';
@@ -19,9 +19,9 @@ import { useNotificationStore } from '../stores/notification';
import { useUiStore } from '../stores/ui';
import { useUserStore } from '../stores/user';
import { useGroupStore } from '../stores/group';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
import * as workerTimers from 'worker-timers';
diff --git a/src/coordinators/inviteCoordinator.js b/src/coordinators/inviteCoordinator.js
index 78697bc3..3a9cfbca 100644
--- a/src/coordinators/inviteCoordinator.js
+++ b/src/coordinators/inviteCoordinator.js
@@ -1,5 +1,5 @@
import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
import { instanceRequest } from '../api';
import { parseLocation } from '../shared/utils';
diff --git a/src/coordinators/locationCoordinator.js b/src/coordinators/locationCoordinator.js
index 96e771ed..5a83c66f 100644
--- a/src/coordinators/locationCoordinator.js
+++ b/src/coordinators/locationCoordinator.js
@@ -4,7 +4,7 @@ import {
isRealInstance,
parseLocation
} from '../shared/utils';
-import { database } from '../service/database';
+import { database } from '../services/database';
import { useAdvancedSettingsStore } from '../stores/settings/advanced';
import { useGameLogStore } from '../stores/gameLog';
import { useGameStore } from '../stores/game';
diff --git a/src/coordinators/userCoordinator.js b/src/coordinators/userCoordinator.js
index 0a5f3103..4c17192b 100644
--- a/src/coordinators/userCoordinator.js
+++ b/src/coordinators/userCoordinator.js
@@ -1,6 +1,6 @@
import { reactive } from 'vue';
import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
import {
arraysMatch,
@@ -22,11 +22,11 @@ import {
queryRequest,
userRequest
} from '../api';
-import { processBulk, request } from '../service/request';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { processBulk, request } from '../services/request';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
import { patchUserFromEvent } from '../queries';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
import { applyAvatar, showAvatarDialog } from './avatarCoordinator';
import { applyFavorite } from './favoriteCoordinator';
import {
diff --git a/src/coordinators/userEventCoordinator.js b/src/coordinators/userEventCoordinator.js
index b29c8c7b..d8cae6c3 100644
--- a/src/coordinators/userEventCoordinator.js
+++ b/src/coordinators/userEventCoordinator.js
@@ -1,6 +1,6 @@
import { getGroupName, getWorldName, parseLocation } from '../shared/utils';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
import { useAvatarStore } from '../stores/avatar';
import { getAvatarName } from './avatarCoordinator';
import { useFeedStore } from '../stores/feed';
diff --git a/src/coordinators/vrcxCoordinator.js b/src/coordinators/vrcxCoordinator.js
index 32d050bf..8b95143f 100644
--- a/src/coordinators/vrcxCoordinator.js
+++ b/src/coordinators/vrcxCoordinator.js
@@ -7,7 +7,7 @@ import { useInstanceStore } from '../stores/instance';
import { useLocationStore } from '../stores/location';
import { useUserStore } from '../stores/user';
import { useWorldStore } from '../stores/world';
-import { failedGetRequests } from '../service/request';
+import { failedGetRequests } from '../services/request';
/**
* Clears caches across multiple stores while preserving data that is
diff --git a/src/coordinators/worldCoordinator.js b/src/coordinators/worldCoordinator.js
index a7894bc9..71c591d7 100644
--- a/src/coordinators/worldCoordinator.js
+++ b/src/coordinators/worldCoordinator.js
@@ -1,6 +1,6 @@
import { nextTick } from 'vue';
import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
import {
checkVRChatCache,
@@ -14,9 +14,9 @@ import {
sanitizeEntityJson
} from '../shared/utils';
import { instanceRequest, queryRequest, worldRequest } from '../api';
-import { database } from '../service/database';
+import { database } from '../services/database';
import { patchWorldFromEvent } from '../queries';
-import { processBulk } from '../service/request';
+import { processBulk } from '../services/request';
import { applyFavorite } from './favoriteCoordinator';
import { useFavoriteStore } from '../stores/favorite';
import { useInstanceStore } from '../stores/instance';
diff --git a/src/plugin/components.js b/src/plugins/components.js
similarity index 100%
rename from src/plugin/components.js
rename to src/plugins/components.js
diff --git a/src/plugin/dayjs.js b/src/plugins/dayjs.js
similarity index 100%
rename from src/plugin/dayjs.js
rename to src/plugins/dayjs.js
diff --git a/src/plugin/i18n.js b/src/plugins/i18n.js
similarity index 100%
rename from src/plugin/i18n.js
rename to src/plugins/i18n.js
diff --git a/src/plugin/index.js b/src/plugins/index.js
similarity index 100%
rename from src/plugin/index.js
rename to src/plugins/index.js
diff --git a/src/plugin/interopApi.js b/src/plugins/interopApi.js
similarity index 91%
rename from src/plugin/interopApi.js
rename to src/plugins/interopApi.js
index 0b92a15d..24748a5d 100644
--- a/src/plugin/interopApi.js
+++ b/src/plugins/interopApi.js
@@ -1,7 +1,7 @@
// @ts-nocheck
import InteropApi from '../ipc-electron/interopApi.js';
-import configRepository from '../service/config';
-import vrcxJsonStorage from '../service/jsonStorage';
+import configRepository from '../services/config.js';
+import vrcxJsonStorage from '../services/jsonStorage.js';
export async function initInteropApi(isVrOverlay = false) {
if (isVrOverlay) {
diff --git a/src/plugin/noty.js b/src/plugins/noty.js
similarity index 100%
rename from src/plugin/noty.js
rename to src/plugins/noty.js
diff --git a/src/plugin/piniaActionTrail.js b/src/plugins/piniaActionTrail.js
similarity index 100%
rename from src/plugin/piniaActionTrail.js
rename to src/plugins/piniaActionTrail.js
diff --git a/src/plugin/router.js b/src/plugins/router.js
similarity index 98%
rename from src/plugin/router.js
rename to src/plugins/router.js
index 9d310ea6..a73a2a7f 100644
--- a/src/plugin/router.js
+++ b/src/plugins/router.js
@@ -1,6 +1,6 @@
import { createRouter, createWebHashHistory } from 'vue-router';
-import { watchState } from './../service/watchState';
+import { watchState } from '../services/watchState';
import FavoritesAvatar from './../views/Favorites/FavoritesAvatar.vue';
import FavoritesFriend from './../views/Favorites/FavoritesFriend.vue';
diff --git a/src/plugin/sentry.js b/src/plugins/sentry.js
similarity index 98%
rename from src/plugin/sentry.js
rename to src/plugins/sentry.js
index c269fe8f..0326ac90 100644
--- a/src/plugin/sentry.js
+++ b/src/plugins/sentry.js
@@ -1,7 +1,7 @@
import { router } from './router';
import { startRendererMemoryThresholdReport } from './piniaActionTrail';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
export async function isSentryOptedIn() {
return NIGHTLY && configRepository.getBool('VRCX_SentryEnabled', false);
diff --git a/src/plugin/ui.js b/src/plugins/ui.js
similarity index 94%
rename from src/plugin/ui.js
rename to src/plugins/ui.js
index 6156c9bb..71a4b8df 100644
--- a/src/plugin/ui.js
+++ b/src/plugins/ui.js
@@ -9,7 +9,7 @@ import {
} from '../shared/utils/base/ui';
import { i18n, loadLocalizedStrings } from './i18n';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
export async function initUi() {
try {
diff --git a/src/service/__tests__/config.test.js b/src/services/__tests__/config.test.js
similarity index 95%
rename from src/service/__tests__/config.test.js
rename to src/services/__tests__/config.test.js
index 6b2656c5..c946f701 100644
--- a/src/service/__tests__/config.test.js
+++ b/src/services/__tests__/config.test.js
@@ -1,5 +1,5 @@
// Mock router to avoid transitive i18n.global error from columns.jsx
-vi.mock('../../plugin/router.js', () => ({
+vi.mock('../../plugins/router.js', () => ({
router: { beforeEach: vi.fn(), push: vi.fn() },
initRouter: vi.fn()
}));
diff --git a/src/service/__tests__/confusables.test.js b/src/services/__tests__/confusables.test.js
similarity index 100%
rename from src/service/__tests__/confusables.test.js
rename to src/services/__tests__/confusables.test.js
diff --git a/src/service/__tests__/gameLog.test.js b/src/services/__tests__/gameLog.test.js
similarity index 100%
rename from src/service/__tests__/gameLog.test.js
rename to src/services/__tests__/gameLog.test.js
diff --git a/src/service/__tests__/request.test.js b/src/services/__tests__/request.test.js
similarity index 99%
rename from src/service/__tests__/request.test.js
rename to src/services/__tests__/request.test.js
index 031c0ce6..1bc09e22 100644
--- a/src/service/__tests__/request.test.js
+++ b/src/services/__tests__/request.test.js
@@ -1,5 +1,5 @@
// Mock router to avoid transitive i18n.global error from columns.jsx
-vi.mock('../../plugin/router.js', () => ({
+vi.mock('../../plugins/router.js', () => ({
router: { beforeEach: vi.fn(), push: vi.fn() },
initRouter: vi.fn()
}));
diff --git a/src/service/__tests__/security.test.js b/src/services/__tests__/security.test.js
similarity index 100%
rename from src/service/__tests__/security.test.js
rename to src/services/__tests__/security.test.js
diff --git a/src/service/appConfig.js b/src/services/appConfig.js
similarity index 100%
rename from src/service/appConfig.js
rename to src/services/appConfig.js
diff --git a/src/service/config.js b/src/services/config.js
similarity index 100%
rename from src/service/config.js
rename to src/services/config.js
diff --git a/src/service/confusables.js b/src/services/confusables.js
similarity index 100%
rename from src/service/confusables.js
rename to src/services/confusables.js
diff --git a/src/service/database/avatarFavorites.js b/src/services/database/avatarFavorites.js
similarity index 100%
rename from src/service/database/avatarFavorites.js
rename to src/services/database/avatarFavorites.js
diff --git a/src/service/database/avatarTags.js b/src/services/database/avatarTags.js
similarity index 100%
rename from src/service/database/avatarTags.js
rename to src/services/database/avatarTags.js
diff --git a/src/service/database/feed.js b/src/services/database/feed.js
similarity index 100%
rename from src/service/database/feed.js
rename to src/services/database/feed.js
diff --git a/src/service/database/friendFavorites.js b/src/services/database/friendFavorites.js
similarity index 100%
rename from src/service/database/friendFavorites.js
rename to src/services/database/friendFavorites.js
diff --git a/src/service/database/friendLogCurrent.js b/src/services/database/friendLogCurrent.js
similarity index 100%
rename from src/service/database/friendLogCurrent.js
rename to src/services/database/friendLogCurrent.js
diff --git a/src/service/database/friendLogHistory.js b/src/services/database/friendLogHistory.js
similarity index 100%
rename from src/service/database/friendLogHistory.js
rename to src/services/database/friendLogHistory.js
diff --git a/src/service/database/gameLog.js b/src/services/database/gameLog.js
similarity index 100%
rename from src/service/database/gameLog.js
rename to src/services/database/gameLog.js
diff --git a/src/service/database/index.js b/src/services/database/index.js
similarity index 100%
rename from src/service/database/index.js
rename to src/services/database/index.js
diff --git a/src/service/database/memos.js b/src/services/database/memos.js
similarity index 100%
rename from src/service/database/memos.js
rename to src/services/database/memos.js
diff --git a/src/service/database/moderation.js b/src/services/database/moderation.js
similarity index 100%
rename from src/service/database/moderation.js
rename to src/services/database/moderation.js
diff --git a/src/service/database/mutualGraph.js b/src/services/database/mutualGraph.js
similarity index 100%
rename from src/service/database/mutualGraph.js
rename to src/services/database/mutualGraph.js
diff --git a/src/service/database/notifications.js b/src/services/database/notifications.js
similarity index 100%
rename from src/service/database/notifications.js
rename to src/services/database/notifications.js
diff --git a/src/service/database/tableAlter.js b/src/services/database/tableAlter.js
similarity index 100%
rename from src/service/database/tableAlter.js
rename to src/services/database/tableAlter.js
diff --git a/src/service/database/tableFixes.js b/src/services/database/tableFixes.js
similarity index 100%
rename from src/service/database/tableFixes.js
rename to src/services/database/tableFixes.js
diff --git a/src/service/database/tableSize.js b/src/services/database/tableSize.js
similarity index 100%
rename from src/service/database/tableSize.js
rename to src/services/database/tableSize.js
diff --git a/src/service/database/worldFavorites.js b/src/services/database/worldFavorites.js
similarity index 100%
rename from src/service/database/worldFavorites.js
rename to src/services/database/worldFavorites.js
diff --git a/src/service/gameLog.js b/src/services/gameLog.js
similarity index 100%
rename from src/service/gameLog.js
rename to src/services/gameLog.js
diff --git a/src/service/jsonStorage.js b/src/services/jsonStorage.js
similarity index 100%
rename from src/service/jsonStorage.js
rename to src/services/jsonStorage.js
diff --git a/src/service/request.js b/src/services/request.js
similarity index 99%
rename from src/service/request.js
rename to src/services/request.js
index 7bb20aea..a5c4b975 100644
--- a/src/service/request.js
+++ b/src/services/request.js
@@ -10,7 +10,7 @@ import {
import { getCurrentUser } from '../coordinators/userCoordinator';
import { AppDebug } from './appConfig.js';
import { escapeTag } from '../shared/utils';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
import { statusCodes } from '../shared/constants/api.js';
import { watchState } from './watchState';
diff --git a/src/service/security.js b/src/services/security.js
similarity index 100%
rename from src/service/security.js
rename to src/services/security.js
diff --git a/src/service/sqlite.js b/src/services/sqlite.js
similarity index 98%
rename from src/service/sqlite.js
rename to src/services/sqlite.js
index cb7386f7..2a9b2bbf 100644
--- a/src/service/sqlite.js
+++ b/src/services/sqlite.js
@@ -1,4 +1,4 @@
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
import { openExternalLink } from '../shared/utils';
import { useModalStore } from '../stores';
diff --git a/src/service/watchState.js b/src/services/watchState.js
similarity index 100%
rename from src/service/watchState.js
rename to src/services/watchState.js
diff --git a/src/service/webapi.js b/src/services/webapi.js
similarity index 100%
rename from src/service/webapi.js
rename to src/services/webapi.js
diff --git a/src/service/websocket.js b/src/services/websocket.js
similarity index 100%
rename from src/service/websocket.js
rename to src/services/websocket.js
diff --git a/src/shared/utils/__tests__/avatar.test.js b/src/shared/utils/__tests__/avatar.test.js
index b1cd9af6..5d9a8a11 100644
--- a/src/shared/utils/__tests__/avatar.test.js
+++ b/src/shared/utils/__tests__/avatar.test.js
@@ -7,7 +7,7 @@ vi.mock('../../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
router: {
beforeEach: vi.fn(),
push: vi.fn(),
diff --git a/src/shared/utils/__tests__/common.test.js b/src/shared/utils/__tests__/common.test.js
index f8ea4faf..cccc2d93 100644
--- a/src/shared/utils/__tests__/common.test.js
+++ b/src/shared/utils/__tests__/common.test.js
@@ -1,7 +1,7 @@
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
// Mock AppDebug
-vi.mock('../../../service/appConfig', () => ({
+vi.mock('../../../services/appConfig', () => ({
AppDebug: { endpointDomain: 'https://api.vrchat.cloud/api/1' }
}));
@@ -10,7 +10,7 @@ vi.mock('../../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
default: { push: vi.fn(), currentRoute: { value: {} } }
}));
diff --git a/src/shared/utils/__tests__/group.test.js b/src/shared/utils/__tests__/group.test.js
index b8d612cd..e4c4e8ab 100644
--- a/src/shared/utils/__tests__/group.test.js
+++ b/src/shared/utils/__tests__/group.test.js
@@ -5,7 +5,7 @@ vi.mock('../../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
default: { push: vi.fn(), currentRoute: { value: {} } }
}));
diff --git a/src/shared/utils/__tests__/imageUpload.test.js b/src/shared/utils/__tests__/imageUpload.test.js
index f6058557..62f24c15 100644
--- a/src/shared/utils/__tests__/imageUpload.test.js
+++ b/src/shared/utils/__tests__/imageUpload.test.js
@@ -5,11 +5,11 @@ vi.mock('vue-sonner', () => ({
toast: { error: vi.fn() }
}));
-vi.mock('../../../service/request', () => ({
+vi.mock('../../../services/request', () => ({
$throw: vi.fn()
}));
-vi.mock('../../../service/appConfig', () => ({
+vi.mock('../../../services/appConfig', () => ({
AppDebug: { endpointDomain: 'https://api.vrchat.cloud/api/1' }
}));
diff --git a/src/shared/utils/__tests__/instance.test.js b/src/shared/utils/__tests__/instance.test.js
index 8ec21e7a..6e1a7548 100644
--- a/src/shared/utils/__tests__/instance.test.js
+++ b/src/shared/utils/__tests__/instance.test.js
@@ -2,7 +2,7 @@ vi.mock('../../../views/Feed/Feed.vue', () => ({
default: {}
}));
vi.mock('../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
default: { push: vi.fn() }
}));
diff --git a/src/shared/utils/__tests__/invite.test.js b/src/shared/utils/__tests__/invite.test.js
index e70a7f5a..32a0a9ec 100644
--- a/src/shared/utils/__tests__/invite.test.js
+++ b/src/shared/utils/__tests__/invite.test.js
@@ -13,7 +13,7 @@ vi.mock('../../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
default: { push: vi.fn(), currentRoute: { value: {} } }
}));
diff --git a/src/shared/utils/__tests__/location.test.js b/src/shared/utils/__tests__/location.test.js
index 8ee6c1c7..8d7746a2 100644
--- a/src/shared/utils/__tests__/location.test.js
+++ b/src/shared/utils/__tests__/location.test.js
@@ -5,7 +5,7 @@ vi.mock('../../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
default: { push: vi.fn(), currentRoute: { value: {} } }
}));
diff --git a/src/shared/utils/__tests__/user.findByDisplayName.test.js b/src/shared/utils/__tests__/user.findByDisplayName.test.js
index 3b1a24dc..3fb4cef2 100644
--- a/src/shared/utils/__tests__/user.findByDisplayName.test.js
+++ b/src/shared/utils/__tests__/user.findByDisplayName.test.js
@@ -4,7 +4,7 @@ vi.mock('../../../views/Feed/Feed.vue', () => ({
default: { name: 'Feed' }
}));
vi.mock('../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
default: { push: vi.fn(), currentRoute: { value: {} } }
}));
diff --git a/src/shared/utils/__tests__/user.test.js b/src/shared/utils/__tests__/user.test.js
index 0af40ae4..4c164f7c 100644
--- a/src/shared/utils/__tests__/user.test.js
+++ b/src/shared/utils/__tests__/user.test.js
@@ -26,7 +26,7 @@ vi.mock('../../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
default: { push: vi.fn(), currentRoute: { value: {} } }
}));
diff --git a/src/shared/utils/__tests__/world.test.js b/src/shared/utils/__tests__/world.test.js
index d7f4a1c2..9d83ad51 100644
--- a/src/shared/utils/__tests__/world.test.js
+++ b/src/shared/utils/__tests__/world.test.js
@@ -5,7 +5,7 @@ vi.mock('../../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
default: { push: vi.fn(), currentRoute: { value: {} } }
}));
diff --git a/src/shared/utils/base/__tests__/date.test.js b/src/shared/utils/base/__tests__/date.test.js
index d11099f4..1a735809 100644
--- a/src/shared/utils/base/__tests__/date.test.js
+++ b/src/shared/utils/base/__tests__/date.test.js
@@ -10,7 +10,7 @@ vi.mock('../../../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../../plugin/router', () => ({
+vi.mock('../../../../plugins/router', () => ({
default: { push: vi.fn(), currentRoute: { value: {} } }
}));
diff --git a/src/shared/utils/base/format.js b/src/shared/utils/base/format.js
index 14b959ea..c7ce4137 100644
--- a/src/shared/utils/base/format.js
+++ b/src/shared/utils/base/format.js
@@ -1,5 +1,5 @@
import { escapeTag } from './string';
-import { i18n } from '../../../plugin/i18n';
+import { i18n } from '../../../plugins/i18n';
const TIME_UNIT_KEYS = {
y: 'common.time_units.y',
diff --git a/src/shared/utils/base/ui.js b/src/shared/utils/base/ui.js
index c6e15ddc..be42ae89 100644
--- a/src/shared/utils/base/ui.js
+++ b/src/shared/utils/base/ui.js
@@ -8,12 +8,12 @@ import {
THEME_COLORS,
THEME_CONFIG
} from '../../constants';
-import { i18n } from '../../../plugin/i18n';
-import { router } from '../../../plugin/router';
+import { i18n } from '../../../plugins/i18n';
+import { router } from '../../../plugins/router';
import { textToHex } from './string';
import { useAppearanceSettingsStore } from '../../../stores';
-import configRepository from '../../../service/config.js';
+import configRepository from '../../../services/config.js';
const THEME_COLOR_STORAGE_KEY = 'VRCX_themeColor';
const THEME_COLOR_STYLE_ID = 'app-theme-color-style';
diff --git a/src/shared/utils/common.js b/src/shared/utils/common.js
index a9fc3f09..1df0ac3d 100644
--- a/src/shared/utils/common.js
+++ b/src/shared/utils/common.js
@@ -15,10 +15,10 @@ import {
} from './fileUtils';
import { escapeTag, replaceBioSymbols } from './base/string';
import { getFaviconUrl, replaceVrcPackageUrl } from './urlUtils';
-import { AppDebug } from '../../service/appConfig.js';
+import { AppDebug } from '../../services/appConfig.js';
import { compareUnityVersion } from './avatar';
import { getAvailablePlatforms } from './platformUtils';
-import { i18n } from '../../plugin/i18n';
+import { i18n } from '../../plugins/i18n';
import { queryRequest } from '../../api';
/**
diff --git a/src/shared/utils/globalSearchUtils.js b/src/shared/utils/globalSearchUtils.js
index e521680f..9e02145b 100644
--- a/src/shared/utils/globalSearchUtils.js
+++ b/src/shared/utils/globalSearchUtils.js
@@ -1,5 +1,5 @@
import { localeIncludes } from './base/string';
-import removeConfusables, { removeWhitespace } from '../../service/confusables';
+import removeConfusables, { removeWhitespace } from '../../services/confusables';
/**
* Tests whether a name matches a query using locale-aware comparison.
diff --git a/src/shared/utils/imageUpload.js b/src/shared/utils/imageUpload.js
index 4b12631c..cdc117f5 100644
--- a/src/shared/utils/imageUpload.js
+++ b/src/shared/utils/imageUpload.js
@@ -1,7 +1,7 @@
import { toast } from 'vue-sonner';
-import { $throw } from '../../service/request';
-import { AppDebug } from '../../service/appConfig.js';
+import { $throw } from '../../services/request';
+import { AppDebug } from '../../services/appConfig.js';
import { extractFileId } from './index.js';
import { imageRequest } from '../../api';
diff --git a/src/shared/utils/memos.js b/src/shared/utils/memos.js
index 7de5974e..873cca19 100644
--- a/src/shared/utils/memos.js
+++ b/src/shared/utils/memos.js
@@ -1,5 +1,5 @@
import { useFriendStore, useUserStore } from '../../stores';
-import { database } from '../../service/database';
+import { database } from '../../services/database';
/**
* @returns {Promise}
diff --git a/src/stores/__tests__/launch.test.js b/src/stores/__tests__/launch.test.js
index 8f2a06e7..048068bd 100644
--- a/src/stores/__tests__/launch.test.js
+++ b/src/stores/__tests__/launch.test.js
@@ -10,7 +10,7 @@ vi.mock('../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../plugin/router', () => ({
+vi.mock('../../plugins/router', () => ({
router: {
beforeEach: vi.fn(),
push: vi.fn(),
@@ -31,8 +31,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../service/database', () => ({
+vi.mock('../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../services/database', () => ({
database: new Proxy(
{},
{
@@ -43,7 +43,7 @@ vi.mock('../../service/database', () => ({
}
)
}));
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockResolvedValue(''),
@@ -61,8 +61,8 @@ vi.mock('../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../service/watchState', () => ({
+vi.mock('../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
vi.mock('vue-i18n', async (importOriginal) => {
diff --git a/src/stores/__tests__/modal.test.js b/src/stores/__tests__/modal.test.js
index 3f77ed2a..4c8cf09b 100644
--- a/src/stores/__tests__/modal.test.js
+++ b/src/stores/__tests__/modal.test.js
@@ -10,7 +10,7 @@ vi.mock('../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../plugin/router', () => ({
+vi.mock('../../plugins/router', () => ({
router: {
beforeEach: vi.fn(),
push: vi.fn(),
@@ -31,8 +31,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../service/database', () => ({
+vi.mock('../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../services/database', () => ({
database: new Proxy(
{},
{
@@ -43,7 +43,7 @@ vi.mock('../../service/database', () => ({
}
)
}));
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -61,8 +61,8 @@ vi.mock('../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../service/watchState', () => ({
+vi.mock('../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
vi.mock('vue-i18n', async (importOriginal) => {
diff --git a/src/stores/__tests__/search.test.js b/src/stores/__tests__/search.test.js
index 236d5f92..d517d375 100644
--- a/src/stores/__tests__/search.test.js
+++ b/src/stores/__tests__/search.test.js
@@ -10,7 +10,7 @@ vi.mock('../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../plugin/router', () => ({
+vi.mock('../../plugins/router', () => ({
router: {
beforeEach: vi.fn(),
push: vi.fn(),
@@ -31,8 +31,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../service/database', () => ({
+vi.mock('../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../services/database', () => ({
database: new Proxy(
{},
{
@@ -43,7 +43,7 @@ vi.mock('../../service/database', () => ({
}
)
}));
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockResolvedValue('{}'),
@@ -61,8 +61,8 @@ vi.mock('../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../service/watchState', () => ({
+vi.mock('../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
vi.mock('vue-i18n', async (importOriginal) => {
diff --git a/src/stores/__tests__/uiNotifications.test.js b/src/stores/__tests__/uiNotifications.test.js
index 0b73a915..5b313fc7 100644
--- a/src/stores/__tests__/uiNotifications.test.js
+++ b/src/stores/__tests__/uiNotifications.test.js
@@ -8,7 +8,7 @@ vi.mock('../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../plugin/router', () => ({
+vi.mock('../../plugins/router', () => ({
router: {
beforeEach: vi.fn(),
push: vi.fn(),
@@ -29,8 +29,8 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../service/database', () => ({
+vi.mock('../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../services/database', () => ({
database: new Proxy(
{},
{
@@ -41,7 +41,7 @@ vi.mock('../../service/database', () => ({
}
)
}));
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -59,8 +59,8 @@ vi.mock('../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../service/watchState', () => ({
+vi.mock('../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
vi.mock('vue-i18n', async (importOriginal) => {
diff --git a/src/stores/__tests__/vrcStatus.test.js b/src/stores/__tests__/vrcStatus.test.js
index c7a26c24..9a96e60e 100644
--- a/src/stores/__tests__/vrcStatus.test.js
+++ b/src/stores/__tests__/vrcStatus.test.js
@@ -10,7 +10,7 @@ const mocks = vi.hoisted(() => ({
toastDismiss: vi.fn()
}));
-vi.mock('../../service/webapi', () => ({
+vi.mock('../../services/webapi', () => ({
default: {
execute: (...args) => mocks.execute(...args)
}
diff --git a/src/stores/__tests__/vrcxUpdater.test.js b/src/stores/__tests__/vrcxUpdater.test.js
index ea4b05f7..572b43d0 100644
--- a/src/stores/__tests__/vrcxUpdater.test.js
+++ b/src/stores/__tests__/vrcxUpdater.test.js
@@ -14,7 +14,7 @@ const mocks = vi.hoisted(() => ({
}
}));
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
default: mocks.configRepository
}));
diff --git a/src/stores/auth.js b/src/stores/auth.js
index a423fa01..6d98a787 100644
--- a/src/stores/auth.js
+++ b/src/stores/auth.js
@@ -9,12 +9,12 @@ import {
runLoginSuccessFlow,
runLogoutFlow
} from '../coordinators/authCoordinator';
-import { AppDebug } from '../service/appConfig';
+import { AppDebug } from '../services/appConfig';
import { authRequest } from '../api';
-import { database } from '../service/database';
+import { database } from '../services/database';
import { escapeTag } from '../shared/utils';
-import { initWebsocket } from '../service/websocket';
-import { request } from '../service/request';
+import { initWebsocket } from '../services/websocket';
+import { request } from '../services/request';
import { runHandleAutoLoginFlow } from '../coordinators/authAutoLoginCoordinator';
import { getCurrentUser } from '../coordinators/userCoordinator';
import { useAdvancedSettingsStore } from './settings/advanced';
@@ -22,11 +22,11 @@ import { useGeneralSettingsStore } from './settings/general';
import { useModalStore } from './modal';
import { useUpdateLoopStore } from './updateLoop';
import { useUserStore } from './user';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
-import configRepository from '../service/config';
-import security from '../service/security';
-import webApiService from '../service/webapi';
+import configRepository from '../services/config';
+import security from '../services/security';
+import webApiService from '../services/webapi';
import * as workerTimers from 'worker-timers';
diff --git a/src/stores/avatar.js b/src/stores/avatar.js
index 09b20546..8d379424 100644
--- a/src/stores/avatar.js
+++ b/src/stores/avatar.js
@@ -4,8 +4,8 @@ import { defineStore } from 'pinia';
import {
checkVRChatCache
} from '../shared/utils';
-import { database } from '../service/database';
-import { watchState } from '../service/watchState';
+import { database } from '../services/database';
+import { watchState } from '../services/watchState';
export const useAvatarStore = defineStore('Avatar', () => {
let cachedAvatarModerations = new Map();
diff --git a/src/stores/avatarProvider.js b/src/stores/avatarProvider.js
index 1cf0353c..72106dbd 100644
--- a/src/stores/avatarProvider.js
+++ b/src/stores/avatarProvider.js
@@ -1,11 +1,11 @@
import { ref, watch } from 'vue';
import { defineStore } from 'pinia';
-import { router } from '../plugin/router';
+import { router } from '../plugins/router';
import { useAdvancedSettingsStore } from './settings/advanced';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
export const useAvatarProviderStore = defineStore('AvatarProvider', () => {
const advancedSettingsStore = useAdvancedSettingsStore();
diff --git a/src/stores/charts.js b/src/stores/charts.js
index 450e67b4..b0e1d1dc 100644
--- a/src/stores/charts.js
+++ b/src/stores/charts.js
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
import { createRateLimiter, executeWithBackoff } from '../shared/utils';
-import { database } from '../service/database';
+import { database } from '../services/database';
import { useFriendStore } from './friend';
import { useUserStore } from './user';
import { userRequest } from '../api';
diff --git a/src/stores/favorite.js b/src/stores/favorite.js
index bcd958d3..f341cc03 100644
--- a/src/stores/favorite.js
+++ b/src/stores/favorite.js
@@ -10,13 +10,13 @@ import {
replaceReactiveObject
} from '../shared/utils';
import { favoriteRequest } from '../api';
-import { database } from '../service/database';
-import { processBulk } from '../service/request';
+import { database } from '../services/database';
+import { processBulk } from '../services/request';
import { useAppearanceSettingsStore } from './settings/appearance';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
import { onLoginStateChanged } from '../coordinators/favoriteCoordinator';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
export const useFavoriteStore = defineStore('Favorite', () => {
const appearanceSettingsStore = useAppearanceSettingsStore();
diff --git a/src/stores/feed.js b/src/stores/feed.js
index 02a3575e..09049d10 100644
--- a/src/stores/feed.js
+++ b/src/stores/feed.js
@@ -1,12 +1,12 @@
import { ref, shallowRef, watch } from 'vue';
import { defineStore } from 'pinia';
-import { database } from '../service/database';
+import { database } from '../services/database';
import { useFriendStore } from './friend';
import { useVrcxStore } from './vrcx';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
export const useFeedStore = defineStore('Feed', () => {
const friendStore = useFriendStore();
diff --git a/src/stores/friend.js b/src/stores/friend.js
index 2a73ee5c..edeaaae8 100644
--- a/src/stores/friend.js
+++ b/src/stores/friend.js
@@ -2,7 +2,7 @@ import { computed, reactive, ref, watch } from 'vue';
import { defineStore } from 'pinia';
import { useRouter } from 'vue-router';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
import {
compareByCreatedAtAscending,
createRateLimiter,
@@ -25,17 +25,17 @@ import {
runUpdateFriendshipsFlow
} from '../coordinators/friendRelationshipCoordinator';
import { applyUser } from '../coordinators/userCoordinator';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
import { useAppearanceSettingsStore } from './settings/appearance';
import { useFavoriteStore } from './favorite';
import { useGeneralSettingsStore } from './settings/general';
import { useGroupStore } from './group';
import { useLocationStore } from './location';
import { useUserStore } from './user';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
import * as workerTimers from 'worker-timers';
diff --git a/src/stores/gallery.js b/src/stores/gallery.js
index aa12cdf5..8e6bb3ca 100644
--- a/src/stores/gallery.js
+++ b/src/stores/gallery.js
@@ -15,12 +15,12 @@ import {
vrcPlusIconRequest,
vrcPlusImageRequest
} from '../api';
-import { AppDebug } from '../service/appConfig';
+import { AppDebug } from '../services/appConfig';
import { handleImageUploadInput } from '../shared/utils/imageUpload';
-import { router } from '../plugin/router';
+import { router } from '../plugins/router';
import { useAdvancedSettingsStore } from './settings/advanced';
import { useModalStore } from './modal';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
import * as workerTimers from 'worker-timers';
diff --git a/src/stores/game.js b/src/stores/game.js
index be648214..6c7ecf07 100644
--- a/src/stores/game.js
+++ b/src/stores/game.js
@@ -1,7 +1,7 @@
import { reactive, ref } from 'vue';
import { defineStore } from 'pinia';
-import configRepository from '../service/config.js';
+import configRepository from '../services/config.js';
export const useGameStore = defineStore('Game', () => {
const state = reactive({
diff --git a/src/stores/gameLog/index.js b/src/stores/gameLog/index.js
index a6612805..3cad843f 100644
--- a/src/stores/gameLog/index.js
+++ b/src/stores/gameLog/index.js
@@ -12,7 +12,7 @@ import {
getGroupName
} from '../../shared/utils';
import { createMediaParsers } from './mediaParsers';
-import { database } from '../../service/database';
+import { database } from '../../services/database';
import { useAdvancedSettingsStore } from '../settings/advanced';
import { useFriendStore } from '../friend';
import { useGameStore } from '../game';
@@ -24,11 +24,11 @@ import { useUiStore } from '../ui';
import { useUserStore } from '../user';
import { useVrStore } from '../vr';
import { useVrcxStore } from '../vrcx';
-import { watchState } from '../../service/watchState';
+import { watchState } from '../../services/watchState';
import { tryLoadPlayerList, addGameLogEvent } from '../../coordinators/gameLogCoordinator';
-import configRepository from '../../service/config';
+import configRepository from '../../services/config';
import * as workerTimers from 'worker-timers';
diff --git a/src/stores/group.js b/src/stores/group.js
index b5cf9227..76b0650f 100644
--- a/src/stores/group.js
+++ b/src/stores/group.js
@@ -8,7 +8,7 @@ import {
} from '../shared/utils';
import { groupRequest, queryRequest } from '../api';
import { groupDialogFilterOptions } from '../shared/constants/';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
export const useGroupStore = defineStore('Group', () => {
const { t } = useI18n();
diff --git a/src/stores/index.js b/src/stores/index.js
index 6e1d837d..f62aee40 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -1,7 +1,7 @@
import { createPinia } from 'pinia';
-import { getSentry, isSentryOptedIn } from '../plugin';
-import { createPiniaActionTrailPlugin } from '../plugin/piniaActionTrail';
+import { getSentry, isSentryOptedIn } from '../plugins';
+import { createPiniaActionTrailPlugin } from '../plugins/piniaActionTrail';
import { useAdvancedSettingsStore } from './settings/advanced';
import { useAppearanceSettingsStore } from './settings/appearance';
import { useAuthStore } from './auth';
diff --git a/src/stores/instance.js b/src/stores/instance.js
index be2e045e..87cf0687 100644
--- a/src/stores/instance.js
+++ b/src/stores/instance.js
@@ -32,7 +32,7 @@ import {
accessTypeLocaleKeyMap,
instanceContentSettings
} from '../shared/constants';
-import { database } from '../service/database';
+import { database } from '../services/database';
import { resolveRef } from '../shared/utils/resolveRef';
import { useAppearanceSettingsStore } from './settings/appearance';
import { useFriendStore } from './friend';
@@ -44,9 +44,9 @@ import { useSharedFeedStore } from './sharedFeed';
import { useUiStore } from './ui';
import { useUserStore } from './user';
import { useWorldStore } from './world';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
export const useInstanceStore = defineStore('Instance', () => {
const locationStore = useLocationStore();
diff --git a/src/stores/invite.js b/src/stores/invite.js
index 1ee4bfd3..320dbeee 100644
--- a/src/stores/invite.js
+++ b/src/stores/invite.js
@@ -4,7 +4,7 @@ import { defineStore } from 'pinia';
import { inviteMessagesRequest } from '../api';
import { useAdvancedSettingsStore } from './settings/advanced';
import { useGameStore } from './game';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
export const useInviteStore = defineStore('Invite', () => {
const gameStore = useGameStore();
diff --git a/src/stores/launch.js b/src/stores/launch.js
index 28af9888..a2509784 100644
--- a/src/stores/launch.js
+++ b/src/stores/launch.js
@@ -5,9 +5,9 @@ import { useI18n } from 'vue-i18n';
import { instanceRequest } from '../api';
import { parseLocation } from '../shared/utils';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
export const useLaunchStore = defineStore('Launch', () => {
const isLaunchOptionsDialogVisible = ref(false);
diff --git a/src/stores/moderation.js b/src/stores/moderation.js
index 1784589b..a54d68f7 100644
--- a/src/stores/moderation.js
+++ b/src/stores/moderation.js
@@ -3,7 +3,7 @@ import { defineStore } from 'pinia';
import { playerModerationRequest } from '../api';
import { useUserStore } from './user';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
export const useModerationStore = defineStore('Moderation', () => {
const userStore = useUserStore();
diff --git a/src/stores/notification/index.js b/src/stores/notification/index.js
index 4cff0936..09b7a950 100644
--- a/src/stores/notification/index.js
+++ b/src/stores/notification/index.js
@@ -30,12 +30,12 @@ import {
getUserIdFromNoty as getUserIdFromNotyBase,
toNotificationText
} from '../../shared/utils/notificationMessage';
-import { database, dbVars } from '../../service/database';
+import { database, dbVars } from '../../services/database';
import {
getNotificationCategory,
getNotificationTs
} from '../../shared/utils/notificationCategory';
-import { AppDebug } from '../../service/appConfig';
+import { AppDebug } from '../../services/appConfig';
import { createOverlayDispatch } from './overlayDispatch';
import { useAdvancedSettingsStore } from '../settings/advanced';
import { useAppearanceSettingsStore } from '../settings/appearance';
@@ -55,9 +55,9 @@ import { useSharedFeedStore } from '../sharedFeed';
import { useUiStore } from '../ui';
import { useUserStore } from '../user';
import { useWristOverlaySettingsStore } from '../settings/wristOverlay';
-import { watchState } from '../../service/watchState';
+import { watchState } from '../../services/watchState';
-import configRepository from '../../service/config';
+import configRepository from '../../services/config';
export const useNotificationStore = defineStore('Notification', () => {
const { t } = useI18n();
diff --git a/src/stores/photon.js b/src/stores/photon.js
index aecf7054..782eb376 100644
--- a/src/stores/photon.js
+++ b/src/stores/photon.js
@@ -17,8 +17,8 @@ import {
} from '../shared/utils';
import { instanceRequest, userRequest } from '../api';
import { photonEmojis, photonEventType } from '../shared/constants/photon';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
import { useAvatarStore } from './avatar';
import { applyAvatar } from '../coordinators/avatarCoordinator';
import { showUserDialog, lookupUser, applyUser } from '../coordinators/userCoordinator';
@@ -33,7 +33,7 @@ import { useSharedFeedStore } from './sharedFeed';
import { useUserStore } from './user';
import { useVrStore } from './vr';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
import * as workerTimers from 'worker-timers';
diff --git a/src/stores/search.js b/src/stores/search.js
index 84e32603..7a5a47a3 100644
--- a/src/stores/search.js
+++ b/src/stores/search.js
@@ -7,7 +7,7 @@ import { useRouter } from 'vue-router';
import { compareByName, localeIncludes } from '../shared/utils';
import { instanceRequest, userRequest } from '../api';
import { groupRequest } from '../api/';
-import removeConfusables, { removeWhitespace } from '../service/confusables';
+import removeConfusables, { removeWhitespace } from '../services/confusables';
import { useAppearanceSettingsStore } from './settings/appearance';
import { useAvatarStore } from './avatar';
import { useFriendStore } from './friend';
@@ -19,7 +19,7 @@ import { applyUser, showUserDialog, lookupUser } from '../coordinators/userCoord
import { useModalStore } from './modal';
import { useUserStore } from './user';
import { useWorldStore } from './world';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
export const useSearchStore = defineStore('Search', () => {
const userStore = useUserStore();
diff --git a/src/stores/settings/advanced.js b/src/stores/settings/advanced.js
index d0d08be1..5f4c992a 100644
--- a/src/stores/settings/advanced.js
+++ b/src/stores/settings/advanced.js
@@ -3,18 +3,18 @@ import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
-import { AppDebug } from '../../service/appConfig';
-import { database } from '../../service/database';
+import { AppDebug } from '../../services/appConfig';
+import { database } from '../../services/database';
import { languageCodes } from '../../localization';
import { useGameStore } from '../game';
import { useModalStore } from '../modal';
import { useUpdateLoopStore } from '../updateLoop';
import { useVRCXUpdaterStore } from '../vrcxUpdater';
import { useVrcxStore } from '../vrcx';
-import { watchState } from '../../service/watchState';
+import { watchState } from '../../services/watchState';
-import configRepository from '../../service/config';
-import webApiService from '../../service/webapi';
+import configRepository from '../../services/config';
+import webApiService from '../../services/webapi';
export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
const gameStore = useGameStore();
diff --git a/src/stores/settings/appearance.js b/src/stores/settings/appearance.js
index 83e6ebd3..7ee9fe78 100644
--- a/src/stores/settings/appearance.js
+++ b/src/stores/settings/appearance.js
@@ -21,18 +21,18 @@ import {
updateTrustColorClasses
} from '../../shared/utils/base/ui';
import { computeTrustLevel, getNameColour } from '../../shared/utils';
-import { database } from '../../service/database';
+import { database } from '../../services/database';
import { languageCodes } from '../../localization';
-import { loadLocalizedStrings } from '../../plugin';
+import { loadLocalizedStrings } from '../../plugins';
import { useFeedStore } from '../feed';
import { useGameLogStore } from '../gameLog';
import { useUiStore } from '../ui';
import { useUserStore } from '../user';
import { useVrStore } from '../vr';
import { useVrcxStore } from '../vrcx';
-import { watchState } from '../../service/watchState';
+import { watchState } from '../../services/watchState';
-import configRepository from '../../service/config';
+import configRepository from '../../services/config';
export const useAppearanceSettingsStore = defineStore(
'AppearanceSettings',
diff --git a/src/stores/settings/discordPresence.js b/src/stores/settings/discordPresence.js
index 3c9f9548..7e98de98 100644
--- a/src/stores/settings/discordPresence.js
+++ b/src/stores/settings/discordPresence.js
@@ -26,7 +26,7 @@ import { useLocationStore } from '../location';
import { useUpdateLoopStore } from '../updateLoop';
import { useUserStore } from '../user';
-import configRepository from '../../service/config';
+import configRepository from '../../services/config';
export const useDiscordPresenceSettingsStore = defineStore(
'DiscordPresenceSettings',
diff --git a/src/stores/settings/general.js b/src/stores/settings/general.js
index 0c83c8fb..59bce3d1 100644
--- a/src/stores/settings/general.js
+++ b/src/stores/settings/general.js
@@ -7,7 +7,7 @@ import { useModalStore } from '../modal';
import { useVRCXUpdaterStore } from '../vrcxUpdater';
import { useVrcxStore } from '../vrcx';
-import configRepository from '../../service/config';
+import configRepository from '../../services/config';
import * as workerTimers from 'worker-timers';
diff --git a/src/stores/settings/notifications.js b/src/stores/settings/notifications.js
index 5acd0fe0..d82f67f9 100644
--- a/src/stores/settings/notifications.js
+++ b/src/stores/settings/notifications.js
@@ -6,7 +6,7 @@ import { sharedFeedFiltersDefaults } from '../../shared/constants';
import { useModalStore } from '../modal';
import { useVrStore } from '../vr';
-import configRepository from '../../service/config';
+import configRepository from '../../services/config';
export const useNotificationsSettingsStore = defineStore(
'NotificationsSettings',
diff --git a/src/stores/settings/wristOverlay.js b/src/stores/settings/wristOverlay.js
index c21533a6..71313823 100644
--- a/src/stores/settings/wristOverlay.js
+++ b/src/stores/settings/wristOverlay.js
@@ -3,7 +3,7 @@ import { ref } from 'vue';
import { useSharedFeedStore } from '../sharedFeed';
-import configRepository from '../../service/config';
+import configRepository from '../../services/config';
export const useWristOverlaySettingsStore = defineStore(
'WristOverlaySettings',
diff --git a/src/stores/sharedFeed.js b/src/stores/sharedFeed.js
index 13763877..169743f5 100644
--- a/src/stores/sharedFeed.js
+++ b/src/stores/sharedFeed.js
@@ -7,7 +7,7 @@ import {
getGroupName,
getWorldName
} from '../shared/utils';
-import { database } from '../service/database';
+import { database } from '../services/database';
import { useFriendStore } from './friend';
import { useInstanceStore } from './instance';
import { useLocationStore } from './location';
@@ -16,7 +16,7 @@ import { useNotificationStore } from './notification';
import { useNotificationsSettingsStore } from './settings/notifications';
import { useUserStore } from './user';
import { useWristOverlaySettingsStore } from './settings/wristOverlay';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
export const useSharedFeedStore = defineStore('SharedFeed', () => {
const friendStore = useFriendStore();
diff --git a/src/stores/ui.js b/src/stores/ui.js
index 6192e47d..68ec340b 100644
--- a/src/stores/ui.js
+++ b/src/stores/ui.js
@@ -4,9 +4,9 @@ import { toast } from 'vue-sonner';
import { useMagicKeys } from '@vueuse/core';
import { useRouter } from 'vue-router';
-import { AppDebug } from '../service/appConfig';
+import { AppDebug } from '../services/appConfig';
import { refreshCustomCss } from '../shared/utils/base/ui';
-import { updateLocalizedStrings } from '../plugin/i18n';
+import { updateLocalizedStrings } from '../plugins/i18n';
import { useAppearanceSettingsStore } from './settings/appearance';
import { useAvatarStore } from './avatar';
import { useGroupStore } from './group';
diff --git a/src/stores/updateLoop.js b/src/stores/updateLoop.js
index 1f08b8e9..9b1e36e6 100644
--- a/src/stores/updateLoop.js
+++ b/src/stores/updateLoop.js
@@ -1,7 +1,7 @@
import { defineStore } from 'pinia';
import { watch } from 'vue';
-import { database } from '../service/database';
+import { database } from '../services/database';
import { groupRequest } from '../api';
import { runRefreshFriendsListFlow } from '../coordinators/friendSyncCoordinator';
import { runUpdateIsGameRunningFlow } from '../coordinators/gameCoordinator';
@@ -20,7 +20,7 @@ import { useUserStore } from './user';
import { useVRCXUpdaterStore } from './vrcxUpdater';
import { useVrStore } from './vr';
import { useVrcxStore } from './vrcx';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
import * as workerTimers from 'worker-timers';
diff --git a/src/stores/user.js b/src/stores/user.js
index c9dc6cc4..a7c6382d 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -18,8 +18,8 @@ import {
instanceRequest,
userRequest
} from '../api';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
import { runUpdateCurrentUserLocationFlow } from '../coordinators/locationCoordinator';
import { useAppearanceSettingsStore } from './settings/appearance';
import { useFavoriteStore } from './favorite';
@@ -27,7 +27,7 @@ import { useFriendStore } from './friend';
import { useInstanceStore } from './instance';
import { useLocationStore } from './location';
import { useUiStore } from './ui';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
import * as workerTimers from 'worker-timers';
diff --git a/src/stores/vr.js b/src/stores/vr.js
index 50c86244..435837ed 100644
--- a/src/stores/vr.js
+++ b/src/stores/vr.js
@@ -13,7 +13,7 @@ import { usePhotonStore } from './photon';
import { useSharedFeedStore } from './sharedFeed';
import { useUserStore } from './user';
import { useWristOverlaySettingsStore } from './settings/wristOverlay';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
export const useVrStore = defineStore('Vr', () => {
const friendStore = useFriendStore();
diff --git a/src/stores/vrcStatus.js b/src/stores/vrcStatus.js
index b524969a..76591119 100644
--- a/src/stores/vrcStatus.js
+++ b/src/stores/vrcStatus.js
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
import { formatDateFilter, openExternalLink } from '../shared/utils';
-import webApiService from '../service/webapi';
+import webApiService from '../services/webapi';
import * as workerTimers from 'worker-timers';
diff --git a/src/stores/vrcx.js b/src/stores/vrcx.js
index ab28db8a..92755eec 100644
--- a/src/stores/vrcx.js
+++ b/src/stores/vrcx.js
@@ -13,11 +13,11 @@ import { avatarRequest, queryRequest } from '../api';
import {
clearPiniaActionTrail,
getPiniaActionTrail
-} from '../plugin/piniaActionTrail';
+} from '../plugins/piniaActionTrail';
import { debounce, parseLocation } from '../shared/utils';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
-import { failedGetRequests } from '../service/request';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
+import { failedGetRequests } from '../services/request';
import { refreshCustomScript } from '../shared/utils/base/ui';
import { useAdvancedSettingsStore } from './settings/advanced';
import { useAvatarProviderStore } from './avatarProvider';
@@ -47,9 +47,9 @@ import { useUserStore } from './user';
import { useVrcStatusStore } from './vrcStatus';
import { useWorldStore } from './world';
import { clearVRCXCache } from '../coordinators/vrcxCoordinator';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
export const useVrcxStore = defineStore('Vrcx', () => {
const gameStore = useGameStore();
diff --git a/src/stores/vrcxUpdater.js b/src/stores/vrcxUpdater.js
index 33feb9d4..cf34046f 100644
--- a/src/stores/vrcxUpdater.js
+++ b/src/stores/vrcxUpdater.js
@@ -3,11 +3,11 @@ import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
-import { AppDebug } from '../service/appConfig';
+import { AppDebug } from '../services/appConfig';
import { branches } from '../shared/constants';
import { changeLogRemoveLinks } from '../shared/utils';
-import configRepository from '../service/config';
+import configRepository from '../services/config';
import * as workerTimers from 'worker-timers';
diff --git a/src/stores/world.js b/src/stores/world.js
index b2fe8d16..495e0958 100644
--- a/src/stores/world.js
+++ b/src/stores/world.js
@@ -4,7 +4,7 @@ import { defineStore } from 'pinia';
import {
checkVRChatCache
} from '../shared/utils';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
export const useWorldStore = defineStore('World', () => {
const worldDialog = reactive({
diff --git a/src/views/Charts/components/MutualFriends.vue b/src/views/Charts/components/MutualFriends.vue
index 86d176c8..39176cfd 100644
--- a/src/views/Charts/components/MutualFriends.vue
+++ b/src/views/Charts/components/MutualFriends.vue
@@ -276,10 +276,10 @@
} from '../../../stores';
import { userImage, userStatusClass } from '../../../shared/utils';
import { showUserDialog } from '../../../coordinators/userCoordinator';
- import { database } from '../../../service/database';
- import { watchState } from '../../../service/watchState';
+ import { database } from '../../../services/database';
+ import { watchState } from '../../../services/watchState';
- import configRepository from '../../../service/config';
+ import configRepository from '../../../services/config';
const { t } = useI18n();
const friendStore = useFriendStore();
diff --git a/src/views/Charts/composables/useInstanceActivityData.js b/src/views/Charts/composables/useInstanceActivityData.js
index cac01d0f..e85c1c6d 100644
--- a/src/views/Charts/composables/useInstanceActivityData.js
+++ b/src/views/Charts/composables/useInstanceActivityData.js
@@ -2,7 +2,7 @@ import { nextTick, reactive, ref } from 'vue';
import dayjs from 'dayjs';
-import { database } from '../../../service/database';
+import { database } from '../../../services/database';
import { getWorldName } from '../../../shared/utils';
export function useInstanceActivityData() {
diff --git a/src/views/Charts/composables/useInstanceActivitySettings.js b/src/views/Charts/composables/useInstanceActivitySettings.js
index 94fdbd69..1ceb0762 100644
--- a/src/views/Charts/composables/useInstanceActivitySettings.js
+++ b/src/views/Charts/composables/useInstanceActivitySettings.js
@@ -1,6 +1,6 @@
import { nextTick, ref } from 'vue';
-import configRepository from '../../../service/config';
+import configRepository from '../../../services/config';
export function useInstanceActivitySettings() {
const barWidth = ref(25);
diff --git a/src/views/Favorites/composables/useFavoritesCardScaling.js b/src/views/Favorites/composables/useFavoritesCardScaling.js
index 04818721..f929b6cd 100644
--- a/src/views/Favorites/composables/useFavoritesCardScaling.js
+++ b/src/views/Favorites/composables/useFavoritesCardScaling.js
@@ -7,7 +7,7 @@ import {
watch
} from 'vue';
-import configRepository from '../../../service/config.js';
+import configRepository from '../../../services/config.js';
function clamp(value, min, max) {
if (Number.isNaN(value)) {
diff --git a/src/views/Favorites/composables/useFavoritesSplitter.js b/src/views/Favorites/composables/useFavoritesSplitter.js
index 4c8dfe02..0eafaad5 100644
--- a/src/views/Favorites/composables/useFavoritesSplitter.js
+++ b/src/views/Favorites/composables/useFavoritesSplitter.js
@@ -8,7 +8,7 @@ import {
watch
} from 'vue';
-import configRepository from '../../../service/config.js';
+import configRepository from '../../../services/config.js';
/**
* @param {object} options
diff --git a/src/views/Favorites/dialogs/avatarImportColumns.jsx b/src/views/Favorites/dialogs/avatarImportColumns.jsx
index 2d7aaa56..7cdb9bdf 100644
--- a/src/views/Favorites/dialogs/avatarImportColumns.jsx
+++ b/src/views/Favorites/dialogs/avatarImportColumns.jsx
@@ -1,7 +1,7 @@
import { Trash2 } from 'lucide-vue-next';
import { Button } from '../../../components/ui/button';
-import { i18n } from '../../../plugin';
+import { i18n } from '../../../plugins';
const { t } = i18n.global;
diff --git a/src/views/Favorites/dialogs/friendImportColumns.jsx b/src/views/Favorites/dialogs/friendImportColumns.jsx
index 269777ab..1a8c8c8d 100644
--- a/src/views/Favorites/dialogs/friendImportColumns.jsx
+++ b/src/views/Favorites/dialogs/friendImportColumns.jsx
@@ -1,7 +1,7 @@
import { Trash2 } from 'lucide-vue-next';
import { Button } from '../../../components/ui/button';
-import { i18n } from '../../../plugin';
+import { i18n } from '../../../plugins';
const { t } = i18n.global;
diff --git a/src/views/Favorites/dialogs/worldImportColumns.jsx b/src/views/Favorites/dialogs/worldImportColumns.jsx
index 0313578d..d78a7d16 100644
--- a/src/views/Favorites/dialogs/worldImportColumns.jsx
+++ b/src/views/Favorites/dialogs/worldImportColumns.jsx
@@ -1,7 +1,7 @@
import { Trash2 } from 'lucide-vue-next';
import { Button } from '../../../components/ui/button';
-import { i18n } from '../../../plugin';
+import { i18n } from '../../../plugins';
const { t } = i18n.global;
diff --git a/src/views/Feed/columns.jsx b/src/views/Feed/columns.jsx
index 08c8cb36..33439d46 100644
--- a/src/views/Feed/columns.jsx
+++ b/src/views/Feed/columns.jsx
@@ -15,7 +15,7 @@ import {
ChevronRight
} from 'lucide-vue-next';
import { formatDateFilter, statusClass, timeToText } from '../../shared/utils';
-import { i18n } from '../../plugin/i18n';
+import { i18n } from '../../plugins/i18n';
import { useGalleryStore } from '../../stores';
import { showUserDialog } from '../../coordinators/userCoordinator';
diff --git a/src/views/FriendList/FriendList.vue b/src/views/FriendList/FriendList.vue
index aedf7d3f..7a60917b 100644
--- a/src/views/FriendList/FriendList.vue
+++ b/src/views/FriendList/FriendList.vue
@@ -144,8 +144,8 @@
import { Toggle } from '../../components/ui/toggle';
import { createColumns } from './columns.jsx';
import { localeIncludes } from '../../shared/utils';
- import removeConfusables, { removeWhitespace } from '../../service/confusables';
- import { router } from '../../plugin/router';
+ import removeConfusables, { removeWhitespace } from '../../services/confusables';
+ import { router } from '../../plugins/router';
import { useDataTableScrollHeight } from '../../composables/useDataTableScrollHeight';
import { useVrcxVueTable } from '../../lib/table/useVrcxVueTable';
import { showUserDialog } from '../../coordinators/userCoordinator';
diff --git a/src/views/FriendList/__tests__/FriendList.test.js b/src/views/FriendList/__tests__/FriendList.test.js
index 1f392edb..c9fd64b0 100644
--- a/src/views/FriendList/__tests__/FriendList.test.js
+++ b/src/views/FriendList/__tests__/FriendList.test.js
@@ -100,7 +100,7 @@ vi.mock('../../../coordinators/friendRelationshipCoordinator', () => ({
handleFriendDelete: (...args) => mocks.handleFriendDelete(...args)
}));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
router: {
push: (...args) => mocks.routerPush(...args)
}
@@ -115,7 +115,7 @@ vi.mock('../../../api', () => ({
}
}));
-vi.mock('../../../service/confusables', () => ({
+vi.mock('../../../services/confusables', () => ({
default: (value) => value,
removeWhitespace: (value) => String(value ?? '').replace(/\s+/g, '')
}));
diff --git a/src/views/FriendList/columns.jsx b/src/views/FriendList/columns.jsx
index 114f6aa4..a536c162 100644
--- a/src/views/FriendList/columns.jsx
+++ b/src/views/FriendList/columns.jsx
@@ -3,7 +3,7 @@ import { ArrowUpDown, UserMinus } from 'lucide-vue-next';
import { Button } from '../../components/ui/button';
import { Checkbox } from '../../components/ui/checkbox';
import { TooltipWrapper } from '../../components/ui/tooltip';
-import { i18n } from '../../plugin';
+import { i18n } from '../../plugins';
import {
formatDateFilter,
getFaviconUrl,
diff --git a/src/views/FriendLog/FriendLog.vue b/src/views/FriendLog/FriendLog.vue
index b55258ac..ef2cff20 100644
--- a/src/views/FriendLog/FriendLog.vue
+++ b/src/views/FriendLog/FriendLog.vue
@@ -66,12 +66,12 @@
import { DataTableLayout } from '../../components/ui/data-table';
import { InputGroupField } from '../../components/ui/input-group';
import { createColumns } from './columns.jsx';
- import { database } from '../../service/database';
+ import { database } from '../../services/database';
import { removeFromArray } from '../../shared/utils';
import { useDataTableScrollHeight } from '../../composables/useDataTableScrollHeight';
import { useVrcxVueTable } from '../../lib/table/useVrcxVueTable';
- import configRepository from '../../service/config';
+ import configRepository from '../../services/config';
const appearanceSettingsStore = useAppearanceSettingsStore();
const vrcxStore = useVrcxStore();
diff --git a/src/views/FriendLog/__tests__/FriendLog.test.js b/src/views/FriendLog/__tests__/FriendLog.test.js
index c6d085de..6156ed3d 100644
--- a/src/views/FriendLog/__tests__/FriendLog.test.js
+++ b/src/views/FriendLog/__tests__/FriendLog.test.js
@@ -108,13 +108,13 @@ vi.mock('../../../components/ui/input-group', () => ({
}
}));
-vi.mock('../../../service/config', () => ({
+vi.mock('../../../services/config', () => ({
default: {
setString: (...args) => mocks.configSetString(...args)
}
}));
-vi.mock('../../../service/database', () => ({
+vi.mock('../../../services/database', () => ({
database: {
deleteFriendLogHistory: (...args) => mocks.deleteFriendLogHistory(...args)
}
diff --git a/src/views/FriendLog/columns.jsx b/src/views/FriendLog/columns.jsx
index 33c9e166..27d46c79 100644
--- a/src/views/FriendLog/columns.jsx
+++ b/src/views/FriendLog/columns.jsx
@@ -9,7 +9,7 @@ import { ArrowRight, ArrowUpDown, Trash2, X } from 'lucide-vue-next';
import { storeToRefs } from 'pinia';
import { formatDateFilter } from '../../shared/utils';
-import { i18n } from '../../plugin';
+import { i18n } from '../../plugins';
import { useUiStore } from '../../stores';
import { showUserDialog } from '../../coordinators/userCoordinator';
diff --git a/src/views/FriendsLocations/FriendsLocations.vue b/src/views/FriendsLocations/FriendsLocations.vue
index cbefc38f..534dd955 100644
--- a/src/views/FriendsLocations/FriendsLocations.vue
+++ b/src/views/FriendsLocations/FriendsLocations.vue
@@ -154,7 +154,7 @@
import { getFriendsSortFunction } from '../../shared/utils';
import FriendLocationCard from './components/FriendsLocationsCard.vue';
- import configRepository from '../../service/config.js';
+ import configRepository from '../../services/config.js';
const { t } = useI18n();
diff --git a/src/views/FriendsLocations/__tests__/FriendsLocations.test.js b/src/views/FriendsLocations/__tests__/FriendsLocations.test.js
index ce3b8980..2f3c55d6 100644
--- a/src/views/FriendsLocations/__tests__/FriendsLocations.test.js
+++ b/src/views/FriendsLocations/__tests__/FriendsLocations.test.js
@@ -71,7 +71,7 @@ vi.mock('../../../stores', () => ({
})
}));
-vi.mock('../../../service/config.js', () => ({
+vi.mock('../../../services/config.js', () => ({
default: {
getString: (...args) => mocks.configGetString(...args),
getBool: (...args) => mocks.configGetBool(...args),
diff --git a/src/views/FriendsLocations/components/__tests__/FriendsLocationsCard.test.js b/src/views/FriendsLocations/components/__tests__/FriendsLocationsCard.test.js
index 661a5c16..6d723a01 100644
--- a/src/views/FriendsLocations/components/__tests__/FriendsLocationsCard.test.js
+++ b/src/views/FriendsLocations/components/__tests__/FriendsLocationsCard.test.js
@@ -13,7 +13,7 @@ vi.mock('../../../../views/Feed/Feed.vue', () => ({
vi.mock('../../../../views/Feed/columns.jsx', () => ({
columns: []
}));
-vi.mock('../../../../plugin/router', () => ({
+vi.mock('../../../../plugins/router', () => ({
router: {
beforeEach: vi.fn(),
push: vi.fn(),
@@ -34,10 +34,10 @@ vi.mock('vue-router', async (importOriginal) => {
}))
};
});
-vi.mock('../../../../plugin/interopApi', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({
initInteropApi: vi.fn()
}));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../services/database', () => ({
database: new Proxy(
{},
{
@@ -48,7 +48,7 @@ vi.mock('../../../../service/database', () => ({
}
)
}));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi
@@ -74,10 +74,10 @@ vi.mock('../../../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../../../service/jsonStorage', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({
default: vi.fn()
}));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/watchState', () => ({
watchState: { isLoggedIn: false }
}));
vi.mock('../../../../shared/utils/world', () => ({
diff --git a/src/views/GameLog/GameLog.vue b/src/views/GameLog/GameLog.vue
index ae01e010..ee9a798c 100644
--- a/src/views/GameLog/GameLog.vue
+++ b/src/views/GameLog/GameLog.vue
@@ -80,7 +80,7 @@
import { DataTableLayout } from '../../components/ui/data-table';
import { InputGroupField } from '../../components/ui/input-group';
import { createColumns } from './columns.jsx';
- import { database } from '../../service/database';
+ import { database } from '../../services/database';
import { removeFromArray } from '../../shared/utils';
import { useDataTableScrollHeight } from '../../composables/useDataTableScrollHeight';
import { useVrcxVueTable } from '../../lib/table/useVrcxVueTable';
diff --git a/src/views/GameLog/columns.jsx b/src/views/GameLog/columns.jsx
index d26fa32a..7ac89fd5 100644
--- a/src/views/GameLog/columns.jsx
+++ b/src/views/GameLog/columns.jsx
@@ -6,7 +6,7 @@ import { ArrowUpDown, FileText, Trash2, X } from 'lucide-vue-next';
import { storeToRefs } from 'pinia';
import { formatDateFilter, openExternalLink } from '../../shared/utils';
-import { i18n } from '../../plugin';
+import { i18n } from '../../plugins';
import {
useInstanceStore,
useUiStore
diff --git a/src/views/Layout/MainLayout.vue b/src/views/Layout/MainLayout.vue
index 952596f7..4780726e 100644
--- a/src/views/Layout/MainLayout.vue
+++ b/src/views/Layout/MainLayout.vue
@@ -96,7 +96,7 @@
import { SidebarInset, SidebarProvider } from '../../components/ui/sidebar';
import { useAppearanceSettingsStore } from '../../stores';
import { useMainLayoutResizable } from '../../composables/useMainLayoutResizable';
- import { watchState } from '../../service/watchState';
+ import { watchState } from '../../services/watchState';
import AvatarImportDialog from '../Favorites/dialogs/AvatarImportDialog.vue';
import ChangelogDialog from '../Settings/dialogs/ChangelogDialog.vue';
diff --git a/src/views/Login/Dialog/LoginSettingsDialog.vue b/src/views/Login/Dialog/LoginSettingsDialog.vue
index 32970983..e2c101a3 100644
--- a/src/views/Login/Dialog/LoginSettingsDialog.vue
+++ b/src/views/Login/Dialog/LoginSettingsDialog.vue
@@ -80,7 +80,7 @@
import { useI18n } from 'vue-i18n';
import { useAuthStore, useVRCXUpdaterStore, useVrcxStore } from '../../../stores';
- import { AppDebug } from '../../../service/appConfig';
+ import { AppDebug } from '../../../services/appConfig';
const { loginForm, enableCustomEndpoint } = storeToRefs(useAuthStore());
const { toggleCustomEndpoint } = useAuthStore();
diff --git a/src/views/Login/Dialog/__tests__/LoginSettingsDialog.test.js b/src/views/Login/Dialog/__tests__/LoginSettingsDialog.test.js
index 9010766d..ebc5e994 100644
--- a/src/views/Login/Dialog/__tests__/LoginSettingsDialog.test.js
+++ b/src/views/Login/Dialog/__tests__/LoginSettingsDialog.test.js
@@ -32,7 +32,7 @@ vi.mock('../../../../stores', () => ({
useVrcxStore: () => mocks.vrcxStore
}));
-vi.mock('../../../../service/appConfig', () => ({
+vi.mock('../../../../services/appConfig', () => ({
AppDebug: {
endpointDomainVrchat: 'api.vrchat.cloud',
websocketDomainVrchat: 'pipeline.vrchat.cloud'
diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index 29958e30..d7157bd8 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -180,7 +180,7 @@
import { useAppearanceSettingsStore, useAuthStore, useVRCXUpdaterStore } from '../../stores';
import { getLanguageName, languageCodes } from '../../localization';
import { openExternalLink, userImage } from '../../shared/utils';
- import { watchState } from '../../service/watchState';
+ import { watchState } from '../../services/watchState';
import LoginSettingsDialog from './Dialog/LoginSettingsDialog.vue';
diff --git a/src/views/Login/__tests__/Login.test.js b/src/views/Login/__tests__/Login.test.js
index 413cd674..ad11b29d 100644
--- a/src/views/Login/__tests__/Login.test.js
+++ b/src/views/Login/__tests__/Login.test.js
@@ -8,7 +8,7 @@ vi.mock('../../../views/Feed/Feed.vue', () => ({
default: { template: '' }
}));
vi.mock('../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
router: {
beforeEach: vi.fn(),
push: vi.fn(),
@@ -30,8 +30,8 @@ vi.mock('vue-router', async (importOriginal) => {
useRoute: vi.fn(() => ({ query: {} }))
};
});
-vi.mock('../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../service/database', () => ({
+vi.mock('../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../services/database', () => ({
database: new Proxy(
{},
{
@@ -42,7 +42,7 @@ vi.mock('../../../service/database', () => ({
}
)
}));
-vi.mock('../../../service/config', () => ({
+vi.mock('../../../services/config', () => ({
default: {
init: vi.fn(),
getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -60,8 +60,8 @@ vi.mock('../../../service/config', () => ({
remove: vi.fn()
}
}));
-vi.mock('../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../service/watchState', () => ({
+vi.mock('../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../services/watchState', () => ({
watchState: {
isLoggedIn: false,
isFriendsLoaded: false,
diff --git a/src/views/Moderation/Moderation.vue b/src/views/Moderation/Moderation.vue
index 7b5695fb..6eff3bd6 100644
--- a/src/views/Moderation/Moderation.vue
+++ b/src/views/Moderation/Moderation.vue
@@ -66,7 +66,7 @@
import { useDataTableScrollHeight } from '../../composables/useDataTableScrollHeight';
import { useVrcxVueTable } from '../../lib/table/useVrcxVueTable';
- import configRepository from '../../service/config.js';
+ import configRepository from '../../services/config.js';
const { t } = useI18n();
const { playerModerationTable } = storeToRefs(useModerationStore());
diff --git a/src/views/Moderation/__tests__/Moderation.test.js b/src/views/Moderation/__tests__/Moderation.test.js
index a59ea419..c3c5d1b7 100644
--- a/src/views/Moderation/__tests__/Moderation.test.js
+++ b/src/views/Moderation/__tests__/Moderation.test.js
@@ -59,7 +59,7 @@ vi.mock('../../../stores', () => ({
})
}));
-vi.mock('../../../service/config.js', () => ({
+vi.mock('../../../services/config.js', () => ({
default: {
getString: (...args) => mocks.configGetString(...args),
setString: (...args) => mocks.configSetString(...args)
diff --git a/src/views/Moderation/__tests__/columns.test.js b/src/views/Moderation/__tests__/columns.test.js
index 04dbb42e..c09f6811 100644
--- a/src/views/Moderation/__tests__/columns.test.js
+++ b/src/views/Moderation/__tests__/columns.test.js
@@ -16,7 +16,7 @@ vi.mock('pinia', async (importOriginal) => {
};
});
-vi.mock('../../../plugin', () => ({
+vi.mock('../../../plugins', () => ({
i18n: {
global: {
t: (...args) => mocks.t(...args),
diff --git a/src/views/Moderation/columns.jsx b/src/views/Moderation/columns.jsx
index 29669598..0f60ab20 100644
--- a/src/views/Moderation/columns.jsx
+++ b/src/views/Moderation/columns.jsx
@@ -9,7 +9,7 @@ import { ArrowUpDown, Trash2, X } from 'lucide-vue-next';
import { storeToRefs } from 'pinia';
import { formatDateFilter } from '../../shared/utils';
-import { i18n } from '../../plugin';
+import { i18n } from '../../plugins';
import { useUiStore, useUserStore } from '../../stores';
import { showUserDialog } from '../../coordinators/userCoordinator';
diff --git a/src/views/MyAvatars/MyAvatars.vue b/src/views/MyAvatars/MyAvatars.vue
index 573ee730..92e51476 100644
--- a/src/views/MyAvatars/MyAvatars.vue
+++ b/src/views/MyAvatars/MyAvatars.vue
@@ -334,11 +334,11 @@
import { Slider } from '../../components/ui/slider';
import { TooltipWrapper } from '../../components/ui/tooltip';
import { avatarRequest } from '../../api';
- import { database } from '../../service/database';
+ import { database } from '../../services/database';
import { getColumns } from './columns';
import { getPlatformInfo } from '../../shared/utils/avatar';
import { getTagColor } from '../../shared/constants';
- import { processBulk } from '../../service/request';
+ import { processBulk } from '../../services/request';
import { useAvatarCardGrid } from './composables/useAvatarCardGrid';
import { useDataTableScrollHeight } from '../../composables/useDataTableScrollHeight';
import { useVrcxVueTable } from '../../lib/table/useVrcxVueTable';
@@ -346,7 +346,7 @@
import ImageCropDialog from '../../components/dialogs/ImageCropDialog.vue';
import ManageTagsDialog from './ManageTagsDialog.vue';
import MyAvatarCard from './components/MyAvatarCard.vue';
- import configRepository from '../../service/config.js';
+ import configRepository from '../../services/config.js';
import { showAvatarDialog, selectAvatarWithoutConfirmation, applyAvatar } from '../../coordinators/avatarCoordinator';
const { t } = useI18n();
diff --git a/src/views/MyAvatars/columns.jsx b/src/views/MyAvatars/columns.jsx
index 43d55bdd..cb03cb3b 100644
--- a/src/views/MyAvatars/columns.jsx
+++ b/src/views/MyAvatars/columns.jsx
@@ -28,7 +28,7 @@ import {
getPlatformInfo,
timeToText
} from '../../shared/utils';
-import { i18n } from '../../plugin';
+import { i18n } from '../../plugins';
const { t } = i18n.global;
diff --git a/src/views/MyAvatars/composables/__tests__/useAvatarCardGrid.test.js b/src/views/MyAvatars/composables/__tests__/useAvatarCardGrid.test.js
index d04df5fa..425a909c 100644
--- a/src/views/MyAvatars/composables/__tests__/useAvatarCardGrid.test.js
+++ b/src/views/MyAvatars/composables/__tests__/useAvatarCardGrid.test.js
@@ -1,6 +1,6 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
-vi.mock('../../../../service/config.js', () => ({
+vi.mock('../../../../services/config.js', () => ({
default: {
getString: vi.fn().mockResolvedValue('0.6'),
setString: vi.fn()
@@ -247,7 +247,7 @@ describe('useAvatarCardGrid', () => {
describe('persistence', () => {
it('calls configRepository.setString when scale changes', async () => {
- const config = (await import('../../../../service/config.js'))
+ const config = (await import('../../../../services/config.js'))
.default;
const { cardScale } = createGrid();
cardScale.value = 0.7;
@@ -258,7 +258,7 @@ describe('useAvatarCardGrid', () => {
});
it('calls configRepository.setString when spacing changes', async () => {
- const config = (await import('../../../../service/config.js'))
+ const config = (await import('../../../../services/config.js'))
.default;
const { cardSpacing } = createGrid();
cardSpacing.value = 0.8;
@@ -269,7 +269,7 @@ describe('useAvatarCardGrid', () => {
});
it('uses custom config keys', async () => {
- const config = (await import('../../../../service/config.js'))
+ const config = (await import('../../../../services/config.js'))
.default;
const { cardScale } = createGrid({
scaleConfigKey: 'CUSTOM_SCALE'
diff --git a/src/views/MyAvatars/composables/useAvatarCardGrid.js b/src/views/MyAvatars/composables/useAvatarCardGrid.js
index 618483fd..a854fca3 100644
--- a/src/views/MyAvatars/composables/useAvatarCardGrid.js
+++ b/src/views/MyAvatars/composables/useAvatarCardGrid.js
@@ -7,7 +7,7 @@ import {
watch
} from 'vue';
-import configRepository from '../../../service/config.js';
+import configRepository from '../../../services/config.js';
/**
*
diff --git a/src/views/Notifications/Notification.vue b/src/views/Notifications/Notification.vue
index f14cd70a..a6cb1abd 100644
--- a/src/views/Notifications/Notification.vue
+++ b/src/views/Notifications/Notification.vue
@@ -109,7 +109,7 @@
import SendInviteRequestResponseDialog from './dialogs/SendInviteRequestResponseDialog.vue';
import SendInviteResponseDialog from './dialogs/SendInviteResponseDialog.vue';
- import configRepository from '../../service/config';
+ import configRepository from '../../services/config';
const { refreshInviteMessageTableData } = useInviteStore();
const { clearInviteImageUpload } = useGalleryStore();
diff --git a/src/views/Notifications/columns.jsx b/src/views/Notifications/columns.jsx
index 3457ea50..2e4cbf50 100644
--- a/src/views/Notifications/columns.jsx
+++ b/src/views/Notifications/columns.jsx
@@ -28,7 +28,7 @@ import {
import { storeToRefs } from 'pinia';
import { checkCanInvite, formatDateFilter } from '../../shared/utils';
-import { i18n } from '../../plugin';
+import { i18n } from '../../plugins';
import {
useGameStore,
useLocationStore,
diff --git a/src/views/Notifications/dialogs/sendInviteRequestResponseColumns.jsx b/src/views/Notifications/dialogs/sendInviteRequestResponseColumns.jsx
index 29625fa5..872fd631 100644
--- a/src/views/Notifications/dialogs/sendInviteRequestResponseColumns.jsx
+++ b/src/views/Notifications/dialogs/sendInviteRequestResponseColumns.jsx
@@ -1,6 +1,6 @@
import CountdownTimer from '@/components/CountdownTimer.vue';
import { Button } from '@/components/ui/button';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
import { SquarePen } from 'lucide-vue-next';
const { t } = i18n.global;
diff --git a/src/views/Notifications/dialogs/sendInviteResponseColumns.jsx b/src/views/Notifications/dialogs/sendInviteResponseColumns.jsx
index 29625fa5..872fd631 100644
--- a/src/views/Notifications/dialogs/sendInviteResponseColumns.jsx
+++ b/src/views/Notifications/dialogs/sendInviteResponseColumns.jsx
@@ -1,6 +1,6 @@
import CountdownTimer from '@/components/CountdownTimer.vue';
import { Button } from '@/components/ui/button';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
import { SquarePen } from 'lucide-vue-next';
const { t } = i18n.global;
diff --git a/src/views/PlayerList/__tests__/columns.test.js b/src/views/PlayerList/__tests__/columns.test.js
index e632824f..23435577 100644
--- a/src/views/PlayerList/__tests__/columns.test.js
+++ b/src/views/PlayerList/__tests__/columns.test.js
@@ -9,7 +9,7 @@ const mocks = vi.hoisted(() => ({
onUnblockChatbox: vi.fn()
}));
-vi.mock('../../../plugin', () => ({
+vi.mock('../../../plugins', () => ({
i18n: {
global: {
t: (key) => key
diff --git a/src/views/PlayerList/columns.jsx b/src/views/PlayerList/columns.jsx
index 84cbd030..f7c8c051 100644
--- a/src/views/PlayerList/columns.jsx
+++ b/src/views/PlayerList/columns.jsx
@@ -16,7 +16,7 @@ import {
statusClass,
userImage
} from '../../shared/utils';
-import { i18n } from '../../plugin';
+import { i18n } from '../../plugins';
const { t } = i18n.global;
diff --git a/src/views/PlayerList/components/photonEventColumns.jsx b/src/views/PlayerList/components/photonEventColumns.jsx
index ecba206f..f6fa4cbb 100644
--- a/src/views/PlayerList/components/photonEventColumns.jsx
+++ b/src/views/PlayerList/components/photonEventColumns.jsx
@@ -2,7 +2,7 @@ import { ArrowRight, Download } from 'lucide-vue-next';
import Location from '@/components/Location.vue';
import { TooltipWrapper } from '@/components/ui/tooltip';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
import { formatDateFilter, statusClass } from '@/shared/utils';
const { t } = i18n.global;
diff --git a/src/views/Settings/dialogs/FeedFiltersDialog.vue b/src/views/Settings/dialogs/FeedFiltersDialog.vue
index 5686131a..640c0076 100644
--- a/src/views/Settings/dialogs/FeedFiltersDialog.vue
+++ b/src/views/Settings/dialogs/FeedFiltersDialog.vue
@@ -89,7 +89,7 @@
import { ToggleGroup, ToggleGroupItem } from '../../../components/ui/toggle-group';
import { feedFiltersOptions, sharedFeedFiltersDefaults } from '../../../shared/constants';
- import configRepository from '../../../service/config';
+ import configRepository from '../../../services/config';
const { t } = useI18n();
diff --git a/src/views/Settings/dialogs/LaunchOptionsDialog.vue b/src/views/Settings/dialogs/LaunchOptionsDialog.vue
index f4315211..b44cace2 100644
--- a/src/views/Settings/dialogs/LaunchOptionsDialog.vue
+++ b/src/views/Settings/dialogs/LaunchOptionsDialog.vue
@@ -72,7 +72,7 @@
import { openExternalLink } from '../../../shared/utils';
import { useLaunchStore } from '../../../stores';
- import configRepository from '../../../service/config';
+ import configRepository from '../../../services/config';
const { t } = useI18n();
diff --git a/src/views/Settings/dialogs/__tests__/LaunchOptionsDialog.test.js b/src/views/Settings/dialogs/__tests__/LaunchOptionsDialog.test.js
index 3afcf84c..00ebbc36 100644
--- a/src/views/Settings/dialogs/__tests__/LaunchOptionsDialog.test.js
+++ b/src/views/Settings/dialogs/__tests__/LaunchOptionsDialog.test.js
@@ -36,7 +36,7 @@ vi.mock('../../../../stores', () => ({
useLaunchStore: () => ({})
}));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
default: mocks.configRepository
}));
diff --git a/src/views/Settings/dialogs/registryBackupColumns.jsx b/src/views/Settings/dialogs/registryBackupColumns.jsx
index 395454cc..6bdc2b34 100644
--- a/src/views/Settings/dialogs/registryBackupColumns.jsx
+++ b/src/views/Settings/dialogs/registryBackupColumns.jsx
@@ -2,7 +2,7 @@ import { Download, RotateCcw, Trash2 } from 'lucide-vue-next';
import { Button } from '@/components/ui/button';
import { TooltipWrapper } from '@/components/ui/tooltip';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
import { formatDateFilter } from '@/shared/utils';
const { t } = i18n.global;
diff --git a/src/views/Sidebar/components/FriendsSidebar.vue b/src/views/Sidebar/components/FriendsSidebar.vue
index 43909068..ba275153 100644
--- a/src/views/Sidebar/components/FriendsSidebar.vue
+++ b/src/views/Sidebar/components/FriendsSidebar.vue
@@ -213,7 +213,7 @@
import BackToTop from '../../../components/BackToTop.vue';
import FriendItem from './FriendItem.vue';
import Location from '../../../components/Location.vue';
- import configRepository from '../../../service/config';
+ import configRepository from '../../../services/config';
import '@/styles/status-icon.css';
import { showUserDialog } from '../../../coordinators/userCoordinator';
diff --git a/src/views/Sidebar/components/__tests__/FriendsSidebar.test.js b/src/views/Sidebar/components/__tests__/FriendsSidebar.test.js
index 4bf2d037..4fb14a8d 100644
--- a/src/views/Sidebar/components/__tests__/FriendsSidebar.test.js
+++ b/src/views/Sidebar/components/__tests__/FriendsSidebar.test.js
@@ -140,7 +140,7 @@ vi.mock('../../../../shared/utils/location.js', () => ({
getFriendsLocations: vi.fn(() => 'wrld_same:1')
}));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
default: mocks.configRepository
}));
diff --git a/src/views/Tools/Gallery.vue b/src/views/Tools/Gallery.vue
index 21b634c8..ca3bec32 100644
--- a/src/views/Tools/Gallery.vue
+++ b/src/views/Tools/Gallery.vue
@@ -588,7 +588,7 @@
import { useAdvancedSettingsStore, useAuthStore, useGalleryStore, useModalStore, useUserStore } from '../../stores';
import { handleImageUploadInput, readFileAsBase64, withUploadTimeout } from '../../shared/utils/imageUpload';
import { emojiAnimationStyleList, emojiAnimationStyleUrl } from '../../shared/constants';
- import { AppDebug } from '../../service/appConfig';
+ import { AppDebug } from '../../services/appConfig';
import Emoji from '../../components/Emoji.vue';
import ImageCropDialog from '../../components/dialogs/ImageCropDialog.vue';
diff --git a/src/views/Tools/Tools.vue b/src/views/Tools/Tools.vue
index 223a52b7..3f8df395 100644
--- a/src/views/Tools/Tools.vue
+++ b/src/views/Tools/Tools.vue
@@ -347,7 +347,7 @@
import { useVrcxStore } from '../../stores/vrcx';
import AutoChangeStatusDialog from './dialogs/AutoChangeStatusDialog.vue';
- import configRepository from '../../service/config.js';
+ import configRepository from '../../services/config.js';
const GroupCalendarDialog = defineAsyncComponent(() => import('./dialogs/GroupCalendarDialog.vue'));
const NoteExportDialog = defineAsyncComponent(() => import('./dialogs/NoteExportDialog.vue'));
diff --git a/src/views/Tools/components/GroupCalendarEventCard.vue b/src/views/Tools/components/GroupCalendarEventCard.vue
index 491ce594..969845ed 100644
--- a/src/views/Tools/components/GroupCalendarEventCard.vue
+++ b/src/views/Tools/components/GroupCalendarEventCard.vue
@@ -115,7 +115,7 @@
import { useI18n } from 'vue-i18n';
import { useGalleryStore, useGroupStore } from '../../../stores';
- import { AppDebug } from '../../../service/appConfig';
+ import { AppDebug } from '../../../services/appConfig';
import { formatDateFilter } from '../../../shared/utils';
import { groupRequest } from '../../../api';
diff --git a/src/views/Tools/dialogs/ExportAvatarsListDialog.vue b/src/views/Tools/dialogs/ExportAvatarsListDialog.vue
index 8bd60f3a..9ce03e1e 100644
--- a/src/views/Tools/dialogs/ExportAvatarsListDialog.vue
+++ b/src/views/Tools/dialogs/ExportAvatarsListDialog.vue
@@ -23,7 +23,7 @@
import { useAvatarStore, useUserStore } from '../../../stores';
import { avatarRequest } from '../../../api';
- import { processBulk } from '../../../service/request';
+ import { processBulk } from '../../../services/request';
const { t } = useI18n();
diff --git a/src/views/Tools/dialogs/GroupCalendarDialog.vue b/src/views/Tools/dialogs/GroupCalendarDialog.vue
index 9a1220e8..edf4e63a 100644
--- a/src/views/Tools/dialogs/GroupCalendarDialog.vue
+++ b/src/views/Tools/dialogs/GroupCalendarDialog.vue
@@ -107,12 +107,12 @@
import { formatDateFilter, getGroupName, replaceBioSymbols } from '../../../shared/utils';
import { Switch } from '../../../components/ui/switch';
import { groupRequest } from '../../../api';
- import { processBulk } from '../../../service/request';
+ import { processBulk } from '../../../services/request';
import { useGroupStore } from '../../../stores';
import GroupCalendarEventCard from '../components/GroupCalendarEventCard.vue';
import GroupCalendarMonth from '../components/GroupCalendarMonth.vue';
- import configRepository from '../../../service/config';
+ import configRepository from '../../../services/config';
const { applyGroupEvent, showGroupDialog } = useGroupStore();
diff --git a/src/views/Tools/dialogs/RegistryBackupDialog.vue b/src/views/Tools/dialogs/RegistryBackupDialog.vue
index a41581fb..a5935919 100644
--- a/src/views/Tools/dialogs/RegistryBackupDialog.vue
+++ b/src/views/Tools/dialogs/RegistryBackupDialog.vue
@@ -52,7 +52,7 @@
import { createColumns } from '../../Settings/dialogs/registryBackupColumns.jsx';
import { useVrcxVueTable } from '../../../lib/table/useVrcxVueTable';
- import configRepository from '../../../service/config';
+ import configRepository from '../../../services/config';
const { backupVrcRegistry } = useVrcxStore();
const { isRegistryBackupDialogVisible } = storeToRefs(useVrcxStore());
diff --git a/src/views/Tools/dialogs/editInviteMessagesMessageColumns.jsx b/src/views/Tools/dialogs/editInviteMessagesMessageColumns.jsx
index 4563838a..7f87f791 100644
--- a/src/views/Tools/dialogs/editInviteMessagesMessageColumns.jsx
+++ b/src/views/Tools/dialogs/editInviteMessagesMessageColumns.jsx
@@ -1,5 +1,5 @@
import CountdownTimer from '@/components/CountdownTimer.vue';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
const { t } = i18n.global;
diff --git a/src/views/Tools/dialogs/editInviteMessagesRequestColumns.jsx b/src/views/Tools/dialogs/editInviteMessagesRequestColumns.jsx
index 4563838a..7f87f791 100644
--- a/src/views/Tools/dialogs/editInviteMessagesRequestColumns.jsx
+++ b/src/views/Tools/dialogs/editInviteMessagesRequestColumns.jsx
@@ -1,5 +1,5 @@
import CountdownTimer from '@/components/CountdownTimer.vue';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
const { t } = i18n.global;
diff --git a/src/views/Tools/dialogs/editInviteMessagesRequestResponseColumns.jsx b/src/views/Tools/dialogs/editInviteMessagesRequestResponseColumns.jsx
index 4563838a..7f87f791 100644
--- a/src/views/Tools/dialogs/editInviteMessagesRequestResponseColumns.jsx
+++ b/src/views/Tools/dialogs/editInviteMessagesRequestResponseColumns.jsx
@@ -1,5 +1,5 @@
import CountdownTimer from '@/components/CountdownTimer.vue';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
const { t } = i18n.global;
diff --git a/src/views/Tools/dialogs/editInviteMessagesResponseColumns.jsx b/src/views/Tools/dialogs/editInviteMessagesResponseColumns.jsx
index 4563838a..7f87f791 100644
--- a/src/views/Tools/dialogs/editInviteMessagesResponseColumns.jsx
+++ b/src/views/Tools/dialogs/editInviteMessagesResponseColumns.jsx
@@ -1,5 +1,5 @@
import CountdownTimer from '@/components/CountdownTimer.vue';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
const { t } = i18n.global;
diff --git a/src/views/Tools/dialogs/noteExportColumns.jsx b/src/views/Tools/dialogs/noteExportColumns.jsx
index efded37b..dac71dde 100644
--- a/src/views/Tools/dialogs/noteExportColumns.jsx
+++ b/src/views/Tools/dialogs/noteExportColumns.jsx
@@ -2,7 +2,7 @@ import { Trash2 } from 'lucide-vue-next';
import { Button } from '@/components/ui/button';
import { InputGroupTextareaField } from '@/components/ui/input-group';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
const { t } = i18n.global;
diff --git a/src/vr/Vr.vue b/src/vr/Vr.vue
index 3774ab48..d28eff09 100644
--- a/src/vr/Vr.vue
+++ b/src/vr/Vr.vue
@@ -1452,7 +1452,7 @@
import { escapeTag, escapeTagRecursive } from '../shared/utils/base/string';
import { changeHtmlLangAttribute } from '../shared/utils/base/ui';
import { displayLocation } from '../shared/utils/location';
- import { loadLocalizedStrings } from '../plugin/i18n';
+ import { loadLocalizedStrings } from '../plugins/i18n';
import { removeFromArray } from '../shared/utils/base/array';
import { timeToText } from '../shared/utils/base/format';
diff --git a/src/vr/vr.js b/src/vr/vr.js
index 2a7e7b03..91149de8 100644
--- a/src/vr/vr.js
+++ b/src/vr/vr.js
@@ -1,7 +1,7 @@
import { createApp } from 'vue';
-import { i18n } from '../plugin/i18n';
-import { initPlugins } from '../plugin';
+import { i18n } from '../plugins/i18n';
+import { initPlugins } from '../plugins';
import Vr from './Vr.vue';
diff --git a/vitest.setup.js b/vitest.setup.js
index 080161f0..be80d49b 100644
--- a/vitest.setup.js
+++ b/vitest.setup.js
@@ -6,7 +6,7 @@
* Provides global stubs for CefSharp IPC bindings.
*/
-import { i18n } from './src/plugin/i18n';
+import { i18n } from './src/plugins/i18n';
import en from './src/localization/en.json';