diff --git a/app/controllers/home.php b/app/controllers/home.php index 447b925..a988f60 100644 --- a/app/controllers/home.php +++ b/app/controllers/home.php @@ -28,6 +28,9 @@ class Home extends Controller { public function index() { self::$title = '{SITENAME}'; self::$pageDescription = 'AllTheBookmarks.com is here to provide you a better, faster, and easier way - to manage bookmarks across multiple browser and multiple devices seamlessly.'; + if ( App::$isLoggedIn ) { + return Views::view( 'bookmarks.introduction' ); + } Views::view( 'index' ); } diff --git a/app/plugins/bookmarks/controllers/bookmarks.php b/app/plugins/bookmarks/controllers/bookmarks.php index 7ebf81a..c69718f 100644 --- a/app/plugins/bookmarks/controllers/bookmarks.php +++ b/app/plugins/bookmarks/controllers/bookmarks.php @@ -2,7 +2,7 @@ /** * app/plugins/bookmarks/controllers/bookmarks.php * - * This is the bug reports controller. + * This is the bookmarks controller. * * @package TP Bookmarks * @version 3.0 @@ -70,22 +70,6 @@ class Bookmarks extends Controller { $this->setPrefToggles(); } - public function tutorials( $browser = '', $tutorial = '' ) { - self::$title = 'Tutorials - {SITENAME}'; - if ( empty( $browser ) && empty( $tutorial ) ) { - return Views::view( 'bookmarks.tutorials.list' ); - } - if ( ! in_array( $browser, ['chrome','brave','firefox','edge','safari','opera'] ) ) { - Issues::add( 'error', 'Unknown browser' ); - return Views::view( 'bookmarks.tutorials.list' ); - } - if ( ! in_array( $tutorial, ['pin','settings','import','export'] ) ) { - Issues::add( 'error', 'Unknown tutorial' ); - return Views::view( 'bookmarks.tutorials.list' ); - } - return Views::view( 'bookmarks.tutorials.' . $browser . '.' . $tutorial ); - } - public function index() { self::$title = 'Manage Bookmarks - {SITENAME}'; if ( Input::exists('submit') ) { @@ -936,7 +920,7 @@ class Bookmarks extends Controller { $out .= '
'; $out .= ''; $out .= '
'; - $out .= ''; if ( isset( $options[0] ) ) { $assocOptions = []; foreach ( $options as $key => $value ) { diff --git a/app/plugins/bookmarks/controllers/tutorials.php b/app/plugins/bookmarks/controllers/tutorials.php new file mode 100644 index 0000000..5931c88 --- /dev/null +++ b/app/plugins/bookmarks/controllers/tutorials.php @@ -0,0 +1,103 @@ + + * @link https://TheTempusProject.com + * @license https://opensource.org/licenses/MIT [MIT LICENSE] + */ +namespace TheTempusProject\Controllers; + +use TheTempusProject\Houdini\Classes\Issues; +use TheTempusProject\Houdini\Classes\Views; +use TheTempusProject\Classes\Controller; +use TheTempusProject\Houdini\Classes\Navigation; +use TheTempusProject\Houdini\Classes\Components; +use TheTempusProject\Bedrock\Functions\Input; + +class Tutorials extends Controller { + public function __construct() { + parent::__construct(); + self::$title = 'Tutorials - {SITENAME}'; + self::$pageDescription = 'We have detailed walkthroughs on how to perform a number of tasks for every major browser.'; + } + + public function index( $browser = '', $tutorial = '' ) { + return Views::view( 'bookmarks.tutorials.list' ); + } + + public function brave( $tutorial = '' ) { + Navigation::setCrumbComponent( 'tutorialCrumbs', Input::get( 'url' ) ); + + if ( ! in_array( $tutorial, ['pin','settings','import','export'] ) ) { + $test = new \stdClass(); + $test->pretty = 'Brave'; + $test->printed = 'brave'; + return Views::view( 'bookmarks.tutorials.card', [ $test ] ); + } + return Views::view( 'bookmarks.tutorials.brave.' . $tutorial ); + } + + public function chrome( $tutorial = '' ) { + Navigation::setCrumbComponent( 'tutorialCrumbs', Input::get( 'url' ) ); + + if ( ! in_array( $tutorial, ['pin','settings','import','export'] ) ) { + $test = new \stdClass(); + $test->pretty = 'Chrome'; + $test->printed = 'chrome'; + return Views::view( 'bookmarks.tutorials.card', [ $test ] ); + } + + return Views::view( 'bookmarks.tutorials.chrome.' . $tutorial ); + } + + public function edge( $tutorial = '' ) { + Navigation::setCrumbComponent( 'tutorialCrumbs', Input::get( 'url' ) ); + + if ( ! in_array( $tutorial, ['pin','settings','import','export'] ) ) { + $test = new \stdClass(); + $test->pretty = 'Edge'; + $test->printed = 'edge'; + return Views::view( 'bookmarks.tutorials.card', [ $test ] ); + } + return Views::view( 'bookmarks.tutorials.edge.' . $tutorial ); + } + + public function opera( $tutorial = '' ) { + Navigation::setCrumbComponent( 'tutorialCrumbs', Input::get( 'url' ) ); + + if ( ! in_array( $tutorial, ['pin','settings','import','export'] ) ) { + $test = new \stdClass(); + $test->pretty = 'Opera'; + $test->printed = 'opera'; + return Views::view( 'bookmarks.tutorials.card', [ $test ] ); + } + return Views::view( 'bookmarks.tutorials.opera.' . $tutorial ); + } + + public function firefox( $tutorial = '' ) { + Navigation::setCrumbComponent( 'tutorialCrumbs', Input::get( 'url' ) ); + + if ( ! in_array( $tutorial, ['pin','settings','import','export'] ) ) { + $test = new \stdClass(); + $test->pretty = 'Firefox'; + $test->printed = 'firefox'; + return Views::view( 'bookmarks.tutorials.card', [ $test ] ); + } + return Views::view( 'bookmarks.tutorials.firefox.' . $tutorial ); + } + + public function safari( $tutorial = '' ) { + Issues::add( 'notice', 'Safari is not supported at this time.' ); + return; + if ( ! in_array( $tutorial, ['pin','settings','import','export'] ) ) { + Issues::add( 'notice', 'Unknown tutorial' ); + return Views::view( 'bookmarks.tutorials.list' ); + } + return Views::view( 'bookmarks.tutorials.safari.' . $tutorial ); + } +} \ No newline at end of file diff --git a/app/plugins/bookmarks/plugin.php b/app/plugins/bookmarks/plugin.php index 9dc4886..a8b9aa2 100644 --- a/app/plugins/bookmarks/plugin.php +++ b/app/plugins/bookmarks/plugin.php @@ -46,7 +46,7 @@ class Bookmarks extends Plugin { ], [ 'text' => 'Tutorials', - 'url' => '{ROOT_URL}bookmarks/tutorials', + 'url' => '{ROOT_URL}tutorials', 'filter' => 'bkmtuts', ], [ @@ -57,7 +57,7 @@ class Bookmarks extends Plugin { public $info_footer_links = [ [ 'text' => 'Tutorials', - 'url' => '{ROOT_URL}bookmarks/tutorials', + 'url' => '{ROOT_URL}tutorials', ], ]; public $configMatrix = [ diff --git a/app/plugins/bookmarks/views/bookmarks/create.html b/app/plugins/bookmarks/views/bookmarks/create.html index bfb7936..8d99ad7 100644 --- a/app/plugins/bookmarks/views/bookmarks/create.html +++ b/app/plugins/bookmarks/views/bookmarks/create.html @@ -30,7 +30,7 @@
- diff --git a/app/plugins/bookmarks/views/bookmarks/list.html b/app/plugins/bookmarks/views/bookmarks/list.html index cfbe678..fa55915 100644 --- a/app/plugins/bookmarks/views/bookmarks/list.html +++ b/app/plugins/bookmarks/views/bookmarks/list.html @@ -12,7 +12,7 @@ {LOOP} - + {title} diff --git a/app/plugins/bookmarks/views/bookmarks/unsorted.html b/app/plugins/bookmarks/views/bookmarks/unsorted.html index 4f01789..952ce0b 100644 --- a/app/plugins/bookmarks/views/bookmarks/unsorted.html +++ b/app/plugins/bookmarks/views/bookmarks/unsorted.html @@ -7,6 +7,9 @@ When you add bookmarks without a folder, they will be considered "Unsorted". There is nothing wrong with these bookmarks, but much of the application relies on folder for organizing and displaying bookmarks. You may find that these bookmarks do not regularly appear in other sections of the application.

+

+ This explanation and others like it can be hidden in your Profile Settings. +

{/BKMTUTS} @@ -23,7 +26,7 @@ {LOOP} diff --git a/app/plugins/bookmarks/views/dash.html b/app/plugins/bookmarks/views/dash.html index a3d40d3..308a7ee 100644 --- a/app/plugins/bookmarks/views/dash.html +++ b/app/plugins/bookmarks/views/dash.html @@ -11,6 +11,9 @@ Sometimes, there just isn't enough room on the toolbar. Instead of having 6 folders you always use, have 1, short link called "Games" that opens 1 page. I use this to group small sections of my bookmarks together like games. I have PalWorld, WoW, Satisfactory, and Diablo links in a "Games" dashboard. I can just quickly go to that dash, find the folder I need and go.

+

+ This explanation and others like it can be hidden in your Profile Settings. +

{/BKMTUTS} {VIEW_OPTIONS} diff --git a/app/plugins/bookmarks/views/dashboards/list.html b/app/plugins/bookmarks/views/dashboards/list.html index e6db2f7..9d8b3e3 100644 --- a/app/plugins/bookmarks/views/dashboards/list.html +++ b/app/plugins/bookmarks/views/dashboards/list.html @@ -11,6 +11,9 @@ Sometimes, there just isn't enough room on the toolbar. Instead of having 6 folders you always use, have 1, short link called "Games" that opens 1 page. I use this to group small sections of my bookmarks together like games. I have PalWorld, WoW, Satisfactory, and Diablo links in a "Games" dashboard. I can just quickly go to that dash, find the folder I need and go.

+

+ This explanation and others like it can be hidden in your Profile Settings. +

{/BKMTUTS}
diff --git a/app/plugins/bookmarks/views/export.html b/app/plugins/bookmarks/views/export.html index 79c0c48..fb9f18f 100644 --- a/app/plugins/bookmarks/views/export.html +++ b/app/plugins/bookmarks/views/export.html @@ -12,7 +12,10 @@ find your file for download. You take that newly saved file an import it into your browser of choice.

- If you need help importing your bookmarks, we have tutorials available for every major browser that can help. + If you need help importing your bookmarks, we have tutorials available for every major browser that can help. +

+

+ This explanation and others like it can be hidden in your Profile Settings.

{/BKMTUTS} diff --git a/app/plugins/bookmarks/views/exportExplainer.html b/app/plugins/bookmarks/views/exportExplainer.html index 8e033c8..fc332ba 100644 --- a/app/plugins/bookmarks/views/exportExplainer.html +++ b/app/plugins/bookmarks/views/exportExplainer.html @@ -11,7 +11,7 @@ find your file for download. You take that newly saved file an import it into your browser of choice.

- If you need help importing your bookmarks, we have tutorials available for every major browser that can help. + If you need help importing your bookmarks, we have tutorials available for every major browser that can help.

\ 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 44b6426..c785f56 100644 --- a/app/plugins/bookmarks/views/folders/create.html +++ b/app/plugins/bookmarks/views/folders/create.html @@ -22,7 +22,7 @@
- diff --git a/app/plugins/bookmarks/views/folders/listPage.html b/app/plugins/bookmarks/views/folders/listPage.html index 0353abf..cc5dd91 100644 --- a/app/plugins/bookmarks/views/folders/listPage.html +++ b/app/plugins/bookmarks/views/folders/listPage.html @@ -5,6 +5,9 @@

Just like the folders you have in your web browser, you can add, edit, or remove folders for organizing your bookmarks here.

+

+ This explanation and others like it can be hidden in your Profile Settings. +

{/BKMTUTS} {foldersList} diff --git a/app/plugins/bookmarks/views/import.html b/app/plugins/bookmarks/views/import.html index 3d692bd..789e883 100644 --- a/app/plugins/bookmarks/views/import.html +++ b/app/plugins/bookmarks/views/import.html @@ -11,7 +11,10 @@ You will need to browse your computer and select the .html file where you exported your bookmarks from your browser.

- If you need help exporting your bookmarks, we have tutorials available for every major browser that can help. + If you need help exporting your bookmarks, we have tutorials available for every major browser that can help. +

+

+ This explanation and others like it can be hidden in your Profile Settings.

{/BKMTUTS} diff --git a/app/plugins/bookmarks/views/importExplainer.html b/app/plugins/bookmarks/views/importExplainer.html index 5506724..68c4160 100644 --- a/app/plugins/bookmarks/views/importExplainer.html +++ b/app/plugins/bookmarks/views/importExplainer.html @@ -10,7 +10,7 @@ You will need to browse your computer and select the .html file where you exported your bookmarks from your browser.

- If you need help exporting your bookmarks, we have tutorials available for every major browser that can help. + If you need help exporting your bookmarks, we have tutorials available for every major browser that can help.

\ No newline at end of file diff --git a/app/plugins/bookmarks/views/introduction.html b/app/plugins/bookmarks/views/introduction.html index c21ad72..09bfdaf 100644 --- a/app/plugins/bookmarks/views/introduction.html +++ b/app/plugins/bookmarks/views/introduction.html @@ -1,60 +1,58 @@ -
+
-

Welcome to All The Bookmarks

-

Your ultimate tool for organizing, sharing, and managing website bookmarks effortlessly.

- Illustration of bookmark organization - Get Started +

Welcome to All The Bookmarks

+

You've unlocked the ultimate tool for organizing, sharing, and managing all of your bookmarks effortlessly.

+ Illustration of bookmark organization
- +
-
-
- -
Organize Your Bookmarks
-

Create folders to keep your bookmarks tidy and easy to find.

-
-
- -
Share Collections
-

Share dashboards with groups of folders to collaborate seamlessly.

-
-
- -
Import & Export
-

Sync your bookmarks across major browsers with our easy import/export tools.

-
+
+
+ +
Organize Your Bookmarks
+

Create folders to keep your bookmarks tidy and easy to find.

+
+
+ +
Share Collections
+

Share dashboards with groups of folders to collaborate seamlessly.

+
+
+ +
Import & Export
+

Sync your bookmarks across major browsers with our easy import/export tools.

+
- +
-
-
-

Bookmark Anytime, Anywhere

-

Our browser extension works with Chrome, Firefox, Brave, Edge, and Opera, making it simple to save and manage bookmarks directly from your browser.

- Install Extension -
-
- Illustration of browser extensions -
+
+
+

Bookmark Anything; Anytime, Anywhere

+

Our browser extension works with Chrome, Firefox, Brave, Edge, and Opera, making it simple to save and manage bookmarks directly from your browser.

+ Install Extension +
+
+ Illustration of browser extensions +
- +
-
-
- Illustration of dashboards -
-
-

Dynamic Dashboards

-

Group folders into dashboards and share them to keep everyone updated on the latest changes.

- Learn More About Dashboards -
+
+
+ Illustration of dashboards +
+
+

Dynamic Dashboards

+

Group folders into dashboards and share them to keep everyone updated on the latest changes.

+ Learn More About Dashboards +
- +
-
-

Ready to Get Started?

-

Start organizing, sharing, and syncing your bookmarks today!

- Create Your First Folder +
+

Ready to Get Started?

+

Start organizing, sharing, and syncing your bookmarks today!

+ Create Your First Folder
-
- \ No newline at end of file +
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/nav/tutorialCrumbs.html b/app/plugins/bookmarks/views/nav/tutorialCrumbs.html new file mode 100644 index 0000000..e69de29 diff --git a/app/plugins/bookmarks/views/share.html b/app/plugins/bookmarks/views/share.html index d53159c..58dba19 100644 --- a/app/plugins/bookmarks/views/share.html +++ b/app/plugins/bookmarks/views/share.html @@ -10,6 +10,9 @@

Any link or folder can be shared and by default, the extensions and app default to private. These "public" items can be viewed by anyone with the link provided from this page.

+

+ This explanation and others like it can be hidden in your Profile Settings. +

{/BKMTUTS} diff --git a/app/plugins/bookmarks/views/tutorials/brave/export.html b/app/plugins/bookmarks/views/tutorials/brave/export.html index 75e41dd..3536c8f 100644 --- a/app/plugins/bookmarks/views/tutorials/brave/export.html +++ b/app/plugins/bookmarks/views/tutorials/brave/export.html @@ -2,6 +2,7 @@

How to Export bookmarks from Brave

+ {tutorialCrumbs}

Exporting your bookmarks is lightning fast and simple inside of brave. diff --git a/app/plugins/bookmarks/views/tutorials/brave/import.html b/app/plugins/bookmarks/views/tutorials/brave/import.html index 6570a13..9994cf6 100644 --- a/app/plugins/bookmarks/views/tutorials/brave/import.html +++ b/app/plugins/bookmarks/views/tutorials/brave/import.html @@ -2,6 +2,7 @@

How to Import bookmarks in Brave

+ {tutorialCrumbs}

Importing your bookmarks from AllTheBookmarks is lightning fast and simple inside of brave. diff --git a/app/plugins/bookmarks/views/tutorials/brave/pin.html b/app/plugins/bookmarks/views/tutorials/brave/pin.html index c0d22cf..5af950d 100644 --- a/app/plugins/bookmarks/views/tutorials/brave/pin.html +++ b/app/plugins/bookmarks/views/tutorials/brave/pin.html @@ -2,6 +2,7 @@

How to pin the extension to your toolbar in Brave

+ {tutorialCrumbs}
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/chrome/export.html b/app/plugins/bookmarks/views/tutorials/chrome/export.html index 3825dd4..eb844c0 100644 --- a/app/plugins/bookmarks/views/tutorials/chrome/export.html +++ b/app/plugins/bookmarks/views/tutorials/chrome/export.html @@ -2,6 +2,7 @@

How to Export bookmarks from Chrome

+ {tutorialCrumbs}

Exporting your bookmarks is lightning fast and simple inside of chrome. diff --git a/app/plugins/bookmarks/views/tutorials/chrome/import.html b/app/plugins/bookmarks/views/tutorials/chrome/import.html index d3957d6..73bc1bf 100644 --- a/app/plugins/bookmarks/views/tutorials/chrome/import.html +++ b/app/plugins/bookmarks/views/tutorials/chrome/import.html @@ -2,6 +2,7 @@

How to Import bookmarks in Chrome

+ {tutorialCrumbs}

Importing your bookmarks from AllTheBookmarks is lightning fast and simple inside of chrome. diff --git a/app/plugins/bookmarks/views/tutorials/chrome/pin.html b/app/plugins/bookmarks/views/tutorials/chrome/pin.html index 949abce..8f963db 100644 --- a/app/plugins/bookmarks/views/tutorials/chrome/pin.html +++ b/app/plugins/bookmarks/views/tutorials/chrome/pin.html @@ -2,6 +2,7 @@

How to pin the extension to your toolbar in Chrome

+ {tutorialCrumbs}
- + {title}