Commit 1ceb333844d97ca7df5651ac1270f93d372b08c8

Authored by Alexey Boroda
1 parent 63296d61

-Added gallery

backend/config/main.php
@@ -81,6 +81,9 @@ @@ -81,6 +81,9 @@
81 'baseUrl' => '/', 81 'baseUrl' => '/',
82 'enablePrettyUrl' => true, 82 'enablePrettyUrl' => true,
83 'showScriptName' => false, 83 'showScriptName' => false,
  84 + 'processRoutes' => [
  85 + 'page/view',
  86 + ],
84 'rules' => [], 87 'rules' => [],
85 ], 88 ],
86 'sitemap' => [ 89 'sitemap' => [
backend/views/layouts/menu_items.php
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 [ 49 [
50 'label' => \Yii::t('core', 'SEO'), 50 'label' => \Yii::t('core', 'SEO'),
51 'url' => '#', 51 'url' => '#',
52 - 'icon' => 'bolt', 52 + 'icon' => 'leaf',
53 'items' => [ 53 'items' => [
54 [ 54 [
55 'label' => \Yii::t('core', 'Seo pages'), 55 'label' => \Yii::t('core', 'Seo pages'),
backend/views/settings/_social_tab.php
@@ -10,11 +10,11 @@ @@ -10,11 +10,11 @@
10 */ 10 */
11 echo $form->field($model, 'facebook') 11 echo $form->field($model, 'facebook')
12 ->textInput(); 12 ->textInput();
13 - echo $form->field($model, 'vk')  
14 - ->textInput(); 13 +// echo $form->field($model, 'vk')
  14 +// ->textInput();
15 echo $form->field($model, 'google') 15 echo $form->field($model, 'google')
16 ->textInput(); 16 ->textInput();
17 echo $form->field($model, 'twitter') 17 echo $form->field($model, 'twitter')
18 ->textInput(); 18 ->textInput();
19 - echo $form->field($model, 'ok')  
20 - ->textInput();  
21 \ No newline at end of file 19 \ No newline at end of file
  20 +// echo $form->field($model, 'ok')
  21 +// ->textInput();
22 \ No newline at end of file 22 \ No newline at end of file
common/config/.gitignore
@@ -3,4 +3,6 @@ db* @@ -3,4 +3,6 @@ db*
3 params-local.php 3 params-local.php
4 test-local.php 4 test-local.php
5 settings.php 5 settings.php
6 -mail.php  
7 \ No newline at end of file 6 \ No newline at end of file
  7 +mail.php
  8 +SitemapDynamic.php
  9 +SitemapStatic.php
8 \ No newline at end of file 10 \ No newline at end of file
common/config/SitemapDynamic.php deleted
1 -<?php  
2 -  
3 - return [  
4 -  
5 - ];  
6 \ No newline at end of file 0 \ No newline at end of file
common/config/SitemapStatic.php deleted
1 -<?php  
2 -  
3 - return [  
4 -  
5 - ];  
6 \ No newline at end of file 0 \ No newline at end of file
common/config/main.php
1 <?php 1 <?php
2 use artbox\core\components\SeoComponent; 2 use artbox\core\components\SeoComponent;
3 3
4 - $mail = require( 'mail.php' ); 4 + $mail = require( 'filedb/mail.php' );
5 5
6 return [ 6 return [
7 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', 7 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 ], 36 ],
37 'filedb' => [ 37 'filedb' => [
38 'class' => 'yii2tech\filedb\Connection', 38 'class' => 'yii2tech\filedb\Connection',
39 - 'path' => '@common/config', 39 + 'path' => '@common/config/filedb',
40 ], 40 ],
41 'sitemapdb' => [ 41 'sitemapdb' => [
42 'class' => 'yii2tech\filedb\Connection', 42 'class' => 'yii2tech\filedb\Connection',
common/config/settings.php deleted
1 -<?php  
2 -  
3 -return [  
4 - 1 => [  
5 - 'phone' => '+38 (044) 593-73-76',  
6 - 'phone2' => '+38 (098) 468-07-64',  
7 - 'skype' => 'artwebstudio',  
8 - 'email' => 'kennen.md@gmail.com',  
9 - 'house' => '1-М',  
10 - 'street' => 'пр. М. Бажана',  
11 - 'office' => '25',  
12 - 'city' => 'Киев',  
13 - 'country' => 'Украина',  
14 - 'lat' => '50.403696',  
15 - 'lon' => '30.641481',  
16 - 'facebook' => 'https://www.facebook.com/ArtWeb.ua/',  
17 - 'vk' => 'https://vk.com/artwebua',  
18 - 'ok' => 'https://ok.ru/artwebua',  
19 - 'google' => 'https://plus.google.com/+ArtwebUaAgency',  
20 - 'twitter' => 'https://twitter.com/ArtWeb_ua',  
21 - 'name' => 'Artweb',  
22 - 'logo' => null,  
23 - 'about' => 'Строим бизнес в онлайне',  
24 - 'analytics_key' => '119240817',  
25 - 'robots' => 'User-agent: Google  
26 -Disallow:  
27 -',  
28 - 'ga_code' => '796967',  
29 - 'ya_code' => '08908908',  
30 - 'tag_manager' => '',  
31 - 'id' => 1,  
32 - ],  
33 -];  
34 \ No newline at end of file 0 \ No newline at end of file
common/config/mail.php renamed to environments/dev/common/config/filedb/mail.php
environments/dev/common/config/filedb/settings.php 0 → 100755
  1 +<?php
  2 +
  3 +return [
  4 + 1 => [
  5 + 'phone' => '',
  6 + 'phone2' => '',
  7 + 'skype' => '',
  8 + 'email' => '',
  9 + 'house' => '',
  10 + 'street' => '',
  11 + 'office' => '',
  12 + 'city' => '',
  13 + 'country' => '',
  14 + 'lat' => '',
  15 + 'lon' => '',
  16 + 'facebook' => '',
  17 + 'vk' => '',
  18 + 'ok' => '',
  19 + 'google' => '',
  20 + 'twitter' => '',
  21 + 'name' => '',
  22 + 'logo' => null,
  23 + 'about' => '',
  24 + 'analytics_key' => '',
  25 + 'robots' => 'User-agent: Google
  26 +Disallow:
  27 +',
  28 + 'ga_code' => '',
  29 + 'ya_code' => '',
  30 + 'tag_manager' => '',
  31 + 'id' => 1,
  32 + ],
  33 +];
0 \ No newline at end of file 34 \ No newline at end of file
environments/index.php
@@ -36,6 +36,8 @@ return [ @@ -36,6 +36,8 @@ return [
36 'backend/web/assets', 36 'backend/web/assets',
37 'frontend/runtime', 37 'frontend/runtime',
38 'frontend/web/assets', 38 'frontend/web/assets',
  39 + 'common/config/filedb',
  40 + 'storage',
39 ], 41 ],
40 'setExecutable' => [ 42 'setExecutable' => [
41 'yii', 43 'yii',
@@ -54,6 +56,8 @@ return [ @@ -54,6 +56,8 @@ return [
54 'backend/web/assets', 56 'backend/web/assets',
55 'frontend/runtime', 57 'frontend/runtime',
56 'frontend/web/assets', 58 'frontend/web/assets',
  59 + 'common/config/filedb',
  60 + 'storage',
57 ], 61 ],
58 'setExecutable' => [ 62 'setExecutable' => [
59 'yii', 63 'yii',
environments/prod/common/config/filedb/mail.php 0 → 100755
  1 +<?php
  2 +
  3 +return [
  4 + 1 => [
  5 + 'host' => 'smtp.gmail.com',
  6 + 'user' => '',
  7 + 'pass' => '',
  8 + 'id' => 1,
  9 + ],
  10 +];
0 \ No newline at end of file 11 \ No newline at end of file
environments/prod/common/config/filedb/settings.php 0 → 100755
  1 +<?php
  2 +
  3 +return [
  4 + 1 => [
  5 + 'phone' => '',
  6 + 'phone2' => '',
  7 + 'skype' => '',
  8 + 'email' => '',
  9 + 'house' => '',
  10 + 'street' => '',
  11 + 'office' => '',
  12 + 'city' => '',
  13 + 'country' => '',
  14 + 'lat' => '',
  15 + 'lon' => '',
  16 + 'facebook' => '',
  17 + 'vk' => '',
  18 + 'ok' => '',
  19 + 'google' => '',
  20 + 'twitter' => '',
  21 + 'name' => '',
  22 + 'logo' => null,
  23 + 'about' => '',
  24 + 'analytics_key' => '',
  25 + 'robots' => 'User-agent: Google
  26 +Disallow:
  27 +',
  28 + 'ga_code' => '',
  29 + 'ya_code' => '',
  30 + 'tag_manager' => '',
  31 + 'id' => 1,
  32 + ],
  33 +];
0 \ No newline at end of file 34 \ No newline at end of file
frontend/views/layouts/main.php
@@ -77,6 +77,7 @@ @@ -77,6 +77,7 @@
77 <body> 77 <body>
78 <?php $this->beginBody() ?> 78 <?php $this->beginBody() ?>
79 <!-- Google Analytics --> 79 <!-- Google Analytics -->
  80 + <?php if (!empty($settings->ga_code)) { ?>
80 <script> 81 <script>
81 (function(i, s, o, g, r, a, m) { 82 (function(i, s, o, g, r, a, m) {
82 i[ 'GoogleAnalyticsObject' ] = r; 83 i[ 'GoogleAnalyticsObject' ] = r;
@@ -93,6 +94,7 @@ @@ -93,6 +94,7 @@
93 ga('send', 'pageview'); 94 ga('send', 'pageview');
94 95
95 </script> 96 </script>
  97 + <?php } ?>
96 <div id="all"> 98 <div id="all">
97 <header> 99 <header>
98 <!-- *** TOP *** 100 <!-- *** TOP ***
frontend/web/.gitignore
1 /index.php 1 /index.php
2 /index-test.php 2 /index-test.php
  3 +/sitemap.xml
frontend/web/sitemap.xml deleted
1 -<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"><url><loc>http://www.artbox.dev/</loc><lastmod>2017-03-30</lastmod><changefreq>monthly</changefreq><priority>1</priority></url><url><loc>http://www.artbox.dev/site/contacts</loc><lastmod>2017-03-30</lastmod><changefreq>monthly</changefreq><priority>0.7</priority></url><url><loc>http://www.artbox.dev/en/text-en</loc><lastmod>2017-03-30</lastmod><changefreq>hourly</changefreq><priority>0.7</priority></url></urlset>  
2 \ No newline at end of file 0 \ No newline at end of file