From ae2354a0e030d348df6746810e2e1d6f5d37d68f Mon Sep 17 00:00:00 2001 From: jessopb <36554050+jessopb@users.noreply.github.com> Date: Mon, 19 Jul 2021 10:12:47 -0400 Subject: [PATCH] Revert "move stuff to web (#6537)" This reverts commit a6c413da5cedb5efa425cad39586f157cd3829c6. --- ui/component/router/view.jsx | 18 +++++++----------- ui/component/viewers/videoViewer/view.jsx | 2 +- .../page/checkoutPage/credit-card-logos.png | Bin {web => ui}/page/checkoutPage/index.js | 0 {web => ui}/page/checkoutPage/view.jsx | 0 {web => ui}/page/embedWrapper/index.js | 8 ++++---- {web => ui}/page/embedWrapper/view.jsx | 0 ui/page/fourOhFour/index.js | 9 +++++++++ {web => ui}/page/fourOhFour/view.jsx | 0 {web => ui}/page/livestreamCurrent/index.js | 0 {web => ui}/page/livestreamCurrent/view.jsx | 0 {web => ui}/page/livestreamSetup/index.js | 0 {web => ui}/page/livestreamSetup/view.jsx | 0 .../page/settingsStripeAccount/index.js | 0 .../page/settingsStripeAccount/view.jsx | 0 {web => ui}/page/settingsStripeCard/index.js | 0 {web => ui}/page/settingsStripeCard/view.jsx | 0 web/page/fourOhFour/index.js | 6 ------ 18 files changed, 21 insertions(+), 22 deletions(-) rename {web => ui}/page/checkoutPage/credit-card-logos.png (100%) rename {web => ui}/page/checkoutPage/index.js (100%) rename {web => ui}/page/checkoutPage/view.jsx (100%) rename {web => ui}/page/embedWrapper/index.js (82%) rename {web => ui}/page/embedWrapper/view.jsx (100%) create mode 100644 ui/page/fourOhFour/index.js rename {web => ui}/page/fourOhFour/view.jsx (100%) rename {web => ui}/page/livestreamCurrent/index.js (100%) rename {web => ui}/page/livestreamCurrent/view.jsx (100%) rename {web => ui}/page/livestreamSetup/index.js (100%) rename {web => ui}/page/livestreamSetup/view.jsx (100%) rename {web => ui}/page/settingsStripeAccount/index.js (100%) rename {web => ui}/page/settingsStripeAccount/view.jsx (100%) rename {web => ui}/page/settingsStripeCard/index.js (100%) rename {web => ui}/page/settingsStripeCard/view.jsx (100%) delete mode 100644 web/page/fourOhFour/index.js diff --git a/ui/component/router/view.jsx b/ui/component/router/view.jsx index b4d510ebf..1e2631970 100644 --- a/ui/component/router/view.jsx +++ b/ui/component/router/view.jsx @@ -44,22 +44,20 @@ const ChannelsFollowingDiscoverPage = lazyImport(() => ); const ChannelsFollowingPage = lazyImport(() => import('page/channelsFollowing' /* webpackChunkName: "secondary" */)); const ChannelsPage = lazyImport(() => import('page/channels' /* webpackChunkName: "secondary" */)); -const CheckoutPage = lazyImport(() => import('web/page/checkoutPage' /* webpackChunkName: "checkoutPage" */)); +const CheckoutPage = lazyImport(() => import('page/checkoutPage' /* webpackChunkName: "checkoutPage" */)); const CreatorDashboard = lazyImport(() => import('page/creatorDashboard' /* webpackChunkName: "secondary" */)); const DiscoverPage = lazyImport(() => import('page/discover' /* webpackChunkName: "secondary" */)); -const EmbedWrapperPage = lazyImport(() => import('web/page/embedWrapper' /* webpackChunkName: "secondary" */)); +const EmbedWrapperPage = lazyImport(() => import('page/embedWrapper' /* webpackChunkName: "secondary" */)); const FileListPublished = lazyImport(() => import('page/fileListPublished' /* webpackChunkName: "secondary" */)); -const FourOhFourPage = lazyImport(() => import('web/page/fourOhFour' /* webpackChunkName: "fourOhFour" */)); +const FourOhFourPage = lazyImport(() => import('page/fourOhFour' /* webpackChunkName: "fourOhFour" */)); const HelpPage = lazyImport(() => import('page/help' /* webpackChunkName: "help" */)); const InvitePage = lazyImport(() => import('page/invite' /* webpackChunkName: "secondary" */)); const InvitedPage = lazyImport(() => import('page/invited' /* webpackChunkName: "secondary" */)); const LibraryPage = lazyImport(() => import('page/library' /* webpackChunkName: "secondary" */)); const ListBlockedPage = lazyImport(() => import('page/listBlocked' /* webpackChunkName: "secondary" */)); const ListsPage = lazyImport(() => import('page/lists' /* webpackChunkName: "secondary" */)); -const LiveStreamSetupPage = lazyImport(() => import('web/page/livestreamSetup' /* webpackChunkName: "secondary" */)); -const LivestreamCurrentPage = lazyImport(() => - import('web/page/livestreamCurrent' /* webpackChunkName: "secondary" */) -); +const LiveStreamSetupPage = lazyImport(() => import('page/livestreamSetup' /* webpackChunkName: "secondary" */)); +const LivestreamCurrentPage = lazyImport(() => import('page/livestreamCurrent' /* webpackChunkName: "secondary" */)); const PasswordResetPage = lazyImport(() => import('page/passwordReset' /* webpackChunkName: "secondary" */)); const PasswordSetPage = lazyImport(() => import('page/passwordSet' /* webpackChunkName: "secondary" */)); const PublishPage = lazyImport(() => import('page/publish' /* webpackChunkName: "secondary" */)); @@ -70,10 +68,8 @@ const RewardsPage = lazyImport(() => import('page/rewards' /* webpackChunkName: const RewardsVerifyPage = lazyImport(() => import('page/rewardsVerify' /* webpackChunkName: "secondary" */)); const SearchPage = lazyImport(() => import('page/search' /* webpackChunkName: "secondary" */)); const SettingsAdvancedPage = lazyImport(() => import('page/settingsAdvanced' /* webpackChunkName: "secondary" */)); -const SettingsStripeCard = lazyImport(() => import('web/page/settingsStripeCard' /* webpackChunkName: "secondary" */)); -const SettingsStripeAccount = lazyImport(() => - import('web/page/settingsStripeAccount' /* webpackChunkName: "secondary" */) -); +const SettingsStripeCard = lazyImport(() => import('page/settingsStripeCard' /* webpackChunkName: "secondary" */)); +const SettingsStripeAccount = lazyImport(() => import('page/settingsStripeAccount' /* webpackChunkName: "secondary" */)); const SettingsCreatorPage = lazyImport(() => import('page/settingsCreator' /* webpackChunkName: "secondary" */)); const SettingsNotificationsPage = lazyImport(() => import('page/settingsNotifications' /* webpackChunkName: "secondary" */) diff --git a/ui/component/viewers/videoViewer/view.jsx b/ui/component/viewers/videoViewer/view.jsx index 54d6459c1..3665aa249 100644 --- a/ui/component/viewers/videoViewer/view.jsx +++ b/ui/component/viewers/videoViewer/view.jsx @@ -7,7 +7,7 @@ import { stopContextMenu } from 'util/context-menu'; import type { Player } from './internal/videojs'; import VideoJs from './internal/videojs'; import analytics from 'analytics'; -import { EmbedContext } from 'web/page/embedWrapper/view'; +import { EmbedContext } from 'page/embedWrapper/view'; import classnames from 'classnames'; import { FORCE_CONTENT_TYPE_PLAYER } from 'constants/claim'; import AutoplayCountdown from 'component/autoplayCountdown'; diff --git a/web/page/checkoutPage/credit-card-logos.png b/ui/page/checkoutPage/credit-card-logos.png similarity index 100% rename from web/page/checkoutPage/credit-card-logos.png rename to ui/page/checkoutPage/credit-card-logos.png diff --git a/web/page/checkoutPage/index.js b/ui/page/checkoutPage/index.js similarity index 100% rename from web/page/checkoutPage/index.js rename to ui/page/checkoutPage/index.js diff --git a/web/page/checkoutPage/view.jsx b/ui/page/checkoutPage/view.jsx similarity index 100% rename from web/page/checkoutPage/view.jsx rename to ui/page/checkoutPage/view.jsx diff --git a/web/page/embedWrapper/index.js b/ui/page/embedWrapper/index.js similarity index 82% rename from web/page/embedWrapper/index.js rename to ui/page/embedWrapper/index.js index a535e730b..280dfd075 100644 --- a/web/page/embedWrapper/index.js +++ b/ui/page/embedWrapper/index.js @@ -25,11 +25,11 @@ const select = (state, props) => { }; }; -const perform = (dispatch) => { +const perform = dispatch => { return { - resolveUri: (uri) => dispatch(doResolveUri(uri)), - doPlayUri: (uri) => dispatch(doPlayUri(uri)), - doFetchCostInfoForUri: (uri) => dispatch(doFetchCostInfoForUri(uri)), + resolveUri: uri => dispatch(doResolveUri(uri)), + doPlayUri: uri => dispatch(doPlayUri(uri)), + doFetchCostInfoForUri: uri => dispatch(doFetchCostInfoForUri(uri)), }; }; diff --git a/web/page/embedWrapper/view.jsx b/ui/page/embedWrapper/view.jsx similarity index 100% rename from web/page/embedWrapper/view.jsx rename to ui/page/embedWrapper/view.jsx diff --git a/ui/page/fourOhFour/index.js b/ui/page/fourOhFour/index.js new file mode 100644 index 000000000..d6f2d6326 --- /dev/null +++ b/ui/page/fourOhFour/index.js @@ -0,0 +1,9 @@ +import { connect } from 'react-redux'; +import FourOhFourPage from './view'; + +const select = state => ({}); + +export default connect( + select, + null +)(FourOhFourPage); diff --git a/web/page/fourOhFour/view.jsx b/ui/page/fourOhFour/view.jsx similarity index 100% rename from web/page/fourOhFour/view.jsx rename to ui/page/fourOhFour/view.jsx diff --git a/web/page/livestreamCurrent/index.js b/ui/page/livestreamCurrent/index.js similarity index 100% rename from web/page/livestreamCurrent/index.js rename to ui/page/livestreamCurrent/index.js diff --git a/web/page/livestreamCurrent/view.jsx b/ui/page/livestreamCurrent/view.jsx similarity index 100% rename from web/page/livestreamCurrent/view.jsx rename to ui/page/livestreamCurrent/view.jsx diff --git a/web/page/livestreamSetup/index.js b/ui/page/livestreamSetup/index.js similarity index 100% rename from web/page/livestreamSetup/index.js rename to ui/page/livestreamSetup/index.js diff --git a/web/page/livestreamSetup/view.jsx b/ui/page/livestreamSetup/view.jsx similarity index 100% rename from web/page/livestreamSetup/view.jsx rename to ui/page/livestreamSetup/view.jsx diff --git a/web/page/settingsStripeAccount/index.js b/ui/page/settingsStripeAccount/index.js similarity index 100% rename from web/page/settingsStripeAccount/index.js rename to ui/page/settingsStripeAccount/index.js diff --git a/web/page/settingsStripeAccount/view.jsx b/ui/page/settingsStripeAccount/view.jsx similarity index 100% rename from web/page/settingsStripeAccount/view.jsx rename to ui/page/settingsStripeAccount/view.jsx diff --git a/web/page/settingsStripeCard/index.js b/ui/page/settingsStripeCard/index.js similarity index 100% rename from web/page/settingsStripeCard/index.js rename to ui/page/settingsStripeCard/index.js diff --git a/web/page/settingsStripeCard/view.jsx b/ui/page/settingsStripeCard/view.jsx similarity index 100% rename from web/page/settingsStripeCard/view.jsx rename to ui/page/settingsStripeCard/view.jsx diff --git a/web/page/fourOhFour/index.js b/web/page/fourOhFour/index.js deleted file mode 100644 index 149f6812c..000000000 --- a/web/page/fourOhFour/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import { connect } from 'react-redux'; -import FourOhFourPage from './view'; - -const select = (state) => ({}); - -export default connect(select, null)(FourOhFourPage);