diff --git a/.gitignore b/.gitignore index 91f4cd5..433fc3b 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ logs/* mail.log vendor/canary/logs/* .env +components/* diff --git a/app/templates/default/default.inc.php b/app/templates/default/default.inc.php index ef3b61f..0d3519f 100644 --- a/app/templates/default/default.inc.php +++ b/app/templates/default/default.inc.php @@ -28,7 +28,15 @@ class DefaultLoader extends Loader { public function __construct() { Components::set( 'TEMPLATE_URL', Template::parse( '{ROOT_URL}app/templates/default/' ) ); - Components::set( 'BOOTSTRAP_CDN', self::BOOTSTRAP_CDN ); + if ( VENDOR_AUTOLOADED === true ) { + Components::set( 'FONT_AWESOME_URL', '/vendor/fortawesome/font-awesome/css/' ); + Components::set( 'BOOTSTRAP_CDN', '/vendor/twbs/bootstrap/dist/' ); + Components::set( 'JQUERY_CDN', '/vendor/components/jquery/' ); + } else { + Components::set( 'BOOTSTRAP_CDN', self::BOOTSTRAP_CDN ); + Components::set( 'JQUERY_CDN', self::JQUERY_CDN ); + Components::set( 'FONT_AWESOME_URL', self::FONT_AWESOME_URL ); + } $this->addCss( '' ); $this->addJs( '' ); Components::setIfNull( 'LOGO', Config::getValue( 'main/logo' ) ); @@ -50,8 +58,6 @@ class DefaultLoader extends Loader { Components::set( 'topNavRight', Template::parse( App::$topNavRight . '{STATUS}' ) ); Components::set( 'topNavLeft', Navigation::getMenuView( 'nav.main', 'MENU_LINKS', App::MAIN_MENU_NAME ) ); - Components::set( 'JQUERY_CDN', self::JQUERY_CDN ); - Components::set( 'FONT_AWESOME_URL', self::FONT_AWESOME_URL ); Components::set( 'colorSelect', Views::simpleView( 'forms.colorSelect' ) ); Components::set( 'iconSelect', Views::simpleView( 'forms.iconSelect' ) ); Navigation::setCrumbComponent( 'BREADCRUMB', Input::get( 'url' ) ); diff --git a/composer.json b/composer.json index 7dca47f..38180ab 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,7 @@ "thetempusproject/bedrock": "1.0.10", "thetempusproject/canary": "1.0.5", "thetempusproject/houdini": "1.0.8", + "components/jquery": "1.9.*", "twbs/bootstrap": "3.3.7" }, "autoload": @@ -55,8 +56,11 @@ { "optimize-autoloader": true, "preferred-install": "dist", - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "robloach/component-installer": true + } }, "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index f0ceefa..c9e4b7e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,60 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7e218ec992062f8f552f6fceea5bda9c", + "content-hash": "4d87b4a533236913cbbc0e75664016de", "packages": [ + { + "name": "components/jquery", + "version": "1.9.1", + "source": { + "type": "git", + "url": "https://github.com/components/jquery.git", + "reference": "ae5c0c13cf163b3751ce55f9d9e97c1ba7ff796d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/components/jquery/zipball/ae5c0c13cf163b3751ce55f9d9e97c1ba7ff796d", + "reference": "ae5c0c13cf163b3751ce55f9d9e97c1ba7ff796d", + "shasum": "" + }, + "require": { + "robloach/component-installer": "*" + }, + "type": "component", + "extra": { + "component": { + "scripts": [ + "jquery.js" + ], + "files": [ + "jquery.min.js", + "jquery-migrate.js", + "jquery-migrate.min.js", + "jquery.min.map" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Resig", + "email": "jeresig@gmail.com" + } + ], + "description": "jQuery JavaScript Library", + "homepage": "http://jquery.com", + "support": { + "forum": "http://forum.jquery.com", + "irc": "irc://irc.freenode.org/jquery", + "issues": "http://bugs.jquery.com", + "source": "https://github.com/jquery/jquery", + "wiki": "http://docs.jquery.com/" + }, + "time": "2014-10-11T11:52:45+00:00" + }, { "name": "fortawesome/font-awesome", "version": "v4.7.0", @@ -58,6 +110,197 @@ }, "time": "2016-10-24T15:52:54+00:00" }, + { + "name": "kriswallsmith/assetic", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/kriswallsmith/assetic.git", + "reference": "e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1", + "reference": "e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1", + "shasum": "" + }, + "require": { + "php": ">=5.3.1", + "symfony/process": "~2.1|~3.0" + }, + "conflict": { + "twig/twig": "<1.27" + }, + "require-dev": { + "leafo/lessphp": "^0.3.7", + "leafo/scssphp": "~0.1", + "meenie/javascript-packer": "^1.1", + "mrclay/minify": "<2.3", + "natxet/cssmin": "3.0.4", + "patchwork/jsqueeze": "~1.0|~2.0", + "phpunit/phpunit": "~4.8 || ^5.6", + "psr/log": "~1.0", + "ptachoire/cssembed": "~1.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "twig/twig": "~1.23|~2.0", + "yfix/packager": "dev-master" + }, + "suggest": { + "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", + "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", + "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin", + "patchwork/jsqueeze": "Assetic provides the integration with the JSqueeze JavaScript compressor", + "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", + "twig/twig": "Assetic provides the integration with the Twig templating engine" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-0": { + "Assetic": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" + } + ], + "description": "Asset Management for PHP", + "homepage": "https://github.com/kriswallsmith/assetic", + "keywords": [ + "assets", + "compression", + "minification" + ], + "support": { + "issues": "https://github.com/kriswallsmith/assetic/issues", + "source": "https://github.com/kriswallsmith/assetic/tree/master" + }, + "time": "2016-11-11T18:43:20+00:00" + }, + { + "name": "robloach/component-installer", + "version": "0.0.12", + "source": { + "type": "git", + "url": "https://github.com/RobLoach/component-installer.git", + "reference": "1864f25db21fc173e02a359f646acd596c1b0460" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/RobLoach/component-installer/zipball/1864f25db21fc173e02a359f646acd596c1b0460", + "reference": "1864f25db21fc173e02a359f646acd596c1b0460", + "shasum": "" + }, + "require": { + "kriswallsmith/assetic": "1.*", + "php": ">=5.3.2" + }, + "require-dev": { + "composer/composer": "1.*" + }, + "type": "composer-installer", + "extra": { + "class": "ComponentInstaller\\Installer" + }, + "autoload": { + "psr-0": { + "ComponentInstaller": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Rob Loach", + "email": "robloach@gmail.com", + "homepage": "http://robloach.net" + } + ], + "description": "Allows installation of Components via Composer.", + "support": { + "issues": "https://github.com/RobLoach/component-installer/issues", + "source": "https://github.com/RobLoach/component-installer/tree/master" + }, + "abandoned": "oomphinc/composer-installers-extender", + "time": "2013-08-31T23:46:48+00:00" + }, + { + "name": "symfony/process", + "version": "v3.4.47", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "b8648cf1d5af12a44a51d07ef9bf980921f15fca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/b8648cf1d5af12a44a51d07ef9bf980921f15fca", + "reference": "b8648cf1d5af12a44a51d07ef9bf980921f15fca", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Process Component", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v3.4.47" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-10-24T10:57:07+00:00" + }, { "name": "thetempusproject/bedrock", "version": "1.0.10", @@ -297,5 +540,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" }