From 701265472926ee9f06fe86088a13f9d2c99aca15 Mon Sep 17 00:00:00 2001 From: Liam Cardenas Date: Thu, 21 Dec 2017 14:26:16 -0800 Subject: [PATCH 1/4] Added verify page without api or styling --- controller/Controller.class.php | 2 ++ .../action/AcquisitionActions.class.php | 5 ++++ view/template/acquisition/verify.php | 24 +++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 view/template/acquisition/verify.php diff --git a/controller/Controller.class.php b/controller/Controller.class.php index 269da2a7..5625fe96 100644 --- a/controller/Controller.class.php +++ b/controller/Controller.class.php @@ -123,6 +123,8 @@ class Controller $router->any('/youtube/sub', 'AcquisitionActions::executeYouTubeSub'); $router->any('/youtube/{campaignId:c}?', 'AcquisitionActions::executeYouTube'); $router->any('/yt2', 'AcquisitionActions::executeYT2'); + $router->get('/verify/{token}', 'AcquisitionActions::executeVerify'); + $router->post('/set-culture', 'i18nActions::setCulture'); diff --git a/controller/action/AcquisitionActions.class.php b/controller/action/AcquisitionActions.class.php index cf8f803b..f4c66438 100644 --- a/controller/action/AcquisitionActions.class.php +++ b/controller/action/AcquisitionActions.class.php @@ -45,5 +45,10 @@ class AcquisitionActions extends Actions return ['acquisition/yt2', ['_no_layout' => true]]; } + public static function executeVerify(string $token = '') + { + return ['acquisition/verify', ['token' => $token]]; + } + } diff --git a/view/template/acquisition/verify.php b/view/template/acquisition/verify.php new file mode 100644 index 00000000..41053148 --- /dev/null +++ b/view/template/acquisition/verify.php @@ -0,0 +1,24 @@ + + + + + + + Verify Your Identity + + + + + + +

Almost Done!

+

Click the captcha to continue...

+ + +
+ + From d5687f47ee155f371ee9bdd9b3fbe948bae2a02e Mon Sep 17 00:00:00 2001 From: liam Date: Fri, 22 Dec 2017 13:59:53 -0800 Subject: [PATCH 2/4] Fully functioningverify page without styling --- view/template/acquisition/verify.php | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/view/template/acquisition/verify.php b/view/template/acquisition/verify.php index 41053148..fd19b6ad 100644 --- a/view/template/acquisition/verify.php +++ b/view/template/acquisition/verify.php @@ -5,20 +5,33 @@ Verify Your Identity -

Almost Done!

-

Click the captcha to continue...

- - -
+

Click the captcha to continue...

+
+
+

Now click the magic link below to verify your identity in app...

+ +

Does the magic link not work? Not on the same device as the app? Paste this text into the verification screen instead.

+
Copied!
+
From 5fc3a48e09ac884281ef8f43021c1e5c863b3689 Mon Sep 17 00:00:00 2001 From: Liam Cardenas Date: Fri, 22 Dec 2017 15:23:22 -0800 Subject: [PATCH 3/4] Added styling to verification page --- view/template/acquisition/verify.php | 19 +++++++++++-------- web/scss/_code.scss | 12 ++++++++---- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/view/template/acquisition/verify.php b/view/template/acquisition/verify.php index fd19b6ad..b5a799e6 100644 --- a/view/template/acquisition/verify.php +++ b/view/template/acquisition/verify.php @@ -24,14 +24,17 @@ -

Almost Done!

-

Click the captcha to continue...

-
-
-

Now click the magic link below to verify your identity in app...

- -

Does the magic link not work? Not on the same device as the app? Paste this text into the verification screen instead.

-
Copied!
+
+ LBRY +

Almost Done!

+

Click the captcha to continue...

+
+
diff --git a/web/scss/_code.scss b/web/scss/_code.scss index bf2c20eb..aabc2d07 100644 --- a/web/scss/_code.scss +++ b/web/scss/_code.scss @@ -30,7 +30,7 @@ pre overflow-x: auto; } -.code-bash +.multiline-code { -webkit-user-select: text; -moz-user-select: text; @@ -47,10 +47,14 @@ pre display: block; word-wrap: break-word; + font-size: 0.75em; +} + +.code-bash +{ + @extend .multiline-code; background: #222; color: #fff; - - font-size: 0.75em; } .code-bash__response { @@ -65,4 +69,4 @@ pre margin-right: 5px; color: lighten($color-primary, 20%); @include user-select(none); -} \ No newline at end of file +} From 11e2bad0b084c4967f1e63a44e68d98025d05e5c Mon Sep 17 00:00:00 2001 From: Liam Cardenas Date: Fri, 22 Dec 2017 18:14:39 -0800 Subject: [PATCH 4/4] Removed token default --- controller/action/AcquisitionActions.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller/action/AcquisitionActions.class.php b/controller/action/AcquisitionActions.class.php index f4c66438..422be407 100644 --- a/controller/action/AcquisitionActions.class.php +++ b/controller/action/AcquisitionActions.class.php @@ -45,7 +45,7 @@ class AcquisitionActions extends Actions return ['acquisition/yt2', ['_no_layout' => true]]; } - public static function executeVerify(string $token = '') + public static function executeVerify(string $token) { return ['acquisition/verify', ['token' => $token]]; }