-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Start react web app, adjust controller to receive public store info
- Loading branch information
Showing
11 changed files
with
88 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[submodule "src/app/design/frontend/rwd_faceandfigure/default/faceandfigure"] | ||
path = src/app/design/frontend/rwd_faceandfigure/default/faceandfigure | ||
url = [email protected]:portchris/faceandfiguresalon.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,4 @@ | ||
# M1 API | ||
location /api { | ||
rewrite ^/api/rest /api.php?type=rest last; | ||
rewrite ^/api/v2_soap /api.php?type=v2_soap last; | ||
rewrite ^/api/soap /api.php?type=soap last; | ||
rewrite ^/api/xmlrpc /api.php?type=xmlrpc last; | ||
rewrite ^/api.php/ /api.php last; | ||
rewrite ^/api/(\w+).*$ /api.php?type=$1 last; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 0 additions & 35 deletions
35
src/app/code/local/NaturalRemedyCo/FaceAndFigure/etc/api2.xml
This file was deleted.
Oops, something went wrong.
37 changes: 33 additions & 4 deletions
37
src/app/code/local/NaturalRemedyCo/NRCLayout/controllers/IndexController.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,37 @@ | ||
<?php | ||
class NaturalRemedyCo_NRCLayout_IndexController extends Mage_Core_Controller_Front_Action { | ||
public function indexAction() { | ||
$date = date('Y-m-d'); | ||
echo "Hello todays date is $date"; | ||
/** | ||
* Public store inforamtion in JSON format | ||
* | ||
* @author Chris Rogers | ||
* @since 2019-02-22 | ||
*/ | ||
|
||
class NaturalRemedyCo_NRCLayout_IndexController extends Mage_Core_Controller_Front_Action | ||
{ | ||
/** | ||
* @var Mage_Core_Model_Store | ||
*/ | ||
protected $_store; | ||
|
||
/** | ||
* Magento's specific construtor (notice the single underscore) | ||
*/ | ||
public function _construct() | ||
{ | ||
$this->_store = Mage::app()->getStore(); | ||
} | ||
|
||
/** | ||
* Return store info as JSON using layout file <info_index_index> | ||
* @return JSON | ||
* @see Useful debugging: "Zend_Debug::dump($this->getLayout()->getUpdate()->getHandles()); exit;" | ||
*/ | ||
public function indexAction() | ||
{ | ||
$this->getResponse()->setHeader('Content-type', 'application/json'); | ||
$this->loadLayout(); | ||
// $this->getResponse()->setBody(); | ||
$this->renderLayout(); | ||
} | ||
} | ||
?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
src/app/design/frontend/rwd_faceandfigure/default/faceandfiguresalon
Submodule faceandfiguresalon
added at
6df4ec
9 changes: 7 additions & 2 deletions
9
src/app/design/frontend/rwd_faceandfigure/default/layout/faceandfigure.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,18 @@ | ||
<?xml version="1.0" encoding="UTF-8" ?> | ||
<layout> | ||
<page_empty> | ||
<reference name="content"> | ||
</page_empty> | ||
<nrc_layout_index_index> | ||
<reference name="root"> | ||
<action method="setTemplate"> | ||
<template>faceandfigure/main.phtml</template> | ||
</action> | ||
<block type="faceandfigure/hero" name="hero" as="hero" template="faceandfigure/hero.phtml" before="-" /> | ||
<block type="faceandfigure/header" name="header" as="header" template="faceandfigure/header.phtml" before="hero" /> | ||
<block type="faceandfigure/main" name="main" as="main" template="faceandfigure/main.phtml" /> | ||
<block type="faceandfigure/treatments" name="treatments" as="treatments" template="faceandfigure/treatments.phtml" /> | ||
<block type="faceandfigure/contact" name="contact" as="contact" template="faceandfigure/contact.phtml" /> | ||
<block type="faceandfigure/footer" name="footer" as="footer" template="faceandfigure/footer.phtml" /> | ||
</reference> | ||
</page_empty> | ||
</nrc_layout_index_index> | ||
</layout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters