Skip to content

Commit

Permalink
Migrate to Ionic 4
Browse files Browse the repository at this point in the history
  • Loading branch information
ralscha committed Dec 5, 2018
1 parent c93dd2a commit a169d3d
Show file tree
Hide file tree
Showing 471 changed files with 4,115 additions and 22,387 deletions.
28 changes: 12 additions & 16 deletions push/client/.editorconfig
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
# editorconfig.org

root = true

[*]
indent_style = space
indent_size = 2

# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
insert_final_newline = false
trim_trailing_whitespace = false
8 changes: 4 additions & 4 deletions push/client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ log.txt
npm-debug.log*

.idea/
.ionic/
.sourcemaps/
.sass-cache/
.tmp/
.versions/
coverage/
dist/
www/
node_modules/
tmp/
temp/
hooks/
platforms/
plugins/
plugins/android.json
plugins/ios.json
www/
$RECYCLE.BIN/

.DS_Store
Thumbs.db
UserInterfaceState.xcuserstate
/.sourcemaps/
google-services.json
126 changes: 126 additions & 0 deletions push/client/angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
{
"$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
"version": 1,
"defaultProject": "app",
"newProjectRoot": "projects",
"projects": {
"app": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "www",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
{
"glob": "**/*",
"input": "src/assets",
"output": "assets"
}
],
"styles": [
{
"input": "src/theme/variables.scss"
},
{
"input": "src/global.scss"
}
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "app:build"
},
"configurations": {
"production": {
"browserTarget": "app:build:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"ionic-cordova-build": {
"builder": "@ionic/angular-toolkit:cordova-build",
"options": {
"browserTarget": "app:build"
},
"configurations": {
"production": {
"browserTarget": "app:build:production"
}
}
},
"ionic-cordova-serve": {
"builder": "@ionic/angular-toolkit:cordova-serve",
"options": {
"cordovaBuildTarget": "app:ionic-cordova-build",
"devServerTarget": "app:serve"
},
"configurations": {
"production": {
"cordovaBuildTarget": "app:ionic-cordova-build:production",
"devServerTarget": "app:serve:production"
}
}
}
}
}
},
"cli": {
"defaultCollection": "@ionic/angular-toolkit"
},
"schematics": {
"@ionic/angular-toolkit:component": {
"styleext": "scss"
},
"@ionic/angular-toolkit:page": {
"styleext": "scss"
}
}
}
86 changes: 0 additions & 86 deletions push/client/config.xml

This file was deleted.

14 changes: 7 additions & 7 deletions push/client/google-services.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"project_info": {
"project_number": "220709513681",
"firebase_url": "https://demoproject-91348.firebaseio.com",
"project_id": "demoproject-91348",
"storage_bucket": "demoproject-91348.appspot.com"
"project_number": "532700130849",
"firebase_url": "https://pushdemo-91541.firebaseio.com",
"project_id": "pushdemo-91541",
"storage_bucket": "pushdemo-91541.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:220709513681:android:613f8f86b87d2b4f",
"mobilesdk_app_id": "1:532700130849:android:613f8f86b87d2b4f",
"android_client_info": {
"package_name": "com.ionicframework.push124502"
}
},
"oauth_client": [
{
"client_id": "220709513681-7isjikse3i19kusmk3cl78o3bh9fsim3.apps.googleusercontent.com",
"client_id": "532700130849-3jkdct47910lrqg4nsr672gglt88gsee.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCTQpeScxALD5NVvuyQsDG8tlEEDB7IuYs"
"current_key": "AIzaSyAvOyd-swn7C98RrT5ToMmkjeewl4cgr44"
}
],
"services": {
Expand Down
5 changes: 5 additions & 0 deletions push/client/install_cordova.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
1. npm install
2. ionic cordova prepare android
3. Compare <widget id="..." in config.xml with package name in Firebase file
3. ionic cordova plugin add cordova-plugin-firebase
5. ionic cordova run android
9 changes: 3 additions & 6 deletions push/client/ionic.config.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"name": "push",
"integrations": {
"cordova": {}
},
"type": "ionic-angular",
"hooks": {}
}
"integrations": {},
"type": "angular"
}
Loading

0 comments on commit a169d3d

Please sign in to comment.