diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9dc6b4d..49de5b8 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,7 +1,4 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
diff --git a/application/CMSviews/admin/admin.php b/application/CMSviews/admin/admin.php
new file mode 100644
index 0000000..e1b86a5
--- /dev/null
+++ b/application/CMSviews/admin/admin.php
@@ -0,0 +1,77 @@
+<h1>All Articles</h1>
+<?php if ( isset( $results['errorMessage'] ) ) { ?>
+    <div class="errorMessage"><?php echo $results['errorMessage'] ?></div>
+<?php } ?>
+<?php print_r($results['authors'][2])?>
+<?php if ( isset( $results['statusMessage'] ) ) { ?>
+    <div class="statusMessage"><?php echo $results['statusMessage'] ?></div>
+<?php } ?>
+
+<table>
+    <tr>
+        <th>Publication Date</th>
+        <th>Article</th>
+        <th>Category</th>
+        <th>Subcategory</th>
+        <th>Authors</th>
+        <th>Active</th>
+    </tr>
+
+    <?php foreach ( $results['articles'] as $article ) { ?>
+
+        <tr onclick="location='<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/editArticle') ?>&amp;articleId=<?php echo $article->id ?>'">
+            <td><?php echo date('j M Y', $article->publicationDate)?></td>
+            <td>
+                <?php echo $article->title?>
+            </td>
+            <td>
+                <?php 
+                if(isset ($article->categoryId)) {
+                    echo $results['category'][$article->categoryId];                        
+                }
+                else {
+                    echo "Без категории";
+                }
+                ?>
+            </td>
+            <td>
+                <?php
+                if (isset ($article->subcategoryId)){
+                    echo $results['subcategory'][$article->subcategoryId];
+                }
+                ?>
+            </td>
+            <td>
+                <?php
+                $total = count($article->authors);
+                $counter = 0;
+                foreach ($article->authors as $key => $author) {
+                ?>
+                        <a href=".?action=viewArticleAuthor&amp;author=<?php echo $author ?>">
+                            <?php
+                            echo $author;
+                            $counter++;
+                            if ($counter != $total) {
+                                echo ', ';
+                            }
+                            ?>
+                        </a>
+                <?php } ?>
+            </td>
+            <td>
+    <?php
+    // Проверяем, если значение activeArticle равно 1 (активно)
+    echo ($article->active == 1) ? 'Active' : 'Not active';
+    ?>
+</td>
+
+
+        </tr>
+
+    <?php } ?>
+
+</table>
+
+<p><?php echo $results['totalRows']?> article<?php echo ( $results['totalRows'] != 1 ) ? 's' : '' ?> in total.</p>
+
+<p><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/newArticle') ?>">Add a New Article</a></p>
diff --git a/application/CMSviews/admin/edit/article.php b/application/CMSviews/admin/edit/article.php
new file mode 100644
index 0000000..61d2724
--- /dev/null
+++ b/application/CMSviews/admin/edit/article.php
@@ -0,0 +1,84 @@
+<h1><?php echo $results['pageTitle']?></h1>
+<?php print_r($results['article'])?>
+<form method="post" 
+      action="<?= \ItForFree\SimpleMVC\Router\WebRouter::link($results['article']->id ? 'admin/editArticle' : 'admin/newArticle') . ($results['article']->id ? '&articleId=' . $results['article']->id : '') ?>">
+
+    <?php if ($results['article']->id): ?>
+        <input type="hidden" name="articleId" value="<?php echo $results['article']->id ?>" />
+    <?php endif; ?>
+    <?php if ( isset( $results['errorMessage'] ) ) { ?>
+        <div class="errorMessage"><?php echo $results['errorMessage'] ?></div>
+    <?php } ?>
+
+    <ul>
+        <li>
+            <label for="title">Article Title</label>
+            <input type="text" name="title" id="title" placeholder="Name of the article" required autofocus maxlength="255" value="<?php echo htmlspecialchars( $results['article']->title ?? '')?>" />
+        </li>
+
+        <li>
+            <label for="summary">Article Summary</label>
+            <textarea name="summary" id="summary" placeholder="Brief description of the article" required maxlength="1000" style="height: 5em;"><?php echo htmlspecialchars( $results['article']->summary ?? ''  )?></textarea>
+        </li>
+
+        <li>
+            <label for="content">Article Content</label>
+            <textarea name="content" id="content" placeholder="The HTML content of the article" required maxlength="100000" style="height: 30em;"><?php echo htmlspecialchars( $results['article']->content ?? ''  )?></textarea>
+        </li>
+
+        <li>
+            <label for="categoryId">Article Category</label>
+            <select name="categoryId">
+                <?php foreach ($results['categories'] as $category){ ?>
+                    <option value="<?php echo $category->id?>"<?php echo ( $category->id == $results ) ? " selected" : ""?>><?php echo htmlspecialchars( $category->name )?></option>
+                <?php } ?>
+            </select>
+        </li>
+
+        <li>
+            <label for="subcategoryId">Article Subcategory</label>
+            <select name="subcategoryId">
+                <?php foreach ($results['subcategories'] as $subcategory) { ?>
+                    <option value="<?php echo $subcategory->id?>"<?php
+                        echo ($subcategory->id == $results) ? " selected" : "" ?>>
+                        <?php echo htmlspecialchars($subcategory->name) ?>
+                    </option>
+                <?php } ?>
+            </select>
+        </li>
+        <li>
+            <label for="users[]">Authors</label>
+            <select name="users[]">
+                <option value="">Без автора</option>
+                <?php foreach ($results['users'] as $author) { ?>
+                    <option value="<?php echo $author->id ?>"<?php
+                        echo ($author->id == $results) ? " selected" : "" ?>>
+                        <?php echo htmlspecialchars($author->login) ?>
+                    </option>
+                <?php } ?>
+            </select>
+        </li>    
+        <li>
+            <label for="publicationDate">Publication Date</label>
+            <input type="date" name="publicationDate" id="publicationDate" placeholder="YYYY-MM-DD" required value="<?php echo $results['article']->publicationDate ? date( 'Y-m-d', strtotime($results['article']->publicationDate)) : '' ?>" />
+
+        </li>
+
+        <li>
+            <label for="checkActivity">Active</label>
+            <input type="checkbox" name="active" value="1" id="checkActivity" <?php echo $results['article']->active ? 'checked' : '' ?>>
+        </li>
+    </ul>
+
+    <div class="buttons">
+        <input type="submit" name="saveChanges" value="Save Changes" />
+        <input type="submit" formnovalidate name="cancel" value="Cancel" />
+    </div>
+</form>
+
+<?php if ($results['article']->id) { ?>
+    <p><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/deleteArticle') ?>&amp;articleId=<?php echo $results['article']->id ?>" onclick="return confirm('Delete This Article?')">
+            Delete This Article
+        </a>
+    </p>
+<?php } ?>
diff --git a/application/CMSviews/admin/edit/category.php b/application/CMSviews/admin/edit/category.php
new file mode 100644
index 0000000..6dd8f01
--- /dev/null
+++ b/application/CMSviews/admin/edit/category.php
@@ -0,0 +1,39 @@
+<h1><?php echo $results['pageTitle']; ?></h1>
+
+<form method="post" 
+      action="<?= \ItForFree\SimpleMVC\Router\WebRouter::link($results['categories']->id ? 'admin/editCategory' : 'admin/newCategory') . ($results['categories']->id ? '&categoryId=' . $results['categories']->id : '') ?>">
+
+    <?php if ($results['categories']->id): ?>
+        <input type="hidden" name="categoryId" value="<?php echo $results['categories']->id ?>" />
+    <?php endif; ?>
+
+    <?php if (isset($results['errorMessage'])) { ?>
+        <div class="errorMessage"><?php echo $results['errorMessage'] ?></div>
+    <?php } ?>
+
+    <ul>
+        <li>
+            <label for="name">Category Name</label>
+            <input type="text" name="name" id="name" placeholder="Name of the category" required autofocus maxlength="255" 
+                   value="<?php echo htmlspecialchars($results['categories']->name ?? '') ?>" />
+        </li>
+
+        <li>
+            <label for="description">Description</label>
+            <textarea name="description" id="description" placeholder="Brief description of the category" required maxlength="1000" style="height: 5em;"><?php echo htmlspecialchars($results['categories']->description ?? '') ?></textarea>
+        </li>
+    </ul>
+
+    <div class="buttons">
+        <input type="submit" name="saveChanges" value="<?= $results['categories']->id ? 'Save Changes' : 'Create Category' ?>" />
+        <input type="submit" formnovalidate name="cancel" value="Cancel" />
+    </div>
+</form>
+
+<?php if ($results['categories']->id): ?>
+    <p>
+        <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/deleteCategory') ?>&amp;categoryId=<?php echo $results['categories']->id ?>" onclick="return confirm('Delete This Category?')">
+            Delete This Category
+        </a>
+    </p>
+<?php endif; ?>
diff --git a/application/CMSviews/admin/edit/subcategory.php b/application/CMSviews/admin/edit/subcategory.php
new file mode 100644
index 0000000..81dca87
--- /dev/null
+++ b/application/CMSviews/admin/edit/subcategory.php
@@ -0,0 +1,61 @@
+
+    <h1><?php echo $results['pageTitle'];?></h1>
+    
+<form method="post" 
+      action="<?= \ItForFree\SimpleMVC\Router\WebRouter::link($results['subcategories']->id ? 'admin/editSubcategory' : 'admin/newSubcategory') . ($results['subcategories']->id ? '&subcategoryId=' . $results['subcategories']->id : '') ?>">
+
+    <?php if ($results['subcategories']->id): ?>
+        <input type="hidden" name="categoryId" value="<?php echo $results['subcategories']->id ?>" />
+    <?php endif; ?>
+
+    <?php if (isset($results['errorMessage'])) { ?>
+        <div class="errorMessage"><?php echo $results['errorMessage'] ?></div>
+    <?php } ?>  
+        <input type="hidden" name="subcategoryId"
+               value="<?php echo $results['subcategories']->id ?>"/>
+    <?php if ( isset( $results['errorMessage'] ) ) { ?>
+            <div class="errorMessage"><?php echo $results['errorMessage'] ?></div>
+    <?php } ?>
+    
+    <ul>
+        <li>
+            <label for="name">Subcategory Name</label>
+            <input type="text" name="name" id="name"
+                placeholder="Name of the subcategory" required autofocus maxlength="255"
+                value="<?php echo htmlspecialchars( $results['subcategories']->name ?? '' )?>" />
+            </li>
+
+        <li>
+            <label for="description">Description</label>
+            <textarea name="description" id="description"
+                placeholder="Brief description of the subcategory"><?php echo htmlspecialchars( $results['subcategories']->description ?? '' )?></textarea>
+        </li>
+        <li>
+            <label for="category">Category</label>
+            <select name="categoryId">
+                <?php foreach ($results['categories'] as $category) { ?>
+                    <option value="<?php echo $category->id ?>" 
+    <?php echo ($category->id == $results['subcategories']->categoryId) ? "selected" : "" ?>>
+    <?php echo htmlspecialchars($category->name) ?>
+</option>
+
+                <?php } ?>
+            </select>
+
+        </li>
+    <ul>
+        
+    <div class="buttons">
+          <input type="submit" name="saveChanges" value="Save Changes" />
+          <input type="submit" formnovalidate name="cancel" value="Cancel" />
+        </div>
+        
+    </form>
+    
+    <?php if ( $results['subcategories']->id ) { ?>
+          <p>
+            <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/deleteSubcategory') ?>&amp;subcategoryId=<?php echo $results['subcategories']->id ?>" onclick="return confirm('Delete This Category?')">
+            Delete This Subcategory
+        </a>
+          </p>
+    <?php } ?>
\ No newline at end of file
diff --git a/application/CMSviews/admin/edit/user.php b/application/CMSviews/admin/edit/user.php
new file mode 100644
index 0000000..15e06ba
--- /dev/null
+++ b/application/CMSviews/admin/edit/user.php
@@ -0,0 +1,49 @@
+<h1><?php echo $results['pageTitle']?></h1>
+        <form method="post" 
+      action="<?= \ItForFree\SimpleMVC\Router\WebRouter::link($results['users']->id ? 'admin/editUser' : 'admin/newUser') . ($results['users']->id ? '&userId=' . $results['users']->id : '') ?>">
+
+    <?php if ($results['users']->id): ?>
+        <input type="hidden" name="userId" value="<?= htmlspecialchars($results['users']->id, ENT_QUOTES, 'UTF-8') ?>" />
+    <?php endif; ?>
+    <?php if (isset($results['errorMessage'])) { ?>
+            <div class="errorMessage"><?php 
+                                          echo $results['errorMessage'] ?></div>
+    <?php } ?>
+            <ul>
+              <li>
+                <label for="title">User Login</label>
+                <input type="text" name="login" id="login" 
+                       placeholder="Login" 
+                       required autofocus maxlength="25"/>
+              </li>
+              <li>
+                <label for="title">User Password</label>
+                <input type="text" name="password" id="password" 
+                       placeholder="Password" 
+                       required autofocus maxlength="25" />
+              </li>
+              
+              <li>
+                  <label for="checkActivity">Active</label>
+                  <input type="checkbox" name="active" value="1" 
+                         id="checkboxActivity"
+                  <?php
+                        if($results['users']->active == 1) {
+                            echo 'checked = "checked"';
+                        }
+                  ?>
+                  >
+              </li>
+            </ul>
+            <div class="buttons">
+              <input type="submit" name="saveChanges" value="Save Changes" />
+              <input type="submit" formnovalidate name="cancel" value="Cancel" />
+            </div>
+        </form>
+    <?php if ($results['users']->login) { ?>
+          <p>
+        <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/deleteUser') ?>&amp;userId=<?php echo $results['users']->id ?>" onclick="return confirm('Delete This Category?')">
+            Delete This User
+        </a>
+          </p>
+    <?php } ?>
diff --git a/application/CMSviews/admin/listCategories.php b/application/CMSviews/admin/listCategories.php
new file mode 100644
index 0000000..748af84
--- /dev/null
+++ b/application/CMSviews/admin/listCategories.php
@@ -0,0 +1,30 @@
+<h1>Article Categories</h1>
+
+<?php if ( isset( $results['errorMessage'] ) ) { ?>
+    <div class="errorMessage"><?php echo $results['errorMessage'] ?></div>
+<?php } ?>
+
+<?php if ( isset( $results['statusMessage'] ) ) { ?>
+    <div class="statusMessage"><?php echo $results['statusMessage'] ?></div>
+<?php } ?>
+
+<table>
+    <tr>
+        <th>Category</th>
+    </tr>
+
+<?php foreach ( $results['categories'] as $category ) { ?>
+
+    <tr onclick="location='<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/editCategory') ?>&amp;categoryId=<?php echo $category->id?>'">
+        <td>
+            <?php echo $category->name?>
+        </td>
+    </tr>
+
+<?php } ?>
+
+</table>
+
+<p><?php echo $results['totalRows']?> category<?php echo ( $results['totalRows'] != 1 ) ? 'ies' : 'y' ?> in total.</p>
+
+<p><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/newCategory') ?>">Add a New Category</a></p>
diff --git a/application/CMSviews/admin/listSubcategories.php b/application/CMSviews/admin/listSubcategories.php
new file mode 100644
index 0000000..3455dc4
--- /dev/null
+++ b/application/CMSviews/admin/listSubcategories.php
@@ -0,0 +1,30 @@
+<h1>Article Subcategories</h1>
+
+<?php if (isset($results['errorMessage'])) { ?>
+	<div class="errorMessage"><?php echo $results['errorMessage'] ?></div>
+<?php } ?>
+
+<?php if (isset($results['statusMessage'])) { ?>
+	<div class="statusMessage"><?php echo $results['statusMessage'] ?></div>
+<?php } ?>
+
+<table>
+	<tr>
+		<th>Subcategory name</th>
+	</tr>
+
+	<?php foreach ($results['subcategories'] as $subcategory) { ?>
+
+		<tr onclick="location = '<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/editSubcategory')?>&amp;subcategoryId=<?php echo $subcategory->id ?>'">
+			<td>
+				<?php echo $subcategory->name ?>
+			</td>
+		</tr>
+
+	<?php } ?>
+
+</table>
+
+<p><?php echo $results['totalRows'] ?> categor<?php echo ( $results['totalRows'] != 1 ) ? 'ies' : 'y' ?> in total.</p>
+
+<p><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/newSubcategory')?>">Add a New Subcategory</a></p>
diff --git a/application/CMSviews/admin/listUsers.php b/application/CMSviews/admin/listUsers.php
new file mode 100644
index 0000000..6d65367
--- /dev/null
+++ b/application/CMSviews/admin/listUsers.php
@@ -0,0 +1,40 @@
+<h1>Users</h1>
+<?php if ( isset( $results['errorMessage'] ) ) { ?>
+    <div class="errorMessage"><?php echo $results['errorMessage'] ?></div>
+<?php } ?>
+
+<?php if ( isset( $results['statusMessage'] ) ) { ?>
+    <div class="statusMessage"><?php echo $results['statusMessage'] ?></div>
+<?php } ?>
+
+<table>
+    <tr>
+        <th>Имя пользователя</th>
+        <th>Активность</th>
+    </tr>
+
+    <?php foreach ( $results['users'] as $user ) { ?>
+
+        <tr onclick="location='<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/editUser')?>&amp;userId=<?php echo $user->id?>'">
+            <td>
+                <?php echo $user->login?>
+            </td>
+        
+            <td>
+                <?php 
+                    if($user->active){
+                        echo 'Активен';
+                    }else{
+                        echo 'Неактивен';
+                    }      
+                ?>
+            </td>
+        </tr>
+
+    <?php } ?>
+
+</table>
+
+<p><?php echo $results['totalRows']?> user<?php echo ( $results['totalRows'] != 1 ) ? 's' : '' ?> in total.</p>
+
+<p><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/newUser')?>">Add a New User</a></p>
diff --git a/application/views/error.php b/application/CMSviews/error.php
similarity index 97%
rename from application/views/error.php
rename to application/CMSviews/error.php
index c8a5e74..1bbfb76 100644
--- a/application/views/error.php
+++ b/application/CMSviews/error.php
@@ -1,4 +1,3 @@
-
 <?php
 
 ?>
@@ -14,6 +13,4 @@
         </tr>
     <?php endforeach;?>
     </table>
-</div>
-
-
+</div>
\ No newline at end of file
diff --git a/application/CMSviews/homepage/archive.php b/application/CMSviews/homepage/archive.php
new file mode 100644
index 0000000..4d8b999
--- /dev/null
+++ b/application/CMSviews/homepage/archive.php
@@ -0,0 +1,37 @@
+
+
+<h1><?php echo htmlspecialchars($results['pageHeading']); ?></h1>
+
+<?php if ($results['category']) { ?>
+    <h3 class="categoryDescription"><?php echo htmlspecialchars($results['category']->description); ?></h3>
+<?php } ?>
+
+<ul id="headlines" class="archive">
+    <?php foreach ($results['articles'] as $article) { ?>
+        <li>
+            <h2>
+                <span class="pubDate">
+                    <?php echo date('j F Y', $article->publicationDate); ?>
+                </span>
+                <a href=".?action=viewArticle&amp;articleId=<?php echo $article->id; ?>">
+                    <?php echo htmlspecialchars($article->title); ?>
+                </a>
+
+                <?php if (!$results['category'] && $article->categoryId) { ?>
+                    <span class="category">
+                        in 
+                        <a href=".?action=archive&amp;categoryId=<?php echo $article->categoryId; ?>">
+                            <?php echo htmlspecialchars($results['categories'][$article->categoryId]->name); ?>
+                        </a>
+                    </span>
+                <?php } ?>          
+            </h2>
+            <p class="summary"><?php echo htmlspecialchars($article->summary); ?></p>
+        </li>
+    <?php } ?>
+</ul>
+
+<p><?php echo $results['totalRows']; ?> article<?php echo ($results['totalRows'] != 1) ? 's' : ''; ?> in total.</p>
+
+<p><a href="./">Return to Homepage</a></p>
+
diff --git a/application/CMSviews/homepage/homepage.php b/application/CMSviews/homepage/homepage.php
new file mode 100644
index 0000000..8437c60
--- /dev/null
+++ b/application/CMSviews/homepage/homepage.php
@@ -0,0 +1,81 @@
+<?php 
+foreach ($results['articles'] as $article) { 
+?>
+    <li class='<?php echo $article->id?>'>
+        
+        <h2>
+            <span class="pubDate">
+                <?php echo date('j F', $article->publicationDate)?>
+            </span>
+
+            <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/singleArticle') . '&articleId=' . $article->id ?>">
+                <?php echo htmlspecialchars( $article->title )?>
+            </a>
+
+            <?php if (isset($article->categoryId) && array_key_exists($article->categoryId, $results['categories'])) { ?>
+                <span class="category">
+                    Категория
+                    <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/viewArticleCategory') . '&categoryId=' . $article->categoryId ?>">
+                        <?php echo htmlspecialchars($results['categories'][$article->categoryId]->name) ?>
+                    </a>
+                </span>
+            <?php } else { ?>
+                <span class="category">
+                    <?php echo "Без категории" ?>
+                </span>
+            <?php } ?>
+
+            <?php if (isset($article->subcategoryId) && array_key_exists($article->subcategoryId, $results['subcategories'])) { ?>
+                <span class="subcategory">
+                    Подкатегория 
+                    <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/viewArticleSubcategory') . '&subcategoryId=' . $article->subcategoryId ?>">
+                        <?php echo htmlspecialchars($results['subcategories'][$article->subcategoryId]->name)?>
+                    </a>
+                </span>
+            <?php } else { ?>
+                <span class="subcategory">
+                    <?php echo "Без подкатегории"?>
+                </span>
+            <?php } ?>
+
+            <?php 
+            if (isset($article->id) && isset($results['authors'][$article->id]) && !empty($results['authors'][$article->id])) { ?>
+                <span class="authors">
+                    Авторы: 
+                    <?php 
+                    $authors = $results['authors'][$article->id];
+                    $authorsLinks = [];
+
+                    if (is_array($authors)) {
+                        foreach ($authors as $authorId => $author) {
+                            // Предполагаем, что свойство login является строкой
+                            $authorsLinks[] = '<a href="' . \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/viewArticleAuthors') . '?authorsId=' . $authorId . '">' . htmlspecialchars($author->login) . '</a>';
+                        }
+                    } else {
+                        // Если автор только один
+                        $authorsLinks[] = '<a href="' . \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/viewArticleAuthors') . '?authorsId=' . $article->id . '">' . htmlspecialchars($authors->login) . '</a>';
+                    }
+
+                    echo implode(', ', $authorsLinks);
+                    ?>
+                </span>
+            <?php } ?>
+
+
+
+        </h2>
+        
+        <p class="summary"><?php echo htmlspecialchars($article->content)?></p>
+        <img id="loader-identity" src="JS/ajax-loader.gif" alt="gif">
+        <ul class="ajax-load">
+            <li><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/singleArticle') . '&articleId=' . $article->id ?>" class="ajaxArticleBodyByPost" data-contentId="<?php echo $article->id?>">Показать продолжение (POST)</a></li>
+            <li><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/singleArticle') . '&articleId=' . $article->id ?>" class="ajaxArticleBodyByGet" data-contentId="<?php echo $article->id?>">Показать продолжение (GET)</a></li>
+            <li><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/singleArticle') . '&articleId=' . $article->id ?>" class="loadArticle" style="cursor:pointer" data-contentId="<?=$article->id?>">(POST) -- NEW</a></li>
+            <li><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/singleArticle') . '&articleId=' . $article->id ?>" class="loadArticle" style="cursor:pointer" data-contentId="<?=$article->id?>">(GET)  -- NEW</a></li>
+        </ul>
+
+        <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/singleArticle') . '&articleId=' . $article->id ?>" class="showContent" data-contentId="<?php echo $article->id?>">Показать полностью</a>
+    </li>
+<?php } ?>
+</ul>
+<p><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/archive') ?>">Article Archive</a></p>
diff --git a/application/CMSviews/homepage/singleArticle.php b/application/CMSviews/homepage/singleArticle.php
new file mode 100644
index 0000000..4dd6f12
--- /dev/null
+++ b/application/CMSviews/homepage/singleArticle.php
@@ -0,0 +1,16 @@
+<h1 style="width: 75%;"><?php echo htmlspecialchars($results['article']['title']) ?></h1>
+<div style="width: 75%; font-style: italic;"><?php echo htmlspecialchars($results['article']['summary']);?></div>
+<div style="width: 75%;"><?php echo $results['article']['content'] ?></div>
+<p>Subcategory: <?= htmlspecialchars($results['article']['subcategory']) ?></p>
+<div style="width: 75%;">
+    Authors: 
+    <?= !empty($results['article']['authors']) 
+        ? htmlspecialchars($results['article']['authors']) 
+        : "No authors available." ?>
+</div>
+
+<p class="pubDate">Published on <?php echo date('j F Y', strtotime($results['article']['publicationDate'])); ?></p>
+
+</p>
+
+<p><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/index') ?>">Return to Homepage</a></p>
\ No newline at end of file
diff --git a/application/CMSviews/homepage/viewArticleAuthors.php b/application/CMSviews/homepage/viewArticleAuthors.php
new file mode 100644
index 0000000..c976f5e
--- /dev/null
+++ b/application/CMSviews/homepage/viewArticleAuthors.php
@@ -0,0 +1,23 @@
+<?php print_r($results['authors'])?>
+<h3 class="subcategoryDescription">Статьи автора <?php 
+                    echo htmlspecialchars($results['authors']->login)?></h3>
+    <ul id="headlines" class="archive">
+        
+        <?php foreach ($results['articles'] as $article) {?>
+         <li>
+             <h2>
+                 <span class="pubDate">
+                     <?php echo date('j F Y', $article->publicationDate)?>
+                 </span>
+                 <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/singleArticle') . '&articleId=' . $article->id ?>">
+                     <?php echo htmlspecialchars($article->title)?>
+                 </a>
+             </h2>
+             <p class="summary"><?php echo htmlspecialchars($article->summary)?> </p>
+         <li>
+        <?php } ?>
+    </ul>
+    <p><?php echo $results['totalRows']?> article<?php 
+                   echo ($results['totalRows'] != 1) ? 's' : '' ?> in total.</p>
+    <p><a href="./">Return to Homepage</a></p>
+
diff --git a/application/CMSviews/homepage/viewArticleCategory.php b/application/CMSviews/homepage/viewArticleCategory.php
new file mode 100644
index 0000000..0bb4b24
--- /dev/null
+++ b/application/CMSviews/homepage/viewArticleCategory.php
@@ -0,0 +1,34 @@
+<?php 
+if ($results['categories']) { ?>
+    <h3 class="categoryDescription">
+        <?php echo htmlspecialchars($results['categories']->description) ?>
+    </h3>
+<?php } ?>
+
+<ul id="headlines" class="archive">
+    <?php foreach ($results['articles'] as $article) { ?>
+        <li>
+            <h2>
+                <span class="pubDate">
+                    <?php echo date('j F Y', $article->publicationDate) ?>
+                </span>
+                <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/singleArticle') . '&articleId=' . $article->id ?>">
+                    <?php echo htmlspecialchars($article->title) ?>
+                </a>
+
+                <?php if (!$results['categories'] && $article->categoryId && isset($results['categories'][$article->categoryId])) { ?>
+                    <span class="category">
+                        in
+                        <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/archive') . '&categoryId=' . $article->categoryId ?>">
+                            <?php echo htmlspecialchars($results['categories'][$article->categoryId]->name) ?>
+                        </a>
+                    </span>
+                <?php } ?>
+            </h2>
+            <p class="summary"><?php echo htmlspecialchars($article->summary) ?></p>
+        </li>
+    <?php } ?>
+</ul>
+
+<p><?php echo $results['totalRows'] ?> article<?php echo ($results['totalRows'] == 1) ? '' : 's' ?> in total.</p>
+<p><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/index') ?>">Return to Homepage</a></p>
\ No newline at end of file
diff --git a/application/CMSviews/homepage/viewArticleSubcategory.php b/application/CMSviews/homepage/viewArticleSubcategory.php
new file mode 100644
index 0000000..9c1c05e
--- /dev/null
+++ b/application/CMSviews/homepage/viewArticleSubcategory.php
@@ -0,0 +1,35 @@
+<?php 
+
+if ($results['subcategory']) { ?>
+    <h3 class="subcategoryDescription">
+        <?php echo htmlspecialchars($results['subcategory']->description) ?>
+    </h3>
+<?php } ?>
+
+<ul id="headlines" class="archive">
+    <?php foreach ($results['articles'] as $article) { ?>
+        <li>
+            <h2>
+                <span class="pubDate">
+                    <?php echo date('j F Y', $article->publicationDate) ?>
+                </span>
+                <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/singleArticle') . '&articleId=' . $article->id ?>">
+                    <?php echo htmlspecialchars($article->title) ?>
+                </a>
+
+                <?php if (!$results['subcategory'] && $article->subcategoryId && isset($results['subcategories'][$article->subcategoryId])) { ?>
+                    <span class="subcategory">
+                        in
+                        <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/archive') . '&subcategoryId=' . $article->subcategoryId ?>">
+                            <?php echo htmlspecialchars($results['subcategories'][$article->subcategoryId]->name) ?>
+                        </a>
+                    </span>
+                <?php } ?>
+            </h2>
+            <p class="summary"><?php echo htmlspecialchars($article->summary) ?></p>
+        </li>
+    <?php } ?>
+</ul>
+
+<p><?php echo $results['totalRows'] ?> article<?php echo ($results['totalRows'] == 1) ? '' : 's' ?> in total.</p>
+<p><a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Homepage/index') ?>">Return to Homepage</a></p>
\ No newline at end of file
diff --git a/application/CMSviews/layouts/includes/adminHeader.php b/application/CMSviews/layouts/includes/adminHeader.php
new file mode 100644
index 0000000..20af138
--- /dev/null
+++ b/application/CMSviews/layouts/includes/adminHeader.php
@@ -0,0 +1,7 @@
+<div id="adminHeader">
+        <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/index') ?>">Edit Articles</a> 
+        <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/listCategories') ?>">Edit Categories</a>
+        <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/listSubcategories') ?>">Edit Subcategories</a>
+        <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Admin/listUsers') ?>">Edit Users</a>
+    </p>
+</div>
diff --git a/application/CMSviews/layouts/includes/footer.php b/application/CMSviews/layouts/includes/footer.php
new file mode 100644
index 0000000..f042f19
--- /dev/null
+++ b/application/CMSviews/layouts/includes/footer.php
@@ -0,0 +1,8 @@
+<div id="footer">
+    Простая PHP CMS &copy; 2017. Все права принадлежат всем. ;) <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('login/login') ?>">
+        Site Admin</a>
+</div>
+
+</div>
+</body>
+</html>
diff --git a/application/CMSviews/layouts/includes/header.php b/application/CMSviews/layouts/includes/header.php
new file mode 100644
index 0000000..d9a9892
--- /dev/null
+++ b/application/CMSviews/layouts/includes/header.php
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="Your website description">
+    <meta name="author" content="Your Name">
+    <title><?php echo $title?></title>
+    <link rel="stylesheet" type="text/css" href="/CSS/style.css" />
+
+    <script src="JS/jquery-3.2.1.js"></script>
+    <script src="JS/loaderIdentity.js"></script>
+    <script src="JS/showContent.js"></script>
+  </head>
+  <body>
+    <div id="container">
+      <a href="."><img id="logo" src="images/logo.jpg" alt="Logo of Widget News" /></a>
+    <p>You are logged in as <b><?php echo $User->userName ?></b>.
+        <a href="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Login/logout') ?>">Log out </a>
\ No newline at end of file
diff --git a/application/CMSviews/layouts/main.php b/application/CMSviews/layouts/main.php
new file mode 100644
index 0000000..e63c80d
--- /dev/null
+++ b/application/CMSviews/layouts/main.php
@@ -0,0 +1,18 @@
+<?php
+use ItForFree\SimpleMVC\Config;
+
+$User = Config::getObject('core.user.class');
+use application\models\Category;
+?>
+<?php include "includes/header.php"; ?>
+<?php 
+if( isset($_GET['route'])){
+	if($User->userName == 'admin' && 
+	   $User->userName != 'guest' && 
+	   preg_match('/Admin/', $_GET['route']) == 1){ 
+		  include "includes/adminHeader.php"; 
+	}
+}
+?>
+<?= $CONTENT_DATA ?>
+<?php include "includes/footer.php"; ?>
diff --git a/application/CMSviews/login/loginForm.php b/application/CMSviews/login/loginForm.php
new file mode 100644
index 0000000..93eaf14
--- /dev/null
+++ b/application/CMSviews/login/loginForm.php
@@ -0,0 +1,29 @@
+	  
+<form action="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('Login/login')?>" method="post" style="width: 50%;">
+        <input type="hidden" name="login" value="true" />
+
+        <?php if (isset($errorMessage)) { ?>
+        <div class="errorMessage"><?php echo $errorMessage; ?></div>
+    <?php } ?>
+
+        <ul>
+
+            <li>
+                <label for="username">Username</label>
+                <input type="text" name="userName" id="userName" placeholder="Your admin username" required autofocus maxlength="20" />
+            </li>
+
+            <li>
+                <label for="password">Password</label>
+                <input type="password" name="password" id="password" placeholder="Your admin password" required maxlength="20" />
+            </li>
+
+        </ul>
+
+        <div class="buttons">
+            <input type="submit" name="login" value="Войти" />
+        </div>
+
+    </form>
+
+
diff --git a/application/config/console.php b/application/config/console.php
index e6ac73a..8f3eba9 100644
--- a/application/config/console.php
+++ b/application/config/console.php
@@ -5,9 +5,9 @@
 $config = [
     'core' => [ // подмассив, используемый самим ядром фреймворка
         'db' => [
-            'dns' => 'mysql:host=localhost;dbname=dbname',
-            'username' => 'root',
-            'password' => '1234'
+            'dns' => 'mysql:host=localhost;dbname=db_cms',
+            'username' => 'myuser',
+            'password' => '12345'
         ],
         'router' => [ // подсистема маршрутизации
             'class' => \ItForFree\SimpleMVC\Router\ConsoleRouter::class,
diff --git a/application/config/web.php b/application/config/web.php
index 744d79f..2fb4117 100644
--- a/application/config/web.php
+++ b/application/config/web.php
@@ -5,18 +5,18 @@
 $config = [
     'core' => [ // подмассив используемый самим ядром фреймворка
         'db' => [
-            'dns' => 'mysql:host=localhost;dbname=dbname',
-            'username' => 'root',
-            'password' => '1234'
+            'dns' => 'mysql:host=localhost;dbname=db_cms',
+            'username' => 'myuser',
+            'password' => '12345'
         ],
         'router' => [ // подсистема маршрутизация
             'class' => \ItForFree\SimpleMVC\Router\WebRouter::class,
-	    'alias' => '@router'
+	    'alias' => '@router',
         ],
         'mvc' => [ // настройки MVC
             'views' => [
-                'base-template-path' => '../application/views/',
-                'base-layouts-path' => '../application/views/layouts/',
+                'base-template-path' => '../application/CMSviews/',
+                'base-layouts-path' => '../application/CMSviews/layouts/',
                 'footer-path' => '',
                 'header-path' => ''
             ]
@@ -28,7 +28,7 @@
 		=> \application\handlers\UserExceptionHandler::class
         ],
         'user' => [ // подсистема авторизации
-            'class' => \application\models\AuthUser::class,
+            'class' => \application\models\User::class,
 	    'construct' => [
                 'session' => '@session',
                 'router' => '@router'
@@ -37,6 +37,17 @@
         'session' => [ // подсистема работы с сессиями
             'class' => ItForFree\SimpleMVC\Session::class,
             'alias' => '@session'
+        ],
+        'subcategory' => [ // подсистема работы с сессиями
+            'class' => \application\models\Subcategory::class
+        ],
+        
+        'homepageNumArticles' => 25,
+        'homepageNumSubcategories' => 25,
+        'homepageNumArticlesPerSubcategory' =>25,
+        'admin' => [
+            'username' => 'admin', // Укажите имя пользователя администратора
+            'password' => 1234,
         ]
     ]    
 ];
diff --git a/application/controllers/AdminController.php b/application/controllers/AdminController.php
new file mode 100644
index 0000000..3ef0c13
--- /dev/null
+++ b/application/controllers/AdminController.php
@@ -0,0 +1,354 @@
+<?php
+namespace application\controllers;
+use ItForFree\SimpleMVC\Config;
+use ItForFree\SimpleMVC\Url;
+use application\models\Article;
+use application\models\AllUsers;
+use application\models\Category;
+use application\models\Subcategory;
+use application\models\Connection;
+class AdminController extends \ItForFree\SimpleMVC\MVC\Controller
+{
+    public $articlesData = array();
+    public $results = array();
+    public $title = 'CMS на PHP';
+    public $Article = null;
+    public $Category = null;
+    public $Subcategory = null;
+    public $Users = null;
+    public $Connection = null;
+    protected function initModelObjects(){
+		$this->Article = new Article;
+		$this->Category = new Category;
+		$this->Subcategory = new Subcategory;
+		$this->Users = new AllUsers;
+		$this->Connection = new Connection;
+	}
+    protected function getArticles(){
+        $this->articlesData = $this->Article->getList();
+        $this->results['articles'] = $this->articlesData['results'];
+        $this->results['totalRows'] = $this->articlesData['totalRows'];
+        
+        $categoriesData = $this->Category->getList();
+        foreach ($categoriesData['results'] as $category){
+            $this->results['category'][$category->id] = $category->name;
+        }
+       
+        $subcategoryData = $this->Subcategory->getList();
+        foreach($subcategoryData['results'] as $subcategory){
+            $this->results['subcategory'][$subcategory->id] = $subcategory->name;
+            $this->results['categories']['$subcategory->id'] = $this->Category->getById($subcategory->categoryId);
+        }
+        $authorsData = $this->Users->getList();
+        foreach ($authorsData['results'] as $author){
+            $this->results['authors'][$author->id] = $author->login;
+        }
+    }
+    public function indexAction(){
+        $this->initModelObjects();
+        $this->getArticles();
+        $this->view->addVar('title', $this->title);
+        $this->view->addVar('results', $this->results);
+        $this->view->render('admin/admin.php');
+    }
+    public function viewArticleAction(){
+		$this->articlesData['id'] = $_GET['articleId'];
+		$Article = new Article();
+		$SingleArticle = $Article->getById($this->articlesData['id']);
+                $this->title = $SingleArticle->title . ' | ' . $this->title;
+		$this->results['article']['id'] = $SingleArticle->id;
+		$this->results['article']['title'] = $SingleArticle->title;
+		$this->results['article']['publicationDate'] = $SingleArticle->publicationDate;
+		$this->results['article']['subcategoryId'] = $SingleArticle->subcategoryId;
+		$this->results['article']['summary'] = $SingleArticle->summary;
+		$this->results['article']['content'] = $SingleArticle->content;
+		$this->results['article']['active'] = $SingleArticle->active;
+		$this->view->addVar('results', $this->results);
+                $this->view->addVar('title', $this->title);
+		$this->view->render('singleArticle/singleArticle.php');
+		
+	}
+    public function editArticleAction (){
+        $this->initModelObjects();
+        $this->results['pageTitle'] = "Edit article";
+        $articleId = isset($_GET['articleId']) ? ($_GET['articleId']) : null;
+        $article = $this->Article->getById($articleId);
+        if ($_SERVER['REQUEST_METHOD'] == 'POST'){
+            $title = $_POST['title'];
+            $summary = $_POST['summary'];
+            $content = $_POST['content'];
+            $categoryId = $_POST['categoryId'];
+            $subcategoryId = $_POST['subcategoryId'];
+            $publicationDate = $_POST['publicationDate'];
+            $active = isset($_POST['active']) ? 1 : 0;
+            $authors = $_POST['$authors'];
+
+            $article->title = $title;
+            $article->summary = $summary;
+            $article->content = $content;
+            $article->categoryId = $categoryId;
+            $article->subcategoryId = $subcategoryId;
+            $article->publicationDate = $publicationDate;
+            $article->active = $active;
+            $article->authors = $authors ; 
+            $this->Article->update($article);
+        }
+        $this->results['article'] = $article;
+        $this->results['categories'] = $this->Category->getList()['results'];
+        $this->results['subcategories'] = $this->Subcategory->getList()['results'];
+        $this->results['users'] = $this->Users->getList()['results'];
+        
+        $this->view->addVar('results', $this->results);
+        $this->view->render('admin/edit/article.php');
+    }
+    public function editCategoryAction (){
+        $this->initModelObjects();
+        $this->results['pageTitle'] = "Edit categories";
+        $this->title = $this->results['pageTitle'];
+        $categoryId = isset($_GET['categoryId']) ? (int)($_GET['categoryId']) : null;
+        $category = $this->Category->getById($categoryId);
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            $name = $_POST['name'];
+            $description = $_POST['description'];
+
+            $category->name = $name;
+            $category->description = $description;
+
+            echo ("Updating category: " . print_r($category, true)); // Проверяем содержимое
+            $this->Category->update($category);
+        }
+
+        $this->results['categories'] = $this->Category->getById($categoryId);
+        $this->results['formAction'] = 'editCategory&categoryId=' . $categoryId;
+        $this->view->addVar('title', $this->title);
+        $this->view->addVar('results',$this->results);
+        $this->view->render('admin/edit/category.php');
+    }
+    public function editSubcategoryAction(){
+        $this->initModelObjects();
+        $this->results['pageTitle'] = "Edit of subcategory";
+        $this->title = $this->results['pageTitle'];
+        $subcategoryId = isset($_GET['subcategoryId']) ? (int)($_GET['subcategoryId']) : null;
+        $subcategory = $this->Subcategory->getById($subcategoryId);
+        if ($_SERVER['REQUEST_METHOD'] == 'POST'){
+            $name = $_POST['name'];
+            $description = $_POST['description'];
+            $categoryId = $_POST['categoryId'];
+            
+            $subcategory->name = $name;
+            $subcategory->description = $description;
+            $subcategory->categoryId = $categoryId;
+            $this->Subcategory->update($subcategory);
+        }
+        $this->results['subcategories'] = $this->Subcategory->getById($subcategoryId);
+        $this->results['categories'] = $this->Category->getList() ['results'];
+        $this->results['formAction'] = 'editSubcategory&subcategoryId=' . $subcategoryId;
+        $this->view->addVar('title',$this->title);
+        $this->view->addVar('results',$this->results);
+        $this->view->render('admin/edit/subcategory.php');
+    }
+    public function editUserAction(){
+        $this->initModelObjects();
+        $this->results['pageTitle'] = "Edit User";
+        $this->title = $this->results['pageTitle'];
+        $userId = isset($_GET['userId']) ? (int)($_GET['userId']) : null;
+        $user = $this->Users->getById($userId);
+        if ($_SERVER['REQUEST_METHOD'] == 'POST'){
+            $login = $_POST['login'];
+            $password = $_POST['password'];
+            $active = $_POST['active'];
+            
+            $user->login = $login;
+            $user->password = $password;
+            $user->active = $active;
+            $this->Users->update($user);
+        }
+        $this->results['users'] = $this->Users->getById($userId);
+        $this->results['formAction'] = "editUser&userId=" . $userId;
+        $this->view->addVar('title',$this->title);
+        $this->view->addVar('results',$this->results);
+        $this->view->render('admin/edit/user.php');
+    }
+    
+    public function listCategoriesAction(){
+        $this->initModelObjects();
+        $data = $this->Category->getList();
+        $this->results['categories'] = $data['results'];
+        $this->results['totalRows'] = $data['totalRows'];
+        $this->results['pageTitle'] = "List of categories";
+        $this->title = $this->results['pageTitle'];
+        $this->view->addVar('title', $this->title);
+        if (isset($_GET['error'])) {
+			if ($_GET['error'] == "categoryNotFound")
+				$this->results['errorMessage'] = "Error: Category not found.";
+			if ($_GET['error'] == "categoryContainsArticles")
+				$this->results['errorMessage'] = "Error: Category contains subcategories. "
+					. "Delete the subcategories, or assign them to another category, "
+					. "before deleting this category.";
+		}
+
+		if (isset($_GET['status'])) {
+			if ($_GET['status'] == "changesSaved")
+				$this->results['statusMessage'] = "Your changes have been saved.";
+			if ($_GET['status'] == "categoryDeleted")
+				$this->results['statusMessage'] = "Category deleted.";
+		}
+        $this->view->addVar('results',$this->results);
+        $this->view->render('admin/listCategories.php');
+    }
+    public function listSubcategoriesAction(){
+        $this->initModelObjects();
+        $data = $this->Subcategory->getList();
+        $this->results['subcategories'] = $data['results'];
+        $this->results['totalRows'] = $data['totalRows'];
+        $this->results['pageTitle'] = "List of subcategories";
+        $this->title = $this->results['pageTitle'];
+        $this->view->addVar('title',$this->title);
+        if (isset($_GET['error'])){
+            if ($_GET['error'] == "subcategoryNotFound")
+                $this->results['errorMessage'] = "Error: Subcategory not found.";
+            if ($_GET['error'] == "subcategoryContainsArticles")
+                $this->results['errorMEssage'] = "Error: Subcategory contains articles";
+        }
+        if (isset($_GET['status'])){
+            if ($_GET['status'] == "changesSaved")
+                $this->results['statusMessage'] = "Your changes have been saved.";
+            if ($_GET['status'] == "subcategoryDeleted")
+                $this->results['statusMessage'] = "Subcategory deleted";
+        }
+        $this->view->addVar('results', $this->results);
+        $this->view->render('admin/listSubcategories.php');
+    }
+    public function listUsersAction(){
+        $this->initModelObjects();
+        $data = $this->Users->getList();
+        $this->results['users'] = $data['results'];
+        $this->results['totalRows'] = $data['totalRows'];
+        $this->results['pageTitle'] = "User list";
+        $this-> title = $this->results['pageTitle'];
+        $this->view->addVar('title',$this->title);
+        if (isset($_GET['error'])){
+            if ($_GET['error'] == "userNotFound")
+                $this->results['errorMessage'] = "Error: User not found.";
+            if ($_GET['error'] == "userExist")
+                $this->results['errorMessage'] = "Error: User with such name is alredy exist.";
+        }
+        if (isset($_GET['status'])){
+            if ($_GET['status'] == "changesSaved")
+                $this->results['statusMessage'] = "Your changes have been saved.";
+            if ($_GET['status'] == "subcategoryDeleted")
+                $this->results['statusMessage'] = "Subcategory deleted";
+        }
+        $this->view->addVar('results', $this->results);
+	$this->view->render('admin/listUsers.php');
+    }
+    public function newCategoryAction(){
+        $this->initModelObjects();
+        $this->results['pageTitle'] = "Add categories";
+        $this->title = $this->results['pageTitle'];
+        if (isset($_POST['saveChanges'])){
+            $category = $this->Category;
+            $category->storeFormValues($_POST);
+            $category->insert();
+            $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/listCategories'));
+        } elseif (isset($_POST['cancel'])){
+            $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/listCategories'));
+        } else {
+        $this->results['categories'] = $this->Category;
+        $this->view->addVar('results', $this->results);
+        $this->view->render('admin/edit/category.php');
+        }
+    }
+    public function deleteCategoryAction(){
+        $this->initModelObjects();
+        $categoryId = $_GET['categoryId'] ?? null;
+        if (!$categoryId){
+             $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/listCategories') . '&error=missingId');
+             return;
+        }
+        $category = $this->Category->getById($categoryId);
+        if (!$category){
+            $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/listCategories') . '&error=notFound');
+            return;
+        }
+        $this->Category->id = $categoryId;
+        $this->Category->delete();
+        $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/listCategories'));
+    }
+    public function newSubcategoryAction(){
+        $this->initModelObjects();
+        $this->results['pageTitle'] = "Add subcategory";
+        $this->title = $this->results['pageTitle'];
+        if (isset($_POST['saveChanges'])){
+            $subcategory = $this->Subcategory;
+            $subcategory->storeFormValues($_POST);
+            $subcategory->insert();
+            $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/listSubcategories'));
+        }elseif (isset ($_POST['cancel'])) {
+            $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/listCategories'));  
+        } else {
+            $this->results['subcategories'] = $this->Subcategory;
+            $this->results['categories'] = $this->Category->getList() ['results'];
+            $this->view->addVar('results', $this->results);
+            $this->view->render('admin/edit/subcategory.php');
+        }
+    }
+    public function deleteSubcategoryAction(){
+        $this->initModelObjects();
+        $subcategoryId = $_GET['subcategoryId'] ?? null;
+        $subcategory = $this->Subcategory->getById($subcategoryId);
+        $this->Subcategory->id = $subcategoryId;
+        $this->Subcategory->delete();
+        $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/listSubcategories'));
+    }
+    public function newUserAction(){
+        $this->initModelObjects();
+        $this->results['pageTitle'] = "Add new author";
+        $this->title = $this->results['pageTitle'];
+    if (isset($_POST['saveChanges'])){
+        $user = $this->Users;
+        $_POST['active'] = isset($_POST['active']) ? 1 : 0;
+        $user->storeFormValues($_POST);
+        $user->insert();
+        $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/listUsers'));
+    } elseif (isset($_POST['cancel'])){
+        $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/listUsers'));
+    } else {
+        $this->results['users'] = $this->Users;
+        $this->view->addVar('results', $this->results);
+        $this->view->render('admin/edit/user.php');
+        }
+    }
+    public function deleteUserAction(){
+        $this->initModelObjects();
+        $this->results['pageTitle'] = "Delete user";
+        $this->title = $this->results['pageTitle'];
+        $userId = $_GET['userId'] ?? null;
+        $user = $this->Users->getById($userId);
+        $this->Users->id  = $userId;
+        $this->Users->delete();
+        $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/listUsers'));
+    }
+    public function newArticleAction(){
+        $this->initModelObjects();
+        $this->results['pageTitle'] = "Add new article";
+        $this->title = $this->results['pageTitle'];
+        if (isset($_POST['saveChanges'])){
+            $article = $this->Article;
+            $article->storeFormValues($_POST);
+            $article->insert();
+            $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/admin.php'));
+        } elseif (isset($_POST['cancel'])){
+           $this->redirect(\ItForFree\SimpleMVC\Router\WebRouter::link('admin/admin.php')); 
+        } else {
+            $this->results['article'] = $this->Article;
+            $this->results['categories'] = $this->Category->getList() ['results'];
+            $this->results['subcategories'] = $this->Subcategory->getList() ['results'];
+            $this->results['users'] = $this->Users->getList() ['results'];
+            $this->view->addVar('results', $this->results);
+            $this->view->render('admin/edit/article.php');
+        }
+    }
+}
+
+
diff --git a/application/controllers/AjaxController.php b/application/controllers/AjaxController.php
deleted file mode 100644
index 0d0f752..0000000
--- a/application/controllers/AjaxController.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-namespace application\controllers;
-
-/**
- * Можно использовать для обработки ajax-запросов.
- */
-class AjaxController extends \ItForFree\SimpleMVC\MVC\Controller 
-{
-    /**
-     * Подгрузка "лайков" статей или товаров
-     */
-    public function likeAction()
-    {
-       echo 'привет!';
-    }   
-}
-
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index ef0cf99..e3dfa6f 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -12,4 +12,4 @@ public function indexAction($exception)
         $this->view->addVar('message', $exception->getMessage());
         $this->view->render('error.php');
     }
-}
+}
\ No newline at end of file
diff --git a/application/controllers/HelloController.php b/application/controllers/HelloController.php
deleted file mode 100644
index 5a350dd..0000000
--- a/application/controllers/HelloController.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace application\controllers;
-
-/**
- * Контроллер для проверки работоспособности консольного приложения
- */
-class HelloController
-{
-    public function indexAction()
-    {
-        echo 'HELLO !', PHP_EOL;
-    }
-
-    public function calcAction()
-    {
-        echo 1 + 2, PHP_EOL;
-    }
-
-    public function echoAction()
-    {
-        global $argv;
-        echo 'Вы ввели команду: "' . $argv[1] . '"', PHP_EOL;
-        if (count($argv) == 3) {
-            echo 'Дополнительный аргумент: "' . $argv[2] . '"', PHP_EOL;
-        }
-    }
-}
diff --git a/application/controllers/HomepageController.php b/application/controllers/HomepageController.php
index 8b9b6c9..a54e290 100644
--- a/application/controllers/HomepageController.php
+++ b/application/controllers/HomepageController.php
@@ -1,29 +1,244 @@
 <?php
 
 namespace application\controllers;
-
-/**
- * Контроллер для домашней страницы
- */
+use ItForFree\SimpleMVC\Config;
+use application\models\Article;
+use application\models\AllUsers;
+use application\models\Category;
+use application\models\Connection;
+use application\models\Subcategory;
 class HomepageController extends \ItForFree\SimpleMVC\MVC\Controller
 {
-    /**
-     * @var string Название страницы
-     */
-    public $homepageTitle = "Домашняя страница";
-    
-    /**
-     * @var string Пусть к файлу макета 
-     */
     public string $layoutPath = 'main.php';
-      
-    /**
-     * Выводит на экран страницу "Домашняя страница"
+    public $title = 'CMS на PHP';
+    public $articlesData = array();
+    public $subcategoriesData = array();
+    public $results = array();
+    public $Article = null;
+    public $Category = null;
+    public $Subcategory = null;
+    public $Connection = null;
+    public $Users = null;
+    
+    
+    /*
+     * Инициализация всех сущностей
      */
+    protected function initModelObjects(){
+        $this->Article = new Article();
+        $this->Category = new Category();
+        $this->Subcategory = new Subcategory();
+        $this->Connection = new Connection();
+        $this->Users = new AllUsers();
+    }
+    public function getArticles() {
+    $this->initModelObjects();
+    $this->articlesData = $this->Article->getList(Config::get('core.homepageNumArticles'));
+
+    $this->results['articles'] = $this->articlesData['results'];
+    $this->results['totalRows'] = $this->articlesData['totalRows'];
+
+    $subcategoriesData = $this->Subcategory->getList();
+    $categoriesData = $this->Category->getList();
+    $authorsData = $this->Users->getList();
+    
+
+    $this->results['subcategories'] = array();
+    $this->results['categories'] = array();
+    $this->results['authors'] = array();
+
+    foreach ($categoriesData['results'] as $category) {
+        $this->results['categories'][$category->id] = $category;  
+    }
+    
+    foreach ($subcategoriesData['results'] as $subcategory) {
+        $this->results['subcategories'][$subcategory->id] = $subcategory;
+    }
+     foreach ($authorsData['results'] as $author) {
+         $this->results['authors'][$author->id] = $author;
+    }
+}
+
+
+
+
+
     public function indexAction()
     {
-        $this->view->addVar('homepageTitle', $this->homepageTitle); // передаём переменную по view
-        $this->view->render('homepage/index.php');
+        $this->initModelObjects();
+        $this->articlesData = $this->Article->getList(Config::get('core.homepageNumArticles'));
+        $this->getArticles();
+        foreach ($this->results['articles'] as $article)
+        {
+            $article->content = substr($article->content,0,50) . ' ...';
+        }
+        $this->view->addVar('title',$this->title);
+        $this->view->addVar('results', $this->results);
+        $this->view->render('homepage/homepage.php');
+    }
+    
+    public function viewArticleAction(){
+        $this->initModelObjects();
+        if (!isset($_GET['articleId']) || !is_numeric($_GET['articleId'])) {
+            throw new \Exception("Invalid or missing articleId in the request.");
+        }
+        $this->articlesData['id'] = (int) $_GET['articleId'];
+        $SingleArticle = $this->Article->getById($this->articlesData['id']);
+        $this->title = $SingleArticle->title . ' | ' . $this->title;
+        $this->results['article'] = [
+            'id' => $SingleArticle->id,
+            'title' => $SingleArticle->title,
+            'publicationDate' => $SingleArticle->publicationDate,
+            'subcategoryId' => $SingleArticle->subcategoryId,
+            'summary' => $SingleArticle->summary,
+            'content' => $SingleArticle->content,
+            'active' => $SingleArticle->active,
+            'subcategory' => $this->Subcategory->getById($SingleArticle->subcategoryId)
+        ];
+        $connections = $this->Connection->getById($this->results['article']['id']);
+        $this->results['authors'] = [];
+        
+        foreach ($connections as $connection)
+        {
+            $userId = $connection->user_id;
+            $this->results['authors'][] = $this->User->getById($userId)->name;
+        }
+        $this->view->addVar('article', $SingleArticle);
+        $this->view->addVar('results', $this->results);
+        $this->view->addVar('title', $this->title);
+	$this->view->render('homepage/singleArticle.php');
+        
+    }
+    
+    public function archiveAction(){
+		$this->initModelObjects();
+		$this->articlesData = $this->Article->getList(100000);
+		$this->getArticles();
+		$this->results['category'] = 0;
+		$this->results['subcategory'] = 0;
+		$this->results['pageHeading'] = "Article Archive";
+		$this->title = $this->results['pageHeading'] . " | Widget News";
+		
+		$this->view->addVar('title', $this->title);
+		$this->view->addVar('results', $this->results);
+		$this->view->addVar('Category', $this->Category);
+		$this->view->render('homepage/archive.php');
+	}
+    public function archiveCatAction() {
+        $this->initModelObjects();
+        $subcategoryId = ( isset( $_GET['subcategoryId'] ) && 
+				$_GET['subcategoryId'] ) ? (int)$_GET['subcategoryId'] : null;
+        $this->results['subcategory'] = $this->Subcategory->getById($subcategoryId);
+        $this->results['category'] = $this->Category->getById(
+                $this->results['subcategory']->categoryId);
+        $data = $this->Subcategory->getList(100000,$this->results['subcategory']->categoryId);
+        $articleArr = array();
+        foreach($data['results'] as $subcategory){
+			$articleArr[] = $this->Article->getList(100000, $subcategory->id, true);
+	}
+        $this->results['articles'] = array();
+	$this->results['totalRows'] = 0; 
+        for( $i = 0; $i < count($articleArr); $i++){
+			$this->results['articles'] = array_merge($this->results['articles'], 
+					$articleArr[$i]['results']);
+			$this->results['totalRows'] = $this->results['totalRows'] + 
+					$articleArr[$i]['totalRows'];
+		}
+		if($this->results['category']){
+			$this->results['pageHeading'] = $this->results['category']->name;
+			$this->title = $this->results['category']->name;
+		}else{
+			$this->results['pageHeading'] = "Article Archive";
+		}	
+	$this->view->addVar('title', $this->title);
+	$this->view->addVar('results', $this->results);
+	$this->view->addVar('Category', $this->Category);
+	$this->view->render('homepage/archive.php');
+    }
+    public function singleArticleAction()
+{
+    $this->initModelObjects();
+
+    if (empty($_GET['articleId'])) {
+        throw new InvalidArgumentException('ID статьи обязателен.');
     }
+
+    $articleId = (int) $_GET['articleId'];
+
+    $article = $this->Article->getById($articleId);
+    if (!$article) {
+        throw new NotFoundException('Статья не найдена.');
+    }
+    $authorsData = $this->Article->getAuthors($articleId);  
+    $authors = $authorsData['authors'] ?? 'Не указано';
+    $this->title = $article->title . ' | ' . $this->title;
+
+    $subcategory = $this->Subcategory->getById($article->subcategoryId);
+    $subcategoryName = $subcategory ? $subcategory->name : 'Подкатегория не указана';
+
+    $this->results['article'] = [
+        'id' => $article->id,
+        'title' => $article->title,
+        'publicationDate' => $article->publicationDate,
+        'subcategoryId' => $article->subcategoryId,
+        'summary' => $article->summary,
+        'content' => $article->content,
+        'active' => $article->active,
+        'subcategory' => $subcategoryName,
+        'authors' => $authors,
+    ];
+    $this->view->addVar('results', $this->results);
+    $this->view->addVar('title', $this->title);
+    $this->view->render('homepage/singleArticle.php');
 }
 
+public function viewArticleSubcategoryAction() {
+    $this->initModelObjects();
+    
+    $subcategoryId = isset($_GET['subcategoryId']) ? (int) $_GET['subcategoryId'] : null;
+
+    if (!$subcategoryId) {
+        $this->view->addVar('title', 'Subcategory not found');
+        $this->view->render('homepage/error.php');
+        return;
+    }
+    $articlesData = $this->Article->getList(10000,null,1,$subcategoryId);
+
+    $this->results['articles'] = $articlesData['results'];
+    $this->results['totalRows'] = $articlesData['totalRows'];
+    $this->results['subcategory'] = $this->Subcategory->getById($subcategoryId);
+
+    $this->view->addVar('title', $this->results['subcategory']->name ?? 'Articles');
+    $this->view->addVar('results', $this->results);
+    $this->view->addVar('Subcategory', $this->Subcategory);
+
+    $this->view->render('homepage/viewArticleSubcategory.php');
+}
+public function viewArticleCategoryAction()
+{
+    $this->initModelObjects();
+    $categoryId = isset($_GET['categoryId']) ? (int)$_GET['categoryId'] : null;
+    $articlesData = $this->Article->getList(10000,$categoryId,1);
+    $this->results['articles'] = $articlesData['results'];
+    $this->results['totalRows'] = $articlesData['totalRows'];
+    $this->results['categories'] = $this->Category->getById($categoryId);
+     $this->view->addVar('title', $this->results['categories']->name ?? 'Articles');
+    $this->view->addVar('results', $this->results);
+    $this->view->addVar('Category', $this->Category);
+    $this->view->render('homepage/viewArticleCategory.php');
+}
+public function viewArticleAuthorsAction()
+{
+    $this->initModelObjects();
+    $authorsId = isset($_GET['authorsId']) ? (int)($_GET['authorsId']) : null;
+    $articlesData = $this->Article->getList(100,null,false,$authorsId);
+    $this->results['articles'] = $articlesData['results'];
+    $this->results['totalRows'] = $articlesData['totalRows'];
+    $this->results['authors'] = $this->Users->getById($authorsId);
+    $this->view->addVar('title', $this->results['authors']->login ?? 'Articles' );
+    $this->view->addVar('results', $this->results);
+    $this->view->addVar('Users', $this->Category);
+    $this->view->render('homepage/viewArticleAuthors.php');
+}
+  
+}
diff --git a/application/controllers/LoginController.php b/application/controllers/LoginController.php
index 6869896..9005fea 100644
--- a/application/controllers/LoginController.php
+++ b/application/controllers/LoginController.php
@@ -1,57 +1,44 @@
 <?php
 namespace application\controllers;
+
 use ItForFree\SimpleMVC\Config;
-use ItForFree\SimpleMVC\Router\WebRouter;
+use ItForFree\SimpleMVC\Router\WebRouter; // Подключаем WebRouter
 
 class LoginController extends \ItForFree\SimpleMVC\MVC\Controller
 {
-    
-    /**
-     * {@inheritDoc}
-     */
     public string $layoutPath = 'main.php';
-        
-    /** 
-     * @var string Название страницы
-     */
-    public $loginTitle = "Регистрация/Вход в систему";
-    
-    protected array $rules = [ 
-        ['allow' => true, 'roles' => ['?'], 'actions' => ['login']],
-        ['allow' => true, 'roles' => ['@'], 'actions' => ['logout']],
-    ];
-    
-    /**
-     * Вход в систему / Выводит на экран форму для входа в систему
-     */
+    public $title = 'Admin Login';
+    public $errorMessage = 'Неправильный логин или пароль';
+
     public function loginAction()
     {
-        if (!empty($_POST)) {
+		$User = Config::getObject('core.user.class');
+		
+		if($User->userName != null && $User->userName != 'guest'){
+			$this->redirect(WebRouter::link("Admin/index"));
+		} elseif (!empty($_POST)) {
             $login = $_POST['userName'];
             $pass = $_POST['password'];
-            $User = Config::getObject('core.user.class');
             if($User->login($login, $pass)) {
-                $this->redirect(WebRouter::link("homepage/index"));
+                $this->redirect(WebRouter::link("Admin/index"));
             }
             else {
-                $this->redirect(WebRouter::link("login/login&auth=deny"));
+                $this->view->addVar('errorMessage', 'Неверное имя пользователя или пароль.');
+                $this->redirect(WebRouter::link("Login/login&auth=deny"));
             }
         }
         else {
-            $this->view->addVar('loginTitle', $this->loginTitle);
-            $this->view->render('login/index.php');
+			$this->view->addVar('errorMessage', $this->errorMessage);
+			$this->view->addVar('title', $this->title);
+            $this->view->render('login/loginForm.php');
         }
     }
-    
-    /**
-     * Выход из системы
-     */
-    public function logoutAction()
-    {
-        $User = Config::getObject('core.user.class');
-        $User->logout();
-        $this->redirect(WebRouter::link("login/login"));
-    }
-}
 
 
+public function logoutAction() {
+    // Очищаем сессию при выходе
+    session_destroy();
+    $this->redirect(WebRouter::link("Login/login"));
+}
+
+}
diff --git a/application/controllers/admin/AdminusersController.php b/application/controllers/admin/AdminusersController.php
deleted file mode 100644
index c0c4d27..0000000
--- a/application/controllers/admin/AdminusersController.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-namespace application\controllers\admin;
-use ItForFree\SimpleMVC\Config;
-use \application\models\UserModel;
-
-/**
- * Администрирование пользователей
- */
-class AdminusersController extends \ItForFree\SimpleMVC\MVC\Controller
-{
-    
-    public string $layoutPath = 'admin-main.php';
-    
-    protected array $rules = [ //вариант 2:  здесь всё гибче, проще развивать в дальнешем
-         ['allow' => true, 'roles' => ['admin']],
-         ['allow' => false, 'roles' => ['?', '@']],
-    ];
-    
-    /**
-     * Основное действие контроллера
-     */
-    public function indexAction()
-    {
-        $Adminusers = new UserModel();
-        $userId = $_GET['id'] ?? null;
-        
-        if ($userId) { // если указан конктреный пользователь
-            $viewAdminusers = $Adminusers->getById($_GET['id']);
-            $this->view->addVar('viewAdminusers', $viewAdminusers);
-            $this->view->render('user/view-item.php');
-        } else { // выводим полный список
-            
-            $users = $Adminusers->getList()['results'];
-            $this->view->addVar('users', $users);
-            $this->view->render('user/index.php');
-        }
-    }
-
-    /**
-     * Создание нового пользователя
-     */
-    public function addAction()
-    {
-        $Url = Config::get('core.router.class');
-        if (!empty($_POST)) {
-            if (!empty($_POST['saveNewUser'])) {
-                $Adminusers = new UserModel();
-                $newAdminusers = $Adminusers->loadFromArray($_POST);
-                $newAdminusers->insert(); 
-                $this->redirect($Url::link("admin/adminusers/index"));
-            } 
-            elseif (!empty($_POST['cancel'])) {
-                $this->redirect($Url::link("admin/adminusers/index"));
-            }
-        } else {
-            $addAdminusersTitle = "Регистрация пользователя";
-            $this->view->addVar('addAdminusersTitle', $addAdminusersTitle);
-            
-            $this->view->render('user/add.php');
-        }
-    }
-    
-    /**
-     * Редактирование пользователя
-     */
-    public function editAction()
-    {
-        $id = $_GET['id'];
-        $Url = Config::get('core.router.class');
-        
-        if (!empty($_POST)) { // это выполняется нормально.
-            
-            if (!empty($_POST['saveChanges'] )) {
-                $Adminusers = new UserModel();
-                $newAdminusers = $Adminusers->loadFromArray($_POST);
-                $newAdminusers->update();
-                $this->redirect($Url::link("admin/adminusers/index&id=$id"));
-            } 
-            elseif (!empty($_POST['cancel'])) {
-                $this->redirect($Url::link("admin/adminusers/index&id=$id"));
-            }
-        } else {
-            $Adminusers = new UserModel();
-            $viewAdminusers = $Adminusers->getById($id);
-            
-            $editAdminusersTitle = "Редактирование данных пользователя";
-            
-            $this->view->addVar('viewAdminusers', $viewAdminusers);
-            $this->view->addVar('editAdminusersTitle', $editAdminusersTitle);
-            
-            $this->view->render('user/edit.php');   
-        }
-        
-    }
-    
-    /**
-     * Удаление пользователя
-     */
-    public function deleteAction()
-    {
-        $id = $_GET['id'];
-        $Url = Config::get('core.router.class');
-        
-        if (!empty($_POST)) {
-            if (!empty($_POST['deleteUser'])) {
-                $Adminusers = new UserModel();
-                $newAdminusers = $Adminusers->loadFromArray($_POST);
-                $newAdminusers->delete();
-                
-                $this->redirect($Url::link("admin/adminusers/index"));
-              
-            }
-            elseif (!empty($_POST['cancel'])) {
-                $this->redirect($Url::link("admin/adminusers/edit&id=$id"));
-            }
-        } else {
-            
-            $Adminusers = new UserModel();
-            $deletedAdminusers = $Adminusers->getById($id);
-            $deleteAdminusersTitle = "Удаление статьи";
-            
-            $this->view->addVar('deleteAdminusersTitle', $deleteAdminusersTitle);
-            $this->view->addVar('deletedAdminusers', $deletedAdminusers);
-            
-            $this->view->render('user/delete.php');
-        }
-    }
-}
diff --git a/application/controllers/admin/NotesController.php b/application/controllers/admin/NotesController.php
deleted file mode 100644
index b3865f8..0000000
--- a/application/controllers/admin/NotesController.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-namespace application\controllers\admin;
-use application\models\Note;
-use ItForFree\SimpleMVC\Config;
-
-/* 
- *   Class-controller notes
- * 
- * 
- */
-
-class NotesController extends \ItForFree\SimpleMVC\MVC\Controller
-{
-    
-    public string $layoutPath = 'admin-main.php';
-    
-    
-    public function indexAction()
-    {
-        $Note = new Note();
-
-        $noteId = $_GET['id'] ?? null;
-        
-        if ($noteId) { // если указан конктреный пользователь
-            $viewNotes = $Note->getById($_GET['id']);
-            $this->view->addVar('viewNotes', $viewNotes);
-            $this->view->render('note/view-item.php');
-        } else { // выводим полный список
-            
-            $notes = $Note->getList()['results'];
-            $this->view->addVar('notes', $notes);
-            $this->view->render('note/index.php');
-        }
-    }
-    
-    /**
-     * Выводит на экран форму для создания новой статьи (только для Администратора)
-     */
-    public function addAction()
-    {
-        $Url = Config::get('core.router.class');
-        if (!empty($_POST)) {
-            if (!empty($_POST['saveNewNote'])) {
-                $Note = new Note();
-                $newNotes = $Note->loadFromArray($_POST);
-                $newNotes->insert(); 
-                $this->redirect($Url::link("admin/notes/index"));
-            } 
-            elseif (!empty($_POST['cancel'])) {
-                $this->redirect($Url::link("admin/notes/index"));
-            }
-        }
-        else {
-            $addNoteTitle = "Добавление новой заметки";
-            $this->view->addVar('addNoteTitle', $addNoteTitle);
-            
-            $this->view->render('note/add.php');
-        }
-    }
-    
-    /**
-     * Выводит на экран форму для редактирования статьи (только для Администратора)
-     */
-    public function editAction()
-    {
-        $id = $_GET['id'];
-        $Url = Config::get('core.router.class');
-        
-        if (!empty($_POST)) { // это выполняется нормально.
-            
-            if (!empty($_POST['saveChanges'] )) {
-                $Note = new Note();
-                $newNotes = $Note->loadFromArray($_POST);
-                $newNotes->update();
-                $this->redirect($Url::link("admin/notes/index&id=$id"));
-            } 
-            elseif (!empty($_POST['cancel'])) {
-                $this->redirect($Url::link("admin/notes/index&id=$id"));
-            }
-        }
-        else {
-            $Note = new Note();
-            $viewNotes = $Note->getById($id);
-            
-            $editNoteTitle = "Редактирование заметки";
-            
-            $this->view->addVar('viewNotes', $viewNotes);
-            $this->view->addVar('editNoteTitle', $editNoteTitle);
-            
-            $this->view->render('note/edit.php');   
-        }
-        
-    }
-    
-    /**
-     * Выводит на экран предупреждение об удалении данных (только для Администратора)
-     */
-    public function deleteAction()
-    {
-        $id = $_GET['id'];
-        $Url = Config::get('core.router.class');
-        
-        if (!empty($_POST)) {
-            if (!empty($_POST['deleteNote'])) {
-                $Note = new Note();
-                $newNotes = $Note->loadFromArray($_POST);
-                $newNotes->delete();
-                
-                $this->redirect($Url::link("admin/notes/index"));
-              
-            }
-            elseif (!empty($_POST['cancel'])) {
-                $this->redirect($Url::link("admin/notes/edit&id=$id"));
-            }
-        }
-        else {
-            
-            $Note = new Note();
-            $deletedNote = $Note->getById($id);
-            $deleteNoteTitle = "Удалить заметку?";
-            
-            $this->view->addVar('deleteNoteTitle', $deleteNoteTitle);
-            $this->view->addVar('deletedNote', $deletedNote);
-            
-            $this->view->render('note/delete.php');
-        }
-    }
-    
-    
-}
\ No newline at end of file
diff --git a/application/models/AllUsers.php b/application/models/AllUsers.php
new file mode 100644
index 0000000..0092cee
--- /dev/null
+++ b/application/models/AllUsers.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace application\models;
+use ItForFree\SimpleMVC\Config;
+use ItForFree\SimpleMVC\MVC\Model;
+class AllUsers extends \ItForFree\SimpleMVC\MVC\Model
+{
+	/**
+     * Имя таблицы пользователей
+     */
+    public string $tableName = 'users';
+	
+	/**
+     * @var string Критерий сортировки строк таблицы
+     */
+    public string $orderBy = 'name ASC';
+	
+	//Свойства
+	/**
+    * @var int ID пользователя из базы данных
+    */
+    public ?int $id = null;
+	
+	/**
+    * @var string Логин пользователя
+    */
+    public $login = null;
+	
+	/**
+    * @var string пароль пользователя
+    */
+    public $password = null;
+	
+	/**
+    * @var bool индикатор, показывающий активен пользователь или нет 
+    */
+    public $active = null;
+
+    public function isUserExist($login){
+        $sql = "SELECT name FROM users WHERE login = :login";
+        $st = $this->pdo->prepare($sql);
+        $st->bindValue(":login",$login, \PDO::PARAM_STR);
+        $st->execute();
+        if ($st->fetch()[0]){
+            return true;
+        }else {
+            return false;
+        }
+    }
+        public function storeFormValues($params){
+                    $this->__construct( $params );
+            }
+            
+        public function getList($numRows=1000000):array
+            {
+                $sql = "SELECT  * FROM users";
+                $st = $this->pdo->query($sql);
+                $list = array ();
+                while ($row = $st->fetch()){
+                    $user = new AllUsers($row);
+                    $list[] = $user;
+                }
+                $sql = "SELECT FOUND_ROWS() AS totalRows";
+                $totalRows = $this->pdo->query($sql)->fetch();
+                return (array(
+                    "results" =>$list,
+                    "totalRows" => $totalRows[0]
+                )
+                );
+        }   
+        public function insert(){
+            $sql = "INSERT INTO users(login, password, active) VALUES(:login, :password, :active)";
+            $st = $this->pdo->prepare($sql);
+            $st->bindValue(":login", $this->login, \PDO::PARAM_STR );
+            $st->bindValue(":password", $this->password, \PDO::PARAM_STR );
+            $st->bindValue(":active", $this->active, \PDO::PARAM_INT );
+            $st->execute();
+            $this->id = $this->pdo->lastInsertId();
+	}
+        public function update($user) {
+            $sql = "UPDATE $this->tableName SET login=:login, password=:password, active=:active WHERE id = :id";
+            $st = $this->pdo->prepare( $sql );
+            $st->bindValue( ":login", $user->login,\PDO::PARAM_STR );
+            $st->bindValue( ":password", $user->password, \PDO::PARAM_STR );
+	    $st->bindValue( ":active", $user->active, \PDO::PARAM_INT );
+            $st->bindValue( ":id", $user->id, \PDO::PARAM_INT );
+            $st->execute();
+        }
+         public function getById(int $id, string $tableName = ''): ?Model
+    {  
+        $tableName = !empty($tableName) ? $tableName : $this->tableName;
+        
+        $sql = "SELECT * FROM $tableName where id = :id";      
+        $modelClassName = static::class;
+        
+        $st = $this->pdo->prepare($sql); 
+        
+        $st->bindValue(":id", $id, \PDO::PARAM_INT);
+        $st->execute();
+        $row = $st->fetch();
+        
+        if ($row) { 
+            return new $modelClassName( $row );
+        } else {
+            return null;
+        }
+    }
+        public function delete():void{
+            $st = $this->pdo->prepare("DELETE FROM users WHERE id = :id LIMIT 1");
+            $st->bindValue(":id",$this->id,\PDO::PARAM_STR);
+            $st->execute();
+            $st = $this->pdo-> prepare("DELETE FROM users_article WHERE user = :id");
+            $st->bindValue(":id", $this->id,\PDO::PARAM_INT);
+            $st->execute();
+        }
+        
+        public function getAuthData($login): ?array {
+        $sql = "SELECT password,active FROM users WHERE login = :login";
+        $st = $this->pdo->prepare($sql);
+        $st->bindValue(":login", $login, \PDO::PARAM_STR);
+        $st->execute();
+        return $st->fetch(); 
+    }
+
+        public function checkAuthData($login, $password): bool {
+        $sql = "SELECT password FROM users WHERE login = :login";
+        $st = $this->pdo->prepare($sql);
+        $st->bindValue(":login", $login, \PDO::PARAM_STR);
+        $st->execute();
+        $authData = $st->fetch();
+        if ($authData && password_verify($password, $authData['pass'])) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    
+    
+    
+}
+
+
diff --git a/application/models/Article.php b/application/models/Article.php
new file mode 100644
index 0000000..edc9203
--- /dev/null
+++ b/application/models/Article.php
@@ -0,0 +1,237 @@
+<?php
+
+namespace application\models;
+use ItForFree\SimpleMVC\Config as Config;
+use ItForFree\SimpleMVC\MVC\Model;
+class Article extends \ItForFree\SimpleMVC\MVC\Model
+{
+    public string $tableName = 'articles';
+    
+    public $publicationDate = null;
+    public $title = null;
+    public $subcategoryId = null;
+    public $summary = null;
+    public $categoryId = null;
+    public $content = null;
+    public $active = null;
+    public $authors = null;
+    
+    public function storeFormValues ( $params ) {
+
+      // Сохраняем все параметры
+      $this->__construct( $params);
+
+      // Разбираем и сохраняем дату публикации
+      if ( isset($params['publicationDate']) ) {
+        $publicationDate = explode ( '-', $params['publicationDate'] );
+
+        if ( count($publicationDate) == 3 ) {
+          list ( $y, $m, $d ) = $publicationDate;
+          $this->publicationDate = mktime ( 0, 0, 0, $m, $d, $y );
+        }
+        if (isset($params['authors']) && is_array($params['authors'])){
+            $this->authors = $params['authors'];
+        }else {
+            $this->authors= array();
+        }
+      }
+    }
+    
+    public function getById(int $id, string $tableName = ''): ?Model
+    {  
+        $tableName = !empty($tableName) ? $tableName : $this->tableName;
+        
+        $sql = "SELECT * FROM $tableName where id = :id";      
+        $modelClassName = static::class;
+        
+        $st = $this->pdo->prepare($sql); 
+        
+        $st->bindValue(":id", $id, \PDO::PARAM_INT);
+        $st->execute();
+        $row = $st->fetch();
+        
+        if ($row) { 
+            return new $modelClassName( $row );
+        } else {
+            return null;
+        }
+    }
+    public function getList(
+    $numRows = 1000000, 
+    $categoryId = null, 
+    $useActiveValue = false,
+    $subcategoryId = null, 
+    $authorsId = null, 
+    $order = "publicationDate DESC"
+): array {
+    // Формируем условия WHERE
+    $conditions = [];
+    if ($useActiveValue !== false) {
+        $conditions[] = "a.active = :active";
+    }
+    if ($categoryId) {
+        $conditions[] = "a.categoryId = :categoryId";
+    }
+    if ($subcategoryId) {
+        $conditions[] = "a.subcategoryId = :subcategoryId";
+    }
+    if ($authorsId) {
+        $conditions[] = "t1.user = :authorsId";
+    }
+    $categoryClause = $conditions ? "WHERE " . implode(" AND ", $conditions) : "";
+
+    $sql = "SELECT SQL_CALC_FOUND_ROWS a.*, 
+               UNIX_TIMESTAMP(a.publicationDate) AS publicationDate, 
+               GROUP_CONCAT(authors.login SEPARATOR ', ') AS authors_login
+            FROM articles AS a
+            LEFT JOIN users_article AS t1 ON a.id = t1.articles
+            LEFT JOIN users AS authors ON authors.id = t1.user
+            $categoryClause
+            GROUP BY a.id
+            ORDER BY $order
+            LIMIT :numRows";
+
+    // Подготовка и выполнение запроса
+    $st = $this->pdo->prepare($sql);
+    if ($useActiveValue !== false) {
+        $st->bindValue(":active", $useActiveValue, \PDO::PARAM_INT);
+    }
+    if ($categoryId) {
+        $st->bindValue(":categoryId", $categoryId, \PDO::PARAM_INT);
+    }
+    if ($subcategoryId) {
+        $st->bindValue(":subcategoryId", $subcategoryId, \PDO::PARAM_INT);
+    }
+    if ($authorsId) {
+        $st->bindValue(":authorsId", $authorsId, \PDO::PARAM_INT);
+    }
+    $st->bindValue(":numRows", $numRows, \PDO::PARAM_INT);
+    $st->execute();
+    $list = [];
+    while ($row = $st->fetch()) {
+        $modelClassName = static::class;
+        $example = new $modelClassName($row);
+        if (isset($row['authors_login']) && !empty($row['authors_login'])) {
+            $example->authors = explode(', ', $row['authors_login']);
+        } else {
+            $example->authors = [];
+        }
+        $list[] = $example;
+    }
+
+    // Получаем общее количество строк
+    $sql = "SELECT FOUND_ROWS() AS totalRows";
+    $totalRows = $this->pdo->query($sql)->fetch();
+
+    // Возвращаем массив с результатами и количеством строк
+    return [
+        "results" => $list,
+        "totalRows" => $totalRows[0]
+    ];
+}
+     public function getAuthors($articleId): array
+{
+    $sql = "
+        SELECT GROUP_CONCAT(users.login SEPARATOR ', ') AS users_name
+        FROM users
+        JOIN users_article ON users.id = users_article.user
+        WHERE users_article.articles = :articleId
+    ";
+    $st = $this->pdo->prepare($sql);
+    $st->bindValue(':articleId', $articleId, \PDO::PARAM_INT);
+    $st->execute();
+    $result = $st->fetch();
+    return ['authors' => $result['users_name'] ?? ''];
+}
+
+
+
+    public function insert() {
+
+        // Есть уже у объекта Article ID?
+        if ( !is_null( $this->id ) ) trigger_error ( "Article::insert(): Attempt to insert an Article object that already has its ID property set (to $this->id).", E_USER_ERROR );
+
+        // Вставляем статью
+        $sql = "INSERT INTO articles ( publicationDate, categoryId,subcategoryId ,title, summary, content, active ) VALUES ( FROM_UNIXTIME(:publicationDate), :categoryId,:subcategoryId ,:title, :summary, :content, :active )";
+        $st = $this->pdo->prepare ( $sql );
+        $st->bindValue( ":publicationDate", $this->publicationDate, \PDO::PARAM_INT );
+        $st->bindValue( ":categoryId", $this->categoryId, \PDO::PARAM_INT );
+        $st->bindValue( ":subcategoryId", $this->subcategoryId, \PDO::PARAM_INT );
+        $st->bindValue( ":title", $this->title, \PDO::PARAM_STR );
+        $st->bindValue( ":summary", $this->summary, \PDO::PARAM_STR );
+        $st->bindValue( ":content", $this->content, \PDO::PARAM_STR );
+        $st->bindValue( ":active", $this->active, \PDO::PARAM_INT);
+        $st->execute();
+        $this->id = $this->pdo->lastInsertId();
+        $st = $this->pdo->prepare($sql);
+        $st->bindValue(":id", $this->id, PDO::PARAM_INT);
+        $st->execute(); 
+        foreach ($this->authors as $user) {
+            $sql = "INSERT INTO users_article (user, article) VALUES (:user, :id)";
+            $st = $this->pdo->prepare($sql);
+            $st->bindValue(":user", $user, PDO::PARAM_INT);
+            $st->bindValue(":id", $this->id, PDO::PARAM_INT);
+
+            if (!$st->execute()) {
+                // Логирование ошибки или вывод сообщения об ошибке
+                error_log("Error inserting into users_article: " . implode(", ", $st->errorInfo()));
+            }
+        }
+    }
+
+    /**
+    * Обновляем текущий объект статьи в базе данных
+    */
+    public function update() 
+    {        
+      // Есть ли у объекта статьи ID?
+      if (is_null($this->id)) trigger_error("Article::update(): Attempt to "
+              . "update an Article object that does not have its ID property "
+              . "set.", E_USER_ERROR);
+
+      // Обновляем статью
+      $sql = "UPDATE articles SET publicationDate=FROM_UNIXTIME(:publicationDate),"
+              . " categoryId=:categoryId, subcategoryId=:subcategoryId,"
+              . " title=:title, summary=:summary, content=:content,"
+              . " active=:active WHERE id = :id";
+      $st = $this->pdo->prepare($sql);
+      $st->bindValue(":publicationDate", $this->publicationDate, PDO::PARAM_INT);
+      $st->bindValue(":categoryId", $this->categoryId, PDO::PARAM_INT);
+      $st->bindValue(":subcategoryId", $this->subcategoryId, PDO::PARAM_INT);
+      $st->bindValue(":title", $this->title, PDO::PARAM_STR);
+      $st->bindValue(":summary", $this->summary, PDO::PARAM_STR);
+      $st->bindValue(":content", $this->content, PDO::PARAM_STR);
+      $st->bindValue(":id", $this->id, PDO::PARAM_INT);
+      $st->bindValue(":active", $this->activeArticle, PDO::PARAM_INT);
+      $st->execute();
+      $sql = "DELETE FROM users_article WHERE articles = :id";
+      $st = $this->pdo->prepare($sql);
+      $st->bindValue(":id", $this->id, PDO::PARAM_INT);
+      $st->execute();
+      foreach ($this->authors as $author) {
+        $sql = "INSERT INTO users_article (user, articles) VALUES (:user, :id)";
+        $st = $conn->prepare($sql);
+        $st->bindValue(":user", $author, PDO::PARAM_INT);
+        $st->bindValue(":id", $this->id, PDO::PARAM_INT);
+        $st->execute();
+    }
+    }
+
+
+    /**
+    * Удаляем текущий объект статьи из базы данных
+    */
+    public function delete() : void {
+
+      // Есть ли у объекта статьи ID?
+      if ( is_null( $this->id ) ) trigger_error ( "Article::delete(): Attempt to delete an Article object that does not have its ID property set.", E_USER_ERROR );
+
+      // Удаляем статью
+      $st = $this->pdo->prepare ( "DELETE FROM articles WHERE id = :id LIMIT 1" );
+      $st->bindValue( ":id", $this->id, PDO::PARAM_INT );
+      $st->execute();
+      $st = $this->pdo->prepare("DELETE FROM users_article WHERE article = :id");
+      $st->bindValue(":id", $this->id, PDO::PARAM_INT);
+      $st->execute();
+    }
+}
\ No newline at end of file
diff --git a/application/models/AuthUser.php b/application/models/AuthUser.php
deleted file mode 100644
index 4aea4cd..0000000
--- a/application/models/AuthUser.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-namespace application\models;
-
-use ItForFree\SimpleMVC\User;
-/**
- * Класс для проверки авторизационных данных пользователя
- */
-class AuthUser extends User
-{        
-    
-    /**
-     * Проверка логина и пароля пользователя.
-     */
-    protected function checkAuthData($login, $pass): bool {
-	$result = false;
-	$User = new UserModel();
-	$siteAuthData = $User->getAuthData($login);	
-        if (isset($siteAuthData['pass'])) {
-	    $pass .= $siteAuthData['salt'];
-	    $passForCheck = password_verify($pass, $siteAuthData['pass']);
-	    if ($passForCheck) {
-		$result = true;
-	    }
-	}	
-        return $result;
-    }
-
-    /**
-     * Получить роль по имени пользователя
-     */
-    protected function getRoleByUserName($login): string {
-	$User = new UserModel();
-	$siteAuthData = $User->getRole($login);
-	if (isset($siteAuthData['role'])) {
-	    return $siteAuthData['role'];
-        }
-    }
-
-}
diff --git a/application/models/BaseExampleModel.php b/application/models/BaseExampleModel.php
deleted file mode 100644
index bb14538..0000000
--- a/application/models/BaseExampleModel.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace application\models;
-
-
-/**
- * Базовая клиентская модель
- *
- */
-class BaseExampleModel extends \ItForFree\SimpleMVC\MVC\Model
-{
-    
-    public function likesUpper($id,$tableName)
-    {
-        $modelData = $this->getById($id, $tableName);
-        $modelData->likes++;
-        $modelData->update();
-    }
-    
-    public function getModelLikes($id, $tableName) //метод не узнаёт какая именно модель
-    {
-        $modelData = $this->getById($id, $tableName);
-        return $modelData->likes;
-    }
-}
diff --git a/application/models/Category.php b/application/models/Category.php
new file mode 100644
index 0000000..30e5f36
--- /dev/null
+++ b/application/models/Category.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace application\models;
+use ItForFree\SimpleMVC\Config as Config;
+use ItForFree\SimpleMVC\MVC\Model;
+use ItForFree\SimpleMVC\Application;
+use ItForFree\rusphp\Log\SimpleEchoLog;
+
+class Category extends \ItForFree\SimpleMVC\MVC\Model
+{
+    public string $tableName = "categories";
+    public ?int $id = null;
+    public  $name = null;
+    public  $description = null;
+    public string $orderBy = 'name ASC';
+    public function storeFormValues ($params){
+         $this->__construct( $params );
+    }
+   public function getById(int $id, string $tableName = ''): ?Model
+    {  
+        $tableName = !empty($tableName) ? $tableName : $this->tableName;
+        
+        $sql = "SELECT * FROM $tableName where id = :id";      
+        $modelClassName = static::class;
+        
+        $st = $this->pdo->prepare($sql); 
+        
+        $st->bindValue(":id", $id, \PDO::PARAM_INT);
+        $st->execute();
+        $row = $st->fetch();
+        
+        if ($row) { 
+            return new $modelClassName( $row );
+        } else {
+            return null;
+        }
+    }
+    public function getList($numRows=100000,$order="name ASC"):array {
+        $sql = "SELECT * FROM categories ORDER BY $order LIMIT :numRows";
+        $st = $this->pdo->prepare($sql);
+        $st->bindValue(":numRows", $numRows, \PDO::PARAM_INT);
+        $st->execute();
+        $list = array();
+        while ($row= $st->fetch()){
+            $category = new Category($row);
+            $list[] = $category;
+        }
+        $sql = "SELECT FOUND_ROWS() AS totalRows";
+        $totalRows = $this->pdo->query($sql)->fetch();
+        return [
+            "results" => $list,
+            "totalRows" => $totalRows['totalRows']
+        ];
+    }
+    public function insert(){
+        $sql = "INSERT INTO $this->tableName (name,description) VALUES (:name,:description)";
+        $st= $this->pdo->prepare($sql);
+        $st->bindValue(":name", $this->name, \PDO::PARAM_STR);
+        $st->bindValue(":description",$this->description, \PDO::PARAM_STR);
+        $st->execute();
+        $this->id = $this->pdo->lastInsertId();
+    }
+    public function update($category) {
+    $sql = "UPDATE $this->tableName SET name = :name, description = :description WHERE id = :id";
+    $st = $this->pdo->prepare($sql);
+
+    // Связываем параметры
+    $st->bindValue(":name", $category->name, \PDO::PARAM_STR);
+    $st->bindValue(":description", $category->description, \PDO::PARAM_STR);
+    $st->bindValue(":id", $category->id, \PDO::PARAM_INT);
+
+    // Отладка запроса перед выполнением
+    if ($st->execute()) {
+        echo "Запрос успешно выполнен.";
+    } else {
+        echo "Ошибка выполнения запроса:";
+        print_r($st->errorInfo());
+    }
+}
+
+    public function delete():void{
+        $st = $this->pdo->prepare("DELETE FROM $this->tableName WHERE id = :id LIMIT 1");
+        $st->bindValue(":id", $this->id, \PDO::PARAM_INT);
+        $st->execute();
+    }
+}
diff --git a/application/models/Connection.php b/application/models/Connection.php
new file mode 100644
index 0000000..1792f94
--- /dev/null
+++ b/application/models/Connection.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace application\models;
+use ItForFree\SimpleMVC\MVC\Model;
+
+class Connection extends \ItForFree\SimpleMVC\MVC\Model
+{
+    public string $tableName = 'connections';
+	
+    public string $orderBy = 'article_id';
+	
+    public $user_id = '';
+	
+    public $article_id = '';
+    
+    public function getById($id, $tableName = '') : ?Model{
+    
+        $tableName = !empty($tableName) ? $tableName : $this->tableName;
+        
+        $sql = "SELECT * FROM $tableName where article_id = :id";      
+        $modelClassName = static::class;
+        
+        $st = $this->pdo->prepare($sql); 
+        
+        $st->bindValue(":id", $id, PDO::PARAM_INT);
+        $st->execute();
+		$row = null;
+		while ($row = $st->fetch()) {
+			$example = new $modelClassName($row);
+			$list[] = $example;
+		}
+		return $list;
+    }
+    public function insert(){
+      $sql = "INSERT INTO connections ( article_id, user_id) VALUES ( :articleId, :userId )";
+      $st = $this->pdo->prepare( $sql );
+      $st->bindValue( ":articleId", $this->article_id, \PDO::PARAM_INT );
+      $st->bindValue( ":userId", $this->user_id, \PDO::PARAM_INT );
+      $st->execute();
+      $conn = null;
+    }
+}
diff --git a/application/models/Note.php b/application/models/Note.php
deleted file mode 100644
index 4ea450a..0000000
--- a/application/models/Note.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-namespace application\models;
-/* 
- * class Note
- * 
- * 
- */
-
-class Note extends BaseExampleModel {
-    
-    public string $tableName = "notes";
-    
-    public string $orderBy = 'publicationDate ASC';
-    
-    public ?int $id = null;
-    
-    public $title = null;
-    
-    public $content = null;
-    
-    public $publicationDate = null;
-    
-    
-    public function insert()
-    {
-        $sql = "INSERT INTO $this->tableName (title, content, publicationDate) VALUES (:title, :content, :publicationDate)"; 
-        $st = $this->pdo->prepare ( $sql );
-        $st->bindValue( ":publicationDate", (new \DateTime('NOW'))->format('Y-m-d H:i:s'), \PDO::PARAM_STMT);
-        $st->bindValue( ":title", $this->title, \PDO::PARAM_STR );
-
-        $st->bindValue( ":content", $this->content, \PDO::PARAM_STR );
-        $st->execute();
-        $this->id = $this->pdo->lastInsertId();
-    }
-    
-    public function update()
-    {
-        $sql = "UPDATE $this->tableName SET publicationDate=:publicationDate, title=:title, content=:content WHERE id = :id";  
-        $st = $this->pdo->prepare ( $sql );
-        
-        $st->bindValue( ":publicationDate", (new \DateTime('NOW'))->format('Y-m-d H:i:s'), \PDO::PARAM_STMT);
-        $st->bindValue( ":title", $this->title, \PDO::PARAM_STR );
-
-        $st->bindValue( ":content", $this->content, \PDO::PARAM_STR );
-        $st->bindValue( ":id", $this->id, \PDO::PARAM_INT );
-        $st->execute();
-    }
-}
-
diff --git a/application/models/Subcategory.php b/application/models/Subcategory.php
new file mode 100644
index 0000000..0f93b51
--- /dev/null
+++ b/application/models/Subcategory.php
@@ -0,0 +1,117 @@
+<?php
+namespace application\models;
+use ItForFree\SimpleMVC\Config as Config;
+use ItForFree\SimpleMVC\Application;
+use ItForFree\SimpleMVC\MVC\Model;
+use ItForFree\rusphp\Log\SimpleEchoLog;
+class Subcategory extends \ItForFree\SimpleMVC\MVC\Model
+{
+    public string $tableName = 'subcategories';
+    public ?int $id = null;
+    public $name = null;
+    public $description = null;
+    public $categoryId = null;
+    public function storeFormValues($params){
+		$this->__construct( $params );
+	}
+        public function getList($numRows = 1000000, $categoryId = null, $order = "name ASC") : array
+    {
+        $categoryClause = $categoryId !== null ? "WHERE categoryId = :categoryId" : "";
+        $sql = "SELECT * FROM $this->tableName $categoryClause ORDER BY $order LIMIT :numRows";
+        $st = $this->pdo->prepare($sql);
+        $st->bindValue(":numRows", $numRows, \PDO::PARAM_INT);
+        if ($categoryId !== null) {
+            $st->bindValue(":categoryId", $categoryId, \PDO::PARAM_INT);
+        }
+        $st->execute();
+        $list = [];
+        while ($row = $st->fetch()) {
+            $subcategory = new Subcategory($row);
+            $list[] = $subcategory;
+        }
+        $totalRowsSql = "SELECT COUNT(*) AS totalRows FROM $this->tableName $categoryClause";
+        $totalRowsSt = $this->pdo->prepare($totalRowsSql);
+        if ($categoryId !== null) {
+            $totalRowsSt->bindValue(":categoryId", $categoryId, \PDO::PARAM_INT);
+        }
+        $totalRowsSt->execute();
+        $totalRows = $totalRowsSt->fetch();
+        return [
+            "results" => $list,
+            "totalRows" => $totalRows['totalRows']
+        ];
+    }
+    
+    #[\Override]
+    public function getById(int $id, string $tableName = ''): ?Model
+    {  
+        $tableName = !empty($tableName) ? $tableName : $this->tableName;
+        
+        $sql = "SELECT * FROM $tableName where id = :id";      
+        $modelClassName = static::class;
+        
+        $st = $this->pdo->prepare($sql); 
+        
+        $st->bindValue(":id", $id, \PDO::PARAM_INT);
+        $st->execute();
+        $row = $st->fetch();
+        
+        if ($row) { 
+            return new $modelClassName( $row );
+        } else {
+            return null;
+        }
+    }
+    
+    public function getCategIdByName($name){
+        $sql = "SELECT id FROM categories WHERE name = :name ";
+        $st = $this->pdo->prepare($sql);
+        $st->bindValue(":name", $name, \PDO::PARAM_STR);
+	$st->execute();
+	$row = $st->fetch();
+	$conn = null;
+	if($row){
+                    return $row[0];
+		}
+    }
+     public function isSubcategoryExist($name)
+    {
+        $sql = "SELECT name FROM $this->tableName WHERE name = :name";
+        $st = $this->pdo->prepare($sql);
+        $st->bindValue(":name", $name, \PDO::PARAM_STR);
+        $st->execute();
+        return $st->fetch() !== false;
+    }
+    public function insert(){
+		// Проверяем есть ли уже у обьекта Subcategory ID ?
+		if ( !is_null( $this->id ) ) trigger_error ( "Subcategory::insert(): "
+				. "Attempt to insert a Subcategory object that already has its "
+				. "ID property set (to $this->id).", E_USER_ERROR );
+		$sql = "INSERT INTO $this->tableName(name,description ,categoryId) VALUES(:name,:description ,:categoryId)";
+		$st = $this->pdo->prepare($sql);
+		$st->bindValue(":name", $this->name, \PDO::PARAM_STR );
+                $st->bindValue(":description",$this->description, \PDO::PARAM_STR);
+		$st->bindValue(":categoryId", $this->categoryId, \PDO::PARAM_INT );
+		$st->execute();
+		$this->id = $this->pdo->lastInsertId();
+	}
+    public function update($subcategory){
+		$sql = "UPDATE $this->tableName SET name=:name, description = :description, categoryId=:categoryId WHERE id=:id";
+		$st = $this->pdo->prepare($sql);
+		$st->bindValue(":name", $subcategory->name, \PDO::PARAM_STR);
+                $st->bindValue(":description", $subcategory->description, \PDO::PARAM_STR);
+		$st->bindValue(":categoryId", $subcategory->categoryId, \PDO::PARAM_INT);
+		$st->bindValue(":id", $subcategory->id, \PDO::PARAM_INT);
+		$st->execute();
+        }
+    public function delete() :void {
+		// У объекта Subcategory  есть ID?
+      if ( is_null( $this->id ) ) trigger_error ( "Subcategory::delete(): "
+			  . "Attempt to delete a Subcategory object that does not have its "
+			  . "ID property set.", E_USER_ERROR );
+      $st = $this->pdo->prepare ( "DELETE FROM $this->tableName WHERE id = :id LIMIT 1" );
+      $st->bindValue( ":id", $this->id, \PDO::PARAM_INT );
+      $st->execute();
+		
+	}
+}
diff --git a/application/models/User.php b/application/models/User.php
new file mode 100644
index 0000000..e0551c3
--- /dev/null
+++ b/application/models/User.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace application\models;
+
+use ItForFree\SimpleMVC\Config;
+use ItForFree\SimpleMVC\MVC\Model;
+
+class User extends \ItForFree\SimpleMVC\User
+{
+    public string $tableName = 'users';
+    public string $orderBy = 'name ASC';
+
+    protected function getRoleByUserName(string $userName): string {
+        if( $userName == Config::get('core.admin.username') ){
+            return $userName;
+        } else {
+            return "authorized";
+        }
+    }
+   
+    public function checkAuthData(string $login, string $pass): bool
+    {
+        $result = false;
+        $User = new AllUsers();
+        if ($login == Config::get('core.admin.username')) {
+            if ($pass == Config::get('core.admin.password')) {
+            $result = true;
+        }
+        } else {
+            $authData = $User->getAuthData($login);
+            if ($authData && $authData['password'] == $pass && $authData['active'] == 1){
+                $result = true;
+            }
+        }
+        return $result;
+    }
+}
diff --git a/application/models/UserModel.php b/application/models/UserModel.php
deleted file mode 100644
index 8280ad3..0000000
--- a/application/models/UserModel.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-namespace application\models;
-
-use ItForFree\SimpleMVC\MVC\Model;
-/**
- * Класс для обработки пользователей
- */
-class UserModel extends Model
-{
-    // Свойства
-    /**
-    * @var string логин пользователя
-    */
-    public $login = null;
-    
-    public ?int $id = null;
-
-    /**
-    * @var string пароль пользователя
-    */
-    public $pass = null;
-    
-    /**
-    * @var string роль пользователя
-    */
-    protected $role = null;
-    
-    public $email = null;
-    
-    public $timestamp = null;
-    
-    /**
-     * @var string Критерий сортировки строк таблицы
-     */
-    public string $orderBy = "login ASC";
-    
-    /**
-     *  @var string название таблицы
-     */
-    public string $tableName = 'users';
-    
-    public $salt = null;
-    
-
-    public function insert()
-    {
-        $sql = "INSERT INTO $this->tableName (timestamp, login, salt, pass, role, email) VALUES (:timestamp, :login, :salt, :pass, :role, :email)"; 
-        $st = $this->pdo->prepare ( $sql );
-        $st->bindValue( ":timestamp", (new \DateTime('NOW'))->format('Y-m-d H:i:s'), \PDO::PARAM_STMT);
-        $st->bindValue( ":login", $this->login, \PDO::PARAM_STR );
-        
-        //Хеширование пароля
-        $this->salt = rand(0,1000000);
-        $st->bindValue( ":salt", $this->salt, \PDO::PARAM_STR );
-//        \DebugPrinter::debug($this->salt);
-        
-        $this->pass .= $this->salt;
-        $hashPass = password_hash($this->pass, PASSWORD_BCRYPT);
-//        \DebugPrinter::debug($hashPass);
-        $st->bindValue( ":pass", $hashPass, \PDO::PARAM_STR );
-        
-        $st->bindValue( ":role", $this->role, \PDO::PARAM_STR );
-        $st->bindValue( ":email", $this->email, \PDO::PARAM_STR );
-        $st->execute();
-        $this->id = $this->pdo->lastInsertId();
-    }
-    
-    public function update()
-    {
-        $sql = "UPDATE $this->tableName SET timestamp=:timestamp, login=:login, pass=:pass, email=:email  WHERE id = :id";  
-        $st = $this->pdo->prepare ( $sql );
-        
-        $st->bindValue( ":timestamp", (new \DateTime('NOW'))->format('Y-m-d H:i:s'), \PDO::PARAM_STMT);
-        $st->bindValue( ":login", $this->login, \PDO::PARAM_STR );
-        
-        // Хеширование пароля
-        $this->salt = rand(0,1000000);
-        //$st->bindValue( ":salt", $this->salt, \PDO::PARAM_STR );
-        //$this->pass .= $this->salt;
-        //$hashPass = password_hash($this->pass, PASSWORD_BCRYPT);
-        $st->bindValue( ":pass", $this->pass, \PDO::PARAM_STR );
-        
-        //$st->bindValue( ":role", $this->role, \PDO::PARAM_STR );
-        $st->bindValue( ":email", $this->email, \PDO::PARAM_STR );
-        $st->bindValue( ":id", $this->id, \PDO::PARAM_INT );
-        $st->execute();
-    }
-    
-    /**
-     * Вернёт id пользователя
-     * 
-     * @return ?int
-     */
-    public function getId()
-    {
-        if ($this->userName !== 'guest'){
-            $sql = "SELECT id FROM users where login = :userName";
-            $st = $this->pdo->prepare($sql); 
-            $st -> bindValue( ":userName", $this->userName, \PDO::PARAM_STR );
-            $st -> execute();
-            $row = $st->fetch();
-            return $row['id']; 
-        } else  {
-            return null;
-        }  
-    }
-    
-    /**
-     * Проверка логина и пароля пользователя.
-     */
-    public function getAuthData($login): ?array {
-	$sql = "SELECT salt, pass FROM users WHERE login = :login";
-	$st = $this->pdo->prepare($sql);
-	$st->bindValue(":login", $login, \PDO::PARAM_STR);
-	$st->execute();
-	$authData = $st->fetch();
-	return $authData ? $authData : null;
-    }
-    
-    /**
-     * Проверяем активность пользователя.
-     */
-    public function getRole($login): array {
-	$sql = "SELECT role FROM users WHERE login = :login";
-	$st = $this->pdo->prepare($sql);
-	$st->bindValue(":login", $login, \PDO::PARAM_STR);
-	$st->execute();	
-	return $st->fetch();
-    }
-
-}
\ No newline at end of file
diff --git a/application/views/homepage/index.php b/application/views/homepage/index.php
deleted file mode 100644
index d34f114..0000000
--- a/application/views/homepage/index.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php 
-
-use application\assets\DemoJavascriptAsset;
-DemoJavascriptAsset::add();
-
-?>
-<div class="row">
-    <div class="col"><h1 class="callAlert"><?php echo $homepageTitle ?></h1>
-        </div>
-</div>
-<div class="row">
-    <div class="col ">
-      <p class="lead"> Добро пожаловать в SimpleMVC! </p>
-    </div>
-</div>
\ No newline at end of file
diff --git a/application/views/layouts/admin-main.php b/application/views/layouts/admin-main.php
deleted file mode 100644
index 0500efb..0000000
--- a/application/views/layouts/admin-main.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php 
-use ItForFree\SimpleMVC\Config;
-
-
-$User = Config::getObject('core.user.class');
-
-?>
-<!DOCTYPE html>
-<html>
-    <?php include('includes/main/head.php'); ?>
-    <body> 
-        <?php include('includes/admin-main/nav.php'); ?>
-        <div class="container">
-            <?= $CONTENT_DATA ?>
-        </div>
-        <?php include('includes/main/footer.php'); ?>
-    </body>
-</html>
-
diff --git a/application/views/layouts/includes/admin-main/nav.php b/application/views/layouts/includes/admin-main/nav.php
deleted file mode 100644
index adf83e8..0000000
--- a/application/views/layouts/includes/admin-main/nav.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
-<?php 
-use ItForFree\SimpleMVC\Config;
-use ItForFree\SimpleMVC\Router\WebRouter;
-
-$User = Config::getObject('core.user.class');
-
-
-//vpre($User->explainAccess("homepage/index"));
-
-?>
-
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark"> <!-- Меню оформленное с помощью  twitter bootstrap -->
- <a class="navbar-brand" href="/" title="aka Самый Лучший Сайт ;)">Админка</a>
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
- </button>
- <div class="collapse navbar-collapse" id="navbarNav">
-    <ul class="navbar-nav">
-        <li class="nav-item ">
-            <a class="nav-link" href="/">Главная</a>
-        </li>
-        <?php  if ($User->isAllowed("login/login")): ?>
-        <li class="nav-item ">
-            <a class="nav-link" href="<?= WebRouter::link("login/login") ?>">[Вход]</a>
-        </li>
-        <?php endif; ?>
-        <?php  if ($User->isAllowed("admin/adminusers/index")): ?>
-        <li class="nav-item ">
-            <a class="nav-link" href="<?= WebRouter::link("admin/adminusers/index") ?>"> Пользователи </a>
-        </li>
-        <?php endif; ?>
-        
-        <?php  if ($User->isAllowed("admin/notes/index")): ?>
-        <li class="nav-item ">
-            <a class="nav-link" href="<?= WebRouter::link("admin/notes/index") ?>"> Заметки </a>
-        </li>
-        <?php endif; ?>
-        
-        <?php  if ($User->isAllowed("login/logout")): ?>
-        <li class="nav-item ">
-            <a class="nav-link" href="<?= WebRouter::link("login/logout") ?>">Выход (<?= $User->userName ?>)</a>
-        </li>
-        <?php endif; ?>
-        
-    </ul>
-   </div>
-</nav>
-
diff --git a/application/views/layouts/includes/main/footer.php b/application/views/layouts/includes/main/footer.php
deleted file mode 100644
index 3d20dea..0000000
--- a/application/views/layouts/includes/main/footer.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php use ItForFree\SimpleAsset\SimpleAssetManager; 
-
-SimpleAssetManager::printJS();
-?>
-
-<div class="footer">
-    <div class="container">
-       <span title="orioginal text:  2017. All rights reserved. I will find you." style="color: #cbc4c4"> 
-            <span class="copyleft">&copy;</span>
-           SimpleMVC -- учебный проект 
-           <a href="http://fkn.ktu10.com/?q=node/7716" class="footer-link" target="__blank">курса backend программирования</a>
-           от ITForFree.   
-       </span>
-    </div>
-   
-</div>
-
diff --git a/application/views/layouts/includes/main/head.php b/application/views/layouts/includes/main/head.php
deleted file mode 100644
index de3bf75..0000000
--- a/application/views/layouts/includes/main/head.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php 
-use ItForFree\SimpleAsset\SimpleAssetManager;
-use application\assets\CustomCSSAsset;
-
-
-CustomCSSAsset::add();
-SimpleAssetManager::printCss();
-?>
-<head>
-    <meta http-equiv="content-type" content="text/html; charset=windows-1251" />
-    <title>SimpleMVC | Учебный проект</title>   
-    
-    <div class="row">
-    <div class="col ">
-      
-    </div>
-</div>
-    
-</head>
diff --git a/application/views/layouts/includes/main/nav.php b/application/views/layouts/includes/main/nav.php
deleted file mode 100644
index 5667fc2..0000000
--- a/application/views/layouts/includes/main/nav.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
-<?php 
-use ItForFree\SimpleMVC\Config;
-use ItForFree\SimpleMVC\Router\WebRouter;
-
-$User = Config::getObject('core.user.class');
-
-
-//ppre($User->explainAccess("admin/adminusers/index"));
-
-?>
-
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark"> <!-- Меню оформленное с помощью  twitter bootstrap -->
- <a class="navbar-brand" href="/" title="aka Самый Лучший Сайт ;)">SimpleMVC</a>
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
- </button>
- <div class="collapse navbar-collapse" id="navbarNav">
-    <ul class="navbar-nav">
-        <li class="nav-item ">
-            <a class="nav-link" href="/">Главная</a>
-        </li>
-        <?php  if ($User->isAllowed("login/login")): ?>
-        <li class="nav-item ">
-            <a class="nav-link" href="<?= WebRouter::link("login/login") ?>">[Вход]</a>
-        </li>
-        <?php endif; ?>
-        <?php  if ($User->isAllowed("admin/adminusers/index")): ?>
-        <li class="nav-item ">
-            <a class="nav-link" href="<?= WebRouter::link("admin/adminusers/index") ?>"> Пользователи </a>
-        </li>
-        <?php endif; ?>
-        
-        <?php  if ($User->isAllowed("admin/adminusers/index")): ?>
-        <li class="nav-item ">
-            <a class="nav-link" href="<?= WebRouter::link("admin/notes/index") ?>"> Заметки </a>
-        </li>
-        <?php endif; ?>
-        
-        <?php  if ($User->isAllowed("login/logout")): ?>
-        <li class="nav-item ">
-            <a class="nav-link" href="<?= WebRouter::link("login/logout") ?>">Выход (<?= $User->userName ?>)</a>
-        </li>
-        <?php endif; ?>
-    </ul>
-   </div>
-</nav>
-
diff --git a/application/views/layouts/main.php b/application/views/layouts/main.php
deleted file mode 100644
index 42fa06f..0000000
--- a/application/views/layouts/main.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php 
-use ItForFree\SimpleMVC\Config;
-
-
-$User = Config::getObject('core.user.class');
-
-?>
-<!DOCTYPE html>
-<html>
-    <?php include('includes/main/head.php'); ?>
-    <body> 
-        <?php include('includes/main/nav.php'); ?>
-        <div class="container">
-            <?= $CONTENT_DATA ?>
-        </div>
-        <?php include('includes/main/footer.php'); ?>
-    </body>
-</html>
-
diff --git a/application/views/login/index.php b/application/views/login/index.php
deleted file mode 100644
index 8138947..0000000
--- a/application/views/login/index.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<h2><?= $loginTitle ?></h2>
-
-<form method="post" action="<?= \ItForFree\SimpleMVC\Router\WebRouter::link('login/login')?>">
-    
-    <?php 
-    if (!empty($_GET['auth'])) {
-        echo "Неверное имя пользователя или пароль";
-    }
-    ?>
-    <div class="form-group">
-        <label for="userName" >Введите имя пользователя</label>
-        <input type="text"  class="form-control" id="userName"  name="userName" >
-    </div>
-    <div class="form-group">
-        <label for="password" >Введите пароль</label>
-        <input type="password" name="password"  class="form-control" id="userName"  name="userName" >
-    </div>
-    <input type="submit" class="btn btn-primary" name="login" value="Сохранить">
-   
-</form>
-
diff --git a/application/views/note/add.php b/application/views/note/add.php
deleted file mode 100644
index 0c1a71c..0000000
--- a/application/views/note/add.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<style> 
-    
-    textarea{
-        height: 200%;
-        width: 1110px;
-        color: #003300;
-    }
-   
-</style>
-
-<?php include('includes/admin-notes-nav.php'); ?>
-<h2><?= $addNoteTitle ?></h2>
-
-<form id="addNote" method="post" action="<?= \ItForFree\SimpleMVC\Router\WebRouter::link("admin/notes/add")?>"> 
-    <div class="form-group">
-        <label for="title">Название новой заметки</label>
-        <input type="text" class="form-control" name="title" id="title" placeholder="имя заметки">
-    </div>
-    <div class="form-group">
-        <label for="content">Содержание</label><br>
-        <textarea type="description" name="content" placeholred="описание заметки"  value=></textarea>
-    </div>
-    <input type="submit" class="btn btn-primary" name="saveNewNote" value="Сохранить">
-    <input type="submit" class="btn" name="cancel" value="Назад">
-</form>    
diff --git a/application/views/note/delete.php b/application/views/note/delete.php
deleted file mode 100644
index bf924e4..0000000
--- a/application/views/note/delete.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php 
-use ItForFree\SimpleMVC\Config;
-
-$Url = Config::getObject('core.router.class');
-?>
-
-<?php include('includes/admin-notes-nav.php'); ?>
-
-<h2><?= $deleteNoteTitle ?></h2>
-
-<form method="post" action="<?= $Url::link("admin/notes/delete&id=". $_GET['id'])?>" >
-    Вы уверены, что хотите удалить заметку?
-    
-    <input type="hidden" name="id" value="<?= $deletedNote->id ?>">
-    <input type="submit" name="deleteNote" value="Удалить">
-    <input type="submit" name="cancel" value="Вернуться"><br>
-</form>
\ No newline at end of file
diff --git a/application/views/note/edit.php b/application/views/note/edit.php
deleted file mode 100644
index dc8eeb8..0000000
--- a/application/views/note/edit.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<style> 
-    
-    textarea{
-        height: 200%;
-        width: 1110px;
-        color: #003300;
-    }
-   
-</style>
-
-<?php 
-use ItForFree\SimpleMVC\Config;
-
-$Url = Config::getObject('core.router.class');
-$User = Config::getObject('core.user.class');
-?>
-
-<?php include('includes/admin-notes-nav.php'); ?>
-
-<h2><?= $editNoteTitle ?></h2>
-
-<form id="editNote" method="post" action="<?= $Url::link("admin/notes/edit&id=" . $_GET['id'])?>">
-    <h5>Note title</h5> 
-    <input type="text" name="title" placeholder="name note" value=<?= $viewNotes->title?>><br>
-    <h5>Note content</h5>
-    <textarea type="description" name="content" placeholred="контент"   value=><?= $viewNotes->content ?></textarea><br>
-
-<input type="hidden" name="id" value="<?= $_GET['id']; ?>">
-<input type="submit" name="saveChanges" value="Сохранить">
-<input type="submit" name="cancel" value="Назад">
-</form>
\ No newline at end of file
diff --git a/application/views/note/includes/admin-notes-nav.php b/application/views/note/includes/admin-notes-nav.php
deleted file mode 100644
index 4ec212c..0000000
--- a/application/views/note/includes/admin-notes-nav.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php 
-use ItForFree\SimpleMVC\Config;
-use ItForFree\SimpleMVC\Router\WebRouter;
-
-$User = Config::getObject('core.user.class');
-
-
-//vpre($User->explainAccess("admin/adminusers/index"));
-?>
-
-<ul class="nav">
-    
-    <?php  if ($User->isAllowed("admin/notes/index")): ?>
-    <li class="nav-item ">
-        <a class="nav-link" href="<?= WebRouter::link("admin/notes/index") ?>">Список</a>
-    </li>
-    <?php endif; ?>
-    
-    <?php  if ($User->isAllowed("admin/notes/add")): ?>
-    <li class="nav-item ">
-        <a class="nav-link" href="<?= WebRouter::link("admin/notes/add") ?>"> + Добавить заметку</a>
-    </li>
-    <?php endif; ?>  
-</ul>
\ No newline at end of file
diff --git a/application/views/note/index.php b/application/views/note/index.php
deleted file mode 100644
index 6f98031..0000000
--- a/application/views/note/index.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php 
-use ItForFree\SimpleMVC\Config;
-
-$User = Config::getObject('core.user.class');
-?>
-<?php include('includes/admin-notes-nav.php'); ?>
-
-<h2>List notes</h2>
-
-<?php if (!empty($notes)): ?>
-<table class="table">
-    <thead>
-    <tr>
-      <th scope="col">Оглавление</th>
-      <th scope="col">Посвящается</th>
-      <th scope="col">Дата</th>
-      <th scope="col"></th>
-    </tr>
-     </thead>
-    <tbody>
-    <?php foreach($notes as $note): ?>
-    <tr>
-        <td> <?= "<a href=" . \ItForFree\SimpleMVC\Router\WebRouter::link('admin/notes/index&id=' 
-		. $note->id . ">{$note->title}</a>" ) ?> </td>
-        <td> <?= $note->content ?> </td>
-        <td> <?= $note->publicationDate ?> </td>
-    </tr>
-    <?php endforeach; ?>
-
-    </tbody>
-</table>
-
-<?php else:?>
-    <p> Список заметок пуст</p>
-<?php endif; ?>
-
diff --git a/application/views/note/view-item.php b/application/views/note/view-item.php
deleted file mode 100644
index aa38965..0000000
--- a/application/views/note/view-item.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-use ItForFree\SimpleMVC\Config;
-
-$User = Config::getObject('core.user.class');
-?>
-
-<?php include('includes/admin-notes-nav.php'); ?>
-
-<h2><?= $viewNotes->title ?>
-    <span>
-        <?= $User->returnIfAllowed("admin/notes/edit", 
-            "<a href=" . \ItForFree\SimpleMVC\Router\WebRouter::link("admin/notes/edit&id=". $viewNotes->id) 
-            . ">[Редактировать]</a>");?>
-        
-        <?= $User->returnIfAllowed("admin/notes/delete",
-                "<a href=" . \ItForFree\SimpleMVC\Router\WebRouter::link("admin/notes/delete&id=". $viewNotes->id)
-            .    ">[Удалить]</a>"); ?>
-    </span>
-    
-</h2> 
-
-<p>Контент: <?= $viewNotes->content ?></p>
-<p>Зарегестрирована: <?= $viewNotes->publicationDate ?></p>
-
diff --git a/application/views/user/add.php b/application/views/user/add.php
deleted file mode 100644
index f1f71d3..0000000
--- a/application/views/user/add.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php include('includes/admin-users-nav.php'); ?>
-<h2><?= $addAdminusersTitle ?></h2>
-
-<form id="addUser" method="post" action="<?= \ItForFree\SimpleMVC\Router\WebRouter::link("admin/adminusers/add")?>"> 
-
-    <div class="form-group">
-        <label for="login">Введите имя пользователя</label>
-        <input type="text" class="form-control" name="login" id="login" placeholder="имя пользователя">
-    </div>
-    <div class="form-group">
-        <label for="pass">Введите пароль</label>
-        <input type="text" class="form-control"  name="pass" id="pass" placeholder="пароль">
-    </div>
-    <div class="form-group">   
-        <label for="role">Права доступа</label>
-        <select name="role" id="role" class="form-control"> 
-            <option value="admin">Администратор</option>
-            <option value="auth_user">Зарегистрированный пользователь</option>
-        </select>
-    </div>
-    <div class="form-group">
-        <label for="email">Введите e-mail </label>
-        <input type="text" class="form-control"  name="email" id="email" placeholder="адрес электропочты">
-    </div>
-    <input type="submit" class="btn btn-primary" name="saveNewUser" value="Сохранить">
-    <input type="submit" class="btn" name="cancel" value="Назад">
-</form>
-
-
diff --git a/application/views/user/delete.php b/application/views/user/delete.php
deleted file mode 100644
index 8712efe..0000000
--- a/application/views/user/delete.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php 
-use ItForFree\SimpleMVC\Config;
-
-$Url = Config::getObject('core.router.class');
-?>
-
-<?php include('includes/admin-users-nav.php'); ?>
-
-<h2><?= $deleteAdminusersTitle ?></h2>
-
-<form method="post" action="<?= $Url::link("admin/adminusers/delete&id=". $_GET['id'])?>" >
-    Вы уверены, что хотите удалить данные пользователя?
-    
-    <input type="hidden" name="id" value="<?= $deletedAdminusers->id ?>">
-    <input type="submit" name="deleteUser" value="Удалить">
-    <input type="submit" name="cancel" value="Вернуться"><br>
-</form>
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
deleted file mode 100644
index dccb87c..0000000
--- a/application/views/user/edit.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php 
-use ItForFree\SimpleMVC\Config;
-
-$Url = Config::getObject('core.router.class');
-$User = Config::getObject('core.user.class');
-?>
-
-<?php include('includes/admin-users-nav.php'); ?>
-
-
-<h2><?= $editAdminusersTitle ?>
-    <span>
-        <?= $User->returnIfAllowed("admin/adminusers/delete", 
-            "<a href=" . $Url::link("admin/adminusers/delete&id=" . $_GET['id']) 
-            . ">[Удалить]</a>");?>
-    </span>
-</h2>
-
-<form id="editUser" method="post" action="<?= $Url::link("admin/adminusers/edit&id=" . $_GET['id'])?>">
-    <h5>Введите имя пользователя</h5>
-    <input type="text" name="login" placeholder="логин пользователя" value="<?= $viewAdminusers->login ?>"><br>
-    <h5>Введите пароль</h5>
-    <input type="text" name="pass" placeholder="новый пароль" value=""><br>
-    <h5>Введите e-mail</h5>
-    <input type="text" name="email"  placeholder="email" value="<?= $viewAdminusers->email ?>"><br>
-    
-    <input type="hidden" name="id" value="<?= $_GET['id']; ?>">
-    <input type="submit" name="saveChanges" value="Сохранить">
-    <input type="submit" name="cancel" value="Назад">
-</form>
diff --git a/application/views/user/includes/admin-users-nav.php b/application/views/user/includes/admin-users-nav.php
deleted file mode 100644
index 5b0151e..0000000
--- a/application/views/user/includes/admin-users-nav.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php 
-use ItForFree\SimpleMVC\Config;
-use ItForFree\SimpleMVC\Router\WebRouter;
-
-$User = Config::getObject('core.user.class');
-
-
-//vpre($User->explainAccess("admin/adminusers/index"));
-?>
-
-<ul class="nav">
-    
-    <?php  if ($User->isAllowed("admin/adminusers/index")): ?>
-    <li class="nav-item ">
-        <a class="nav-link" href="<?= WebRouter::link("admin/adminusers/index") ?>">Список</a>
-    </li>
-    <?php endif; ?>
-    
-    <?php  if ($User->isAllowed("admin/adminusers/add")): ?>
-    <li class="nav-item ">
-        <a class="nav-link" href="<?= WebRouter::link("admin/adminusers/add") ?>"> + Добавить пользователя</a>
-    </li>
-    <?php endif; ?>  
-</ul>
\ No newline at end of file
diff --git a/application/views/user/index.php b/application/views/user/index.php
deleted file mode 100644
index e11bb48..0000000
--- a/application/views/user/index.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php 
-use ItForFree\SimpleMVC\Config;
-
-$User = Config::getObject('core.user.class');
-?>
-<?php include('includes/admin-users-nav.php'); ?>
-
-<h2>Список пользователей</h2> 
-    
-<?php if (!empty($users)): ?>
-<table class="table">
-    <thead>
-    <tr>
-      <th scope="col">id</th>
-      <th scope="col">Логин</th>
-      <th scope="col">Email</th>
-      <th scope="col">Зарегистрирован</th>
-      <th scope="col"></th>
-    </tr>
-     </thead>
-    <tbody>
-    <?php foreach($users as $user): ?>
-    <tr>
-        <td> <?= $user->id ?> </td>
-        <td> <?= "<a href=" . \ItForFree\SimpleMVC\Router\WebRouter::link('admin/adminusers/index&id=' 
-		. $user->id . ">{$user->login}</a>" ) ?> </td>
-        <td>  <?= $user->email ?> </td>
-        <td>  <?= $user->timestamp ?> </td>
-        <td>  <?= $User->returnIfAllowed("admin/adminusers/edit",
-                    "<a href=" . \ItForFree\SimpleMVC\Router\WebRouter::link("admin/adminusers/edit&id=". $user->id) 
-                    . ">[Редактировать]</a>");?></td>
-    </tr>
-    <?php endforeach; ?>
-    
-    </tbody>
-</table>
-
-<?php else:?>
-    <p> Список пользователей пуст. </p>
-<?php endif; ?>
\ No newline at end of file
diff --git a/application/views/user/view-item.php b/application/views/user/view-item.php
deleted file mode 100644
index 298dd54..0000000
--- a/application/views/user/view-item.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php 
-use ItForFree\SimpleMVC\Config;
-
-$User = Config::getObject('core.user.class');
-?>
-
-<?php include('includes/admin-users-nav.php'); ?>
-
-<h2><?= $viewAdminusers->login ?>
-    <span>
-        <?= $User->returnIfAllowed("admin/adminusers/edit", 
-            "<a href=" . \ItForFree\SimpleMVC\Router\WebRouter::link("admin/adminusers/edit&id=". $viewAdminusers->id) 
-            . ">[Редактировать]</a>");?>
-    </span>
-</h2> 
-
-<p>Зарегистрирован <?= $viewAdminusers->timestamp ?></p>
-<p>E-mail: <?= $viewAdminusers->email ?></p>
\ No newline at end of file
diff --git a/assets/CustomCSSAsset.php b/assets/CustomCSSAsset.php
new file mode 100644
index 0000000..2ddb0f3
--- /dev/null
+++ b/assets/CustomCSSAsset.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace application\assets;
+use ItForFree\SimpleAsset\SimpleAsset;
+use application\assets\BootstrapAsset;
+
+/* 
+ * Класс ассетов для CSS стилей. Пользовательский
+ * 
+ */
+
+class CustomCSSAsset extends SimpleAsset {
+    
+    public $basePath = '/';
+    
+    public $css = [
+        'CSS/style.css'
+    ];
+    
+    public $needs = [    
+       BootstrapAsset::class         
+    ];     
+    
+}
diff --git a/web/CSS/CMSstyle.css b/web/CSS/CMSstyle.css
new file mode 100644
index 0000000..ca0be37
--- /dev/null
+++ b/web/CSS/CMSstyle.css
@@ -0,0 +1,353 @@
+/* Стили для body and внешнего контейнера */
+
+body {
+    margin: 0;
+    color: #333;
+    background-color: #00a0b0;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    line-height: 1.5em;
+}
+
+#container {
+    width: 960px;
+    background: #fff;
+    margin: 20px auto;
+    padding: 20px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+}
+
+
+/* Логотип и нижний колонтитул */
+
+#logo {
+    display: block;
+    width: 300px;
+    padding: 0 660px 20px 0;
+    border: none;
+    border-bottom: 1px solid #00a0b0;
+    margin-bottom: 40px;
+}
+
+#footer {
+    border-top: 1px solid #00a0b0;
+    margin-top: 40px;
+    padding: 20px 0 0 0;
+    font-size: .8em;
+}
+
+#loader-identity {
+    display : none;
+    float : right;
+}
+
+
+/* Заголвки */
+
+h1 {
+    color: #eb6841;
+    margin-bottom: 30px;
+    line-height: 1.2em;
+}
+
+h2, h2 a {
+    color: #edc951;
+}
+
+h2 a {
+    text-decoration: none;
+}
+
+h3.categoryDescription {
+    margin-top: -20px;
+    margin-bottom: 40px;
+}
+
+
+/* Заголовки статей */
+
+#headlines {
+    list-style: none;
+    padding-left: 0;
+    width: 75%;
+}
+
+#headlines li {
+    margin-bottom: 2em;
+}
+
+.pubDate {
+    font-size: .8em;
+    color: #eb6841;
+    text-transform: uppercase;
+}
+
+#headlines .pubDate {
+    display: inline-block;
+    width: 100px;
+    font-size: .5em;
+    vertical-align: middle;
+}
+
+#headlines.archive .pubDate {
+    width: 130px;
+}
+
+.summary {
+    padding-left: 100px;
+}
+
+#headlines.archive .summary {
+    padding-left: 130px;
+}
+
+.category {
+    font-style: italic;
+    font-weight: normal;
+    font-size: 60%;
+    color: #999;
+    display: block;
+    line-height: 2em;
+}
+
+.category a {
+    color: #999;
+    text-decoration: underline;
+}
+
+.showContent {
+    font-size : 14px;
+    float : right;
+}
+
+
+/* Заголовок для страницы администратора */
+
+#adminHeader {
+    width: 940px;
+    padding: 0 10px;
+    border-bottom: 1px solid #00a0b0;
+    margin: -30px 0 40px 0;
+    font-size: 0.8em;
+}
+
+
+/* Стили для формы с цветным фоном, скругленными углами и тенью */
+
+form {
+    margin: 20px auto;
+    padding: 40px 20px;
+    overflow: auto;
+    background: #fff4cf;
+    border: 1px solid #666;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    -moz-box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+    -webkit-box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+    box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+}
+
+
+/* Задаем для элементов формы согласованные поля, отступы, и высоту строки */
+
+form ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+form ul li {
+    margin: .9em 0 0 0;
+    padding: 0;
+}
+
+form * {
+    line-height: 1em;
+}
+
+
+/* Метки полей */
+
+label {
+    display: block;
+    float: left;
+    clear: left;
+    text-align: right;
+    width: 15%;
+    padding: .4em 0 0 0;
+    margin: .15em .5em 0 0;
+}
+
+
+/* Поля */
+
+input, select, textarea {
+    display: block;
+    margin: 0;
+    padding: .4em;
+    width: 80%;
+}
+
+input, textarea, .date {
+    border: 2px solid #666;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    background: #fff;
+}
+
+input {
+    font-size: .9em;
+}
+
+select {
+    padding: 0;
+    margin-bottom: 2.5em;
+    position: relative;
+    top: .7em;
+}
+
+textarea {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size: .9em;
+    height: 5em;
+    line-height: 1.5em;
+}
+
+textarea#content {
+    font-family: "Courier New", courier, fixed;
+}
+
+
+/* Рамка вокруг поля с фокусом ввода */
+
+form *:focus {
+    border: 2px solid #7c412b;
+    outline: none;
+}
+
+
+/* Правильно заполненное поле имеет зеленый фон */
+
+input:valid, textarea:valid {
+    background: #efe;
+}
+
+
+/* Кнопки отправки */
+
+.buttons {
+    text-align: center;
+    margin: 40px 0 0 0;
+}
+
+input[type="submit"] {
+    display: inline;
+    margin: 0 20px;
+    width: 12em;
+    padding: 10px;
+    border: 2px solid #7c412b;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    -moz-box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+    -webkit-box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+    box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+    color: #fff;
+    background: #ef7d50;
+    font-weight: bold;
+    -webkit-appearance: none;
+}
+
+input[type="submit"]:hover, input[type="submit"]:active {
+    cursor: pointer;
+    background: #fff;
+    color: #ef7d50;
+}
+
+input[type="submit"]:active {
+    background: #eee;
+    -moz-box-shadow: 0 0 .5em rgba(0, 0, 0, .8) inset;
+    -webkit-box-shadow: 0 0 .5em rgba(0, 0, 0, .8) inset;
+    box-shadow: 0 0 .5em rgba(0, 0, 0, .8) inset;
+}
+
+
+/* Таблицы */
+
+table {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+tr, th, td {
+    padding: 10px;
+    margin: 0;
+    text-align: left;
+}
+
+table, th {
+    border: 1px solid #00a0b0;
+}
+
+th {
+    border-left: none;
+    border-right: none;
+    background: #ef7d50;
+    color: #fff;
+    cursor: default;
+}
+
+tr:nth-child(odd) {
+    background: #fff4cf;
+}
+
+tr:nth-child(even) {
+    background: #fff;
+}
+
+tr:hover {
+    background: #ddd;
+    cursor: pointer;
+}
+
+
+/* Окна для вывода статуса и сообщений об ошибках */
+
+.statusMessage, .errorMessage {
+    font-size: .8em;
+    padding: .5em;
+    margin: 2em 0;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    -moz-box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+    -webkit-box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+    -box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+}
+
+.statusMessage {
+    background-color: #2b2;
+    border: 1px solid #080;
+    color: #fff;
+}
+
+.errorMessage {
+    background-color: #f22;
+    border: 1px solid #800;
+    color: #fff;
+}
+
+ul.ajax-load {
+    margin-left:  0px;
+    padding-left: 10px;
+}
+ul.ajax-load li {
+    display: inline; /* Отображать как строчный элемент */
+    margin-right: 5px; /* Отступ слева */
+    border: 1px solid #000; /* Рамка вокруг текста */
+    padding: 3px; /* Поля вокруг текста */
+    font-size: 12px;
+}
diff --git a/web/CSS/style.css b/web/CSS/style.css
index 80c15b2..9bfce4e 100644
--- a/web/CSS/style.css
+++ b/web/CSS/style.css
@@ -1,42 +1,381 @@
-/* Дополнительные стили сайта (помимо самого бутстрапа) */
+/* Стили для body and внешнего контейнера */
+	 
+body {
+  margin: 0;
+  color: #333;
+  background-color: #00a0b0;
+  font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  line-height: 1.5em;
+}
+
+#container {
+  width: 960px;
+  background: #fff;
+  margin: 20px auto;
+  padding: 20px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+}
+
+
+/* Логотип и нижний колонтитул */
+
+#logo {
+  display: block;
+  width: 300px;
+  padding: 0 660px 20px 0;
+  border: none;
+  border-bottom: 1px solid #00a0b0;
+  margin-bottom: 40px;
+}
+
+#footer {
+  border-top: 1px solid #00a0b0;
+  margin-top: 40px;
+  padding: 20px 0 0 0;
+  font-size: .8em;
+}
+
+.loader-identity {
+    display : none;
+    float : right;
+}
+
+
+/* Заголвки */
+
+h1 {
+  color: #eb6841;
+  margin-bottom: 30px;
+  line-height: 1.2em;
+}
+
+h2, h2 a {
+  color: #edc951;
+}
+
+h2 a {
+  text-decoration: none;
+}
+
+h3.categoryDescription {
+  margin-top: -20px;
+  margin-bottom: 40px;
+}
+
+
+/* Заголовки статей */
+
+#headlines {
+  list-style: none;
+  padding-left: 0;
+  width: 75%;
+}
+
+#headlines li {
+  margin-bottom: 2em;
+}
+
+.pubDate {
+  font-size: .8em;
+  color: #eb6841;
+  text-transform: uppercase;
+}
+
+#headlines .pubDate {
+  display: inline-block;
+  width: 100px;
+  font-size: .5em;
+  vertical-align: middle;
+}
+
+#headlines.archive .pubDate {
+  width: 130px;
+}
+
+.summary {
+  padding-left: 100px;
+}
+
+#headlines.archive .summary {
+  padding-left: 130px;
+}
+
+.category {
+  font-style: italic;
+  font-weight: normal;
+  font-size: 60%;
+  color: #999;
+  display: block;
+  line-height: 2em;
+}
+
+.category a {
+  color: #999;
+  text-decoration: underline;
+}
+.subcategory {
+  font-style: italic;
+  font-weight: normal;
+  font-size: 60%;
+  color: #999;
+  display: block;
+  line-height: 2em;
+}
+.subcategory a {
+  color: #999;
+  text-decoration: underline;
+}
+.authors{
+  font-style: italic;
+  font-weight: normal;
+  font-size: 60%;
+  color: #999;
+  display: block;
+  line-height: 2em;
+}
+.authors a {
+  color: #999;
+  text-decoration: underline;
+}
+.showContent {
+    font-size : 14px;
+    float : right;
+}
+
+
+/* Заголовок для страницы администратора */
+
+#adminHeader {
+  width: 940px;
+  padding: 0 10px;
+  border-bottom: 1px solid #00a0b0;
+  margin: -30px 0 40px 0;
+  font-size: 0.8em;
+}
 
 
+/* Стили для формы с цветным фоном, скругленными углами и тенью */
+
+form {
+  margin: 20px auto;
+  padding: 40px 20px;
+  overflow: auto;
+  background: #fff4cf;
+  border: 1px solid #666;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px; 
+  border-radius: 5px;
+  -moz-box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+  -webkit-box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+  box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+}
 
-/* Футе для бутстрапа
--------------------------------------------------- */
-html {
+
+/* Задаем для элементов формы согласованные поля, отступы, и высоту строки */
+
+form ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+form ul li {
+  margin: .9em 0 0 0;
+  padding: 0;
+}
+
+form * {
+  line-height: 1em;
+}
+
+
+/* Метки полей */
+
+label {
+  display: block;
+  float: left;
+  clear: left;
+  text-align: right;
+  width: 15%;
+  padding: .4em 0 0 0;
+  margin: .15em .5em 0 0;
+}
+
+
+/* Поля */
+
+input, select, textarea {
+  display: block;
+  margin: 0;
+  padding: .4em;
+  width: 80%;
+}
+
+input, textarea, .date {
+  border: 2px solid #666;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;   
+  border-radius: 5px;
+  background: #fff;
+}
+
+input {
+  font-size: .9em;
+}
+
+select {
+  padding: 0;
+  margin-bottom: 2.5em;
   position: relative;
-  min-height: 100%;
+  top: .7em;
 }
-body {
-  margin-bottom: 60px; /* Margin bottom by footer height */
+
+textarea {
+  font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  font-size: .9em;
+  height: 5em;
+  line-height: 1.5em;
+}
+
+textarea#content {
+  font-family: "Courier New", courier, fixed;
 }
-.footer {
-  position: absolute;
-  bottom: 0;
+
+
+/* Рамка вокруг поля с фокусом ввода */
+
+form *:focus {
+  border: 2px solid #7c412b;
+  outline: none;
+}
+
+
+/* Правильно заполненное поле имеет зеленый фон */
+
+input:valid, textarea:valid {
+  background: #efe;
+}
+
+
+/* Кнопки отправки */
+
+.buttons {
+  text-align: center;
+  margin: 40px 0 0 0;
+}
+
+input[type="submit"] {
+  display: inline;
+  margin: 0 20px;
+  width: 12em;
+  padding: 10px;
+  border: 2px solid #7c412b;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px; 
+  border-radius: 5px;
+  -moz-box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+  -webkit-box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+  box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+  color: #fff;
+  background: #ef7d50;
+  font-weight: bold;
+  -webkit-appearance: none;
+}
+
+input[type="submit"]:hover, input[type="submit"]:active {
+  cursor: pointer;
+  background: #fff;
+  color: #ef7d50;
+}
+
+input[type="submit"]:active {
+  background: #eee;
+  -moz-box-shadow: 0 0 .5em rgba(0, 0, 0, .8) inset;
+  -webkit-box-shadow: 0 0 .5em rgba(0, 0, 0, .8) inset;
+  box-shadow: 0 0 .5em rgba(0, 0, 0, .8) inset;
+}
+
+
+/* Таблицы */
+
+table {
   width: 100%;
-  height: 60px; /* Set the fixed height of the footer here */
-  line-height: 60px; /* Vertically center the text there */
-  background-color: #f5f5f5;
+  border-collapse: collapse;
 }
 
+tr, th, td {
+  padding: 10px;
+  margin: 0;
+  text-align: left;
+}
 
-/* Коилефт*/
-.copyleft {
-    -webkit-transform: scaleX(-1);
-      -moz-transform: scaleX(-1);
-        -o-transform: scaleX(-1);
-    -khtml-transform: scaleX(-1);
-       -ms-transform: scaleX(-1);
-           transform: scaleX(-1);
-   display: inline-block;
+table, th {
+  border: 1px solid #00a0b0;
 }
 
+th {
+  border-left: none;
+  border-right: none;
+  background: #ef7d50;
+  color: #fff;
+  cursor: default;
+}
 
-.footer-link {
-    color: #17a2b8;
+tr:nth-child(odd) {
+  background: #fff4cf;
 }
 
+tr:nth-child(even) {
+  background: #fff;
+}
 
+tr:hover {
+  background: #ddd;
+  cursor: pointer;
+}
 
 
+/* Окна для вывода статуса и сообщений об ошибках */
+
+.statusMessage, .errorMessage {
+  font-size: .8em;
+  padding: .5em;
+  margin: 2em 0;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  -moz-box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+  -webkit-box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+  -box-shadow: 0 0 .5em rgba(0, 0, 0, .8);
+}
+
+.statusMessage {
+  background-color: #2b2;
+  border: 1px solid #080;
+  color: #fff;
+}
+
+.errorMessage {
+  background-color: #f22;
+  border: 1px solid #800;
+  color: #fff;
+}
+
+ul.ajax-load {
+    margin-left:  0px;
+    padding-left: 10px;
+}
+ul.ajax-load li {
+    display: inline; /* Отображать как строчный элемент */
+    margin-right: 5px; /* Отступ слева */
+    border: 1px solid #000; /* Рамка вокруг текста */
+    padding: 3px; /* Поля вокруг текста */
+    font-size: 12px;
+}
+checkboxActivity {
+            width: 25px;             
+	height: 25px;
+        cursor: pointer;
+        }        
\ No newline at end of file
diff --git a/web/JS/loaderIdentity.js b/web/JS/loaderIdentity.js
new file mode 100644
index 0000000..e00b301
--- /dev/null
+++ b/web/JS/loaderIdentity.js
@@ -0,0 +1,15 @@
+// выводим идентификатор
+    function showLoaderIdentity(content) 
+    {
+        let id = "#loader-identity" + content;
+        $(id).show("slow")
+    }
+
+    // скрываем идентификатор
+    function hideLoaderIdentity(content) 
+    {
+       let id = "#loader-identity" + content;
+       $(id).hide();
+    }
+
+
diff --git a/web/JS/showContent.js b/web/JS/showContent.js
new file mode 100644
index 0000000..ea34d20
--- /dev/null
+++ b/web/JS/showContent.js
@@ -0,0 +1,68 @@
+$(function(){
+    
+    console.log('Привет, это страый js ))');
+    init_get();
+    init_post();
+});
+
+function init_get() 
+{
+    $('a.ajaxArticleBodyByGet').one('click', function(){
+        var contentId = $(this).attr('data-contentId');
+        console.log('ID статьи = ', contentId); 
+        showLoaderIdentity(contentId);
+        $.ajax({
+            url:'/ajax/showContentsHandler.php?articleId=' + contentId, 
+            dataType: 'json'
+        })
+        .done (function(obj){
+            hideLoaderIdentity(contentId);
+            console.log('Ответ получен');
+            $('li.' + contentId).append(obj);
+        })
+        .fail(function(xhr, status, error){
+            hideLoaderIdentity(contentId);
+    
+            console.log('ajaxError xhr:', xhr); // выводим значения переменных
+            console.log('ajaxError status:', status);
+            console.log('ajaxError error:', error);
+    
+            console.log('Ошибка соединения при получении данных (GET)');
+        });
+        
+        return false;
+        
+    });  
+}
+
+function init_post() 
+{
+    $('a.ajaxArticleBodyByPost').one('click', function(){
+        var content = $(this).attr('data-contentId');
+        showLoaderIdentity(contentId);
+        $.ajax({
+            url:'/ajax/showContentsHandler.php', 
+            data: ({articleId: content}),
+            dataType: 'text',
+//            converters: 'json text',
+            method: 'POST'
+        })
+        .done (function(obj){
+            hideLoaderIdentity(contentId);
+            console.log('Ответ получен', obj);
+            $('li.' + content).append(obj);
+        })
+        .fail(function(xhr, status, error){
+            hideLoaderIdentity(contentId);
+    
+    
+            console.log('Ошибка соединения с сервером (POST)');
+            console.log('ajaxError xhr:', xhr); // выводим значения переменных
+            console.log('ajaxError status:', status);
+            console.log('ajaxError error:', error);
+        });
+        
+        return false;
+        
+    });  
+}
diff --git a/web/ajax/loadArticle.js b/web/ajax/loadArticle.js
new file mode 100644
index 0000000..b241a0e
--- /dev/null
+++ b/web/ajax/loadArticle.js
@@ -0,0 +1,28 @@
+$(document).ready(function()
+{
+    $(".loadArticle").bind("click", function(){
+        let articleId = $(this).attr('data-contentId');
+        $.ajax({
+            
+            url:"ajax/loadArticle.php",
+            type:"POST",
+            data:({articleId: articleId}),
+            dataType:"html",
+            beforeSend: function()
+            {
+                let id = "#article" + articleId;
+                $(id).text("Загрузка данных");
+            },
+            success: function (data)
+            {
+                let id = "#article" + articleId;
+                $(id).text(data);
+            },
+            error: function funcError()
+            {
+                let id = "#article" + articleId;
+                $(id).text("Ошибка!");
+            }
+        });
+    });
+});
\ No newline at end of file
diff --git a/web/ajax/loadArticle.php b/web/ajax/loadArticle.php
new file mode 100644
index 0000000..aa0bf12
--- /dev/null
+++ b/web/ajax/loadArticle.php
@@ -0,0 +1,4 @@
+<?php
+require ('../config.php');
+$article = Article::getById($_POST['articleId']);
+echo $article->content;
\ No newline at end of file
diff --git a/web/ajax/showContentsHandler.php b/web/ajax/showContentsHandler.php
new file mode 100644
index 0000000..7e6fc05
--- /dev/null
+++ b/web/ajax/showContentsHandler.php
@@ -0,0 +1,30 @@
+<?php
+require ('../config.php');
+
+if (isset($_GET['articleId'])) {
+    $article = Article::getById((int)$_GET['articleId']);
+    echo $article->content;
+}
+if (isset ($_POST['articleId'])) {
+    //die("Привет)");
+    $article = Article::getById((int)$_POST['articleId']);
+    echo json_encode($article->content);
+//        die("Привет)");
+//    $conn = new PDO( DB_DSN, DB_USERNAME, DB_PASSWORD );
+//    
+//        if (isset($conn)) {
+//            die("Соединенте установлено");
+//        }
+//        else {
+//            die("Соединение не установлено");
+//        }
+//    $article = "WHERE Id=". (int)$_POST[articleId];
+//    echo $article;
+//    $sql = "SELECT content FROM articles". $article;
+//    $contentFromDb = $conn->prepare( $sql );
+//    $contentFromDb->execute();
+//    $result = $contentFromDb->fetch();
+//    $conn = null;
+//    echo json_encode($result);
+}
+
diff --git a/web/images/logo.jpg b/web/images/logo.jpg
new file mode 100644
index 0000000..9409eff
Binary files /dev/null and b/web/images/logo.jpg differ