Skip to content

Commit bca2368

Browse files
committed
Merge of selected changes from Sharathkumar92 into pfilippi's submission.
1 parent 0e38b5b commit bca2368

File tree

4 files changed

+130
-35
lines changed

4 files changed

+130
-35
lines changed

.yo-rc.json

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
{
2+
"generator-gulp-angular": {
3+
"version": "1.0.0",
4+
"props": {
5+
"angularVersion": "~1.4.2",
6+
"angularModules": [
7+
{
8+
"key": "animate",
9+
"module": "ngAnimate"
10+
},
11+
{
12+
"key": "cookies",
13+
"module": "ngCookies"
14+
},
15+
{
16+
"key": "touch",
17+
"module": "ngTouch"
18+
},
19+
{
20+
"key": "sanitize",
21+
"module": "ngSanitize"
22+
},
23+
{
24+
"key": "messages",
25+
"module": "ngMessages"
26+
},
27+
{
28+
"key": "aria",
29+
"module": "ngAria"
30+
}
31+
],
32+
"jQuery": {
33+
"key": "jqLite"
34+
},
35+
"resource": {
36+
"key": "$http",
37+
"module": null
38+
},
39+
"router": {
40+
"key": "angular-route",
41+
"module": "ngRoute"
42+
},
43+
"ui": {
44+
"key": "angular-material",
45+
"module": "ngMaterial"
46+
},
47+
"cssPreprocessor": {
48+
"key": "node-sass",
49+
"extension": "scss"
50+
},
51+
"jsPreprocessor": {
52+
"key": "noJsPrepro",
53+
"extension": "js",
54+
"srcExtension": "js"
55+
},
56+
"htmlPreprocessor": {
57+
"key": "noHtmlPrepro",
58+
"extension": "html"
59+
},
60+
"bootstrapComponents": {
61+
"name": null,
62+
"version": null,
63+
"key": null,
64+
"module": null
65+
},
66+
"foundationComponents": {
67+
"name": null,
68+
"version": null,
69+
"key": null,
70+
"module": null
71+
},
72+
"paths": {
73+
"src": "src",
74+
"dist": "dist",
75+
"e2e": "e2e",
76+
"tmp": ".tmp"
77+
}
78+
}
79+
}
80+
}

README.md

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Internal application used to administer specific support tasks related to the To
77

88
- node.js v6+
99
- npm v3+
10+
- Google Chrome browser version >= 55.0.2883.0
1011

1112
## Installation
1213

@@ -39,37 +40,42 @@ The following configuration parameters are available:
3940
## Start the Application
4041

4142
Simply execute the following command to start the app in development mode (with browsersync)
42-
43-
> npm start
43+
```
44+
npm install
45+
npm start
46+
```
47+
Application will be hosted and running at http://locahost:3000
4448

4549
To build the application to be hosted on a real webserver run:
46-
47-
> npm run build
50+
```
51+
npm run build
52+
```
4853

4954
## Execute E2E Tests
5055

51-
> npm test
56+
```npm test```
5257

5358
## Fallback instruction in case the npm scripts fail
5459

5560
### Install global dependencies
5661

57-
> npm install -g [email protected] bower
62+
```npm install -g [email protected] bower```
5863

5964
### Install project dependencies
6065

61-
> npm install
62-
63-
> bower install
66+
```
67+
npm install
68+
bower install
69+
```
6470

6571
### Start the Application
6672

67-
> gulp serve
73+
```gulp serve```
6874

6975
### Build the Application
7076

71-
> gulp build
77+
```gulp build```
7278

7379
### Execute E2E Tests
7480

75-
> gulp protractor
81+
```gulp protractor```

circle.yml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
1+
##Set Node Js Version (Could be set to needed version)
12
machine:
23
node:
3-
version: 6.9.5
4+
version: 6.8.1
5+
6+
# Add some environment variables
47
environment:
5-
# Fix issue with selenium-server in containers.
6-
# See http://github.com/SeleniumHQ/docker-selenium/issues/87
7-
DBUS_SESSION_BUS_ADDRESS: /dev/null
8-
8+
CIRCLE_ENV: dev
9+
10+
## Customize dependencies
911
dependencies:
10-
post:
11-
# install latest google chrome
12-
- curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
13-
- sudo dpkg -i google-chrome.deb
12+
pre:
13+
- curl -s https://raw.githubusercontent.com/chronogolf/circleci-google-chrome/master/use_chrome_stable_version.sh | bash
14+
15+
override:
16+
- npm install
17+
18+
compile:
19+
override:
20+
- npm run build
21+
22+
test:
23+
override:
24+
- npm run test

package.json

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@
33
"version": "2.3.0",
44
"dependencies": {},
55
"devDependencies": {
6-
"bower": "~1.4.1",
6+
"bower": "~1.8.0",
77
"browser-sync": "~2.18.8",
88
"chalk": "~0.5.1",
9-
"del": "~0.1.3",
9+
"del": "~2.2.2",
1010
"gulp": "~3.8.10",
1111
"gulp-angular-filesort": "~1.0.4",
1212
"gulp-angular-templatecache": "~1.4.2",
1313
"gulp-autoprefixer": "~2.0.0",
1414
"gulp-awspublish": "^3.0.1",
1515
"gulp-consolidate": "~0.1.2",
1616
"gulp-csso": "~0.2.9",
17-
"gulp-filter": "~1.0.2",
17+
"gulp-filter": "~2.0.2",
1818
"gulp-flatten": "~0.0.4",
1919
"gulp-inject": "~1.0.2",
20-
"gulp-jshint": "~1.9.0",
21-
"gulp-karma": "~0.0.4",
20+
"gulp-jshint": "~2.0.4",
2221
"gulp-less": "~1.3.6",
23-
"gulp-load-plugins": "~0.7.1",
24-
"gulp-minify-html": "~0.1.7",
22+
"gulp-load-plugins": "~1.5.0",
23+
"gulp-minify-html": "~1.0.6",
2524
"gulp-ng-annotate": "~1.0.0",
2625
"gulp-ng-config": "~1.2.1",
2726
"gulp-protractor": "~4.0.0",
@@ -34,20 +33,19 @@
3433
"gulp-useref": "~1.0.2",
3534
"http-proxy": "~1.7.0",
3635
"jasmine-core": "^2.5.2",
36+
"jshint":"~2.9.4",
3737
"jshint-stylish": "~1.0.0",
38-
"karma": "^0.12",
39-
"karma-jasmine": "~0.3.1",
40-
"karma-phantomjs-launcher": "~1.0.4",
41-
"main-bower-files": "~2.4.0",
38+
"main-bower-files": "~2.13.1",
39+
"protractor": "~5.1.1",
4240
"require-dir": "~0.1.0",
4341
"uglify-save-license": "~0.4.1",
44-
"wiredep": "~2.2.0"
42+
"wiredep": "~4.0.0"
4543
},
4644
"engines": {
47-
"node": ">=6.0.0"
45+
"node": ">=0.10.0"
4846
},
4947
"scripts": {
50-
"postinstall": "bower install",
48+
"postinstall": "bower install --config.interactive=false",
5149
"build": "gulp build",
5250
"start": "gulp serve",
5351
"test": "gulp protractor"

0 commit comments

Comments
 (0)