Skip to content

Commit

Permalink
Moving icon and svg folders into widgets/icons (mattermost#3471)
Browse files Browse the repository at this point in the history
  • Loading branch information
jespino committed Aug 23, 2019
1 parent 73803a9 commit b7fa31d
Show file tree
Hide file tree
Showing 166 changed files with 166 additions and 166 deletions.
2 changes: 1 addition & 1 deletion components/about_build_modal/about_build_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {Modal} from 'react-bootstrap';
import {FormattedMessage} from 'react-intl';

import FormattedMarkdownMessage from 'components/formatted_markdown_message';
import MattermostLogo from 'components/svg/mattermost_logo';
import MattermostLogo from 'components/widgets/icons/mattermost_logo';

export default class AboutBuildModal extends React.PureComponent {
static defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {localizeMessage} from 'utils/utils.jsx';

import MultiSelect from 'components/multiselect/multiselect.jsx';
import groupsAvatar from 'images/groups-avatar.png';
import AddIcon from 'components/icon/add_icon';
import AddIcon from 'components/widgets/icons/fa_add_icon';

const GROUPS_PER_PAGE = 50;
const MAX_SELECTABLE_VALUES = 10;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {localizeMessage} from 'utils/utils.jsx';

import MultiSelect from 'components/multiselect/multiselect.jsx';
import groupsAvatar from 'images/groups-avatar.png';
import AddIcon from 'components/icon/add_icon';
import AddIcon from 'components/widgets/icons/fa_add_icon';

const GROUPS_PER_PAGE = 50;
const MAX_SELECTABLE_VALUES = 10;
Expand Down
2 changes: 1 addition & 1 deletion components/admin_console/admin_sidebar/admin_sidebar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import AdminSidebarHeader from 'components/admin_console/admin_sidebar_header';
import AdminSidebarSection from 'components/admin_console/admin_sidebar_section.jsx';
import AdminDefinition from 'components/admin_console/admin_definition.jsx';
import Highlight from 'components/admin_console/highlight.jsx';
import SearchIcon from 'components/svg/search_icon.jsx';
import SearchIcon from 'components/widgets/icons/search_icon.jsx';

export default class AdminSidebar extends React.Component {
static get contextTypes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
import {FormattedMessage} from 'react-intl';
import {Client4} from 'mattermost-redux/client';

import MenuIcon from 'components/svg/menu_icon';
import MenuIcon from 'components/widgets/icons/menu_icon';

import MenuWrapper from 'components/widgets/menu/menu_wrapper';
import Avatar from 'components/widgets/users/avatar';
Expand Down
4 changes: 2 additions & 2 deletions components/admin_console/audits/audits.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import ComplianceReports from 'components/admin_console/compliance_reports';
import AuditTable from 'components/audit_table';
import LoadingScreen from 'components/loading_screen.jsx';

import ReloadIcon from 'components/icon/reload_icon';
import ReloadIcon from 'components/widgets/icons/fa_reload_icon';

export default class Audits extends React.PureComponent {
static propTypes = {
Expand Down Expand Up @@ -120,4 +120,4 @@ export default class Audits extends React.PureComponent {
</div>
);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import * as Utils from 'utils/utils.jsx';
import {UploadStatuses} from 'utils/constants.jsx';

import LoadingWrapper from 'components/widgets/loading/loading_wrapper.jsx';
import SuccessIcon from 'components/icon/success_icon';
import SuccessIcon from 'components/widgets/icons/fa_success_icon';

export default class UploadButton extends React.PureComponent {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion components/admin_console/cluster_settings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {Client4} from 'mattermost-redux/client';
import * as Utils from 'utils/utils.jsx';

import FormattedMarkdownMessage from 'components/formatted_markdown_message.jsx';
import WarningIcon from 'components/icon/warning_icon';
import WarningIcon from 'components/widgets/icons/fa_warning_icon';

import AdminSettings from './admin_settings.jsx';
import BooleanSetting from './boolean_setting.jsx';
Expand Down
2 changes: 1 addition & 1 deletion components/admin_console/cluster_table.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {FormattedMessage} from 'react-intl';
import * as Utils from 'utils/utils.jsx';
import statusGreen from 'images/status_green.png';
import statusYellow from 'images/status_yellow.png';
import ReloadIcon from 'components/icon/reload_icon';
import ReloadIcon from 'components/widgets/icons/fa_reload_icon';

export default class ClusterTable extends React.Component {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {FormattedDate, FormattedMessage, FormattedTime} from 'react-intl';
import {Client4} from 'mattermost-redux/client';

import LoadingScreen from 'components/loading_screen.jsx';
import ReloadIcon from 'components/icon/reload_icon';
import ReloadIcon from 'components/widgets/icons/fa_reload_icon';
import LocalizedInput from 'components/localized_input/localized_input';
import {t} from 'utils/i18n.jsx';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {FormattedMessage} from 'react-intl';

import ConfirmModal from 'components/confirm_modal.jsx';

import GlobeIcon from 'components/svg/globe_icon';
import LockIcon from 'components/svg/lock_icon';
import GlobeIcon from 'components/widgets/icons/globe_icon';
import LockIcon from 'components/widgets/icons/lock_icon';

export default class GroupTeamsAndChannelsRow extends React.PureComponent {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {FormattedMessage} from 'react-intl';

import GroupUsersRow from 'components/admin_console/group_settings/group_details/group_users_row';
import FormattedMarkdownMessage from 'components/formatted_markdown_message';
import NextIcon from 'components/icon/next_icon';
import PreviousIcon from 'components/icon/previous_icon';
import NextIcon from 'components/widgets/icons/fa_next_icon';
import PreviousIcon from 'components/widgets/icons/fa_previous_icon';

const GROUP_MEMBERS_PAGE_SIZE = 20;

Expand Down
2 changes: 1 addition & 1 deletion components/admin_console/group_settings/group_row.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {FormattedMessage} from 'react-intl';

import {localizeMessage} from 'utils/utils.jsx';

import CheckboxCheckedIcon from 'components/svg/checkbox_checked_icon.jsx';
import CheckboxCheckedIcon from 'components/widgets/icons/checkbox_checked_icon.jsx';
import LoadingSpinner from 'components/widgets/loading/loading_spinner.jsx';

export default class GroupRow extends React.Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import {FormattedMessage} from 'react-intl';
import * as Utils from 'utils/utils.jsx';

import GroupRow from 'components/admin_console/group_settings/group_row.jsx';
import NextIcon from 'components/icon/next_icon';
import PreviousIcon from 'components/icon/previous_icon';
import SearchIcon from 'components/svg/search_icon';
import CheckboxCheckedIcon from 'components/svg/checkbox_checked_icon.jsx';
import NextIcon from 'components/widgets/icons/fa_next_icon';
import PreviousIcon from 'components/widgets/icons/fa_previous_icon';
import SearchIcon from 'components/widgets/icons/search_icon';
import CheckboxCheckedIcon from 'components/widgets/icons/checkbox_checked_icon.jsx';

import {Constants} from 'utils/constants';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import React from 'react';
import PropTypes from 'prop-types';

import CheckboxCheckedIcon from 'components/svg/checkbox_checked_icon.jsx';
import CheckboxPartialIcon from 'components/svg/checkbox_partial_icon.jsx';
import CheckboxCheckedIcon from 'components/widgets/icons/checkbox_checked_icon.jsx';
import CheckboxPartialIcon from 'components/widgets/icons/checkbox_partial_icon.jsx';

export default class PermissionCheckbox extends React.PureComponent {
static propTypes = {
Expand Down
4 changes: 2 additions & 2 deletions components/admin_console/request_button/request_button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {FormattedMessage} from 'react-intl';
import * as Utils from 'utils/utils.jsx';
import {t} from 'utils/i18n';
import LoadingWrapper from 'components/widgets/loading/loading_wrapper.jsx';
import SuccessIcon from 'components/icon/success_icon';
import WarningIcon from 'components/icon/warning_icon';
import SuccessIcon from 'components/widgets/icons/fa_success_icon';
import WarningIcon from 'components/widgets/icons/fa_warning_icon';

/**
* A button which, when clicked, performs an action and displays
Expand Down
2 changes: 1 addition & 1 deletion components/admin_console/server_logs/log_list.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import {FormattedMessage} from 'react-intl';

import NextIcon from 'components/icon/next_icon';
import NextIcon from 'components/widgets/icons/fa_next_icon';

const NEXT_BUTTON_TIMEOUT = 500;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import React from 'react';
import PropTypes from 'prop-types';
import {FormattedMessage} from 'react-intl';

import NextIcon from 'components/icon/next_icon';
import PreviousIcon from 'components/icon/previous_icon';
import NextIcon from 'components/widgets/icons/fa_next_icon';
import PreviousIcon from 'components/widgets/icons/fa_previous_icon';

const PAGE_SIZE = 10;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {Link} from 'react-router-dom';
import {FormattedMessage} from 'react-intl';

import {Constants} from 'utils/constants';
import GlobeIcon from 'components/svg/globe_icon';
import LockIcon from 'components/svg/lock_icon';
import GlobeIcon from 'components/widgets/icons/globe_icon';
import LockIcon from 'components/widgets/icons/lock_icon';

export default class ChannelRow extends React.Component {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import React from 'react';
import PropTypes from 'prop-types';
import {FormattedMessage} from 'react-intl';

import NextIcon from 'components/icon/next_icon';
import PreviousIcon from 'components/icon/previous_icon';
import NextIcon from 'components/widgets/icons/fa_next_icon';
import PreviousIcon from 'components/widgets/icons/fa_previous_icon';

import GroupUsersRow from './group_users_row';

Expand Down
2 changes: 1 addition & 1 deletion components/backstage/components/backstage_list.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {Link} from 'react-router-dom';

import * as Utils from 'utils/utils.jsx';
import LoadingScreen from 'components/loading_screen.jsx';
import SearchIcon from 'components/icon/search_icon';
import SearchIcon from 'components/widgets/icons/fa_search_icon';

export default class BackstageList extends React.Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion components/backstage/components/backstage_navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import React from 'react';
import {FormattedMessage} from 'react-intl';
import {Link} from 'react-router-dom';

import BackIcon from 'components/icon/back_icon';
import BackIcon from 'components/widgets/icons/fa_back_icon';

export default class BackstageNavbar extends React.Component {
static get propTypes() {
Expand Down
10 changes: 5 additions & 5 deletions components/channel_header/channel_header.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import Markdown from 'components/markdown';
import PopoverListMembers from 'components/popover_list_members';
import SearchBar from 'components/search_bar';
import StatusIcon from 'components/status_icon';
import FlagIcon from 'components/svg/flag_icon';
import MentionsIcon from 'components/svg/mentions_icon';
import PinIcon from 'components/svg/pin_icon';
import SearchIcon from 'components/svg/search_icon';
import ArchiveIcon from 'components/svg/archive_icon';
import FlagIcon from 'components/widgets/icons/flag_icon';
import MentionsIcon from 'components/widgets/icons/mentions_icon';
import PinIcon from 'components/widgets/icons/pin_icon';
import SearchIcon from 'components/widgets/icons/search_icon';
import ArchiveIcon from 'components/widgets/icons/archive_icon';
import ChannelPermissionGate from 'components/permissions_gates/channel_permission_gate';
import QuickSwitchModal from 'components/quick_switch_modal';
import {ChannelHeaderDropdown} from 'components/channel_header_dropdown';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import React from 'react';
import {shallow} from 'enzyme';

import FlagIcon from 'components/svg/flag_icon';
import MentionsIcon from 'components/svg/mentions_icon';
import PinIcon from 'components/svg/pin_icon';
import SearchIcon from 'components/svg/search_icon';
import FlagIcon from 'components/widgets/icons/flag_icon';
import MentionsIcon from 'components/widgets/icons/mentions_icon';
import PinIcon from 'components/widgets/icons/pin_icon';
import SearchIcon from 'components/widgets/icons/search_icon';

import HeaderIconWrapper from 'components/channel_header/components/header_icon_wrapper';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {ModalIdentifiers} from 'utils/constants';

import EditChannelHeaderModal from 'components/edit_channel_header_modal';
import Markdown from 'components/markdown';
import InfoIcon from 'components/svg/info_icon';
import InfoIcon from 'components/widgets/icons/info_icon';

const headerMarkdownOptions = {mentionHighlight: false};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
import {FormattedMessage} from 'react-intl';

import NotifyCounts from 'components/notify_counts';
import MenuIcon from 'components/svg/menu_icon';
import MenuIcon from 'components/widgets/icons/menu_icon';

const CollapseLhsButton = ({
actions: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import React from 'react';
import PropTypes from 'prop-types';

import MenuIcon from 'components/svg/menu_icon';
import MenuIcon from 'components/widgets/icons/menu_icon';

const CollapseRhsButton = ({
actions: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import React from 'react';
import PropTypes from 'prop-types';

import SearchIcon from 'components/svg/search_icon';
import SearchIcon from 'components/widgets/icons/search_icon';
import {RHSStates} from 'utils/constants';

export default class ShowSearchButton extends React.PureComponent {
Expand Down
6 changes: 3 additions & 3 deletions components/channel_info_modal/channel_info_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import {FormattedMessage} from 'react-intl';
import {memoizeResult} from 'mattermost-redux/utils/helpers';

import Markdown from 'components/markdown';
import GlobeIcon from 'components/svg/globe_icon';
import LockIcon from 'components/svg/lock_icon';
import ArchiveIcon from 'components/svg/archive_icon';
import GlobeIcon from 'components/widgets/icons/globe_icon';
import LockIcon from 'components/widgets/icons/lock_icon';
import ArchiveIcon from 'components/widgets/icons/archive_icon';

import Constants from 'utils/constants.jsx';
import {getSiteURL} from 'utils/url.jsx';
Expand Down
2 changes: 1 addition & 1 deletion components/channel_invite_modal/channel_invite_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {filterProfilesMatchingTerm} from 'mattermost-redux/utils/user_utils';
import {displayEntireNameForUser, localizeMessage, isGuest} from 'utils/utils.jsx';
import ProfilePicture from 'components/profile_picture.jsx';
import MultiSelect from 'components/multiselect/multiselect.jsx';
import AddIcon from 'components/icon/add_icon';
import AddIcon from 'components/widgets/icons/fa_add_icon';
import GuestBadge from 'components/widgets/badges/guest_badge.jsx';
import BotBadge from 'components/widgets/badges/bot_badge.jsx';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {FormattedMessage} from 'react-intl';

import {Constants} from 'utils/constants.jsx';
import * as Utils from 'utils/utils.jsx';
import DropdownIcon from '../icon/dropdown_icon';

import DropdownIcon from 'components/widgets/icons/fa_dropdown_icon';
import Menu from 'components/widgets/menu/menu';
import MenuWrapper from 'components/widgets/menu/menu_wrapper';

Expand Down
4 changes: 2 additions & 2 deletions components/channel_selector_modal/channel_selector_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import MultiSelect from 'components/multiselect/multiselect.jsx';

import FormattedMarkdownMessage from 'components/formatted_markdown_message.jsx';

import GlobeIcon from 'components/svg/globe_icon';
import LockIcon from 'components/svg/lock_icon';
import GlobeIcon from 'components/widgets/icons/globe_icon';
import LockIcon from 'components/widgets/icons/lock_icon';

const CHANNELS_PER_PAGE = 50;

Expand Down
2 changes: 1 addition & 1 deletion components/common/comment_icon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {FormattedMessage} from 'react-intl';
import {Locations} from 'utils/constants.jsx';
import {localizeMessage} from 'utils/utils.jsx';

import ReplyIcon from 'components/svg/reply_icon';
import ReplyIcon from 'components/widgets/icons/reply_icon';

export default class CommentIcon extends React.PureComponent {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion components/create_comment/create_comment.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import FilePreview from 'components/file_preview';
import FileUpload from 'components/file_upload';
import MsgTyping from 'components/msg_typing';
import PostDeletedModal from 'components/post_deleted_modal.jsx';
import EmojiIcon from 'components/svg/emoji_icon';
import EmojiIcon from 'components/widgets/icons/emoji_icon';
import Textbox from 'components/textbox';
import TextboxLinks from 'components/textbox/textbox_links.jsx';
import FormattedMarkdownMessage from 'components/formatted_markdown_message.jsx';
Expand Down
2 changes: 1 addition & 1 deletion components/create_post/create_post.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import FileUpload from 'components/file_upload';
import MsgTyping from 'components/msg_typing';
import PostDeletedModal from 'components/post_deleted_modal.jsx';
import ResetStatusModal from 'components/reset_status_modal';
import EmojiIcon from 'components/svg/emoji_icon';
import EmojiIcon from 'components/widgets/icons/emoji_icon';
import Textbox from 'components/textbox';
import TextboxLinks from 'components/textbox/textbox_links.jsx';
import TutorialTip from 'components/tutorial/tutorial_tip';
Expand Down
2 changes: 1 addition & 1 deletion components/create_team/components/display_name.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {trackEvent} from 'actions/diagnostics_actions.jsx';
import Constants from 'utils/constants.jsx';
import {cleanUpUrlable} from 'utils/url.jsx';
import logoImage from 'images/logo.png';
import NextIcon from 'components/icon/next_icon';
import NextIcon from 'components/widgets/icons/fa_next_icon';

export default class TeamSignupDisplayNamePage extends React.PureComponent {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion components/edit_post_modal/edit_post_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import * as UserAgent from 'utils/user_agent.jsx';
import * as Utils from 'utils/utils.jsx';
import DeletePostModal from 'components/delete_post_modal';
import EmojiPickerOverlay from 'components/emoji_picker/emoji_picker_overlay.jsx';
import EmojiIcon from 'components/svg/emoji_icon';
import EmojiIcon from 'components/widgets/icons/emoji_icon';
import Textbox from 'components/textbox';
import TextboxLinks from 'components/textbox/textbox_links.jsx';

Expand Down
2 changes: 1 addition & 1 deletion components/emoji/delete_emoji_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import React from 'react';
import {FormattedMessage} from 'react-intl';

import DeleteModalTrigger from 'components/delete_modal_trigger.jsx';
import WarningIcon from 'components/icon/warning_icon';
import WarningIcon from 'components/widgets/icons/fa_warning_icon';

export default class DeleteEmoji extends DeleteModalTrigger {
static propTypes = {
Expand Down
Loading

0 comments on commit b7fa31d

Please sign in to comment.