diff --git a/controller/Controller.class.php b/controller/Controller.class.php index ef84209d..582bcbdd 100644 --- a/controller/Controller.class.php +++ b/controller/Controller.class.php @@ -119,14 +119,15 @@ class Controller $router->any('/dmca', 'ReportActions::executeDmca'); - $router->any('/youtube/thanks', 'AcquisitionActions::executeThanks'); $router->any('/youtube/sub', 'AcquisitionActions::executeYouTubeSub'); - $router->any('/youtube', 'AcquisitionActions::executeYT2'); $router->post('/youtube/edit', 'AcquisitionActions::executeYoutubeEdit'); $router->post('/youtube/token', 'AcquisitionActions::executeYoutubeToken'); $router->any('/youtube/status/{token}', 'AcquisitionActions::executeYoutubeStatus'); + $router->any('/youtube', 'AcquisitionActions::executeYouTube'); + $router->get('/verify/{token}', 'AcquisitionActions::executeVerify'); + $router->get('/news/category/{category}', 'ContentActions::executePostCategoryFilter'); $router->post('/set-culture', 'i18nActions::setCulture'); diff --git a/controller/action/AcquisitionActions.class.php b/controller/action/AcquisitionActions.class.php index 91837079..d08de50b 100644 --- a/controller/action/AcquisitionActions.class.php +++ b/controller/action/AcquisitionActions.class.php @@ -28,18 +28,9 @@ class AcquisitionActions extends Actions return Controller::redirect(Request::getReferrer(), 303); } - public static function executeYouTube(string $campaignId = '') + public static function executeYouTube() { - $template = 'acquisition/youtube' . ($campaignId ? '-' . $campaignId : ''); - if (!View::exists($template)) { - return NavActions::execute404(); - } - return [$template]; - } - - public static function executeYT2() - { - return ['acquisition/yt2']; + return ['acquisition/youtube']; } public static function executeVerify(string $token) diff --git a/lib/thirdparty/LBRY.class.php b/lib/thirdparty/LBRY.class.php index 2e0abf10..90ef6ae2 100644 --- a/lib/thirdparty/LBRY.class.php +++ b/lib/thirdparty/LBRY.class.php @@ -39,7 +39,7 @@ class LBRY // Check the sync status public static function statusYoutube($status_token) { - return Curl::post(static::getApiUrl('/yt/status'), ['status_token' => $status_token], ['json_response' => true]); + return Curl::get(static::getApiUrl('/yt/status'), ['status_token' => $status_token], ['json_response' => true]); } public static function youtubeReward() diff --git a/view/template/acquisition/thanks.php b/view/template/acquisition/thanks.php deleted file mode 100644 index 7eea154e..00000000 --- a/view/template/acquisition/thanks.php +++ /dev/null @@ -1,48 +0,0 @@ - false]) ?> -
-
-

Thank You!

-

Your account will be synced. If you have any questions, please contact reilly@lbry.io

-
- - - - - - - - - - - - - - -
diff --git a/view/template/acquisition/youtube.php b/view/template/acquisition/youtube.php index f3e4c707..2988ff80 100644 --- a/view/template/acquisition/youtube.php +++ b/view/template/acquisition/youtube.php @@ -1,94 +1,201 @@ - - - true, 'isAbsolute' => true]) ?> -
- -
-
- -

- Leave YouTube
- for good. -

-
- No more demonetization or sneaky algorithms.
- Publish on your terms, not Google's. + +
+ +
+
+ + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+

Leave YouTube

+

for good.

+

No more demonetization or sneaky algorithms

+
Claim Your Channel
+
+
+
+
+ +
+ " . "The following error occurred: ". $_GET['error_message'] . " For support please send an email to hello@lbry.io" . "
"; + endif;?> +
+

Own your identity. For real this time.

+ +
+
+
+ + + +
+ +
+ +
+
+ This will verify you are an active YouTuber, then instructions and your welcome credits will be emailed to you. + Learn more.
-
- Let's Do This - More Words, Please -
-
-

- LBRY -

-
- ['Earn More', 'Integrated tipjars, pay-per-stream, or free: the choice is yours. And you earn 100% of it.'], - 'icon-group' => ['Community Run', 'Your audience–not advertisers–decide what they want and how they want it.'], - 'icon-code' => ['Accountable', 'Entirely open-source platform. Maintained by stewards, not overlords.'], - //Easy - ] as $iconClass => $copyTuple): ?> - -
-
-
-
- -
-
-

-

- -

+
+
+
+
+

LBRY is more fun with friends

+

Take your peers and your audience with you. Create without limits.

+
+
+ + + +
+

@3Blue1Brown

- +
+ + + +
+

@CasuallyExplained

+
+
+
+ + + +
+

@ColinsLastStand

+
+
+
-
-
-
-
-

Leave YouTube in one click

-
    -
  1. - Clicking below will authenticate with YouTube and grant permission for your content to be available on the decentralized LBRY network. - You may revoke this permission and unpublish* your content at any time. -
    2. -
  2. - Our team will automate publishing your content to LBRY. When it's done, you'll receive a notification and a login to review, update, and manage it. -
    3. -
-
- Sync Channel -
-
*Unpublishing means removing the ability to decrypt and accessing your content via LBRY, but we cannot guarantee the deletion of all encrypted data.
+
+
+
+
+

Migrating to LBRY

+

We will automatically mirror your existing YouTube channel to the LBRY Network.

+
+
+
+
+
+
1
+

Claim your LBRY name

+
+
+
2
+

Check your email for confirmation

+
+
+
3
+

Sync your existing YouTube content

-
-
-
-

I Have Questions

-

- Have a big audience? Let Reilly know how we can support you - by emailing him directly. -

-
- 'email', - 'type' => 'email', - 'label' => 'Email', - 'required' => true, - ]) ?> - -
- 'reilly-smith']) ?> +
+
+
+
+
+
+

Sync & Earn

+

LBRY offers a single-click sync process
for existing YouTubers

+
+ Sync now +
+
+ By syncing, you agree to mirror your content to the LBRY network for 1 year, and acknowledge these terms.
+
+
+
+
+

LBRY Credits and Your Channel

+

After you sync, receive LBRY Credits every month for one year based on your current subscriber count.

+

The more you give to the network, the more it gives back.

+
+

Partner Programs

+

LBC

+
+
+
+

Subscribers

+

Monthly

+

Amount

+
+
+

1,000

+

+

+
+
+

10,000

+

+

+
+
+

100,000

+

+

+
+
+

1,000,000

+

+

+
+
+
+
+
+
+
+
+

Tell me more.

+

We have a guy that elaborates on things. Apply directly to the forehead.

+
+
+
+

Reilly Smith

+

Head of Content

+ Contact +
+
+
+
+
+
to top
- diff --git a/view/template/acquisition/youtube_status.php b/view/template/acquisition/youtube_status.php index 775018b6..6ba75f2c 100644 --- a/view/template/acquisition/youtube_status.php +++ b/view/template/acquisition/youtube_status.php @@ -2,7 +2,7 @@ - +
@@ -11,15 +11,27 @@

Your Channel

-
-

Number of subscriber
- -

-
-
-

Number of video
- +

+
+

Sync Status
+

+
+
+

Subscribers
+ +

+
+
+

Videos
+ +

+
@@ -28,7 +40,7 @@
-

Edit Your Settings

+

Your LBRY Settings

@@ -37,17 +49,17 @@ if (isset($_GET['error'])): echo "
" . "The following error occurred: ". $_GET['error_message'] . " For support please send an email to hello@lbry.io" . "
"; endif;?>
- + >
- +
- >I want to sync my content to the LBRY network and agree to the "terms" + >I want to sync my content to the LBRY network and agree to these terms.
@@ -68,7 +80,8 @@

-

To get your credits... lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ipsum velit, convallis ac libero sit amet, viverra dictum tortor.

+

To get your credits, download the app and navigate to the "Rewards" area inside of your Wallet. + For more details, see this page.

diff --git a/view/template/acquisition/yt2.php b/view/template/acquisition/yt2.php deleted file mode 100644 index fc1cb28d..00000000 --- a/view/template/acquisition/yt2.php +++ /dev/null @@ -1,201 +0,0 @@ - -
- -
-
- - - - - - - - - - -
-
-
-
-
-
-
-
-
-
-

Leave YouTube

-

for good.

-

No more demonetization or sneaky algorithms

-
Claim Your Channel
-
-
-
-
- -
- " . "The following error occurred: ". $_GET['error_message'] . " For support please send an email to hello@lbry.io" . "
"; - endif;?> -
-

Own your identity. For real this time.

- - -
-
- - - -
- -
- -
-
- This will verify you are an active YouTuber, then instructions and your welcome credits will be emailed to you. - Learn more. -
-
-
-
-
-
-
-

LBRY is more fun with friends

-

Take your peers and your audience with you. Create without limits.

-
-
- - - -
-

@3Blue1Brown

-
-
-
- - - -
-

@CasuallyExplained

-
-
-
- - - -
-

@ColinsLastStand

-
-
-
-
-
-
-
-
-
-

Migrating to LBRY

-

We will automatically mirror your existing YouTube channel to the LBRY Network.

-
-
-
-
-
-
1
-

Claim your LBRY name

-
-
-
2
-

Check your email for confirmation

-
-
-
3
-

Sync your existing YouTube content

-
-
-
-
-
-
-
-
-
-

Sync & Earn

-

LBRY offers a single-click sync process
for existing YouTubers

-
- Sync now -
-
- By syncing, you agree to mirror your content to the LBRY network for 1 year, and acknowledge these terms. -
-
-
-
-
-
-
-

LBRY Credits and Your Channel

-

After you sync, receive LBRY Credits every month for one year based on your current subscriber count.

-

The more you give to the network, the more it gives back.

-
-

Partner Programs

-

LBC (0.3267 USD)

-
-
-
-

Subscribers

-

Monthly

-

Amount

-
-
-

1,000

-

-

-
-
-

10,000

-

-

-
-
-

100,000

-

-

-
-
-

1,000,000

-

-

-
-
-
-
-
-
-
-
-

Tell me more.

-

We have a guy that elaborates on things. Apply directly to the forehead.

-
-
-
-

Reilly Smith

-

Head of Content

- Contact -
-
-
-
-
-
to top
-
diff --git a/web/css/yt2.css b/web/css/yt2.css index cbbb9cfe..5fd9bc11 100644 --- a/web/css/yt2.css +++ b/web/css/yt2.css @@ -770,6 +770,9 @@ header .right a.github { margin-top: 40px; box-sizing: border-box; } +.channel .block:not(:first-child) { + width: 25%; +} .settings .block { padding-right: 60px; } @@ -792,7 +795,7 @@ header .right a.github { .channel .block p span { float: left; width: 100%; - font: normal 400 60px/60px 'metropolis-medium'; + font: normal 400 40px/40px 'metropolis-medium'; color: #2F3C5C; margin-top: 8px; } diff --git a/web/img/youtube/spacerise.jpg b/web/img/youtube/spacerise.jpg deleted file mode 100644 index 0170399e..00000000 Binary files a/web/img/youtube/spacerise.jpg and /dev/null differ diff --git a/web/img/youtube/tanks2.jpg b/web/img/youtube/tanks2.jpg deleted file mode 100644 index c6746bd0..00000000 Binary files a/web/img/youtube/tanks2.jpg and /dev/null differ diff --git a/web/img/youtube/tanks3.jpg b/web/img/youtube/tanks3.jpg deleted file mode 100644 index 12ed896c..00000000 Binary files a/web/img/youtube/tanks3.jpg and /dev/null differ