Commit ec08c1f0af1ad22618b5e485a93e5f00712d9123

Authored by Yarik
2 parents 567888e8 b313037a

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	backend/views/layouts/main.php
backend/config/main.php
@@ -12,6 +12,9 @@ @@ -12,6 +12,9 @@
12 'basePath' => dirname(__DIR__), 12 'basePath' => dirname(__DIR__),
13 'controllerNamespace' => 'backend\controllers', 13 'controllerNamespace' => 'backend\controllers',
14 'bootstrap' => [ 'log' ], 14 'bootstrap' => [ 'log' ],
  15 + 'controllerMap' => [
  16 + 'settings' => 'artweb\artbox\core\controllers\SettingsController',
  17 + ],
15 'modules' => [ 18 'modules' => [
16 'imagemanager' => [ 19 'imagemanager' => [
17 'class' => 'noam148\imagemanager\Module', 20 'class' => 'noam148\imagemanager\Module',
@@ -39,6 +42,10 @@ @@ -39,6 +42,10 @@
39 ], 42 ],
40 ], 43 ],
41 ], 44 ],
  45 + 'filedb' => [
  46 + 'class' => 'yii2tech\filedb\Connection',
  47 + 'path' => '@common/config',
  48 + ],
42 'imagemanager' => [ 49 'imagemanager' => [
43 'class' => 'noam148\imagemanager\components\ImageManagerGetPath', 50 'class' => 'noam148\imagemanager\components\ImageManagerGetPath',
44 'mediaPath' => dirname(dirname(__DIR__)) . '/storage', 51 'mediaPath' => dirname(dirname(__DIR__)) . '/storage',
backend/views/layouts/main.php
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 7
8 use artweb\artbox\core\models\User; 8 use artweb\artbox\core\models\User;
9 use yii\helpers\Html; 9 use yii\helpers\Html;
  10 + use yii\web\View;
10 11
11 $bundle = yiister\gentelella\assets\Asset::register($this); 12 $bundle = yiister\gentelella\assets\Asset::register($this);
12 /** 13 /**
@@ -17,321 +18,219 @@ @@ -17,321 +18,219 @@
17 <?php $this->beginPage(); ?> 18 <?php $this->beginPage(); ?>
18 <!DOCTYPE html> 19 <!DOCTYPE html>
19 <html lang="<?= Yii::$app->language ?>"> 20 <html lang="<?= Yii::$app->language ?>">
20 - <head>  
21 - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>  
22 - <meta charset="<?= Yii::$app->charset ?>"/>  
23 - <meta http-equiv="X-UA-Compatible" content="IE=edge"/>  
24 - <meta name="viewport" content="width=device-width, initial-scale=1"/>  
25 - <?= Html::csrfMetaTags() ?>  
26 - <title><?= Html::encode($this->title) ?></title>  
27 - <?php $this->head() ?>  
28 - <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->  
29 - <!--[if lt IE 9]>  
30 - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>  
31 - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>  
32 - <![endif]-->  
33 - </head>  
34 - <body class="nav-md">  
35 - <?php $this->beginBody(); ?>  
36 - <div class="container body"> 21 +<head>
  22 + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
  23 + <meta charset="<?= Yii::$app->charset ?>" />
  24 + <meta http-equiv="X-UA-Compatible" content="IE=edge" />
  25 + <meta name="viewport" content="width=device-width, initial-scale=1" />
  26 + <?= Html::csrfMetaTags() ?>
  27 + <title><?= Html::encode($this->title) ?></title>
  28 + <?php $this->head() ?>
  29 + <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
  30 + <!--[if lt IE 9]>
  31 + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
  32 + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
  33 + <![endif]-->
  34 +</head>
  35 +<body class="nav-md">
  36 +<?php $this->beginBody(); ?>
  37 +<div class="container body">
  38 +
  39 + <div class="main_container">
  40 +
  41 + <div class="col-md-3 left_col">
  42 + <div class="left_col scroll-view">
  43 +
  44 + <div class="navbar nav_title" style="border: 0;">
  45 + <a href="/" class="site_title"><i class="fa fa-rocket"></i> <span>Artbox!</span></a>
  46 + </div>
  47 + <div class="clearfix"></div>
  48 +
  49 + <!-- menu prile quick info -->
  50 + <div class="profile">
  51 + <div class="profile_pic">
  52 + <img src="http://placehold.it/128x128" alt="..." class="img-circle profile_img">
  53 + </div>
  54 + <div class="profile_info">
  55 + <span>Welcome,</span>
  56 + <h2>John Doe</h2>
  57 + </div>
  58 + </div>
  59 + <!-- /menu prile quick info -->
  60 +
  61 + <br />
  62 +
  63 + <!-- sidebar menu -->
  64 + <div id="sidebar-menu" class="main_menu_side hidden-print main_menu">
  65 +
  66 + <div class="menu_section">
  67 + <h3>General</h3>
  68 + <?=
  69 + \yiister\gentelella\widgets\Menu::widget(
  70 + [
  71 + "items" => [
  72 + ["label" => "Home", "url" => "/", "icon" => "home"],
  73 + ["label" => "Layout", "url" => ["site/layout"], "icon" => "files-o"],
  74 + ["label" => "Error page", "url" => ["site/error-page"], "icon" => "close"],
  75 + [
  76 + "label" => "Widgets",
  77 + "icon" => "th",
  78 + "url" => "#",
  79 + "items" => [
  80 + ["label" => "Menu", "url" => ["site/menu"]],
  81 + ["label" => "Panel", "url" => ["site/panel"]],
  82 + ],
  83 + ],
  84 + [
  85 + "label" => "Badges",
  86 + "url" => "#",
  87 + "icon" => "table",
  88 + "items" => [
  89 + [
  90 + "label" => "Default",
  91 + "url" => "#",
  92 + "badge" => "123",
  93 + ],
  94 + [
  95 + "label" => "Success",
  96 + "url" => "#",
  97 + "badge" => "new",
  98 + "badgeOptions" => ["class" => "label-success"],
  99 + ],
  100 + [
  101 + "label" => "Danger",
  102 + "url" => "#",
  103 + "badge" => "!",
  104 + "badgeOptions" => ["class" => "label-danger"],
  105 + ],
  106 + ],
  107 + ],
  108 + [
  109 + "label" => "Multilevel",
  110 + "url" => "#",
  111 + "icon" => "table",
  112 + "items" => [
  113 + [
  114 + "label" => "Second level 1",
  115 + "url" => "#",
  116 + ],
  117 + [
  118 + "label" => "Second level 2",
  119 + "url" => "#",
  120 + "items" => [
  121 + [
  122 + "label" => "Third level 1",
  123 + "url" => "#",
  124 + ],
  125 + [
  126 + "label" => "Third level 2",
  127 + "url" => "#",
  128 + ],
  129 + ],
  130 + ],
  131 + ],
  132 + ],
  133 + ],
  134 + ]
  135 + )
  136 + ?>
  137 + </div>
  138 +
  139 + </div>
  140 + <!-- /sidebar menu -->
  141 +
  142 + </div>
  143 + </div>
  144 +
  145 + <!-- top navigation -->
  146 + <div class="top_nav">
  147 +
  148 + <div class="nav_menu">
  149 + <nav class="" role="navigation">
  150 + <div class="nav toggle">
  151 + <a id="menu_toggle"><i class="fa fa-bars"></i></a>
  152 + </div>
  153 +
  154 + <ul class="nav navbar-nav navbar-right">
  155 + <li class="">
  156 + <a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
  157 + <img src="http://placehold.it/128x128" alt=""><?=Yii::$app->user->identity->username?>
  158 + <span class=" fa fa-angle-down"></span>
  159 + </a>
  160 + <ul class="dropdown-menu dropdown-usermenu pull-right">
  161 + <li>
  162 + <a href="#"><i class="fa fa-user pull-right"></i> Profile</a>
  163 + </li>
  164 + <li>
  165 + <?= Html::a(
  166 + Html::tag('i', '', [ 'class' => 'fa fa-cogs pull-right' ]) . ' Settings',
  167 + [ '/settings' ]
  168 + ) ?>
  169 + </li>
  170 + <li>
  171 + <?= Html::a(
  172 + Html::tag('i', '', [ 'class' => 'fa fa-sign-out pull-right' ]) . ' Log out',
  173 + [ '/site/logout' ],
  174 + [
  175 + 'data-method' => 'POST',
  176 + ]
  177 + ) ?>
  178 + </li>
  179 + </ul>
  180 + </li>
37 181
38 - <div class="main_container">  
39 -  
40 - <div class="col-md-3 left_col">  
41 - <div class="left_col scroll-view">  
42 -  
43 - <div class="navbar nav_title" style="border: 0;">  
44 - <a href="/" class="site_title"><i class="fa fa-rocket"></i><span>Artbox!</span></a>  
45 - </div>  
46 - <div class="clearfix"></div>  
47 -  
48 - <!-- menu prile quick info -->  
49 - <div class="profile">  
50 - <div class="profile_pic">  
51 - <img src="http://placehold.it/128x128" alt="..." class="img-circle profile_img">  
52 - </div>  
53 - <div class="profile_info">  
54 - <span>Welcome,</span>  
55 - <h2></h2>  
56 - </div>  
57 - </div>  
58 - <!-- /menu prile quick info -->  
59 -  
60 - <br/>  
61 -  
62 - <!-- sidebar menu -->  
63 - <div id="sidebar-menu" class="main_menu_side hidden-print main_menu">  
64 -  
65 - <div class="menu_section">  
66 - <h3>General</h3>  
67 - <?= \yiister\gentelella\widgets\Menu::widget(  
68 - [  
69 - "items" => [  
70 - [  
71 - "label" => "Home",  
72 - "url" => "/",  
73 - "icon" => "home",  
74 - ],  
75 - [  
76 - "label" => "Layout",  
77 - "url" => [ "site/layout" ],  
78 - "icon" => "files-o",  
79 - ],  
80 - [  
81 - "label" => "Error page",  
82 - "url" => [ "site/error-page" ],  
83 - "icon" => "close",  
84 - ],  
85 - [  
86 - "label" => "Widgets",  
87 - "icon" => "th",  
88 - "url" => "#",  
89 - "items" => [  
90 - [  
91 - "label" => "Menu",  
92 - "url" => [ "site/menu" ],  
93 - ],  
94 - [  
95 - "label" => "Panel",  
96 - "url" => [ "site/panel" ],  
97 - ],  
98 - ],  
99 - ],  
100 - [  
101 - "label" => "Badges",  
102 - "url" => "#",  
103 - "icon" => "table",  
104 - "items" => [  
105 - [  
106 - "label" => "Default",  
107 - "url" => "#",  
108 - "badge" => "123",  
109 - ],  
110 - [  
111 - "label" => "Success",  
112 - "url" => "#",  
113 - "badge" => "new",  
114 - "badgeOptions" => [ "class" => "label-success" ],  
115 - ],  
116 - [  
117 - "label" => "Danger",  
118 - "url" => "#",  
119 - "badge" => "!",  
120 - "badgeOptions" => [ "class" => "label-danger" ],  
121 - ],  
122 - ],  
123 - ],  
124 - [  
125 - "label" => "Multilevel",  
126 - "url" => "#",  
127 - "icon" => "table",  
128 - "items" => [  
129 - [  
130 - "label" => "Second level 1",  
131 - "url" => "#",  
132 - ],  
133 - [  
134 - "label" => "Second level 2",  
135 - "url" => "#",  
136 - "items" => [  
137 - [  
138 - "label" => "Third level 1",  
139 - "url" => "#",  
140 - ],  
141 - [  
142 - "label" => "Third level 2",  
143 - "url" => "#",  
144 - ],  
145 - ],  
146 - ],  
147 - ],  
148 - ],  
149 - ],  
150 - ]  
151 - ) ?>  
152 - </div>  
153 -  
154 - </div>  
155 - <!-- /sidebar menu -->  
156 -  
157 - <!-- /menu footer buttons -->  
158 - <div class="sidebar-footer hidden-small">  
159 - <a data-toggle="tooltip" data-placement="top" title="Settings">  
160 - <span class="glyphicon glyphicon-cog" aria-hidden="true"></span>  
161 - </a>  
162 - <a data-toggle="tooltip" data-placement="top" title="FullScreen">  
163 - <span class="glyphicon glyphicon-fullscreen" aria-hidden="true"></span>  
164 - </a>  
165 - <a data-toggle="tooltip" data-placement="top" title="Lock">  
166 - <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>  
167 - </a>  
168 - <a data-toggle="tooltip" data-placement="top" title="Logout">  
169 - <span class="glyphicon glyphicon-off" aria-hidden="true"></span>  
170 - </a>  
171 - </div>  
172 - <!-- /menu footer buttons -->  
173 - </div>  
174 - </div>  
175 -  
176 - <!-- top navigation -->  
177 - <div class="top_nav">  
178 -  
179 - <div class="nav_menu">  
180 - <nav class="" role="navigation">  
181 - <div class="nav toggle">  
182 - <a id="menu_toggle"><i class="fa fa-bars"></i></a>  
183 - </div>  
184 -  
185 - <ul class="nav navbar-nav navbar-right">  
186 - <li class="">  
187 - <a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">  
188 - <img src="http://placehold.it/128x128" alt="">John Doe  
189 - <span class=" fa fa-angle-down"></span>  
190 - </a>  
191 - <ul class="dropdown-menu dropdown-usermenu pull-right">  
192 - <li><a href="javascript:;"> Profile</a>  
193 - </li>  
194 - <li>  
195 - <a href="javascript:;">  
196 - <span class="badge bg-red pull-right">50%</span>  
197 - <span>Settings</span>  
198 - </a>  
199 - </li>  
200 - <li>  
201 - <a href="javascript:;">Help</a>  
202 - </li>  
203 - <li><a href="login.html"><i class="fa fa-sign-out pull-right"></i> Log Out</a>  
204 - </li>  
205 - </ul>  
206 - </li>  
207 -  
208 - <li role="presentation" class="dropdown">  
209 - <a href="javascript:;" class="dropdown-toggle info-number" data-toggle="dropdown" aria-expanded="false">  
210 - <i class="fa fa-envelope-o"></i>  
211 - <span class="badge bg-green">6</span>  
212 - </a>  
213 - <ul id="menu1" class="dropdown-menu list-unstyled msg_list" role="menu">  
214 - <li>  
215 - <a>  
216 - <span class="image">  
217 - <img src="http://placehold.it/128x128" alt="Profile Image"/>  
218 - </span>  
219 - <span>  
220 - <span>John Smith</span>  
221 - <span class="time">3 mins ago</span>  
222 - </span>  
223 - <span class="message">  
224 - Film festivals used to be do-or-die moments for movie makers. They were where...  
225 - </span>  
226 - </a>  
227 - </li>  
228 - <li>  
229 - <a>  
230 - <span class="image">  
231 - <img src="http://placehold.it/128x128" alt="Profile Image"/>  
232 - </span>  
233 - <span>  
234 - <span>John Smith</span>  
235 - <span class="time">3 mins ago</span>  
236 - </span>  
237 - <span class="message">  
238 - Film festivals used to be do-or-die moments for movie makers. They were where...  
239 - </span>  
240 - </a>  
241 - </li>  
242 - <li>  
243 - <a>  
244 - <span class="image">  
245 - <img src="http://placehold.it/128x128" alt="Profile Image"/>  
246 - </span>  
247 - <span>  
248 - <span>John Smith</span>  
249 - <span class="time">3 mins ago</span>  
250 - </span>  
251 - <span class="message">  
252 - Film festivals used to be do-or-die moments for movie makers. They were where...  
253 - </span>  
254 - </a>  
255 - </li>  
256 - <li>  
257 - <a>  
258 - <span class="image">  
259 - <img src="http://placehold.it/128x128" alt="Profile Image"/>  
260 - </span>  
261 - <span>  
262 - <span>John Smith</span>  
263 - <span class="time">3 mins ago</span>  
264 - </span>  
265 - <span class="message">  
266 - Film festivals used to be do-or-die moments for movie makers. They were where...  
267 - </span>  
268 - </a>  
269 - </li>  
270 - <li>  
271 - <div class="text-center">  
272 - <a href="/">  
273 - <strong>See All Alerts</strong>  
274 - <i class="fa fa-angle-right"></i>  
275 - </a>  
276 - </div>  
277 - </li>  
278 - </ul>  
279 - </li>  
280 -  
281 - </ul>  
282 - </nav>  
283 - </div>  
284 -  
285 - </div>  
286 - <!-- /top navigation -->  
287 -  
288 - <!-- page content -->  
289 - <div class="right_col" role="main">  
290 - <?php if (isset( $this->params[ 'h1' ] )): ?>  
291 - <div class="page-title">  
292 - <div class="title_left">  
293 - <h1><?= $this->params[ 'h1' ] ?></h1>  
294 - </div>  
295 - <div class="title_right">  
296 - <div class="col-md-5 col-sm-5 col-xs-12 form-group pull-right top_search">  
297 - <div class="input-group">  
298 - <input type="text" class="form-control" placeholder="Search for...">  
299 - <span class="input-group-btn"> 182 + </ul>
  183 + </nav>
  184 + </div>
  185 +
  186 + </div>
  187 + <!-- /top navigation -->
  188 +
  189 + <!-- page content -->
  190 + <div class="right_col" role="main">
  191 + <?php if (isset($this->params['h1'])): ?>
  192 + <div class="page-title">
  193 + <div class="title_left">
  194 + <h1><?= $this->params['h1'] ?></h1>
  195 + </div>
  196 + <div class="title_right">
  197 + <div class="col-md-5 col-sm-5 col-xs-12 form-group pull-right top_search">
  198 + <div class="input-group">
  199 + <input type="text" class="form-control" placeholder="Search for...">
  200 + <span class="input-group-btn">
300 <button class="btn btn-default" type="button">Go!</button> 201 <button class="btn btn-default" type="button">Go!</button>
301 </span> 202 </span>
302 - </div>  
303 - </div>  
304 - </div>  
305 - </div>  
306 - <?php endif; ?>  
307 - <div class="clearfix"></div>  
308 -  
309 - <?= $content ?>  
310 </div> 203 </div>
311 - <!-- /page content -->  
312 - <!-- footer content -->  
313 - <footer>  
314 - <div class="pull-right">  
315 - Gentelella - Bootstrap Admin Template by  
316 - <a href="https://colorlib.com" rel="nofollow" target="_blank">Colorlib</a><br/>  
317 - Extension for Yii framework 2 by  
318 - <a href="http://yiister.ru" rel="nofollow" target="_blank">Yiister</a>  
319 - </div>  
320 - <div class="clearfix"></div>  
321 - </footer>  
322 - <!-- /footer content --> 204 + </div>
323 </div> 205 </div>
  206 + </div>
  207 + <?php endif; ?>
  208 + <div class="clearfix"></div>
324 209
325 - </div>  
326 -  
327 - <div id="custom_notifications" class="custom-notifications dsp_none">  
328 - <ul class="list-unstyled notifications clearfix" data-tabbed_notifications="notif-group">  
329 - </ul>  
330 - <div class="clearfix"></div>  
331 - <div id="notif-group" class="tabbed_notifications"></div>  
332 - </div>  
333 - <!-- /footer content -->  
334 - <?php $this->endBody(); ?>  
335 - </body> 210 + <?= $content ?>
  211 + </div>
  212 + <!-- /page content -->
  213 + <!-- footer content -->
  214 + <footer>
  215 + <div class="pull-right">
  216 + Gentelella - Bootstrap Admin Template by <a href="https://colorlib.com" rel="nofollow" target="_blank">Colorlib</a><br />
  217 + Extension for Yii framework 2 by <a href="http://yiister.ru" rel="nofollow" target="_blank">Yiister</a>
  218 + </div>
  219 + <div class="clearfix"></div>
  220 + </footer>
  221 + <!-- /footer content -->
  222 + </div>
  223 +
  224 +</div>
  225 +
  226 +<div id="custom_notifications" class="custom-notifications dsp_none">
  227 + <ul class="list-unstyled notifications clearfix" data-tabbed_notifications="notif-group">
  228 + </ul>
  229 + <div class="clearfix"></div>
  230 + <div id="notif-group" class="tabbed_notifications"></div>
  231 +</div>
  232 +<!-- /footer content -->
  233 +<?php $this->endBody(); ?>
  234 +</body>
336 </html> 235 </html>
337 <?php $this->endPage(); ?> 236 <?php $this->endPage(); ?>
common/config/.gitignore 100644 โ†’ 100755
1 main-local.php 1 main-local.php
2 params-local.php 2 params-local.php
3 test-local.php 3 test-local.php
  4 +settings.php
4 \ No newline at end of file 5 \ No newline at end of file
common/config/bootstrap.php 100644 โ†’ 100755
@@ -3,3 +3,4 @@ Yii::setAlias(&#39;@common&#39;, dirname(__DIR__)); @@ -3,3 +3,4 @@ Yii::setAlias(&#39;@common&#39;, dirname(__DIR__));
3 Yii::setAlias('@frontend', dirname(dirname(__DIR__)) . '/frontend'); 3 Yii::setAlias('@frontend', dirname(dirname(__DIR__)) . '/frontend');
4 Yii::setAlias('@backend', dirname(dirname(__DIR__)) . '/backend'); 4 Yii::setAlias('@backend', dirname(dirname(__DIR__)) . '/backend');
5 Yii::setAlias('@console', dirname(dirname(__DIR__)) . '/console'); 5 Yii::setAlias('@console', dirname(dirname(__DIR__)) . '/console');
  6 +Yii::setAlias('@artbox-core', dirname(dirname(__DIR__)) . '/artweb/artbox-core');
common/config/main.php 100644 โ†’ 100755
@@ -5,5 +5,13 @@ return [ @@ -5,5 +5,13 @@ return [
5 'cache' => [ 5 'cache' => [
6 'class' => 'yii\caching\FileCache', 6 'class' => 'yii\caching\FileCache',
7 ], 7 ],
  8 + 'i18n' => [
  9 + 'translations' => [
  10 + 'core' => [
  11 + 'class' => 'yii\i18n\PhpMessageSource',
  12 + 'basePath' => '@artbox-core/messages',
  13 + ],
  14 + ],
  15 + ],
8 ], 16 ],
9 ]; 17 ];
common/config/params.php 100644 โ†’ 100755
common/config/settings.php 0 โ†’ 100755
  1 +<?php
  2 +
  3 +return [
  4 + 1 => [
  5 + 'id' => '1',
  6 + 'name' => 'Admin',
  7 + 'description' => 'Site administrator',
  8 + ],
  9 +];
0 \ No newline at end of file 10 \ No newline at end of file
common/config/test.php 100644 โ†’ 100755
@@ -21,7 +21,9 @@ @@ -21,7 +21,9 @@
21 "insolita/yii2-migration-generator": "~2.2", 21 "insolita/yii2-migration-generator": "~2.2",
22 "yiister/yii2-gentelella": "~1.0", 22 "yiister/yii2-gentelella": "~1.0",
23 "hiqdev/yii2-asset-icheck": "1.0.2.5", 23 "hiqdev/yii2-asset-icheck": "1.0.2.5",
24 - "noam148/yii2-image-manager": "*" 24 + "noam148/yii2-image-manager": "*",
  25 + "yii2tech/filedb": "^1.0",
  26 + "hiqdev/yii2-asset-pnotify": "^2.1"
25 }, 27 },
26 "require-dev": { 28 "require-dev": {
27 "yiisoft/yii2-debug": "~2.0.0", 29 "yiisoft/yii2-debug": "~2.0.0",
@@ -42,5 +44,10 @@ @@ -42,5 +44,10 @@
42 }, 44 },
43 "scripts": { 45 "scripts": {
44 "post-install-cmd": "php init --env=Development --overwrite=n" 46 "post-install-cmd": "php init --env=Development --overwrite=n"
  47 + },
  48 + "autoload": {
  49 + "psr-4": {
  50 + "artweb\\artbox\\core\\": "artweb/artbox-core/"
  51 + }
45 } 52 }
46 } 53 }
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 - "hash": "ccf577a6826f86b5814556c1ea21a85f",  
8 - "content-hash": "685ccd30ba9a1c6c4687729314641cdf", 7 + "hash": "b77198c9b7dc6a47b379a7f696023839",
  8 + "content-hash": "ecbd5dfde30e425db5d104f468df4ee5",
9 "packages": [ 9 "packages": [
10 { 10 {
11 "name": "bower-asset/bootstrap", 11 "name": "bower-asset/bootstrap",
@@ -285,6 +285,68 @@ @@ -285,6 +285,68 @@
285 ] 285 ]
286 }, 286 },
287 { 287 {
  288 + "name": "bower-asset/pnotify",
  289 + "version": "2.1.0",
  290 + "source": {
  291 + "type": "git",
  292 + "url": "https://github.com/sciactive/pnotify.git",
  293 + "reference": "4ca6d8089ec45997ae7be37efc51f1ddad336933"
  294 + },
  295 + "dist": {
  296 + "type": "zip",
  297 + "url": "https://api.github.com/repos/sciactive/pnotify/zipball/4ca6d8089ec45997ae7be37efc51f1ddad336933",
  298 + "reference": "4ca6d8089ec45997ae7be37efc51f1ddad336933",
  299 + "shasum": ""
  300 + },
  301 + "type": "bower-asset-library",
  302 + "extra": {
  303 + "bower-asset-main": [
  304 + "src/pnotify.core.js",
  305 + "src/pnotify.core.min.js",
  306 + "src/pnotify.buttons.js",
  307 + "src/pnotify.buttons.min.js",
  308 + "src/pnotify.callbacks.js",
  309 + "src/pnotify.callbacks.min.js",
  310 + "src/pnotify.confirm.js",
  311 + "src/pnotify.confirm.min.js",
  312 + "src/pnotify.desktop.js",
  313 + "src/pnotify.desktop.min.js",
  314 + "src/pnotify.history.js",
  315 + "src/pnotify.history.min.js",
  316 + "src/pnotify.nonblock.js",
  317 + "src/pnotify.nonblock.min.js",
  318 + "src/pnotify.core.css",
  319 + "src/pnotify.core.min.css",
  320 + "src/pnotify.buttons.css",
  321 + "src/pnotify.buttons.min.css",
  322 + "src/pnotify.history.css",
  323 + "src/pnotify.history.min.css"
  324 + ],
  325 + "bower-asset-ignore": [
  326 + "build-cache/",
  327 + "build-tools/",
  328 + "includes/",
  329 + "oxygen/",
  330 + "devnote*.*",
  331 + "index.html",
  332 + "README.md",
  333 + "testing.html",
  334 + "buildcustom.php",
  335 + "package.json",
  336 + "src/pnotify.tooltip.js",
  337 + "src/pnotify.tooltip.min.js",
  338 + "src/pnotify.mobile.js",
  339 + "src/pnotify.mobile.min.js"
  340 + ]
  341 + },
  342 + "license": [
  343 + "GPL-3.0",
  344 + "LGPL-3.0",
  345 + "MPL-1.1"
  346 + ],
  347 + "description": "JavaScript notification plugin."
  348 + },
  349 + {
288 "name": "bower-asset/punycode", 350 "name": "bower-asset/punycode",
289 "version": "v1.3.2", 351 "version": "v1.3.2",
290 "source": { 352 "source": {
@@ -574,6 +636,68 @@ @@ -574,6 +636,68 @@
574 "time": "2016-03-30 10:59:26" 636 "time": "2016-03-30 10:59:26"
575 }, 637 },
576 { 638 {
  639 + "name": "hiqdev/yii2-asset-pnotify",
  640 + "version": "2.1.0",
  641 + "source": {
  642 + "type": "git",
  643 + "url": "https://github.com/hiqdev/yii2-asset-pnotify.git",
  644 + "reference": "d5bfa39fba84741523238e53b85ef7c2f37b789f"
  645 + },
  646 + "dist": {
  647 + "type": "zip",
  648 + "url": "https://api.github.com/repos/hiqdev/yii2-asset-pnotify/zipball/d5bfa39fba84741523238e53b85ef7c2f37b789f",
  649 + "reference": "d5bfa39fba84741523238e53b85ef7c2f37b789f",
  650 + "shasum": ""
  651 + },
  652 + "require": {
  653 + "bower-asset/pnotify": "2.1.0"
  654 + },
  655 + "type": "package",
  656 + "autoload": {
  657 + "psr-4": {
  658 + "hiqdev\\assets\\pnotify\\": "src"
  659 + }
  660 + },
  661 + "notification-url": "https://packagist.org/downloads/",
  662 + "license": [
  663 + "BSD-3-Clause"
  664 + ],
  665 + "authors": [
  666 + {
  667 + "name": "Andrii Vasyliev",
  668 + "email": "sol@hiqdev.com",
  669 + "homepage": "https://hipanel.com/",
  670 + "role": "Project lead"
  671 + },
  672 + {
  673 + "name": "Andrey Klochok",
  674 + "email": "tafid@hiqdev.com",
  675 + "homepage": "https://hiqdev.com/",
  676 + "role": "Lead frontend developer"
  677 + },
  678 + {
  679 + "name": "Yuriy Myronchuk",
  680 + "email": "bladeroot@hiqdev.com",
  681 + "homepage": "https://hiqdev.com/",
  682 + "role": "QA Lead"
  683 + },
  684 + {
  685 + "name": "Dmitry Naumenko",
  686 + "email": "silverfire@hiqdev.com",
  687 + "homepage": "http://silverfire.me/",
  688 + "role": "Lead backend developer"
  689 + }
  690 + ],
  691 + "description": "Yii2 Asset Pnotify",
  692 + "homepage": "https://github.com/hiqdev/yii2-asset-pnotify",
  693 + "keywords": [
  694 + "asset",
  695 + "pnotify",
  696 + "yii2"
  697 + ],
  698 + "time": "2015-09-09 15:16:38"
  699 + },
  700 + {
577 "name": "imagine/imagine", 701 "name": "imagine/imagine",
578 "version": "v0.6.3", 702 "version": "v0.6.3",
579 "source": { 703 "source": {
@@ -1037,6 +1161,54 @@ @@ -1037,6 +1161,54 @@
1037 "time": "2017-02-13 07:52:53" 1161 "time": "2017-02-13 07:52:53"
1038 }, 1162 },
1039 { 1163 {
  1164 + "name": "yii2tech/filedb",
  1165 + "version": "1.0.3",
  1166 + "source": {
  1167 + "type": "git",
  1168 + "url": "https://github.com/yii2tech/filedb.git",
  1169 + "reference": "29af3a707fa2070b73b268e847b264f29c7dff31"
  1170 + },
  1171 + "dist": {
  1172 + "type": "zip",
  1173 + "url": "https://api.github.com/repos/yii2tech/filedb/zipball/29af3a707fa2070b73b268e847b264f29c7dff31",
  1174 + "reference": "29af3a707fa2070b73b268e847b264f29c7dff31",
  1175 + "shasum": ""
  1176 + },
  1177 + "require": {
  1178 + "yiisoft/yii2": "*"
  1179 + },
  1180 + "type": "yii2-extension",
  1181 + "extra": {
  1182 + "branch-alias": {
  1183 + "dev-master": "1.0.x-dev"
  1184 + }
  1185 + },
  1186 + "autoload": {
  1187 + "psr-4": {
  1188 + "yii2tech\\filedb\\": ""
  1189 + }
  1190 + },
  1191 + "notification-url": "https://packagist.org/downloads/",
  1192 + "license": [
  1193 + "BSD-3-Clause"
  1194 + ],
  1195 + "authors": [
  1196 + {
  1197 + "name": "Paul Klimov",
  1198 + "email": "klimov.paul@gmail.com"
  1199 + }
  1200 + ],
  1201 + "description": "Provides ActiveRecord interface for data declared in static files",
  1202 + "keywords": [
  1203 + "active",
  1204 + "filedb",
  1205 + "record",
  1206 + "static",
  1207 + "yii2"
  1208 + ],
  1209 + "time": "2017-02-06 10:58:30"
  1210 + },
  1211 + {
1040 "name": "yiisoft/yii2", 1212 "name": "yiisoft/yii2",
1041 "version": "2.0.11.2", 1213 "version": "2.0.11.2",
1042 "source": { 1214 "source": {