diff --git a/app/plugins/bookmarks/controllers/bookmarks.php b/app/plugins/bookmarks/controllers/bookmarks.php index 0f2595c..3c1e1c5 100644 --- a/app/plugins/bookmarks/controllers/bookmarks.php +++ b/app/plugins/bookmarks/controllers/bookmarks.php @@ -26,6 +26,7 @@ use TheTempusProject\TheTempusProject as App; use TheTempusProject\Houdini\Classes\Components; use TheTempusProject\Houdini\Classes\Forms as HoudiniForms; use TheTempusProject\Houdini\Classes\Navigation; +use TheTempusProject\Houdini\Classes\Template; class Bookmarks extends Controller { protected static $bookmarks; @@ -127,8 +128,7 @@ class Bookmarks extends Controller { public function createBookmark( $id = null ) { $folderID = Input::get('folder_id') ? Input::get('folder_id') : $id; $folderID = Input::post('folder_id') ? Input::post('folder_id') : $id; - $folderSelect = HoudiniForms::getFormFieldHtml( 'folder_id', 'Folder', 'select', $folderID, self::$folders->simpleByUser() ); - Components::set( 'folderSelect', $folderSelect ); + $this->setFolderSelect( $folderID ); if ( ! Input::exists() ) { return Views::view( 'bookmarks.bookmarks.create' ); @@ -172,8 +172,7 @@ class Bookmarks extends Controller { $folderID = $bookmark->folderID; } - $folderSelect = HoudiniForms::getFormFieldHtml( 'folder_id', 'Folder', 'select', $folderID, self::$folders->simpleByUser() ); - Components::set( 'folderSelect', $folderSelect ); + $this->setFolderSelect( $folderID ); Components::set( 'color', $bookmark->color ); if ( ! Input::exists( 'submit' ) ) { @@ -227,7 +226,8 @@ class Bookmarks extends Controller { $folder = self::$folders->findById( $id ); if ( $folder == false ) { $folders = self::$folders->byUser(); - return Views::view( 'bookmarks.folders.list', $folders ); + Components::set( 'foldersList', Views::simpleView( 'bookmarks.folders.list', $folders ) ); + return Views::view( 'bookmarks.folders.listPage', $folders ); } if ( $folder->createdBy != App::$activeUser->ID ) { Session::flash( 'error', 'You do not have permission to view this folder.' ); @@ -241,11 +241,11 @@ class Bookmarks extends Controller { $folderID = Input::exists('folder_id') ? Input::post('folder_id') : $id; $folders = self::$folders->simpleByUser(); if ( ! empty( $folders ) ) { - $folderSelect = HoudiniForms::getFormFieldHtml( 'folder_id', 'Folder', 'select', $folderID, $folders ); + $this->setFolderSelect( $folderID ); } else { $folderSelect = ''; + Components::set( 'folderSelect', $folderSelect ); } - Components::set( 'folderSelect', $folderSelect ); if ( ! Input::exists() ) { return Views::view( 'bookmarks.folders.create' ); } @@ -275,8 +275,7 @@ class Bookmarks extends Controller { } $folderID = ( false === Input::exists('folder_id') ) ? $folder->ID : Input::post('folder_id'); - $folderSelect = HoudiniForms::getFormFieldHtml( 'folder_id', 'Folder', 'select', $folderID, self::$folders->simpleByUser() ); - Components::set( 'folderSelect', $folderSelect ); + $this->setFolderSelect( $folderID ); Components::set( 'color', $folder->color ); if ( ! Input::exists( 'submit' ) ) { @@ -512,4 +511,36 @@ class Bookmarks extends Controller { } return $out; } + + + + + private function setFolderSelect( $folderID ) { + $options = self::$folders->simpleByUser(); + $out = ''; + $out .= '
'; + $out .= ''; + $out .= '
'; + $out .= ''; + $out .= '
'; + $out .= '
'; + $folderSelect = Template::parse( $out ); + Components::set( 'folderSelect', $folderSelect ); + } } diff --git a/app/plugins/bookmarks/views/bookmarks/create.html b/app/plugins/bookmarks/views/bookmarks/create.html index 13c4113..8069266 100644 --- a/app/plugins/bookmarks/views/bookmarks/create.html +++ b/app/plugins/bookmarks/views/bookmarks/create.html @@ -1,44 +1,51 @@ -Create Bookmark -
- -
- -
- + +

Add Bookmark

+
+
+ +
+ +
-
-
- -
- + + +
+ +
+ +
-
-
- -
- + + +
+ +
+ +
-
- {folderSelect} -
- -
- + {folderSelect} +
+ +
+ +
-
-
- -
- {colorSelect} +
+ +
+ {colorSelect} +
-
-
- -
- + + + + + +
+
-
+ \ No newline at end of file diff --git a/app/plugins/bookmarks/views/bookmarks/edit.html b/app/plugins/bookmarks/views/bookmarks/edit.html index ac89c62..18b9d68 100644 --- a/app/plugins/bookmarks/views/bookmarks/edit.html +++ b/app/plugins/bookmarks/views/bookmarks/edit.html @@ -1,44 +1,51 @@ -Edit Bookmark -
- -
- -
- + +

Edit Bookmark

+
+
+ +
+ +
-
-
- -
- + + +
+ +
+ +
-
-
- -
- + + +
+ +
+ +
-
- {folderSelect} -
- -
- + {folderSelect} +
+ +
+ +
-
-
- -
- {colorSelect} +
+ +
+ {colorSelect} +
-
-
- -
- + + + + + +
+
-
+ \ No newline at end of file diff --git a/app/plugins/bookmarks/views/bookmarks/list.html b/app/plugins/bookmarks/views/bookmarks/list.html index 7a25ff4..1fa2a6a 100644 --- a/app/plugins/bookmarks/views/bookmarks/list.html +++ b/app/plugins/bookmarks/views/bookmarks/list.html @@ -1,37 +1,37 @@ - - - - - - - - - - - - {LOOP} - - - - - - - - {/LOOP} - {ALT} - - - - {/ALT} - -
Bookmark
- - {title} - - - {privacy} -
- No results to show. -
-Create \ No newline at end of file + + + + + + + + + + + + {LOOP} + + + + + + + + {/LOOP} + {ALT} + + + + {/ALT} + +
Bookmark
+ + {title} + + + {privacy} +
+ No results to show. +
+ Create \ No newline at end of file diff --git a/app/plugins/bookmarks/views/bookmarks/listPage.html b/app/plugins/bookmarks/views/bookmarks/listPage.html new file mode 100644 index 0000000..f975b06 --- /dev/null +++ b/app/plugins/bookmarks/views/bookmarks/listPage.html @@ -0,0 +1,8 @@ + + +
+
+ Bookmark List + {bookmarksList} +
+
diff --git a/app/plugins/bookmarks/views/bookmarks/view.html b/app/plugins/bookmarks/views/bookmarks/view.html index 48f080d..cb73a7f 100644 --- a/app/plugins/bookmarks/views/bookmarks/view.html +++ b/app/plugins/bookmarks/views/bookmarks/view.html @@ -1,84 +1,120 @@ -{BookmarkBreadCrumbs}
-
-
-
-
-

Bookmark

-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Title{title}
URL{url}
Type{linkType}
Privacy{privacy}
Color{color}
Description
{description}
Icon
{iconHtml}
{icon}
Meta
{meta}
Created{DTC}{createdAt}{/DTC}
Archived{DTC}{archivedAt}{/DTC}
Hidden{DTC}{hiddenAt}{/DTC}
Last Refreshed{DTC}{refreshedAt}{/DTC}
+ + + + + + + + + + + + + + + + +
+
+
+
+ +
+

Bookmark

+
+ + +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Title:{title}
URL:{url}
Type:{linkType}
Privacy:{privacy}
Color:{color}
Created:{DTC}{createdAt}{/DTC}
Archived:{DTC}{archivedAt}{/DTC}
Hidden:{DTC}{hiddenAt}{/DTC}
Last Refreshed:{DTC}{refreshedAt}{/DTC}
Description
{description}
Icon
{iconHtml}
{icon}
Meta
{meta}
+
-
-
- {refreshBtn} - {hideBtn} - {archiveBtn} - - + + +
+ {refreshBtn} + {hideBtn} + {archiveBtn} + + Edit + + + Delete + +
-
-
\ No newline at end of file +
+
+ + + + + + + + diff --git a/app/plugins/bookmarks/views/dash.html b/app/plugins/bookmarks/views/dash.html index ddcc41b..392423f 100644 --- a/app/plugins/bookmarks/views/dash.html +++ b/app/plugins/bookmarks/views/dash.html @@ -1,15 +1,17 @@
-
- Unsorted Bookmarks +
+ Unsorted Bookmarks {bookmarksList}
-
- Folders List +
+ Folders List {foldersList}
-Folders
- {folderPanels} +
+ Bookmarks + {folderPanels} +
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/folders/create.html b/app/plugins/bookmarks/views/folders/create.html index e87a638..9372d2e 100644 --- a/app/plugins/bookmarks/views/folders/create.html +++ b/app/plugins/bookmarks/views/folders/create.html @@ -1,38 +1,41 @@ -Create Folder -
- -
- -
- + +

Create Folder

+
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
- {folderSelect} -
- -
- + {folderSelect} +
+ +
+ +
-
-
- -
- {colorSelect} +
+ +
+ {colorSelect} +
-
-
- -
- + + + + + +
+
-
+ \ No newline at end of file diff --git a/app/plugins/bookmarks/views/folders/edit.html b/app/plugins/bookmarks/views/folders/edit.html index 4cc6736..fcf1fd0 100644 --- a/app/plugins/bookmarks/views/folders/edit.html +++ b/app/plugins/bookmarks/views/folders/edit.html @@ -1,38 +1,43 @@ -Edit Folder -
- -
- -
- + + + +

Edit Folder

+
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
- {folderSelect} -
- -
- + {folderSelect} +
+ +
+ +
-
-
- -
- {colorSelect} +
+ +
+ {colorSelect} +
-
-
- -
- + + + + + +
+
-
+ \ No newline at end of file diff --git a/app/plugins/bookmarks/views/folders/list.html b/app/plugins/bookmarks/views/folders/list.html index 2961af9..e5df19a 100644 --- a/app/plugins/bookmarks/views/folders/list.html +++ b/app/plugins/bookmarks/views/folders/list.html @@ -1,33 +1,33 @@ - - - - - - - - - - - - - {LOOP} - - - - - - - - - {/LOOP} - {ALT} - - - - {/ALT} - -
TitlePrivacyDescription
{title}{privacy}{description}
- No results to show. -
-Create \ No newline at end of file + + + + + + + + + + + + + {LOOP} + + + + + + + + + {/LOOP} + {ALT} + + + + {/ALT} + +
TitlePrivacyDescription
{title}{privacy}{description}
+ No results to show. +
+ Create \ No newline at end of file diff --git a/app/plugins/bookmarks/views/folders/listPage.html b/app/plugins/bookmarks/views/folders/listPage.html new file mode 100644 index 0000000..e4f4a70 --- /dev/null +++ b/app/plugins/bookmarks/views/folders/listPage.html @@ -0,0 +1,7 @@ + +
+
+ Folders List + {foldersList} +
+
diff --git a/app/plugins/bookmarks/views/folders/view.html b/app/plugins/bookmarks/views/folders/view.html index e337328..ee0fae0 100644 --- a/app/plugins/bookmarks/views/folders/view.html +++ b/app/plugins/bookmarks/views/folders/view.html @@ -1,47 +1,79 @@ -{BookmarkBreadCrumbs}
-
-
-
-
-

Bookmark Folder

-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Title{title}
Privacy{privacy}
Color{color}
Description
{description}
Created{DTC}{createdAt}{/DTC}
+ + + + + + + + + + +
+
+
+
+ +
+

Bookmark Folder

+
+ + +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Title:{title}
Privacy:{privacy}
Color:{color}
Created:{DTC}{createdAt}{/DTC}
Description
{description}
+
-
-
- - - + + +
+ + Bookmarks + + + Edit + + + Delete + +
-
-
\ No newline at end of file +
+
+ + + + + + + + diff --git a/app/plugins/bookmarks/views/import.html b/app/plugins/bookmarks/views/import.html index 62758cb..ec0c98d 100644 --- a/app/plugins/bookmarks/views/import.html +++ b/app/plugins/bookmarks/views/import.html @@ -1,16 +1,18 @@ -Import Bookmarks -
-
- -
- +
+ Import Bookmarks + +
+ +
+ +
-
- -
- -
- + +
+ +
+ +
-
- \ No newline at end of file + +
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/nav/folderTabs.html b/app/plugins/bookmarks/views/nav/folderTabs.html index f3549ba..20d76c2 100644 --- a/app/plugins/bookmarks/views/nav/folderTabs.html +++ b/app/plugins/bookmarks/views/nav/folderTabs.html @@ -1,6 +1,6 @@ -
    -
  • Dashboard
    • -
  • Folders
    • -
  • Import
    • + {userFolderTabs} \ No newline at end of file diff --git a/app/plugins/bookmarks/views/nav/userFolderTabs.html b/app/plugins/bookmarks/views/nav/userFolderTabs.html index b033176..f272735 100644 --- a/app/plugins/bookmarks/views/nav/userFolderTabs.html +++ b/app/plugins/bookmarks/views/nav/userFolderTabs.html @@ -1,9 +1,9 @@ -
      -
    • All
      • + \ No newline at end of file diff --git a/app/plugins/members/controllers/api/stripe.php b/app/plugins/members/controllers/api/stripe.php index 3bf3ce9..392e4c2 100644 --- a/app/plugins/members/controllers/api/stripe.php +++ b/app/plugins/members/controllers/api/stripe.php @@ -14,7 +14,7 @@ namespace TheTempusProject\Controllers\Api; use Stripe\StripeClient; use Stripe\Event; use TheTempusProject\Models\User; -use TheTempusProject\Controllers\ApiController; +use TheTempusProject\Classes\ApiController; use TheTempusProject\Houdini\Classes\Views; use TheTempusProject\Bedrock\Classes\Config; use TheTempusProject\Canary\Bin\Canary as Debug; @@ -178,7 +178,7 @@ class Stripe extends ApiController { $response = 'UnexpectedValueException'; } catch(\Exception $e) { Debug::error( 'Exception' ); - Debug::v( $e ); + Debug::error( $e ); http_response_code(400); $responseType = 'error'; $response = 'Exception'; diff --git a/app/plugins/members/controllers/member.php b/app/plugins/members/controllers/member.php index 1d46a11..462c2e0 100644 --- a/app/plugins/members/controllers/member.php +++ b/app/plugins/members/controllers/member.php @@ -27,6 +27,9 @@ use TheTempusProject\Hermes\Functions\Route as Routes; use TheTempusProject\Houdini\Classes\Navigation; use TheTempusProject\Models\Memberships; use TheTempusProject\Houdini\Classes\Components; +use TheTempusProject\Classes\Forms; +use TheTempusProject\Bedrock\Functions\Hash; +use TheTempusProject\Canary\Bin\Canary as Debug; class Member extends Controller { public static $customers; @@ -61,10 +64,17 @@ class Member extends Controller { Session::flash( 'error', 'You do not have any active payment methods. You can subscribe by going here' ); return Redirect::to( 'member/manage' ); } - $session = $stripe->billingPortal->sessions->create([ - 'customer' => $customer, - 'return_url' => Routes::getAddress() . 'member/manage', - ]); + try { + $session = $stripe->billingPortal->sessions->create([ + 'customer' => $customer, + 'return_url' => Routes::getAddress() . 'member/manage', + ]); + } catch (\Stripe\Exception\InvalidRequestException $e) { + Debug::error('Membership -> ManagePayment - Stripe not configured correctly'); + Debug::error( $e ); + Session::flash( 'error', 'There was an issue redirecting you to Stripe, please try again.' ); + return Redirect::to( 'member/manage' ); + } @@ -146,16 +156,6 @@ class Member extends Controller { } Views::view( 'members.landing1', $product ); } - - public function signup( $id = null ) { - self::$title = 'Sign-up for {SIITENAME}!'; - $product = self::$products->findById( $id ); - if ( empty( $product ) ) { - Session::flash( 'success', 'We aren\'t currently accepting new members, please check back soon!' ); - return Redirect::home(); - } - Views::view( 'members.landing2', $product ); - } public function getyearly( $id = null ) { if ( empty( $id ) ) { @@ -236,4 +236,82 @@ class Member extends Controller { self::$title = '(almost) Members Area'; Views::view( 'members.paymentcomplete' ); } + + + + + + + + public function signup( $plan = 'monthly' ) { + $plan = strtolower( $plan ); + if ( ! in_array( $plan, ['monthly','yearly'] ) ) { + Session::flash( 'error', 'Unknown plan' ); + return Redirect::to( 'home/index' ); + } + + $product = self::$products->mainProduct(); + if ( empty( $product ) ) { + Session::flash( 'error', 'Unknown product' ); + return Redirect::to( 'home/index' ); + } + + $index = 'stripe_price_' . $plan; + $pretty = 'prettyPrice' . ucfirst( $plan ); + + $stripePrice = $product->$index; + $prettyPrice = $product->$pretty; + + self::$title = 'Sign up for {SITENAME} ' . ucfirst( $plan ); + + Components::set( 'planName', ucfirst( $plan ) ); + Components::set( 'prettyPrice', $prettyPrice ); + Components::set( 'TERMS', Views::simpleView( 'terms' ) ); + if ( App::$isLoggedIn ) { + Session::flash( 'notice', 'You are already logged in, were you looking for information on Upgrading?' ); + return Redirect::to( 'home/index' ); + } + if ( !Input::exists() ) { + return Views::view( 'members.register' ); + } + if ( ! Forms::check( 'register' ) ) { + Issues::add( 'error', [ 'There was an error with your registration.' => Check::userErrors() ] ); + return Views::view( 'members.register' ); + } + self::$user->create( [ + 'username' => Input::post( 'username' ), + 'password' => Hash::make( Input::post( 'password' ) ), + 'email' => Input::post( 'email' ), + 'terms' => 1, + ] ); + + if ( !self::$user->logIn( Input::post( 'username' ), Input::post( 'password' ), Input::post( 'remember' ) ) ) { + Session::flash( 'error', 'Thank you for registering! Unfortunately, there was an issue logging you in, please log in and order again.' ); + return Redirect::to( 'home/index' ); + } + + $user = self::$user->authorize( Input::post( 'username' ), Input::post( 'password' ) ); + + $customer = self::$customers->findOrCreate( $user->ID ); + if ( empty( $customer ) ) { + Session::flash( 'error', 'Thank you for registering! Unfortunately, there was an issue communicating with Stripe and we can\'t collect payment right now.' ); + return Redirect::to( 'home/index' ); + } + + $api_key = Config::getValue( 'memberships/stripeSecret' ); + $stripe = new \Stripe\StripeClient( $api_key ); + $session = $stripe->checkout->sessions->create([ + 'payment_method_types' => ['card'], + 'customer' => $customer, + 'line_items' => [[ + 'price' => $stripePrice, + 'quantity' => 1, + ]], + 'mode' => 'subscription', + 'success_url' => Routes::getAddress() . 'member/paymentcomplete?session_id={CHECKOUT_SESSION_ID}', + 'cancel_url' => Routes::getAddress() . 'member/paymentcanceled', + ]); + header('Location: ' . $session->url); + exit; + } } \ No newline at end of file diff --git a/app/plugins/members/models/membership_products.php b/app/plugins/members/models/membership_products.php index b0e5f86..076467c 100644 --- a/app/plugins/members/models/membership_products.php +++ b/app/plugins/members/models/membership_products.php @@ -36,9 +36,6 @@ class MembershipProducts extends DatabaseModel { public function __construct() { parent::__construct(); - - - if ( ! self::$loaded ) { $api_key = Config::getValue( 'memberships/stripeSecret' ); if ( $api_key == 'sk_xxxxxxxxxxxxxxx' || empty($api_key) ) { @@ -48,8 +45,6 @@ class MembershipProducts extends DatabaseModel { } self::$loaded = true; } - - } public function create( $name, $description, $monthly_price, $yearly_price ) { @@ -88,12 +83,14 @@ class MembershipProducts extends DatabaseModel { ]); return $product; } + public function createStripePrices( $product, $monthly_price, $yearly_price ) { $out = []; $out['monthly'] = $this->createStripeMonthlyPrice( $product, $monthly_price ); $out['yearly'] = $this->createStripeYearlyPrice( $product, $yearly_price ); return $out; } + public function createStripeMonthlyPrice( $product, $monthly_price ) { if ( empty( self::$stripe ) ) { return false; @@ -106,6 +103,7 @@ class MembershipProducts extends DatabaseModel { 'lookup_key' => 'membership-monthly', ]); } + public function createStripeYearlyPrice( $product, $yearly_price ) { if ( empty( self::$stripe ) ) { return false; @@ -173,6 +171,7 @@ class MembershipProducts extends DatabaseModel { ); return $this->createStripeYearlyPrice( $product, $yearly_price ); } + public function updateStripeMonthlyPrice( $product, $monthly_price ) { $stripe->prices->update( $monthly->id, @@ -206,10 +205,18 @@ class MembershipProducts extends DatabaseModel { public function findByPriceID( $d ) { $data = self::$db->get( $this->tableName, [ 'stripe_price_monthly', '=', $d, 'OR', 'stripe_price_yearly', '=', $d ] ); - if ( ! $data->count() ) { return false; } return $data->first(); } + + public function mainProduct() { + $data = self::$db->get( $this->tableName, '*' ); + if ( ! $data->count() ) { + return false; + } + + return $this->filter( $data->first() ); + } } \ No newline at end of file diff --git a/app/plugins/members/views/manage.html b/app/plugins/members/views/manage.html index 98c7663..11af213 100644 --- a/app/plugins/members/views/manage.html +++ b/app/plugins/members/views/manage.html @@ -2,7 +2,7 @@
      Memberships - +
      diff --git a/app/plugins/members/views/register.html b/app/plugins/members/views/register.html new file mode 100644 index 0000000..9bdd1cf --- /dev/null +++ b/app/plugins/members/views/register.html @@ -0,0 +1,69 @@ + +

      Create an Account

      +

      After registration is complete, you will be redirected to Stripe to handle payment.

      +

      + You have selected the {planName} plan at {prettyPrice}. +

      +
      + +
      + +
      + +
      +
      + + +
      + +
      + +
      +
      + + +
      + +
      + +
      +
      + + +
      + +
      + +
      +
      + + +
      + +
      + +
      +
      + + +
      +
      + + +
      +
      + {TERMS} +
      +
      + + + + + +
      + +
      +
      + diff --git a/app/views/index.html b/app/views/index.html index a395b9b..efc107b 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -96,7 +96,7 @@

      Not everyone is a night owl or dark dweller, and those people are... fine. But for the rest of us, dark mode rules them all. Dark mode is available site-wide, free of charge! (Its also included in all products!)

      - +
      @@ -321,7 +321,9 @@
    • Direct control of Feature Development
    • Early Access to new features
      • - + + Get started + @@ -335,7 +337,9 @@
      • Its cheaper if you like the product
      - + + Get started +
      Name