e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Render text blocks

Browse source
This commit is contained in:
Ken-Håvard Lieng 2020-06-30 13:24:23 +02:00
parent ca4db66308
commit 307573830a
15 changed files with 662 additions and 345 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/js/components/modals/AddChannel.js
View file

@ -2,6 +2,7 @@ import React, { memo, useState, useEffect, useRef } from 'react';
import Modal from 'react-modal';
import { useSelector, useDispatch } from 'react-redux';
import { FiUsers, FiX } from 'react-icons/fi';
import Text from 'components/Text';
import useModal from 'components/modals/useModal';
import Button from 'components/ui/Button';
import { join } from 'state/channels';
@ -33,7 +34,9 @@ const Channel = memo(({ network, name, topic, userCount, joined }) => {
</Button>
)}
</div>
<p className="modal-channel-topic">{linkify(topic)}</p>
<p className="modal-channel-topic">
<Text>{linkify(topic)}</Text>
</p>
</div>
);
});

5
client/js/components/modals/Topic.js
View file

@ -2,6 +2,7 @@ import React from 'react';
import Modal from 'react-modal';
import { useSelector } from 'react-redux';
import { FiX } from 'react-icons/fi';
import Text from 'components/Text';
import Button from 'components/ui/Button';
import useModal from 'components/modals/useModal';
import { getSelectedChannel } from 'state/channels';
@ -18,7 +19,9 @@ const Topic = () => {
<h2>Topic in {channel}</h2>
<Button icon={FiX} className="modal-close" onClick={closeModal} />
</div>
<p className="modal-content">{linkify(topic)}</p>
<p className="modal-content">
<Text>{linkify(topic)}</Text>
</p>
</Modal>
);
};