up

fecshop · Jul 31, 2016 · 2c6231e · 2c6231e
1 parent 78f8da4
commit 2c6231e
Show file tree

Hide file tree

Showing 13 changed files with 240 additions and 3 deletions.
diff --git a/app/appadmin/config/appadmin.php b/app/appadmin/config/appadmin.php
@@ -16,4 +16,23 @@
 	'modules'=>$modules,
 	/* only config in front web */
 	//'bootstrap' => ['store'],
+	'components' => [
+		'user' => [
+			'identityClass' => 'fecadmin\models\AdminUser',
+			'enableAutoLogin' => true,
+		],
+
+		'errorHandler' => [
+			'errorAction' => 'fecadmin/error',
+		],
+
+		'urlManager' => [
+			'class' => 'yii\web\UrlManager',
+			'enablePrettyUrl' => true,
+			'showScriptName' => false,
+			'rules' => [
+				'' => 'fecadmin/index/index',
+			],
+		],
+    ],
 ];
diff --git a/app/appapi/config/appapi.php b/app/appapi/config/appapi.php
@@ -42,6 +42,14 @@
             ],  
         ],
 
+		'user' => [
+			'identityClass' => 'fecadmin\models\AdminUser',
+			'enableAutoLogin' => true,
+		],
+
+		'errorHandler' => [
+			'errorAction' => 'site/error',
+		],
 
 	],
 

diff --git a/app/appfront/config/appfront.php b/app/appfront/config/appfront.php
@@ -38,6 +38,46 @@
 				],
 			],
 		],
+		'assetManager' => [
+			'forceCopy' => true,
+		],
+		'user' => [
+			'identityClass' => 'fecadmin\models\AdminUser',
+			'enableAutoLogin' => true,
+		],
+
+		'errorHandler' => [
+			'errorAction' => 'site/error',
+		],
+
+
+
+		'urlManager' => [
+			'class' => 'yii\web\UrlManager',
+			'enablePrettyUrl' => true,
+			'showScriptName' => false,
+			'rules' => [
+				'' => 'cms/home/index',
+			],
+			//'baseUrl' => '/fr/',
+		],
+
+
+
+		'request' => [
+			'class' => 'fecshop\yii\web\Request',
+			/*
+			'enableCookieValidation' => true,
+			'enableCsrfValidation' => true,
+			'cookieValidationKey' => 'O1d232trde1x-M97_7QvwPo-5QGdkLMp#@#@',
+			'noCsrfRoutes' => [
+				'catalog/product/addreview',
+				'favorite/product/remark',
+				'paypal/ipn/index',
+				'paypal/ipn',
+			],
+			*/
+		],
 	],
 
 ];
diff --git a/app/apphtml5/config/apphtml5.php b/app/apphtml5/config/apphtml5.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * FecShop file.
+ *
+ * @link http://www.fecshop.com/
+ * @copyright Copyright (c) 2016 FecShop Software LLC
+ * @license http://www.fecshop.com/license/
+ */
+# 本文件在app/web/index.php 处引入。
+# fecshop - appfront 的核心模块
+$modules = [];
+foreach (glob(__DIR__ . '/modules/*.php') as $filename){
+	$modules = array_merge($modules,require($filename));
+}
+# 此处也可以重写fecshop的组件。供调用。
+return [
+	'modules'=>$modules,
+	/* only config in front web */
+	'bootstrap' => ['store'],
+	'params'	=> [
+		/* appfront base theme dir   */
+		'appfrontBaseTheme' 	=> '@fecshop/app/apphtml5/theme/base/front',
+		'appfrontBaseLayoutName'=> 'main.php',
+	],
+	# language config.
+	'components' => [
+		'i18n' => [
+			'translations' => [
+				'apphtml5' => [
+					//'class' => 'yii\i18n\PhpMessageSource',
+					'class' => 'fecshop\yii\i18n\PhpMessageSource',
+					'basePaths' => [
+						'@fecshop/app/apphtml5/languages',
+						'@apphtml5/languages',
+					],
+					'sourceLanguage' => 'en_US', # 如果 en_US 也想翻译，那么可以改成en_XX。
+				],
+			],
+		],
+		'assetManager' => [
+			'forceCopy' => true,
+		],
+		'user' => [
+			'identityClass' => 'fecadmin\models\AdminUser',
+			'enableAutoLogin' => true,
+		],
+
+		'errorHandler' => [
+			'errorAction' => 'site/error',
+		],
+
+
+
+		'urlManager' => [
+			'class' => 'yii\web\UrlManager',
+			'enablePrettyUrl' => true,
+			'showScriptName' => false,
+			'rules' => [
+				'' => 'cms/home/index',
+			],
+			//'baseUrl' => '/fr/',
+		],
+
+
+
+		'request' => [
+			'class' => 'fecshop\yii\web\Request',
+			/*
+			'enableCookieValidation' => true,
+			'enableCsrfValidation' => true,
+			'cookieValidationKey' => 'O1d232trde1x-M97_7QvwPo-5QGdkLMp#@#@',
+			'noCsrfRoutes' => [
+				'catalog/product/addreview',
+				'favorite/product/remark',
+				'paypal/ipn/index',
+				'paypal/ipn',
+			],
+			*/
+		],
+	],
+
+];
diff --git a/app/apphtml5/config/modules/.gitignore b/app/apphtml5/config/modules/.gitignore
@@ -0,0 +1 @@
+!.gitignore
diff --git a/app/apphtml5/languages/.gitignore b/app/apphtml5/languages/.gitignore
@@ -0,0 +1 @@
+!.gitignore
diff --git a/app/apphtml5/modules/.gitignore b/app/apphtml5/modules/.gitignore
diff --git a/app/apphtml5/theme/.gitignore b/app/apphtml5/theme/.gitignore
diff --git a/app/appserver/config/appserver.php b/app/appserver/config/appserver.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * FecShop file.
+ *
+ * @link http://www.fecshop.com/
+ * @copyright Copyright (c) 2016 FecShop Software LLC
+ * @license http://www.fecshop.com/license/
+ */
+# 本文件在app/web/index.php 处引入。
+# fecshop - appfront 的核心模块
+$modules = [];
+foreach (glob(__DIR__ . '/modules/*.php') as $filename){
+	$modules = array_merge($modules,require($filename));
+}
+# 此处也可以重写fecshop的组件。供调用。
+return [
+	'modules'=>$modules,
+	/* only config in front web */
+	'bootstrap' => ['store'],
+	'params'	=> [
+		/* appfront base theme dir   */
+		//'appfrontBaseTheme' 	=> '@fecshop/app/appfront/theme/base/front',
+		//'appfrontBaseLayoutName'=> 'main.php',
+	],
+	# language config.
+	'components' => [
+		'i18n' => [
+			'translations' => [
+				'appserver' => [
+					//'class' => 'yii\i18n\PhpMessageSource',
+					'class' => 'fecshop\yii\i18n\PhpMessageSource',
+					'basePaths' => [
+						'@fecshop/app/appserver/languages',
+						'@appserver/languages',
+					],
+					'sourceLanguage' => 'en_US', # 如果 en_US 也想翻译，那么可以改成en_XX。
+				],
+			],
+		],
+		'assetManager' => [
+			'forceCopy' => true,
+		],
+		'user' => [
+			'identityClass' => 'fecadmin\models\AdminUser',
+			'enableAutoLogin' => true,
+		],
+
+		'errorHandler' => [
+			'errorAction' => 'site/error',
+		],
+
+
+
+		'urlManager' => [
+			'class' => 'yii\web\UrlManager',
+			'enablePrettyUrl' => true,
+			'showScriptName' => false,
+			'rules' => [
+				'' => 'cms/home/index',
+			],
+			//'baseUrl' => '/fr/',
+		],
+
+
+
+		'request' => [
+			'class' => 'fecshop\yii\web\Request',
+			/*
+			'enableCookieValidation' => true,
+			'enableCsrfValidation' => true,
+			'cookieValidationKey' => 'O1d232trde1x-M97_7QvwPo-5QGdkLMp#@#@',
+			'noCsrfRoutes' => [
+				'catalog/product/addreview',
+				'favorite/product/remark',
+				'paypal/ipn/index',
+				'paypal/ipn',
+			],
+			*/
+		],
+	],
+
+];
diff --git a/app/appserver/config/modules/.gitignore b/app/appserver/config/modules/.gitignore
@@ -0,0 +1 @@
+!.gitignore
diff --git a/app/appserver/languages/.gitignore b/app/appserver/languages/.gitignore
diff --git a/app/appserver/modules/.gitignore b/app/appserver/modules/.gitignore
diff --git a/composer.json b/composer.json
@@ -4,11 +4,14 @@
   "keywords": [  
 	"yii2",  
 	"fecshop" , 
-	"fancyecommerce" 
+	"fancyecommerce" ,
+	"shop" ,
+	"ecommerce" ,
+	"cart" 
   ],  
   "homepage": "https://github.com/fancyecommerce/yii2_fecshop",  
   "type": "yii2-extension",  
-  "license": "BSD-3-Clause",  
+  "license": "OSL-3",  
   "support": {  
 	"source": "https://github.com/fancyecommerce/yii2_fecshop"  
   },  
@@ -22,7 +25,7 @@
   "require": {  
 	"php": ">=5.4.0",  
 	"yiisoft/yii2": ">=2.0.6" ,
-	"fancyecommerce/fec_admin":"~1.3.5.8",
+	"fancyecommerce/fec_admin":"~1.3.5.9",
 	"yiisoft/yii2-mongodb": "~2.0.0" ,
 	"skeeks/yii2-assets-auto-compress": "*"
   },