Skip to content

Commit

Permalink
Start Face and Figure Salon theme
Browse files Browse the repository at this point in the history
  • Loading branch information
portchris committed Feb 11, 2019
1 parent f0a613a commit a97164c
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 2 deletions.
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ services:
- nr_mysql
ports:
- 9000:9000
- 3000:3000
volumes:
- ./env/composer:/home/www/.composer
- ./env/global/bashrc:/home/www/.bashrc
Expand Down
21 changes: 21 additions & 0 deletions env/nginx/webserver/conf.d/naturalremedy.portchris.co.uk.template
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,27 @@ server {
}
}

server {

listen 8080;
listen [::]:8080;

server_name faceandfigure.portchris.co.uk;

set $MAGE_ROOT /home/www/naturalremedy/src;
set $code faceandfigure;

root $MAGE_ROOT;
index index.php;

include /etc/nginx/defaults/magento1.conf;
include /etc/nginx/global/php72.conf;

location / {
try_files $uri $uri/ /index.php$is_args$args;
}
}

# server {

# # SSL configuration
Expand Down
11 changes: 9 additions & 2 deletions env/php72/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,14 @@ RUN apt-get update && \
autoconf \
libc-dev \
pkg-config \
libmcrypt-dev
libmcrypt-dev \
software-properties-common

# Install NPM & Node.Js
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
RUN apt-get update && \
apt-get install -y --no-install-recommends \
nodejs

# Install mcrypt (legacy for M1)
RUN pecl install mcrypt-1.0.1
Expand Down Expand Up @@ -107,7 +114,7 @@ RUN curl -sS -o n98-magerun.phar https://files.magerun.net/n98-magerun.phar &&
chmod +x n98-magerun.phar && \
mv n98-magerun.phar /usr/local/bin/n98-magerun.phar

EXPOSE 9000
EXPOSE 9000 3000

# Install Ioncube
# RUN bash /scripts/install-ioncube.sh
Expand Down
30 changes: 30 additions & 0 deletions src/app/design/frontend/rwd_faceandfigure/default/etc/theme.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0"?>
<!--
/**
* Magento
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE_AFL.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
* @package rwd_default
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<theme>
<parent>rwd_hannasherbs/default</parent>
</theme>
Submodule faceandfigure added at 92fcc4
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?php
/**
* Magento
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE_AFL.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
* @package rwd_default
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php
/**
* Template for Mage_Page_Block_Html
*/
?>

<!DOCTYPE html>

<!--[if lt IE 7 ]> <html lang="en" id="top" class="no-js ie6"> <![endif]-->
<!--[if IE 7 ]> <html lang="en" id="top" class="no-js ie7"> <![endif]-->
<!--[if IE 8 ]> <html lang="en" id="top" class="no-js ie8"> <![endif]-->
<!--[if IE 9 ]> <html lang="en" id="top" class="no-js ie9"> <![endif]-->
<!--[if (gt IE 9)|!(IE)]><!--> <html lang="en" id="top" class="no-js"> <!--<![endif]-->

<head>
<?php echo $this->getChildHtml('head') ?>
</head>
<body class="page-empty <?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>">
<h1>HERE</h1>
<div>
<?php echo $this->getChildHtml('after_body_start') ?>
<?php echo $this->getChildHtml('global_messages') ?>
<?php echo $this->getChildHtml('content') ?>
<?php echo $this->getChildHtml('before_body_end') ?>
<?php echo $this->getAbsoluteFooter() ?>
</div>

<!-- Load React. -->
<!-- Note: when deploying, replace "development.js" with "production.min.js". -->
<script src="https://unpkg.com/react@16/umd/react.production.min.js" crossorigin></script>
<script src="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js" crossorigin></script>
</body>
</html>

0 comments on commit a97164c

Please sign in to comment.