From 44ff45c54387a56faff6d4505d325f0f4d66fe99 Mon Sep 17 00:00:00 2001 From: iron Date: Mon, 18 Nov 2019 10:18:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E9=A1=B9=E7=9B=AE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- {kcadmin => backend}/assets/AppAsset.php | 2 +- {kcadmin => backend}/config/.gitignore | 0 {kcadmin => backend}/config/bootstrap.php | 0 {kcadmin => backend}/config/main.php | 10 +++++----- {kcadmin => backend}/config/params.php | 0 .../controllers/CategoryController.php | 2 +- {kcadmin => backend}/controllers/SiteController.php | 2 +- {kcadmin => backend}/models/.gitkeep | 0 {kcadmin => backend}/runtime/.gitignore | 0 {kcadmin => backend}/views/category/_form.php | 0 {kcadmin => backend}/views/category/_search.php | 0 {kcadmin => backend}/views/category/create.php | 0 {kcadmin => backend}/views/category/index.php | 0 {kcadmin => backend}/views/category/test.php | 0 {kcadmin => backend}/views/category/update.php | 0 {kcadmin => backend}/views/category/view.php | 0 {kcadmin => backend}/views/layouts/base.php | 2 +- {kcadmin => backend}/views/layouts/breadcrumb.php | 0 {kcadmin => backend}/views/layouts/footer.php | 0 {kcadmin => backend}/views/layouts/header.php | 0 {kcadmin => backend}/views/layouts/main.php | 2 +- {kcadmin => backend}/views/layouts/sidebar.php | 0 {kcadmin => backend}/views/site/error.php | 0 {kcadmin => backend}/views/site/index.php | 0 {kcadmin => backend}/views/site/login.php | 0 {kcadmin => backend}/views/site/test.php | 0 {kcadmin => backend}/web/assets/.gitignore | 0 {kcadmin => backend}/web/css/reset.css | 0 {kcadmin => backend}/web/css/site.css | 0 {kcadmin => backend}/web/favicon.ico | Bin {kcadmin => backend}/web/img/avatar.png | Bin {kcadmin => backend}/web/img/avatar04.png | Bin {kcadmin => backend}/web/img/avatar2.png | Bin {kcadmin => backend}/web/img/avatar3.png | Bin {kcadmin => backend}/web/img/avatar5.png | Bin .../web/img/credit/american-express.png | Bin {kcadmin => backend}/web/img/credit/cirrus.png | Bin {kcadmin => backend}/web/img/credit/mastercard.png | Bin {kcadmin => backend}/web/img/credit/mestro.png | Bin {kcadmin => backend}/web/img/credit/paypal.png | Bin {kcadmin => backend}/web/img/credit/paypal2.png | Bin {kcadmin => backend}/web/img/credit/visa.png | Bin {kcadmin => backend}/web/img/default-50x50.gif | Bin {kcadmin => backend}/web/img/icons.png | Bin {kcadmin => backend}/web/img/logo.jpeg | Bin {kcadmin => backend}/web/img/photo1.png | Bin {kcadmin => backend}/web/img/photo2.png | Bin {kcadmin => backend}/web/img/photo3.jpg | Bin {kcadmin => backend}/web/img/photo4.jpg | Bin {kcadmin => backend}/web/img/user1-128x128.jpg | Bin {kcadmin => backend}/web/img/user2-160x160.jpg | Bin {kcadmin => backend}/web/img/user3-128x128.jpg | Bin {kcadmin => backend}/web/img/user4-128x128.jpg | Bin {kcadmin => backend}/web/img/user5-128x128.jpg | Bin {kcadmin => backend}/web/img/user6-128x128.jpg | Bin {kcadmin => backend}/web/img/user7-128x128.jpg | Bin {kcadmin => backend}/web/img/user8-128x128.jpg | Bin {kcadmin => backend}/web/index.php | 0 {kcadmin => backend}/web/js/common.js | 0 common/config/bootstrap.php | 2 +- 61 files changed, 12 insertions(+), 12 deletions(-) rename {kcadmin => backend}/assets/AppAsset.php (94%) rename {kcadmin => backend}/config/.gitignore (100%) rename {kcadmin => backend}/config/bootstrap.php (100%) rename {kcadmin => backend}/config/main.php (84%) rename {kcadmin => backend}/config/params.php (100%) rename {kcadmin => backend}/controllers/CategoryController.php (99%) rename {kcadmin => backend}/controllers/SiteController.php (98%) rename {kcadmin => backend}/models/.gitkeep (100%) rename {kcadmin => backend}/runtime/.gitignore (100%) rename {kcadmin => backend}/views/category/_form.php (100%) rename {kcadmin => backend}/views/category/_search.php (100%) rename {kcadmin => backend}/views/category/create.php (100%) rename {kcadmin => backend}/views/category/index.php (100%) rename {kcadmin => backend}/views/category/test.php (100%) rename {kcadmin => backend}/views/category/update.php (100%) rename {kcadmin => backend}/views/category/view.php (100%) rename {kcadmin => backend}/views/layouts/base.php (96%) rename {kcadmin => backend}/views/layouts/breadcrumb.php (100%) rename {kcadmin => backend}/views/layouts/footer.php (100%) rename {kcadmin => backend}/views/layouts/header.php (100%) rename {kcadmin => backend}/views/layouts/main.php (97%) rename {kcadmin => backend}/views/layouts/sidebar.php (100%) rename {kcadmin => backend}/views/site/error.php (100%) rename {kcadmin => backend}/views/site/index.php (100%) rename {kcadmin => backend}/views/site/login.php (100%) rename {kcadmin => backend}/views/site/test.php (100%) rename {kcadmin => backend}/web/assets/.gitignore (100%) rename {kcadmin => backend}/web/css/reset.css (100%) rename {kcadmin => backend}/web/css/site.css (100%) rename {kcadmin => backend}/web/favicon.ico (100%) rename {kcadmin => backend}/web/img/avatar.png (100%) rename {kcadmin => backend}/web/img/avatar04.png (100%) rename {kcadmin => backend}/web/img/avatar2.png (100%) rename {kcadmin => backend}/web/img/avatar3.png (100%) rename {kcadmin => backend}/web/img/avatar5.png (100%) rename {kcadmin => backend}/web/img/credit/american-express.png (100%) rename {kcadmin => backend}/web/img/credit/cirrus.png (100%) rename {kcadmin => backend}/web/img/credit/mastercard.png (100%) rename {kcadmin => backend}/web/img/credit/mestro.png (100%) rename {kcadmin => backend}/web/img/credit/paypal.png (100%) rename {kcadmin => backend}/web/img/credit/paypal2.png (100%) rename {kcadmin => backend}/web/img/credit/visa.png (100%) rename {kcadmin => backend}/web/img/default-50x50.gif (100%) rename {kcadmin => backend}/web/img/icons.png (100%) rename {kcadmin => backend}/web/img/logo.jpeg (100%) rename {kcadmin => backend}/web/img/photo1.png (100%) rename {kcadmin => backend}/web/img/photo2.png (100%) rename {kcadmin => backend}/web/img/photo3.jpg (100%) rename {kcadmin => backend}/web/img/photo4.jpg (100%) rename {kcadmin => backend}/web/img/user1-128x128.jpg (100%) rename {kcadmin => backend}/web/img/user2-160x160.jpg (100%) rename {kcadmin => backend}/web/img/user3-128x128.jpg (100%) rename {kcadmin => backend}/web/img/user4-128x128.jpg (100%) rename {kcadmin => backend}/web/img/user5-128x128.jpg (100%) rename {kcadmin => backend}/web/img/user6-128x128.jpg (100%) rename {kcadmin => backend}/web/img/user7-128x128.jpg (100%) rename {kcadmin => backend}/web/img/user8-128x128.jpg (100%) rename {kcadmin => backend}/web/index.php (100%) rename {kcadmin => backend}/web/js/common.js (100%) diff --git a/.gitignore b/.gitignore index e6d67bc..a73b817 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,4 @@ phpunit.phar /.vagrant vendor.zip /vagrant -/kcadmin/web/uploads +/backend/web/uploads diff --git a/kcadmin/assets/AppAsset.php b/backend/assets/AppAsset.php similarity index 94% rename from kcadmin/assets/AppAsset.php rename to backend/assets/AppAsset.php index d4f192e..6a7b360 100644 --- a/kcadmin/assets/AppAsset.php +++ b/backend/assets/AppAsset.php @@ -1,6 +1,6 @@ 'kcadmin', + 'id' => 'backend', 'basePath' => dirname(__DIR__), - 'controllerNamespace' => 'kcadmin\controllers', + 'controllerNamespace' => 'backend\controllers', 'bootstrap' => ['log'], 'modules' => [], 'components' => [ 'request' => [ - 'csrfParam' => '_csrf-kcadmin', + 'csrfParam' => '_csrf-backend', ], 'user' => [ 'identityClass' => 'common\models\User', 'enableAutoLogin' => true, - 'identityCookie' => ['name' => '_identity-kcadmin', 'httpOnly' => true], + 'identityCookie' => ['name' => '_identity-backend', 'httpOnly' => true], ], 'session' => [ // this is the name of the session cookie used for login on the app - 'name' => 'kcadmin', + 'name' => 'backend', ], 'log' => [ 'traceLevel' => YII_DEBUG ? 3 : 0, diff --git a/kcadmin/config/params.php b/backend/config/params.php similarity index 100% rename from kcadmin/config/params.php rename to backend/config/params.php diff --git a/kcadmin/controllers/CategoryController.php b/backend/controllers/CategoryController.php similarity index 99% rename from kcadmin/controllers/CategoryController.php rename to backend/controllers/CategoryController.php index 1ae4c9a..d77d626 100644 --- a/kcadmin/controllers/CategoryController.php +++ b/backend/controllers/CategoryController.php @@ -1,6 +1,6 @@