From 2680ab50734b9b8eb7e53c1d7a2940796436c64d Mon Sep 17 00:00:00 2001
From: Niko Storni <niko@lbry.io>
Date: Tue, 26 Feb 2019 23:11:51 +0100
Subject: [PATCH 1/2] improve status page

---
 view/template/acquisition/youtube_status.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/view/template/acquisition/youtube_status.php b/view/template/acquisition/youtube_status.php
index dea7505f..40c97081 100644
--- a/view/template/acquisition/youtube_status.php
+++ b/view/template/acquisition/youtube_status.php
@@ -6,8 +6,8 @@
 <?php Response::addJsAsset('/js/yt2/youtube_video.js')?>
 <?php Response::addJsAsset('//www.googleadservices.com/pagead/conversion_async.js') ?>
 <?php $statusData = $status_token['data'] ?>
-<?php $isSyncAgreed = in_array($statusData['status'], ["syncing", "synced", "queued"]) ?>
-<?php $isRewardClaimed = $statusData['is_reward_claimed'] ?? false ?>
+<?php $isSyncAgreed = in_array($statusData['status'], ["syncing", "synced", "queued","failed","finalized"]) ?>
+<?php $isRewardClaimed = $statusData['redeemed_reward']>0?>
 <?php if (IS_PRODUCTION): ?>
 <?php js_start() ?>
     if (!localStorage.getItem('status_token')) {
@@ -113,9 +113,11 @@
                         <div hidden id="email-error" class="error">Email is invalid or blank</div>
                         <div hidden id="email-google-plus-error" class="error">Are you sure you want to use this email</div>
                     </div>
-                    <label for="sync-consent" class="block full">
-                        <input name="sync_consent" id="sync-consent" type="checkbox" <?php if ($statusData['status'] == 'queued'): echo "checked"; endif;?> <?php if ($statusData['status'] == 'syncing' || $statusData['status'] == 'synced'): echo "disabled "; echo "checked"; endif; ?>>I want to sync my content to the LBRY network and agree to <a href="/faq/youtube-terms">these terms</a>.
-                        <div hidden id="sync-consent-error" class="error">In order to continue, you must agree to sync.</div>
+                    <p <?php echo $statusData['has_verified_email']?"hidden":""?> class="block full error">You need to verify your email before continuing!</p>
+                    <label for="sync-consent" class="block full" <?php echo !$statusData['has_verified_email']?"hidden":""?>>
+                        <input name="sync_consent" id="sync-consent" type="checkbox"
+                            <?php echo $isSyncAgreed? "checked": ""?> <?php echo (($statusData['status'] == 'pending' || $statusData['status'] == 'queued') && !$statusData['transferred'])? "": "disabled "; ?>>I want to sync my content to the LBRY network and agree to <a href="/faq/youtube-terms">these terms</a>.
+                        <p hidden id="sync-consent-error" class="error">In order to continue, you must agree to sync.</p>
                     </label>
                     <div class="block">
                         <button type="submit" onClick="return submitEditForm()">Save Changes</button>

From db80ccf3757ed20c69744940ca5c9b3c24389a11 Mon Sep 17 00:00:00 2001
From: Niko Storni <niko@lbry.io>
Date: Tue, 26 Feb 2019 23:27:11 +0100
Subject: [PATCH 2/2] add more statuses support

disable more stuff when the channel cannot be edited
format code because it's unreadable
---
 view/template/acquisition/youtube_status.php | 117 ++++++++++++-------
 1 file changed, 75 insertions(+), 42 deletions(-)

diff --git a/view/template/acquisition/youtube_status.php b/view/template/acquisition/youtube_status.php
index 40c97081..3e346101 100644
--- a/view/template/acquisition/youtube_status.php
+++ b/view/template/acquisition/youtube_status.php
@@ -1,41 +1,44 @@
 <?php Response::setMetaDescription('YouTuber? Take back control! LBRY allows publication on your terms. It\'s open-source, decentralized, and gives you 100% of the profit.') ?>
 <?php Response::setMetaTitle(__('YouTubers! Take back control.')) ?>
 <?php Response::setCssAssets(['/css/youtube.css']) ?>
-<?php Response::addJsAsset('/js/yt2/FormValidation.js')?>
+<?php Response::addJsAsset('/js/yt2/FormValidation.js') ?>
 <?php Response::addJsAsset('/js/yt2/youtube_status.js') ?>
-<?php Response::addJsAsset('/js/yt2/youtube_video.js')?>
+<?php Response::addJsAsset('/js/yt2/youtube_video.js') ?>
 <?php Response::addJsAsset('//www.googleadservices.com/pagead/conversion_async.js') ?>
 <?php $statusData = $status_token['data'] ?>
-<?php $isSyncAgreed = in_array($statusData['status'], ["syncing", "synced", "queued","failed","finalized"]) ?>
-<?php $isRewardClaimed = $statusData['redeemed_reward']>0?>
+<?php $isSyncAgreed = in_array($statusData['status'], ["syncing", "synced", "queued", "failed", "finalized"]) ?>
+<?php $isRewardClaimed = $statusData['redeemed_reward'] > 0 ?>
 <?php if (IS_PRODUCTION): ?>
-<?php js_start() ?>
+    <?php js_start() ?>
     if (!localStorage.getItem('status_token')) {
-      ga('send', 'event', 'YT Sync', '<?php echo $isSyncAgreed ? "pending" : "queued" ?>', '');
-      fbq('track', 'Lead');
+    ga('send', 'event', 'YT Sync', '<?php echo $isSyncAgreed ? "pending" : "queued" ?>', '');
+    fbq('track', 'Lead');
 
-      window.google_conversion_id = 980489749;
-      window.google_conversion_label = "B0ZpCIuLgV0QlazE0wM";
-      window.google_remarketing_only = false;
-      window.google_conversion_format = "3";
+    window.google_conversion_id = 980489749;
+    window.google_conversion_label = "B0ZpCIuLgV0QlazE0wM";
+    window.google_remarketing_only = false;
+    window.google_conversion_format = "3";
 
-      var opt = new Object();
-      opt.onload_callback = function() { };
-      var conv_handler = window['google_trackConversion'];
-      if (typeof(conv_handler) == 'function') {
-        conv_handler(opt);
-      }
+    var opt = new Object();
+    opt.onload_callback = function() { };
+    var conv_handler = window['google_trackConversion'];
+    if (typeof(conv_handler) == 'function') {
+    conv_handler(opt);
     }
-<?php js_end() ?>
+    }
+    <?php js_end() ?>
 <?php endif ?>
 
-  <main class="channel-settings">
+<main class="channel-settings">
     <?php echo View::render('acquisition/_youtube_header') ?>
     <section class="section channel pad-top">
         <div class="inner">
             <div class="content">
                 <?php if (preg_match('/^[A-Za-z0-9._%+-]+@plusgoogle.com$/', $statusData['email'])): ?>
-                    <div id="email-google-plus-error" class="error">Your email address is set as <?php echo $statusData['email'];?>.<br>If this is not your email address, please <span id="scroll_email">change it below</span>.</div>
+                    <div id="email-google-plus-error" class="error">Your email address is set
+                        as <?php echo $statusData['email']; ?>.<br>If this is not your email address, please <span
+                                id="scroll_email">change it below</span>.
+                    </div>
                 <?php endif ?>
                 <div class="zigzag"></div>
                 <h1><?php echo $isSyncAgreed && $isRewardClaimed ? "You're all set!" : "Almost done!" ?></h1>
@@ -45,15 +48,18 @@
                             <span>✓</span>
                             <p>Confirm your channel</p>
                         </li>
-                        <li class="<?php echo $isSyncAgreed? "" : "disabled" ?>">
+                        <li class="<?php echo $isSyncAgreed ? "" : "disabled" ?>">
                             <span><?php echo $isSyncAgreed ? "✓" : "☐" ?></span>
                             <p>Agree to sync</p>
-                            <p <?php echo $isSyncAgreed ? "hidden" : "" ?>>click <a id="scroll-sync" href="#">here</a> to agree to sync your content</p>
+                            <p <?php echo $isSyncAgreed ? "hidden" : "" ?>>click <a id="scroll-sync" href="#">here</a>
+                                to agree to sync your content</p>
                         </li>
-                        <li class="<?php echo $isRewardClaimed && $isSyncAgreed? "" : "disabled" ?>">
+                        <li class="<?php echo $isRewardClaimed && $isSyncAgreed ? "" : "disabled" ?>">
                             <span><?php echo $isRewardClaimed ? "✓" : "☐" ?></span>
                             <p>Claim your credits</p>
-                            <p <?php echo ($isRewardClaimed === false && $isSyncAgreed === true)? "" : "hidden"?>>To get your credits, <a href="/get">download the app</a> and <a href="/faq/youtube">follow these instructions.</a></p>
+                            <p <?php echo ($isRewardClaimed === false && $isSyncAgreed === true) ? "" : "hidden" ?>>To
+                                get your credits, <a href="/get">download the app</a> and <a href="/faq/youtube">follow
+                                    these instructions.</a></p>
                         </li>
                     </ul>
                 </div>
@@ -63,27 +69,44 @@
                         <p>Your Sync Status<br>
                             <span>
                             <?php switch ($statusData['status']) {
-                                case "pending": echo __("Pending Agreement"); break;
-                                case "queued": echo __("Queued"); break;
-                                case "syncing": echo __("Sync in Progress!"); break;
-                                case "synced": echo __("Content is Live!"); break;
+                                case "pending":
+                                    echo __("Pending Agreement");
+                                    break;
+                                case "queued":
+                                    echo __("Queued");
+                                    break;
+                                case "syncing":
+                                    echo __("Sync in Progress!");
+                                    break;
+                                case "synced":
+                                    echo __("Content is Live!");
+                                    break;
+                                case "failed":
+                                    echo __("Something went wrong, check back later!");
+                                    break;
+                                case "finalized":
+                                    echo __("The content is in your control!");
+                                    break;
+                                case "abandoned":
+                                    echo __("Cannot sync anymore!");
+                                    break;
                             } ?>
                             </span>
                         </p>
                     </div>
                     <div class="block">
                         <p>Subscribers<br>
-                            <span><?php echo $statusData['subscribers'] === 0? "-": $statusData['subscribers']?></span>
+                            <span><?php echo $statusData['subscribers'] === 0 ? "-" : $statusData['subscribers'] ?></span>
                         </p>
                     </div>
                     <div class="block">
                         <p>Videos<br>
-                            <span><?php echo $statusData['videos'] === 0? "-": $statusData['videos']?></span>
+                            <span><?php echo $statusData['videos'] === 0 ? "-" : $statusData['videos'] ?></span>
                         </p>
                     </div>
                     <div class="block">
                         <p>Expected Rewards<br>
-                            <span><?php echo $statusData['expected_reward'] === 0? "-": $statusData['expected_reward']?></span>
+                            <span><?php echo $statusData['expected_reward'] === 0 ? "-" : $statusData['expected_reward'] ?></span>
                         </p>
                     </div>
                 </div>
@@ -97,27 +120,37 @@
                 <h1>Confirm your preferences</h1>
                 <form id="youtube_settings" action="/youtube/edit" method="post">
                     <div>
-                        <input type="hidden" name="status_token" id="status_token" value="<?php echo $token?>"/>
+                        <input type="hidden" name="status_token" id="status_token" value="<?php echo $token ?>"/>
                     </div>
-                  <?php
-                  if ($error_message): echo "<div>" . "The following error occurred: ". $error_message  . " For support please send an email to hello@lbry.io" . "</div>";
-                  endif;?>
+                    <?php
+                    if ($error_message): echo "<div>" . "The following error occurred: " . $error_message . " For support please send an email to hello@lbry.io" . "</div>";
+                    endif; ?>
                     <div class="block">
                         <label for="channel-name">LBRY Channel ID</label>
-                        <input type="text" id="channel-name" name="new_preferred_channel" placeholder="@YourPreferredChannelName" value="<?php echo $statusData['lbry_channel_name'];?>" <?php if ($statusData['status'] == 'syncing' || $statusData['status'] == 'synced'): echo "disabled"; endif; ?> >
+                        <input type="text" id="channel-name" name="new_preferred_channel"
+                               placeholder="@YourPreferredChannelName"
+                               value="<?php echo $statusData['lbry_channel_name']; ?>" <?php echo $statusData['editable'] ? "" : "disabled" ?> >
                         <div hidden id="channel-name-error" class="error">Channel is invalid or blank</div>
                     </div>
                     <div class="block">
                         <label for="email">Preferred Email</label>
-                        <input type="text" id="email" name="new_email" placeholder="bill@gmail.com" value="<?php echo $statusData['email'];?>">
+                        <input type="text" id="email" name="new_email" placeholder="bill@gmail.com"
+                               value="<?php echo $statusData['email']; ?>">
                         <div hidden id="email-error" class="error">Email is invalid or blank</div>
-                        <div hidden id="email-google-plus-error" class="error">Are you sure you want to use this email</div>
+                        <div hidden id="email-google-plus-error" class="error">Google plus email addresses cannot be
+                            used
+                        </div>
                     </div>
-                    <p <?php echo $statusData['has_verified_email']?"hidden":""?> class="block full error">You need to verify your email before continuing!</p>
-                    <label for="sync-consent" class="block full" <?php echo !$statusData['has_verified_email']?"hidden":""?>>
+                    <p <?php echo $statusData['has_verified_email'] ? "hidden" : "" ?> class="block full error">You need
+                        to verify your email before continuing!</p>
+                    <label for="sync-consent"
+                           class="block full" <?php echo !$statusData['has_verified_email'] ? "hidden" : "" ?>>
                         <input name="sync_consent" id="sync-consent" type="checkbox"
-                            <?php echo $isSyncAgreed? "checked": ""?> <?php echo (($statusData['status'] == 'pending' || $statusData['status'] == 'queued') && !$statusData['transferred'])? "": "disabled "; ?>>I want to sync my content to the LBRY network and agree to <a href="/faq/youtube-terms">these terms</a>.
-                        <p hidden id="sync-consent-error" class="error">In order to continue, you must agree to sync.</p>
+                            <?php echo $isSyncAgreed ? "checked" : "" ?> <?php echo (($statusData['status'] == 'pending' || $statusData['status'] == 'queued') && !$statusData['transferred']) ? "" : "disabled "; ?>>I
+                        want to sync my content to the LBRY network and agree to <a href="/faq/youtube-terms">these
+                            terms</a>.
+                        <p hidden id="sync-consent-error" class="error">In order to continue, you must agree to
+                            sync.</p>
                     </label>
                     <div class="block">
                         <button type="submit" onClick="return submitEditForm()">Save Changes</button>