Renamed channels to rooms (#30)

This commit is contained in:
unknown 2021-08-31 18:43:31 +05:30
parent b5dfc337ec
commit 705910d9e0
42 changed files with 291 additions and 291 deletions

View file

@ -40,9 +40,9 @@ function Drawer() {
<DrawerHeader activeTab={activeTab} />
<div className="drawer__content-wrapper">
<DrawerBradcrumb />
<div className="channels__wrapper">
<div className="rooms__wrapper">
<ScrollView autoHide>
<div className="channels-container">
<div className="rooms-container">
{
activeTab === 'home'
? <Home />

View file

@ -28,14 +28,14 @@
display: none;
height: var(--header-height);
}
.channels__wrapper {
.rooms__wrapper {
@extend .drawer-flexItem;
}
.channels-container {
.rooms-container {
padding-bottom: var(--sp-extra-loose);
& > .channel-selector {
& > .room-selector {
width: calc(100% - var(--sp-extra-tight));
margin-left: auto;
@ -46,7 +46,7 @@
}
& > .channel-selector:first-child {
& > .room-selector:first-child {
margin-top: var(--sp-extra-tight);
}

View file

@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import {
openPublicChannels, openCreateChannel, openInviteUser,
openPublicRooms, openCreateRoom, openInviteUser,
} from '../../../client/action/navigation';
import Text from '../../atoms/text/Text';
@ -26,22 +26,22 @@ function DrawerHeader({ activeTab }) {
<ContextMenu
content={(hideMenu) => (
<>
<MenuHeader>Add channel</MenuHeader>
<MenuHeader>Add room</MenuHeader>
<MenuItem
iconSrc={HashPlusIC}
onClick={() => { hideMenu(); openCreateChannel(); }}
onClick={() => { hideMenu(); openCreateRoom(); }}
>
Create new channel
Create new room
</MenuItem>
<MenuItem
iconSrc={HashSearchIC}
onClick={() => { hideMenu(); openPublicChannels(); }}
onClick={() => { hideMenu(); openPublicRooms(); }}
>
Add Public channel
Add public room
</MenuItem>
</>
)}
render={(toggleMenu) => (<IconButton onClick={toggleMenu} tooltip="Add channel" src={PlusIC} size="normal" />)}
render={(toggleMenu) => (<IconButton onClick={toggleMenu} tooltip="Add room" src={PlusIC} size="normal" />)}
/>
)}
{/* <IconButton onClick={() => ''} tooltip="Menu" src={VerticalMenuIC} size="normal" /> */}

View file

@ -70,7 +70,7 @@ function Home() {
/>
))}
{ roomIds.length !== 0 && <Text className="cat-header" variant="b3">Channels</Text> }
{ roomIds.length !== 0 && <Text className="cat-header" variant="b3">Rooms</Text> }
{ roomIds.map((id) => (
<Selector
key={id}

View file

@ -7,7 +7,7 @@ import { doesRoomHaveUnread } from '../../../util/matrixUtil';
import { selectRoom } from '../../../client/action/navigation';
import navigation from '../../../client/state/navigation';
import ChannelSelector from '../../molecules/channel-selector/ChannelSelector';
import RoomSelector from '../../molecules/room-selector/RoomSelector';
import HashIC from '../../../../public/res/ic/outlined/hash.svg';
import HashLockIC from '../../../../public/res/ic/outlined/hash-lock.svg';
@ -39,7 +39,7 @@ function Selector({ roomId, isDM, drawerPostie }) {
}, []);
return (
<ChannelSelector
<RoomSelector
key={roomId}
name={room.name}
roomId={roomId}

View file

@ -6,7 +6,7 @@ import cons from '../../../client/state/cons';
import colorMXID from '../../../util/colorMXID';
import logout from '../../../client/action/logout';
import {
changeTab, openInviteList, openPublicChannels, openSettings,
changeTab, openInviteList, openPublicRooms, openSettings,
} from '../../../client/action/navigation';
import navigation from '../../../client/state/navigation';
@ -92,8 +92,8 @@ function SideBar() {
<div className="scrollable-content">
<div className="featured-container">
<SidebarAvatar active={activeTab === 'home'} onClick={() => changeTab('home')} tooltip="Home" iconSrc={HomeIC} />
<SidebarAvatar active={activeTab === 'dms'} onClick={() => changeTab('dms')} tooltip="People" iconSrc={UserIC} />
<SidebarAvatar onClick={() => openPublicChannels()} tooltip="Public channels" iconSrc={HashSearchIC} />
<SidebarAvatar active={activeTab === 'dm'} onClick={() => changeTab('dm')} tooltip="People" iconSrc={UserIC} />
<SidebarAvatar onClick={() => openPublicRooms()} tooltip="Public rooms" iconSrc={HashSearchIC} />
</div>
<div className="sidebar-divider" />
<div className="space-container" />