Merge branch 'release/2.0.0-rc3'

Author: shprink

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "wp-api-angularjs",
-    "version": "2.0.0-rc2",
+    "version": "2.0.0-rc3",
     "description": "WordPress WP-API v2 client for AngularJs",
     "main": [
         "dist/wp-api-angularjs.js"

dist/wp-api-angularjs.js

@@ -35,7 +35,7 @@ export default class extends Parent {
      * @returns {Object} Promise
      */
     getCustomList(taxonomiesType, params, data, headers) {
-        return super.getList(`/terms/${taxonomiesType}`, params, data, headers);
+        return super.getList(`/${taxonomiesType}`, params, data, headers);
     }
 
     /**
@@ -59,7 +59,7 @@ export default class extends Parent {
             taxonomiesType,
             termId
         });
-        return super.get(`/terms/${taxonomiesType}/${termId}`, params, data, headers);
+        return super.get(`/${taxonomiesType}/${termId}`, params, data, headers);
     }
 
     /**
@@ -87,7 +87,7 @@ export default class extends Parent {
      * @returns {Object} Promise
      */
     getCategoryList(params, data, headers) {
-        return super.getList(`/terms/category`, params, data, headers);
+        return super.getList(`/categories`, params, data, headers);
     }
 
     /**
@@ -114,7 +114,7 @@ export default class extends Parent {
      * @returns {Object} Promise
      */
     getTagList(params, data, headers) {
-        return super.getList(`/terms/tag`, params, data, headers);
+        return super.getList(`/tags`, params, data, headers);
     }
 
     /**
@@ -136,7 +136,7 @@ export default class extends Parent {
         super.requiredInput('$wpApiTerms:get', {
             termId
         });
-        return super.get(`/terms/category/${termId}`, params, data, headers);
+        return super.get(`/categories/${termId}`, params, data, headers);
     }
 
     /**
@@ -158,6 +158,6 @@ export default class extends Parent {
         super.requiredInput('$wpApiTerms:get', {
             termId
         });
-        return super.get(`/terms/tag/${termId}`, params, data, headers);
+        return super.get(`/tags/${termId}`, params, data, headers);
     }
 }

dist/wp-api-angularjs.js.map

@@ -0,0 +1,40 @@
+import {Inject} from 'angular2/core';
+import {Http} from 'angular2/http';
+
+export Parent class {
+    constructor(@Inject(Http) http:Http) {
+
+
+        this.baseUrl = $injector.get('WpApi').getBaseUrl();
+        this.defaultHttpProperties = $injector.get('WpApi').getDefaultHttpProperties();
+        this.$http = $injector.get('$http');
+
+    }
+
+    getList(suffix, params = {}, data = {}, headers = {}) {
+        return this.$http(angular.merge({}, this.defaultHttpProperties, {
+            method: 'GET',
+            url: this.baseUrl + suffix,
+            params,
+            data,
+            headers
+        }));
+    }
+
+    get(suffix, params = {}, data = {}, headers = {}) {
+        return this.$http(angular.merge({}, this.defaultHttpProperties, {
+            method: 'GET',
+            url: this.baseUrl + suffix,
+            params,
+            data,
+            headers
+        }));
+    }
+
+    requiredInput(functionName, inputs) {
+        angular.forEach(inputs, (value, name) => {
+            if (typeof value !== 'undefined') return;
+            throw new Error(`Parameter ${name} from function ${functionName} is required`);
+        });
+    }
+}

dist/wp-api-angularjs.min.js

@@ -0,0 +1,5 @@
+import Parent from './parent.service.js';
+
+export default class extends Parent {
+
+}

lib/terms.service.js

@@ -1,10 +1,11 @@
 {
   "name": "wp-api-angularjs",
-  "version": "2.0.0-rc2",
+  "version": "2.0.0-rc3",
   "description": "WordPress WP-API v2 client for AngularJs",
   "main": "dist/wp-api-angularjs.js",
   "scripts": {
     "devserver": "webpack-dev-server --port 8080 --json --progress",
+    "devserverV2": "webpack-dev-server --port 8080 --json --progress --config webpack.config.v2.js",
     "build": "npm run dumpdev && npm run dumpprod",
     "dumpdev": "webpack --progress --colors --config webpack.config.dist.js -d",
     "watch": "webpack --watch --progress --colors --config webpack.config.dist.js -d",
@@ -29,9 +30,12 @@
   },
   "homepage": "https://github.com/shprink/wp-api-angularjs",
   "devDependencies": {
+    "@reactivex/rxjs": "5.0.0-alpha.4",
     "angular": "^1.4.5",
+    "angular2": "2.0.0-alpha.45",
     "babel-core": "^5.6.15",
     "babel-loader": "^5.2.2",
+    "es6-shim": "^0.33.10",
     "exports-loader": "^0.6.2",
     "expose-loader": "^0.6.0",
     "gulp": "^3.9.0",
@@ -40,9 +44,13 @@
     "json-loader": "^0.5.2",
     "ng-annotate-loader": "~0.0.6",
     "path": "^0.4.9",
+    "reflect-metadata": "0.1.2",
+    "ts-loader": "^0.6.0",
+    "typescript": "1.6.2",
     "util": "^0.10.3",
     "webpack": "~1.10.0",
-    "webpack-dev-server": "~1.10.0"
+    "webpack-dev-server": "~1.10.0",
+    "zone.js": "0.5.8"
   },
   "dependencies": {
     "js-base64": "^2.1.9"

lib/v2/parent.ts

@@ -0,0 +1,125 @@
+/*
+ * Angular 2 decorators and services
+ */
+import {Directive, Component, View, ElementRef} from 'angular2/angular2';
+import {RouteConfig, Router} from 'angular2/router';
+import {Http, Headers} from 'angular2/http';
+
+/*
+ * Angular Directives
+ */
+import {CORE_DIRECTIVES, FORM_DIRECTIVES} from 'angular2/angular2';
+import {ROUTER_DIRECTIVES} from 'angular2/router';
+
+
+/*
+ * App Component
+ * Top Level Component
+ */
+@Component({
+  // The selector is what angular internally uses
+  // for `document.querySelectorAll(selector)` in our index.html
+  // where, in this case, selector is the string 'app'
+  selector: 'app', // <app></app>
+  // We need to tell Angular's compiler which directives are in our template.
+  // Doing so will allow Angular to attach our behavior to an element
+  directives: [ CORE_DIRECTIVES, FORM_DIRECTIVES, ROUTER_DIRECTIVES ],
+  // Our list of styles in our component. We may add more to compose many styles together
+  styles: [`
+    .title {
+      font-family: Arial, Helvetica, sans-serif;
+    }
+    main {
+      padding: 1em;
+    }
+  `],
+  // Every Angular template is first compiled by the browser before Angular runs it's compiler
+  template: `
+  <header>
+    <h1 class="title">Hello {{ title }}</h1>
+  </header>
+
+  <main>
+    Your Content Here
+    <div>
+
+      <input type="text" [value]="title" (input)="title = $event.target.value" autofocus>
+      <!--
+        Rather than wiring up two-way data-binding ourselves
+        we can use Angular's [(ng-model)] syntax
+        <input type="text" [(ng-model)]="title">
+      -->
+    </div>
+
+    <pre>this.title = {{ title | json }}</pre>
+    <pre>this.data = {{ data | json }}</pre>
+
+  </main>
+  `
+})
+export class App {
+  // These are member type
+  title: string;
+  data: Array<any> = []; // default data
+  // TypeScript public modifiers
+  constructor(public http: Http) {
+    this.title = 'Angular 2';
+  }
+
+  onInit() {
+    // Our API
+    // Before you start the app, run these commands in another process:
+    //
+    // - npm run express-install
+    // - npm run express
+    //
+    // This will start a process that will listen for requests on port 3001
+
+    const BASE_URL = 'http://localhost:3001';
+    const TODO_API_URL = '/api/todos';
+    const JSON_HEADERS = new Headers();
+
+    JSON_HEADERS.append('Accept', 'application/json');
+    JSON_HEADERS.append('Content-Type', 'application/json');
+
+    this.http
+      .get(BASE_URL + TODO_API_URL, {
+        headers: JSON_HEADERS
+      })
+      .map(res => res.json())
+      .subscribe(
+        // onNext callback
+        data => this.serverData(data),
+        // onError callback
+        err  => this.errorMessage(err),
+        // onComplete callback
+        ()   => console.log('complete')
+      );//end http
+
+  }
+
+  serverData(data) {
+    console.log('data', data);
+    this.data = data;
+  }//serverData
+
+  errorMessage(err) {
+    console.info(`${'\n'
+      } // You must run these commands in another process for the Http API to work  ${'\n'
+      } npm run express-install ${'\n'
+      } npm run express
+    `);
+  }//errorMessage
+
+}
+
+
+
+/*
+ * Please review the examples/ folder for more angular app examples
+ * (The examples may not be updated as quickly. Please open an issue on github for us to update it)
+ * you can change the `entry` in webpack.config to quickly view the examples
+ * For help or questions please contact us at @AngularClass on twitter
+ * or our chat on Slack at https://AngularClass.com/slack-join
+ * or via chat on Gitter at https://gitter.im/AngularClass/angular2-webpack-starter
+ */

lib/v2/posts.ts

@@ -0,0 +1,26 @@
+import 'es6-shim';
+import '@reactivex/rxjs';
+import 'zone.js';
+import 'reflect-metadata';
+
+import {bootstrap, FORM_PROVIDERS, ELEMENT_PROBE_PROVIDERS} from 'angular2/angular2';
+import {ROUTER_PROVIDERS} from 'angular2/router';
+import {HTTP_PROVIDERS} from 'angular2/http';
+
+/*
+ * App Component
+ * our top level component that holds all of our components
+ */
+import {App} from './app';
+
+/*
+ * Bootstrap our Angular app with a top level component `App` and inject
+ * our Services and Providers into Angular's dependency injection
+ */
+bootstrap(App, [
+  // These are dependencies of our App
+  FORM_PROVIDERS,
+  ROUTER_PROVIDERS,
+  HTTP_PROVIDERS,
+  ELEMENT_PROBE_PROVIDERS
+]);

package.json

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+
+    <head>
+        <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+        <title>{%=o.htmlWebpackPlugin.options.pkg.title %}</title>
+        <style>
+            .error {
+                background-color: red;
+            }
+
+            .success {
+                background-color: green;
+            }
+        </style>
+    </head>
+
+    <body>
+        <app>
+          Loading...
+        </app>
+        {% for (var chunk in o.htmlWebpackPlugin.files.chunks) { %}
+        <script src="{%=o.htmlWebpackPlugin.files.chunks[chunk].entry %}"></script>
+        {% } %}
+    </body>
+
+</html>