Skip to content

Commit bb8cebe

Browse files
gstfgstf
committed
more fixes for resource deployment
1 parent fab3343 commit bb8cebe

File tree

14 files changed

+52
-74
lines changed

14 files changed

+52
-74
lines changed

‎Gruntfile.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ module.exports = function (grunt) {
143143
src: [
144144
'<%= yeoman.dist %>/scripts/{,*/}*.js',
145145
'<%= yeoman.dist %>/styles/{,*/}*.css',
146-
'<%= yeoman.dist %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
146+
'<%= yeoman.dist %>/images/*.{png,jpg,jpeg,gif,webp,svg}',
147147
'<%= yeoman.dist %>/styles/fonts/*'
148148
]
149149
}
@@ -229,7 +229,8 @@ module.exports = function (grunt) {
229229
'.htaccess',
230230
'bower_components/**/*',
231231
'images/{,*/}*.{gif,webp}',
232-
'fonts/*'
232+
'fonts/*',
233+
'resources/*'
233234
]
234235
}, {
235236
expand: true,

‎app/images/00.jpg ‎app/images/cover/00.jpg

File renamed without changes.

‎app/images/01.jpg ‎app/images/cover/01.jpg

File renamed without changes.

‎app/images/02.jpg ‎app/images/cover/02.jpg

File renamed without changes.

‎app/images/03.jpg ‎app/images/cover/03.jpg

File renamed without changes.

‎app/images/04.jpg ‎app/images/cover/04.jpg

File renamed without changes.

‎app/images/05.jpg ‎app/images/cover/05.jpg

File renamed without changes.

‎app/images/06.jpg ‎app/images/cover/06.jpg

File renamed without changes.

‎app/images/07.jpg ‎app/images/cover/07.jpg

File renamed without changes.

‎app/images/08.jpg ‎app/images/cover/08.jpg

File renamed without changes.

‎app/index.html

+42-63
Original file line numberDiff line numberDiff line change
@@ -9,78 +9,57 @@
99
<title>Hellberg</title>
1010
<meta name="description" content="">
1111
<meta name="viewport" content="width=device-width">
12-
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
1312

14-
<!-- build:css(.tmp) styles/main.css -->
15-
<link rel="stylesheet" href="styles/bootstrap.css">
16-
<link rel="stylesheet" href="styles/main.css">
17-
<!-- endbuild -->
13+
<!-- build:css(.tmp) styles/main.css -->
14+
<link rel="stylesheet" href="styles/bootstrap.css">
15+
<link rel="stylesheet" href="styles/main.css">
16+
<!-- endbuild -->
1817
</head>
19-
<body ng-app="hellbergApp">
20-
<!--[if lt IE 7]>
21-
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
22-
<![endif]-->
23-
24-
<!--[if lt IE 9]>
25-
<script src="bower_components/es5-shim/es5-shim.js"></script>
26-
<script src="bower_components/json3/lib/json3.min.js"></script>
27-
<![endif]-->
28-
29-
<!-- Add your site or application content here -->
30-
<div ng-view=""></div>
18+
<body ng-app="hellbergApp">
19+
<!--[if lt IE 10]>
20+
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
21+
<![endif]-->
3122

32-
<script src="bower_components/jquery/jquery.js"></script>
33-
<script src="bower_components/angular/angular.js"></script>
34-
<script src="//maps.googleapis.com/maps/api/js?libraries=places,geometry&sensor=false"></script>
35-
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
23+
<div ng-view=""></div>
3624

37-
<!-- build:js scripts/plugins.js -->
38-
<script src="bower_components/sass-bootstrap/js/affix.js"></script>
39-
<script src="bower_components/sass-bootstrap/js/alert.js"></script>
40-
<script src="bower_components/sass-bootstrap/js/button.js"></script>
41-
<script src="bower_components/sass-bootstrap/js/carousel.js"></script>
42-
<script src="bower_components/sass-bootstrap/js/transition.js"></script>
43-
<script src="bower_components/sass-bootstrap/js/collapse.js"></script>
44-
<script src="bower_components/sass-bootstrap/js/dropdown.js"></script>
45-
<script src="bower_components/sass-bootstrap/js/modal.js"></script>
46-
<script src="bower_components/sass-bootstrap/js/scrollspy.js"></script>
47-
<script src="bower_components/sass-bootstrap/js/tab.js"></script>
48-
<script src="bower_components/sass-bootstrap/js/tooltip.js"></script>
49-
<script src="bower_components/sass-bootstrap/js/popover.js"></script>
25+
<script src="//maps.googleapis.com/maps/api/js?libraries=places,geometry&sensor=false"></script>
26+
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
5027

51-
<script src="bower_components/levenshtein/lib/levenshtein.js"></script>
52-
<script src="bower_components/sprintf/src/sprintf.js"></script>
53-
<script src="libs/Hyperlapse.js/examples/js/three.min.js"></script>
54-
<script src="libs/Hyperlapse.js/examples/js/GSVPano.js"></script>
55-
<script src="libs/Hyperlapse.js/src/Hyperlapse.js"></script>
56-
<!-- endbuild -->
28+
<!-- build:js scripts/libs.js -->
29+
<script src="bower_components/angular/angular.js"></script>
30+
<script src="bower_components/levenshtein/lib/levenshtein.js"></script>
31+
<script src="bower_components/sprintf/src/sprintf.js"></script>
32+
<script src="libs/Hyperlapse.js/examples/js/three.min.js"></script>
33+
<script src="libs/Hyperlapse.js/examples/js/GSVPano.js"></script>
34+
<script src="libs/Hyperlapse.js/src/Hyperlapse.js"></script>
35+
<!-- endbuild -->
5736

58-
<!-- build:js scripts/modules.js -->
59-
<script src="bower_components/angular-resource/angular-resource.js"></script>
60-
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
61-
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
62-
<script src="bower_components/angular-route/angular-route.js"></script>
63-
<script src="libs/ngAutocomplete/src/ngAutocomplete.js"></script>
64-
<!-- endbuild -->
37+
<!-- build:js scripts/modules.js -->
38+
<script src="bower_components/angular-resource/angular-resource.js"></script>
39+
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
40+
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
41+
<script src="bower_components/angular-route/angular-route.js"></script>
42+
<script src="libs/ngAutocomplete/src/ngAutocomplete.js"></script>
43+
<!-- endbuild -->
6544

66-
<!-- build:js({.tmp,app}) scripts/scripts.js -->
67-
<script src="scripts/app.js"></script>
45+
<!-- build:js({.tmp,app}) scripts/scripts.js -->
46+
<script src="scripts/app.js"></script>
6847

69-
<script src="scripts/models/answer.js"></script>
70-
<script src="scripts/models/question-template.js"></script>
71-
<script src="scripts/models/question.js"></script>
72-
<script src="scripts/models/question-set.js"></script>
73-
<script src="scripts/models/trip-location.js"></script>
48+
<script src="scripts/models/answer.js"></script>
49+
<script src="scripts/models/question-template.js"></script>
50+
<script src="scripts/models/question.js"></script>
51+
<script src="scripts/models/question-set.js"></script>
52+
<script src="scripts/models/trip-location.js"></script>
7453

75-
<script src="libs/txtwiki/txtwiki.js"></script>
76-
<script src="scripts/services/question-factory.js"></script>
77-
<script src="scripts/services/route-loader.js"></script>
78-
<script src="scripts/services/speak.js"></script>
79-
<script src="scripts/services/soundtrack.js"></script>
54+
<script src="libs/txtwiki/txtwiki.js"></script>
55+
<script src="scripts/services/question-factory.js"></script>
56+
<script src="scripts/services/route-loader.js"></script>
57+
<script src="scripts/services/speak.js"></script>
58+
<script src="scripts/services/soundtrack.js"></script>
8059

81-
<script src="scripts/controllers/main.js"></script>
82-
<script src="scripts/controllers/trip.js"></script>
83-
<script src="scripts/controllers/result.js"></script>
84-
<!-- endbuild -->
60+
<script src="scripts/controllers/main.js"></script>
61+
<script src="scripts/controllers/trip.js"></script>
62+
<script src="scripts/controllers/result.js"></script>
63+
<!-- endbuild -->
8564
</body>
8665
</html>

‎app/scripts/controllers/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
angular.module('hellbergApp')
44
.controller('MainCtrl', ['$scope', '$location', function($scope, $location) {
5-
$scope.img_index = '0' + Math.floor(Math.round(Math.random() * 9));
5+
$scope.bg_image = 'images/cover/0' + Math.floor(Math.round(Math.random() * 9)) + '.jpg';
66
$scope.detail1 = null;
77
$scope.detail2 = null;
88
$scope.options = { types: '(cities)' };

‎app/views/main.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
<div class="coverbg" style="background-image: url('images/{{ img_index }}.jpg')">
2+
<div class="coverbg" style="background-image: url({{ bg_image }})">
33

44
<div class="container dest-wrap">
55
<div class="row">
@@ -13,12 +13,12 @@ <h1>Where to go?</h1>
1313
<div class="form-group">
1414
<form role="form">
1515
<div class="form-group">
16-
<label for="exampleInputEmail1">Departure</label>
17-
<input type="text" class="form-control input-lg" ng-autocomplete="name1" details="detail1" options="options" placeholder="Berlin" />
16+
<label for="departure">Departure</label>
17+
<input type="text" class="form-control input-lg" id="departure" ng-autocomplete="name1" details="detail1" options="options" placeholder="Berlin" />
1818
</div>
1919
<div class="form-group">
20-
<label for="exampleInputEmail1">Destination</label>
21-
<input type="text" class="form-control input-lg" ng-autocomplete="name2" details="detail2" options="options" placeholder="Hamburg" />
20+
<label for="destination">Destination</label>
21+
<input type="text" class="form-control input-lg" id="destination" ng-autocomplete="name2" details="detail2" options="options" placeholder="Hamburg" />
2222
</div>
2323
<a class="btn btn-primary btn-lg" ng-click="trip()">Go!</a>
2424
</form>

‎bower.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
{
22
"name": "hellberg",
3-
"version": "0.0.0",
3+
"version": "0.1.0",
44
"dependencies": {
55
"angular": "~1.2.0",
6-
"json3": "~3.2.4",
76
"jquery": "~1.10.0",
87
"sass-bootstrap": "~3.0.0",
9-
"es5-shim": "~2.1.0",
108
"angular-resource": "~1.2.0",
119
"angular-cookies": "~1.2.0",
1210
"angular-sanitize": "~1.2.0",

0 commit comments

Comments
 (0)