Skip to content

Commit 38d1750

Browse files
committed
Some fun stuff; using ui-bootstrap in new places; finding traces of bower
1 parent 34c9173 commit 38d1750

File tree

7 files changed

+9
-22
lines changed

7 files changed

+9
-22
lines changed

bin/generate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var renameGitignore = function () {
2323
console.log(chalk.green('Generating your new, poppin\' fresh application!'));
2424
copyFiles().then(renameGitignore).then(function () {
2525
console.log(chalk.blue('All done!'));
26-
console.log(chalk.red('Do not forget to'), chalk.yellow('npm install'), 'AND', chalk.blue('bower install'), 'AND', chalk.green('gulp build'));
26+
console.log(chalk.red('Do not forget to'), chalk.yellow('npm install'), 'AND', chalk.green('gulp build'));
2727
});
2828

2929

generated/browser/js/common/factories/RandomGreetings.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ app.factory('RandomGreetings', function () {
1212
'What a beautiful day!',
1313
'I\'m like any other project, except that I am yours. :)',
1414
'This empty string is for Lindsay Levine.',
15-
'こんにちは、ユーザー様。'
15+
'こんにちは、ユーザー様。',
16+
'Welcome. To. WEBSITE.',
17+
':D'
1618
];
1719

1820
return {

generated/browser/js/fsa/fsa-pre-built.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,8 @@
88
var app = angular.module('fsaPreBuilt', []);
99

1010
app.factory('Socket', function ($location) {
11-
1211
if (!window.io) throw new Error('socket.io not found!');
13-
14-
var socket;
15-
16-
if ($location.$$port) {
17-
socket = io('http://localhost:1337');
18-
} else {
19-
socket = io('/');
20-
}
21-
22-
return socket;
23-
12+
return window.io(window.location.origin);
2413
});
2514

2615
// AUTH_EVENTS is used throughout our app to

generated/browser/js/login/login.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<form id="login-form" name="loginForm" ng-submit="loginForm.$valid && sendLogin(login)">
22

3-
<div class="alert alert-danger" ng-show="error">
4-
<span class="glyphicon glyphicon-exclamation-sign"></span>
5-
<span class="sr-only">Error:</span>
3+
<alert type="danger" ng-show="error">
64
{{ error }}
7-
</div>
5+
</alert>
86

97
<div class="form-group">
108
<label for="email">Email address</label>

generated/gitignore.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.idea
22
node_modules
3-
bower_components
43
npm-debug.log
54
public
65
.DS_Store

generated/gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ gulp.task('build', function () {
119119
if (process.env.NODE_ENV === 'production') {
120120
runSeq(['buildJSProduction', 'buildCSSProduction']);
121121
} else {
122-
runSeq(['buildJS', 'buildCSS']);
122+
runSeq(['lintJS', 'buildJS', 'buildCSS']);
123123
}
124124
});
125125

@@ -129,7 +129,7 @@ gulp.task('default', function () {
129129
gulp.start('build');
130130

131131
gulp.watch('browser/js/**', function () {
132-
runSeq('lintJS', 'buildJS', ['testBrowserJS', 'reload']);
132+
runSeq('buildJS', ['testBrowserJS', 'reload']);
133133
});
134134

135135
gulp.watch('browser/scss/**', function () {

generated/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"gulp-minify-css": "^0.4.6",
3030
"gulp-mocha": "^2.0.0",
3131
"gulp-ng-annotate": "^0.5.2",
32-
"gulp-ng-templates": "0.0.5",
3332
"gulp-plumber": "^0.6.6",
3433
"gulp-rename": "^1.2.0",
3534
"gulp-sass": "^1.3.3",

0 commit comments

Comments
 (0)