Skip to content

Commit

Permalink
Source updated
Browse files Browse the repository at this point in the history
  • Loading branch information
hsbalar committed Jul 12, 2016
1 parent 6dfcb27 commit ed1a188
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 12 deletions.
5 changes: 1 addition & 4 deletions client/app.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import './assets/styles/app.scss';
import './assets/styles/main.scss';

import 'rxjs/Rx';

import { bootstrap } from '@angular/platform-browser-dynamic';
import { enableProdMode } from '@angular/core';
import { HTTP_PROVIDERS } from '@angular/http';
import { ROUTER_PROVIDERS } from '@angular/router-deprecated';
import { environment } from './app/environment';

Expand All @@ -15,5 +12,5 @@ if (environment.production) {
enableProdMode();
}

bootstrap(NotesApp, [HTTP_PROVIDERS, ROUTER_PROVIDERS])
bootstrap(NotesApp, [ROUTER_PROVIDERS])
.catch(err => console.error(err));
2 changes: 1 addition & 1 deletion client/app/environment.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const environment = {
production: false
production: true
};
2 changes: 1 addition & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ app.on('ready', function() {

tray.create(mainWindow);

// mainWindow.openDevTools();
mainWindow.openDevTools();
mainWindow.on('closed', function() {
// Dereference the window object, usually you would store windows
// in an array if your app supports multi windows, this is the time
Expand Down
14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,14 @@
"webpack-stream": "^3.1.0"
},
"dependencies": {
"@angular/common": "2.0.0-rc.1",
"@angular/core": "2.0.0-rc.1",
"@angular/http": "2.0.0-rc.1",
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
"@angular/router-deprecated": "2.0.0-rc.1",
"@angular/common": "2.0.0-rc.4",
"@angular/compiler": "^2.0.0-rc.4",
"@angular/core": "2.0.0-rc.4",
"@angular/http": "2.0.0-rc.4",
"@angular/platform-browser": "2.0.0-rc.4",
"@angular/platform-browser-dynamic": "2.0.0-rc.4",
"@angular/router": "3.0.0-beta.1",
"@angular/router-deprecated": "2.0.0-rc.2",
"angular2-notifications": "^0.1.57",
"babel-preset-es2015": "^6.3.13",
"babel-preset-stage-3": "^6.3.13",
Expand All @@ -55,6 +58,7 @@
"ng2-dragula": "^1.1.9",
"pouchdb": "^5.3.2",
"reflect-metadata": "0.1.3",
"rxjs": "5.0.0-beta.6",
"zone.js": "^0.6.12"
},
"babel": {
Expand Down
1 change: 1 addition & 0 deletions public/css/bootstrap.min.css.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/css/material.min.css.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/css/ripples.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions public/css/roboto.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ const config = {

plugins: [
new webpack.optimize.CommonsChunkPlugin('vendor', 'vendor.bundle.js')
// new webpack.optimize.UglifyJsPlugin({ compressor: { warnings: false } }),
// new webpack.optimize.DedupePlugin(),
// new webpack.DefinePlugin({
// "process.env": { NODE_ENV: JSON.stringify("production") }
// })
],

resolve: {
Expand All @@ -36,7 +41,7 @@ const config = {
{ test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "url?limit=10000&mimetype=application/font-woff" },
{ test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "file" }
],
noParse: [ path.join(__dirname, 'node_modules', 'angular2', 'bundles') ]
noParse: [ path.join(__dirname, 'node_modules', '@angular', 'bundles') ]
},
postcss: [ autoprefixer ]
};
Expand Down

0 comments on commit ed1a188

Please sign in to comment.