Skip to content

Commit 34c9173

Browse files
committed
Bower removed completely; ui-bootstrap implemented; carousel on about page with new pictures
1 parent c19180c commit 34c9173

File tree

10 files changed

+64
-55
lines changed

10 files changed

+64
-55
lines changed

generated/.bowerrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

generated/bower.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

generated/browser/js/about/about.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<section id="about">
22
<p>
33
This website--the very one at which you currently gaze--was created by a basic scaffolding
4-
concocted at Fullstack Academy. If you want to know more about how this scaffolding works,
5-
check out the <a ui-sref="tutorial">tutorial</a> section. Here are some of the people who make
6-
it all very real:
4+
concocted at Fullstack Academy. Here are some of the people who make it all very real:
75
</p>
8-
<img ng-repeat="image in images" ng-src="{{ image }}" />
6+
<carousel interval="2000">
7+
<slide ng-repeat="image in images">
8+
<img height="300" ng-src="{{ image }}" />
9+
</slide>
10+
</carousel>
911
</section>

generated/browser/js/about/about.js

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,28 @@ app.config(function ($stateProvider) {
1313
app.controller('AboutController', function ($scope) {
1414

1515
// Images of beautiful Fullstack people.
16-
$scope.images = [
16+
$scope.images = _.shuffle([
1717
'https://pbs.twimg.com/media/B7gBXulCAAAXQcE.jpg:large',
1818
'https://fbcdn-sphotos-c-a.akamaihd.net/hphotos-ak-xap1/t31.0-8/10862451_10205622990359241_8027168843312841137_o.jpg',
1919
'https://pbs.twimg.com/media/B-LKUshIgAEy9SK.jpg',
2020
'https://pbs.twimg.com/media/B79-X7oCMAAkw7y.jpg',
2121
'https://pbs.twimg.com/media/B-Uj9COIIAIFAh0.jpg:large',
22-
'https://pbs.twimg.com/media/B6yIyFiCEAAql12.jpg:large'
23-
];
22+
'https://pbs.twimg.com/media/B6yIyFiCEAAql12.jpg:large',
23+
'https://pbs.twimg.com/media/CE-T75lWAAAmqqJ.jpg:large',
24+
'https://pbs.twimg.com/media/CEvZAg-VAAAk932.jpg:large',
25+
'https://pbs.twimg.com/media/CEgNMeOXIAIfDhK.jpg:large',
26+
'https://pbs.twimg.com/media/CEQyIDNWgAAu60B.jpg:large',
27+
'https://pbs.twimg.com/media/CCF3T5QW8AE2lGJ.jpg:large',
28+
'https://pbs.twimg.com/media/CAeVw5SWoAAALsj.jpg:large',
29+
'https://pbs.twimg.com/media/CAaJIP7UkAAlIGs.jpg:large',
30+
'https://pbs.twimg.com/media/CAQOw9lWEAAY9Fl.jpg:large',
31+
'https://pbs.twimg.com/media/B-OQbVrCMAANwIM.jpg:large',
32+
'https://pbs.twimg.com/media/B9b_erwCYAAwRcJ.png:large',
33+
'https://pbs.twimg.com/media/B5PTdvnCcAEAl4x.jpg:large',
34+
'https://pbs.twimg.com/media/B4qwC0iCYAAlPGh.jpg:large',
35+
'https://pbs.twimg.com/media/B2b33vRIUAA9o1D.jpg:large',
36+
'https://pbs.twimg.com/media/BwpIwr1IUAAvO2_.jpg:large',
37+
'https://pbs.twimg.com/media/BsSseANCYAEOhLw.jpg:large'
38+
]);
2439

2540
});

generated/browser/js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
var app = angular.module('FullstackGeneratedApp', ['ui.router', 'fsaPreBuilt']);
2+
var app = angular.module('FullstackGeneratedApp', ['ui.router', 'ui.bootstrap', 'fsaPreBuilt']);
33

44
app.config(function ($urlRouterProvider, $locationProvider) {
55
// This turns off hashbang urls (/#about) and changes it to something normal (/about)
Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,33 @@
11
#about {
22

3-
padding-bottom: 50px;
3+
padding: 50px 100px;
44

55
p {
66
width: 400px;
77
margin: 0 auto;
8-
margin-top: 50px;
98
text-align: justify;
10-
font-size: 25px;
9+
font-size: 22px;
1110
font-weight: 300;
11+
float: left;
1212
}
1313

14-
img {
15-
display: block;
14+
.carousel {
15+
float: right;
1616
width: 600px;
17+
overflow: hidden;
1718
margin: 0 auto;
18-
margin-top: 50px;
19+
.carousel-control {
20+
background: none;
21+
}
22+
.carousel-indicators {
23+
display: none;
24+
}
25+
img {
26+
width: 100%;
27+
height: 500px;
28+
display: block;
29+
margin: 0 auto;
30+
}
1931
}
2032

2133
}

generated/package.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@
55
"main": "server/start.js",
66
"scripts": {
77
"start": "nodemon --watch server -e js,html server/start.js",
8-
"postinstall": "./node_modules/bower/bin/bower install && gulp build"
8+
"postinstall": "gulp build"
99
},
1010
"dependencies": {
11+
"angular": "^1.4.0",
12+
"angular-bootstrap": "^0.12.0",
13+
"angular-mocks": "^1.4.0",
14+
"angular-ui-router": "^0.2.15",
1115
"babel": "^5.0.12",
1216
"body-parser": "^1.12.0",
13-
"bower": "^1.3.12",
17+
"bootstrap": "^3.3.4",
1418
"chai": "^2.1.0",
1519
"chalk": "^1.0.0",
1620
"connect-mongo": "^0.7.0",
@@ -36,7 +40,7 @@
3640
"karma-chai": "^0.1.0",
3741
"karma-mocha": "^0.1.10",
3842
"karma-phantomjs-launcher": "^0.1.4",
39-
"lodash": "^3.3.0",
43+
"lodash": "^3.9.3",
4044
"mocha-mongoose": "^1.0.3",
4145
"mongodb": "^1.4.33",
4246
"mongoose": "3.8.23",
@@ -51,6 +55,7 @@
5155
"serve-favicon": "^2.2.0",
5256
"sinon": "^1.13.0",
5357
"socket.io": "^1.3.4",
58+
"socket.io-client": "^1.3.5",
5459
"supertest": "^0.15.0"
5560
}
5661
}

generated/server/app/configure/static-middleware.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@ var favicon = require('serve-favicon');
66
module.exports = function (app) {
77

88
var root = app.getValue('projectRoot');
9-
var bowerPath = path.join(root, './bower_components');
9+
10+
var uiBootstrapPath = path.join(root, './node_modules/angular-bootstrap');
11+
var npmPath = path.join(root, './node_modules');
1012
var publicPath = path.join(root, './public');
1113
var browserPath = path.join(root, './browser');
1214

1315
app.use(favicon(app.getValue('faviconPath')));
14-
app.use(express.static(bowerPath));
16+
app.use(express.static(uiBootstrapPath));
17+
app.use(express.static(npmPath));
1518
app.use(express.static(publicPath));
1619
app.use(express.static(browserPath));
1720

generated/server/app/views/index.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
<title>Fullstack Academy Generated Application</title>
66
<link rel="stylesheet" type="text/css" href="/bootstrap/dist/css/bootstrap.css" />
77
<link rel="stylesheet" type="text/css" href="/style.css" />
8-
<script src="/lodash/lodash.js"></script>
9-
<script src="/jquery/dist/jquery.js"></script>
10-
<script src="/bootstrap/dist/js/bootstrap.js"></script>
8+
<script src="/lodash/index.js"></script>
119
<script src="/angular/angular.js"></script>
1210
<script src="/angular-ui-router/release/angular-ui-router.js"></script>
11+
<script src="/angular-bootstrap/dist/ui-bootstrap.js"></script>
1312
<script src="/socket.io-client/socket.io.js"></script>
1413
<script src="/main.js"></script>
1514
</head>

generated/tests/browser/karma.conf.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ var path = require('path');
33
module.exports = function (config) {
44

55
var filesCollection = [
6-
'bower_components/lodash/lodash.js',
7-
'bower_components/jquery/dist/jquery.js',
8-
'bower_components/bootstrap/dist/js/bootstrap.js',
9-
'bower_components/angular/angular.js',
10-
'bower_components/angular-ui-router/release/angular-ui-router.js',
11-
'bower_components/socket.io-client/socket.io.js',
6+
'node_modules/lodash/index.js',
7+
'node_modules/angular/angular.js',
8+
'node_modules/angular-ui-router/release/angular-ui-router.js',
9+
'node_modules/angular-bootstrap/dist/ui-bootstrap.js',
10+
'node_modules/socket.io-client/socket.io.js',
1211
'public/main.js',
1312
'node_modules/sinon/pkg/sinon.js',
14-
'bower_components/angular-mocks/angular-mocks.js',
13+
'node_modules/angular-mocks/angular-mocks.js',
1514
'tests/browser/**/*.js'
1615
];
1716

0 commit comments

Comments
 (0)