Skip to content
This repository has been archived by the owner on Apr 17, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into AEROGEAR-8882
Browse files Browse the repository at this point in the history
  • Loading branch information
milenazuccarelli committed Apr 12, 2019
2 parents 0bb0412 + 89c7652 commit fad491b
Show file tree
Hide file tree
Showing 25 changed files with 429 additions and 565 deletions.
10 changes: 5 additions & 5 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
= AeroGear Data Sync Showcase Application

Example application using AeroGear Mobile Services.
Example application using AeroGear Mobile Services.

== Implementation

Expand All @@ -12,7 +12,7 @@ Implementation includes:

=== GraphQL Client

The mobile application uses https://github.com/aerogear/aerogear-js-sdk/tree/master/packages/sync[Voyager Client] to provide additional offline capabilities on top of Apollo GraphQL.
The mobile application uses https://github.com/aerogear/aerogear-js-sdk/tree/master/packages/sync[Voyager Client] to provide additional offline capabilities on top of Apollo GraphQL.

=== GraphQL Server

Expand Down Expand Up @@ -51,7 +51,7 @@ export NODE_TLS_REJECT_UNAUTHORIZED=0
```
====

=== Running the Server on OpenShift (optional)
=== Running the Server on OpenShift (optional)

. Log into your OpenShift instance with the `oc login` command.
. Deploy the Server with PostgreSQL
Expand Down Expand Up @@ -83,7 +83,7 @@ npm install
```

. Browse Ionic 4 app
+
+
```shell
npm run start
```
Expand All @@ -95,7 +95,7 @@ npm run ionic:android
```

NOTE: To connect to the local GraphQL server, when the app is running in the Android emulator,
please change [Client URL](https://github.com/aerogear/apollo-voyager-ionic-example/blob/master/src/app/services/voyager.service.ts#L42) from `localhost` to `10.0.2.2`
change [Client URL](https://github.com/aerogear/ionic-showcase/blob/master/src/app/services/sync/voyager.service.ts#L76) from `localhost` to `10.0.2.2`. Note that Push notifications do not work in an emulator.

=== OpenShift Integration

Expand Down
76 changes: 38 additions & 38 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
},
"private": true,
"dependencies": {
"@aerogear/app": "2.3.1",
"@aerogear/auth": "2.3.1",
"@aerogear/cordova-plugin-aerogear-metrics": "2.3.1",
"@aerogear/push": "2.3.1",
"@aerogear/security": "2.3.1",
"@aerogear/voyager-client": "2.3.1",
"@angular/common": "7.2.8",
"@angular/core": "7.2.8",
"@angular/forms": "7.2.8",
"@angular/http": "7.2.8",
"@angular/platform-browser": "7.2.8",
"@angular/platform-browser-dynamic": "7.2.8",
"@angular/router": "7.2.8",
"@ionic-native/core": "5.2.0",
"@ionic-native/dialogs": "5.2.0",
"@ionic-native/ionic-webview": "5.2.0",
"@ionic-native/local-notifications": "5.2.0",
"@ionic-native/push": "5.2.0",
"@ionic-native/splash-screen": "5.2.0",
"@ionic-native/status-bar": "5.2.0",
"@ionic/angular": "4.1.1",
"@aerogear/app": "2.4.0",
"@aerogear/auth": "2.4.0",
"@aerogear/cordova-plugin-aerogear-metrics": "2.4.0",
"@aerogear/push": "2.4.0",
"@aerogear/security": "2.4.0",
"@aerogear/voyager-client": "2.4.0",
"@angular/common": "7.2.12",
"@angular/core": "7.2.12",
"@angular/forms": "7.2.12",
"@angular/http": "7.2.12",
"@angular/platform-browser": "7.2.12",
"@angular/platform-browser-dynamic": "7.2.12",
"@angular/router": "7.2.12",
"@ionic-native/core": "5.4.0",
"@ionic-native/dialogs": "5.4.0",
"@ionic-native/ionic-webview": "5.4.0",
"@ionic-native/local-notifications": "5.4.0",
"@ionic-native/push": "5.4.0",
"@ionic-native/splash-screen": "5.4.0",
"@ionic-native/status-bar": "5.4.0",
"@ionic/angular": "4.2.0",
"@ionic/storage": "2.2.0",
"apollo-upload-client": "10.0.0",
"cordova-android": "8.0.0",
Expand All @@ -44,40 +44,40 @@
"cordova-plugin-dialogs": "2.0.1",
"cordova-plugin-inappbrowser": "3.0.0",
"cordova-plugin-ionic-keyboard": "2.1.3",
"cordova-plugin-ionic-webview": "4.0.0",
"cordova-plugin-ionic-webview": "4.0.1",
"cordova-plugin-iroot": "0.8.0",
"cordova-plugin-is-debug": "1.0.0",
"cordova-plugin-local-notification": "0.9.0-beta.3",
"cordova-plugin-network-information": "2.0.1",
"cordova-plugin-pincheck": "0.0.6",
"cordova-plugin-splashscreen": "5.0.2",
"cordova-plugin-whitelist": "1.3.3",
"cordova-sqlite-storage": "3.1.0",
"cordova-sqlite-storage": "3.2.0",
"cordova-support-google-services": "1.3.1",
"core-js": "2.6.5",
"graphql": "14.1.1",
"graphql": "14.2.1",
"graphql-tag": "2.10.1",
"phonegap-plugin-multidex": "1.0.0",
"phonegap-plugin-push": "2.2.3",
"rxjs": "6.4.0",
"subscriptions-transport-ws": "0.9.16",
"zone.js": "0.8.29"
"zone.js": "0.9.0"
},
"devDependencies": {
"@angular-devkit/architect": "0.13.5",
"@angular-devkit/build-angular": "0.13.5",
"@angular-devkit/core": "7.3.5",
"@angular-devkit/schematics": "7.3.5",
"@angular/cli": "7.3.5",
"@angular/compiler": "7.2.8",
"@angular/compiler-cli": "7.2.8",
"@angular/language-service": "7.2.8",
"@ionic/angular-toolkit": "1.4.0",
"@types/node": "10.12.30",
"@types/jasmine": "3.3.9",
"@angular-devkit/architect": "0.13.8",
"@angular-devkit/build-angular": "0.13.8",
"@angular-devkit/core": "7.3.8",
"@angular-devkit/schematics": "7.3.8",
"@angular/cli": "7.3.8",
"@angular/compiler": "7.2.12",
"@angular/compiler-cli": "7.2.12",
"@angular/language-service": "7.2.12",
"@ionic/angular-toolkit": "1.5.1",
"@types/node": "10.14.4",
"@types/jasmine": "3.3.12",
"@types/jasminewd2": "2.0.6",
"codelyzer": "4.5.0",
"jasmine-core": "3.3.0",
"jasmine-core": "3.4.0",
"jasmine-spec-reporter": "4.2.1",
"karma": "4.0.1",
"karma-chrome-launcher": "2.2.0",
Expand All @@ -86,7 +86,7 @@
"karma-jasmine-html-reporter": "1.4.0",
"protractor": "5.4.2",
"ts-node": "8.0.3",
"tslint": "5.13.1",
"tslint": "5.15.0",
"typescript": "3.2.4"
},
"cordova": {
Expand Down
8 changes: 4 additions & 4 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"extends": [
"config:base",
":pinVersions",
":assignee(wtrocki)"
":pinVersions"
],
"groupName":"all"
}
"groupName":"all",
"ignoreDeps": ["typescript", "ts-node", "core-js"]
}
Loading

0 comments on commit fad491b

Please sign in to comment.