Yarik / artbox-blog

Commit 0194ad48a5ba7f5fa17944938a12a70c8674228c

Authored by Yarik
1 parent 6813d2d0

Namespaces

Showing 14 changed files with 30 additions and 28 deletions   Show diff stats
Inline Side-by-side
@@ -5,7 +5,9 @@ @@ -5,7 +5,9 @@
5 "require": { 5 "require": {
6 "php": ">=7.0", 6 "php": ">=7.0",
7 "yiisoft/yii2": "*", 7 "yiisoft/yii2": "*",
8 - "developeruz/yii2-db-rbac": "*" 8 + "artweb/artbox": "dev-master",
  9 + "artweb/artbox/ecommerce": "dev-master",
  10 + "artweb/artbox/language": "dev-master"
9 }, 11 },
10 "autoload": { 12 "autoload": {
11 "psr-4": { 13 "psr-4": {
controllers/BlogArticleController.php
  Show/Hide comments   View file @0194ad4
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 4
5 use artweb\artbox\blog\models\BlogCategory; 5 use artweb\artbox\blog\models\BlogCategory;
6 use artweb\artbox\blog\models\BlogTag; 6 use artweb\artbox\blog\models\BlogTag;
7 - use common\modules\product\models\Product; 7 + use artweb\artbox\ecommerce\models\Product;
8 use Yii; 8 use Yii;
9 use artweb\artbox\blog\models\BlogArticle; 9 use artweb\artbox\blog\models\BlogArticle;
10 use artweb\artbox\blog\models\BlogArticleSearch; 10 use artweb\artbox\blog\models\BlogArticleSearch;
models/BlogArticle.php
  Show/Hide comments   View file @0194ad4
@@ -2,12 +2,12 @@ @@ -2,12 +2,12 @@
2 2
3 namespace artweb\artbox\blog\models; 3 namespace artweb\artbox\blog\models;
4 4
5 - use common\behaviors\SaveImgBehavior; 5 + use artweb\artbox\behaviors\SaveImgBehavior;
6 use yii\behaviors\TimestampBehavior; 6 use yii\behaviors\TimestampBehavior;
7 use yii\db\ActiveRecord; 7 use yii\db\ActiveRecord;
8 - use common\modules\language\behaviors\LanguageBehavior;  
9 - use common\modules\language\models\Language;  
10 - use common\modules\product\models\Product; 8 + use artweb\artbox\language\behaviors\LanguageBehavior;
  9 + use artweb\artbox\language\models\Language;
  10 + use artweb\artbox\ecommerce\models\Product;
11 use yii\db\ActiveQuery; 11 use yii\db\ActiveQuery;
12 use yii\web\Request; 12 use yii\web\Request;
13 13
models/BlogArticleLang.php
  Show/Hide comments   View file @0194ad4
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 namespace artweb\artbox\blog\models; 3 namespace artweb\artbox\blog\models;
4 4
5 - use common\modules\language\models\Language; 5 + use artweb\artbox\language\models\Language;
6 use yii\db\ActiveRecord; 6 use yii\db\ActiveRecord;
7 7
8 /** 8 /**
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 { 36 {
37 return [ 37 return [
38 'slug' => [ 38 'slug' => [
39 - 'class' => 'common\behaviors\Slug', 39 + 'class' => 'artweb\artbox\behaviors\Slug',
40 ], 40 ],
41 ]; 41 ];
42 } 42 }
models/BlogCategory.php
  Show/Hide comments   View file @0194ad4
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 namespace artweb\artbox\blog\models; 3 namespace artweb\artbox\blog\models;
4 4
5 use yii\db\ActiveRecord; 5 use yii\db\ActiveRecord;
6 - use common\modules\language\behaviors\LanguageBehavior;  
7 - use common\behaviors\SaveImgBehavior;  
8 - use common\modules\language\models\Language; 6 + use artweb\artbox\language\behaviors\LanguageBehavior;
  7 + use artweb\artbox\behaviors\SaveImgBehavior;
  8 + use artweb\artbox\language\models\Language;
9 use yii\db\ActiveQuery; 9 use yii\db\ActiveQuery;
10 use yii\web\Request; 10 use yii\web\Request;
11 11
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 'class' => LanguageBehavior::className(), 77 'class' => LanguageBehavior::className(),
78 ], 78 ],
79 'Slug' => [ 79 'Slug' => [
80 - 'class' => 'common\behaviors\Slug', 80 + 'class' => 'artweb\artbox\behaviors\Slug',
81 ], 81 ],
82 ]; 82 ];
83 } 83 }
models/BlogCategoryLang.php
  Show/Hide comments   View file @0194ad4
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 namespace artweb\artbox\blog\models; 3 namespace artweb\artbox\blog\models;
4 4
5 use yii\db\ActiveRecord; 5 use yii\db\ActiveRecord;
6 - use common\modules\language\models\Language; 6 + use artweb\artbox\language\models\Language;
7 7
8 /** 8 /**
9 * This is the model class for table "blog_category_lang". 9 * This is the model class for table "blog_category_lang".
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 { 35 {
36 return [ 36 return [
37 'slug' => [ 37 'slug' => [
38 - 'class' => 'common\behaviors\Slug', 38 + 'class' => 'artweb\artbox\behaviors\Slug',
39 ], 39 ],
40 ]; 40 ];
41 } 41 }
models/BlogTag.php
  Show/Hide comments   View file @0194ad4
@@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
3 namespace artweb\artbox\blog\models; 3 namespace artweb\artbox\blog\models;
4 4
5 use yii\db\ActiveRecord; 5 use yii\db\ActiveRecord;
6 - use common\modules\language\behaviors\LanguageBehavior;  
7 - use common\modules\language\models\Language; 6 + use artweb\artbox\language\behaviors\LanguageBehavior;
  7 + use artweb\artbox\language\models\Language;
8 use yii\db\ActiveQuery; 8 use yii\db\ActiveQuery;
9 use yii\web\Request; 9 use yii\web\Request;
10 10
models/BlogTagLang.php
  Show/Hide comments   View file @0194ad4
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 namespace artweb\artbox\blog\models; 3 namespace artweb\artbox\blog\models;
4 4
5 - use common\modules\language\models\Language; 5 + use artweb\artbox\language\models\Language;
6 use yii\db\ActiveRecord; 6 use yii\db\ActiveRecord;
7 7
8 /** 8 /**
views/blog-article/_form.php
  Show/Hide comments   View file @0194ad4
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 use yii\helpers\Html; 8 use yii\helpers\Html;
9 use yii\web\View; 9 use yii\web\View;
10 use yii\widgets\ActiveForm; 10 use yii\widgets\ActiveForm;
11 - use common\modules\language\widgets\LanguageForm; 11 + use artweb\artbox\language\widgets\LanguageForm;
12 use yii\web\JsExpression; 12 use yii\web\JsExpression;
13 13
14 /** 14 /**
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 'gif', 92 'gif',
93 'png', 93 'png',
94 ], 94 ],
95 - 'initialPreview' => !empty( $model->imageUrl ) ? \common\components\artboximage\ArtboxImageHelper::getImage( 95 + 'initialPreview' => !empty( $model->imageUrl ) ? \artweb\artbox\components\artboximage\ArtboxImageHelper::getImage(
96 $model->imageUrl, 96 $model->imageUrl,
97 'list' 97 'list'
98 ) : '', 98 ) : '',
views/blog-article/_form_language.php
  Show/Hide comments   View file @0194ad4
1 <?php 1 <?php
2 - use common\models\ArticleLang;  
3 - use common\modules\language\models\Language; 2 + use artweb\artbox\models\ArticleLang;
  3 + use artweb\artbox\language\models\Language;
4 use mihaildev\ckeditor\CKEditor; 4 use mihaildev\ckeditor\CKEditor;
5 use mihaildev\elfinder\ElFinder; 5 use mihaildev\elfinder\ElFinder;
6 use yii\web\View; 6 use yii\web\View;
views/blog-category/_form.php
  Show/Hide comments   View file @0194ad4
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 use yii\helpers\Html; 6 use yii\helpers\Html;
7 use yii\web\View; 7 use yii\web\View;
8 use yii\widgets\ActiveForm; 8 use yii\widgets\ActiveForm;
9 - use common\modules\language\widgets\LanguageForm; 9 + use artweb\artbox\language\widgets\LanguageForm;
10 10
11 /** 11 /**
12 * @var View $this 12 * @var View $this
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 'gif', 51 'gif',
52 'png', 52 'png',
53 ], 53 ],
54 - 'initialPreview' => !empty( $model->imageUrl ) ? \common\components\artboximage\ArtboxImageHelper::getImage( 54 + 'initialPreview' => !empty( $model->imageUrl ) ? \artweb\artbox\components\artboximage\ArtboxImageHelper::getImage(
55 $model->imageUrl, 55 $model->imageUrl,
56 'list' 56 'list'
57 ) : '', 57 ) : '',
views/blog-category/_form_language.php
  Show/Hide comments   View file @0194ad4
1 <?php 1 <?php
2 - use common\models\ArticleLang;  
3 - use common\modules\language\models\Language; 2 + use artweb\artbox\models\ArticleLang;
  3 + use artweb\artbox\language\models\Language;
4 use yii\web\View; 4 use yii\web\View;
5 use yii\widgets\ActiveForm; 5 use yii\widgets\ActiveForm;
6 6
views/blog-tag/_form.php
  Show/Hide comments   View file @0194ad4
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 use yii\helpers\Html; 5 use yii\helpers\Html;
6 use yii\web\View; 6 use yii\web\View;
7 use yii\widgets\ActiveForm; 7 use yii\widgets\ActiveForm;
8 - use common\modules\language\widgets\LanguageForm; 8 + use artweb\artbox\language\widgets\LanguageForm;
9 9
10 /** 10 /**
11 * @var View $this 11 * @var View $this
views/blog-tag/_form_language.php
  Show/Hide comments   View file @0194ad4
1 <?php 1 <?php
2 - use common\models\ArticleLang;  
3 - use common\modules\language\models\Language; 2 + use artweb\artbox\models\ArticleLang;
  3 + use artweb\artbox\language\models\Language;
4 use yii\web\View; 4 use yii\web\View;
5 use yii\widgets\ActiveForm; 5 use yii\widgets\ActiveForm;
6 6