diff --git a/app/plugins/bookmarks/controllers/extensions.php b/app/plugins/bookmarks/controllers/extensions.php index 811ab3e..bac707b 100644 --- a/app/plugins/bookmarks/controllers/extensions.php +++ b/app/plugins/bookmarks/controllers/extensions.php @@ -27,7 +27,7 @@ class Extensions extends Controller { public function mobile() { self::$title = 'Mobile Bookmarklet'; - if ( App::$isLoggedIn ) { + if ( ! App::$isLoggedIn ) { return Issues::add( 'error', 'Unfortunately you will need to sign in to generate the bookmarklet unique to your account.' ); } Views::view( 'bookmarks.extensions.bookmarklet' ); diff --git a/app/plugins/bookmarks/views/bookmarks/unsorted.html b/app/plugins/bookmarks/views/bookmarks/unsorted.html index 3fcbf90..d55f2da 100644 --- a/app/plugins/bookmarks/views/bookmarks/unsorted.html +++ b/app/plugins/bookmarks/views/bookmarks/unsorted.html @@ -23,7 +23,7 @@ {privacy} - + @@ -38,7 +38,7 @@
- Add + Add
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/components/shareListPanel.html b/app/plugins/bookmarks/views/components/shareListPanel.html index a9b1fbc..3086a65 100644 --- a/app/plugins/bookmarks/views/components/shareListPanel.html +++ b/app/plugins/bookmarks/views/components/shareListPanel.html @@ -9,7 +9,7 @@ {privacyBadge} {title} - + @@ -39,8 +39,8 @@
- - + +
diff --git a/app/plugins/bookmarks/views/dashboards/list.html b/app/plugins/bookmarks/views/dashboards/list.html index 3197939..95b2a50 100644 --- a/app/plugins/bookmarks/views/dashboards/list.html +++ b/app/plugins/bookmarks/views/dashboards/list.html @@ -22,7 +22,7 @@ {title} {description} - + @@ -37,7 +37,7 @@
- Create + Create
diff --git a/app/plugins/bookmarks/views/export.html b/app/plugins/bookmarks/views/export.html index 55941f6..6f8d3f8 100644 --- a/app/plugins/bookmarks/views/export.html +++ b/app/plugins/bookmarks/views/export.html @@ -41,7 +41,7 @@

Literally every browser is chromium based now, so they all have a standard import/export.

- +
diff --git a/app/plugins/bookmarks/views/folders/list.html b/app/plugins/bookmarks/views/folders/list.html index cc2afad..e9cbe11 100644 --- a/app/plugins/bookmarks/views/folders/list.html +++ b/app/plugins/bookmarks/views/folders/list.html @@ -14,7 +14,7 @@ {prettyPrivacy} {description} - + diff --git a/app/plugins/bookmarks/views/folders/view.html b/app/plugins/bookmarks/views/folders/view.html index 4094cfa..2ac4fc8 100644 --- a/app/plugins/bookmarks/views/folders/view.html +++ b/app/plugins/bookmarks/views/folders/view.html @@ -45,7 +45,7 @@
- + Bookmarks diff --git a/app/plugins/bookmarks/views/import.html b/app/plugins/bookmarks/views/import.html index 404c1b2..3d46a97 100644 --- a/app/plugins/bookmarks/views/import.html +++ b/app/plugins/bookmarks/views/import.html @@ -8,7 +8,7 @@
- +
diff --git a/app/plugins/members/controllers/member.php b/app/plugins/members/controllers/member.php index 21b6143..f89858a 100644 --- a/app/plugins/members/controllers/member.php +++ b/app/plugins/members/controllers/member.php @@ -61,7 +61,7 @@ class Member extends Controller { Views::view( 'members.members' ); } - public function managepayment( $id = null ) { + public function managepayment() { $this->confirmAuth(); $customer = self::$customers->findByUserID( App::$activeUser->ID ); if ( empty( $customer ) ) { @@ -85,7 +85,7 @@ class Member extends Controller { } public function cancelconfirm( $id = null ) { - $this->confirmAuth(); + $this->confirmAuth( $id ); $memberships = new Memberships; $result = $memberships->cancel( $id ); if ( ! empty( $result ) ) { @@ -98,7 +98,7 @@ class Member extends Controller { } public function pauseconfirm( $id = null ) { - $this->confirmAuth(); + $this->confirmAuth( $id ); $memberships = new Memberships; $result = $memberships->cancel( $id ); if ( ! empty( $result ) ) { @@ -111,26 +111,26 @@ class Member extends Controller { } public function pause( $id = null ) { - $this->confirmAuth(); + $this->confirmAuth( $id ); self::$title = 'pause Membership'; Components::set( 'pauseid', $id ); Views::view( 'members.pause' ); } public function resume( $id = null ) { - $this->confirmAuth(); + $this->confirmAuth( $id ); self::$title = 'resume Membership'; Views::view( 'members.resume' ); } public function cancel( $id = null ) { - $this->confirmAuth(); + $this->confirmAuth( $id ); self::$title = 'Cancel Membership'; Components::set( 'cancelid', $id ); Views::view( 'members.cancel' ); } - public function manage( $id = null ) { + public function manage() { if ( ! App::$isLoggedIn ) { Session::flash( 'error', 'You do not have permission to access this page.' ); return Redirect::home(); @@ -145,11 +145,12 @@ class Member extends Controller { Views::view( 'members.manage', $userMemberships ); } - public function upgrade( $id = null ) { + public function upgrade() { if ( ! App::$isLoggedIn ) { Session::flash( 'error', 'You do not have permission to access this page.' ); return Redirect::home(); } + // need to check if the plan CAN be upgraded self::$title = 'Upgrade Membership'; Views::view( 'members.upgrade' ); } @@ -165,7 +166,7 @@ class Member extends Controller { return Redirect::to( 'home/index' ); } - self::$title = 'Join {SIITENAME}!'; + self::$title = 'Join {SITENAME}!'; $stripePrice = $this->findPrice( $plan ); $product = self::$products->findByPriceID( $stripePrice ); diff --git a/app/plugins/members/plugin.php b/app/plugins/members/plugin.php index 48f3bca..3e0a658 100644 --- a/app/plugins/members/plugin.php +++ b/app/plugins/members/plugin.php @@ -61,11 +61,11 @@ class Members extends Plugin { ], ]; public $main_links = [ - // [ - // 'text' => 'Members', - // 'url' => '{ROOT_URL}member/index', - // 'filter' => 'member', - // ], + [ + 'text' => 'My Membership', + 'url' => '{ROOT_URL}member/index', + 'filter' => 'member', + ], [ 'text' => 'Subscribe', 'url' => '{ROOT_URL}member/join', diff --git a/app/plugins/members/views/landing1.html b/app/plugins/members/views/landing1.html index 21cb598..cdda656 100644 --- a/app/plugins/members/views/landing1.html +++ b/app/plugins/members/views/landing1.html @@ -1,3 +1,4 @@ +

Compare plans

@@ -6,60 +7,64 @@ Free - Pro - Enterprise + Monthly + Yearly Add and Manage Bookmarks - - + + Extensions for all major browsers - - + + - - Access from any device + + + + + Share bookmarks abd folders - + + Import/Export Features - - + + Customizable Dashboards / Pages - - + + Request/Influence Development - - + + Early Access - - + + Cheaper - + @@ -81,8 +86,9 @@
  • Add / Manage your bookmarks
  • Extensions for all major browsers
  • Access from any device
    • +
  • Share access with anyone
    • -     + Sign-Up for Free
    @@ -102,15 +108,15 @@
  • Direct control of Feature Development
  • Early Access to new features
    • - + Get started
    -
    -
    +
    +

    Yearly

    @@ -118,7 +124,7 @@
    • Its cheaper if you like the product
    - + Get started
    diff --git a/app/plugins/members/views/landing2.html b/app/plugins/members/views/landing2.html deleted file mode 100644 index 4854f99..0000000 --- a/app/plugins/members/views/landing2.html +++ /dev/null @@ -1,38 +0,0 @@ -
    -

    Why Choose Us?

    -
    -
    -

    Free Version

    -

    Basic storage for all your bookmarks, forever free.

    -
    -
    -

    Pro Features

    -

    Unlock powerful import/export and advanced organization.

    -
    -
    -
    -
    -

    Affordable Plans

    -
    -
    -
    -
    {name} Monthly Plan
    -
    -

    {prettyPriceMonthly}/month

    -

    All pro features unlocked

    - Get Started -
    -
    -
    -
    -
    -
    {name} Yearly Plan
    -
    -

    {prettyPriceYearly}/year

    -

    Save {prettySavings} annually!

    - Sign Up -
    -
    -
    -
    -
    \ No newline at end of file diff --git a/app/plugins/members/views/members.html b/app/plugins/members/views/members.html index f415a07..c4d262a 100644 --- a/app/plugins/members/views/members.html +++ b/app/plugins/members/views/members.html @@ -1,6 +1,17 @@ -

    Members' Area

    -
    -

    Welcome!

    -

    This is the members section. You can give some groups permission to access these areas. the menu is hidden for normal users and if they get a link to a member's area, the authentication system will stop them from accessing any content protected this way.

    -

    You can even use this feature in-line with your views, hiding certain components from non-members

    +
    +

    Membership Benefits

    +

    + First, let me say thank you for choosing to become a member! There are several great benefits exclusively for members. +

    +

    + In addition to extra features for bookmark management like dashboards and import/export, you gain access to influence development. Suggestions gives users a direct way to make suggestions to me personally. By default, suggestions are not public, but I can comment on them to let you know what I think. + All respectful and reasonable suggestions go up for the entire community to see and comment on. There iis going to be a loyalty points system in the future to allow you to accrue points and use the points to vote for suggestions and features they like. But that's for another time. +

    +

    + Right now, this entire system was built and managed by myself. I have used my own version of this for years, but translating it to a publicly available product is not a 1-to-1 job. There may be bugs or issues encountered while you use the product. I can't guarantee a fix for every need in every case immediately, but I do actively keep track of bugs and work hard to ensure everyone has a great experience using the app. +

    +
    + {loggedin}Report a Bug{/loggedin} + Contact Us +
    \ No newline at end of file diff --git a/app/plugins/suggestions/views/list.html b/app/plugins/suggestions/views/list.html index 7e7d8ba..9b138f7 100644 --- a/app/plugins/suggestions/views/list.html +++ b/app/plugins/suggestions/views/list.html @@ -2,7 +2,7 @@ Suggestions
    {LOOP} -
    +

    {title}

    {suggestion} diff --git a/app/plugins/wip/views/wip.html b/app/plugins/wip/views/wip.html index 5ec0ebd..551f054 100644 --- a/app/plugins/wip/views/wip.html +++ b/app/plugins/wip/views/wip.html @@ -1,17 +1,20 @@ -
    +

    Work in Progress

    {LOOP}

    {title}

    -

    Started: {prettyStart}

    -
    + Started: {prettyStart} +
    -
    +
    {description}
    +
    +
    +
    {/LOOP} {ALT}
    diff --git a/app/views/faq.html b/app/views/faq.html index 72063a5..05483e6 100644 --- a/app/views/faq.html +++ b/app/views/faq.html @@ -1,65 +1,65 @@ -
    +

    Frequently Asked Questions

    -

    Table of Contents

    +

    Table of Contents

    -

    -

    -
    - Yes, this works seamlessly on mobile devices. +
    + Yes, this works seamlessly on mobile devices.
    -

    -

    -
    - Yes, it is compatible with Mac, PC, and Linux platforms. +
    + Yes, it is compatible with Mac, PC, and Linux platforms.
    -

    -

    -
    - To use the extension on mobile, open your browser, install the extension, and follow the setup instructions. +
    + To use the extension on mobile, open your browser, install the extension, and follow the setup instructions.
    -

    -

    -
    - You can add it to your phone by installing the app or creating a shortcut from your browser to your home screen. +
    + You can add it to your phone by installing the app or creating a shortcut from your browser to your home screen.
    diff --git a/app/views/footer/social.html b/app/views/footer/social.html index a833fde..ae6ddac 100644 --- a/app/views/footer/social.html +++ b/app/views/footer/social.html @@ -1,26 +1,26 @@
    • - +
    • - +
    • - +
    • - +
    • - +
      • diff --git a/app/views/index.html b/app/views/index.html index 00aad6b..cc73ddc 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -223,8 +223,8 @@ Free - Pro - Enterprise + Monthly + Yearly diff --git a/images/icon.svg b/images/icon.svg deleted file mode 100644 index 6067dab..0000000 --- a/images/icon.svg +++ /dev/null @@ -1,509 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -