From de07a276bd1653de557599993e6dfe0148ada3f0 Mon Sep 17 00:00:00 2001 From: yarik Date: Fri, 31 Mar 2017 15:43:30 +0300 Subject: [PATCH] v0.0.2-stable --- common/config/SitemapDynamic.php | 8 +------- common/config/SitemapStatic.php | 13 +------------ common/config/bootstrap.php | 4 +--- common/config/settings.php | 62 ++++++++++++++++++++++++++++++-------------------------------- composer.json | 12 +++++++++++- 5 files changed, 44 insertions(+), 55 deletions(-) diff --git a/common/config/SitemapDynamic.php b/common/config/SitemapDynamic.php index 66c4ee0..f02fbed 100644 --- a/common/config/SitemapDynamic.php +++ b/common/config/SitemapDynamic.php @@ -1,11 +1,5 @@ [ - 'entity' => 'artbox\\core\\models\\Page', - 'status' => '1', - 'frequency' => 'hourly', - 'priority' => '0.7', - 'id' => 1, - ], + ]; \ No newline at end of file diff --git a/common/config/SitemapStatic.php b/common/config/SitemapStatic.php index 9a70227..f02fbed 100644 --- a/common/config/SitemapStatic.php +++ b/common/config/SitemapStatic.php @@ -1,16 +1,5 @@ [ - 'url' => 'http://www.artbox.dev/', - 'frequency' => 'monthly', - 'priority' => '1', - 'id' => 1, - ], - 2 => [ - 'url' => 'http://www.artbox.dev/site/contacts', - 'frequency' => 'monthly', - 'priority' => '0.7', - 'id' => 2, - ], + ]; \ No newline at end of file diff --git a/common/config/bootstrap.php b/common/config/bootstrap.php index 71b0e0d..60f0345 100644 --- a/common/config/bootstrap.php +++ b/common/config/bootstrap.php @@ -3,6 +3,4 @@ Yii::setAlias('@frontend', dirname(dirname(__DIR__)) . '/frontend'); Yii::setAlias('@backend', dirname(dirname(__DIR__)) . '/backend'); Yii::setAlias('@console', dirname(dirname(__DIR__)) . '/console'); - Yii::setAlias('@storage', dirname(dirname(__DIR__)) . '/storage'); - Yii::setAlias('@artbox/core', dirname(dirname(__DIR__)) . '/artweb/artbox-core'); - \ No newline at end of file + Yii::setAlias('@storage', dirname(dirname(__DIR__)) . '/storage'); \ No newline at end of file diff --git a/common/config/settings.php b/common/config/settings.php index cf946cc..a2dc835 100755 --- a/common/config/settings.php +++ b/common/config/settings.php @@ -1,33 +1,31 @@ [ - 'phone' => '+38 (044) 593-73-76', - 'phone2' => '+38 (098) 468-07-64', - 'skype' => 'artwebstudio', - 'email' => 'artweb.ua@gmail.com', - 'house' => '1-М', - 'street' => 'пр. М. Бажана', - 'office' => '25', - 'city' => 'Киев', - 'country' => 'Украина', - 'lat' => '50.403696', - 'lon' => '30.641481', - 'facebook' => 'https://www.facebook.com/ArtWeb.ua/', - 'vk' => 'https://vk.com/artwebua', - 'ok' => 'https://ok.ru/artwebua', - 'google' => 'https://plus.google.com/+ArtwebUaAgency', - 'twitter' => 'https://twitter.com/ArtWeb_ua', - 'name' => 'Artweb', - 'logo' => '10', - 'about' => 'Строим бизнес в онлайне', - 'analytics_key' => '119240817', - 'robots' => 'User-agent: Google -Disallow: -', - 'ga_code' => '796967', - 'ya_code' => '08908908', - 'tag_manager' => '', - 'id' => 1, - ], -]; \ No newline at end of file + + return [ + 1 => [ + 'phone' => '', + 'phone2' => '', + 'skype' => '', + 'email' => '', + 'house' => '', + 'street' => '', + 'office' => '', + 'city' => '', + 'country' => '', + 'lat' => '', + 'lon' => '', + 'facebook' => '', + 'vk' => '', + 'ok' => '', + 'google' => '', + 'twitter' => '', + 'name' => '', + 'logo' => '', + 'about' => '', + 'analytics_key' => '', + 'robots' => '', + 'ga_code' => '', + 'ya_code' => '', + 'tag_manager' => '', + 'id' => 1, + ], + ]; \ No newline at end of file diff --git a/composer.json b/composer.json index ec9d72b..262f67e 100644 --- a/composer.json +++ b/composer.json @@ -48,5 +48,15 @@ "npm-asset-library": "vendor/npm", "bower-asset-library": "vendor/bower" } - } + }, + "repositories": [ + { + "type": "vcs", + "url": "git@gitlab.artweb.com.ua:yarik.nechyporuk/artbox-core.git" + }, + { + "type": "vcs", + "url": "git@gitlab.artweb.com.ua:yarik.nechyporuk/artbox-gentelella.git" + } + ] } -- libgit2 0.21.4