diff --git a/app/js/main.js b/app/js/main.js index a41ce06..e3d297d 100644 --- a/app/js/main.js +++ b/app/js/main.js @@ -123,3 +123,67 @@ $(document).ready(function() { } }); }); + + document.addEventListener('DOMContentLoaded', () => { + // Initialize Masonry + const masonryContainer = document.querySelector('[data-masonry]'); + const masonryInstance = new Masonry(masonryContainer, { + // horizontalOrder: false, // Maintains natural order in DOM + columnHeight: '.accordion', + // columnWidth: '.card', // Use the card width as the column reference + percentPosition: true + }); + + + // const sortContainer = document.getElementById('bookmarkSort'); + // Sortable.create(masonryContainer, { + // // animation: 150, // Smooth animations + // sort: true, + // ghostClass: 'bg-primary', + // onEnd: () => { + // // Trigger Masonry layout after drag-and-drop + // masonryInstance.layout(); + // } + // }); + + // Function to trigger layout after any accordion change + const updateMasonryLayout = () => masonryInstance.layout(); + + // Listen for all accordion collapse/expand events + masonryContainer.addEventListener('hidden.bs.collapse', updateMasonryLayout); + masonryContainer.addEventListener('shown.bs.collapse', updateMasonryLayout); + + // Observe dynamic content changes (e.g., rows added/removed) + const observer = new MutationObserver(() => { + updateMasonryLayout(); + }); + + // Observe all cards for changes in the DOM + document.querySelectorAll('.card').forEach((card) => { + observer.observe(card, { childList: true, subtree: true }); + }); + + jQuery(function($) { + var panelList = $('#bookmarkSort'); + + panelList.sortable({ + // Only make the .panel-heading child elements support dragging. + // Omit this to make then entire
  • ...
    • draggable. + handle: '.card', + update: function() { + console.error( 'update' ); + $('.bookmark-card', panelList).each(function(index, elem) { + var $listItem = $(elem), + + newIndex = $listItem.index(); + masonryInstance.layout(); + console.error( $listItem ); + console.error( index ); + console.error( newIndex ); + + // Persist the new indices. + }); + } + }); + }); +}); \ No newline at end of file diff --git a/app/plugins/bookmarks/controllers/api/bookmark_folders.php b/app/plugins/bookmarks/controllers/api/bookmark_folders.php index 62a88f8..37dfa27 100644 --- a/app/plugins/bookmarks/controllers/api/bookmark_folders.php +++ b/app/plugins/bookmarks/controllers/api/bookmark_folders.php @@ -47,8 +47,8 @@ class BookmarkFolders extends ApiController { $responseType = 'error'; $response = 'There was an error creating your folder.'; } else { - $responseType = 'success'; - $response = 'success'; + $responseType = 'id'; + $response = $result; } Views::view( 'api.response', ['response' => json_encode( [ $responseType => $response ], true )]); } @@ -68,4 +68,3 @@ class BookmarkFolders extends ApiController { Views::view( 'api.response', ['response' => json_encode( [ $responseType => $response ], true )]); } } - diff --git a/app/plugins/bookmarks/controllers/bookmarks.php b/app/plugins/bookmarks/controllers/bookmarks.php index 3c1e1c5..490ba73 100644 --- a/app/plugins/bookmarks/controllers/bookmarks.php +++ b/app/plugins/bookmarks/controllers/bookmarks.php @@ -70,12 +70,11 @@ class Bookmarks extends Controller { $folderObject->title = $folder->title; $folderObject->color = $folder->color; $folderObject->bookmarkListRows = Views::simpleView( 'bookmarks.components.bookmarkListRows', $folderObject->bookmarks ); - $panel->panel = Views::simpleView( 'bookmarks.components.bookmarkListPanel', [$folderObject] ); - $panelArray[] = $panel; + $panelArray[] = $folderObject; } } Components::set( 'foldersList', Views::simpleView( 'bookmarks.folders.list', $folders ) ); - Components::set( 'folderPanels', Views::simpleView( 'bookmarks.components.folderPanelList', $panelArray ) ); + Components::set( 'folderPanels', Views::simpleView( 'bookmarks.components.bookmarkListPanel', $panelArray ) ); Components::set( 'bookmarksList', Views::simpleView( 'bookmarks.bookmarks.list', $bookmarks ) ); return Views::view( 'bookmarks.dash' ); } @@ -121,8 +120,8 @@ class Bookmarks extends Controller { $folderObject->bookmarkListRows = Views::simpleView( 'bookmarks.components.bookmarkListRows', $folderObject->bookmarks ); $panel->panel = Views::simpleView( 'bookmarks.components.bookmarkListPanel', [$folderObject] ); $panelArray[] = $panel; - - return Views::view( 'bookmarks.components.folderPanelList', $panelArray ); + + return Views::view( 'bookmarks.bookmarks.listPage', $panelArray ); } public function createBookmark( $id = null ) { @@ -227,7 +226,7 @@ class Bookmarks extends Controller { if ( $folder == false ) { $folders = self::$folders->byUser(); Components::set( 'foldersList', Views::simpleView( 'bookmarks.folders.list', $folders ) ); - return Views::view( 'bookmarks.folders.listPage', $folders ); + return Views::view( 'bookmarks.folders.listPage' ); } if ( $folder->createdBy != App::$activeUser->ID ) { Session::flash( 'error', 'You do not have permission to view this folder.' ); diff --git a/app/plugins/bookmarks/models/folders.php b/app/plugins/bookmarks/models/folders.php index 4fe4481..7591fbe 100644 --- a/app/plugins/bookmarks/models/folders.php +++ b/app/plugins/bookmarks/models/folders.php @@ -171,4 +171,23 @@ class Folders extends DatabaseModel { } return $out; } + + public function filter( $data, $params = [] ) { + foreach ( $data as $instance ) { + if ( !is_object( $instance ) ) { + $instance = $data; + $end = true; + } + // Real Work Starts Here + $instance->prettyPrivacy = ucfirst( $instance->privacy ); + $instance->prettyTitle = ucfirst( $instance->title ); + // Real Work Ends Here + $out[] = $instance; + if ( !empty( $end ) ) { + $out = $out[0]; + break; + } + } + return $out; + } } diff --git a/app/plugins/bookmarks/views/bookmarks/list.html b/app/plugins/bookmarks/views/bookmarks/list.html index 1fa2a6a..7384b8a 100644 --- a/app/plugins/bookmarks/views/bookmarks/list.html +++ b/app/plugins/bookmarks/views/bookmarks/list.html @@ -21,7 +21,7 @@ {privacy} - + {/LOOP} @@ -34,4 +34,7 @@ {/ALT} - Create \ No newline at end of file + +
    + 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 index f975b06..45e81f0 100644 --- a/app/plugins/bookmarks/views/bookmarks/listPage.html +++ b/app/plugins/bookmarks/views/bookmarks/listPage.html @@ -1,8 +1,13 @@ - - -
    -
    +
    + {LOOP} Bookmark List - {bookmarksList} -
    -
    +
    + {panel} +
    + {/LOOP} + {ALT} +
    +

    no folders

    +
    + {/ALT} +
    \ No newline at end of file diff --git a/app/plugins/bookmarks/views/bookmarks/view.html b/app/plugins/bookmarks/views/bookmarks/view.html index cb73a7f..6ab9258 100644 --- a/app/plugins/bookmarks/views/bookmarks/view.html +++ b/app/plugins/bookmarks/views/bookmarks/view.html @@ -100,7 +100,7 @@ {hideBtn} {archiveBtn} - Edit + Edit Delete diff --git a/app/plugins/bookmarks/views/components/bookmarkListPanel.html b/app/plugins/bookmarks/views/components/bookmarkListPanel.html index bfabdf8..a7f679f 100644 --- a/app/plugins/bookmarks/views/components/bookmarkListPanel.html +++ b/app/plugins/bookmarks/views/components/bookmarkListPanel.html @@ -1,21 +1,32 @@ -
    -
    - {title} -
    -
    -
    -
      - {bookmarkListRows} -
    -
    -
    - - - - - - - +{LOOP} +
    +
    +
    +
    + {title} +
    +
    +
    +
      + {bookmarkListRows} +
    +
    +
    + + + + + + + +
    +
    -
    \ No newline at end of file +
    +{/LOOP} +{ALT} +
    +

    no folders

    +
    +{/ALT} \ No newline at end of file diff --git a/app/plugins/bookmarks/views/components/bookmarkListRows.html b/app/plugins/bookmarks/views/components/bookmarkListRows.html index 8bd2e9f..9d83f3c 100644 --- a/app/plugins/bookmarks/views/components/bookmarkListRows.html +++ b/app/plugins/bookmarks/views/components/bookmarkListRows.html @@ -1,18 +1,18 @@ {LOOP} -
  • - {iconHtml} - {title} - +
  • + {iconHtml} + {title} + {hideBtn} {archiveBtn} - +
    • {/LOOP} {ALT} -
  • - No Bookmarks +
  • +

    No Bookmarks

    • {/ALT} \ No newline at end of file diff --git a/app/plugins/bookmarks/views/components/folderPanelList.html b/app/plugins/bookmarks/views/components/folderPanelList.html deleted file mode 100644 index 6e8c4a6..0000000 --- a/app/plugins/bookmarks/views/components/folderPanelList.html +++ /dev/null @@ -1,10 +0,0 @@ -{LOOP} -
    - {panel} -
    -{/LOOP} -{ALT} -
    -

    no folders

    -
    -{/ALT} \ No newline at end of file diff --git a/app/plugins/bookmarks/views/dash.html b/app/plugins/bookmarks/views/dash.html index 392423f..960fffd 100644 --- a/app/plugins/bookmarks/views/dash.html +++ b/app/plugins/bookmarks/views/dash.html @@ -1,17 +1,20 @@ -
    -
    - Unsorted Bookmarks +
    +
    + Unsorted Bookmarks {bookmarksList}
    -
    - Folders List +
    + Folders List {foldersList}
    -
    -
    - Bookmarks - {folderPanels} +
    +
    + Bookmarks +
    +
    + {folderPanels} +
    \ 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 e5df19a..7fabceb 100644 --- a/app/plugins/bookmarks/views/folders/list.html +++ b/app/plugins/bookmarks/views/folders/list.html @@ -2,9 +2,9 @@ - - - + + + @@ -13,11 +13,11 @@ {LOOP} - - + + - + {/LOOP} @@ -30,4 +30,6 @@ {/ALT}
    TitlePrivacyDescriptionTitlePrivacyDescription
    {title}{privacy}{prettyTitle}{prettyPrivacy} {description}
    - Create \ No newline at end of file +
    + 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 index e4f4a70..c6324f0 100644 --- a/app/plugins/bookmarks/views/folders/listPage.html +++ b/app/plugins/bookmarks/views/folders/listPage.html @@ -1,7 +1,8 @@ -
    -
    - Folders List +
    +
    + Folders List +
    {foldersList}
    -
    +
    \ No newline at end of file diff --git a/app/plugins/bookmarks/views/folders/view.html b/app/plugins/bookmarks/views/folders/view.html index ee0fae0..2136b76 100644 --- a/app/plugins/bookmarks/views/folders/view.html +++ b/app/plugins/bookmarks/views/folders/view.html @@ -59,7 +59,7 @@ Bookmarks - Edit + Edit Delete diff --git a/app/plugins/bookmarks/views/nav/folderTabs.html b/app/plugins/bookmarks/views/nav/folderTabs.html index 20d76c2..d3e18d9 100644 --- a/app/plugins/bookmarks/views/nav/folderTabs.html +++ b/app/plugins/bookmarks/views/nav/folderTabs.html @@ -1,4 +1,4 @@ -
      +
      • Dashboard
      • Folders
      • Import
        • diff --git a/app/plugins/bookmarks/views/nav/userFolderTabs.html b/app/plugins/bookmarks/views/nav/userFolderTabs.html index f272735..7ac7ccc 100644 --- a/app/plugins/bookmarks/views/nav/userFolderTabs.html +++ b/app/plugins/bookmarks/views/nav/userFolderTabs.html @@ -1,4 +1,4 @@ -
          +
          • All
            • {LOOP}
          • {title}
            • diff --git a/app/plugins/members/views/admin/products/view.html b/app/plugins/members/views/admin/products/view.html index bf67500..d15a600 100644 --- a/app/plugins/members/views/admin/products/view.html +++ b/app/plugins/members/views/admin/products/view.html @@ -1,8 +1,8 @@
            -
            -
            +
            +

            Membership Product

            diff --git a/app/plugins/members/views/landing1.html b/app/plugins/members/views/landing1.html index 172c7f0..67d8c30 100644 --- a/app/plugins/members/views/landing1.html +++ b/app/plugins/members/views/landing1.html @@ -32,8 +32,8 @@
            -
            -
            +
            +

            {name} Monthly

            @@ -45,8 +45,8 @@
            -
            -
            +
            +

            {name} Yearly

            diff --git a/app/plugins/members/views/landing2.html b/app/plugins/members/views/landing2.html index 710d7bc..fe76c66 100644 --- a/app/plugins/members/views/landing2.html +++ b/app/plugins/members/views/landing2.html @@ -15,8 +15,8 @@

            Affordable Plans

            -
            -
            {name} Monthly Plan
            +
            +
            {name} Monthly Plan

            {prettyPriceMonthly}/month

            All pro features unlocked

            @@ -25,8 +25,8 @@
            -
            -
            {name} Yearly Plan
            +
            +
            {name} Yearly Plan

            {prettyPriceYearly}/year

            Save {prettySavings} annually!

            diff --git a/app/plugins/reviews/controllers/admin/reviews.php b/app/plugins/reviews/controllers/admin/reviews.php index 6edae63..bfac95f 100644 --- a/app/plugins/reviews/controllers/admin/reviews.php +++ b/app/plugins/reviews/controllers/admin/reviews.php @@ -19,7 +19,7 @@ use TheTempusProject\Houdini\Classes\Navigation; use TheTempusProject\Houdini\Classes\Components; use TheTempusProject\Classes\AdminController; use TheTempusProject\Models\Review; -use TheTempusProject\Models\Reviewcategory; +use TheTempusProject\Models\ReviewCategory; use TheTempusProject\Classes\Forms; class Reviews extends AdminController { @@ -30,7 +30,7 @@ class Reviews extends AdminController { parent::__construct(); self::$title = 'Admin - Reviews'; self::$reviews = new Review; - self::$categories = new Reviewcategory; + self::$categories = new ReviewCategory; $view = Navigation::activePageSelect( 'nav.admin', '/admin/reviews' ); Components::set( 'ADMINNAV', $view ); } diff --git a/app/plugins/reviews/controllers/reviews.php b/app/plugins/reviews/controllers/reviews.php index cd4d0ea..1f28858 100644 --- a/app/plugins/reviews/controllers/reviews.php +++ b/app/plugins/reviews/controllers/reviews.php @@ -24,7 +24,7 @@ use TheTempusProject\Models\Review; use TheTempusProject\TheTempusProject as App; use TheTempusProject\Houdini\Classes\Components; use TheTempusProject\Houdini\Classes\Template; -use TheTempusProject\Models\Reviewcategory; +use TheTempusProject\Models\ReviewCategory; use TheTempusProject\Houdini\Classes\Forms as HoudiniForms; class Reviews extends Controller { @@ -33,7 +33,7 @@ class Reviews extends Controller { public function __construct() { self::$title = 'Reviews - {SITENAME}'; - self::$pageDescription = 'On this page you can submit a reviews for a product from the site.'; + self::$pageDescription = 'On this page you can submit a reviews for a product.'; if ( ! App::$isLoggedIn ) { Session::flash( 'notice', 'You must be logged in to review products.' ); @@ -42,7 +42,7 @@ class Reviews extends Controller { parent::__construct(); self::$reviews = new Review; - self::$categories = new Reviewcategory; + self::$categories = new ReviewCategory; Components::append( 'TEMPLATE_JS_INCLUDES', Template::parse('' ) ); Components::append( 'TEMPLATE_CSS_INCLUDES', Template::parse('') ); } @@ -50,7 +50,7 @@ class Reviews extends Controller { public function index() { $reviews = Views::simpleView( 'reviews.list', self::$reviews->byUser() ); Components::set( 'reviews', $reviews ); - Views::view( 'reviews.index' ); + Views::view( 'reviews.list' ); } public function review( $slug = null ) { diff --git a/app/plugins/reviews/models/review.php b/app/plugins/reviews/models/review.php index 9e1dd80..3e96855 100644 --- a/app/plugins/reviews/models/review.php +++ b/app/plugins/reviews/models/review.php @@ -14,7 +14,7 @@ namespace TheTempusProject\Models; use TheTempusProject\Bedrock\Classes\Config; use TheTempusProject\Bedrock\Functions\Check; -use TheTempusProject\Canary\Canary as Debug; +use TheTempusProject\Canary\Bin\Canary as Debug; use TheTempusProject\Classes\DatabaseModel; use TheTempusProject\Plugins\Reviews as Plugin; use TheTempusProject\TheTempusProject as App; diff --git a/app/plugins/reviews/models/reviewcategory.php b/app/plugins/reviews/models/review_category.php similarity index 95% rename from app/plugins/reviews/models/reviewcategory.php rename to app/plugins/reviews/models/review_category.php index 6de2e98..14848db 100644 --- a/app/plugins/reviews/models/reviewcategory.php +++ b/app/plugins/reviews/models/review_category.php @@ -1,6 +1,6 @@ '{ROOT_URL}admin/reviews', ], ]; - public $footer_links = [ + public $contact_footer_links = [ [ 'text' => 'Reviews', 'url' => '{ROOT_URL}reviews/index/', diff --git a/app/plugins/reviews/views/admin/categoryList.html b/app/plugins/reviews/views/admin/categoryList.html index 93ec77e..22a5fc0 100644 --- a/app/plugins/reviews/views/admin/categoryList.html +++ b/app/plugins/reviews/views/admin/categoryList.html @@ -16,9 +16,9 @@ {ID} {name} {slug} - - - + + + {/LOOP} {ALT} diff --git a/app/plugins/reviews/views/admin/review.html b/app/plugins/reviews/views/admin/review.html index 37aad42..45260cd 100644 --- a/app/plugins/reviews/views/admin/review.html +++ b/app/plugins/reviews/views/admin/review.html @@ -33,9 +33,9 @@
            - - - + + +
            diff --git a/app/plugins/reviews/views/admin/reviewList.html b/app/plugins/reviews/views/admin/reviewList.html index b3fb56c..6cd391c 100644 --- a/app/plugins/reviews/views/admin/reviewList.html +++ b/app/plugins/reviews/views/admin/reviewList.html @@ -16,9 +16,9 @@ {ID} {title} {rating} - - - + + + {/LOOP} {ALT} diff --git a/app/plugins/reviews/views/index.html b/app/plugins/reviews/views/index.html deleted file mode 100644 index 4338bc5..0000000 --- a/app/plugins/reviews/views/index.html +++ /dev/null @@ -1 +0,0 @@ -{reviews} \ No newline at end of file diff --git a/app/plugins/reviews/views/list.html b/app/plugins/reviews/views/list.html index b3fb56c..e1cd117 100644 --- a/app/plugins/reviews/views/list.html +++ b/app/plugins/reviews/views/list.html @@ -1,32 +1,38 @@ -Reviews - - - - - - - - - - - - - {LOOP} - - - - - - - - - {/LOOP} - {ALT} - - - - {/ALT} - -
            IDTitleRating
            {ID}{title}{rating}
            - No results to show. -
            \ No newline at end of file +
            + Reviews +
            +

            + Understanding the customer is a huge part of making products better. Whether its feedback that we are doing great, or we need work; the review allows users to share that with us. +

            +

            + On this page you can find your reviews to see any responses or make edits. +

            + + + + + + + + + + + + {LOOP} + + + + + + + {/LOOP} + {ALT} + + + + {/ALT} + +
            TitleRating
            {title}{rating}
            + No results to show. +
            +
            \ No newline at end of file diff --git a/app/plugins/suggestions/plugin.php b/app/plugins/suggestions/plugin.php index f12e737..817a5a6 100644 --- a/app/plugins/suggestions/plugin.php +++ b/app/plugins/suggestions/plugin.php @@ -37,7 +37,7 @@ class Suggestions extends Plugin { 'url' => '{ROOT_URL}admin/suggestions', ], ]; - public $footer_links = [ + public $contact_footer_links = [ [ 'text' => 'Suggestions', 'url' => '{ROOT_URL}suggestions/index', diff --git a/app/plugins/suggestions/views/admin/list.html b/app/plugins/suggestions/views/admin/list.html index 7e11444..de8686f 100644 --- a/app/plugins/suggestions/views/admin/list.html +++ b/app/plugins/suggestions/views/admin/list.html @@ -29,12 +29,12 @@ {DTC}{approvedOn}{/DTC} {approvedByName} - - + + - - + + diff --git a/app/plugins/suggestions/views/create.html b/app/plugins/suggestions/views/create.html index 479bfaa..243ea96 100644 --- a/app/plugins/suggestions/views/create.html +++ b/app/plugins/suggestions/views/create.html @@ -1,16 +1,32 @@ -
            - Submit a Suggestion -
            - -
            - +
            +

            Make a suggestion

            +

            + I can't be expected to come up with all the great ideas around here. Feel free to make a suggestion here. Some suggestions will be approved for the community to comment on! +

            + + +
            + +
            + +
            -
            -
            -
            - + + +
            + +
            + + Max: 2000 characters +
            -
            - - - \ No newline at end of file + + + + + +
            + +
            + +
            diff --git a/app/plugins/suggestions/views/list.html b/app/plugins/suggestions/views/list.html index ee7ac85..f8e862e 100644 --- a/app/plugins/suggestions/views/list.html +++ b/app/plugins/suggestions/views/list.html @@ -1,19 +1,21 @@ -Suggestions -{PAGINATION} -{LOOP} -
            -

            {title}

            -
            - {suggestion} -

            - Suggested on {DTC date}{suggestedOn}{/DTC} by {submittedBy} -

            +
            + Suggestions +
            + {LOOP} +
            +

            {title}

            +
            + {suggestion} +

            + Suggested on {DTC date}{suggestedOn}{/DTC} by {submittedBy} +

            +
            -
            -{/LOOP} -{ALT} -
            -

            No Suggestions Found.

            -
            -{/ALT} -Create \ No newline at end of file + {/LOOP} + {ALT} +
            +

            No Suggestions Found.

            +
            + {/ALT} + Make a Suggestion +
            \ No newline at end of file diff --git a/app/plugins/wip/views/admin/list.html b/app/plugins/wip/views/admin/list.html index 8cf8197..01fd1ce 100644 --- a/app/plugins/wip/views/admin/list.html +++ b/app/plugins/wip/views/admin/list.html @@ -20,8 +20,8 @@ {title} {progress} {startDate} - - + + diff --git a/app/plugins/wip/views/wip.html b/app/plugins/wip/views/wip.html index f2ef3b4..5ec0ebd 100644 --- a/app/plugins/wip/views/wip.html +++ b/app/plugins/wip/views/wip.html @@ -1,19 +1,21 @@ -

            Work in Progress

            -
            -{LOOP} -
            -

            {title}

            -

            Started: {prettyStart}

            -
            -
            +
            +

            Work in Progress

            +
            + {LOOP} +
            +

            {title}

            +

            Started: {prettyStart}

            +
            +
            +
            +
            + {description} +
            -
            - {description} + {/LOOP} + {ALT} +
            +

            None Found

            -
            -{/LOOP} -{ALT} -
            -

            None Found

            -
            -{/ALT} \ No newline at end of file + {/ALT} +
            \ No newline at end of file diff --git a/app/templates/default/default.tpl b/app/templates/default/default.tpl index 5066e02..d813173 100644 --- a/app/templates/default/default.tpl +++ b/app/templates/default/default.tpl @@ -72,6 +72,7 @@ + {TEMPLATE_JS_INCLUDES}