Skip to content

Commit 1a89241

Browse files
author
Aeneas Rekkas
committed
Continued assignment
1 parent 32369b0 commit 1a89241

File tree

9 files changed

+93
-80
lines changed

9 files changed

+93
-80
lines changed

‎Gruntfile.js

+66-66
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,34 @@ module.exports = function (grunt) {
2020
};
2121

2222
grunt.initConfig({
23-
stormcall: config,
23+
stargazer: config,
2424
watch: {
2525
compass: {
26-
files: ['<%= stormcall.app %>/styles/{,*/}*.{scss,sass}'],
26+
files: ['<%= stargazer.app %>/styles/{,*/}*.{scss,sass}'],
2727
tasks: ['compass:server', 'autoprefixer', 'clean:dist', 'copy:dist', 'copy:images']
2828
},
2929
styles: {
30-
files: ['<%= stormcall.app %>/styles/{,*/}*.css'],
30+
files: ['<%= stargazer.app %>/styles/{,*/}*.css'],
3131
tasks: ['copy:styles', 'autoprefixer', 'clean:dist', 'copy:dist', 'copy:images']
3232
},
3333
jsLang: {
34-
files: ['<%= stormcall.app %>/lang/*'],
34+
files: ['<%= stargazer.app %>/lang/*'],
3535
tasks: ['i18n', 'clean:dist', 'copy:dist', 'copy:images']
3636
},
3737
scripts: {
38-
files: ['<%= stormcall.app %>/scripts/{,*/}*.js', '<%= stormcall.app %>/**/*.js'],
38+
files: ['<%= stargazer.app %>/scripts/{,*/}*.js', '<%= stargazer.app %>/**/*.js'],
3939
tasks: ['jshint', 'copy:requirejs', 'requirejs:production', 'clean:dist', 'copy:dist', 'copy:images'],
4040
options: {
4141
// Start a live reload server on the default port 35729
4242
livereload: true
4343
}
4444
},
4545
images: {
46-
files: ['<%= stormcall.app %>/images/{,*/}*.{png,jpg,jpeg}'],
46+
files: ['<%= stargazer.app %>/images/{,*/}*.{png,jpg,jpeg}'],
4747
tasks: ['imagemin', 'clean:dist', 'copy:dist', 'copy:images']
4848
},
4949
fonts: {
50-
files: ['<%= stormcall.app %>/styles/fonts/*'],
50+
files: ['<%= stargazer.app %>/styles/fonts/*'],
5151
tasks: ['copy:tmp', 'clean:dist', 'copy:dist', 'copy:images']
5252
}
5353
},
@@ -56,52 +56,52 @@ module.exports = function (grunt) {
5656
files: [{
5757
dot: true,
5858
src: [
59-
'<%= stormcall.tmp %>/*',
60-
'!<%= stormcall.tmp %>/.git*'
59+
'<%= stargazer.tmp %>/*',
60+
'!<%= stargazer.tmp %>/.git*'
6161
]
6262
}]
6363
},
6464
dist: {
6565
files: [{
6666
dot: true,
6767
src: [
68-
'<%= stormcall.dist %>/*',
69-
'!<%= stormcall.dist %>/.git*'
68+
'<%= stargazer.dist %>/*',
69+
'!<%= stargazer.dist %>/.git*'
7070
]
7171
}]
7272
},
73-
server: '<%= stormcall.tmp %>'
73+
server: '<%= stargazer.tmp %>'
7474
},
7575
jshint: {
7676
options: {
7777
jshintrc: '.jshintrc',
7878
ignores: [
79-
'<%= stormcall.app %>/scripts/thirdparty/{,*/}*.js',
80-
'<%= stormcall.app %>/scripts/modules/stormcall_i18n.js',
81-
'<%= stormcall.app %>/scripts/libs/polyfills.js'
79+
'<%= stargazer.app %>/scripts/thirdparty/{,*/}*.js',
80+
'<%= stargazer.app %>/scripts/modules/stargazer_i18n.js',
81+
'<%= stargazer.app %>/scripts/libs/polyfills.js'
8282
]
8383
},
8484
all: [
85-
'<%= stormcall.app %>/scripts/{,*/}*.js'
85+
'<%= stargazer.app %>/scripts/{,*/}*.js'
8686
]
8787
},
8888
compass: {
8989
options: {
90-
sassDir: '<%= stormcall.app %>/styles',
91-
cssDir: '<%= stormcall.tmp %>/styles',
92-
generatedImagesDir: '<%= stormcall.tmp %>/images/generated',
93-
imagesDir: '<%= stormcall.app %>/images',
94-
javascriptsDir: '<%= stormcall.app %>/scripts',
95-
fontsDir: '<%= stormcall.app %>/styles/fonts',
96-
importPath: '<%= stormcall.app %>/bower_components',
90+
sassDir: '<%= stargazer.app %>/styles',
91+
cssDir: '<%= stargazer.tmp %>/styles',
92+
generatedImagesDir: '<%= stargazer.tmp %>/images/generated',
93+
imagesDir: '<%= stargazer.app %>/images',
94+
javascriptsDir: '<%= stargazer.app %>/scripts',
95+
fontsDir: '<%= stargazer.app %>/styles/fonts',
96+
importPath: '<%= stargazer.app %>/bower_components',
9797
httpImagesPath: '/images',
9898
httpGeneratedImagesPath: '/images/generated',
9999
httpFontsPath: '/styles/fonts',
100100
relativeAssets: false
101101
},
102102
tmp: {
103103
options: {
104-
generatedImagesDir: '<%= stormcall.tmp %>/images/generated'
104+
generatedImagesDir: '<%= stargazer.tmp %>/images/generated'
105105
}
106106
},
107107
server: {
@@ -117,16 +117,16 @@ module.exports = function (grunt) {
117117
tmp: {
118118
files: [{
119119
expand: true,
120-
cwd: '<%= stormcall.tmp %>/styles/',
120+
cwd: '<%= stargazer.tmp %>/styles/',
121121
src: '{,*/}*.css',
122-
dest: '<%= stormcall.tmp %>/styles/'
122+
dest: '<%= stargazer.tmp %>/styles/'
123123
}]
124124
}
125125
},
126126
'bower-install': {
127127
app: {
128-
html: '<%= stormcall.app %>/index.html',
129-
ignorePath: '<%= stormcall.app %>/'
128+
html: '<%= stargazer.app %>/index.html',
129+
ignorePath: '<%= stargazer.app %>/'
130130
}
131131
},
132132
uglify: {
@@ -146,40 +146,40 @@ module.exports = function (grunt) {
146146
mangle: true
147147
},
148148
// files: {
149-
// '<%= stormcall.tmp %>/scripts/main.js': '<%= stormcall.tmp %>/scripts/main.js'
149+
// '<%= stargazer.tmp %>/scripts/main.js': '<%= stargazer.tmp %>/scripts/main.js'
150150
// }
151151
files: [{
152-
'<%= stormcall.tmp %>/scripts/main.js': '<%= stormcall.tmp %>/scripts/main.js',
153-
'<%= stormcall.tmp %>/bower_components/requirejs/require.js': '<%= stormcall.tmp %>/bower_components/requirejs/require.js'
152+
'<%= stargazer.tmp %>/scripts/main.js': '<%= stargazer.tmp %>/scripts/main.js',
153+
'<%= stargazer.tmp %>/bower_components/requirejs/require.js': '<%= stargazer.tmp %>/bower_components/requirejs/require.js'
154154
}]
155155
}
156156
},
157157
imagemin: {
158158
tmp: {
159159
files: [{
160160
expand: true,
161-
cwd: '<%= stormcall.app %>/images',
161+
cwd: '<%= stargazer.app %>/images',
162162
src: '{,*/}*.{png,jpg,jpeg}',
163-
dest: '<%= stormcall.tmp %>/images'
163+
dest: '<%= stargazer.tmp %>/images'
164164
}]
165165
}
166166
},
167167
svgmin: {
168168
tmp: {
169169
files: [{
170170
expand: true,
171-
cwd: '<%= stormcall.app %>/images',
171+
cwd: '<%= stargazer.app %>/images',
172172
src: '{,*/}*.svg',
173-
dest: '<%= stormcall.tmp %>/images'
173+
dest: '<%= stargazer.tmp %>/images'
174174
}]
175175
}
176176
},
177177
cssmin: {
178178
minify: {
179179
expand: true,
180-
cwd: '<%= stormcall.tmp %>/styles/',
180+
cwd: '<%= stargazer.tmp %>/styles/',
181181
src: ['*.css', '!*.min.css'],
182-
dest: '<%= stormcall.tmp %>/styles/',
182+
dest: '<%= stargazer.tmp %>/styles/',
183183
ext: '.css'
184184
}
185185
},
@@ -189,8 +189,8 @@ module.exports = function (grunt) {
189189
files: [{
190190
expand: true,
191191
dot: true,
192-
cwd: '<%= stormcall.app %>',
193-
dest: '<%= stormcall.tmp %>',
192+
cwd: '<%= stargazer.app %>',
193+
dest: '<%= stargazer.tmp %>',
194194
src: [
195195
'.htaccess',
196196
'styles/fonts/{,*/}*.*',
@@ -202,8 +202,8 @@ module.exports = function (grunt) {
202202
files: [{
203203
expand: true,
204204
dot: true,
205-
cwd: '<%= stormcall.tmp %>',
206-
dest: '<%= stormcall.dist %>',
205+
cwd: '<%= stargazer.tmp %>',
206+
dest: '<%= stargazer.dist %>',
207207
src: [
208208
'**'
209209
]
@@ -212,43 +212,43 @@ module.exports = function (grunt) {
212212
images: {
213213
expand: true,
214214
dot: true,
215-
cwd: '<%= stormcall.app %>/images',
216-
dest: '<%= stormcall.dist %>/images/',
215+
cwd: '<%= stargazer.app %>/images',
216+
dest: '<%= stargazer.dist %>/images/',
217217
src: '{,*/}*.{png,jpg,jpeg,svg}'
218218
},
219219
styles: {
220220
expand: true,
221221
dot: true,
222-
cwd: '<%= stormcall.app %>/styles',
223-
dest: '<%= stormcall.tmp %>/styles/',
222+
cwd: '<%= stargazer.app %>/styles',
223+
dest: '<%= stargazer.tmp %>/styles/',
224224
src: '{,*/}*.css'
225225
},
226226
requirejs: {
227227
expand: true,
228228
dot: true,
229-
cwd: '<%= stormcall.app %>/bower_components/requirejs',
230-
dest: '<%= stormcall.tmp %>/bower_components/requirejs',
229+
cwd: '<%= stargazer.app %>/bower_components/requirejs',
230+
dest: '<%= stargazer.tmp %>/bower_components/requirejs',
231231
src: 'require.js'
232232
},
233233
modernizr: {
234234
expand: true,
235235
dot: true,
236-
cwd: '<%= stormcall.app %>/bower_components/modernizr',
237-
dest: '<%= stormcall.tmp %>/bower_components/modernizr',
236+
cwd: '<%= stargazer.app %>/bower_components/modernizr',
237+
dest: '<%= stargazer.tmp %>/bower_components/modernizr',
238238
src: 'modernizr.js'
239239
}
240240
},
241241
i18n: {
242-
src: ['<%= stormcall.app %>/lang/*.json'],
243-
dest: '<%= stormcall.app %>/scripts/modules/stormcall_i18n.js'
242+
src: ['<%= stargazer.app %>/lang/*.json'],
243+
dest: '<%= stargazer.app %>/scripts/modules/stargazer_i18n.js'
244244
},
245245
modernizr: {
246-
devFile: '<%= stormcall.app %>/bower_components/modernizr/modernizr.js',
247-
outputFile: '<%= stormcall.tmp %>/bower_components/modernizr/modernizr.js',
246+
devFile: '<%= stargazer.app %>/bower_components/modernizr/modernizr.js',
247+
outputFile: '<%= stargazer.tmp %>/bower_components/modernizr/modernizr.js',
248248
files: [
249-
'<%= stormcall.tmp %>/scripts/{,*/}*.js',
250-
'<%= stormcall.tmp %>/styles/{,*/}*.css',
251-
'!<%= stormcall.tmp %>/scripts/vendor/*'
249+
'<%= stargazer.tmp %>/scripts/{,*/}*.js',
250+
'<%= stargazer.tmp %>/styles/{,*/}*.css',
251+
'!<%= stargazer.tmp %>/scripts/vendor/*'
252252
],
253253
uglify: true
254254
},
@@ -275,40 +275,40 @@ module.exports = function (grunt) {
275275
requirejs: {
276276
production: {
277277
options: {
278-
baseUrl: "<%= stormcall.app %>/scripts",
278+
baseUrl: "<%= stargazer.app %>/scripts",
279279
mainConfigFile: "src/scripts/main.js",
280-
out: "<%= stormcall.tmp %>/scripts/main.js",
280+
out: "<%= stargazer.tmp %>/scripts/main.js",
281281
preserveLicenseComments: false,
282282
optimize: 'none'
283283
}
284284
},
285285
testing: {
286286
options: {
287287
name: 'ATHENE2-TEST',
288-
baseUrl: "<%= stormcall.app %>/tests/modules",
288+
baseUrl: "<%= stargazer.app %>/tests/modules",
289289
mainConfigFile: "src/tests/modules/specRunner.js",
290-
out: "<%= stormcall.tmp %>/scripts/main.js",
290+
out: "<%= stargazer.tmp %>/scripts/main.js",
291291
preserveLicenseComments: false,
292292
optimize: 'none'
293293
}
294294
}
295295
},
296296
"language-update": {
297297
src: [
298-
'<%= stormcall.app %>/scripts/{,*/}*.js'
298+
'<%= stargazer.app %>/scripts/{,*/}*.js'
299299
],
300300
langSrc: [
301-
'<%= stormcall.app %>/lang/*.json'
301+
'<%= stargazer.app %>/lang/*.json'
302302
],
303-
dest: '<%= stormcall.app %>/lang-processed'
303+
dest: '<%= stargazer.app %>/lang-processed'
304304
},
305305
concat: {
306306
test: {
307307
src: [
308-
'<%= stormcall.app %>/bower_components/jasmine/lib/jasmine-core/jasmine.css',
309-
'<%= stormcall.tmp %>/styles/main.css'
308+
'<%= stargazer.app %>/bower_components/jasmine/lib/jasmine-core/jasmine.css',
309+
'<%= stargazer.tmp %>/styles/main.css'
310310
],
311-
dest: '<%= stormcall.tmp %>/styles/main.css'
311+
dest: '<%= stargazer.tmp %>/styles/main.css'
312312
}
313313
},
314314
connect: {

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
stormcall
1+
stargazer
22
=========
33

44
## Build
55

66
* You'll need npm, bower and grunt-cli installed
7-
* cd stormcall/
7+
* cd stargazer/
88
* npm install
99
* bower install
1010
* grunt build
1111

1212
## Develop
1313

14-
* cd stormcall/
14+
* cd stargazer/
1515
* npm install
1616
* bower install
1717
* grunt dev

‎app/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<html>
22
<head>
3-
<title>#stormcall</title>
3+
<title>#stargazer</title>
44
<script src="build/bower_components/modernizr/modernizr.js"></script>
55
<script src="build/bower_components/requirejs/require.js"></script>
66
<script src="build/scripts/main.js"></script>

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "stormcall",
2+
"name": "stargazer",
33
"version": "0.0.1",
44
"dependencies": {
55
"modernizr": "~2.6.2",

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "stormcall",
2+
"name": "stargazer",
33
"version": "0.0.0",
44
"devDependencies": {
55
"grunt": "~0.4.1",

‎src/scripts/main.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*global require*/
22
require.config({
3-
name: 'stormcall',
3+
name: 'stargazer',
44
baseUrl: "/build/scripts",
55
paths: {
66
"jquery": "../bower_components/jquery/jquery",
@@ -29,7 +29,7 @@ require.config({
2929
deps: ['easel'],
3030
exports: 'Tween'
3131
},
32-
stormcall: {
32+
stargazer: {
3333
deps: ['bootstrap']
3434
}
3535
},

‎src/scripts/stormcall.js renamed to ‎src/scripts/stargazer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*global define, require*/
2-
define("stormcall", ['jquery', 'render_service', 'game_service'],
2+
define("stargazer", ['jquery', 'render_service', 'game_service'],
33
function ($, RenderService, GameService) {
44

55
function init(canvas) {
@@ -21,7 +21,7 @@ define("stormcall", ['jquery', 'render_service', 'game_service'],
2121
}
2222
);
2323

24-
require(['jquery', 'stormcall'], function ($, App) {
24+
require(['jquery', 'stargazer'], function ($, App) {
2525
"use strict";
2626

2727
$(function () {

0 commit comments

Comments
 (0)