github/VRCX
1
1
Fork 0
mirror of https://github.com/vrcx-team/VRCX.git synced 2026-04-06 00:32:02 +02:00
Code Issues 51 Packages Projects Releases Wiki Activity

clean up noty and remove animate.css

Browse Source
This commit is contained in:
pa
2026-03-09 17:14:20 +09:00
parent 3dadc84179
commit e5500f47be
16 changed files with 146 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@@ -37,7 +37,6 @@
"@vitest/coverage-v8": "^4.0.18",
"@vue/test-utils": "^2.4.6",
"@vueuse/core": "^14.2.1",
"animate.css": "^4.1.1",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cross-env": "^10.1.0",
@@ -4664,13 +4663,6 @@
"ajv": "^6.9.1"
}
},
"node_modules/animate.css": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
"integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==",
"dev": true,
"license": "MIT"
},
"node_modules/ansi-regex": {
"version": "6.2.2",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",

1
package.json
View File

@@ -56,7 +56,6 @@
"@vitest/coverage-v8": "^4.0.18",
"@vue/test-utils": "^2.4.6",
"@vueuse/core": "^14.2.1",
"animate.css": "^4.1.1",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cross-env": "^10.1.0",

6
src/components/FullscreenImagePreview.vue
View File

@@ -108,8 +108,6 @@
import { useGeneralSettingsStore } from '@/stores/settings/general';
import { useI18n } from 'vue-i18n';
import Noty from 'noty';
import { escapeTag, extractFileId } from '../shared/utils';
import { useGalleryStore } from '../stores';
@@ -303,7 +301,7 @@
toast.success(t('message.image.copied_to_clipboard'));
} catch (error) {
console.error('Error downloading image:', error);
new Noty({ type: 'error', text: escapeTag(`Failed to download image. ${url}`) }).show();
toast.error(escapeTag(`Failed to download image. ${url}`));
} finally {
toast.dismiss(msg);
}
@@ -333,7 +331,7 @@
document.body.removeChild(link);
} catch (error) {
console.error('Error downloading image:', error);
new Noty({ type: 'error', text: escapeTag(`Failed to download image. ${url}`) }).show();
toast.error(escapeTag(`Failed to download image. ${url}`));
} finally {
toast.dismiss(msg);
}

13
src/components/dialogs/ChooseFavoriteGroupDialog.vue
View File

@@ -104,10 +104,9 @@
import { Button } from '@/components/ui/button';
import { Check } from 'lucide-vue-next';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import Noty from 'noty';
import { useFavoriteStore, useUserStore } from '../../stores';
import { favoriteRequest } from '../../api';
@@ -159,6 +158,9 @@
}
);
/**
* @returns {void}
*/
function initFavoriteDialog() {
if (favoriteDialog.value.type === 'friend') {
groups.value = favoriteFriendGroups.value;
@@ -169,6 +171,11 @@
}
}
/**
*
* @param {object} group
* @returns {void}
*/
function addFavorite(group) {
const D = favoriteDialog.value;
loading.value = true;
@@ -180,7 +187,7 @@
})
.then(() => {
isVisible.value = false;
new Noty({ type: 'success', text: 'Favorite added!' }).show();
toast.success('Favorite added!');
})
.finally(() => {
loading.value = false;

8
src/plugin/index.js
View File

@@ -3,13 +3,19 @@ import { initInteropApi } from './interopApi';
import { initNoty } from './noty';
import { initUi } from './ui';
/**
* @param {boolean} isVrOverlay
* @returns {Promise<void>}
*/
export async function initPlugins(isVrOverlay = false) {
await initInteropApi(isVrOverlay);
if (!isVrOverlay) {
await initUi();
}
initDayjs();
initNoty(isVrOverlay);
if (isVrOverlay) {
initNoty(true);
}
}
export * from './i18n';

11
src/service/request.js
View File

@@ -1,7 +1,5 @@
import { toast } from 'vue-sonner';
import Noty from 'noty';
import {
useAuthStore,
useModalStore,
@@ -189,12 +187,9 @@ export function request(endpoint, options) {
text = data.OK;
}
if (text) {
new Noty({
type: 'success',
text: options.customMsg
? options.customMsg
: escapeTag(text)
}).show();
toast.success(
options.customMsg ? options.customMsg : escapeTag(text)
);
}
return data;
}

16
src/service/websocket.js
View File

@@ -1,6 +1,6 @@
import { reactive } from 'vue';
import Noty from 'noty';
import { toast } from 'vue-sonner';
import {
useFriendStore,
@@ -99,12 +99,9 @@ function connectWebSocket(token) {
};
socket.onerror = () => {
if (AppDebug.errorNoty) {
AppDebug.errorNoty.close();
toast.dismiss(AppDebug.errorNoty);
}
AppDebug.errorNoty = new Noty({
type: 'error',
text: 'WebSocket Error'
}).show();
AppDebug.errorNoty = toast.error('WebSocket Error');
socket.onclose(
new CloseEvent('close', {
code: 1006, // Abnormal Closure
@@ -190,12 +187,9 @@ function handlePipeline(args) {
if (typeof err !== 'undefined') {
console.error('PIPELINE: error', args);
if (AppDebug.errorNoty) {
AppDebug.errorNoty.close();
toast.dismiss(AppDebug.errorNoty);
}
AppDebug.errorNoty = new Noty({
type: 'error',
text: escapeTag(`WebSocket Error: ${err}`)
}).show();
AppDebug.errorNoty = toast.error(escapeTag(`WebSocket Error: ${err}`));
return;
}
if (typeof content === 'undefined') {

7
src/shared/utils/common.js
View File

@@ -1,8 +1,6 @@
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import Noty from 'noty';
import {
useAvatarStore,
useInstanceStore,
@@ -44,10 +42,7 @@ function downloadAndSaveJson(fileName, data) {
link.click();
document.body.removeChild(link);
} catch {
new Noty({
type: 'error',
text: escapeTag('Failed to download JSON.')
}).show();
toast.error(escapeTag('Failed to download JSON.'));
}
}

38
src/stores/auth.js
View File

@@ -246,18 +246,12 @@ export const useAuthStore = defineStore('Auth', () => {
await webApiService.clearCookies();
delete user.cookies;
relogin(user).then(() => {
new Noty({
type: 'success',
text: t('message.auth.email_2fa_resent')
}).show();
toast.success(t('message.auth.email_2fa_resent'));
});
return;
}
}
new Noty({
type: 'error',
text: t('message.auth.email_2fa_no_credentials')
}).show();
toast.error(t('message.auth.email_2fa_no_credentials'));
}
/**
@@ -548,10 +542,7 @@ export const useAuthStore = defineStore('Auth', () => {
'savedCredentials',
JSON.stringify(savedCredentials)
);
new Noty({
type: 'success',
text: t('message.auth.account_removed')
}).show();
toast.success(t('message.auth.account_removed'));
}
/**
@@ -915,27 +906,22 @@ export const useAuthStore = defineStore('Auth', () => {
relogin,
notifyAutoLoginSuccess: () => {
if (AppDebug.errorNoty) {
AppDebug.errorNoty.close();
toast.dismiss(AppDebug.errorNoty);
}
AppDebug.errorNoty = new Noty({
type: 'success',
text: t('message.auth.auto_login_success')
}).show();
AppDebug.errorNoty = toast.success(
t('message.auth.auto_login_success')
);
},
notifyAutoLoginFailed: () => {
if (AppDebug.errorNoty) {
AppDebug.errorNoty.close();
toast.dismiss(AppDebug.errorNoty);
}
AppDebug.errorNoty = new Noty({
type: 'error',
text: t('message.auth.auto_login_failed')
}).show();
AppDebug.errorNoty = toast.error(
t('message.auth.auto_login_failed')
);
},
notifyOffline: () => {
AppDebug.errorNoty = new Noty({
type: 'error',
text: t('message.auth.offline')
}).show();
AppDebug.errorNoty = toast.error(t('message.auth.offline'));
},
flashWindow: () => AppApi.FlashWindow(),
isOnline: () => navigator.onLine,

15
src/stores/gallery.js
View File

@@ -1,9 +1,8 @@
import { reactive, ref, shallowReactive, watch } from 'vue';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import Noty from 'noty';
import {
getEmojiFileName,
getPrintFileName,
@@ -379,9 +378,8 @@ export const useGalleryStore = defineStore('Gallery', () => {
try {
for (let i = 0; i < 100; i++) {
params.offset = i * params.n;
const args = await inventoryRequest.getCachedInventoryItems(
params
);
const args =
await inventoryRequest.getCachedInventoryItems(params);
for (const item of args.json.data) {
advancedSettingsStore.currentUserInventory.set(
item.id,
@@ -427,12 +425,9 @@ export const useGalleryStore = defineStore('Gallery', () => {
await vrcPlusImageRequest.deletePrint(printId);
const text = `Old print automatically deleted: ${printId}`;
if (AppDebug.errorNoty) {
AppDebug.errorNoty.close();
toast.dismiss(AppDebug.errorNoty);
}
AppDebug.errorNoty = new Noty({
type: 'info',
text
}).show();
AppDebug.errorNoty = toast.info(text);
}
} catch (err) {
console.error('Failed to delete old print:', err);

14
src/stores/notification/index.js
View File

@@ -3,7 +3,6 @@ import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import Noty from 'noty';
import dayjs from 'dayjs';
import {
@@ -369,13 +368,9 @@ export const useNotificationStore = defineStore('Notification', () => {
.then((_args) => {
const text = `Auto invite sent to ${ref.senderUsername}`;
if (AppDebug.errorNoty) {
AppDebug.errorNoty.close();
toast.dismiss(AppDebug.errorNoty);
}
AppDebug.errorNoty = new Noty({
type: 'info',
text
});
AppDebug.errorNoty.show();
AppDebug.errorNoty = toast.info(text);
console.log(text);
notificationRequest
.hideNotification({
@@ -1341,10 +1336,7 @@ export const useNotificationStore = defineStore('Notification', () => {
console.log('Notification response', args);
if (!args.json) return;
handleNotificationV2Hide(notificationId);
new Noty({
type: 'success',
text: escapeTag(args.json)
}).show();
toast.success(escapeTag(args.json));
})
.catch(() => {
handleNotificationV2Hide(notificationId);

10
src/stores/user.js
View File

@@ -3,8 +3,6 @@ import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import Noty from 'noty';
import {
arraysMatch,
compareByCreatedAt,
@@ -1247,13 +1245,9 @@ export const useUserStore = defineStore('User', () => {
userRequest.saveCurrentUser(params).then(() => {
const text = `Status automatically changed to ${newStatus}`;
if (AppDebug.errorNoty) {
AppDebug.errorNoty.close();
toast.dismiss(AppDebug.errorNoty);
}
AppDebug.errorNoty = new Noty({
type: 'info',
text
});
AppDebug.errorNoty.show();
AppDebug.errorNoty = toast.info(text);
console.log(text);
});
}

7
src/stores/vrcx.js
View File

@@ -3,8 +3,6 @@ import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import Noty from 'noty';
import {
DEFAULT_MAX_TABLE_SIZE,
DEFAULT_SEARCH_LIMIT,
@@ -727,10 +725,7 @@ export const useVrcxStore = defineStore('Vrcx', () => {
avatarStore
.selectAvatarWithoutConfirmation(avatarId)
.then(() => {
new Noty({
type: 'success',
text: 'Avatar changed via launch command'
}).show();
toast.success('Avatar changed via launch command');
});
shouldFocusWindow = false;
}

1
src/styles/globals.css
View File

@@ -1,7 +1,6 @@
@import 'tailwindcss';
@import 'tw-animate-css';
@import 'animate.css/animate.min.css';
@import 'noty/lib/noty.css';
@import 'remixicon/fonts/remixicon.css';
@import 'vue-sonner/style.css';

94
src/styles/noty.css
View File

@@ -1,3 +1,97 @@
/* Noty animate.css keyframes (inlined, only the 4 animations used by noty.js) */
.animate__animated {
animation-duration: 1s;
animation-fill-mode: both;
}
@keyframes bounceInLeft {
from,
60%,
75%,
90%,
to {
animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
}
0% {
opacity: 0;
transform: translate3d(-3000px, 0, 0) scaleX(3);
}
60% {
opacity: 1;
transform: translate3d(25px, 0, 0) scaleX(1);
}
75% {
transform: translate3d(-10px, 0, 0) scaleX(0.98);
}
90% {
transform: translate3d(5px, 0, 0) scaleX(0.995);
}
to {
transform: translate3d(0, 0, 0);
}
}
.animate__bounceInLeft {
animation-name: bounceInLeft;
}
@keyframes bounceOutLeft {
20% {
opacity: 1;
transform: translate3d(20px, 0, 0) scaleX(0.9);
}
to {
opacity: 0;
transform: translate3d(-2000px, 0, 0) scaleX(2);
}
}
.animate__bounceOutLeft {
animation-name: bounceOutLeft;
}
@keyframes fadeIn {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
.animate__fadeIn {
animation-name: fadeIn;
}
@keyframes zoomOut {
from {
opacity: 1;
}
50% {
opacity: 0;
transform: scale3d(0.3, 0.3, 0.3);
}
to {
opacity: 0;
}
}
.animate__zoomOut {
animation-name: zoomOut;
}
/* Noty mint theme */
.noty_layout {
word-break: break-all;
}

2
src/vr/vr.css
View File

@@ -1,6 +1,6 @@
@import 'tailwindcss';
@import 'animate.css/animate.min.css';
@import '../styles/noty.css';
@import 'noty/lib/noty.css';
@import 'remixicon/fonts/remixicon.css';