diff --git a/app/classes/controller.php b/app/classes/controller.php index 63e948b..4bde183 100644 --- a/app/classes/controller.php +++ b/app/classes/controller.php @@ -35,7 +35,6 @@ class Controller extends BedrockController { } new Template; Template::setTemplate( 'default' ); - Components::set( 'TOKEN', Token::generate() ); } public function __destruct() { diff --git a/app/controllers/home.php b/app/controllers/home.php index 71a7d67..3d91789 100644 --- a/app/controllers/home.php +++ b/app/controllers/home.php @@ -102,18 +102,25 @@ class Home extends Controller { public function about() { self::$title = 'About - {SITENAME}'; self::$pageDescription = '{SITENAME} Terms and Conditions of use. Please use {SITENAME} safely.'; - Views::view( 'switches' ); + Views::view( 'about' ); } public function contact() { - self::$title = 'contact - {SITENAME}'; + self::$title = 'Contact Us - {SITENAME}'; self::$pageDescription = '{SITENAME} Terms and Conditions of use. Please use {SITENAME} safely.'; Views::view( 'contact' ); } public function privacy() { - self::$title = 'privacy - {SITENAME}'; + self::$title = 'Privacy Policy - {SITENAME}'; self::$pageDescription = '{SITENAME} Terms and Conditions of use. Please use {SITENAME} safely.'; - Views::view( 'privacy' ); + Components::set( 'PRIVACY', Views::simpleView( 'privacy' ) ); + Views::raw( '
{PRIVACY}
' ); + } + + public function faq() { + self::$title = 'Frequently Asked Questions - {SITENAME}'; + self::$pageDescription = '{SITENAME} Terms and Conditions of use. Please use {SITENAME} safely.'; + Views::view( 'faq' ); } } diff --git a/app/plugins/blog/templates/blog.tpl b/app/plugins/blog/templates/blog.tpl index 576402a..83e59ec 100644 --- a/app/plugins/blog/templates/blog.tpl +++ b/app/plugins/blog/templates/blog.tpl @@ -31,7 +31,7 @@ - + @@ -39,70 +39,57 @@ {TEMPLATE_CSS_INCLUDES} - -
-
- {ISSUES} -
-
- {ERROR} - {NOTICE} - {SUCCESS} -
-
- {/ISSUES} -
-
-

{SITENAME} Blog

-
-
- {BLOG_BREADCRUMBS} - {CONTENT} -
- -
-
- {SIDEBAR} -
-
- {SIDEBAR2} -
-
- + {/ISSUES} +
+
+

{SITENAME} Blog

+
+
+ {BLOG_BREADCRUMBS} + {CONTENT} +
+
+
+ {SIDEBAR} +
+
+ {SIDEBAR2} +
-
-
- {FOOT} - {COPY} -
+ {FOOT} - - + + + {TEMPLATE_JS_INCLUDES} diff --git a/app/plugins/bugreport/views/create.html b/app/plugins/bugreport/views/create.html index e357701..5dd63c0 100644 --- a/app/plugins/bugreport/views/create.html +++ b/app/plugins/bugreport/views/create.html @@ -1,36 +1,51 @@ -Bug Report -

Thank you for visiting Our bug reporting page. We value our users' input highly and in an effort to better serve your needs, please fill out the form below to help us address this issue.

-

We read each and every bug report submitted, and by submitting this form you allow us to send you a follow up email.

-
- - -

- What is the URL of the page you actually received the error on? (The URL is the website address. Example: {ROOT_URL}home) -

- - -

- What is the URL of the page you were on before you received the error? (The URL is the website address. Example: {ROOT_URL}home/newhome) -

- -
- -
-
- -
-
- -
- +
+

Bug Report

+

Thank you for visiting our bug reporting page. We value our users' input highly and in an effort to better serve your needs, please fill out the form below to help us address this issue.

+

We read each and every bug report submitted, and by submitting this form you allow us to send you a follow-up email.

+ + +
+ + + + What is the URL of the page you actually received the error on? (The URL is the website address. Example: {ROOT_URL}home) +
-
- - - \ No newline at end of file + + +
+ + + + What is the URL of the page you were on before you received the error? (The URL is the website address. Example: {ROOT_URL}home/newhome) + +
+ + +
+ +
+ + +
+
+ + +
+
+ + +
+ + +
+ + + + + +
+ +
+ +
diff --git a/app/plugins/feedback/controllers/feedback.php b/app/plugins/feedback/controllers/feedback.php index 685a573..72a816f 100644 --- a/app/plugins/feedback/controllers/feedback.php +++ b/app/plugins/feedback/controllers/feedback.php @@ -30,11 +30,11 @@ class Feedback extends Controller { self::$title = 'Feedback - {SITENAME}'; self::$pageDescription = 'At {SITENAME}, we value our users\' input. You can provide any feedback or suggestions using this form.'; if ( !Input::exists() ) { - return Views::view( 'feedback.feedback' ); + return Views::view( 'feedback.create' ); } if ( !Forms::check( 'feedback' ) ) { Issues::add( 'error', [ 'There was an error with your form, please check your submission and try again.' => Check::userErrors() ] ); - return Views::view( 'feedback.feedback' ); + return Views::view( 'feedback.create' ); } $result = self::$feedback->create( Input::post( 'name' ), Input::post( 'feedbackEmail' ), Input::post( 'entry' ) ); if ( $result ) { diff --git a/app/plugins/feedback/views/create.html b/app/plugins/feedback/views/create.html new file mode 100644 index 0000000..57cbfef --- /dev/null +++ b/app/plugins/feedback/views/create.html @@ -0,0 +1,43 @@ +
+

Feedback

+

+ Here at {SITENAME}, we highly value your feedback. We constantly strive to provide our users with the highest level of quality in everything we do. +

+

+ If you would like to provide any suggestions or comments on our service, we ask that you please fill out the quick form below and let us know what's on your mind. +

+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ + Max: 2000 characters +
+
+ + + + + +
+ +
+
+
diff --git a/app/plugins/messages/views/create.html b/app/plugins/messages/views/create.html index 6958c8b..d1cd308 100644 --- a/app/plugins/messages/views/create.html +++ b/app/plugins/messages/views/create.html @@ -1,25 +1,57 @@ -
- New Message -
-
- -
- +
+
+
+ + New Message +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ + +
+
+ + +
-
- -
- -
-
-
- -
- -
-
-
- -
- \ No newline at end of file +
diff --git a/app/plugins/notifications/views/list.html b/app/plugins/notifications/views/list.html index cb757c7..553216b 100644 --- a/app/plugins/notifications/views/list.html +++ b/app/plugins/notifications/views/list.html @@ -1,30 +1,33 @@ -{PAGINATION} -
-
- - - - - - - - - - {LOOP} - - - - - - {/LOOP} - {ALT} - - - - {/ALT} - -
Notification
{notification}
- No Notifications -
-
+ +
+
+
+ Notifications + + + + + + + + + + {LOOP} + + + + + + {/LOOP} + {ALT} + + + + {/ALT} + +
{notification}
+ No Notifications +
+
+
\ No newline at end of file diff --git a/app/plugins/notifications/views/nav/recentNotificationsDropdown.html b/app/plugins/notifications/views/nav/recentNotificationsDropdown.html index c630da2..ed2f6a1 100644 --- a/app/plugins/notifications/views/nav/recentNotificationsDropdown.html +++ b/app/plugins/notifications/views/nav/recentNotificationsDropdown.html @@ -1,21 +1,21 @@
-
{/ALT} -
  • - See All Notifications + +
  • +
    +
    • +
  • + + See All Notifications +
    • -
    \ No newline at end of file +
    diff --git a/app/plugins/redirects/plugin.php b/app/plugins/redirects/plugin.php index 7b5928c..a84fd22 100644 --- a/app/plugins/redirects/plugin.php +++ b/app/plugins/redirects/plugin.php @@ -38,14 +38,3 @@ class Redirects extends Plugin { ], ]; } - -// as long as this is in the plugin constructor, it should happen before the controller and method loading - // $routes = new RoutesModel; - // $route = $routes->findByOriginalUrl( $url ); - // if ( false !== $route ) { - // if ( 'internal' === $route->redirect_type ) { - // $this->setUrl( $route->forwarded_url ); - // } else { - // Redirect::external( $route->forwarded_url ); - // } - // } \ No newline at end of file diff --git a/app/templates/admin/admin.tpl b/app/templates/admin/admin.tpl index ae8a3dc..1e2f397 100644 --- a/app/templates/admin/admin.tpl +++ b/app/templates/admin/admin.tpl @@ -18,7 +18,7 @@ {ROBOT} - + {TEMPLATE_CSS_INCLUDES} @@ -48,35 +48,67 @@
    - {ISSUES}
    -
    - {ERROR} - {NOTICE} - {SUCCESS} -
    -
    - {/ISSUES} -
    -
    + +
    {ADMIN} - {ADMINNAV} + {/ADMIN}
    -
    + +
    + {ISSUES} +
    +
    + {ERROR} + {NOTICE} + {SUCCESS} +
    +
    + {/ISSUES} {ADMIN_BREADCRUMBS} {CONTENT}
    - + +
    diff --git a/app/templates/default/default.tpl b/app/templates/default/default.tpl index dd7d2ef..78290dc 100644 --- a/app/templates/default/default.tpl +++ b/app/templates/default/default.tpl @@ -65,8 +65,8 @@
    {CONTENT}
    + {FOOT}
    - {FOOT} diff --git a/app/views/about.html b/app/views/about.html index e69de29..35ff1f7 100644 --- a/app/views/about.html +++ b/app/views/about.html @@ -0,0 +1,11 @@ +
    +

    + AllTheBookmarks was built out of a need to manage my own bookmarks better. As a web developer, I would not only use urls for every aspect of my job, but i also needed to switch browsers, operating systems, or devices. For years I had a version of this tool that I used on my own local network. In 2025 I'm bringing it to anyone who wants it. +

    +

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

    +

    + If you encounter any bugs, feel free to report it here. Likewise, there are forms for feedback, reviews, suggestions, and a general contact form. Thanks for taking the time to check out the product! +

    +
    \ No newline at end of file diff --git a/app/views/faq.html b/app/views/faq.html new file mode 100644 index 0000000..65c623a --- /dev/null +++ b/app/views/faq.html @@ -0,0 +1,67 @@ + +
    +

    Frequently Asked Questions

    + + +
    +

    Table of Contents

    + +
    + + +
    +
    +

    + +

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

    + +

    +
    +
    + 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. +
    +
    +
    +
    +

    + +

    +
    +
    + You can add it to your phone by installing the app or creating a shortcut from your browser to your home screen. +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/app/views/footer/container.html b/app/views/footer/container.html index f59846a..d758635 100644 --- a/app/views/footer/container.html +++ b/app/views/footer/container.html @@ -1,13 +1,11 @@
    -
    - +
    - {FOOTER_LEFT} - {FOOTER_CENTER} - {FOOTER_RIGHT} + {FOOTER_LEFT} + {FOOTER_CENTER} + {FOOTER_RIGHT}
    - -
    +
    {COPY} {SOCIAL}
    diff --git a/app/views/footer/right.html b/app/views/footer/right.html index d9df4db..c04aec4 100644 --- a/app/views/footer/right.html +++ b/app/views/footer/right.html @@ -1,6 +1,7 @@ -
    -
    +
    +
    Dark Mode
    +
    -
    \ No newline at end of file +
    diff --git a/app/views/nav/usercp.html b/app/views/nav/usercp.html index ad13a6e..a9dd2e2 100644 --- a/app/views/nav/usercp.html +++ b/app/views/nav/usercp.html @@ -1,5 +1,5 @@ -
      + \ No newline at end of file diff --git a/app/views/profile.html b/app/views/profile.html index 77b5b06..9b309a7 100644 --- a/app/views/profile.html +++ b/app/views/profile.html @@ -1,60 +1,73 @@ -
      -
      -
      -
      -
      -

      {username}

      -
      -
      -
      -
      - User Pic -
      -
      - - - {ADMIN} - - - - - {/ADMIN} - - - - - - - - - - - - - {ADMIN} - - - - - - - - {/ADMIN} - -
      Confirmed:{confirmedText}
      registered:{DTC}{registered}{/DTC}
      Last seen{DTC}{lastLogin}{/DTC}
      Gender{gender}
      Email{email}
      User ID{ID}
      -
      -
      -
      -
      - - {ADMIN} - - - - - {/ADMIN} -
      -
      -
      -
      -
      \ No newline at end of file +
      +
      +
      +
      + +
      +

      {username}

      +
      + + +
      +
      + +
      + User Pic +
      + + +
      + + + {ADMIN} + + + + + {/ADMIN} + + + + + + + + + + + + + {ADMIN} + + + + + + + + + {/ADMIN} + +
      Confirmed:{confirmedText}
      Registered:{DTC}{registered}{/DTC}
      Last Seen:{DTC}{lastLogin}{/DTC}
      Gender:{gender}
      Email:{email}
      User ID:{ID}
      +
      +
      +
      + + +
      + + Message + + {ADMIN} + + Edit + + + Delete + + {/ADMIN} +
      +
      +
      +
      +
      diff --git a/app/views/register.html b/app/views/register.html index 536cb70..555ed6c 100644 --- a/app/views/register.html +++ b/app/views/register.html @@ -1,46 +1,65 @@ -
      - Register + +

      Create an Account

      -
      - + +
      +
      - +
      -
      - + + +
      +
      - +
      -
      - + + +
      +
      - +
      -
      - + + +
      +
      - +
      -
      - + + +
      +
      - +
      -
      -
      - I have read and agree to the Terms of Service - -
      - {TERMS} -
      -
      + + +
      +
      + + +
      +
      + {TERMS} +
      +
      + + + + + +
      +
      - -
      -
      \ No newline at end of file + diff --git a/app/views/user_cp/email_change.html b/app/views/user_cp/email_change.html index 38f3dc8..bad9fa2 100644 --- a/app/views/user_cp/email_change.html +++ b/app/views/user_cp/email_change.html @@ -1,19 +1,21 @@ -
      - Email Settings -
      -
      - -
      - -
      +
      +
      +
      + + Email Settings +
      +
      + + +
      +
      + + +
      +
      + + +
      -
      - -
      - -
      -
      -
      - -
      - \ No newline at end of file +
    +
    diff --git a/app/views/user_cp/password_change.html b/app/views/user_cp/password_change.html index 49d7e55..4e9ffbe 100644 --- a/app/views/user_cp/password_change.html +++ b/app/views/user_cp/password_change.html @@ -1,25 +1,25 @@ -
    - Change Password -
    -
    - -
    - -
    +
    +
    +
    + + Change Password +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - \ No newline at end of file +
    +
    \ No newline at end of file diff --git a/app/views/user_cp/settings.html b/app/views/user_cp/settings.html index 6f2cceb..8096005 100644 --- a/app/views/user_cp/settings.html +++ b/app/views/user_cp/settings.html @@ -1,6 +1,14 @@ -
    - Preferences - {PREFERENCES_FORM} - -
    -
    \ No newline at end of file +
    +
    +
    +
    + Preferences +
    + {PREFERENCES_FORM} +
    + + +
    +
    +
    +
    \ No newline at end of file diff --git a/bin/tempus_project.php b/bin/tempus_project.php index 45ab2bb..8d1f738 100644 --- a/bin/tempus_project.php +++ b/bin/tempus_project.php @@ -60,15 +60,15 @@ class TheTempusProject extends Bedrock { public $info_footer_links = [ [ 'text' => 'FAQs', - 'url' => '{ROOT_URL}home/terms', + 'url' => '{ROOT_URL}home/faq', ], [ 'text' => 'About', - 'url' => '{ROOT_URL}home/terms', + 'url' => '{ROOT_URL}home/about', ], [ 'text' => 'Privacy Policy', - 'url' => '{ROOT_URL}home/terms', + 'url' => '{ROOT_URL}home/privacy', ], [ 'text' => 'Terms of Service', @@ -478,6 +478,13 @@ class TheTempusProject extends Bedrock { 'enabled' => true, 'example' => '{LOGGEDIN}Only visible to users who are logged-in{LOGGEDIN}', ]; + $this->filters[] = [ + 'name' => 'notloggedin', + 'find' => '#{NOTLOGGEDIN}(.*?){/NOTLOGGEDIN}#is', + 'replace' => ( self::$isLoggedIn ? '' : '$1' ), + 'enabled' => true, + 'example' => '{NOTLOGGEDIN}Only visible to users who are logged-in{NOTLOGGEDIN}', + ]; $this->filters[] = [ 'name' => 'dtc', 'find' => '#{DTC(.*?)}(.*?){/DTC}#is', @@ -510,8 +517,8 @@ class TheTempusProject extends Bedrock { public function load( $url = '' ) { $routes = new RoutesModel; - if (empty($url)) { - $url = trim(Input::get('url'), '/'); + if ( empty( $url ) ) { + $url = trim( Input::get( 'url' ), '/' ); $url = str_ireplace( '.php', '', $url ); } $route = $routes->findByOriginalUrl($url);