Commit 9576f4025edb5ee2902bfd9978d1000bf7ed96cc
1 parent
fdaf05bd
Namespaces and aliases
Showing
13 changed files
with
48 additions
and
50 deletions
Show diff stats
1 | +# Change Log | ||
2 | +All notable changes to this project will be documented in this file. | ||
3 | + | ||
4 | +## 1.0.0 - 2017-03-21 | ||
5 | +### Added | ||
6 | +- This CHANGELOG file to hopefully serve as an evolving example of a standardized open source project CHANGELOG. | ||
7 | +- Added initial Artbox basic project. | ||
0 | \ No newline at end of file | 8 | \ No newline at end of file |
README.md
1 | -Yii 2 Advanced Project Template | 1 | +Artbox Basic Template |
2 | =============================== | 2 | =============================== |
3 | 3 | ||
4 | -Yii 2 Advanced Project Template is a skeleton [Yii 2](http://www.yiiframework.com/) application best for | ||
5 | -developing complex Web applications with multiple tiers. | 4 | +Artbox Basic Template is a skeleton [Yii 2](http://www.yiiframework.com/) application enhanced by |
5 | +light-weight CMS developed by Artweb. | ||
6 | 6 | ||
7 | The template includes three tiers: front end, back end, and console, each of which | 7 | The template includes three tiers: front end, back end, and console, each of which |
8 | is a separate Yii application. | 8 | is a separate Yii application. |
@@ -10,12 +10,6 @@ is a separate Yii application. | @@ -10,12 +10,6 @@ is a separate Yii application. | ||
10 | The template is designed to work in a team development environment. It supports | 10 | The template is designed to work in a team development environment. It supports |
11 | deploying the application in different environments. | 11 | deploying the application in different environments. |
12 | 12 | ||
13 | -Documentation is at [docs/guide/README.md](docs/guide/README.md). | ||
14 | - | ||
15 | -[](https://packagist.org/packages/yiisoft/yii2-app-advanced) | ||
16 | -[](https://packagist.org/packages/yiisoft/yii2-app-advanced) | ||
17 | -[](https://travis-ci.org/yiisoft/yii2-app-advanced) | ||
18 | - | ||
19 | DIRECTORY STRUCTURE | 13 | DIRECTORY STRUCTURE |
20 | ------------------- | 14 | ------------------- |
21 | 15 | ||
@@ -24,11 +18,11 @@ common | @@ -24,11 +18,11 @@ common | ||
24 | config/ contains shared configurations | 18 | config/ contains shared configurations |
25 | mail/ contains view files for e-mails | 19 | mail/ contains view files for e-mails |
26 | models/ contains model classes used in both backend and frontend | 20 | models/ contains model classes used in both backend and frontend |
27 | - tests/ contains tests for common classes | 21 | + tests/ contains tests for common classes |
22 | + widgets/ contains views render widgets | ||
28 | console | 23 | console |
29 | config/ contains console configurations | 24 | config/ contains console configurations |
30 | controllers/ contains console controllers (commands) | 25 | controllers/ contains console controllers (commands) |
31 | - migrations/ contains database migrations | ||
32 | models/ contains console-specific model classes | 26 | models/ contains console-specific model classes |
33 | runtime/ contains files generated during runtime | 27 | runtime/ contains files generated during runtime |
34 | backend | 28 | backend |
@@ -49,7 +43,6 @@ frontend | @@ -49,7 +43,6 @@ frontend | ||
49 | tests/ contains tests for frontend application | 43 | tests/ contains tests for frontend application |
50 | views/ contains view files for the Web application | 44 | views/ contains view files for the Web application |
51 | web/ contains the entry script and Web resources | 45 | web/ contains the entry script and Web resources |
52 | - widgets/ contains frontend widgets | ||
53 | vendor/ contains dependent 3rd-party packages | 46 | vendor/ contains dependent 3rd-party packages |
54 | environments/ contains environment-based overrides | 47 | environments/ contains environment-based overrides |
55 | ``` | 48 | ``` |
backend/config/main.php
@@ -15,11 +15,11 @@ | @@ -15,11 +15,11 @@ | ||
15 | 'controllerNamespace' => 'backend\controllers', | 15 | 'controllerNamespace' => 'backend\controllers', |
16 | 'bootstrap' => [ 'log' ], | 16 | 'bootstrap' => [ 'log' ], |
17 | 'controllerMap' => [ | 17 | 'controllerMap' => [ |
18 | - 'settings' => 'artweb\artbox\core\controllers\SettingsController', | ||
19 | - 'profile' => 'artweb\artbox\core\controllers\ProfileController', | ||
20 | - 'page' => 'artweb\artbox\core\controllers\PageController', | ||
21 | - 'seo' => 'artweb\artbox\core\controllers\AliasController', | ||
22 | - 'feedback' => 'artweb\artbox\core\controllers\FeedbackController', | 18 | + 'settings' => 'artbox\core\controllers\SettingsController', |
19 | + 'profile' => 'artbox\core\controllers\ProfileController', | ||
20 | + 'page' => 'artbox\core\controllers\PageController', | ||
21 | + 'seo' => 'artbox\core\controllers\AliasController', | ||
22 | + 'feedback' => 'artbox\core\controllers\FeedbackController', | ||
23 | ], | 23 | ], |
24 | 'modules' => [ | 24 | 'modules' => [ |
25 | 'imagemanager' => [ | 25 | 'imagemanager' => [ |
@@ -60,7 +60,7 @@ | @@ -60,7 +60,7 @@ | ||
60 | 'baseUrl' => '/admin', | 60 | 'baseUrl' => '/admin', |
61 | ], | 61 | ], |
62 | 'user' => [ | 62 | 'user' => [ |
63 | - 'identityClass' => 'artweb\artbox\core\models\User', | 63 | + 'identityClass' => 'artbox\core\models\User', |
64 | 'enableAutoLogin' => true, | 64 | 'enableAutoLogin' => true, |
65 | 'identityCookie' => [ | 65 | 'identityCookie' => [ |
66 | 'name' => '_identity-backend', | 66 | 'name' => '_identity-backend', |
backend/views/layouts/main.php
@@ -5,10 +5,10 @@ | @@ -5,10 +5,10 @@ | ||
5 | * @var View $this | 5 | * @var View $this |
6 | */ | 6 | */ |
7 | 7 | ||
8 | - use artweb\artbox\core\assets\ArtboxCoreAsset; | ||
9 | - use artweb\artbox\core\models\User; | ||
10 | - use artweb\artbox\core\widgets\FeedbackWidget; | ||
11 | - use artweb\artbox\core\widgets\FlashWidget; | 8 | + use artbox\core\assets\ArtboxCoreAsset; |
9 | + use artbox\core\models\User; | ||
10 | + use artbox\core\widgets\FeedbackWidget; | ||
11 | + use artbox\core\widgets\FlashWidget; | ||
12 | use hiqdev\assets\icheck\iCheckAsset; | 12 | use hiqdev\assets\icheck\iCheckAsset; |
13 | use hiqdev\assets\pnotify\PNotifyAsset; | 13 | use hiqdev\assets\pnotify\PNotifyAsset; |
14 | use yii\bootstrap\Html; | 14 | use yii\bootstrap\Html; |
backend/views/site/index.php
@@ -2,8 +2,6 @@ | @@ -2,8 +2,6 @@ | ||
2 | 2 | ||
3 | /* @var $this yii\web\View */ | 3 | /* @var $this yii\web\View */ |
4 | 4 | ||
5 | - use artweb\artbox\core\helpers\ImageHelper; | ||
6 | - | ||
7 | $this->title = 'My Yii Application'; | 5 | $this->title = 'My Yii Application'; |
8 | 6 | ||
9 | 7 | ||
10 | \ No newline at end of file | 8 | \ No newline at end of file |
common/config/bootstrap.php
@@ -4,5 +4,5 @@ | @@ -4,5 +4,5 @@ | ||
4 | Yii::setAlias('@backend', dirname(dirname(__DIR__)) . '/backend'); | 4 | Yii::setAlias('@backend', dirname(dirname(__DIR__)) . '/backend'); |
5 | Yii::setAlias('@console', dirname(dirname(__DIR__)) . '/console'); | 5 | Yii::setAlias('@console', dirname(dirname(__DIR__)) . '/console'); |
6 | Yii::setAlias('@storage', dirname(dirname(__DIR__)) . '/storage'); | 6 | Yii::setAlias('@storage', dirname(dirname(__DIR__)) . '/storage'); |
7 | - Yii::setAlias('@artbox-core', dirname(dirname(__DIR__)) . '/artweb/artbox-core'); | 7 | + Yii::setAlias('@artbox/core', dirname(dirname(__DIR__)) . '/artweb/artbox-core'); |
8 | 8 | ||
9 | \ No newline at end of file | 9 | \ No newline at end of file |
common/config/main.php
@@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
9 | 'translations' => [ | 9 | 'translations' => [ |
10 | 'core' => [ | 10 | 'core' => [ |
11 | 'class' => 'yii\i18n\PhpMessageSource', | 11 | 'class' => 'yii\i18n\PhpMessageSource', |
12 | - 'basePath' => '@artbox-core/messages', | 12 | + 'basePath' => '@artbox/core/messages', |
13 | ], | 13 | ], |
14 | ], | 14 | ], |
15 | ], | 15 | ], |
common/config/settings.php
@@ -7,13 +7,13 @@ return [ | @@ -7,13 +7,13 @@ return [ | ||
7 | 'description' => 'Site administrator', | 7 | 'description' => 'Site administrator', |
8 | 'analytics' => '<!-- Google Analytics --> | 8 | 'analytics' => '<!-- Google Analytics --> |
9 | <script> | 9 | <script> |
10 | -(function(i,s,o,g,r,a,m){i[\'GoogleAnalyticsObject\']=r;i[r]=i[r]||function(){ | ||
11 | -(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), | ||
12 | -m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) | ||
13 | -})(window,document,\'script\',\'https://www.google-analytics.com/analytics.js\',\'ga\'); | 10 | + (function(i,s,o,g,r,a,m){i[\'GoogleAnalyticsObject\']=r;i[r]=i[r]||function(){ |
11 | + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), | ||
12 | + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) | ||
13 | + })(window,document,\'script\',\'https://www.google-analytics.com/analytics.js\',\'ga\'); | ||
14 | 14 | ||
15 | -ga(\'create\', \'UA-XXXXX-Y\', \'auto\'); | ||
16 | -ga(\'send\', \'pageview\'); | 15 | + ga(\'create\', \'UA-54355086-1\', \'auto\'); |
16 | + ga(\'send\', \'pageview\'); | ||
17 | </script> | 17 | </script> |
18 | <!-- End Google Analytics -->', | 18 | <!-- End Google Analytics -->', |
19 | ], | 19 | ], |
common/models/LoginForm.php
composer.json
@@ -53,8 +53,8 @@ | @@ -53,8 +53,8 @@ | ||
53 | }, | 53 | }, |
54 | "autoload": { | 54 | "autoload": { |
55 | "psr-4": { | 55 | "psr-4": { |
56 | - "artweb\\artbox\\core\\": "artweb/artbox-core/", | ||
57 | - "artweb\\artbox\\gentelella\\": "artweb/artbox-gentelella/" | 56 | + "artbox\\core\\": "artweb/artbox-core/", |
57 | + "artbox\\gentelella\\": "artweb/artbox-gentelella/" | ||
58 | } | 58 | } |
59 | } | 59 | } |
60 | } | 60 | } |
composer.lock
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", | 4 | "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", |
5 | "This file is @generated automatically" | 5 | "This file is @generated automatically" |
6 | ], | 6 | ], |
7 | - "hash": "372abdde08fd6123bb4e2d1719a5b96e", | 7 | + "hash": "8edc03031d05841e190f26a89923f16a", |
8 | "content-hash": "a4388a61af3f169567e804b653d72990", | 8 | "content-hash": "a4388a61af3f169567e804b653d72990", |
9 | "packages": [ | 9 | "packages": [ |
10 | { | 10 | { |
@@ -1988,16 +1988,16 @@ | @@ -1988,16 +1988,16 @@ | ||
1988 | }, | 1988 | }, |
1989 | { | 1989 | { |
1990 | "name": "guzzlehttp/psr7", | 1990 | "name": "guzzlehttp/psr7", |
1991 | - "version": "1.4.1", | 1991 | + "version": "1.4.2", |
1992 | "source": { | 1992 | "source": { |
1993 | "type": "git", | 1993 | "type": "git", |
1994 | "url": "https://github.com/guzzle/psr7.git", | 1994 | "url": "https://github.com/guzzle/psr7.git", |
1995 | - "reference": "0d6c7ca039329247e4f0f8f8f6506810e8248855" | 1995 | + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" |
1996 | }, | 1996 | }, |
1997 | "dist": { | 1997 | "dist": { |
1998 | "type": "zip", | 1998 | "type": "zip", |
1999 | - "url": "https://api.github.com/repos/guzzle/psr7/zipball/0d6c7ca039329247e4f0f8f8f6506810e8248855", | ||
2000 | - "reference": "0d6c7ca039329247e4f0f8f8f6506810e8248855", | 1999 | + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", |
2000 | + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", | ||
2001 | "shasum": "" | 2001 | "shasum": "" |
2002 | }, | 2002 | }, |
2003 | "require": { | 2003 | "require": { |
@@ -2049,7 +2049,7 @@ | @@ -2049,7 +2049,7 @@ | ||
2049 | "uri", | 2049 | "uri", |
2050 | "url" | 2050 | "url" |
2051 | ], | 2051 | ], |
2052 | - "time": "2017-02-27 10:51:17" | 2052 | + "time": "2017-03-20 17:10:46" |
2053 | }, | 2053 | }, |
2054 | { | 2054 | { |
2055 | "name": "myclabs/deep-copy", | 2055 | "name": "myclabs/deep-copy", |
@@ -2591,16 +2591,16 @@ | @@ -2591,16 +2591,16 @@ | ||
2591 | }, | 2591 | }, |
2592 | { | 2592 | { |
2593 | "name": "phpunit/phpunit", | 2593 | "name": "phpunit/phpunit", |
2594 | - "version": "5.7.15", | 2594 | + "version": "5.7.17", |
2595 | "source": { | 2595 | "source": { |
2596 | "type": "git", | 2596 | "type": "git", |
2597 | "url": "https://github.com/sebastianbergmann/phpunit.git", | 2597 | "url": "https://github.com/sebastianbergmann/phpunit.git", |
2598 | - "reference": "b99112aecc01f62acf3d81a3f59646700a1849e5" | 2598 | + "reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf" |
2599 | }, | 2599 | }, |
2600 | "dist": { | 2600 | "dist": { |
2601 | "type": "zip", | 2601 | "type": "zip", |
2602 | - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b99112aecc01f62acf3d81a3f59646700a1849e5", | ||
2603 | - "reference": "b99112aecc01f62acf3d81a3f59646700a1849e5", | 2602 | + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/68752b665d3875f9a38a357e3ecb35c79f8673bf", |
2603 | + "reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf", | ||
2604 | "shasum": "" | 2604 | "shasum": "" |
2605 | }, | 2605 | }, |
2606 | "require": { | 2606 | "require": { |
@@ -2669,7 +2669,7 @@ | @@ -2669,7 +2669,7 @@ | ||
2669 | "testing", | 2669 | "testing", |
2670 | "xunit" | 2670 | "xunit" |
2671 | ], | 2671 | ], |
2672 | - "time": "2017-03-02 15:22:43" | 2672 | + "time": "2017-03-19 16:52:12" |
2673 | }, | 2673 | }, |
2674 | { | 2674 | { |
2675 | "name": "phpunit/phpunit-mock-objects", | 2675 | "name": "phpunit/phpunit-mock-objects", |
console/controllers/CreateController.php
frontend/views/layouts/main.php
@@ -3,8 +3,8 @@ | @@ -3,8 +3,8 @@ | ||
3 | /* @var $this \yii\web\View */ | 3 | /* @var $this \yii\web\View */ |
4 | /* @var $content string */ | 4 | /* @var $content string */ |
5 | 5 | ||
6 | - use artweb\artbox\core\models\Settings; | ||
7 | - use artweb\artbox\core\models\User; | 6 | + use artbox\core\models\Settings; |
7 | + use artbox\core\models\User; | ||
8 | use yii\helpers\Html; | 8 | use yii\helpers\Html; |
9 | use yii\bootstrap\Nav; | 9 | use yii\bootstrap\Nav; |
10 | use yii\bootstrap\NavBar; | 10 | use yii\bootstrap\NavBar; |