diff --git a/.firebaserc b/.firebaserc
index 2e1e7524..65b7d895 100644
--- a/.firebaserc
+++ b/.firebaserc
@@ -1,5 +1,6 @@
{
"projects": {
- "default": "feedlyapp-9df9a"
+ "default": "feedlyapp-9df9a",
+ "Thomax": "myapp-93470"
}
-}
+}
\ No newline at end of file
diff --git a/GoogleService-Info.plist b/GoogleService-Info.plist
index da9a86a4..3a86231a 100644
--- a/GoogleService-Info.plist
+++ b/GoogleService-Info.plist
@@ -7,21 +7,21 @@
AD_UNIT_ID_FOR_INTERSTITIAL_TEST
ca-app-pub-3940256099942544/4411468910
CLIENT_ID
- 197049247480-pte881jhuqqreo10mmgo47450ubfckvc.apps.googleusercontent.com
+ 412208839835-k4v5ldns137gn5i9v95qal2j0etpffhf.apps.googleusercontent.com
REVERSED_CLIENT_ID
- com.googleusercontent.apps.197049247480-pte881jhuqqreo10mmgo47450ubfckvc
+ com.googleusercontent.apps.412208839835-k4v5ldns137gn5i9v95qal2j0etpffhf
API_KEY
- AIzaSyC6JVSL8ji4DVXzMRb1F6w10MZic_iaSu0
+ AIzaSyAik3zzg5KJb2P6TLsw1YcAtrSqkDmx2FA
GCM_SENDER_ID
- 197049247480
+ 412208839835
PLIST_VERSION
1
BUNDLE_ID
- com.samarthagarwal.feedly
+ com.angularfirebase.feedlyapp
PROJECT_ID
- feedlyapp-9df9a
+ myapp-93470
STORAGE_BUCKET
- feedlyapp-9df9a.appspot.com
+ myapp-93470.appspot.com
IS_ADS_ENABLED
IS_ANALYTICS_ENABLED
@@ -33,8 +33,8 @@
IS_SIGNIN_ENABLED
GOOGLE_APP_ID
- 1:197049247480:ios:837a40b37429f47d
+ 1:412208839835:ios:12eabe2529e1e258
DATABASE_URL
- https://feedlyapp-9df9a.firebaseio.com
+ https://myapp-93470.firebaseio.com
\ No newline at end of file
diff --git a/config.xml b/config.xml
index 082d83ec..6d98a1ed 100644
--- a/config.xml
+++ b/config.xml
@@ -19,6 +19,8 @@
+
+
@@ -82,7 +84,9 @@
-
-
+
+
+
+
diff --git a/firebase.json b/firebase.json
index 67a15010..36aed667 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1,8 +1,6 @@
{
"functions": {
"predeploy": [
- "npm --prefix \"$RESOURCE_DIR\" run lint",
- "npm --prefix \"$RESOURCE_DIR\" run build"
]
}
}
diff --git a/functions/package-lock.json b/functions/package-lock.json
index c3034e1f..05b55061 100644
--- a/functions/package-lock.json
+++ b/functions/package-lock.json
@@ -2160,13 +2160,6 @@
"version": "3.0.2",
"bundled": true
},
- "string_decoder": {
- "version": "1.1.1",
- "bundled": true,
- "requires": {
- "safe-buffer": "5.1.2"
- }
- },
"string-width": {
"version": "1.0.2",
"bundled": true,
@@ -2176,6 +2169,13 @@
"strip-ansi": "3.0.1"
}
},
+ "string_decoder": {
+ "version": "1.1.1",
+ "bundled": true,
+ "requires": {
+ "safe-buffer": "5.1.2"
+ }
+ },
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
@@ -3614,14 +3614,6 @@
"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
},
- "string_decoder": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "requires": {
- "safe-buffer": "5.1.2"
- }
- },
"string-format-obj": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.1.tgz",
@@ -3637,6 +3629,14 @@
"strip-ansi": "3.0.1"
}
},
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "5.1.2"
+ }
+ },
"stringifier": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/stringifier/-/stringifier-1.3.0.tgz",
diff --git a/functions/src/index.ts b/functions/src/index.ts
index 64bfbfe2..d0610692 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -8,7 +8,7 @@ const sendNotification = (owner_uid, type) => {
return new Promise((resolve, reject) => {
return admin.firestore().collection("users").doc(owner_uid).get().then((doc) => {
if(doc.exists && doc.data().token){
-
+
if(type === "new_comment"){
admin.messaging().sendToDevice(doc.data().token, {
data: {
@@ -34,12 +34,12 @@ const sendNotification = (owner_uid, type) => {
reject(err)
});
}
-
+
}
})
})
-
+
}
diff --git a/google-services.json b/google-services.json
index a4e3e550..eb3a7c96 100644
--- a/google-services.json
+++ b/google-services.json
@@ -1,39 +1,58 @@
{
"project_info": {
- "project_number": "197049247480",
- "firebase_url": "https://feedlyapp-9df9a.firebaseio.com",
- "project_id": "feedlyapp-9df9a",
- "storage_bucket": "feedlyapp-9df9a.appspot.com"
+ "project_number": "412208839835",
+ "firebase_url": "https://myapp-93470.firebaseio.com",
+ "project_id": "myapp-93470",
+ "storage_bucket": "myapp-93470.appspot.com"
},
"client": [
{
"client_info": {
- "mobilesdk_app_id": "1:197049247480:android:e3fc01e7c2026042",
+ "mobilesdk_app_id": "1:412208839835:android:38b33d55f1e958fc",
"android_client_info": {
- "package_name": "com.samarth.feedly"
+ "package_name": "com.angularfirebase.dynamicsapp"
}
},
"oauth_client": [
{
- "client_id": "197049247480-bvukna7n25onr6ua9i6btss7ul28l1fu.apps.googleusercontent.com",
- "client_type": 1,
- "android_info": {
- "package_name": "com.samarth.feedly",
- "certificate_hash": "2dc06eb9e644b92694635b2348a6a576fedca1cd"
- }
- },
- {
- "client_id": "197049247480-1p3d172acr19rbht1g3q06uos6mmva8g.apps.googleusercontent.com",
+ "client_id": "412208839835-g6bjlkhlmuu4gr3mqd7o8u2c1cq9ehhl.apps.googleusercontent.com",
"client_type": 3
+ }
+ ],
+ "api_key": [
+ {
+ "current_key": "AIzaSyAZ-ySgQVZ1E4cqed8C4RestGdTy73zKzQ"
+ }
+ ],
+ "services": {
+ "analytics_service": {
+ "status": 1
},
+ "appinvite_service": {
+ "status": 1,
+ "other_platform_oauth_client": []
+ },
+ "ads_service": {
+ "status": 2
+ }
+ }
+ },
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:412208839835:android:12eabe2529e1e258",
+ "android_client_info": {
+ "package_name": "com.angularfirebase.feedlyapp"
+ }
+ },
+ "oauth_client": [
{
- "client_id": "197049247480-1p3d172acr19rbht1g3q06uos6mmva8g.apps.googleusercontent.com",
+ "client_id": "412208839835-g6bjlkhlmuu4gr3mqd7o8u2c1cq9ehhl.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
- "current_key": "AIzaSyC16T8soYwFgd4ZxWpeeH-yKNaFyyeX9cU"
+ "current_key": "AIzaSyAZ-ySgQVZ1E4cqed8C4RestGdTy73zKzQ"
}
],
"services": {
@@ -41,13 +60,8 @@
"status": 1
},
"appinvite_service": {
- "status": 2,
- "other_platform_oauth_client": [
- {
- "client_id": "197049247480-1p3d172acr19rbht1g3q06uos6mmva8g.apps.googleusercontent.com",
- "client_type": 3
- }
- ]
+ "status": 1,
+ "other_platform_oauth_client": []
},
"ads_service": {
"status": 2
diff --git a/ionic.config.json b/ionic.config.json
index 58635196..83826e14 100644
--- a/ionic.config.json
+++ b/ionic.config.json
@@ -1,8 +1,7 @@
{
"name": "Feedly",
- "type": "ionic-angular",
"integrations": {
"cordova": {}
},
- "app_id": ""
-}
+ "type": "ionic-angular"
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 5e9612db..dd47e646 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -100,11 +100,11 @@
}
},
"@firebase/app": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.3.2.tgz",
- "integrity": "sha512-YtZHWkf/6NfePt520ZA1+ntVx/4JmRL6G/Fqykn+d/gM/FKxW3jvp0p5ZThjiC3dD5MVvpl8kUCLGTYc1mzMnA==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.3.3.tgz",
+ "integrity": "sha512-V5fMC2Ysx1TlHD6x7vj7EOtoyJSU/ts+fp9qxt0E3TA+DbWgKFrkcL+o2jZhi30h0sXKV7oW0vh67YZdZylqOg==",
"requires": {
- "@firebase/app-types": "0.3.1",
+ "@firebase/app-types": "0.3.2",
"@firebase/util": "0.2.1",
"dom-storage": "2.1.0",
"tslib": "1.9.0",
@@ -119,29 +119,29 @@
}
},
"@firebase/app-types": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.3.1.tgz",
- "integrity": "sha512-DjdBY3dC6w7bIcTiGjBm2wNbWml3HA5JdIwOntrhRkmxSGWMxdkd4PxPFqAj3OES47PAUjcU/4lKW6/TJYB18g=="
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.3.2.tgz",
+ "integrity": "sha512-ZD8lTgW07NGgo75bTyBJA8Lt9+NweNzot7lrsBtIvfciwUzaFJLsv2EShqjBeuhF7RpG6YFucJ6m67w5buCtzw=="
},
"@firebase/auth": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.5.2.tgz",
- "integrity": "sha512-G2U51dEKO2jyXwOw0Ga2tQ3J2JR1gG+gajNC4ErIVhwvxdhlkewkzx+J/Thb3rjsB9z4//cw3KzPgQoqUe6UJg==",
+ "version": "0.7.2",
+ "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.7.2.tgz",
+ "integrity": "sha512-PeCPaK3axD5Ad4+S5FtaBwyaKeRNXH6a44Koy0MLiKxjFjRjfsICOiNkSzzZ+jxqAPctdM6noe3Ck/VzDiyYPA==",
"requires": {
- "@firebase/auth-types": "0.3.2"
+ "@firebase/auth-types": "0.3.4"
}
},
"@firebase/auth-types": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.3.2.tgz",
- "integrity": "sha512-u3Xbe9l90NDCdjb3G4O/oczKf6Q8bJe4rcRMCPva+Rr1dbjhTaYwHhtVYUqY3c64TPwcYT0+ahCEYmwfDmfsZA=="
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.3.4.tgz",
+ "integrity": "sha512-0r3gSQk9jw5orFHCTUIgao0zan6dHt2J0BO3t/uEzbod+uwqvUn/gh+yg+kK6HX92Fg8E7y030KX4Bw/aXt0Ew=="
},
"@firebase/database": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.3.2.tgz",
- "integrity": "sha512-ImJVv8DKaaXghm+yjZSuAVfJOMVDDGDK+bW4FGJigQDr55BzWFHzg35ZwVN4dVKOehMkRqlKuVT0WFYm/20I5Q==",
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.3.4.tgz",
+ "integrity": "sha512-xsQPk4MJq8KuuEq0QXYVWsQc+ksMeoYpmiYWM9UWIoT20PqmZ2WHmxLkVW7xFnM55wsawJ2FtW/Nan9uMhS1nw==",
"requires": {
- "@firebase/database-types": "0.3.1",
+ "@firebase/database-types": "0.3.2",
"@firebase/logger": "0.1.1",
"@firebase/util": "0.2.1",
"faye-websocket": "0.11.1",
@@ -164,19 +164,19 @@
}
},
"@firebase/database-types": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.3.1.tgz",
- "integrity": "sha512-1LuRusZhkCr00kZVrLhElUvo3w5Cwcfk4eAtIIRnZIQC364XZUf9FnTLSl6DaQeqNA2kYvOZd1zMb5iquUP+lg=="
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.3.2.tgz",
+ "integrity": "sha512-9ZYdvYQ6r3aaHJarhUM5Hf6lQWu3ZJme+RR0o8qfBb9L04TL3uNjt+AJFku1ysVPntTn+9GqJjiIB2/OC3JtwA=="
},
"@firebase/firestore": {
- "version": "0.5.3",
- "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-0.5.3.tgz",
- "integrity": "sha512-cyb1paEW0njtR6CXzvq6D1XmIz8RruWHtfgk80lO9ZWkoEJWE1V4xYU9G7Tt73XTLi0iVKm/1NHQL4MOoZhsDQ==",
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-0.6.1.tgz",
+ "integrity": "sha512-gy8B3eKrbJt5c+kAMwjQpWrHBMAYPvXtiv4ptRMbrrzeoltQhLPBQzapkkxTQrFLUN6avObCt+HU8bcDOFSiuA==",
"requires": {
- "@firebase/firestore-types": "0.4.2",
+ "@firebase/firestore-types": "0.5.0",
"@firebase/logger": "0.1.1",
"@firebase/webchannel-wrapper": "0.2.8",
- "grpc": "1.11.3",
+ "grpc": "1.13.1",
"tslib": "1.9.0"
},
"dependencies": {
@@ -188,24 +188,32 @@
}
},
"@firebase/firestore-types": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-0.4.2.tgz",
- "integrity": "sha512-r1lHTAqrNk80c0xhi5Mvhw4hoODWmy/5GfL1PQUiiiLpviReU+A2VGr21PnFPYci2qcesvkHNkzboIQviNhCkQ=="
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-0.5.0.tgz",
+ "integrity": "sha512-BXqPnq/hm/YusKqtZUZ7ODSIUxOgHinxHJ07SJiIoP9Tq1uzHqrccv9++eClXWn47Rls7wehI8IYuZ1b2AVC5A=="
},
"@firebase/functions": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.2.3.tgz",
- "integrity": "sha512-Ipzadg7V46cLvvf1yqT/8bPQHWCDICkvYyl04B6+ctJiPBL4tdz/hUnOPoVU7EJ3bhmhdi/agRMAfjdi8v4nhA==",
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.3.0.tgz",
+ "integrity": "sha512-bCJmcniVbCdPcydI+CdeEkDidlBnJRsc667ETvljwfnp+df4Em2ZSqcEG8DApzuyd+uI+rYFCvwX5FS4pkFkcA==",
"requires": {
- "@firebase/functions-types": "0.1.2",
- "@firebase/messaging-types": "0.2.2",
- "isomorphic-fetch": "2.2.1"
+ "@firebase/functions-types": "0.2.0",
+ "@firebase/messaging-types": "0.2.3",
+ "isomorphic-fetch": "2.2.1",
+ "tslib": "1.9.0"
+ },
+ "dependencies": {
+ "tslib": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz",
+ "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ=="
+ }
}
},
"@firebase/functions-types": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.1.2.tgz",
- "integrity": "sha512-m/spdruWxEK7TPJwvmhMkNtXLPDNVSSdxEnswVPAChv8jHtiKWPsy4gUecnclQo/1q6LW8wqHFuagritasRp7Q=="
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.2.0.tgz",
+ "integrity": "sha512-q1FB3YKEAnWd+FpIL5Xn0B1BXO2IowrAdrSViXkFxNZVpp9iCzQ8Ytcbr3V1xUr3dnmoW/V7zkZJZGuwBgiVhw=="
},
"@firebase/logger": {
"version": "0.1.1",
@@ -213,11 +221,11 @@
"integrity": "sha512-5jn3HHbEfdOwychyIEIkP1cik+MW/vvoOavTOzwDkH+fv6Bx+HBUOzh09M7sCYzXFtKzjbUax9+g39mJNBLklQ=="
},
"@firebase/messaging": {
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.3.3.tgz",
- "integrity": "sha512-IoLEJ7B5X/BHHX7xQxppIDt/JgMtiqaGfZwMbFqhewwbBlhiauP8ukEEVVbrFBttHrtlq57psQ18cE3uQ47YRQ==",
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.3.5.tgz",
+ "integrity": "sha512-+FkrW+li/QOqSXUGipOEvqPUSy1/ZH7zibB63UtRHy3LSwxn5PZ6lKgaeCVkWZBwCHm92riHrjR0cpRhE4+4SQ==",
"requires": {
- "@firebase/messaging-types": "0.2.2",
+ "@firebase/messaging-types": "0.2.3",
"@firebase/util": "0.2.1",
"tslib": "1.9.0"
},
@@ -230,14 +238,14 @@
}
},
"@firebase/messaging-types": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.2.2.tgz",
- "integrity": "sha512-1XpMWpMJRg9H0CKWaG5CIn6l1vA1nZ7lxNCO3MEt6SfmMhWVpWUMNyXPVVY0r33sL2enfUE7VH7EDsY1I5p6JA=="
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.2.3.tgz",
+ "integrity": "sha512-avwCgZzcx2uxIW/wT3p3G/EyHftIrvMyiTS7AA7dxDlzfx+8dpAeTsb1+jsHJT4F6foSh5HG17Nw8sDzYuxH1Q=="
},
"@firebase/polyfill": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.2.tgz",
- "integrity": "sha512-ATr65F02ZDLOAk+MDeW4+nl9jNE07Wl7s0+SujPyzafgygXT05go66n3De54AQuTM7g/R+s4o33wE8O4PXpwLg==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.3.tgz",
+ "integrity": "sha512-xs8IZf1WEbufYXyfV8YjmiFZOaujRRq0T03NteihYfuGVTTym7z5SmvLvEHLEUjf2fgeobPEzZ2JgrCQHS+QHw==",
"requires": {
"core-js": "2.5.5",
"promise-polyfill": "7.1.2",
@@ -245,11 +253,11 @@
}
},
"@firebase/storage": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.2.2.tgz",
- "integrity": "sha512-zAnWDX4RfHqRRdzeKQlj37jT3ibekfsIBa6MTCYBwqtwRjf0ThnQDoySLogJi+foSrRr0pLgZHahAXJ6wZOhFQ==",
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.2.3.tgz",
+ "integrity": "sha512-2sq5jckWszW53gfQMkPNc7EumJ92oErRhzGJANbVzBumwR8qwKZU8/I+/uV9SPK1tVmSUc3S21jdoW5oOJVEuA==",
"requires": {
- "@firebase/storage-types": "0.2.2",
+ "@firebase/storage-types": "0.2.3",
"tslib": "1.9.0"
},
"dependencies": {
@@ -261,9 +269,9 @@
}
},
"@firebase/storage-types": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.2.2.tgz",
- "integrity": "sha512-SNPDaEUtf9MB8sjEzxH+DChLpXkb3VUOtuj33Vis+wRrFlfUg7dF+EYU3JH0svjDApdgLQTZR7P49z0ClGD2tg=="
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.2.3.tgz",
+ "integrity": "sha512-RaZeam2LgsB7xwAtOQr4G0Geoyf7D5TnLF3a12By6Rh0Z9PqBSlWn0SVYGW3SkmxIdqvWZMZvCyamUlqQvQzWw=="
},
"@firebase/util": {
"version": "0.2.1",
@@ -296,9 +304,9 @@
"integrity": "sha512-BT4a9qIl3qfJMukcfMPtXDAAsOrYIAoVQvCodDZhqGExTakIx0/JlOr+lZa6KEU46CoA1SEctcBjj0N+nNcWOw=="
},
"@ionic-native/firebase": {
- "version": "4.7.0",
- "resolved": "https://registry.npmjs.org/@ionic-native/firebase/-/firebase-4.7.0.tgz",
- "integrity": "sha512-fK/QE8k6ri6748Ri9NRMQbUeG2Un6bfepGjoodxg4HWrauJml4f5v2xbCb/gYOp/h/1ObK81dosncLy7QdRxxw=="
+ "version": "4.11.0",
+ "resolved": "https://registry.npmjs.org/@ionic-native/firebase/-/firebase-4.11.0.tgz",
+ "integrity": "sha512-gceCKcDGZ8sCeHmJruYHJEMUUejQFXgmidvpJEWzhHVn71WYzPvO7XiAqdVaaOxeB9568u5YvqqTVCnKMfti9Q=="
},
"@ionic-native/splash-screen": {
"version": "4.7.0",
@@ -431,6 +439,11 @@
"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
},
+ "angularfire2": {
+ "version": "5.0.0-rc.11",
+ "resolved": "https://registry.npmjs.org/angularfire2/-/angularfire2-5.0.0-rc.11.tgz",
+ "integrity": "sha512-Jr6uEquMRuJSgYTw8YxNkDwpkvg2CDJtLlQD0AdMXYoUAwcgsIE4ar7qatIJ2/fwX12TO+oPooCyr0G4GjdwXQ=="
+ },
"ansi-regex": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -1301,12 +1314,12 @@
"dev": true
},
"cordova-android": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.0.0.tgz",
- "integrity": "sha1-yVvt/PvDhjsYDE0p7/7E95Nh0Z0=",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.0.tgz",
+ "integrity": "sha1-HNNu57nRm61Q0+mEK3Mf5ZCSTdU=",
"requires": {
- "android-versions": "1.2.1",
- "cordova-common": "2.2.0",
+ "android-versions": "1.3.0",
+ "cordova-common": "2.2.1",
"elementtree": "0.1.6",
"nopt": "3.0.6",
"properties-parser": "0.2.3",
@@ -1319,8 +1332,11 @@
"bundled": true
},
"android-versions": {
- "version": "1.2.1",
- "bundled": true
+ "version": "1.3.0",
+ "bundled": true,
+ "requires": {
+ "semver": "5.5.0"
+ }
},
"ansi": {
"version": "0.3.1",
@@ -1346,7 +1362,7 @@
}
},
"brace-expansion": {
- "version": "1.1.8",
+ "version": "1.1.11",
"bundled": true,
"requires": {
"balanced-match": "1.0.0",
@@ -1358,7 +1374,7 @@
"bundled": true
},
"cordova-common": {
- "version": "2.2.0",
+ "version": "2.2.1",
"bundled": true,
"requires": {
"ansi": "0.3.1",
@@ -1367,10 +1383,10 @@
"elementtree": "0.1.6",
"glob": "5.0.15",
"minimatch": "3.0.4",
- "osenv": "0.1.4",
+ "osenv": "0.1.5",
"plist": "1.2.0",
"q": "1.5.1",
- "semver": "5.4.1",
+ "semver": "5.5.0",
"shelljs": "0.5.3",
"underscore": "1.8.3",
"unorm": "1.4.1"
@@ -1384,9 +1400,492 @@
"version": "0.1.6",
"bundled": true,
"requires": {
- "sax": "0.3.5"
+ "sax": "0.3.5"
+ }
+ },
+ "glob": {
+ "version": "5.0.15",
+ "bundled": true,
+ "requires": {
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
+ }
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "bundled": true,
+ "requires": {
+ "once": "1.4.0",
+ "wrappy": "1.0.2"
+ }
+ },
+ "inherits": {
+ "version": "2.0.3",
+ "bundled": true
+ },
+ "lodash": {
+ "version": "3.10.1",
+ "bundled": true
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "bundled": true,
+ "requires": {
+ "brace-expansion": "1.1.11"
+ }
+ },
+ "nopt": {
+ "version": "3.0.6",
+ "bundled": true,
+ "requires": {
+ "abbrev": "1.1.1"
+ }
+ },
+ "once": {
+ "version": "1.4.0",
+ "bundled": true,
+ "requires": {
+ "wrappy": "1.0.2"
+ }
+ },
+ "os-homedir": {
+ "version": "1.0.2",
+ "bundled": true
+ },
+ "os-tmpdir": {
+ "version": "1.0.2",
+ "bundled": true
+ },
+ "osenv": {
+ "version": "0.1.5",
+ "bundled": true,
+ "requires": {
+ "os-homedir": "1.0.2",
+ "os-tmpdir": "1.0.2"
+ }
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "bundled": true
+ },
+ "plist": {
+ "version": "1.2.0",
+ "bundled": true,
+ "requires": {
+ "base64-js": "0.0.8",
+ "util-deprecate": "1.0.2",
+ "xmlbuilder": "4.0.0",
+ "xmldom": "0.1.27"
+ }
+ },
+ "properties-parser": {
+ "version": "0.2.3",
+ "bundled": true
+ },
+ "q": {
+ "version": "1.5.1",
+ "bundled": true
+ },
+ "sax": {
+ "version": "0.3.5",
+ "bundled": true
+ },
+ "semver": {
+ "version": "5.5.0",
+ "bundled": true
+ },
+ "shelljs": {
+ "version": "0.5.3",
+ "bundled": true
+ },
+ "underscore": {
+ "version": "1.8.3",
+ "bundled": true
+ },
+ "unorm": {
+ "version": "1.4.1",
+ "bundled": true
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "bundled": true
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "bundled": true
+ },
+ "xmlbuilder": {
+ "version": "4.0.0",
+ "bundled": true,
+ "requires": {
+ "lodash": "3.10.1"
+ }
+ },
+ "xmldom": {
+ "version": "0.1.27",
+ "bundled": true
+ }
+ }
+ },
+ "cordova-browser": {
+ "version": "5.0.4",
+ "resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-5.0.4.tgz",
+ "integrity": "sha512-EDuG+9NGsaYpNSY6wF0kR34m1m38V+nRglGXxQ609fgMYrMHEYR2lg38nDr1Os4qeF0LJz8UQ7nq7Y+idg6Aig==",
+ "requires": {
+ "abbrev": "1.1.1",
+ "accepts": "1.3.5",
+ "ansi": "0.3.1",
+ "ansi-regex": "2.1.1",
+ "ansi-styles": "2.2.1",
+ "array-flatten": "1.1.1",
+ "balanced-match": "1.0.0",
+ "base64-js": "1.2.0",
+ "big-integer": "1.6.32",
+ "body-parser": "1.18.2",
+ "bplist-parser": "0.1.1",
+ "brace-expansion": "1.1.11",
+ "bytes": "3.0.0",
+ "chalk": "1.1.3",
+ "compressible": "2.0.14",
+ "compression": "1.7.2",
+ "concat-map": "0.0.1",
+ "content-disposition": "0.5.2",
+ "content-type": "1.0.4",
+ "cookie": "0.3.1",
+ "cookie-signature": "1.0.6",
+ "cordova-common": "2.2.5",
+ "cordova-registry-mapper": "1.1.15",
+ "cordova-serve": "2.0.1",
+ "debug": "2.6.9",
+ "depd": "1.1.2",
+ "destroy": "1.0.4",
+ "ee-first": "1.1.1",
+ "elementtree": "0.1.6",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "escape-string-regexp": "1.0.5",
+ "etag": "1.8.1",
+ "express": "4.16.3",
+ "finalhandler": "1.1.1",
+ "forwarded": "0.1.2",
+ "fresh": "0.5.2",
+ "glob": "5.0.15",
+ "has-ansi": "2.0.0",
+ "http-errors": "1.6.3",
+ "iconv-lite": "0.4.19",
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "ipaddr.js": "1.6.0",
+ "is-wsl": "1.1.0",
+ "media-typer": "0.3.0",
+ "merge-descriptors": "1.0.1",
+ "methods": "1.1.2",
+ "mime": "1.4.1",
+ "mime-db": "1.33.0",
+ "mime-types": "2.1.18",
+ "minimatch": "3.0.4",
+ "ms": "2.0.0",
+ "negotiator": "0.6.1",
+ "nopt": "3.0.6",
+ "on-finished": "2.3.0",
+ "on-headers": "1.0.1",
+ "once": "1.4.0",
+ "opn": "5.3.0",
+ "parseurl": "1.3.2",
+ "path-is-absolute": "1.0.1",
+ "path-to-regexp": "0.1.7",
+ "plist": "2.1.0",
+ "proxy-addr": "2.0.3",
+ "q": "1.5.1",
+ "qs": "6.5.1",
+ "range-parser": "1.2.0",
+ "raw-body": "2.3.2",
+ "safe-buffer": "5.1.1",
+ "sax": "0.3.5",
+ "send": "0.16.2",
+ "serve-static": "1.13.2",
+ "setprototypeof": "1.1.0",
+ "shelljs": "0.5.3",
+ "statuses": "1.4.0",
+ "strip-ansi": "3.0.1",
+ "supports-color": "2.0.0",
+ "type-is": "1.6.16",
+ "underscore": "1.9.1",
+ "unorm": "1.4.1",
+ "unpipe": "1.0.0",
+ "utils-merge": "1.0.1",
+ "vary": "1.1.2",
+ "wrappy": "1.0.2",
+ "xmlbuilder": "8.2.2",
+ "xmldom": "0.1.27"
+ },
+ "dependencies": {
+ "abbrev": {
+ "version": "1.1.1",
+ "bundled": true
+ },
+ "accepts": {
+ "version": "1.3.5",
+ "bundled": true,
+ "requires": {
+ "mime-types": "2.1.18",
+ "negotiator": "0.6.1"
+ }
+ },
+ "ansi": {
+ "version": "0.3.1",
+ "bundled": true
+ },
+ "ansi-regex": {
+ "version": "2.1.1",
+ "bundled": true
+ },
+ "ansi-styles": {
+ "version": "2.2.1",
+ "bundled": true
+ },
+ "array-flatten": {
+ "version": "1.1.1",
+ "bundled": true
+ },
+ "balanced-match": {
+ "version": "1.0.0",
+ "bundled": true
+ },
+ "base64-js": {
+ "version": "1.2.0",
+ "bundled": true
+ },
+ "big-integer": {
+ "version": "1.6.32",
+ "bundled": true
+ },
+ "body-parser": {
+ "version": "1.18.2",
+ "bundled": true,
+ "requires": {
+ "bytes": "3.0.0",
+ "content-type": "1.0.4",
+ "debug": "2.6.9",
+ "depd": "1.1.2",
+ "http-errors": "1.6.3",
+ "iconv-lite": "0.4.19",
+ "on-finished": "2.3.0",
+ "qs": "6.5.1",
+ "raw-body": "2.3.2",
+ "type-is": "1.6.16"
+ }
+ },
+ "bplist-parser": {
+ "version": "0.1.1",
+ "bundled": true,
+ "requires": {
+ "big-integer": "1.6.32"
+ }
+ },
+ "brace-expansion": {
+ "version": "1.1.11",
+ "bundled": true,
+ "requires": {
+ "balanced-match": "1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "bytes": {
+ "version": "3.0.0",
+ "bundled": true
+ },
+ "chalk": {
+ "version": "1.1.3",
+ "bundled": true,
+ "requires": {
+ "ansi-styles": "2.2.1",
+ "escape-string-regexp": "1.0.5",
+ "has-ansi": "2.0.0",
+ "strip-ansi": "3.0.1",
+ "supports-color": "2.0.0"
+ }
+ },
+ "compressible": {
+ "version": "2.0.14",
+ "bundled": true,
+ "requires": {
+ "mime-db": "1.34.0"
+ },
+ "dependencies": {
+ "mime-db": {
+ "version": "1.34.0",
+ "bundled": true
+ }
+ }
+ },
+ "compression": {
+ "version": "1.7.2",
+ "bundled": true,
+ "requires": {
+ "accepts": "1.3.5",
+ "bytes": "3.0.0",
+ "compressible": "2.0.14",
+ "debug": "2.6.9",
+ "on-headers": "1.0.1",
+ "safe-buffer": "5.1.1",
+ "vary": "1.1.2"
+ }
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "bundled": true
+ },
+ "content-disposition": {
+ "version": "0.5.2",
+ "bundled": true
+ },
+ "content-type": {
+ "version": "1.0.4",
+ "bundled": true
+ },
+ "cookie": {
+ "version": "0.3.1",
+ "bundled": true
+ },
+ "cookie-signature": {
+ "version": "1.0.6",
+ "bundled": true
+ },
+ "cordova-common": {
+ "version": "2.2.5",
+ "bundled": true,
+ "requires": {
+ "ansi": "0.3.1",
+ "bplist-parser": "0.1.1",
+ "cordova-registry-mapper": "1.1.15",
+ "elementtree": "0.1.6",
+ "glob": "5.0.15",
+ "minimatch": "3.0.4",
+ "plist": "2.1.0",
+ "q": "1.5.1",
+ "shelljs": "0.5.3",
+ "underscore": "1.9.1",
+ "unorm": "1.4.1"
+ }
+ },
+ "cordova-registry-mapper": {
+ "version": "1.1.15",
+ "bundled": true
+ },
+ "cordova-serve": {
+ "version": "2.0.1",
+ "bundled": true,
+ "requires": {
+ "chalk": "1.1.3",
+ "compression": "1.7.2",
+ "express": "4.16.3",
+ "opn": "5.3.0",
+ "shelljs": "0.5.3"
+ }
+ },
+ "debug": {
+ "version": "2.6.9",
+ "bundled": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "depd": {
+ "version": "1.1.2",
+ "bundled": true
+ },
+ "destroy": {
+ "version": "1.0.4",
+ "bundled": true
+ },
+ "ee-first": {
+ "version": "1.1.1",
+ "bundled": true
+ },
+ "elementtree": {
+ "version": "0.1.6",
+ "bundled": true,
+ "requires": {
+ "sax": "0.3.5"
+ }
+ },
+ "encodeurl": {
+ "version": "1.0.2",
+ "bundled": true
+ },
+ "escape-html": {
+ "version": "1.0.3",
+ "bundled": true
+ },
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "bundled": true
+ },
+ "etag": {
+ "version": "1.8.1",
+ "bundled": true
+ },
+ "express": {
+ "version": "4.16.3",
+ "bundled": true,
+ "requires": {
+ "accepts": "1.3.5",
+ "array-flatten": "1.1.1",
+ "body-parser": "1.18.2",
+ "content-disposition": "0.5.2",
+ "content-type": "1.0.4",
+ "cookie": "0.3.1",
+ "cookie-signature": "1.0.6",
+ "debug": "2.6.9",
+ "depd": "1.1.2",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "etag": "1.8.1",
+ "finalhandler": "1.1.1",
+ "fresh": "0.5.2",
+ "merge-descriptors": "1.0.1",
+ "methods": "1.1.2",
+ "on-finished": "2.3.0",
+ "parseurl": "1.3.2",
+ "path-to-regexp": "0.1.7",
+ "proxy-addr": "2.0.3",
+ "qs": "6.5.1",
+ "range-parser": "1.2.0",
+ "safe-buffer": "5.1.1",
+ "send": "0.16.2",
+ "serve-static": "1.13.2",
+ "setprototypeof": "1.1.0",
+ "statuses": "1.4.0",
+ "type-is": "1.6.16",
+ "utils-merge": "1.0.1",
+ "vary": "1.1.2"
+ }
+ },
+ "finalhandler": {
+ "version": "1.1.1",
+ "bundled": true,
+ "requires": {
+ "debug": "2.6.9",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "on-finished": "2.3.0",
+ "parseurl": "1.3.2",
+ "statuses": "1.4.0",
+ "unpipe": "1.0.0"
}
},
+ "forwarded": {
+ "version": "0.1.2",
+ "bundled": true
+ },
+ "fresh": {
+ "version": "0.5.2",
+ "bundled": true
+ },
"glob": {
"version": "5.0.15",
"bundled": true,
@@ -1398,6 +1897,27 @@
"path-is-absolute": "1.0.1"
}
},
+ "has-ansi": {
+ "version": "2.0.0",
+ "bundled": true,
+ "requires": {
+ "ansi-regex": "2.1.1"
+ }
+ },
+ "http-errors": {
+ "version": "1.6.3",
+ "bundled": true,
+ "requires": {
+ "depd": "1.1.2",
+ "inherits": "2.0.3",
+ "setprototypeof": "1.1.0",
+ "statuses": "1.4.0"
+ }
+ },
+ "iconv-lite": {
+ "version": "0.4.19",
+ "bundled": true
+ },
"inflight": {
"version": "1.0.6",
"bundled": true,
@@ -1410,17 +1930,56 @@
"version": "2.0.3",
"bundled": true
},
- "lodash": {
- "version": "3.10.1",
+ "ipaddr.js": {
+ "version": "1.6.0",
+ "bundled": true
+ },
+ "is-wsl": {
+ "version": "1.1.0",
+ "bundled": true
+ },
+ "media-typer": {
+ "version": "0.3.0",
+ "bundled": true
+ },
+ "merge-descriptors": {
+ "version": "1.0.1",
+ "bundled": true
+ },
+ "methods": {
+ "version": "1.1.2",
+ "bundled": true
+ },
+ "mime": {
+ "version": "1.4.1",
"bundled": true
},
+ "mime-db": {
+ "version": "1.33.0",
+ "bundled": true
+ },
+ "mime-types": {
+ "version": "2.1.18",
+ "bundled": true,
+ "requires": {
+ "mime-db": "1.33.0"
+ }
+ },
"minimatch": {
"version": "3.0.4",
"bundled": true,
"requires": {
- "brace-expansion": "1.1.8"
+ "brace-expansion": "1.1.11"
}
},
+ "ms": {
+ "version": "2.0.0",
+ "bundled": true
+ },
+ "negotiator": {
+ "version": "0.6.1",
+ "bundled": true
+ },
"nopt": {
"version": "3.0.6",
"bundled": true,
@@ -1428,73 +1987,188 @@
"abbrev": "1.1.1"
}
},
- "once": {
- "version": "1.4.0",
+ "on-finished": {
+ "version": "2.3.0",
"bundled": true,
"requires": {
- "wrappy": "1.0.2"
+ "ee-first": "1.1.1"
}
},
- "os-homedir": {
- "version": "1.0.2",
+ "on-headers": {
+ "version": "1.0.1",
"bundled": true
},
- "os-tmpdir": {
- "version": "1.0.2",
- "bundled": true
+ "once": {
+ "version": "1.4.0",
+ "bundled": true,
+ "requires": {
+ "wrappy": "1.0.2"
+ }
},
- "osenv": {
- "version": "0.1.4",
+ "opn": {
+ "version": "5.3.0",
"bundled": true,
"requires": {
- "os-homedir": "1.0.2",
- "os-tmpdir": "1.0.2"
+ "is-wsl": "1.1.0"
}
},
+ "parseurl": {
+ "version": "1.3.2",
+ "bundled": true
+ },
"path-is-absolute": {
"version": "1.0.1",
"bundled": true
},
+ "path-to-regexp": {
+ "version": "0.1.7",
+ "bundled": true
+ },
"plist": {
- "version": "1.2.0",
+ "version": "2.1.0",
"bundled": true,
"requires": {
- "base64-js": "0.0.8",
- "util-deprecate": "1.0.2",
- "xmlbuilder": "4.0.0",
+ "base64-js": "1.2.0",
+ "xmlbuilder": "8.2.2",
"xmldom": "0.1.27"
}
},
- "properties-parser": {
- "version": "0.2.3",
- "bundled": true
+ "proxy-addr": {
+ "version": "2.0.3",
+ "bundled": true,
+ "requires": {
+ "forwarded": "0.1.2",
+ "ipaddr.js": "1.6.0"
+ }
},
"q": {
"version": "1.5.1",
"bundled": true
},
+ "qs": {
+ "version": "6.5.1",
+ "bundled": true
+ },
+ "range-parser": {
+ "version": "1.2.0",
+ "bundled": true
+ },
+ "raw-body": {
+ "version": "2.3.2",
+ "bundled": true,
+ "requires": {
+ "bytes": "3.0.0",
+ "http-errors": "1.6.2",
+ "iconv-lite": "0.4.19",
+ "unpipe": "1.0.0"
+ },
+ "dependencies": {
+ "depd": {
+ "version": "1.1.1",
+ "bundled": true
+ },
+ "http-errors": {
+ "version": "1.6.2",
+ "bundled": true,
+ "requires": {
+ "depd": "1.1.1",
+ "inherits": "2.0.3",
+ "setprototypeof": "1.0.3",
+ "statuses": "1.4.0"
+ }
+ },
+ "setprototypeof": {
+ "version": "1.0.3",
+ "bundled": true
+ }
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.1",
+ "bundled": true
+ },
"sax": {
"version": "0.3.5",
"bundled": true
},
- "semver": {
- "version": "5.4.1",
+ "send": {
+ "version": "0.16.2",
+ "bundled": true,
+ "requires": {
+ "debug": "2.6.9",
+ "depd": "1.1.2",
+ "destroy": "1.0.4",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "etag": "1.8.1",
+ "fresh": "0.5.2",
+ "http-errors": "1.6.3",
+ "mime": "1.4.1",
+ "ms": "2.0.0",
+ "on-finished": "2.3.0",
+ "range-parser": "1.2.0",
+ "statuses": "1.4.0"
+ }
+ },
+ "serve-static": {
+ "version": "1.13.2",
+ "bundled": true,
+ "requires": {
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "parseurl": "1.3.2",
+ "send": "0.16.2"
+ }
+ },
+ "setprototypeof": {
+ "version": "1.1.0",
"bundled": true
},
"shelljs": {
"version": "0.5.3",
"bundled": true
},
+ "statuses": {
+ "version": "1.4.0",
+ "bundled": true
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "bundled": true,
+ "requires": {
+ "ansi-regex": "2.1.1"
+ }
+ },
+ "supports-color": {
+ "version": "2.0.0",
+ "bundled": true
+ },
+ "type-is": {
+ "version": "1.6.16",
+ "bundled": true,
+ "requires": {
+ "media-typer": "0.3.0",
+ "mime-types": "2.1.18"
+ }
+ },
"underscore": {
- "version": "1.8.3",
+ "version": "1.9.1",
"bundled": true
},
"unorm": {
"version": "1.4.1",
"bundled": true
},
- "util-deprecate": {
- "version": "1.0.2",
+ "unpipe": {
+ "version": "1.0.0",
+ "bundled": true
+ },
+ "utils-merge": {
+ "version": "1.0.1",
+ "bundled": true
+ },
+ "vary": {
+ "version": "1.1.2",
"bundled": true
},
"wrappy": {
@@ -1502,11 +2176,8 @@
"bundled": true
},
"xmlbuilder": {
- "version": "4.0.0",
- "bundled": true,
- "requires": {
- "lodash": "3.10.1"
- }
+ "version": "8.2.2",
+ "bundled": true
},
"xmldom": {
"version": "0.1.27",
@@ -1822,6 +2493,11 @@
}
}
},
+ "cordova-plugin-camera": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-4.0.3.tgz",
+ "integrity": "sha1-c3Olk4MYyGzP2E43E+I4LRD+B2s="
+ },
"cordova-plugin-device": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.2.tgz",
@@ -1833,20 +2509,25 @@
"integrity": "sha1-s3swFRRnCbvMwN/IGEYZCbOM7Io="
},
"cordova-plugin-ionic-keyboard": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.0.5.tgz",
- "integrity": "sha512-ygwK+U7Vs7OJJYsDrWAxhegHfvuRRpMC3Y8RhQSVLfv4ELrXtkCUjD+UfsDQ3aObpvxGLTvcVrOw5p04dPXy3w=="
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.1.2.tgz",
+ "integrity": "sha512-uJeL83WMMD15Y+aISznwQfm+ZwSHkPvVZSI7cjDZX/6umn2Rz1BiR9W0MSiooSUv5DF3U8QdJjDSDY5cwigbVA=="
},
"cordova-plugin-ionic-webview": {
- "version": "1.1.19",
- "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-1.1.19.tgz",
- "integrity": "sha512-Sgs6eHWsVFYBuc2xVhA3JqV7d7Wac6Yj1ZJjBLrhaA60LlMV8pReaPvWr898DKoLfhlBhJqNBEJSUAVP/4G9FA=="
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-1.2.1.tgz",
+ "integrity": "sha512-35Tu80g74enHV7HnXPDTwaPfObFydsLWyyAo2Eez/ns80UfhwkV99hWeG5jSO3zpPtSY8AVq7la6Z6Ww+4kDkg=="
},
"cordova-plugin-splashscreen": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-5.0.2.tgz",
"integrity": "sha1-dH509W4gHNWFvGLRS8oZ9oZ/8e0="
},
+ "cordova-plugin-statusbar": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.2.tgz",
+ "integrity": "sha1-/B+9wNjXAzp+jh8ff/FnrJvU+vY="
+ },
"cordova-plugin-whitelist": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz",
@@ -2541,7 +3222,7 @@
"acorn": "1.2.2",
"foreach": "2.0.5",
"isarray": "0.0.1",
- "object-keys": "1.0.11"
+ "object-keys": "1.0.12"
},
"dependencies": {
"isarray": {
@@ -2615,18 +3296,18 @@
}
},
"firebase": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/firebase/-/firebase-5.0.3.tgz",
- "integrity": "sha512-/TNZkBmREQ+Cp8tz5IL7neSTFmCwXae8k/BO9dlI80sQzBdNjWMNwf87yU/71tZhkEWOGTab6bsLsLcDRyJ7mw==",
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/firebase/-/firebase-5.3.1.tgz",
+ "integrity": "sha512-Po6BLFav9jwU5qHF95LepYheLb7XvTt4IKKvu2geExPtNvVIWPlUlXUStLezZZldj4Vscuf55WV7V177K3gx9g==",
"requires": {
- "@firebase/app": "0.3.2",
- "@firebase/auth": "0.5.2",
- "@firebase/database": "0.3.2",
- "@firebase/firestore": "0.5.3",
- "@firebase/functions": "0.2.3",
- "@firebase/messaging": "0.3.3",
- "@firebase/polyfill": "0.3.2",
- "@firebase/storage": "0.2.2"
+ "@firebase/app": "0.3.3",
+ "@firebase/auth": "0.7.2",
+ "@firebase/database": "0.3.4",
+ "@firebase/firestore": "0.6.1",
+ "@firebase/functions": "0.3.0",
+ "@firebase/messaging": "0.3.5",
+ "@firebase/polyfill": "0.3.3",
+ "@firebase/storage": "0.2.3"
}
},
"for-in": {
@@ -3097,14 +3778,6 @@
"bundled": true,
"optional": true
},
- "string_decoder": {
- "version": "1.1.1",
- "bundled": true,
- "optional": true,
- "requires": {
- "safe-buffer": "5.1.1"
- }
- },
"string-width": {
"version": "1.0.2",
"bundled": true,
@@ -3114,6 +3787,14 @@
"strip-ansi": "3.0.1"
}
},
+ "string_decoder": {
+ "version": "1.1.1",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "safe-buffer": "5.1.1"
+ }
+ },
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
@@ -3303,13 +3984,13 @@
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
},
"grpc": {
- "version": "1.11.3",
- "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.11.3.tgz",
- "integrity": "sha512-7fJ40USpnP7hxGK0uRoEhJz6unA5VUdwInfwAY2rK2+OVxdDJSdTZQ/8/M+1tW68pHZYgHvg2ohvJ+clhW3ANg==",
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.13.1.tgz",
+ "integrity": "sha512-yl0xChnlUISTefOPU2NQ1cYPh5m/DTatEUV6jdRyQPE9NCrtPq7Gn6J2alMTglN7ufYbJapOd00dvhGurHH6HQ==",
"requires": {
"lodash": "4.17.10",
"nan": "2.10.0",
- "node-pre-gyp": "0.10.0",
+ "node-pre-gyp": "0.10.3",
"protobufjs": "5.0.3"
},
"dependencies": {
@@ -3326,7 +4007,7 @@
"bundled": true
},
"are-we-there-yet": {
- "version": "1.1.4",
+ "version": "1.1.5",
"bundled": true,
"requires": {
"delegates": "1.0.0",
@@ -3373,7 +4054,7 @@
}
},
"deep-extend": {
- "version": "0.5.1",
+ "version": "0.6.0",
"bundled": true
},
"delegates": {
@@ -3388,7 +4069,7 @@
"version": "1.2.5",
"bundled": true,
"requires": {
- "minipass": "2.2.4"
+ "minipass": "2.3.3"
}
},
"fs.realpath": {
@@ -3406,7 +4087,7 @@
"signal-exit": "3.0.2",
"string-width": "1.0.2",
"strip-ansi": "3.0.1",
- "wide-align": "1.1.2"
+ "wide-align": "1.1.3"
}
},
"glob": {
@@ -3426,8 +4107,11 @@
"bundled": true
},
"iconv-lite": {
- "version": "0.4.19",
- "bundled": true
+ "version": "0.4.23",
+ "bundled": true,
+ "requires": {
+ "safer-buffer": "2.1.2"
+ }
},
"ignore-walk": {
"version": "3.0.1",
@@ -3475,10 +4159,10 @@
"bundled": true
},
"minipass": {
- "version": "2.2.4",
+ "version": "2.3.3",
"bundled": true,
"requires": {
- "safe-buffer": "5.1.1",
+ "safe-buffer": "5.1.2",
"yallist": "3.0.2"
}
},
@@ -3486,7 +4170,7 @@
"version": "1.1.0",
"bundled": true,
"requires": {
- "minipass": "2.2.4"
+ "minipass": "2.3.3"
}
},
"mkdirp": {
@@ -3511,24 +4195,24 @@
"bundled": true,
"requires": {
"debug": "2.6.9",
- "iconv-lite": "0.4.19",
+ "iconv-lite": "0.4.23",
"sax": "1.2.4"
}
},
"node-pre-gyp": {
- "version": "0.10.0",
+ "version": "0.10.3",
"bundled": true,
"requires": {
"detect-libc": "1.0.3",
"mkdirp": "0.5.1",
"needle": "2.2.1",
"nopt": "4.0.1",
- "npm-packlist": "1.1.10",
+ "npm-packlist": "1.1.11",
"npmlog": "4.1.2",
- "rc": "1.2.7",
+ "rc": "1.2.8",
"rimraf": "2.6.2",
"semver": "5.5.0",
- "tar": "4.4.2"
+ "tar": "4.4.4"
}
},
"nopt": {
@@ -3544,7 +4228,7 @@
"bundled": true
},
"npm-packlist": {
- "version": "1.1.10",
+ "version": "1.1.11",
"bundled": true,
"requires": {
"ignore-walk": "3.0.1",
@@ -3555,7 +4239,7 @@
"version": "4.1.2",
"bundled": true,
"requires": {
- "are-we-there-yet": "1.1.4",
+ "are-we-there-yet": "1.1.5",
"console-control-strings": "1.1.0",
"gauge": "2.7.4",
"set-blocking": "2.0.0"
@@ -3601,10 +4285,10 @@
"bundled": true
},
"rc": {
- "version": "1.2.7",
+ "version": "1.2.8",
"bundled": true,
"requires": {
- "deep-extend": "0.5.1",
+ "deep-extend": "0.6.0",
"ini": "1.3.5",
"minimist": "1.2.0",
"strip-json-comments": "2.0.1"
@@ -3618,7 +4302,7 @@
"inherits": "2.0.3",
"isarray": "1.0.0",
"process-nextick-args": "2.0.0",
- "safe-buffer": "5.1.1",
+ "safe-buffer": "5.1.2",
"string_decoder": "1.1.1",
"util-deprecate": "1.0.2"
}
@@ -3631,7 +4315,11 @@
}
},
"safe-buffer": {
- "version": "5.1.1",
+ "version": "5.1.2",
+ "bundled": true
+ },
+ "safer-buffer": {
+ "version": "2.1.2",
"bundled": true
},
"sax": {
@@ -3650,13 +4338,6 @@
"version": "3.0.2",
"bundled": true
},
- "string_decoder": {
- "version": "1.1.1",
- "bundled": true,
- "requires": {
- "safe-buffer": "5.1.1"
- }
- },
"string-width": {
"version": "1.0.2",
"bundled": true,
@@ -3666,6 +4347,13 @@
"strip-ansi": "3.0.1"
}
},
+ "string_decoder": {
+ "version": "1.1.1",
+ "bundled": true,
+ "requires": {
+ "safe-buffer": "5.1.2"
+ }
+ },
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
@@ -3678,22 +4366,16 @@
"bundled": true
},
"tar": {
- "version": "4.4.2",
+ "version": "4.4.4",
"bundled": true,
"requires": {
"chownr": "1.0.1",
"fs-minipass": "1.2.5",
- "minipass": "2.2.4",
+ "minipass": "2.3.3",
"minizlib": "1.1.0",
"mkdirp": "0.5.1",
"safe-buffer": "5.1.2",
"yallist": "3.0.2"
- },
- "dependencies": {
- "safe-buffer": {
- "version": "5.1.2",
- "bundled": true
- }
}
},
"util-deprecate": {
@@ -3701,7 +4383,7 @@
"bundled": true
},
"wide-align": {
- "version": "1.1.2",
+ "version": "1.1.3",
"bundled": true,
"requires": {
"string-width": "1.0.2"
@@ -5079,9 +5761,9 @@
}
},
"object-keys": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
- "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+ "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="
},
"object-visit": {
"version": "1.0.1",
@@ -6356,14 +7038,6 @@
"xtend": "4.0.1"
}
},
- "string_decoder": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "requires": {
- "safe-buffer": "5.1.2"
- }
- },
"string-template": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
@@ -6380,6 +7054,14 @@
"strip-ansi": "3.0.1"
}
},
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "5.1.2"
+ }
+ },
"stringstream": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
diff --git a/package.json b/package.json
index 8dcd7a27..e63aa3b9 100644
--- a/package.json
+++ b/package.json
@@ -23,26 +23,29 @@
"@angular/platform-browser-dynamic": "5.2.10",
"@ionic-native/camera": "^4.7.0",
"@ionic-native/core": "4.7.0",
- "@ionic-native/firebase": "^4.7.0",
+ "@ionic-native/firebase": "^4.11.0",
"@ionic-native/splash-screen": "4.7.0",
"@ionic-native/status-bar": "4.7.0",
- "@ionic/storage": "2.1.3",
- "cordova-android": "7.0.0",
+ "@ionic/storage": "^2.1.3",
+ "angularfire2": "^5.0.0-rc.11",
+ "cordova-android": "7.1.0",
+ "cordova-browser": "5.0.4",
"cordova-ios": "4.5.4",
+ "cordova-plugin-camera": "^4.0.3",
"cordova-plugin-device": "^2.0.2",
"cordova-plugin-firebase": "^1.0.5",
- "cordova-plugin-ionic-keyboard": "^2.0.5",
- "cordova-plugin-ionic-webview": "^1.1.19",
+ "cordova-plugin-ionic-keyboard": "^2.1.2",
+ "cordova-plugin-ionic-webview": "^1.2.1",
"cordova-plugin-splashscreen": "^5.0.2",
+ "cordova-plugin-statusbar": "^2.4.2",
"cordova-plugin-whitelist": "^1.3.3",
- "firebase": "^5.0.3",
+ "firebase": "^5.3.1",
"ionic-angular": "3.9.2",
"ionicons": "3.0.0",
"moment": "^2.22.1",
"rxjs": "5.5.10",
"sw-toolbox": "3.6.0",
- "zone.js": "0.8.26",
- "cordova-plugin-camera": "~4.0.3"
+ "zone.js": "0.8.26"
},
"devDependencies": {
"@ionic/app-scripts": "3.1.9",
@@ -57,11 +60,13 @@
"cordova-plugin-ionic-webview": {},
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-camera": {},
- "cordova-plugin-firebase": {}
+ "cordova-plugin-firebase": {},
+ "cordova-plugin-statusbar": {}
},
"platforms": [
"ios",
- "android"
+ "android",
+ "browser"
]
}
}
\ No newline at end of file
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 11ac68a7..ea3f31b6 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -18,12 +18,12 @@ import { Firebase } from '@ionic-native/firebase';
import firebase from 'firebase';
var config = {
- apiKey: "AIzaSyDhZKCDPs1ZDLevzdbPTPxVDHAa9vqreBs",
- authDomain: "feedlyapp-9df9a.firebaseapp.com",
- databaseURL: "https://feedlyapp-9df9a.firebaseio.com",
- projectId: "feedlyapp-9df9a",
- storageBucket: "feedlyapp-9df9a.appspot.com",
- messagingSenderId: "197049247480"
+ apiKey: "AIzaSyC_FMJcswceJB7ZYlzaRwKW1ij7kn8K6w4",
+ authDomain: "myapp-93470.firebaseapp.com",
+ databaseURL: "https://myapp-93470.firebaseio.com",
+ projectId: "myapp-93470",
+ storageBucket: "myapp-93470.appspot.com",
+ messagingSenderId: "412208839835"
};
firebase.initializeApp(config);
firebase.firestore().settings({
diff --git a/src/pages/feed/feed.ts b/src/pages/feed/feed.ts
index 6e13405d..d97b647c 100644
--- a/src/pages/feed/feed.ts
+++ b/src/pages/feed/feed.ts
@@ -20,6 +20,7 @@ export class FeedPage {
cursor: any;
infiniteEvent: any;
image: string;
+ Studenttype: string;
constructor(public navCtrl: NavController, public navParams: NavParams, private loadingCtrl: LoadingController, private toastCtrl: ToastController, private camera: Camera, private http: HttpClient, private actionSheetCtrl: ActionSheetController, private alertCtrl: AlertController, private modalCtrl: ModalController, private firebaseCordova: Firebase) {
this.getPosts();
@@ -33,6 +34,19 @@ export class FeedPage {
console.log(err)
})
+ firebase.firestore().collection("users").where('name', '==', firebase.auth().currentUser.displayName)
+ .get()
+ .then(function(querySnapshot) {
+ querySnapshot.forEach(function(doc){
+ console.log(doc.data());//works. now get the relevant devices into this array, and take it from the array. post() gives notification(.., "post")
+ });
+
+ // this.Studenttype= res.studenttype;
+ //console.log(this.Studenttype);
+
+ }).catch((err) => {
+ console.log(err)
+ })
}
@@ -54,6 +68,7 @@ export class FeedPage {
getPosts() {
+
this.posts = [];
let loading = this.loadingCtrl.create({
@@ -171,6 +186,7 @@ export class FeedPage {
console.log(err)
})
+
}
ago(time) {
@@ -282,8 +298,8 @@ export class FeedPage {
});
toast.present();
-
- this.http.post("https://us-central1-feedlyapp-9df9a.cloudfunctions.net/updateLikesCount", JSON.stringify(body), {
+//https://us-central1-myapp-93470.cloudfunctions.net/updateLikesCount
+ this.http.post("https://us-central1-myapp-93470.cloudfunctions.net/updateLikesCount", JSON.stringify(body), {
responseType: "text"
}).subscribe((data) => {
console.log(data)
@@ -318,12 +334,12 @@ export class FeedPage {
{
text: "New Comment",
handler: () => {
-
+
this.alertCtrl.create({
title: "New Comment",
message: "Type your comment",
inputs: [
- {
+ {
name: "comment",
type: "text"
}
@@ -335,7 +351,7 @@ export class FeedPage {
{
text: "Post",
handler: (data) => {
-
+
if(data.comment){
firebase.firestore().collection("comments").add({
diff --git a/src/pages/signup/signup.ts b/src/pages/signup/signup.ts
index ffb04a78..24c1b483 100644
--- a/src/pages/signup/signup.ts
+++ b/src/pages/signup/signup.ts
@@ -12,6 +12,7 @@ export class SignupPage {
name: string = "";
email: string = "";
password: string = "";
+ usertype: string = "";
constructor(public navCtrl: NavController, public navParams: NavParams, public toastCtrl: ToastController, public alertCtrl: AlertController) {
}
@@ -19,13 +20,13 @@ export class SignupPage {
signup(){
firebase.auth().createUserWithEmailAndPassword(this.email, this.password)
.then((data) => {
-
+
console.log(data)
let newUser: firebase.User = data.user;
newUser.updateProfile({
displayName: this.name,
- photoURL: ""
+ photoURL: "",
}).then(() => {
console.log("Profile Updated")
@@ -54,6 +55,20 @@ export class SignupPage {
duration: 3000
}).present();
})
+
+ firebase.firestore().collection("users").add({
+ name: this.name,
+ usertype: "Student",
+ studentnumber: this.email
+ }).then((doc) => {
+ console.log(doc)
+ }).catch((err) => {
+ console.log(err)
+ })
+
+
+
+
}
goBack(){