Sfoglia il codice sorgente

Merge branch 'feat/notification' into imprv/jump-to-page-when-notification-clicked

# Conflicts:
#	packages/app/src/components/InAppNotification/InAppNotificationElm.tsx
#	packages/app/src/components/InAppNotification/InAppNotificationList.tsx
#	packages/app/src/components/InAppNotification/NotificationContent.tsx
kaori 4 anni fa
parent
commit
48c0de9e1b
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      packages/app/src/server/service/in-app-notification.ts

+ 2 - 2
packages/app/src/server/service/in-app-notification.ts

@@ -5,10 +5,10 @@ import {
   InAppNotification, InAppNotificationDocument, STATUS_UNREAD, STATUS_UNOPENED, STATUS_OPENED,
 } from '~/server/models/in-app-notification';
 
-import { IUser } from '~/interfaces/user';
-import { HasObjectId } from '~/interfaces/has-object-id';
 import { ActivityDocument } from '~/server/models/activity';
 
+import { IUser } from '~/interfaces/user';
+import { HasObjectId } from '~/interfaces/has-object-id';
 import loggerFactory from '~/utils/logger';
 import { RoomPrefix, getRoomNameWithId } from '../util/socket-io-helpers';