fixed aliased paths to real

hiqdev · Jul 7, 2020 · 172cf68 · 172cf68
1 parent 4d981c9
commit 172cf68
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/config/common.php b/config/common.php
@@ -27,19 +27,19 @@
             'translations' => [
                 'hipanel' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel:synt' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel:block-reasons' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel.object-combo' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
             ],
         ],

diff --git a/config/i18n.php b/config/i18n.php
@@ -10,8 +10,8 @@
 
 return [
     'languages' => ['ru'],
-    'sourcePath' => dirname(__DIR__),
-    'messagePath' => dirname(__DIR__) . '/messages',
+    'sourcePath' => dirname(__DIR__) . '/src',
+    'messagePath' => dirname(__DIR__) . '/src/messages',
     'sort' => true,
     'removeUnused' => true,
 ];
diff --git a/config/web.php b/config/web.php
@@ -12,7 +12,7 @@
     'id' => 'hipanel',
     'name' => 'HiPanel',
     'basePath' => dirname(__DIR__),
-    'viewPath' => '@hisite/views',
+    'viewPath' => '@vendor/hiqdev/hisite/src/views',
     'vendorPath' => '@root/vendor',
     'runtimePath' => '@root/runtime',
     'controllerNamespace' => 'hipanel\controllers',
@@ -31,7 +31,7 @@
         ],
         'mailer' => [
             'class' => \yii\swiftmailer\Mailer::class,
-            'viewPath' => '@hipanel/mail',
+            'viewPath' => dirname(__DIR__) . '/src/mail',
         ],
         'orientationStorage' => [
             'class' => \hipanel\components\OrientationStorage::class,
@@ -102,7 +102,7 @@
                 \hipanel\assets\AppAsset::class,
             ],
             'pathMap' => [
-                '$themedViewPaths' => ['@hipanel/views'],
+                '$themedViewPaths' => [dirname(__DIR__) . '/src/views'],
             ],
         ],
         'fileStorage' => [

diff --git a/src/assets/AppAsset.php b/src/assets/AppAsset.php
@@ -21,7 +21,7 @@
 
 class AppAsset extends AssetBundle
 {
-    public $sourcePath = '@hipanel/assets/AppAssetFiles';
+    public $sourcePath = __DIR__ . '/AppAssetFiles';
     public $css = [
         '//code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css',
         'css/panel.css',

diff --git a/src/assets/ApplyToAllAsset.php b/src/assets/ApplyToAllAsset.php
@@ -11,7 +11,7 @@ class ApplyToAllAsset extends AssetBundle
     /**
      * {@inheridoc}
      */
-    public $sourcePath = '@hipanel/assets';
+    public $sourcePath = __DIR__;
 
     /**
      * {@inheridoc}

diff --git a/src/assets/CheckboxStyleAsset.php b/src/assets/CheckboxStyleAsset.php
@@ -15,7 +15,7 @@ class CheckboxStyleAsset extends \yii\web\AssetBundle
     /**
      * {@inheritdoc}
      */
-    public $sourcePath = '@hipanel/assets/css';
+    public $sourcePath = __DIR__ . '/css';
 
     /**
      * {@inheritdoc}

diff --git a/src/assets/HipanelAsset.php b/src/assets/HipanelAsset.php
@@ -14,7 +14,7 @@
 
 class HipanelAsset extends AssetBundle
 {
-    public $sourcePath = '@hipanel/assets/js';
+    public $sourcePath = __DIR__ . '/js';
 
     public $js = [
         'hipanel.js',

diff --git a/src/assets/IsotopeAsset.php b/src/assets/IsotopeAsset.php
@@ -15,7 +15,7 @@
 
 class IsotopeAsset extends AssetBundle
 {
-    public $sourcePath = '@hipanel/assets/js';
+    public $sourcePath = __DIR__ . '/js';
 
     public $js = [
         '//cdnjs.cloudflare.com/ajax/libs/jquery.isotope/2.2.2/isotope.pkgd.min.js',

diff --git a/src/assets/PincodePromptAsset.php b/src/assets/PincodePromptAsset.php
@@ -17,7 +17,7 @@ class PincodePromptAsset extends AssetBundle
     /**
      * @var string
      */
-    public $sourcePath = '@hipanel/assets/js';
+    public $sourcePath = __DIR__ . '/js';
 
     /**
      * @var array

diff --git a/src/console/TranslateController.php b/src/console/TranslateController.php
@@ -24,7 +24,7 @@
  */
 class TranslateController extends MessageController
 {
-    public $configFile = '@hipanel/config/i18n.php';
+    public $configFile = __DIR__ . '/../../config/i18n.php';
 
     public function actionIndex($message = 'hello {world} apple beta {gamma {horse, cat}} this {mysite} this is a draw {apple {beta,{cat,dog} dog} house} farm')
     {

diff --git a/src/widgets/RequestStateAsset.php b/src/widgets/RequestStateAsset.php
@@ -15,7 +15,7 @@ class RequestStateAsset extends \yii\web\AssetBundle
     /**
      * @var string
      */
-    public $sourcePath = '@hipanel/assets';
+    public $sourcePath = __DIR__ . '/../assets';
 
     /**
      * @var array