Skip to content

Commit

Permalink
fixed localhost static files issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@seanmavley
seanmavley committed Nov 13, 2017
1 parent fc078b7 commit 458c0e8
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 55 deletions.
2 changes: 1 addition & 1 deletion app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ app.use(logger('dev'));
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: false }));
app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public')));
app.use('/public', express.static(path.join(__dirname, 'public')));

app.use('/', index);

Expand Down
106 changes: 52 additions & 54 deletions views/layout.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,74 +2,72 @@
<html lang="en">

<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>{% block title %} Override {% endblock %} - It's AlwaysOn</title>
<link rel="icon" href="assets/favico.png" sizes="32x32">
<!-- Bootstrap -->
<link href="../public/vendor/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="../public/vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="./public/vendor/bootstrap/dist/css/bootstrap.min.css">

<link href="./public/assets/style.css" rel="stylesheet">
{% block extra_head %}
{% endblock %}
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>{% block title %} Override {% endblock %} - It's AlwaysOn</title>
<link rel="icon" href="assets/favico.png" sizes="32x32">
<!-- Bootstrap -->
<link href="../public/vendor/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="../public/vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="../public/vendor/bootstrap/dist/css/bootstrap.min.css">
<link href="./public/assets/style.css" rel="stylesheet"> {% block extra_head %} {% endblock %}
</head>

<body>
<nav class="navbar fixed-top navbar-toggleable-md navbar-inverse bg-inverse">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="/">
<nav class="navbar fixed-top navbar-toggleable-md navbar-inverse bg-inverse">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="/">
AlwaysOn WiFi
</a>
<div class="container">
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="/">Welcome</a>
</li>
</ul>
<span class="navbar-text">
<div class="container">
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="/">Welcome</a>
</li>
</ul>
<span class="navbar-text">
<a href="/check-voucher" class="btn btn-warning btn-sm">Check Bundle</a>
</span>
</div>
</div>
</div>
</nav>
{% block slider %} Slider Here {% endblock %}
<div class="container" style="margin-top:50px;">
{% block content %} Override here {% endblock %}
</div>
</nav>
{% block slider %}
Slider Here
{% endblock %}
<div class="container" style="margin-top:50px;">
{% block content %}
Override here
{% endblock %}
</div>
<footer class="footer" style="margin-top:3rem;">
<div class="container">
<span class="text-muted">
<footer class="footer" style="margin-top:3rem;">
<div class="container">
<span class="text-muted">
<script type="text/javascript">
document.write(new Date().getFullYear());
</script>
AlwaysOn WiFi is a project of <a href="http://theafricandream.co" target="new">TheAfricanDream LLC</a>, a US-Based organization.</span>
</div>
</footer>
<!-- jQuery first, then Tether, then Bootstrap JS. -->
<script src="./public/vendor/jquery/dist/jquery.min.js"></script>
<script src="./public/vendor/tether/dist/js/tether.min.js"></script>
<script src="./public/vendor/bootstrap/dist/js/bootstrap.min.js"></script>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
</div>
</footer>
<!-- jQuery first, then Tether, then Bootstrap JS. -->
<script src="../public/vendor/jquery/dist/jquery.min.js"></script>
<script src="../public/vendor/tether/dist/js/tether.min.js"></script>
<script src="../public/vendor/bootstrap/dist/js/bootstrap.min.js"></script>
<script>
(function(i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function() {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
a = s.createElement(o),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
ga('create', 'UA-59418377-1', 'auto');
ga('send', 'pageview');
</script>
</script>
</body>

</html>

</html>

0 comments on commit 458c0e8

Please sign in to comment.