account admin prefix #972

luyadev · Aug 31, 2016 · 280e87f · 280e87f
1 parent 77418ad
commit 280e87f
Show file tree

Hide file tree

Showing 30 changed files with 52 additions and 47 deletions.
diff --git a/envs/dev/composer.json b/envs/dev/composer.json
@@ -24,11 +24,10 @@
             "luya\\" : "../../core/",
             "luya\\admin\\" : "../../modules/admin/src",
             "luya\\cms\\" : "../../modules/cms/",
+            "luya\\account\\" : "../../modules/account",
 
             "newsadmin\\" : "../../modules/newsadmin",
             "news\\" : "../../modules/news/src",
-            "account\\" : "../../modules/account",
-            "accountadmin\\" : "../../modules/accountadmin",
             "errorapi\\" : "../../modules/errorapi/src",
             "gallery\\" : "../../modules/gallery",
             "galleryadmin\\" : "../../modules/galleryadmin",

diff --git a/envs/kickstarter/composer.json b/envs/kickstarter/composer.json
@@ -6,8 +6,7 @@
     "require": {
         "luyadev/luya-core" : "^1.0@dev",
         "luyadev/luya-module-admin" : "^1.0@dev",
-        "luyadev/luya-module-cms" : "^1.0@dev",
-        "luyadev/luya-module-cmsadmin" : "^1.0@dev"
+        "luyadev/luya-module-cms" : "^1.0@dev"
     },
     "require-dev": {
         "yiisoft/yii2-gii" : "^2.0",

diff --git a/modules/account/RegisterInterface.php b/modules/account/RegisterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace account;
+namespace luya\account;
 
 interface RegisterInterface
 {

diff --git a/modules/accountadmin/Module.php → modules/account/admin/Module.php b/modules/accountadmin/Module.php → modules/account/admin/Module.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace accountadmin;
+namespace luya\account\admin;
 
 class Module extends \luya\admin\base\Module
 {
     public $apis = [
-        'api-account-user' => 'accountadmin\apis\UserController',
+        'api-account-user' => 'luya\account\admin\apis\UserController',
     ];
 
     public function getMenu()

diff --git a/modules/account/admin/apis/UserController.php b/modules/account/admin/apis/UserController.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace luya\account\admin\apis;
+
+class UserController extends \luya\admin\ngrest\base\Api
+{
+    public $modelClass = 'luya\account\models\User';
+}
diff --git a/modules/account/admin/controllers/UserController.php b/modules/account/admin/controllers/UserController.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace luya\account\admin\controllers;
+
+class UserController extends \luya\admin\ngrest\base\Controller
+{
+    public $modelClass = '\luya\account\models\User';
+}
diff --git a/modules/account/composer.json b/modules/account/composer.json
@@ -17,7 +17,7 @@
 	},
 	"autoload" : {
 		"psr-4" : {
-			"account\\" : ""
+			"luya\\account\\" : ""
 		}
 	},
 	"extra": {

diff --git a/modules/account/Module.php → modules/account/frontend/Module.php b/modules/account/Module.php → modules/account/frontend/Module.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace account;
+namespace luya\account\frontend;
 
 use Yii;
 
@@ -16,12 +16,12 @@ class Module extends \luya\base\Module
         ]],
     ];
 
-    public $userIdentity = '\account\components\User';
+    public $userIdentity = '\luya\account\frontend\components\User';
 
     /**
      * @var string defined your custom RegisterForm validation model must impelement `account\RegisterInterface`.
      */
-    public $registerFormClass = 'account\models\RegisterForm';
+    public $registerFormClass = 'luya\account\models\RegisterForm';
 
     /**
      * @var boolean Whether the email must be confirmet on registration with an activation link (double opt-in) or not.

diff --git a/modules/account/base/Controller.php → modules/account/frontend/base/Controller.php b/modules/account/base/Controller.php → modules/account/frontend/base/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace account\base;
+namespace luya\account\frontend\base;
 
 use Yii;
 

diff --git a/modules/account/base/RegisterForm.php → ...es/account/frontend/base/RegisterForm.php b/modules/account/base/RegisterForm.php → ...es/account/frontend/base/RegisterForm.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace account\base;
+namespace luya\account\frontend\base;
 
 use Yii;
+use luya\account\RegisterInterface;
 
-abstract class RegisterForm extends \yii\base\Model implements \account\RegisterInterface
+abstract class RegisterForm extends \yii\base\Model implements RegisterInterface
 {
     private $_model = null;
 
-    protected $modelClass = 'accountadmin\models\User';
+    protected $modelClass = 'luya\account\models\User';
 
     protected $modelScenario = 'register';
 

diff --git a/modules/account/components/User.php → modules/account/frontend/components/User.php b/modules/account/components/User.php → modules/account/frontend/components/User.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace account\components;
+namespace luya\account\frontend\components;
 
 class User extends \yii\web\User
 {
-    public $identityClass = '\accountadmin\models\User';
+    public $identityClass = '\luya\account\models\User';
 
     public $loginUrl = ['/account/login/default'];
 

diff --git a/...account/controllers/DefaultController.php → ...rontend/controllers/DefaultController.php b/...account/controllers/DefaultController.php → ...rontend/controllers/DefaultController.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace account\controllers;
+namespace luya\account\frontend\controllers;
 
 use Yii;
-use account\models\LoginForm;
+use luya\account\models\LoginForm;
 use luya\helpers\Url;
+use luya\account\frontend\base\Controller;
 
-class DefaultController extends \account\base\Controller
+class DefaultController extends Controller
 {
     public function getRules()
     {

diff --git a/...ccount/controllers/RegisterController.php → ...ontend/controllers/RegisterController.php b/...ccount/controllers/RegisterController.php → ...ontend/controllers/RegisterController.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace account\controllers;
+namespace luya\account\frontend\controllers;
 
 use Yii;
 use Exception;
 use luya\helpers\Url;
+use luya\account\frontend\base\Controller;
 
-class RegisterController extends \account\base\Controller
+class RegisterController extends Controller
 {
     public function getRules()
     {

diff --git a/...ccount/controllers/SettingsController.php → ...ontend/controllers/SettingsController.php b/...ccount/controllers/SettingsController.php → ...ontend/controllers/SettingsController.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace account\controllers;
+namespace luya\account\frontend\controllers;
 
-class SettingsController extends \account\base\Controller
+use luya\account\frontend\base\Controller;
+
+class SettingsController extends Controller
 {
     public function actionIndex()
     {

diff --git a/...igrations/m150302_154115_account_user.php → ...igrations/m150302_154115_account_user.php b/...igrations/m150302_154115_account_user.php → ...igrations/m150302_154115_account_user.php
diff --git a/...ons/m151214_095728_add_more_user_data.php → ...ons/m151214_095728_add_more_user_data.php b/...ons/m151214_095728_add_more_user_data.php → ...ons/m151214_095728_add_more_user_data.php
diff --git a/...nt/properties/IsProtectedAreaProperty.php → ...nd/properties/IsProtectedAreaProperty.php b/...nt/properties/IsProtectedAreaProperty.php → ...nd/properties/IsProtectedAreaProperty.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace account\properties;
+namespace luya\account\frontend\properties;
 
 use Yii;
 use luya\cms\helpers\Url;
+use luya\admin\base\Property;
 
-class IsProtectedAreaProperty extends \admin\base\Property
+class IsProtectedAreaProperty extends Property
 {
     public function init()
     {

diff --git a/modules/account/views/default/index.php → .../account/frontend/views/default/index.php b/modules/account/views/default/index.php → .../account/frontend/views/default/index.php
diff --git a/modules/account/views/default/lostpass.php → ...count/frontend/views/default/lostpass.php b/modules/account/views/default/lostpass.php → ...count/frontend/views/default/lostpass.php
diff --git a/modules/account/views/layout.php → modules/account/frontend/views/layout.php b/modules/account/views/layout.php → modules/account/frontend/views/layout.php
diff --git a/modules/account/views/register/index.php → ...account/frontend/views/register/index.php b/modules/account/views/register/index.php → ...account/frontend/views/register/index.php
diff --git a/...es/account/views/register/mail/_login.php → ...t/frontend/views/register/mail/_login.php b/...es/account/views/register/mail/_login.php → ...t/frontend/views/register/mail/_login.php
diff --git a/...t/views/register/mail/_validationlink.php → ...d/views/register/mail/_validationlink.php b/...t/views/register/mail/_validationlink.php → ...d/views/register/mail/_validationlink.php
diff --git a/...ws/register/mail/_waituntilvalidation.php → ...ws/register/mail/_waituntilvalidation.php b/...ws/register/mail/_waituntilvalidation.php → ...ws/register/mail/_waituntilvalidation.php
diff --git a/modules/account/views/settings/index.php → ...account/frontend/views/settings/index.php b/modules/account/views/settings/index.php → ...account/frontend/views/settings/index.php
diff --git a/modules/account/models/LoginForm.php b/modules/account/models/LoginForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace account\models;
+namespace luya\account\models;
 
 class LoginForm extends \yii\base\Model
 {
@@ -42,7 +42,7 @@ public function login()
     public function getUser()
     {
         if ($this->_user === false) {
-            $this->_user = \accountadmin\models\User::findByEmail($this->email);
+            $this->_user = User::findByEmail($this->email);
         }
 
         return $this->_user;

diff --git a/modules/account/models/RegisterForm.php b/modules/account/models/RegisterForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace account\models;
+namespace luya\account\models;
 
 class RegisterForm extends \account\base\RegisterForm
 {

diff --git a/modules/accountadmin/models/User.php → modules/account/models/User.php b/modules/accountadmin/models/User.php → modules/account/models/User.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace accountadmin\models;
+namespace luya\account\models;
 
 use Yii;
+use luya\admin\ngrest\base\NgRestModel;
 
-class User extends \luya\admin\ngrest\base\NgRestModel implements \yii\web\IdentityInterface
+class User extends NgRestModel implements \yii\web\IdentityInterface
 {
     public $password_confirm = null;
 

diff --git a/modules/accountadmin/apis/UserController.php b/modules/accountadmin/apis/UserController.php
diff --git a/modules/accountadmin/controllers/UserController.php b/modules/accountadmin/controllers/UserController.php