Merge branch 'develop' into sw-notification-action

src/client/ui/_common_/common.vue

@@ -15,14 +15,14 @@
 
 <script lang="ts">
 import { defineAsyncComponent, defineComponent, inject } from 'vue';
-import { stream, popup, popups, uploads, pendingApiRequestsCount, pageWindow, post } from '@/os';
-import * as sound from '@/scripts/sound';
-import { $i, login } from '@/account';
-import { SwMessage } from '@/sw/types';
-import { popout } from '@/scripts/popout';
-import { defaultStore, ColdDeviceStorage } from '@/store';
-import { getAccountFromId } from '@/scripts/get-account-from-id';
-import { router } from '@/router';
+import { stream, popup, popups, uploads, pendingApiRequestsCount, pageWindow, post } from '@client/os';
+import * as sound from '@client/scripts/sound';
+import { $i, login } from '@client/account';
+import { SwMessage } from '@client/sw/types';
+import { popout } from '@client/scripts/popout';
+import { defaultStore, ColdDeviceStorage } from '@client/store';
+import { getAccountFromId } from '@client/scripts/get-account-from-id';
+import { router } from '@client/router';
 
 export default defineComponent({
 	components: {
@@ -39,7 +39,7 @@ export default defineComponent({
 					id: notification.id
 				});
 
-				popup(import('@/components/toast.vue'), {
+				popup(import('@client/components/toast.vue'), {
 					notification
 				}, {}, 'closed');
 			}

src/client/ui/_common_/stream-indicator.vue

@@ -10,7 +10,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import * as os from '@/os';
+import * as os from '@client/os';
 
 export default defineComponent({
 	data() {

src/client/ui/_common_/upload.vue

@@ -20,7 +20,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { faSpinner } from '@fortawesome/free-solid-svg-icons';
-import * as os from '@/os';
+import * as os from '@client/os';
 
 export default defineComponent({
 	data() {