From 17b13d8b19c08dcfd9ab55e09ac53da97dba3682 Mon Sep 17 00:00:00 2001 From: zeppi Date: Sun, 18 Jul 2021 13:45:35 -0400 Subject: [PATCH] move stuff to web --- ui/component/router/view.jsx | 18 +++++++++++------- ui/component/viewers/videoViewer/view.jsx | 2 +- ui/page/fourOhFour/index.js | 9 --------- .../page/checkoutPage/credit-card-logos.png | Bin {ui => web}/page/checkoutPage/index.js | 0 {ui => web}/page/checkoutPage/view.jsx | 0 {ui => web}/page/embedWrapper/index.js | 8 ++++---- {ui => web}/page/embedWrapper/view.jsx | 0 web/page/fourOhFour/index.js | 6 ++++++ {ui => web}/page/fourOhFour/view.jsx | 0 {ui => web}/page/livestreamCurrent/index.js | 0 {ui => web}/page/livestreamCurrent/view.jsx | 0 {ui => web}/page/livestreamSetup/index.js | 0 {ui => web}/page/livestreamSetup/view.jsx | 0 .../page/settingsStripeAccount/index.js | 0 .../page/settingsStripeAccount/view.jsx | 0 {ui => web}/page/settingsStripeCard/index.js | 0 {ui => web}/page/settingsStripeCard/view.jsx | 0 18 files changed, 22 insertions(+), 21 deletions(-) delete mode 100644 ui/page/fourOhFour/index.js rename {ui => web}/page/checkoutPage/credit-card-logos.png (100%) rename {ui => web}/page/checkoutPage/index.js (100%) rename {ui => web}/page/checkoutPage/view.jsx (100%) rename {ui => web}/page/embedWrapper/index.js (82%) rename {ui => web}/page/embedWrapper/view.jsx (100%) create mode 100644 web/page/fourOhFour/index.js rename {ui => web}/page/fourOhFour/view.jsx (100%) rename {ui => web}/page/livestreamCurrent/index.js (100%) rename {ui => web}/page/livestreamCurrent/view.jsx (100%) rename {ui => web}/page/livestreamSetup/index.js (100%) rename {ui => web}/page/livestreamSetup/view.jsx (100%) rename {ui => web}/page/settingsStripeAccount/index.js (100%) rename {ui => web}/page/settingsStripeAccount/view.jsx (100%) rename {ui => web}/page/settingsStripeCard/index.js (100%) rename {ui => web}/page/settingsStripeCard/view.jsx (100%) diff --git a/ui/component/router/view.jsx b/ui/component/router/view.jsx index 1e2631970..b4d510ebf 100644 --- a/ui/component/router/view.jsx +++ b/ui/component/router/view.jsx @@ -44,20 +44,22 @@ const ChannelsFollowingDiscoverPage = lazyImport(() => ); const ChannelsFollowingPage = lazyImport(() => import('page/channelsFollowing' /* webpackChunkName: "secondary" */)); const ChannelsPage = lazyImport(() => import('page/channels' /* webpackChunkName: "secondary" */)); -const CheckoutPage = lazyImport(() => import('page/checkoutPage' /* webpackChunkName: "checkoutPage" */)); +const CheckoutPage = lazyImport(() => import('web/page/checkoutPage' /* webpackChunkName: "checkoutPage" */)); const CreatorDashboard = lazyImport(() => import('page/creatorDashboard' /* webpackChunkName: "secondary" */)); const DiscoverPage = lazyImport(() => import('page/discover' /* webpackChunkName: "secondary" */)); -const EmbedWrapperPage = lazyImport(() => import('page/embedWrapper' /* webpackChunkName: "secondary" */)); +const EmbedWrapperPage = lazyImport(() => import('web/page/embedWrapper' /* webpackChunkName: "secondary" */)); const FileListPublished = lazyImport(() => import('page/fileListPublished' /* webpackChunkName: "secondary" */)); -const FourOhFourPage = lazyImport(() => import('page/fourOhFour' /* webpackChunkName: "fourOhFour" */)); +const FourOhFourPage = lazyImport(() => import('web/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('page/livestreamSetup' /* webpackChunkName: "secondary" */)); -const LivestreamCurrentPage = lazyImport(() => import('page/livestreamCurrent' /* webpackChunkName: "secondary" */)); +const LiveStreamSetupPage = lazyImport(() => import('web/page/livestreamSetup' /* webpackChunkName: "secondary" */)); +const LivestreamCurrentPage = lazyImport(() => + import('web/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" */)); @@ -68,8 +70,10 @@ 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('page/settingsStripeCard' /* webpackChunkName: "secondary" */)); -const SettingsStripeAccount = lazyImport(() => import('page/settingsStripeAccount' /* webpackChunkName: "secondary" */)); +const SettingsStripeCard = lazyImport(() => import('web/page/settingsStripeCard' /* webpackChunkName: "secondary" */)); +const SettingsStripeAccount = lazyImport(() => + import('web/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 3665aa249..54d6459c1 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 'page/embedWrapper/view'; +import { EmbedContext } from 'web/page/embedWrapper/view'; import classnames from 'classnames'; import { FORCE_CONTENT_TYPE_PLAYER } from 'constants/claim'; import AutoplayCountdown from 'component/autoplayCountdown'; diff --git a/ui/page/fourOhFour/index.js b/ui/page/fourOhFour/index.js deleted file mode 100644 index d6f2d6326..000000000 --- a/ui/page/fourOhFour/index.js +++ /dev/null @@ -1,9 +0,0 @@ -import { connect } from 'react-redux'; -import FourOhFourPage from './view'; - -const select = state => ({}); - -export default connect( - select, - null -)(FourOhFourPage); diff --git a/ui/page/checkoutPage/credit-card-logos.png b/web/page/checkoutPage/credit-card-logos.png similarity index 100% rename from ui/page/checkoutPage/credit-card-logos.png rename to web/page/checkoutPage/credit-card-logos.png diff --git a/ui/page/checkoutPage/index.js b/web/page/checkoutPage/index.js similarity index 100% rename from ui/page/checkoutPage/index.js rename to web/page/checkoutPage/index.js diff --git a/ui/page/checkoutPage/view.jsx b/web/page/checkoutPage/view.jsx similarity index 100% rename from ui/page/checkoutPage/view.jsx rename to web/page/checkoutPage/view.jsx diff --git a/ui/page/embedWrapper/index.js b/web/page/embedWrapper/index.js similarity index 82% rename from ui/page/embedWrapper/index.js rename to web/page/embedWrapper/index.js index 280dfd075..a535e730b 100644 --- a/ui/page/embedWrapper/index.js +++ b/web/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/ui/page/embedWrapper/view.jsx b/web/page/embedWrapper/view.jsx similarity index 100% rename from ui/page/embedWrapper/view.jsx rename to web/page/embedWrapper/view.jsx diff --git a/web/page/fourOhFour/index.js b/web/page/fourOhFour/index.js new file mode 100644 index 000000000..149f6812c --- /dev/null +++ b/web/page/fourOhFour/index.js @@ -0,0 +1,6 @@ +import { connect } from 'react-redux'; +import FourOhFourPage from './view'; + +const select = (state) => ({}); + +export default connect(select, null)(FourOhFourPage); diff --git a/ui/page/fourOhFour/view.jsx b/web/page/fourOhFour/view.jsx similarity index 100% rename from ui/page/fourOhFour/view.jsx rename to web/page/fourOhFour/view.jsx diff --git a/ui/page/livestreamCurrent/index.js b/web/page/livestreamCurrent/index.js similarity index 100% rename from ui/page/livestreamCurrent/index.js rename to web/page/livestreamCurrent/index.js diff --git a/ui/page/livestreamCurrent/view.jsx b/web/page/livestreamCurrent/view.jsx similarity index 100% rename from ui/page/livestreamCurrent/view.jsx rename to web/page/livestreamCurrent/view.jsx diff --git a/ui/page/livestreamSetup/index.js b/web/page/livestreamSetup/index.js similarity index 100% rename from ui/page/livestreamSetup/index.js rename to web/page/livestreamSetup/index.js diff --git a/ui/page/livestreamSetup/view.jsx b/web/page/livestreamSetup/view.jsx similarity index 100% rename from ui/page/livestreamSetup/view.jsx rename to web/page/livestreamSetup/view.jsx diff --git a/ui/page/settingsStripeAccount/index.js b/web/page/settingsStripeAccount/index.js similarity index 100% rename from ui/page/settingsStripeAccount/index.js rename to web/page/settingsStripeAccount/index.js diff --git a/ui/page/settingsStripeAccount/view.jsx b/web/page/settingsStripeAccount/view.jsx similarity index 100% rename from ui/page/settingsStripeAccount/view.jsx rename to web/page/settingsStripeAccount/view.jsx diff --git a/ui/page/settingsStripeCard/index.js b/web/page/settingsStripeCard/index.js similarity index 100% rename from ui/page/settingsStripeCard/index.js rename to web/page/settingsStripeCard/index.js diff --git a/ui/page/settingsStripeCard/view.jsx b/web/page/settingsStripeCard/view.jsx similarity index 100% rename from ui/page/settingsStripeCard/view.jsx rename to web/page/settingsStripeCard/view.jsx