From 40ab364cd29fd5eefcc7f5d7147c5bb93416aed1 Mon Sep 17 00:00:00 2001 From: yarik Date: Thu, 16 Mar 2017 00:28:00 +0200 Subject: [PATCH] Page --- backend/config/main.php | 21 +++++++++++---------- composer.json | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- composer.lock | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 177 insertions(+), 65 deletions(-) diff --git a/backend/config/main.php b/backend/config/main.php index 8ee5909..76f52e5 100644 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -12,19 +12,20 @@ 'basePath' => dirname(__DIR__), 'controllerNamespace' => 'backend\controllers', 'bootstrap' => [ 'log' ], - 'controllerMap' => [ + 'controllerMap' => [ 'settings' => 'artweb\artbox\core\controllers\SettingsController', 'profile' => 'artweb\artbox\core\controllers\ProfileController', + 'page' => 'artweb\artbox\core\controllers\PageController', ], 'modules' => [ 'imagemanager' => [ - 'class' => 'noam148\imagemanager\Module', - 'canUploadImage' => true, - 'canRemoveImage' => function(){ + 'class' => 'noam148\imagemanager\Module', + 'canUploadImage' => true, + 'canRemoveImage' => function () { return true; }, 'setBlameableBehavior' => false, - 'cssFiles' => [ + 'cssFiles' => [ 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css', ], ], @@ -43,14 +44,14 @@ ], ], ], - 'filedb' => [ + 'filedb' => [ 'class' => 'yii2tech\filedb\Connection', - 'path' => '@common/config', + 'path' => '@common/config', ], 'imagemanager' => [ - 'class' => 'noam148\imagemanager\components\ImageManagerGetPath', - 'mediaPath' => dirname(dirname(__DIR__)) . '/storage', - 'cachePath' => 'assets/images', + 'class' => 'noam148\imagemanager\components\ImageManagerGetPath', + 'mediaPath' => dirname(dirname(__DIR__)) . '/storage', + 'cachePath' => 'assets/images', 'useFilename' => true, 'absoluteUrl' => false, ], diff --git a/composer.json b/composer.json index b54b839..771a39d 100644 --- a/composer.json +++ b/composer.json @@ -1,55 +1,60 @@ { - "name": "yiisoft/yii2-app-advanced", - "description": "Yii 2 Advanced Project Template", - "keywords": ["yii2", "framework", "advanced", "project template"], - "homepage": "http://www.yiiframework.com/", - "type": "project", - "license": "BSD-3-Clause", - "support": { - "issues": "https://github.com/yiisoft/yii2/issues?state=open", - "forum": "http://www.yiiframework.com/forum/", - "wiki": "http://www.yiiframework.com/wiki/", - "irc": "irc://irc.freenode.net/yii", - "source": "https://github.com/yiisoft/yii2" - }, - "minimum-stability": "stable", - "require": { - "php": ">=5.4.0", - "yiisoft/yii2": "~2.0.6", - "yiisoft/yii2-bootstrap": "~2.0.0", - "yiisoft/yii2-swiftmailer": "~2.0.0", - "insolita/yii2-migration-generator": "~2.2", - "yiister/yii2-gentelella": "~1.0", - "hiqdev/yii2-asset-icheck": "1.0.2.5", - "noam148/yii2-image-manager": "*", - "yii2tech/filedb": "^1.0", - "hiqdev/yii2-asset-pnotify": "^2.1", - "yiisoft/yii2-imagine": "*" - }, - "require-dev": { - "yiisoft/yii2-debug": "~2.0.0", - "yiisoft/yii2-gii": "~2.0.0", - "yiisoft/yii2-faker": "~2.0.0", - - "codeception/base": "^2.2.3", - "codeception/verify": "~0.3.1" - }, - "config": { - "process-timeout": 1800 - }, - "extra": { - "asset-installer-paths": { - "npm-asset-library": "vendor/npm", - "bower-asset-library": "vendor/bower" - } - }, - "scripts": { - "post-install-cmd": "php init --env=Development --overwrite=n" - }, - "autoload": { - "psr-4": { - "artweb\\artbox\\core\\": "artweb/artbox-core/", - "artweb\\artbox\\gentelella\\": "artweb/artbox-gentelella/" - } + "name": "yiisoft/yii2-app-advanced", + "description": "Yii 2 Advanced Project Template", + "keywords": [ + "yii2", + "framework", + "advanced", + "project template" + ], + "homepage": "http://www.yiiframework.com/", + "type": "project", + "license": "BSD-3-Clause", + "support": { + "issues": "https://github.com/yiisoft/yii2/issues?state=open", + "forum": "http://www.yiiframework.com/forum/", + "wiki": "http://www.yiiframework.com/wiki/", + "irc": "irc://irc.freenode.net/yii", + "source": "https://github.com/yiisoft/yii2" + }, + "minimum-stability": "stable", + "require": { + "php": ">=5.4.0", + "yiisoft/yii2": "~2.0.6", + "yiisoft/yii2-bootstrap": "~2.0.0", + "yiisoft/yii2-swiftmailer": "~2.0.0", + "insolita/yii2-migration-generator": "~2.2", + "yiister/yii2-gentelella": "~1.0", + "hiqdev/yii2-asset-icheck": "1.0.2.5", + "noam148/yii2-image-manager": "*", + "yii2tech/filedb": "^1.0", + "hiqdev/yii2-asset-pnotify": "^2.1", + "yiisoft/yii2-imagine": "*", + "2amigos/yii2-tinymce-widget": "*" + }, + "require-dev": { + "yiisoft/yii2-debug": "~2.0.0", + "yiisoft/yii2-gii": "~2.0.0", + "yiisoft/yii2-faker": "~2.0.0", + "codeception/base": "^2.2.3", + "codeception/verify": "~0.3.1" + }, + "config": { + "process-timeout": 1800 + }, + "extra": { + "asset-installer-paths": { + "npm-asset-library": "vendor/npm", + "bower-asset-library": "vendor/bower" } + }, + "scripts": { + "post-install-cmd": "php init --env=Development --overwrite=n" + }, + "autoload": { + "psr-4": { + "artweb\\artbox\\core\\": "artweb/artbox-core/", + "artweb\\artbox\\gentelella\\": "artweb/artbox-gentelella/" + } + } } diff --git a/composer.lock b/composer.lock index d0035c3..0e4bebe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,10 +4,70 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "50bead4b144ecff641e219af923843cf", - "content-hash": "8378306ade4a941663a7b7c576be312a", + "hash": "372abdde08fd6123bb4e2d1719a5b96e", + "content-hash": "a4388a61af3f169567e804b653d72990", "packages": [ { + "name": "2amigos/yii2-tinymce-widget", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/2amigos/yii2-tinymce-widget.git", + "reference": "d58bad3ede450f86acd475fb4ecda982b980132b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/2amigos/yii2-tinymce-widget/zipball/d58bad3ede450f86acd475fb4ecda982b980132b", + "reference": "d58bad3ede450f86acd475fb4ecda982b980132b", + "shasum": "" + }, + "require": { + "tinymce/tinymce": ">=4", + "yiisoft/yii2": "~2.0.0" + }, + "require-dev": { + "phpunit/phpunit": "4.*" + }, + "type": "yii2-extension", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + }, + "asset-installer-paths": { + "bower-asset-library": "vendor/bower" + } + }, + "autoload": { + "psr-4": { + "dosamigos\\tinymce\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "2amigOS! Consulting Group", + "email": "hola@2amigos.us", + "homepage": "http://2amigos.us", + "role": "Developer" + } + ], + "description": "TinyMCE widget for Yii2.", + "homepage": "http://yiiwheels.com/extension/tinymce-widget", + "keywords": [ + "2amigos", + "extension", + "tinymce", + "widget", + "yii", + "yii 2", + "yii2" + ], + "time": "2015-03-28 21:53:43" + }, + { "name": "bower-asset/bootstrap", "version": "v3.3.7", "source": { @@ -22,7 +82,7 @@ "shasum": "" }, "require": { - "bower-asset/jquery": ">=1.9.1,<4.0" + "bower-asset/jquery": ">=1.9.1,<=3" }, "type": "bower-asset-library", "extra": { @@ -1161,6 +1221,52 @@ "time": "2017-02-13 07:52:53" }, { + "name": "tinymce/tinymce", + "version": "4.5.5", + "source": { + "type": "git", + "url": "https://github.com/tinymce/tinymce-dist.git", + "reference": "d6dda8ceadf741fce2cf808790080a589877d6e6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/d6dda8ceadf741fce2cf808790080a589877d6e6", + "reference": "d6dda8ceadf741fce2cf808790080a589877d6e6", + "shasum": "" + }, + "type": "component", + "extra": { + "component": { + "scripts": [ + "tinymce.js", + "plugins/*/plugin.js", + "themes/*/theme.js" + ], + "files": [ + "tinymce.min.js", + "plugins/*/plugin.min.js", + "themes/*/theme.min.js", + "skins/**" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1" + ], + "description": "Web based JavaScript HTML WYSIWYG editor control.", + "homepage": "http://www.tinymce.com", + "keywords": [ + "editor", + "html", + "javascript", + "richtext", + "tinymce", + "wysiwyg" + ], + "time": "2017-03-07 13:29:55" + }, + { "name": "yii2tech/filedb", "version": "1.0.3", "source": { -- libgit2 0.21.4