Skip to content

Commit

Permalink
upgrade dependencies and readme
Browse files Browse the repository at this point in the history
  • Loading branch information
sonicoder86 committed Apr 2, 2017
1 parent 0c7179b commit a0e0eeb
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 52 deletions.
2 changes: 1 addition & 1 deletion client/app/core/components/app/app.component.js
@@ -1,5 +1,5 @@
import { Component, Inject } from '@angular/core'; // eslint-disable-line no-unused-vars
import { TranslateService } from 'ng2-translate';
import { TranslateService } from '@ngx-translate/core';
import { translation } from '../../../i18n/en';

import template from './app.template.html';
Expand Down
2 changes: 1 addition & 1 deletion client/boot.js
Expand Up @@ -7,7 +7,7 @@ import { enableProdMode, NgModule } from '@angular/core';
import { HttpModule } from '@angular/http';
import { RouterModule } from '@angular/router';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TranslateModule } from 'ng2-translate';
import { TranslateModule } from '@ngx-translate/core';

import { routes } from './app/core/app.routes';
import { CORE_PROVIDERS, CORE_DECLARATIONS, AppComponent } from './app/core';
Expand Down
2 changes: 1 addition & 1 deletion client/vendor.js
Expand Up @@ -10,4 +10,4 @@ import '@angular/router';
import '@angular/http';
import '@angular/forms';

import 'ng2-translate';
import '@ngx-translate/core';
73 changes: 36 additions & 37 deletions package.json
Expand Up @@ -28,35 +28,34 @@
"node": "6.5.0"
},
"dependencies": {
"jsonwebtoken": "7.3.0",
"jsonwebtoken": "~7.3.0",
"koa": "1.2.5",
"koa-bodyparser": "2.3.0",
"koa-jwt": "1.3.1",
"koa-router": "5.4.0",
"koa-static": "2.1.0",
"node-uuid": "1.4.7"
"uuid": "~3.0.1"
},
"devDependencies": {
"@angular/common": "2.4.8",
"@angular/compiler": "2.4.8",
"@angular/core": "2.4.8",
"@angular/forms": "2.4.8",
"@angular/http": "2.4.8",
"@angular/platform-browser": "2.4.8",
"@angular/platform-browser-dynamic": "2.4.8",
"@angular/router": "3.4.8",
"core-js": "2.4.1",
"rxjs": "5.0.3",
"zone.js": "0.7.7",
"babel-core": "6.23.1",
"babel-eslint": "7.1.1",
"babel-loader": "6.3.2",
"babel-plugin-__coverage__": "11.0.0",
"babel-preset-angular2": "0.0.2",
"babel-preset-es2015": "6.22.0",
"bootstrap": "3.3.7",
"codeclimate-test-reporter": "0.4.1",
"del": "2.2.2",
"@angular/common": "~4.0.1",
"@angular/compiler": "~4.0.1",
"@angular/core": "~4.0.1",
"@angular/forms": "~4.0.1",
"@angular/http": "~4.0.1",
"@angular/platform-browser": "~4.0.1",
"@angular/platform-browser-dynamic": "~4.0.1",
"@angular/router": "~4.0.1",
"@ngx-translate/core": "^6.0.1",
"babel-core": "~6.24.0",
"babel-eslint": "~7.2.1",
"babel-loader": "~6.4.1",
"babel-plugin-__coverage__": "~11.0.0",
"babel-preset-angular2": "~0.0.2",
"babel-preset-es2015": "~6.24.0",
"bootstrap": "~3.3.7",
"codeclimate-test-reporter": "~0.4.1",
"core-js": "~2.4.1",
"del": "~2.2.2",
"gulp": "3.9.1",
"gulp-cssnano": "2.1.2",
"gulp-delete-lines": "0.0.7",
Expand All @@ -65,20 +64,20 @@
"gulp-nodemon": "2.2.1",
"gulp-util": "3.0.8",
"gulp-watch": "4.3.11",
"jasmine-core": "2.5.2",
"json-loader": "0.5.4",
"karma": "1.5.0",
"karma-coverage": "1.1.1",
"karma-jasmine": "1.1.0",
"karma-phantomjs-launcher": "1.0.2",
"karma-sourcemap-loader": "0.3.7",
"karma-webpack": "2.0.2",
"mini-lr": "0.1.9",
"ng2-translate": "5.0.0",
"phantomjs-prebuilt": "2.1.14",
"raw-loader": "0.5.1",
"run-sequence": "1.2.2",
"validate.js": "0.11.1",
"webpack": "1.14.0"
"jasmine-core": "~2.5.2",
"json-loader": "~0.5.4",
"karma": "~1.5.0",
"karma-coverage": "~1.1.1",
"karma-jasmine": "~1.1.0",
"karma-phantomjs-launcher": "~1.0.4",
"karma-sourcemap-loader": "~0.3.7",
"karma-webpack": "~2.0.3",
"mini-lr": "~0.1.9",
"raw-loader": "~0.5.1",
"run-sequence": "~1.2.2",
"rxjs": "~5.2.0",
"validate.js": "~0.11.1",
"webpack": "1.14.0",
"zone.js": "~0.8.5"
}
}
20 changes: 10 additions & 10 deletions readme.md
@@ -1,19 +1,19 @@
# Angular 2 Babel ESNext Starter
# Angular Babel ESNext Starter
[![Dependency Status](https://david-dm.org/blacksonic/angular2-babel-esnext-starter.svg)](https://david-dm.org/blacksonic/angular2-babel-esnext-starter)
[![devDependency Status](https://david-dm.org/blacksonic/angular2-babel-esnext-starter/dev-status.svg)](https://david-dm.org/blacksonic/angular2-babel-esnext-starter?type=dev)
[![Build Status](https://travis-ci.org/blacksonic/angular2-babel-esnext-starter.svg?branch=master)](https://travis-ci.org/blacksonic/angular2-babel-esnext-starter)

This repository shows development and testing techniques with [Angular 2](https://angular.io/).
This repository shows development and testing techniques with [Angular](https://angular.io/).
The application is written in modern Javascript without Typescript.
It can be ideal for those who are new to Angular 2 and want to learn how things work
It can be ideal for those who are new to Angular and want to learn how things work
and fiddle with Typescript later.

It is a basic CRUD application with authentication, similar to the news site [jslive.com](https://jslive.com).
You can see the list of links, add and edit them after you signed in.

> If you're looking for Angular 2 in Javascript without Gulp tasks and server side check out [angular2-esnext-todomvc](https://github.com/blacksonic/angular2-esnext-todomvc)
> If you're looking for Angular in Javascript without Gulp tasks and server side check out [angular2-esnext-todomvc](https://github.com/blacksonic/angular2-esnext-todomvc)
> If you're looking for Angular 2 in Typescript check out [angular2-webpack-starter](https://github.com/AngularClass/angular2-webpack-starter)
> If you're looking for Angular in Typescript check out [angular2-webpack-starter](https://github.com/AngularClass/angular2-webpack-starter)
- Modern Javascript implementation with classes, decorators.
- Uses [Babel](https://babeljs.io/) to support decorators.
Expand All @@ -40,7 +40,7 @@ You can see the list of links, add and edit them after you signed in.
- Authentication and restricting access to routes
- Form handling
- Using custom validators in forms
- Internationalization with [ng2-translate](https://github.com/ocombe/ng2-translate)
- Internationalization with [ngx-translate](https://github.com/ngx-translate/core)

### Quick Start

Expand All @@ -56,11 +56,11 @@ gulp serve

It bundles the application, copies the static files and starts the webserver with Nodemon.
The transpiled application will have two separate ES5 compatible files: ```vendor.js``` for vendor libraries, ```boot.js``` for application logic.
Server side changes restart the server, client side changes rebundle the Angular 2 application and refresh the page with Livereload.
Server side changes restart the server, client side changes rebundle the Angular application and refresh the page with Livereload.

Note: The application needs at least Node 5+ installed.
Note: The application needs at least Node 6+ installed.

Open it in your browser [http://localhost:9000](http://localhost:9000) and start coding your first Angular 2 application in Javascript!
Open it in your browser [http://localhost:9000](http://localhost:9000) and start coding your first Angular application in Javascript!

### Testing

Expand All @@ -83,7 +83,7 @@ gulp test-dev

```

To get a good overview of testing possibilities within Angular 2 [read this article](https://medium.com/google-developer-experts/angular-2-unit-testing-with-jasmine-defe20421584).
To get a good overview of testing possibilities within Angular [read this article](https://medium.com/google-developer-experts/angular-2-unit-testing-with-jasmine-defe20421584).

### Workarounds

Expand Down
4 changes: 2 additions & 2 deletions server/router.js
@@ -1,6 +1,6 @@
'use strict';
let router = require('koa-router')();
let uuid = require('node-uuid');
let uuid = require('uuid');
let jwt = require('jsonwebtoken');
let config = require('./config');
let jwtMiddleware = require('koa-jwt')({ secret: config.jwt_secret });
Expand Down Expand Up @@ -84,4 +84,4 @@ router.post('/login', function*() {
this.body = result;
});

module.exports = router;
module.exports = router;

0 comments on commit a0e0eeb

Please sign in to comment.