Skip to content

Commit

Permalink
Added SITE_URL environment variable and updated links in templates.
Browse files Browse the repository at this point in the history
  • Loading branch information
@justinhartman
justinhartman committed Oct 17, 2018
1 parent c7079d5 commit d7825ed
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 53 deletions.
4 changes: 4 additions & 0 deletions config/.env.default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
# @since 0.1.0
# @license https://opensource.org/licenses/AGPL-3.0 AGPL-3.0

# General Configuration
#######################
# export STORE_URL='http://localhost'

# Database configuration
########################
# export DB_HOST='localhost'
Expand Down
4 changes: 4 additions & 0 deletions config/.env.prod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
# @since 0.1.0
# @license https://opensource.org/licenses/AGPL-3.0 AGPL-3.0

# General Configuration
#######################
# export STORE_URL='http://localhost'

# Database configuration
########################
# export DB_HOST='localhost'
Expand Down
2 changes: 1 addition & 1 deletion config/bootstrap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
$dotenv = new Dotenv\Dotenv(CONFIG, '.env');
$dotenv->load();
// Check that the following variables have been defined.
$dotenv->required(['DB_HOST', 'DB_USERNAME', 'DB_PASSWORD', 'DB_DATABASE']);
$dotenv->required(['DB_HOST', 'DB_USERNAME', 'DB_PASSWORD', 'DB_DATABASE', 'STORE_URL']);
}

/**
Expand Down
50 changes: 24 additions & 26 deletions inc/footer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,38 @@
<div class="col-md-6">
<p>Copyright &copy; 2018 Copyright Holder All Rights Reserved.</p>
</div>
<div class="col-md-6">
</div>
<div class="col-md-6"></div>
</div>
</div>
</footer>
<!-- FOOTER -->
</div>

<!-- Javascript -->
<script src="js/jquery.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/dialogFx.js"></script>
<script src="js/dialog-js.js"></script>
<script src="js/navigation/jquery.easing.js"></script>
<script src="js/flexslider/jquery.flexslider.js"></script>
<script src="js/navigation/scroll.js"></script>
<script src="js/navigation/jquery.sticky.js"></script>
<script src="js/owl-carousel/owl.carousel.min.js"></script>
<script src="js/isotope/isotope.pkgd.js"></script>
<script src="js/superfish/js/hoverIntent.js"></script>
<script src="js/superfish/js/superfish.js"></script>
<script src="js/tweecool.js"></script>
<script src="js/jquery.bpopup.js"></script>
<script src="js/pikaday/pikaday.js"></script>
<script src="js/classie.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/jquery.min.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/bootstrap.min.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/dialogFx.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/dialog-js.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/navigation/jquery.easing.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/flexslider/jquery.flexslider.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/navigation/scroll.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/navigation/jquery.sticky.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/owl-carousel/owl.carousel.min.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/isotope/isotope.pkgd.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/superfish/js/hoverIntent.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/superfish/js/superfish.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/tweecool.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/jquery.bpopup.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/pikaday/pikaday.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/classie.js"></script>
<script src="http://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
<script src="js/rs-plugin/js/jquery.themepunch.tools.min.js"></script>
<script src="js/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
<script src="js/jquery.prettyphoto.js"></script>
<script src="js/script.js"></script>
<script src="js/booking.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/rs-plugin/js/jquery.themepunch.tools.min.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/jquery.prettyphoto.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/script.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/booking.js"></script>
<script src="https://maps.googleapis.com/maps/api/js?sensor=false"></script>
<script src="js/gmap.js"></script>
<script src="js/gmap2.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/gmap.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/gmap2.js"></script>
</body>
</html>
46 changes: 20 additions & 26 deletions inc/header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,31 @@
<!--[if IE 9]> <html class="ie ie9"> <![endif]-->
<!--[if gt IE 9]><!--> <html> <!--<![endif]-->
<head>
<!-- Meta -->
<meta charset="utf-8">
<meta name="keywords" content="HTML5 Template" />
<title>Shop Home Page - PHP Ecommerce</title>
<meta name="description" content="">
<meta name="keywords" content="">
<meta name="author" content="">
<title>Shop Home Page - PHP Ecommerce</title>
<!-- Mobile Metas -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Favicon -->
<link rel="shortcut icon" href="images/favicon.png">
<link rel="shortcut icon" href="<?php echo getenv('STORE_URL'); ?>/images/favicon.png">

<!-- CSS -->
<link rel="stylesheet" href="css/bootstrap.css">
<link rel="stylesheet" href="font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="js/isotope/isotope.css">
<link rel="stylesheet" href="js/flexslider/flexslider.css">
<link rel="stylesheet" href="js/owl-carousel/owl.carousel.css">
<link rel="stylesheet" href="js/owl-carousel/owl.theme.css">
<link rel="stylesheet" href="js/owl-carousel/owl.transitions.css">
<link rel="stylesheet" href="js/superfish/css/megafish.css" media="screen">
<link rel="stylesheet" href="js/superfish/css/superfish.css" media="screen">
<link rel="stylesheet" href="js/pikaday/pikaday.css">
<link rel="stylesheet" href="css/settings-panel.css">
<link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" href="css/light.css">
<link rel="stylesheet" href="css/responsive.css">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/css/bootstrap.css">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/js/isotope/isotope.css">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/js/flexslider/flexslider.css">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/js/owl-carousel/owl.carousel.css">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/js/owl-carousel/owl.theme.css">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/js/owl-carousel/owl.transitions.css">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/js/superfish/css/megafish.css" media="screen">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/js/superfish/css/superfish.css" media="screen">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/js/pikaday/pikaday.css">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/css/settings-panel.css">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/css/style.css">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/css/light.css">
<link rel="stylesheet" href="<?php echo getenv('STORE_URL'); ?>/css/responsive.css">

<!-- JS Font Script -->
<script src="http://use.edgefonts.net/bebas-neue.js"></script>
Expand All @@ -44,7 +40,7 @@
<![endif]-->

<!-- Modernizer -->
<script src="js/modernizr.custom.js"></script>
<script src="<?php echo getenv('STORE_URL'); ?>/js/modernizr.custom.js"></script>
</head>
<body class="multi-page">
<div id="wrapper" class="wrapper">
Expand All @@ -53,11 +49,9 @@
<div class="container">
<div class="row">
<div class="col-md-3 col-xs-5 logo">
<a href="http://localhost/ecomphp/index.php"><img src="http://[::1]/cishop/assets/images/logo.png" class="img-responsive" alt=""/></a>
<a href="<?php echo getenv('STORE_URL'); ?>/index.php"><img src="https://via.placeholder.com/276x100" class="img-responsive" alt=""/></a>
</div>
<div class="col-md-9 col-xs-7">
<div class="top-bar">
</div>
<div class="top-bar"></div>
</div>
</div>

0 comments on commit d7825ed

Please sign in to comment.