Merge pull request #47 from billsonnn/patch/style-fixes

Patch/style fixes

package.json

@@ -14,7 +14,7 @@
     "@nitrots/nitro-renderer": "file:../nitro-renderer",
     "animate.css": "^4.1.1",
     "classnames": "^2.3.1",
-    "node-sass": "^5.0.0",
+    "node-sass": "^6.0.1",
     "react": "^17.0.2",
     "react-bootstrap": "^2.0.0-alpha.2",
     "react-dom": "^17.0.2",

public/renderer-config.json

@@ -101,20 +101,7 @@
         "elephants"
     ],
     "preload.assets.urls": [
-        "${images.url}/additions/user_blowkiss.png",
+        "${asset.url}/bundled/generic/avatar_additions.nitro",
-        "${images.url}/additions/user_idle_left_1.png",
-        "${images.url}/additions/user_idle_left_2.png",
-        "${images.url}/additions/user_idle_right_1.png",
-        "${images.url}/additions/user_idle_right_2.png",
-        "${images.url}/additions/user_muted.png",
-        "${images.url}/additions/user_muted_small.png",
-        "${images.url}/additions/user_typing.png",
-        "${images.url}/additions/number_1.png",
-        "${images.url}/additions/number_2.png",
-        "${images.url}/additions/number_3.png",
-        "${images.url}/additions/number_4.png",
-        "${images.url}/additions/number_5.png",
-        "${images.url}/additions/pet_experience_bubble.png",
         "${images.url}/loading_icon.png",
         "${images.url}/clear_icon.png",
         "${images.url}/big_arrow.png"

src/App.scss

@@ -56,6 +56,9 @@ $help-height: 450px;
 $nitropedia-width: 400px;
 $nitropedia-height: 400px;
 
+$messenger-width: 500px;
+$messenger-height: 370px;
+
 .nitro-app {
     width: 100%;
     height: 100%;

src/views/friends/common/GroupType.ts

@@ -0,0 +1,5 @@
+export class GroupType
+{
+    public static readonly GROUP_CHAT = 0;
+    public static readonly PRIVATE_CHAT = 1;
+}

src/views/friends/common/MessengerThread.ts

@@ -1,7 +1,9 @@
 import { LocalizeText } from '../../../api';
+import { GroupType } from './GroupType';
 import { MessengerFriend } from './MessengerFriend';
 import { MessengerThreadChat } from './MessengerThreadChat';
 import { MessengerThreadChatGroup } from './MessengerThreadChatGroup';
+import { getGroupChatData } from './Utils';
 
 export class MessengerThread
 {
@@ -10,35 +12,40 @@ export class MessengerThread
     private _participant: MessengerFriend;
     private _groups: MessengerThreadChatGroup[];
     private _lastUpdated: Date;
-    private _unread: boolean;
+    private _unreadCount: number;
 
     constructor(participant: MessengerFriend, isNew: boolean = true)
     {
         this._participant = participant;
         this._groups = [];
         this._lastUpdated = new Date();
-        this._unread = false;
+        this._unreadCount = 0;
 
         if(isNew)
         {
-            this.addMessage(-1, LocalizeText('messenger.moderationinfo'), 0, null, MessengerThreadChat.SECURITY_NOTIFICATION);
+            this.addMessage(null, LocalizeText('messenger.moderationinfo'), 0, null, MessengerThreadChat.SECURITY_NOTIFICATION);
 
-            this._unread = false;
+            this._unreadCount = 0;
         }
     }
 
     public addMessage(senderId: number, message: string, secondsSinceSent: number = 0, extraData: string = null, type: number = 0): MessengerThreadChat
     {
-        const group = this.getLastGroup(senderId);
+        const isGroupChat = (senderId < 0 && extraData);
+        const userId = isGroupChat ? getGroupChatData(extraData).userId : senderId;
+
+        const group = this.getLastGroup(userId);
 
         if(!group) return;
 
+        if(isGroupChat) group.type = GroupType.GROUP_CHAT;
+
         const chat = new MessengerThreadChat(senderId, message, secondsSinceSent, extraData, type);
 
         group.addChat(chat);
 
         this._lastUpdated = new Date();
-        this._unread = true;
+        this._unreadCount++;
 
         return chat;
     }
@@ -58,7 +65,7 @@ export class MessengerThread
 
     public setRead(): void
     {
-        this._unread = false;
+        this._unreadCount = 0;
     }
 
     public get participant(): MessengerFriend
@@ -76,8 +83,13 @@ export class MessengerThread
         return this._lastUpdated;
     }
 
+    public get unreadCount(): number
+    {
+        return this._unreadCount;
+    }
+
     public get unread(): boolean
     {
-        return this._unread;
+        return this._unreadCount > 0;
     }
 }

src/views/friends/common/MessengerThreadChatGroup.ts

@@ -1,14 +1,17 @@
+import { GroupType } from './GroupType';
 import { MessengerThreadChat } from './MessengerThreadChat';
 
 export class MessengerThreadChatGroup
 {
     private _userId: number;
     private _chats: MessengerThreadChat[];
+    private _type: number;
 
-    constructor(userId: number)
+    constructor(userId: number, type = GroupType.PRIVATE_CHAT)
     {
         this._userId = userId;
         this._chats = [];
+        this._type = type;
     }
 
     public addChat(message: MessengerThreadChat): void
@@ -25,4 +28,14 @@ export class MessengerThreadChatGroup
     {
         return this._chats;
     }
+
+    public get type(): number
+    {
+        return this._type;
+    }
+
+    public set type(type: number)
+    {
+        this._type = type;
+    }
 }

src/views/friends/common/Utils.ts

@@ -0,0 +1,18 @@
+export const getGroupChatData = (extraData: string) =>
+{
+    const splitData = extraData.split('/');
+
+    const username = splitData[0];
+    const figure = splitData[1];
+    const userId = parseInt(splitData[2]);
+
+    const result: IGroupChatData = { username: username, figure: figure, userId: userId }
+    return  result;
+}
+
+export interface IGroupChatData
+{
+    username: string;
+    figure: string;
+    userId: number;
+} 

src/views/friends/views/friend-bar-item/FriendBarItemView.scss

@@ -11,8 +11,15 @@
     }
 
     .friend-bar-item-head {
+        &.avatar {
             top: -30px;
             left: -30px;
+        }
+        &.group {
+            top: -5px;
+            left: -5px;
+        }
+
         pointer-events: none;
     }
 

src/views/friends/views/friend-bar-item/FriendBarItemView.tsx

@@ -4,6 +4,7 @@ import { GetUserProfile, LocalizeText, OpenMessengerChat } from '../../../../api
 import { SendMessageHook } from '../../../../hooks/messages';
 import { NitroLayoutBase } from '../../../../layout/base';
 import { AvatarImageView } from '../../../shared/avatar-image/AvatarImageView';
+import { BadgeImageView } from '../../../shared/badge-image/BadgeImageView';
 import { FriendBarItemViewProps } from './FriendBarItemView.types';
 
 export const FriendBarItemView: FC<FriendBarItemViewProps> = props =>
@@ -58,8 +59,9 @@ export const FriendBarItemView: FC<FriendBarItemViewProps> = props =>
 
     return (
         <div ref={ elementRef } className={'btn btn-success friend-bar-item ' + (isVisible ? 'friend-bar-item-active' : '')} onClick={ event => setVisible(prevValue => !prevValue) }>
-            <div className="friend-bar-item-head position-absolute">
+            <div className={`friend-bar-item-head position-absolute ${friend.id > 0 ? 'avatar': 'group'}`}>
-                <AvatarImageView headOnly={ true } figure={ friend.figure } direction={ 2 } />
+                { friend.id > 0 && <AvatarImageView headOnly={ true } figure={ friend.figure } direction={ 2 } /> }
+                { friend.id <= 0 && <BadgeImageView isGroup={ true } badgeCode={ friend.figure} />} 
             </div>
             <div className="text-truncate">{ friend.name }</div>
             { isVisible &&

src/views/friends/views/messenger-thread-group/FriendsMessengerThreadGroup.tsx

@@ -1,18 +1,31 @@
-import { FC } from 'react';
+import { FC, useMemo } from 'react';
 import { GetSessionDataManager } from '../../../../api';
 import { NitroLayoutFlex } from '../../../../layout';
 import { NitroLayoutBase } from '../../../../layout/base';
 import { AvatarImageView } from '../../../shared/avatar-image/AvatarImageView';
+import { GroupType } from '../../common/GroupType';
 import { MessengerThreadChat } from '../../common/MessengerThreadChat';
+import { getGroupChatData } from '../../common/Utils';
 import { FriendsMessengerThreadGroupProps } from './FriendsMessengerThreadGroup.types';
 
 export const FriendsMessengerThreadGroup: FC<FriendsMessengerThreadGroupProps> = props =>
 {
     const { thread = null, group = null } = props;
 
+    const isOwnChat = useMemo(() =>
+    {
+        if(!thread || !group) return false;
+        
+        if(group.type === GroupType.PRIVATE_CHAT && (group.userId === GetSessionDataManager().userId)) return true;
+
+        if( (group.type === GroupType.GROUP_CHAT) && (group.chats.length && getGroupChatData(group.chats[0].extraData).userId === GetSessionDataManager().userId)) return true;
+
+        return false;
+    }, [group, thread]);
+
     if(!thread || !group) return null;
     
-    if(group.userId === -1)
+    if(!group.userId)
     {
         return (
             <div className="d-flex gap-2 w-100 justify-content-start">
@@ -33,15 +46,26 @@ export const FriendsMessengerThreadGroup: FC<FriendsMessengerThreadGroupProps> =
     }
     
     return (
-        <NitroLayoutFlex className={ 'w-100 justify-content-' + (group.userId === 0 ? 'end' : 'start') } gap={ 2 }>
+        <NitroLayoutFlex className={ 'w-100 justify-content-' + (isOwnChat ? 'end' : 'start') } gap={ 2 }>
-            { (group.userId > 0) &&
                 <NitroLayoutBase className="message-avatar flex-shrink-0">
+                { (group.type === GroupType.PRIVATE_CHAT && !isOwnChat) &&
                     <AvatarImageView figure={ thread.participant.figure } direction={ 2 } />
-                </NitroLayoutBase> }
+                }
-            <NitroLayoutBase className={ 'bg-light text-black border-radius mb-2 rounded py-1 px-2 messages-group-' + (group.userId === 0 ? 'right' : 'left') }>
+                { (group.type === GroupType.GROUP_CHAT && !isOwnChat) &&
+                    <AvatarImageView figure={ getGroupChatData(group.chats[0].extraData).figure } direction={ 2} />
+                }
+                </NitroLayoutBase>
+            <NitroLayoutBase className={ 'bg-light text-black border-radius mb-2 rounded py-1 px-2 messages-group-' + (isOwnChat ? 'right' : 'left') }>
+                <NitroLayoutBase className='fw-bold'>
+                    {
+                        (isOwnChat) && GetSessionDataManager().userName
+                    }
+                    { (!isOwnChat) && ((group.type === GroupType.GROUP_CHAT) ? getGroupChatData(group.chats[0].extraData).username : thread.participant.name)
+                    }
+                </NitroLayoutBase>
                 { group.chats.map((chat, index) =><NitroLayoutBase key={ index } className="text-break">{ chat.message }</NitroLayoutBase>) }
             </NitroLayoutBase>
-            { (group.userId === 0) &&
+            { (isOwnChat) &&
                 <NitroLayoutBase className="message-avatar flex-shrink-0">
                     <AvatarImageView figure={ GetSessionDataManager().figure } direction={ 4 } />
                 </NitroLayoutBase> }

src/views/friends/views/messenger/FriendsMessengerView.scss

@@ -1,34 +1,35 @@
 .nitro-friends-messenger {
-    width: 280px;
+    width: $messenger-width;
-    resize: both;
+    height: $messenger-height;
+
+    .open-chat-entry {
+        position: relative;
+        border: 2px solid;
+        border-color: $light;
+
+        &.active {
+            border-color: #fffde9;
+            background-color: #ececec
+        }
 
         .friend-head {
-        position: relative;
+            width: 45px;
-        width: 40px;
+            height: 45px;
-        height: 40px;
             overflow: hidden;
     
-        .icon {
-            position: absolute;
-            top: 1px;
-            right: 1px;
-            z-index: 10;
-        }
-
             .avatar-image {
                 position: absolute;
                 margin-left: -27px;
                 margin-top: -27px;
             }
         }
+    }
 
     .chat-title {
         margin-top: -21px;
     }
 
     .chat-messages {
-        height: 200px;
-        min-height: 200px;
         overflow-y: auto;
 
         .message-avatar {

src/views/friends/views/messenger/FriendsMessengerView.tsx

@@ -1,12 +1,14 @@
 import { FollowFriendMessageComposer, ILinkEventTracker, NewConsoleMessageEvent, SendMessageComposer } from '@nitrots/nitro-renderer';
 import { FC, KeyboardEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { AddEventLinkTracker, GetUserProfile, LocalizeText, RemoveLinkEventTracker } from '../../../../api';
+import { AddEventLinkTracker, GetSessionDataManager, GetUserProfile, LocalizeText, RemoveLinkEventTracker } from '../../../../api';
 import { MESSENGER_MESSAGE_RECEIVED, MESSENGER_NEW_THREAD, PlaySound } from '../../../../api/utils/PlaySound';
 import { FriendsMessengerIconEvent } from '../../../../events';
 import { BatchUpdates, CreateMessageHook, dispatchUiEvent, SendMessageHook } from '../../../../hooks';
-import { NitroCardContentView, NitroCardHeaderView, NitroCardView, NitroLayoutButton, NitroLayoutButtonGroup, NitroLayoutFlex, NitroLayoutFlexColumn } from '../../../../layout';
+import { NitroCardContentView, NitroCardHeaderView, NitroCardView, NitroLayoutButton, NitroLayoutButtonGroup, NitroLayoutFlex, NitroLayoutFlexColumn, NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../layout';
 import { NitroLayoutBase } from '../../../../layout/base';
 import { AvatarImageView } from '../../../shared/avatar-image/AvatarImageView';
+import { BadgeImageView } from '../../../shared/badge-image/BadgeImageView';
+import { ItemCountView } from '../../../shared/item-count/ItemCountView';
 import { MessengerThread } from '../../common/MessengerThread';
 import { MessengerThreadChat } from '../../common/MessengerThreadChat';
 import { useFriendsContext } from '../../context/FriendsContext';
@@ -117,7 +119,7 @@ export const FriendsMessengerView: FC<{}> = props =>
 
         if(messageThreads.length === 1 && thread.groups.length === 1) PlaySound(MESSENGER_NEW_THREAD);
 
-        thread.addMessage(0, messageText, 0, null, MessengerThreadChat.CHAT);
+        thread.addMessage(GetSessionDataManager().userId, messageText, 0, null, MessengerThreadChat.CHAT);
 
         BatchUpdates(() =>
         {
@@ -222,7 +224,7 @@ export const FriendsMessengerView: FC<{}> = props =>
 
         for(const thread of visibleThreads)
         {
-            if(thread.unread)
+            if(thread.unreadCount > 0)
             {
                 isUnread = true;
 
@@ -241,29 +243,35 @@ export const FriendsMessengerView: FC<{}> = props =>
         <NitroCardView className="nitro-friends-messenger" uniqueKey="nitro-friends-messenger" simple={true}>
             <NitroCardHeaderView headerText={LocalizeText('messenger.window.title', ['OPEN_CHAT_COUNT'], [visibleThreads.length.toString()])} onCloseClick={event => setIsVisible(false)} />
             <NitroCardContentView>
-                <NitroLayoutFlex gap={ 2 } overflow="auto">
+            <NitroLayoutGrid>
+                <NitroLayoutGridColumn size={ 4 }>
+                        <NitroLayoutBase className='text-black fw-bold fs-5'>{LocalizeText('toolbar.icon.label.messenger')}</NitroLayoutBase>
+                        <NitroLayoutFlexColumn className='h-100 overflow-auto'>
                         {visibleThreads && (visibleThreads.length > 0) && visibleThreads.map((thread, index) =>
                         {
                             const messageThreadIndex = messageThreads.indexOf(thread);
 
                             return (
-                                <div key={ index } className="position-relative friend-head rounded flex-shrink-0 cursor-pointer bg-muted" onClick={ event => setActiveThreadIndex(messageThreadIndex) }>
+                                <NitroLayoutFlex key={index} className={`open-chat-entry p-1 cursor-pointer rounded ${activeThreadIndex === messageThreadIndex ? 'active' : ''}`} onClick={event => setActiveThreadIndex(messageThreadIndex)}>
                                     {thread.unread &&
-                                        <NitroLayoutBase className="position-absolute nitro-friends-spritesheet icon-new-message top-1 end-1 z-index-1" /> }
+                                            <ItemCountView count={ thread.unreadCount }/>
-                                    <AvatarImageView figure={ thread.participant.figure } headOnly={ true } direction={ 3 } />
+                                    }
+                                    <div className="friend-head rounded flex-shrink-0">
+                                        
+                                        {thread.participant.id > 0 && <AvatarImageView figure={thread.participant.figure} headOnly={true} direction={3} />}
+                                        {thread.participant.id <= 0 && <BadgeImageView isGroup={true} badgeCode={thread.participant.figure} />}
+
                                     </div>
+                                    <NitroLayoutBase className='d-flex text-truncate text-black ms-1 align-items-center'>{thread.participant.name}</NitroLayoutBase>
+                                </NitroLayoutFlex>
                             );
                         })}
-                </NitroLayoutFlex>
+                        </NitroLayoutFlexColumn>
-                <NitroLayoutFlex className="align-items-center my-1" position="relative">
+                    </NitroLayoutGridColumn>
-                    { (activeThreadIndex >= 0) &&
+                    <NitroLayoutGridColumn size={ 8 }>
-                        <NitroLayoutBase className="text-black bg-light pe-2 flex-none">
-                            { LocalizeText('messenger.window.separator', [ 'FRIEND_NAME' ], [ messageThreads[activeThreadIndex].participant.name ]) }
-                        </NitroLayoutBase> }
-                    <hr className="bg-dark m-0 w-100" />
-                </NitroLayoutFlex>
                         {(activeThreadIndex >= 0) &&
                             <>
+                                <NitroLayoutBase className='mb-2 text-black text-center fw-bold fs-6'>{LocalizeText('messenger.window.separator', ['FRIEND_NAME'], [messageThreads[activeThreadIndex].participant.name])}</NitroLayoutBase>
                                 <NitroLayoutFlex className="mb-2" gap={2}>
                                     <NitroLayoutButtonGroup>
                                         <NitroLayoutButton variant="primary" size="sm" onClick={followFriend}>
@@ -280,7 +288,7 @@ export const FriendsMessengerView: FC<{}> = props =>
                                         <NitroLayoutBase className="fas fa-times" />
                                     </NitroLayoutButton>
                                 </NitroLayoutFlex>
-                        <NitroLayoutFlexColumn innerRef={ messagesBox } className="bg-muted p-2 rounded chat-messages mb-2">
+                                <NitroLayoutFlexColumn innerRef={messagesBox} className="bg-muted p-2 rounded chat-messages mb-2 h-100 w-100">
                                     <FriendsMessengerThreadView thread={messageThreads[activeThreadIndex]} />
                                 </NitroLayoutFlexColumn>
                                 <NitroLayoutFlex gap={2}>
@@ -290,6 +298,8 @@ export const FriendsMessengerView: FC<{}> = props =>
                                     </NitroLayoutButton>
                                 </NitroLayoutFlex>
                             </>}
+                    </NitroLayoutGridColumn>
+                </NitroLayoutGrid>
             </NitroCardContentView>
         </NitroCardView>
     );

src/views/groups/views/shared-tabs/tab-colors/GroupSharedTabColorsView.tsx

@@ -27,7 +27,7 @@ export const GroupSharedTabColorsView: FC<{}> = props =>
             }
         });
         
-    }, [ groupColors, groupColorsA, groupColorsB ]);
+    }, [dispatchGroupsState, groupColors, groupColorsA, groupColorsB]);
 
     const getGroupColor = useCallback((colorIndex: number) =>
     {
@@ -63,7 +63,7 @@ export const GroupSharedTabColorsView: FC<{}> = props =>
                 <div className="fw-bold">{ LocalizeText('group.edit.color.primary.color') }</div>
                 <div className="d-flex align-items-center gap-2">
                     <div className="row row-cols-18 g-0 gap-1 w-100 h-100 overflow-auto">
-                        { groupColorsA && groupColorsA.map((item, index) =>
+                        { groupColors && groupColorsA && groupColorsA.map((item, index) =>
                             {
                                 return <div key={ index } className={ 'color-swatch cursor-pointer' + classNames({ ' active': groupColors[selectingColorIndex] === item.id }) } style={{ backgroundColor: '#' + item.color }} onClick={ () => selectColor(item.id) }></div>
                             }) }