From 7b0907ca7808c8b88ab7a123b709c2a83fe58aca Mon Sep 17 00:00:00 2001 From: Joey Kimsey Date: Wed, 5 Feb 2025 06:03:38 -0500 Subject: [PATCH] WIP on main --- app/controllers/admin/home.php | 5 - app/views/admin/dashboard/dash.html | 24 --- app/views/faq.html | 6 +- app/views/index.html | 18 +- bin/autoload.php | 6 +- composer.json | 23 ++- composer.lock | 252 ++++++++++++++++++++++++---- 7 files changed, 242 insertions(+), 92 deletions(-) diff --git a/app/controllers/admin/home.php b/app/controllers/admin/home.php index dedddb1..f3b6ea0 100644 --- a/app/controllers/admin/home.php +++ b/app/controllers/admin/home.php @@ -78,11 +78,6 @@ class Home extends AdminController { $users = Views::simpleView( 'admin.dashboard.users', self::$user->recent( 5 ) ); Components::set( 'userDash', $users ); - if ( Input::exists( 'submit' ) ) { - $results = Views::simpleView( 'admin.dashboard.users', self::$user->search( Input::post('searchTerm') ) ); - Components::set( 'searchResults', $results ); - } - Views::view( 'admin.dashboard.dash' ); } } diff --git a/app/views/admin/dashboard/dash.html b/app/views/admin/dashboard/dash.html index 7f0d4c0..240d46a 100644 --- a/app/views/admin/dashboard/dash.html +++ b/app/views/admin/dashboard/dash.html @@ -18,28 +18,4 @@ {blogDash} - - -Results -
-
- -
- -
- -
-
- - - - - -
- -
-
-
-
- {searchResults}
\ No newline at end of file diff --git a/app/views/faq.html b/app/views/faq.html index 9f65fb2..956f2b6 100644 --- a/app/views/faq.html +++ b/app/views/faq.html @@ -23,7 +23,7 @@
- + Yes, {SITENAME} is a responsive web-app and it works seamlessly on mobile devices. The front-end is powered by Bootstrap 5.2.3 the original design system used by twitter. In addition to the powerful tools behind the scenes, every page on {SITENAME} has been tested to work on devices of all sizes. @@ -39,7 +39,7 @@
- + Yes, in more ways than one. Since {SITENAME} is designed as a responsive web-app, its accessible from any browser connected to the internet. Behind the scenes, the app can be installed on any server hardware and has been tested with both nginx and Apache web-servers. @@ -55,7 +55,7 @@
- + {SITENAME} is open source and available free of charge through GitLab and Packagist. The developer behind the project is Joey Kimsey and he can be contacted through his website for development services. diff --git a/app/views/index.html b/app/views/index.html index ea3e14a..2edd9c3 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -35,7 +35,7 @@
@@ -95,7 +95,7 @@
@@ -131,7 +131,7 @@
diff --git a/bin/autoload.php b/bin/autoload.php index fe3860f..47dd906 100644 --- a/bin/autoload.php +++ b/bin/autoload.php @@ -34,7 +34,7 @@ if ( file_exists( VENDOR_DIRECTORY . 'autoload.php' ) ) { sideLoad(); } -if ( class_exists( 'TheTempusProject\Hermes\Classes\Autoloader' ) && TEMPUS_PROJECT_CONSTANTS_LOADED ) { +if ( ! VENDOR_AUTOLOADED && class_exists( 'TheTempusProject\Hermes\Classes\Autoloader' ) && TEMPUS_PROJECT_CONSTANTS_LOADED ) { ttp_autoload(); } @@ -151,14 +151,14 @@ function sideLoad() { // Canary Autoloader (Debugging) if ( ! defined( 'CANARY_AUTOLOADED' ) ) { if ( defined( 'CANARY_ROOT_DIRECTORY' ) ) { - require_once CANARY_ROOT_DIRECTORY . 'Bin' . DIRECTORY_SEPARATOR . 'autoload.php'; + require_once CANARY_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php'; } } // Bedrock Autoloader (Core Functionality) if ( ! defined( 'BEDROCK_AUTOLOADED' ) ) { if ( defined( 'BEDROCK_ROOT_DIRECTORY' ) ) { - require_once BEDROCK_ROOT_DIRECTORY . 'Bin' . DIRECTORY_SEPARATOR . 'autoload.php'; + require_once BEDROCK_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php'; } } diff --git a/composer.json b/composer.json index 0835499..24a21e1 100644 --- a/composer.json +++ b/composer.json @@ -24,10 +24,11 @@ "require": { "components/jquery": "1.9.*", + "endroid/qr-code": "^6.0", "fortawesome/font-awesome": "4.7", - "thetempusproject/bedrock": "1.1.2", - "thetempusproject/canary": "1.0.7", - "thetempusproject/houdini": "2.0.3", + "thetempusproject/bedrock": "1.1.5", + "thetempusproject/canary": "1.0.9", + "thetempusproject/houdini": "2.0.5", "twbs/bootstrap": "5.2.3" }, "autoload": @@ -39,14 +40,12 @@ "classmap": [ "app/classes", - "app/models" - ], - "psr-4": - { - "TheTempusProject\\Bedrock\\": "vendor/thetempusproject/bedrock", - "TheTempusProject\\Canary\\": "vendor/thetempusproject/canary", - "TheTempusProject\\Houdini\\": "vendor/thetempusproject/houdini" - } + "app/controllers", + "app/controllers/admin", + "app/controllers/api", + "app/models", + "app/plugins" + ] }, "scripts": { @@ -65,4 +64,4 @@ } }, "prefer-stable": true -} +} \ No newline at end of file diff --git a/composer.lock b/composer.lock index 4f37afa..8bc56ef 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,62 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b54d2da34f833481cff28144a669b2aa", + "content-hash": "4d538dca0808fe67a3b0711039b2f8e8", "packages": [ + { + "name": "bacon/bacon-qr-code", + "version": "v3.0.1", + "source": { + "type": "git", + "url": "https://github.com/Bacon/BaconQrCode.git", + "reference": "f9cc1f52b5a463062251d666761178dbdb6b544f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f9cc1f52b5a463062251d666761178dbdb6b544f", + "reference": "f9cc1f52b5a463062251d666761178dbdb6b544f", + "shasum": "" + }, + "require": { + "dasprid/enum": "^1.0.3", + "ext-iconv": "*", + "php": "^8.1" + }, + "require-dev": { + "phly/keep-a-changelog": "^2.12", + "phpunit/phpunit": "^10.5.11 || 11.0.4", + "spatie/phpunit-snapshot-assertions": "^5.1.5", + "squizlabs/php_codesniffer": "^3.9" + }, + "suggest": { + "ext-imagick": "to generate QR code images" + }, + "type": "library", + "autoload": { + "psr-4": { + "BaconQrCode\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Ben Scholzen 'DASPRiD'", + "email": "mail@dasprids.de", + "homepage": "https://dasprids.de/", + "role": "Developer" + } + ], + "description": "BaconQrCode is a QR code generator for PHP.", + "homepage": "https://github.com/Bacon/BaconQrCode", + "support": { + "issues": "https://github.com/Bacon/BaconQrCode/issues", + "source": "https://github.com/Bacon/BaconQrCode/tree/v3.0.1" + }, + "time": "2024-10-01T13:55:55+00:00" + }, { "name": "components/jquery", "version": "1.9.1", @@ -58,6 +112,128 @@ }, "time": "2014-10-11T11:52:45+00:00" }, + { + "name": "dasprid/enum", + "version": "1.0.6", + "source": { + "type": "git", + "url": "https://github.com/DASPRiD/Enum.git", + "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8dfd07c6d2cf31c8da90c53b83c026c7696dda90", + "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90", + "shasum": "" + }, + "require": { + "php": ">=7.1 <9.0" + }, + "require-dev": { + "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11", + "squizlabs/php_codesniffer": "*" + }, + "type": "library", + "autoload": { + "psr-4": { + "DASPRiD\\Enum\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Ben Scholzen 'DASPRiD'", + "email": "mail@dasprids.de", + "homepage": "https://dasprids.de/", + "role": "Developer" + } + ], + "description": "PHP 7.1 enum implementation", + "keywords": [ + "enum", + "map" + ], + "support": { + "issues": "https://github.com/DASPRiD/Enum/issues", + "source": "https://github.com/DASPRiD/Enum/tree/1.0.6" + }, + "time": "2024-08-09T14:30:48+00:00" + }, + { + "name": "endroid/qr-code", + "version": "6.0.3", + "source": { + "type": "git", + "url": "https://github.com/endroid/qr-code.git", + "reference": "bdbb06e767efe9abe3c00461662b4059a6cd0b55" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/endroid/qr-code/zipball/bdbb06e767efe9abe3c00461662b4059a6cd0b55", + "reference": "bdbb06e767efe9abe3c00461662b4059a6cd0b55", + "shasum": "" + }, + "require": { + "bacon/bacon-qr-code": "^3.0", + "php": "^8.2" + }, + "require-dev": { + "endroid/quality": "dev-main", + "ext-gd": "*", + "khanamiryan/qrcode-detector-decoder": "^2.0.2", + "setasign/fpdf": "^1.8.2" + }, + "suggest": { + "ext-gd": "Enables you to write PNG images", + "khanamiryan/qrcode-detector-decoder": "Enables you to use the image validator", + "roave/security-advisories": "Makes sure package versions with known security issues are not installed", + "setasign/fpdf": "Enables you to use the PDF writer" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Endroid\\QrCode\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jeroen van den Enden", + "email": "info@endroid.nl" + } + ], + "description": "Endroid QR Code", + "homepage": "https://github.com/endroid/qr-code", + "keywords": [ + "code", + "endroid", + "php", + "qr", + "qrcode" + ], + "support": { + "issues": "https://github.com/endroid/qr-code/issues", + "source": "https://github.com/endroid/qr-code/tree/6.0.3" + }, + "funding": [ + { + "url": "https://github.com/endroid", + "type": "github" + } + ], + "time": "2024-10-29T19:28:52+00:00" + }, { "name": "fortawesome/font-awesome", "version": "v4.7.0", @@ -303,28 +479,28 @@ }, { "name": "thetempusproject/bedrock", - "version": "1.1.1", + "version": "1.1.5", "source": { "type": "git", "url": "https://git.thetempusproject.com/the-tempus-project/bedrock", - "reference": "bcd73d58f9d7df41b5ec0f12871ff15cfcc215ae" + "reference": "39d350df061b4c69266bbbe152976cf7254e4c08" }, "require": { "php": ">=8.1.0", - "thetempusproject/canary": "1.0.6", - "thetempusproject/hermes": "1.0.3", - "thetempusproject/houdini": "2.0.2" + "thetempusproject/canary": "1.0.9", + "thetempusproject/hermes": "1.0.5", + "thetempusproject/houdini": "2.0.5" }, "type": "library", "autoload": { "files": [ - "Config/constants.php", - "Bin/Bedrock.php" + "config/constants.php", + "bin/bedrock.php" ], - "psr-4": { - "TheTempusProject\\Bedroock\\Classes\\": "Classes", - "TheTempusProject\\Bedroock\\Functions\\": "Functions" - } + "classmap": [ + "classes", + "functions" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -339,20 +515,22 @@ } ], "description": "Bedrock is intended as the core functionality used by The Tempus Project: a rapid prototyping framework. This library utilizes the MVC architecture in addition to a custom templating engine designed to make building web applications simple.", - "homepage": "https://git.thetempusproject.com/the-tempus-project/bedrock", + "homepage": "https://thetempusproject.com/libraries/bedrock", "keywords": [ "framework", - "mvc" + "mvc", + "php", + "thetempusproject" ], - "time": "2025-01-27T05:07:05+00:00" + "time": "2025-02-04T12:20:56+00:00" }, { "name": "thetempusproject/canary", - "version": "1.0.6", + "version": "1.0.9", "source": { "type": "git", "url": "https://git.thetempusproject.com/the-tempus-project/canary", - "reference": "44b2ad688cff933964ec2ff50b408d94c7f51e40" + "reference": "77cef522e9919573836901eb82b59b20f453fb61" }, "require": { "php": ">=8.1.0" @@ -360,12 +538,12 @@ "type": "library", "autoload": { "files": [ - "Config/constants.php", - "Bin/Canary.php" + "config/constants.php", + "bin/canary.php" ], - "psr-4": { - "TheTempusProject\\Canary\\Classes\\": "Classes" - } + "classmap": [ + "classes" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -380,22 +558,23 @@ } ], "description": "Functionality for tracking, logging, and sending log messages to chrome for debugging.", - "homepage": "https://git.thetempusproject.com/the-tempus-project/canary", + "homepage": "https://thetempusproject.com/libraries/canary", "keywords": [ "debugging", + "logging", "php", "thetempusproject", "tools" ], - "time": "2025-01-22T01:39:34+00:00" + "time": "2025-02-04T12:16:29+00:00" }, { "name": "thetempusproject/hermes", - "version": "1.0.3", + "version": "1.0.5", "source": { "type": "git", "url": "https://git.thetempusproject.com/the-tempus-project/hermes", - "reference": "4b4e06a98f0f01695bda18de240bb3294d096ef4" + "reference": "802581b1d2d70877ccc75d8954b33efcc05d9371" }, "require": { "php": ">=8.1.0" @@ -422,28 +601,29 @@ "role": "Lead Developer" } ], - "description": "Php functions that aid in routing and redirecting; requests and responses.", - "homepage": "https://git.thetempusproject.com/the-tempus-project/hermes", + "description": "This library handles redirects, provides a common backbone for routing, and can handle autoloading in cases where composer is unavailable.", + "homepage": "https://thetempusproject.com/libraries/hermes", "keywords": [ + "autoloader", "php", "routing", "thetempusproject", "tools" ], - "time": "2025-01-22T01:43:15+00:00" + "time": "2025-02-02T23:22:15+00:00" }, { "name": "thetempusproject/houdini", - "version": "2.0.2", + "version": "2.0.5", "source": { "type": "git", "url": "https://git.thetempusproject.com/the-tempus-project/houdini", - "reference": "fb027a4ebc327e709ad3da29a4cf112894c2b7e6" + "reference": "2c7538471ab1f900048ccdb2c71d6bf2bee975e0" }, "require": { "php": ">=8.1.0", - "thetempusproject/canary": "1.0.6", - "thetempusproject/hermes": "1.0.3" + "thetempusproject/canary": "1.0.9", + "thetempusproject/hermes": "1.0.5" }, "type": "library", "autoload": { @@ -466,15 +646,15 @@ "role": "Lead Developer" } ], - "description": "Php functions that aid in creating, managing, and displaying frontend components.", - "homepage": "https://git.thetempusproject.com/the-tempus-project/houdini", + "description": "This library handles creating, managing, and displaying frontend components.", + "homepage": "https://thetempusproject.com/libraries/houdini", "keywords": [ "frontend", "php", "thetempusproject", "tools" ], - "time": "2025-01-27T05:02:14+00:00" + "time": "2025-02-04T12:19:25+00:00" }, { "name": "twbs/bootstrap",