From e3a12e2f37b5b536e80b334753a7867b5b3080e0 Mon Sep 17 00:00:00 2001 From: Yarik Date: Thu, 8 Jun 2017 16:50:16 +0300 Subject: [PATCH] Export web interface --- .gitignore | 4 ++++ backend/config/main.php | 11 ++++++----- backend/views/layouts/main.php | 2 ++ backend/views/layouts/menu_items.php | 13 +++++++++++++ backend/web/img/hotline_logo.jpg | Bin 0 -> 23932 bytes backend/web/img/nadavi_logo.png | Bin 0 -> 30961 bytes console/config/main.php | 1 + frontend/config/eauth.php | 25 ------------------------- 8 files changed, 26 insertions(+), 30 deletions(-) create mode 100755 backend/web/img/hotline_logo.jpg create mode 100755 backend/web/img/nadavi_logo.png diff --git a/.gitignore b/.gitignore index 91851e9..f3f710e 100755 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,7 @@ phpunit.phar /artweb/ /storage /common/config/settings.php +/frontend/web/hotline.xml +/frontend/web/nadavi.xml +common/components/ +console/migrations/ diff --git a/backend/config/main.php b/backend/config/main.php index 1fca45d..48da3c9 100755 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -42,14 +42,15 @@ 'blog-tag' => 'artbox\weblog\controllers\TagController', 'order' => 'artbox\order\controllers\OrderController', 'order-product' => 'artbox\order\controllers\OrderProductController', - 'label' => 'artbox\order\controllers\LabelController', - 'delivery' => 'artbox\order\controllers\DeliveryController', - 'payment' => 'artbox\order\controllers\PaymentController', - 'sitemap' => 'artbox\core\controllers\SitemapController', - 'comment' => [ + 'label' => 'artbox\order\controllers\LabelController', + 'delivery' => 'artbox\order\controllers\DeliveryController', + 'payment' => 'artbox\order\controllers\PaymentController', + 'sitemap' => 'artbox\core\controllers\SitemapController', + 'comment' => [ 'class' => 'artbox\webcomment\controllers\ManageController', 'viewPath' => '@artbox/webcomment/views/manage', ], + 'export' => 'artbox\catalog\controllers\ExportController', ], 'components' => [ 'assetManager' => [ diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php index 5bbc086..fe85bab 100755 --- a/backend/views/layouts/main.php +++ b/backend/views/layouts/main.php @@ -5,6 +5,7 @@ * @var View $this */ + use artbox\catalog\assets\CatalogAsset; use artbox\core\assets\ArtboxCoreAsset; use artbox\core\models\User; use artbox\core\models\UserData; @@ -19,6 +20,7 @@ ArtboxCoreAsset::register($this); OrderAsset::register($this); + CatalogAsset::register($this); /** * @var User $user diff --git a/backend/views/layouts/menu_items.php b/backend/views/layouts/menu_items.php index 93a0522..67012d7 100755 --- a/backend/views/layouts/menu_items.php +++ b/backend/views/layouts/menu_items.php @@ -89,6 +89,11 @@ 'url' => [ 'import/index' ], 'icon' => 'download', ], + [ + 'label' => \Yii::t('catalog', 'Export'), + 'url' => [ 'export/index' ], + 'icon' => 'upload', + ], ], ], [ @@ -175,5 +180,13 @@ ], ], ], + [ + 'label' => \Yii::t('catalog', 'Comments'), + 'url' => [ 'comment/index' ], + 'icon' => 'comment-o', + 'active' => function () { + return \Yii::$app->controller->id === 'comment'; + }, + ], ] ); \ No newline at end of file diff --git a/backend/web/img/hotline_logo.jpg b/backend/web/img/hotline_logo.jpg new file mode 100755 index 0000000..1d8041c Binary files /dev/null and b/backend/web/img/hotline_logo.jpg differ diff --git a/backend/web/img/nadavi_logo.png b/backend/web/img/nadavi_logo.png new file mode 100755 index 0000000..876a824 Binary files /dev/null and b/backend/web/img/nadavi_logo.png differ diff --git a/console/config/main.php b/console/config/main.php index f15f995..b8b112d 100755 --- a/console/config/main.php +++ b/console/config/main.php @@ -16,6 +16,7 @@ 'class' => 'yii\console\controllers\FixtureController', 'namespace' => 'common\fixtures', ], + 'export' => 'artbox\catalog\console\controllers\ExportXmlController', ], 'components' => [ 'log' => [ diff --git a/frontend/config/eauth.php b/frontend/config/eauth.php index aba9bae..4f78a8a 100644 --- a/frontend/config/eauth.php +++ b/frontend/config/eauth.php @@ -26,30 +26,5 @@ 'class' => 'nodge\eauth\services\YahooOpenIDService', //'realm' => '*.example.org', // your domain, can be with wildcard to authenticate on subdomains. ], - 'linkedin_oauth2' => [ - // register your app here: https://www.linkedin.com/secure/developer - 'class' => 'nodge\eauth\services\LinkedinOAuth2Service', - 'clientId' => '86uay6912iwzn7', - 'clientSecret' => 'IkOc8oMOlxkyNSfK', - 'title' => 'LinkedIn (OAuth2)', - ], - 'github' => [ - // register your app here: https://github.com/settings/applications - 'class' => 'nodge\eauth\services\GitHubOAuth2Service', - 'clientId' => '1a72fc01be1ecca28c76', - 'clientSecret' => '188376ae0736133bdca9f4376a99a1cd2a6e6254', - ], - 'steam' => [ - 'class' => 'nodge\eauth\services\SteamOpenIDService', - //'realm' => '*.example.org', // your domain, can be with wildcard to authenticate on subdomains. - 'apiKey' => 'ED8812C3AA509B94D4744AADBF4FDF49', - // Optional. You can get it here: https://steamcommunity.com/dev/apikey - ], - 'instagram' => [ - // register your app here: https://instagram.com/developer/register/ - 'class' => 'nodge\eauth\services\InstagramOAuth2Service', - 'clientId' => '7c3de0236bb4467bae58707012addce8', - 'clientSecret' => 'bfcf8a5eb47d4998b6e3dd573777a857', - ], ], ]; \ No newline at end of file -- libgit2 0.21.4