Skip to content

Commit 1e95010

Browse files
committed
Use .twig to render the layout including package and bower information
1 parent 0e3aed1 commit 1e95010

File tree

9 files changed

+46
-67
lines changed

9 files changed

+46
-67
lines changed

Diff for: .bowerrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"directory": "web/js/vendor"
2+
"directory": "web/js/vendor/"
33
}

Diff for: app.js

+14-11
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,23 @@ var config = {
3232
static: {
3333
directory: __dirname + '/web/'
3434
}
35+
}],
36+
[require('dragonnodejs-webserver'), {
37+
bower: {
38+
libraries: ['bootstrap', 'jquery', 'angular'],
39+
path: __dirname + '/'
40+
},
41+
package: {
42+
path: __dirname + '/package.json'
43+
},
44+
swig: {
45+
views: __dirname + '/views/'
46+
}
3547
}]
3648
],
3749
directory: {
38-
config: {
39-
route: '/js/config.js',
40-
config: function () {
41-
var pkg = require(__dirname + '/package.json');
42-
return {
43-
name: pkg.name,
44-
version: pkg.version,
45-
homepage: pkg.homepage,
46-
server: process.env.SERVER
47-
};
48-
}()
50+
homepage: {
51+
server: process.env.SERVER
4952
}
5053
}
5154
}

Diff for: bower.json

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"name": "angularjs-skeleton",
33
"dependencies": {
4+
"bootstrap": "^3.3.1",
5+
"jquery": "^2.1.3",
6+
"angular": "^1.3.13",
47
"angular-bootstrap-show-errors": "^2.3.0",
58
"angular-route": "^1.3.15",
69
"angular-translate": "^2.6.0",

Diff for: js/app.js

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ var dependencies = [
99

1010
require('./controllers/homepage.js'),
1111

12-
require('./controllers/imprint.js'),
1312
require('./controllers/navigation.js')
1413
];
1514

Diff for: js/controllers/imprint.js

-18
This file was deleted.

Diff for: modules/config.js

-27
This file was deleted.

Diff for: modules/homepage.js

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
/**
4+
* Serves the homepage for the application
5+
* @example
6+
homepage: {
7+
server: process.env.SERVER
8+
}
9+
*/
10+
11+
module.exports = function (config, libraries, services) {
12+
var app = services.app;
13+
14+
app.get('/', function (req, res) {
15+
res.render('layout.html.twig', { server: config.server });
16+
});
17+
};

Diff for: package.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"dependencies": {
1515
"dragonnodejs": "^4.0.4",
1616
"dragonnodejs-express": "^2.1.1",
17+
"dragonnodejs-webserver": "^9.0.0",
1718
"bower": "^1.3.12",
1819
"browserify": "^8.1.3",
1920
"newrelic": "^1.15.1",

Diff for: web/index.html renamed to views/layout.html.twig

+10-9
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66
<title translate="title"></title>
7-
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet">
8-
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css" rel="stylesheet">
7+
<link href="//maxcdn.bootstrapcdn.com/bootstrap/{{ bower.bootstrap }}/css/bootstrap.min.css" rel="stylesheet">
8+
<link href="//maxcdn.bootstrapcdn.com/bootstrap/{{ bower.bootstrap }}/css/bootstrap-theme.min.css" rel="stylesheet">
99
<link href="/css/angular-bootstrap.css" rel="stylesheet">
1010
<link href="/css/angular-bootstrap-show-errors.css" rel="stylesheet">
1111
<link href="/css/sticky-footer.css" rel="stylesheet">
@@ -54,22 +54,23 @@ <h4 class="modal-title" id="imprintLabel" translate="imprint"></h4>
5454
5555
</address>
5656
</div>
57-
<div class="modal-footer" ng-controller="ImprintCtrl">
58-
<a ng-href="{{ config.homepage }}">{{ config.name }}</a> {{ config.version }},
59-
<span ng-if="server"><a ng-href="{{ server.homepage }}">{{ server.name }}</a> {{ server.version }},</span>
57+
<div class="modal-footer">
58+
<a href="{{ package.homepage }}">{{ package.name }}</a> {{ package.version }},
6059
<a href="http://dragonprojects.de">DragonProjects</a>
6160
</div>
6261
</div>
6362
</div>
6463
</div>
65-
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
66-
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
67-
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.13/angular.min.js"></script>
64+
<script src="//ajax.googleapis.com/ajax/libs/jquery/{{ bower.jquery }}/jquery.min.js"></script>
65+
<script src="//maxcdn.bootstrapcdn.com/bootstrap/{{ bower.bootstrap }}/js/bootstrap.min.js"></script>
66+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/{{ bower.angular }}/angular.min.js"></script>
6867
<script src="/js/vendor/angular-bootstrap-show-errors/src/showErrors.js"></script>
6968
<script src="/js/vendor/angular-route/angular-route.min.js"></script>
7069
<script src="/js/vendor/angular-translate/angular-translate.min.js"></script>
7170
<script src="/js/vendor/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>
72-
<script src="/js/config.js"></script>
71+
<script>
72+
var server = '{{ server }}';
73+
</script>
7374
<script src="/js/app.js"></script>
7475
</body>
7576
</html>

0 commit comments

Comments
 (0)