From 77d30544acca2118bfd7f93058235fa1576fc58c Mon Sep 17 00:00:00 2001
From: Yarik <Yarik>
Date: Thu, 3 Dec 2015 14:50:30 +0200
Subject: [PATCH] Начата разработка блога

---
 common/config/main.php                                |  3 +++
 common/modules/blog/Module.php                        | 12 ++++++++++++
 common/modules/blog/config.php                        |  9 +++++++++
 common/modules/blog/controllers/AjaxController.php    |  1 +
 common/modules/blog/controllers/ArticleController.php |  9 +++++++++
 common/modules/blog/controllers/DefaultController.php | 12 ++++++++++++
 common/modules/blog/views/default/index.php           |  1 +
 frontend/controllers/SiteController.php               |  7 +++++++
 8 files changed, 54 insertions(+), 0 deletions(-)
 create mode 100644 common/modules/blog/Module.php
 create mode 100644 common/modules/blog/config.php
 create mode 100644 common/modules/blog/controllers/AjaxController.php
 create mode 100644 common/modules/blog/controllers/ArticleController.php
 create mode 100644 common/modules/blog/controllers/DefaultController.php
 create mode 100644 common/modules/blog/views/default/index.php

diff --git a/common/config/main.php b/common/config/main.php
index 21154a7..bc57e5e 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -8,6 +8,9 @@ return [
                 'userClass' => 'common\models\User'
             ]
         ],
+        'blog' => [
+        	'class' => 'common\modules\blog\Module',
+        ],
     ],
     'components' => [
         'cache' => [
diff --git a/common/modules/blog/Module.php b/common/modules/blog/Module.php
new file mode 100644
index 0000000..9a800a5
--- /dev/null
+++ b/common/modules/blog/Module.php
@@ -0,0 +1,12 @@
+<?php
+namespace common\modules\blog;
+
+class Module extends \yii\base\Module
+{
+	public function init()
+	{
+		parent::init();
+		
+		\Yii::configure($this, require(__DIR__.'/config.php'));
+	}
+}
diff --git a/common/modules/blog/config.php b/common/modules/blog/config.php
new file mode 100644
index 0000000..5e3ee6d
--- /dev/null
+++ b/common/modules/blog/config.php
@@ -0,0 +1,9 @@
+<?php
+return [
+	'components' => [
+	
+	],
+	'params' => [
+		'test' => 'Hello',
+	],
+];
diff --git a/common/modules/blog/controllers/AjaxController.php b/common/modules/blog/controllers/AjaxController.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/common/modules/blog/controllers/AjaxController.php
@@ -0,0 +1 @@
+<?php
diff --git a/common/modules/blog/controllers/ArticleController.php b/common/modules/blog/controllers/ArticleController.php
new file mode 100644
index 0000000..ceb2aa0
--- /dev/null
+++ b/common/modules/blog/controllers/ArticleController.php
@@ -0,0 +1,9 @@
+<?php
+namespace common\modules\blog\controllers;
+
+use yii\web\Controller;
+
+class ArticleController extends Controller
+{
+	
+}
diff --git a/common/modules/blog/controllers/DefaultController.php b/common/modules/blog/controllers/DefaultController.php
new file mode 100644
index 0000000..a80c8a4
--- /dev/null
+++ b/common/modules/blog/controllers/DefaultController.php
@@ -0,0 +1,12 @@
+<?php
+namespace common\modules\blog\controllers;
+
+use yii\web\Controller;
+
+class DefaultController extends Controller
+{
+	public function actionIndex()
+	{
+		echo "hello";
+	}
+}
diff --git a/common/modules/blog/views/default/index.php b/common/modules/blog/views/default/index.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/common/modules/blog/views/default/index.php
@@ -0,0 +1 @@
+<?php
diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php
index 0c5eb12..a31eabd 100644
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@@ -261,7 +261,11 @@ class SiteController extends Controller
             'model' => $model,
         ]);
     }
+<<<<<<< 64aac2e6acdbc009a3b87da32cede2c5c6d7b17d
 
+=======
+    
+>>>>>>> aa2b5a028dc8d6406f78928a067b2c853625fb95
     public function actionOptions() {
         $option_model = new Options();
         $option_list = $option_model->find()->where(1)->all();
@@ -312,6 +316,9 @@ class SiteController extends Controller
     	} else {
     		return $this->render('index');
     	}
+<<<<<<< 64aac2e6acdbc009a3b87da32cede2c5c6d7b17d
 
+=======
+>>>>>>> aa2b5a028dc8d6406f78928a067b2c853625fb95
     }
 }
--
libgit2 0.21.4