From c22de3832cdd8123ea37c7c072aa7ab307d0a9e7 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Fri, 9 Mar 2018 19:52:35 +0100 Subject: [PATCH] Move SortOption to talk-plugin-viewing-options --- .../talk-plugin-sort-most-liked/client/index.js | 2 +- .../talk-plugin-sort-most-loved/client/index.js | 2 +- .../talk-plugin-sort-most-replied/client/index.js | 2 +- .../client/index.js | 2 +- plugins/talk-plugin-sort-newest/client/index.js | 2 +- plugins/talk-plugin-sort-oldest/client/index.js | 2 +- .../client/api}/components/SortOption.css | 0 .../client/api}/components/SortOption.js | 14 +++++++------- .../client/api}/factories/index.js | 2 +- .../client/constants.js | 5 ++++- 10 files changed, 18 insertions(+), 15 deletions(-) rename {plugin-api/beta/client => plugins/talk-plugin-viewing-options/client/api}/components/SortOption.css (100%) rename {plugin-api/beta/client => plugins/talk-plugin-viewing-options/client/api}/components/SortOption.js (76%) rename {plugin-api/beta/client => plugins/talk-plugin-viewing-options/client/api}/factories/index.js (85%) diff --git a/plugins/talk-plugin-sort-most-liked/client/index.js b/plugins/talk-plugin-sort-most-liked/client/index.js index eb49045af..ef7892403 100644 --- a/plugins/talk-plugin-sort-most-liked/client/index.js +++ b/plugins/talk-plugin-sort-most-liked/client/index.js @@ -1,5 +1,5 @@ import translations from './translations.yml'; -import { createSortOption } from 'plugin-api/beta/client/factories'; +import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories'; import { t } from 'plugin-api/beta/client/services'; const SortOption = createSortOption( diff --git a/plugins/talk-plugin-sort-most-loved/client/index.js b/plugins/talk-plugin-sort-most-loved/client/index.js index 371ff4deb..a2a70e354 100644 --- a/plugins/talk-plugin-sort-most-loved/client/index.js +++ b/plugins/talk-plugin-sort-most-loved/client/index.js @@ -1,5 +1,5 @@ import translations from './translations.yml'; -import { createSortOption } from 'plugin-api/beta/client/factories'; +import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories'; import { t } from 'plugin-api/beta/client/services'; const SortOption = createSortOption( diff --git a/plugins/talk-plugin-sort-most-replied/client/index.js b/plugins/talk-plugin-sort-most-replied/client/index.js index 5bd61eb5e..77d66a0e0 100644 --- a/plugins/talk-plugin-sort-most-replied/client/index.js +++ b/plugins/talk-plugin-sort-most-replied/client/index.js @@ -1,5 +1,5 @@ import translations from './translations.yml'; -import { createSortOption } from 'plugin-api/beta/client/factories'; +import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories'; import { t } from 'plugin-api/beta/client/services'; const SortOption = createSortOption( diff --git a/plugins/talk-plugin-sort-most-respected/client/index.js b/plugins/talk-plugin-sort-most-respected/client/index.js index 21f726ede..7d72ef5ae 100644 --- a/plugins/talk-plugin-sort-most-respected/client/index.js +++ b/plugins/talk-plugin-sort-most-respected/client/index.js @@ -1,5 +1,5 @@ import translations from './translations.yml'; -import { createSortOption } from 'plugin-api/beta/client/factories'; +import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories'; import { t } from 'plugin-api/beta/client/services'; const SortOption = createSortOption( diff --git a/plugins/talk-plugin-sort-newest/client/index.js b/plugins/talk-plugin-sort-newest/client/index.js index e49ef4f7e..ff58833b7 100644 --- a/plugins/talk-plugin-sort-newest/client/index.js +++ b/plugins/talk-plugin-sort-newest/client/index.js @@ -1,5 +1,5 @@ import translations from './translations.yml'; -import { createSortOption } from 'plugin-api/beta/client/factories'; +import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories'; import { t } from 'plugin-api/beta/client/services'; const SortOption = createSortOption(() => t('talk-plugin-sort-newest.label'), { diff --git a/plugins/talk-plugin-sort-oldest/client/index.js b/plugins/talk-plugin-sort-oldest/client/index.js index 5e010e2c4..f7d072388 100644 --- a/plugins/talk-plugin-sort-oldest/client/index.js +++ b/plugins/talk-plugin-sort-oldest/client/index.js @@ -1,5 +1,5 @@ import translations from './translations.yml'; -import { createSortOption } from 'plugin-api/beta/client/factories'; +import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories'; import { t } from 'plugin-api/beta/client/services'; const SortOption = createSortOption(() => t('talk-plugin-sort-oldest.label'), { diff --git a/plugin-api/beta/client/components/SortOption.css b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.css similarity index 100% rename from plugin-api/beta/client/components/SortOption.css rename to plugins/talk-plugin-viewing-options/client/api/components/SortOption.css diff --git a/plugin-api/beta/client/components/SortOption.js b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js similarity index 76% rename from plugin-api/beta/client/components/SortOption.js rename to plugins/talk-plugin-viewing-options/client/api/components/SortOption.js index 41c462511..cb71fe879 100644 --- a/plugin-api/beta/client/components/SortOption.js +++ b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js @@ -2,18 +2,18 @@ import React from 'react'; import cn from 'classnames'; import styles from './SortOption.css'; import PropTypes from 'prop-types'; - -const pluginName = 'talk-slot-viewing-options-sort-option'; +import {PLUGIN_NAME} from '../constants'; export default class SortOption extends React.Component { render() { + const className = cn([ + styles.label, + `${PLUGIN_NAME}-sort-option`, + { [`${PLUGIN_NAME}-sort-option-active`]: this.props.active }, + ]); return (