Merge pull request #79 from Enngage/master

Upgrade to kentico-cloud-delivery v4

examples/hoc/package.json

@@ -3,7 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "kentico-cloud-delivery-typescript-sdk": "2.0.0",
+    "kentico-cloud-delivery": "4.0.1",
+    "rxjs": "6.1.0",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
     "react-scripts": "1.1.1"

examples/hoc/src/Components/ArticleModel.js

@@ -1,4 +1,4 @@
-import {  ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import {  ContentItem } from 'kentico-cloud-delivery';
 
 export class Article extends ContentItem {
    constructor(){

examples/hoc/src/Components/deliveryClientConfig.js

@@ -1,6 +1,9 @@
-import { DeliveryClientConfig, TypeResolver } from "kentico-cloud-delivery-typescript-sdk";
+import { TypeResolver } from "kentico-cloud-delivery";
 import { Article } from './ArticleModel';
 
-export default new DeliveryClientConfig("975bf280-fd91-488c-994c-2f04416e5ee3",[
-    new TypeResolver('article', () => new Article())
-]);
+export default config = {
+    projectId: '975bf280-fd91-488c-994c-2f04416e5ee3',
+    typeResolvers: [
+        new TypeResolver('article', () => new Article())
+    ]
+}

examples/hoc/src/Components/withDeliveryClient.js

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { DeliveryClient } from "kentico-cloud-delivery-typescript-sdk";
+import { DeliveryClient } from "kentico-cloud-delivery";
 
 
 export default function withDeliveryClient(config) {

package.json

@@ -10,14 +10,14 @@
   "dependencies": {
     "google-maps-react": "^1.1.2",
     "immutable": "^3.8.2",
-    "kentico-cloud-delivery-typescript-sdk": "3.0.1",
+    "kentico-cloud-delivery": "^4.0.1",
     "lodash": "^4.17.4",
     "react": "^15.3.1",
     "react-dom": "^15.3.1",
     "react-router-dom": "^4.2.2",
     "react-scroll": "^1.6.4",
     "react-translate": "^6.0.0",
-    "rxjs": "^5.5.7",
+    "rxjs": "^6.1.0",
     "twitter-widgets": "^1.0.0"
   },
   "scripts": {

src/Client.js

@@ -1,23 +1,23 @@
 // kentico cloud
-import { DeliveryClient, DeliveryClientConfig, TypeResolver } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import { DeliveryClient, TypeResolver } from 'kentico-cloud-delivery';
 
 const projectId = '975bf280-fd91-488c-994c-2f04416e5ee3';
-const previewApiKey = "";
+const previewApiKey = '';
 
 // models
-import { AboutUs } from './Models/AboutUs'
-import { Accessory } from './Models/Accessory'
-import { Article } from './Models/Article'
-import { Brewer } from './Models/Brewer'
-import { Cafe } from './Models/Cafe'
-import { Coffee } from './Models/Coffee'
-import { FactAboutUs } from './Models/FactAboutUs'
-import { Grinder } from './Models/Grinder'
-import { HeroUnit } from './Models/HeroUnit'
-import { Home } from './Models/Home'
-import { HostedVideo } from './Models/HostedVideo'
-import { Office } from './Models/Office'
-import { Tweet } from './Models/Tweet'
+import { AboutUs } from './Models/AboutUs';
+import { Accessory } from './Models/Accessory';
+import { Article } from './Models/Article';
+import { Brewer } from './Models/Brewer';
+import { Cafe } from './Models/Cafe';
+import { Coffee } from './Models/Coffee';
+import { FactAboutUs } from './Models/FactAboutUs';
+import { Grinder } from './Models/Grinder';
+import { HeroUnit } from './Models/HeroUnit';
+import { Home } from './Models/Home';
+import { HostedVideo } from './Models/HostedVideo';
+import { Office } from './Models/Office';
+import { Tweet } from './Models/Tweet';
 
 // configure type resolvers
 let typeResolvers = [
@@ -36,16 +36,8 @@ let typeResolvers = [
   new TypeResolver('tweet', () => new Tweet())
 ];
 
-
-function isPreview() {
-  return previewApiKey !== "";
-}
-
-export default new DeliveryClient(
-  new DeliveryClientConfig(projectId, typeResolvers,
-    {
-      enablePreviewMode: isPreview(),
-      previewApiKey: previewApiKey
-    }
-  )
-)
+export default new DeliveryClient({
+  projectId: projectId,
+  typeResolvers: typeResolvers,
+  previewApiKey: previewApiKey
+});

src/Models/AboutUs.js

@@ -1,4 +1,4 @@
-import {  ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import {  ContentItem } from 'kentico-cloud-delivery';
 import {  resolveContentLink } from '../Utilities/ContentLinks';
 
 export class AboutUs extends ContentItem {

src/Models/Accessory.js

@@ -1,4 +1,4 @@
-import {  ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import {  ContentItem } from 'kentico-cloud-delivery';
 import {  resolveContentLink } from '../Utilities/ContentLinks';
 
 export class Accessory extends ContentItem {

src/Models/Article.js

@@ -1,4 +1,4 @@
-import {  ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import {  ContentItem } from 'kentico-cloud-delivery';
 import {  resolveContentLink } from '../Utilities/ContentLinks';
 
 export class Article extends ContentItem {

src/Models/Brewer.js

@@ -1,4 +1,4 @@
-import {  ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import {  ContentItem } from 'kentico-cloud-delivery';
 import {  resolveContentLink } from '../Utilities/ContentLinks';
 
 export class Brewer extends ContentItem {

src/Models/Cafe.js

@@ -1,4 +1,4 @@
-import {  ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import {  ContentItem } from 'kentico-cloud-delivery';
 import {  resolveContentLink } from '../Utilities/ContentLinks';
 
 export class Cafe extends ContentItem {

src/Models/Coffee.js

@@ -1,4 +1,4 @@
-import {  ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import {  ContentItem } from 'kentico-cloud-delivery';
 import {  resolveContentLink } from '../Utilities/ContentLinks';
 
 export class Coffee extends ContentItem {

src/Models/FactAboutUs.js

@@ -1,4 +1,4 @@
-import { ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import { ContentItem } from 'kentico-cloud-delivery';
 
 export class FactAboutUs extends ContentItem {     
 }

src/Models/Grinder.js

@@ -1,4 +1,4 @@
-import {  ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import {  ContentItem } from 'kentico-cloud-delivery';
 import {  resolveContentLink } from '../Utilities/ContentLinks';
 
 export class Grinder extends ContentItem {

src/Models/HeroUnit.js

@@ -1,4 +1,4 @@
-import {  ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import {  ContentItem } from 'kentico-cloud-delivery';
 import {  resolveContentLink } from '../Utilities/ContentLinks';
 
 export class HeroUnit extends ContentItem {

src/Models/Home.js

@@ -1,4 +1,4 @@
-import {  ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import {  ContentItem } from 'kentico-cloud-delivery';
 import {  resolveContentLink } from '../Utilities/ContentLinks';
 
 export class Home extends ContentItem {

src/Models/HostedVideo.js

@@ -1,4 +1,4 @@
-import {  ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import {  ContentItem } from 'kentico-cloud-delivery';
 import {  resolveContentLink } from '../Utilities/ContentLinks';
 
 export class HostedVideo extends ContentItem {

src/Models/Office.js

@@ -1,4 +1,4 @@
-import {  ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import {  ContentItem } from 'kentico-cloud-delivery';
 import {  resolveContentLink } from '../Utilities/ContentLinks';
 
 export class Office extends ContentItem {

src/Models/Tweet.js

@@ -1,4 +1,4 @@
-import { ContentItem } from 'kentico-cloud-delivery-typescript-sdk/_bundles';
+import { ContentItem } from 'kentico-cloud-delivery';
 import { resolveContentLink } from '../Utilities/ContentLinks';
 import TwitterWidgetsLoader from 'twitter-widgets';