Skip to content

Commit

Permalink
Rename to FocusriteNovation and some tidy ups.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sophie Shanahan-Kluth committed Jun 18, 2020
1 parent 7f90d46 commit b5c254d
Show file tree
Hide file tree
Showing 10 changed files with 74 additions and 47 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/nbproject/*
/nbproject/*
/vendor/
4 changes: 2 additions & 2 deletions Helper/Data.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Abelbm\DisableFrontend\Helper;
namespace FocusriteNovation\DisableFrontend\Helper;

use Magento\Framework\App\Helper\AbstractHelper;
use Magento\Store\Model\ScopeInterface;
Expand All @@ -15,7 +15,7 @@ class Data extends AbstractHelper{
*/
public function getConfigValue() {
return $this->scopeConfig->getValue(
'admin/disable_frontend/show_as_frontend', ScopeInterface::SCOPE_WEBSITE
'admin/disable_frontend/show_frontend_as', ScopeInterface::SCOPE_WEBSITE
);
}
}
7 changes: 4 additions & 3 deletions Model/Config/Source/Custom.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Abelbm\DisableFrontend\Model\Config\Source;
namespace FocusriteNovation\DisableFrontend\Model\Config\Source;


class Custom implements \Magento\Framework\Option\ArrayInterface{
Expand All @@ -14,8 +14,9 @@ public function toOptionArray()
{

return [
['value' => 0, 'label' => __('Blank Page')],
['value' => 1, 'label' => __('Admin')],
['value' => 0, 'label' => __('Blank page')],
['value' => 1, 'label' => __('Admin login')],
['value' => 2, 'label' => __('Specific URL')],
];
}
}
49 changes: 31 additions & 18 deletions Observer/DisableFrontend.php
Original file line number Diff line number Diff line change
@@ -1,18 +1,35 @@
<?php
namespace Abelbm\DisableFrontend\Observer;

namespace FocusriteNovation\DisableFrontend\Observer;

use FocusriteNovation\DisableFrontend\Helper\Data as DisableFrontendHelper;
use Magento\Framework\Event\ObserverInterface;
use Magento\Framework\App\ActionFlag;
use Magento\Framework\App\Action\Action;
use Magento\Framework\App\Response\RedirectInterface;
use Magento\Backend\Helper\Data;
use Abelbm\DisableFrontend\Helper\Data as DisableFrontendHelper;

class DisableFrontend implements ObserverInterface{
class DisableFrontend implements ObserverInterface {

protected $_actionFlag;
protected $redirect;
private $helperBackend;
private $logger;
private $disableFrontendHelper;
/**
* @var Magento\Framework\App\ActionFlag;
*/
protected $_actionFlag;

/**
* @var Magento\Framework\App\Response\RedirectInterface
*/
protected $redirect;

/**
* @var Magento\Backend\Helper\Data
*/
private $helperBackend;

/**
* @var FocusriteNovation\DisableFrontend\Helper\Data
*/
private $disableFrontendHelper;

/**
* DisableFrontend constructor.
Expand All @@ -22,19 +39,16 @@ class DisableFrontend implements ObserverInterface{
* @param RedirectInterface $redirect
* @param Data $helperBackend
* @param DisableFrontendHelper $disableFrontendHelper
* @param \Psr\Log\LoggerInterface $logger
*/
public function __construct(
ActionFlag $actionFlag,
RedirectInterface $redirect,
Data $helperBackend,
DisableFrontendHelper $disableFrontendHelper,
\Psr\Log\LoggerInterface $logger
) {
$this->_actionFlag = $actionFlag;
$this->redirect = $redirect;
$this->helperBackend = $helperBackend;
$this->logger = $logger;
$this->disableFrontendHelper = $disableFrontendHelper;
}

Expand All @@ -44,16 +58,15 @@ public function __construct(
* Stores > Configuration > Advanced > Admin > Disable Frontend
*
* @author Abel Bolanos Martinez <[email protected]>
* @param \Magento\Framework\Event\Observer $observer
* @param \Magento\Framework\Event\ObserverInterface $observer
* @return void
*/
public function execute(\Magento\Framework\Event\Observer $observer){

//$this->logger->info('TEST');

$this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
public function execute(ObserverInterface $observer)
{
$this->_actionFlag->set('', Action::FLAG_NO_DISPATCH, true);

if($this->disableFrontendHelper->getConfigValue()){//redirect to Admin
if ($this->disableFrontendHelper->getConfigValue() === 1) {
// Redirect to admin.
$controller = $observer->getControllerAction();
$this->redirect->redirect($controller->getResponse(),$this->helperBackend->getHomePageUrl());
}
Expand Down
33 changes: 18 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
## Disable Frontend in Magento 2
# Disable Frontend in Magento 2
Disable the frontend in Magento 2 for using only the Admin and the API routes.

#### 1 - Installation Disable Frontend
This was forked from [abelbm/magento2-disable-frontend](https://github.com/abelbm/magento2-disable-frontend)

##### Manual Installation
## 1. Install Disable Frontend

### Manual Installation

Install Disable Frontend for Magento2
* Download the extension
* Unzip the file
* Create a folder {Magento root}/app/code/Abelbm/DisableFrontend
* Create a folder {Magento root}/app/code/FocusriteNovation/DisableFrontend
* Copy the content from the unzip folder

### Using Composer

##### Using Composer

```
composer require abelbm/magento2-disablefrontend
```bash
$ composer require focusrite-novation/magento2-disablefrontend
```

#### 2 - Enable Disable Frontend
## 2. Enable Disable Frontend

* php bin/magento module:enable Abelbm_DisableFrontend
* php bin/magento setup:upgrade
* php bin/magento cache:flush
* php bin/magento setup:di:compile
```bash
$ php bin/magento module:enable FocusriteNovation_DisableFrontend
$ php bin/magento setup:upgrade
$ php bin/magento cache:flush
$ php bin/magento setup:di:compile
```

#### 3 - Change the frontend redirect
## 3. Change the frontend redirect

Stores > Configuration > Advanced > Admin > Disable Frontend
Stores > Configuration > Advanced > Admin > Disable Frontend

10 changes: 8 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "abelbm/magento2-disablefrontend",
"name": "focusrite-novation/magento2-disablefrontend",
"description": "Disable Frontend in Magento 2.",
"keywords": [
"magento 2",
Expand All @@ -22,14 +22,20 @@
"email": "[email protected]",
"homepage": "http://abelbolanos.blogspot.com/",
"role": "Developer"
},
{
"name": "Sophie Shanahan-Kluth",
"email": "[email protected]",
"homepage": "https://focusrite.com/",
"role": "Lead developer"
}
],
"autoload": {
"files": [
"registration.php"
],
"psr-4": {
"Abelbm\\DisableFrontend\\": ""
"FocusriteNovation\\DisableFrontend\\": ""
}
}
}
9 changes: 6 additions & 3 deletions etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
<system>
<section id="admin">
<group id="disable_frontend" translate="label" type="text" sortOrder="9999" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Disable Frontend</label>
<field id="show_as_frontend" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Disable frontend</label>
<field id="show_frontend_as" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Show frontend as</label>
<source_model>Abelbm\DisableFrontend\Model\Config\Source\Custom</source_model>
<source_model>FocusriteNovation\DisableFrontend\Model\Config\Source\Custom</source_model>
</field>
<field id="redirect_to" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Redirect to</label>
</field>
</group>
</section>
Expand Down
2 changes: 1 addition & 1 deletion etc/frontend/events.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
<event name="controller_action_predispatch">
<observer name="disable_frontend_observer" instance="Abelbm\DisableFrontend\Observer\DisableFrontend"/>
<observer name="disable_frontend_observer" instance="FocusriteNovation\DisableFrontend\Observer\DisableFrontend"/>
</event>
</config>
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Abelbm_DisableFrontend" setup_version="1.1.0">
<module name="FocusriteNovation_DisableFrontend" setup_version="1.1.0">
<sequence>
<module name="Magento_Store"/>
</sequence>
Expand Down
2 changes: 1 addition & 1 deletion registration.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

\Magento\Framework\Component\ComponentRegistrar::register(
\Magento\Framework\Component\ComponentRegistrar::MODULE,
'Abelbm_DisableFrontend',
'FocusriteNovation_DisableFrontend',
__DIR__
);

0 comments on commit b5c254d

Please sign in to comment.