From 88b05cdfebd78a03ad399b42ed7fe94a0119dbc9 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sun, 9 Jun 2013 20:15:55 +0400 Subject: [PATCH] =?UTF-8?q?renamed=20backstage=20=E2=86=92=20backend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/advanced/README.md | 12 ++-- apps/advanced/backend/assets/.gitkeep | 1 + apps/advanced/backend/config/.gitignore | 2 + apps/advanced/backend/config/assets.php | 18 +++++ apps/advanced/backend/config/main.php | 40 +++++++++++ apps/advanced/backend/config/params.php | 5 ++ .../backend/controllers/SiteController.php | 33 +++++++++ apps/advanced/backend/models/.gitkeep | 1 + apps/advanced/backend/runtime/.gitignore | 2 + apps/advanced/backend/views/layouts/main.php | 64 ++++++++++++++++++ apps/advanced/backend/views/site/index.php | 47 +++++++++++++ apps/advanced/backend/views/site/login.php | 24 +++++++ apps/advanced/backend/www/.gitignore | 1 + apps/advanced/backend/www/assets/.gitignore | 2 + apps/advanced/backend/www/css/site.css | 78 ++++++++++++++++++++++ apps/advanced/backstage/assets/.gitkeep | 1 - apps/advanced/backstage/config/.gitignore | 2 - apps/advanced/backstage/config/assets.php | 18 ----- apps/advanced/backstage/config/main.php | 40 ----------- apps/advanced/backstage/config/params.php | 5 -- .../backstage/controllers/SiteController.php | 33 --------- apps/advanced/backstage/models/.gitkeep | 1 - apps/advanced/backstage/runtime/.gitignore | 2 - apps/advanced/backstage/views/layouts/main.php | 64 ------------------ apps/advanced/backstage/views/site/index.php | 47 ------------- apps/advanced/backstage/views/site/login.php | 24 ------- apps/advanced/backstage/www/.gitignore | 1 - apps/advanced/backstage/www/assets/.gitignore | 2 - apps/advanced/backstage/www/css/site.css | 78 ---------------------- apps/advanced/composer.json | 4 +- 30 files changed, 326 insertions(+), 326 deletions(-) create mode 100644 apps/advanced/backend/assets/.gitkeep create mode 100644 apps/advanced/backend/config/.gitignore create mode 100644 apps/advanced/backend/config/assets.php create mode 100644 apps/advanced/backend/config/main.php create mode 100644 apps/advanced/backend/config/params.php create mode 100644 apps/advanced/backend/controllers/SiteController.php create mode 100644 apps/advanced/backend/models/.gitkeep create mode 100644 apps/advanced/backend/runtime/.gitignore create mode 100644 apps/advanced/backend/views/layouts/main.php create mode 100644 apps/advanced/backend/views/site/index.php create mode 100644 apps/advanced/backend/views/site/login.php create mode 100644 apps/advanced/backend/www/.gitignore create mode 100644 apps/advanced/backend/www/assets/.gitignore create mode 100644 apps/advanced/backend/www/css/site.css delete mode 100644 apps/advanced/backstage/assets/.gitkeep delete mode 100644 apps/advanced/backstage/config/.gitignore delete mode 100644 apps/advanced/backstage/config/assets.php delete mode 100644 apps/advanced/backstage/config/main.php delete mode 100644 apps/advanced/backstage/config/params.php delete mode 100644 apps/advanced/backstage/controllers/SiteController.php delete mode 100644 apps/advanced/backstage/models/.gitkeep delete mode 100644 apps/advanced/backstage/runtime/.gitignore delete mode 100644 apps/advanced/backstage/views/layouts/main.php delete mode 100644 apps/advanced/backstage/views/site/index.php delete mode 100644 apps/advanced/backstage/views/site/login.php delete mode 100644 apps/advanced/backstage/www/.gitignore delete mode 100644 apps/advanced/backstage/www/assets/.gitignore delete mode 100644 apps/advanced/backstage/www/css/site.css diff --git a/apps/advanced/README.md b/apps/advanced/README.md index d8c1e17..f2abc1e 100644 --- a/apps/advanced/README.md +++ b/apps/advanced/README.md @@ -10,7 +10,7 @@ if you have a project to be deployed for production soon. Thank you for using Yii 2 Advanced Application Template - an application template that works out-of-box and can be easily customized to fit for your needs. -Yii 2 Advanced Application Template is best suitable for large projects requiring frontend and backstage separation, +Yii 2 Advanced Application Template is best suitable for large projects requiring frontend and backend separation, deployment in different environments, configuration nesting etc. @@ -20,18 +20,18 @@ DIRECTORY STRUCTURE ``` common config/ contains shared configurations - models/ contains model classes used in both backstage and frontend + models/ contains model classes used in both backend and frontend console config/ contains console configurations controllers/ contains console controllers (commands) migrations/ contains database migrations models/ contains console-specific model classes runtime/ contains files generated during runtime -backstage +backend assets/ contains application assets such as JavaScript and CSS - config/ contains backstage configurations + config/ contains backend configurations controllers/ contains Web controller classes - models/ contains backstage-specific model classes + models/ contains backend-specific model classes runtime/ contains files generated during runtime views/ contains view files for the Web application www/ contains the entry script and Web resources @@ -107,7 +107,7 @@ the installed application. You only need to do these once for all. Now you should be able to access: - the frontend using the URL `http://localhost/yii-advanced/frontend/www/` -- the backstage using the URL `http://localhost/yii-advanced/backstage/www/` +- the backend using the URL `http://localhost/yii-advanced/backend/www/` assuming `yii-advanced` is directly under the document root of your Web server. diff --git a/apps/advanced/backend/assets/.gitkeep b/apps/advanced/backend/assets/.gitkeep new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/apps/advanced/backend/assets/.gitkeep @@ -0,0 +1 @@ +* diff --git a/apps/advanced/backend/config/.gitignore b/apps/advanced/backend/config/.gitignore new file mode 100644 index 0000000..20da318 --- /dev/null +++ b/apps/advanced/backend/config/.gitignore @@ -0,0 +1,2 @@ +main-local.php +params-local.php \ No newline at end of file diff --git a/apps/advanced/backend/config/assets.php b/apps/advanced/backend/config/assets.php new file mode 100644 index 0000000..ee0d610 --- /dev/null +++ b/apps/advanced/backend/config/assets.php @@ -0,0 +1,18 @@ + array( + 'basePath' => '@wwwroot', + 'baseUrl' => '@www', + 'css' => array( + 'css/site.css', + ), + 'js' => array( + + ), + 'depends' => array( + 'yii', + 'yii/bootstrap/responsive', + ), + ), +); diff --git a/apps/advanced/backend/config/main.php b/apps/advanced/backend/config/main.php new file mode 100644 index 0000000..3140cd2 --- /dev/null +++ b/apps/advanced/backend/config/main.php @@ -0,0 +1,40 @@ + 'app-backend', + 'basePath' => dirname(__DIR__), + 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', + 'preload' => array('log'), + 'controllerNamespace' => 'backend\controllers', + 'modules' => array( + ), + 'components' => array( + 'db' => $params['components.db'], + 'cache' => $params['components.cache'], + 'user' => array( + 'class' => 'yii\web\User', + 'identityClass' => 'common\models\User', + ), + 'assetManager' => array( + 'bundles' => require(__DIR__ . '/assets.php'), + ), + 'log' => array( + 'class' => 'yii\logging\Router', + 'targets' => array( + array( + 'class' => 'yii\logging\FileTarget', + 'levels' => array('error', 'warning'), + ), + ), + ), + ), + 'params' => $params, +); diff --git a/apps/advanced/backend/config/params.php b/apps/advanced/backend/config/params.php new file mode 100644 index 0000000..1e197d0 --- /dev/null +++ b/apps/advanced/backend/config/params.php @@ -0,0 +1,5 @@ + 'admin@example.com', +); \ No newline at end of file diff --git a/apps/advanced/backend/controllers/SiteController.php b/apps/advanced/backend/controllers/SiteController.php new file mode 100644 index 0000000..0306c97 --- /dev/null +++ b/apps/advanced/backend/controllers/SiteController.php @@ -0,0 +1,33 @@ +render('index'); + } + + public function actionLogin() + { + $model = new LoginForm(); + if ($this->populate($_POST, $model) && $model->login()) { + Yii::$app->response->redirect(array('site/index')); + } else { + echo $this->render('login', array( + 'model' => $model, + )); + } + } + + public function actionLogout() + { + Yii::$app->getUser()->logout(); + Yii::$app->getResponse()->redirect(array('site/index')); + } +} diff --git a/apps/advanced/backend/models/.gitkeep b/apps/advanced/backend/models/.gitkeep new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/apps/advanced/backend/models/.gitkeep @@ -0,0 +1 @@ +* diff --git a/apps/advanced/backend/runtime/.gitignore b/apps/advanced/backend/runtime/.gitignore new file mode 100644 index 0000000..c96a04f --- /dev/null +++ b/apps/advanced/backend/runtime/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/apps/advanced/backend/views/layouts/main.php b/apps/advanced/backend/views/layouts/main.php new file mode 100644 index 0000000..44117f4 --- /dev/null +++ b/apps/advanced/backend/views/layouts/main.php @@ -0,0 +1,64 @@ +registerAssetBundle('app'); +?> +beginPage(); ?> + + + + + <?php echo Html::encode($this->title); ?> + head(); ?> + + +
+ beginBody(); ?> +
+

My Company

+ +
+
+
+ array('class' => 'nav'), + 'items' => array( + array('label' => 'Home', 'url' => array('/site/index')), + Yii::$app->user->isGuest ? + array('label' => 'Login', 'url' => array('/site/login')) : + array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => array('/site/logout')), + ), + )); ?> +
+
+
+ +
+ + isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(), + )); ?> + + +
+ +
+

© My Company

+

+ + Template by Twitter Bootstrap +

+
+ endBody(); ?> +
+ + + +endPage(); ?> diff --git a/apps/advanced/backend/views/site/index.php b/apps/advanced/backend/views/site/index.php new file mode 100644 index 0000000..158b61c --- /dev/null +++ b/apps/advanced/backend/views/site/index.php @@ -0,0 +1,47 @@ +title = 'Welcome'; +?> +
+

Welcome!

+ +

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus + commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

+ Get started with Yii +
+ +
+ + +
+
+

Heading

+ +

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris + condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. + Donec sed odio dui.

+ +

View details »

+
+
+

Heading

+ +

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris + condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. + Donec sed odio dui.

+ +

View details »

+
+
+

Heading

+ +

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta + felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum + massa.

+ +

View details »

+
+
+ diff --git a/apps/advanced/backend/views/site/login.php b/apps/advanced/backend/views/site/login.php new file mode 100644 index 0000000..f676b98 --- /dev/null +++ b/apps/advanced/backend/views/site/login.php @@ -0,0 +1,24 @@ +title = 'Login'; +$this->params['breadcrumbs'][] = $this->title; +?> +

title); ?>

+ +

Please fill out the following fields to login:

+ + array('class' => 'form-horizontal'))); ?> + field($model, 'username')->textInput(); ?> + field($model, 'password')->passwordInput(); ?> + field($model, 'rememberMe')->checkbox(); ?> +
+ 'btn btn-primary')); ?> +
+ diff --git a/apps/advanced/backend/www/.gitignore b/apps/advanced/backend/www/.gitignore new file mode 100644 index 0000000..148f2b0 --- /dev/null +++ b/apps/advanced/backend/www/.gitignore @@ -0,0 +1 @@ +/index.php \ No newline at end of file diff --git a/apps/advanced/backend/www/assets/.gitignore b/apps/advanced/backend/www/assets/.gitignore new file mode 100644 index 0000000..c96a04f --- /dev/null +++ b/apps/advanced/backend/www/assets/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/apps/advanced/backend/www/css/site.css b/apps/advanced/backend/www/css/site.css new file mode 100644 index 0000000..890a953 --- /dev/null +++ b/apps/advanced/backend/www/css/site.css @@ -0,0 +1,78 @@ +body { + padding-top: 20px; + padding-bottom: 60px; +} + +/* Custom container */ +.container { + margin: 0 auto; + max-width: 1000px; +} + +.container > hr { + margin: 60px 0; +} + +/* Main marketing message and sign up button */ +.jumbotron { + margin: 80px 0; + text-align: center; +} + +.jumbotron h1 { + font-size: 100px; + line-height: 1; +} + +.jumbotron .lead { + font-size: 24px; + line-height: 1.25; +} + +.jumbotron .btn { + font-size: 21px; + padding: 14px 24px; +} + +/* Supporting marketing content */ +.marketing { + margin: 60px 0; +} + +.marketing p + h4 { + margin-top: 28px; +} + +/* Customize the navbar links to be fill the entire space of the .navbar */ +.navbar .navbar-inner { + padding: 0; +} + +.navbar .nav { + margin: 0; + display: table; + width: 100%; +} + +.navbar .nav li { + display: table-cell; + width: 1%; + float: none; +} + +.navbar .nav li a { + font-weight: bold; + text-align: center; + border-left: 1px solid rgba(255, 255, 255, .75); + border-right: 1px solid rgba(0, 0, 0, .1); +} + +.navbar .nav li:first-child a { + border-left: 0; + border-radius: 3px 0 0 3px; +} + +.navbar .nav li:last-child a { + border-right: 0; + border-radius: 0 3px 3px 0; +} diff --git a/apps/advanced/backstage/assets/.gitkeep b/apps/advanced/backstage/assets/.gitkeep deleted file mode 100644 index 72e8ffc..0000000 --- a/apps/advanced/backstage/assets/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/apps/advanced/backstage/config/.gitignore b/apps/advanced/backstage/config/.gitignore deleted file mode 100644 index 20da318..0000000 --- a/apps/advanced/backstage/config/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -main-local.php -params-local.php \ No newline at end of file diff --git a/apps/advanced/backstage/config/assets.php b/apps/advanced/backstage/config/assets.php deleted file mode 100644 index ee0d610..0000000 --- a/apps/advanced/backstage/config/assets.php +++ /dev/null @@ -1,18 +0,0 @@ - array( - 'basePath' => '@wwwroot', - 'baseUrl' => '@www', - 'css' => array( - 'css/site.css', - ), - 'js' => array( - - ), - 'depends' => array( - 'yii', - 'yii/bootstrap/responsive', - ), - ), -); diff --git a/apps/advanced/backstage/config/main.php b/apps/advanced/backstage/config/main.php deleted file mode 100644 index 6e55c47..0000000 --- a/apps/advanced/backstage/config/main.php +++ /dev/null @@ -1,40 +0,0 @@ - 'app-backend', - 'basePath' => dirname(__DIR__), - 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', - 'preload' => array('log'), - 'controllerNamespace' => 'backstage\controllers', - 'modules' => array( - ), - 'components' => array( - 'db' => $params['components.db'], - 'cache' => $params['components.cache'], - 'user' => array( - 'class' => 'yii\web\User', - 'identityClass' => 'common\models\User', - ), - 'assetManager' => array( - 'bundles' => require(__DIR__ . '/assets.php'), - ), - 'log' => array( - 'class' => 'yii\logging\Router', - 'targets' => array( - array( - 'class' => 'yii\logging\FileTarget', - 'levels' => array('error', 'warning'), - ), - ), - ), - ), - 'params' => $params, -); diff --git a/apps/advanced/backstage/config/params.php b/apps/advanced/backstage/config/params.php deleted file mode 100644 index 1e197d0..0000000 --- a/apps/advanced/backstage/config/params.php +++ /dev/null @@ -1,5 +0,0 @@ - 'admin@example.com', -); \ No newline at end of file diff --git a/apps/advanced/backstage/controllers/SiteController.php b/apps/advanced/backstage/controllers/SiteController.php deleted file mode 100644 index d40738a..0000000 --- a/apps/advanced/backstage/controllers/SiteController.php +++ /dev/null @@ -1,33 +0,0 @@ -render('index'); - } - - public function actionLogin() - { - $model = new LoginForm(); - if ($this->populate($_POST, $model) && $model->login()) { - Yii::$app->response->redirect(array('site/index')); - } else { - echo $this->render('login', array( - 'model' => $model, - )); - } - } - - public function actionLogout() - { - Yii::$app->getUser()->logout(); - Yii::$app->getResponse()->redirect(array('site/index')); - } -} diff --git a/apps/advanced/backstage/models/.gitkeep b/apps/advanced/backstage/models/.gitkeep deleted file mode 100644 index 72e8ffc..0000000 --- a/apps/advanced/backstage/models/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/apps/advanced/backstage/runtime/.gitignore b/apps/advanced/backstage/runtime/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/apps/advanced/backstage/runtime/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/apps/advanced/backstage/views/layouts/main.php b/apps/advanced/backstage/views/layouts/main.php deleted file mode 100644 index 44117f4..0000000 --- a/apps/advanced/backstage/views/layouts/main.php +++ /dev/null @@ -1,64 +0,0 @@ -registerAssetBundle('app'); -?> -beginPage(); ?> - - - - - <?php echo Html::encode($this->title); ?> - head(); ?> - - -
- beginBody(); ?> -
-

My Company

- -
-
-
- array('class' => 'nav'), - 'items' => array( - array('label' => 'Home', 'url' => array('/site/index')), - Yii::$app->user->isGuest ? - array('label' => 'Login', 'url' => array('/site/login')) : - array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => array('/site/logout')), - ), - )); ?> -
-
-
- -
- - isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(), - )); ?> - - -
- -
-

© My Company

-

- - Template by Twitter Bootstrap -

-
- endBody(); ?> -
- - - -endPage(); ?> diff --git a/apps/advanced/backstage/views/site/index.php b/apps/advanced/backstage/views/site/index.php deleted file mode 100644 index 158b61c..0000000 --- a/apps/advanced/backstage/views/site/index.php +++ /dev/null @@ -1,47 +0,0 @@ -title = 'Welcome'; -?> -
-

Welcome!

- -

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus - commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

- Get started with Yii -
- -
- - -
-
-

Heading

- -

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris - condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. - Donec sed odio dui.

- -

View details »

-
-
-

Heading

- -

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris - condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. - Donec sed odio dui.

- -

View details »

-
-
-

Heading

- -

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta - felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum - massa.

- -

View details »

-
-
- diff --git a/apps/advanced/backstage/views/site/login.php b/apps/advanced/backstage/views/site/login.php deleted file mode 100644 index f676b98..0000000 --- a/apps/advanced/backstage/views/site/login.php +++ /dev/null @@ -1,24 +0,0 @@ -title = 'Login'; -$this->params['breadcrumbs'][] = $this->title; -?> -

title); ?>

- -

Please fill out the following fields to login:

- - array('class' => 'form-horizontal'))); ?> - field($model, 'username')->textInput(); ?> - field($model, 'password')->passwordInput(); ?> - field($model, 'rememberMe')->checkbox(); ?> -
- 'btn btn-primary')); ?> -
- diff --git a/apps/advanced/backstage/www/.gitignore b/apps/advanced/backstage/www/.gitignore deleted file mode 100644 index 148f2b0..0000000 --- a/apps/advanced/backstage/www/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/index.php \ No newline at end of file diff --git a/apps/advanced/backstage/www/assets/.gitignore b/apps/advanced/backstage/www/assets/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/apps/advanced/backstage/www/assets/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/apps/advanced/backstage/www/css/site.css b/apps/advanced/backstage/www/css/site.css deleted file mode 100644 index 890a953..0000000 --- a/apps/advanced/backstage/www/css/site.css +++ /dev/null @@ -1,78 +0,0 @@ -body { - padding-top: 20px; - padding-bottom: 60px; -} - -/* Custom container */ -.container { - margin: 0 auto; - max-width: 1000px; -} - -.container > hr { - margin: 60px 0; -} - -/* Main marketing message and sign up button */ -.jumbotron { - margin: 80px 0; - text-align: center; -} - -.jumbotron h1 { - font-size: 100px; - line-height: 1; -} - -.jumbotron .lead { - font-size: 24px; - line-height: 1.25; -} - -.jumbotron .btn { - font-size: 21px; - padding: 14px 24px; -} - -/* Supporting marketing content */ -.marketing { - margin: 60px 0; -} - -.marketing p + h4 { - margin-top: 28px; -} - -/* Customize the navbar links to be fill the entire space of the .navbar */ -.navbar .navbar-inner { - padding: 0; -} - -.navbar .nav { - margin: 0; - display: table; - width: 100%; -} - -.navbar .nav li { - display: table-cell; - width: 1%; - float: none; -} - -.navbar .nav li a { - font-weight: bold; - text-align: center; - border-left: 1px solid rgba(255, 255, 255, .75); - border-right: 1px solid rgba(0, 0, 0, .1); -} - -.navbar .nav li:first-child a { - border-left: 0; - border-radius: 3px 0 0 3px; -} - -.navbar .nav li:last-child a { - border-right: 0; - border-radius: 0 3px 3px 0; -} diff --git a/apps/advanced/composer.json b/apps/advanced/composer.json index cc3ec2d..0e393cf 100644 --- a/apps/advanced/composer.json +++ b/apps/advanced/composer.json @@ -25,8 +25,8 @@ }, "extra": { "yii-install-writable": [ - "backstage/runtime", - "backstage/www/assets", + "backend/runtime", + "backend/www/assets", "console/runtime", "console/migrations",