Skip to content

Commit

Permalink
added src folders, added luya prefix for styleguide, remoteadmin #972
Browse files Browse the repository at this point in the history
  • Loading branch information
nadar committed Aug 31, 2016
1 parent b63466e commit a94f359
Show file tree
Hide file tree
Showing 101 changed files with 39 additions and 42 deletions.
17 changes: 7 additions & 10 deletions envs/dev/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,15 @@
"luya\\" : "../../core/",
"luya\\admin\\" : "../../modules/admin/src",
"luya\\cms\\" : "../../modules/cms/src",
"luya\\account\\" : "../../modules/account",
"luya\\crawler\\" : "../../modules/crawler",
"luya\\account\\" : "../../modules/account/src",
"luya\\crawler\\" : "../../modules/crawler/src",
"luya\\errorapi\\" : "../../modules/errorapi/src",
"luya\\gallery\\" : "../../modules/gallery",
"luya\\exporter\\" : "../../modules/exporter",
"luya\\frontendgroup\\" : "../../modules/frontendgroup",
"luya\\gallery\\" : "../../modules/gallery/src",
"luya\\exporter\\" : "../../modules/exporter/src",
"luya\\frontendgroup\\" : "../../modules/frontendgroup/src",
"luya\\news\\" : "../../modules/news/src",



"styleguide\\" : "../../modules/styleguide",
"remoteadmin\\" : "../../modules/remoteadmin",
"luya\\remoteadmin\\" : "../../modules/remoteadmin/src",
"luya\\styleguide\\" : "../../modules/styleguide/src",

"payment\\" : "../../../luya-module-payment/src",
"basicauth\\" : "../../../luya-module-basicauth/src",
Expand Down
2 changes: 1 addition & 1 deletion modules/account/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"autoload" : {
"psr-4" : {
"luya\\account\\" : ""
"luya\\account\\" : "src/"
}
},
"extra": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion modules/crawler/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"autoload" : {
"psr-4" : {
"luya\\crawler\\" : ""
"luya\\crawler\\" : "src/"
}
},
"extra": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion modules/exporter/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"autoload" : {
"psr-4" : {
"luya\\exporter\\" : ""
"luya\\exporter\\" : "src/"
}
},
"extra": {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion modules/frontendgroup/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"autoload" : {
"psr-4" : {
"luya\\frontendgroup\\" : ""
"luya\\frontendgroup\\" : "src/"
}
},
"extra": {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion modules/gallery/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"autoload" : {
"psr-4" : {
"luya\\gallery\\" : ""
"luya\\gallery\\" : "src/"
}
},
"extra": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion modules/newsadmin/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"autoload" : {
"psr-4" : {
"luya\news\admin\\" : ""
"luya\\news\\admin\\" : ""
}
},
"extra": {
Expand Down
4 changes: 2 additions & 2 deletions modules/remoteadmin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ Remote Admin will work out of the box with all [LUYA](https://github.com/zephir/
require remoteadmin in composer.json:

```
"luyadev/luya-module-remoteadmin" : "1.0.0-beta8",
"luyadev/luya-module-remoteadmin" : "^1.0@dev",
```

add remote admin to the list of your modules:

```
'remoteadmin' => [
'class' => 'remoteadmin\Module'
'class' => 'luya\remoteadmin\Module'
],
```

Expand Down
8 changes: 0 additions & 8 deletions modules/remoteadmin/apis/SiteController.php

This file was deleted.

2 changes: 1 addition & 1 deletion modules/remoteadmin/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"autoload" : {
"psr-4" : {
"remoteadmin\\" : ""
"luya\\remoteadmin\\" : "src/"
}
},
"extra": {
Expand Down
8 changes: 0 additions & 8 deletions modules/remoteadmin/controllers/SiteController.php

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
namespace remoteadmin;
namespace luya\remoteadmin;

class Module extends \luya\admin\base\Module
{
public $apis = [
'api-remote-site' => 'remoteadmin\apis\SiteController',
'api-remote-site' => 'luya\remoteadmin\apis\SiteController',
];

public function getMenu()
Expand Down
8 changes: 8 additions & 0 deletions modules/remoteadmin/src/apis/SiteController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php

namespace luya\remoteadmin\apis;

class SiteController extends \luya\admin\ngrest\base\Api
{
public $modelClass = 'luya\remoteadmin\models\Site';
}
8 changes: 8 additions & 0 deletions modules/remoteadmin/src/controllers/SiteController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php

namespace luya\remoteadmin\controllers;

class SiteController extends \luya\admin\ngrest\base\Controller
{
public $modelClass = 'luya\remoteadmin\models\Site';
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace remoteadmin\controllers;
namespace luya\remoteadmin\controllers;

use yii\helpers\Json;
use remoteadmin\models\Site;
use luya\remoteadmin\models\Site;

/**
* @see packages api https://packagist.org/apidoc
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace remoteadmin\models;
namespace luya\remoteadmin\models;

use Yii;
use luya\helpers\Url;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion modules/styleguide/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"autoload" : {
"psr-4" : {
"styleguide\\" : ""
"luya\\styleguide\\" : "src/"
}
},
"extra": {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace styleguide\controllers;
namespace luya\styleguide\controllers;

use Yii;

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit a94f359

Please sign in to comment.