Skip to content

Commit 950ac7f

Browse files
committed
Merge branch 'release/1.0.0'
2 parents 162bb5b + 96ce220 commit 950ac7f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2212
-2012
lines changed

.editorconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# @w3tec
12
# http://editorconfig.org
23

34
root = true
@@ -12,4 +13,4 @@ trim_trailing_whitespace = true
1213

1314
[*.md]
1415
insert_final_newline = false
15-
trim_trailing_whitespace = false
16+
trim_trailing_whitespace = false

.gitignore

100644100755
Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,36 @@
1-
logs/*
2-
!.gitkeep
3-
node_modules/
4-
bower_components/
1+
# @w3tec
2+
3+
# Logs #
4+
logs
5+
*.log
6+
*.log*
7+
8+
# Coverage directory used by tools like istanbul #
9+
/test/coverage
10+
11+
# Node Files #
12+
/node_modules
13+
/bower_components
14+
npm-debug.log
15+
16+
# OS generated files #
17+
.DS_Store
18+
Thumbs.db
19+
20+
# Typing #
21+
/typings/
22+
23+
# Dist #
24+
/dist
25+
26+
# Cordova #
27+
cordova/plugins
28+
cordova/platforms
529
www/
630
plugins/
731
platforms/
8-
dist/
9-
build/
10-
docs/
11-
out/
12-
coverage/
13-
tmp
14-
.DS_Store
15-
.idea
32+
33+
# IDE #
34+
.idea/
35+
*.swp
1636
.awcache
17-
npm-debug.log
18-
npm-debug.log*
19-
/typings

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ script:
1515
- npm test
1616
- npm run build:prod
1717
notifications:
18-
email: false
18+
email: false
19+
hipchat: 861e4f14f03ed33d069f1083a6c9f5@2679708

README.md

100644100755
Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
[![devDependency Status](https://david-dm.org/w3tecch/aurelia-ts-boilerplate/dev-status.svg)](https://david-dm.org/w3tecch/aurelia-ts-boilerplate#info=devDependencies)
44

55
## Prerequisites
6+
67
1. Install [NodeJS](https://nodejs.org/en/)
78
2. Open your Terminal and navigate to the project folder
89
3. To get all app prerequisites run ```$ npm install```
910

1011
## Technologies
12+
1113
[aurelia](http://www.aurelia.io/)
1214

1315
## Getting started
@@ -139,7 +141,7 @@ Please see https://github.com/aurelia/webpack-plugin for more information.
139141
To run the unit tests:
140142

141143
```shell
142-
npm run test
144+
npm test
143145
```
144146

145147
## Running The E2E Tests
@@ -169,14 +171,14 @@ Integration tests are performed with [Protractor](http://angular.github.io/protr
169171

170172
## Environment confugration
171173
There is a configuration management in place. Three standart environments are already set (devlopment, test and production).
172-
You can also add more environments with ```--env <env-name>``` but there is a catch: You have to add ```--``` for each npm command you
174+
You can also add more environments with ```--env.target <env-name>``` but there is a catch: You have to add ```--``` for each npm command you
173175
run throw so if your like to set the evnirnment for ```npm start``` you have to do this like so:
174176

175177
```shell
176-
npm start -- -- --env <json-file-name-without-extension>
178+
npm start -- -- --env.target <json-file-name-without-extension>
177179
```
178180

179-
This because ```npm start``` runs ```npm run server:dev``` and then the target command, so we have to to pass the ```--env``` by providing two times ```--```.
181+
This because ```npm start``` runs ```npm run server:dev``` and then the target command, so we have to to pass the ```--env.target``` by providing two times ```--```.
180182
You can find the configurations in ```<root>/environment```.
181183

182184
## HTML5 pushState routing
@@ -189,28 +191,38 @@ extra confuration to enable this.
189191
Initiate cordova with the following commands:
190192
```shell
191193
npm install -g cordova
192-
npm run cordova:init
194+
npm run mobile:setup
193195
```
194196

195-
Finally add the following code just before the ```</body>``` closing tag:
196-
```
197-
<!-- Cordova -->
198-
<script src="cordova.js"></script>
199-
```
197+
### Run and build
198+
Cordova takes the ```www``` folder source to create the Cordova app. This ```www``` folder is a symlink to the ```dist``` folder.
199+
So make sure you run for example ```npm run build``` first before runing/buildinga Cordova app.
200200

201-
Cordova has a issue in the way they serve the source code files to the WebView in the platforms. So we have to remove/alter the following code
202-
to make sure everything works in cordova.
203201

204-
Remove the following line in src/index.ejs
205-
```
206-
12: <base href="<%= htmlWebpackPlugin.options.baseUrl %>">
207-
```
208202

209-
Remove the following line in src/app/app.ts
210-
```
211-
8: config.options.pushState = true;
212-
```
203+
# ToDo's
204+
205+
- [X] Add typings
206+
- [X] Remove bluebird
207+
- [X] Update app structure
208+
- [X] Add bootstrap sass
209+
- [X] Add sass ignore for unit tests
210+
- [X] Add linter
211+
- [X] Add env mgmt
212+
- [X] Add logging system
213+
- [X] Animation
214+
- [X] refactor webpack config
215+
- [ ] Layout Wrapper
216+
- [X] add i18n
217+
- [ ] add materialize.css
218+
- [ ] Add all important libs like moment, lodash ...
219+
- [X] Add cordova
220+
- [X] Add travis
221+
- [ ] Add greenkeeper
222+
- [X] polyfill ES6 promises for tests => replaced phantom with firefox
223+
- [ ] Add electron
224+
- [ ] Add wallaby.js
225+
- [ ] Add typedocs
226+
- [ ] VSC frontend debugging https://github.com/AngularClass/angular2-webpack-starter/blob/master/.vscode/launch.json
227+
- [ ] VSC add tasks https://code.visualstudio.com/docs/editor/tasks
213228

214-
### Run and build
215-
Cordova takes the ```www``` folder source to create the Cordova app. This ```www``` folder is a symlink to the ```dist``` folder.
216-
So make sure you run for example ```npm run build``` first before runing/buildinga Cordova app.

TODO.ms

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

config/config-environment.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
"use strict";
22

33
const webpack = require('webpack');
4-
const minimist = require('minimist')(process.argv.slice(2));
54

65
/**
76
* Environment Config
87
*/
98
const configEnv = function (options) {
109
return {
1110
plugins: [
12-
new webpack.DefinePlugin(getDefinitions(options.env, options.name, options.version))
11+
new webpack.DefinePlugin(getDefinitions(options.env, options.name, options.version, options.platform))
1312
]
1413
};
1514
};
1615

17-
function getDefinitions(env, name, version) {
18-
const environment = minimist.env || env;
16+
function getDefinitions(env, name, version, platform) {
1917
return {
2018
NAME: JSON.stringify(name),
2119
VERSION: JSON.stringify(version),
22-
CONFIG: JSON.stringify(require(process.cwd() + `/environment/${environment}.json`))
20+
PLATFORM: JSON.stringify(platform),
21+
CONFIG: JSON.stringify(require(process.cwd() + `/environment/${env}.json`))
2322
};
2423

2524
}

config/config-favicon.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ const faviconsWebpackPlugin = require('favicons-webpack-plugin');
99
/**
1010
* Favicon config
1111
*/
12-
const configFavicon = function (appName, icon, icons) {
13-
return {
12+
const configFavicon = function (options) {
13+
return {
1414
plugins: [
1515
new faviconsWebpackPlugin({
1616
// Your source logo
17-
logo: icon || 'favicon.png',
17+
logo: options.logo || 'favicon.png',
1818
// Generate a cache file with control hashes and
1919
// don't rebuild the favicons until those hashes change
2020
persistentCache: true,
2121
// Inject the html into the html-webpack-plugin
2222
inject: true,
2323
// favicon app title (see https://github.com/haydenbleasel/favicons#usage)
24-
title: appName,
24+
title: options.title,
2525
// which icons should be generated (see https://github.com/haydenbleasel/favicons#usage)
2626
icons: Object.assign({
2727
android: true,
@@ -34,9 +34,9 @@ const configFavicon = function (appName, icon, icons) {
3434
twitter: false,
3535
yandex: false,
3636
windows: false
37-
}, icons)
37+
}, options.icons)
3838
})
3939
]
40-
};
40+
};
4141
};
42-
module.exports = configFavicon;
42+
module.exports = configFavicon;

config/config-ignore.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
"use strict";
2+
3+
/**
4+
* Ignore config
5+
*/
6+
const configIgnore = function (options) {
7+
return {
8+
module: {
9+
loaders: [
10+
{ test: /\.html$/, loader: 'ignore-loader' },
11+
{ test: /\.ejs$/, loader: 'ignore-loader' },
12+
{ test: /\.scss$/, loader: 'ignore-loader' }
13+
]
14+
}
15+
};
16+
};
17+
module.exports = configIgnore;

config/config-notifier.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ const WebpackNotifierPlugin = require('webpack-notifier');
99
/**
1010
* Notifier config
1111
*/
12-
const configNotifier = function (title, options) {
12+
const configNotifier = function (options) {
1313
return {
1414
plugins: [
1515
new WebpackNotifierPlugin(Object.assign({
16-
title: title || 'Webpack'
16+
title: options.title || 'Webpack'
1717
}, options))
1818
]
1919
};

config/init-cordova.js

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

0 commit comments

Comments
 (0)