Reconciled my code with master

This commit is contained in:
Aaron Sun
2019-09-30 23:04:37 -04:00
parent b1cfcda948
commit 201f5d8949
5 changed files with 499 additions and 171 deletions

View File

@@ -1,29 +1,30 @@
{
"database": {
"rules": "database.rules.json"
},
"firestore": {
"rules": "firestore.rules",
"indexes": "firestore.indexes.json"
},
"functions": {
"predeploy": [
"npm --prefix \"$RESOURCE_DIR\" run lint"
]
},
"hosting": {
"public": "public",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [{
"source": "/feed",
"destination": "/feed.html"
}]
},
"storage": {
"rules": "storage.rules"
"database": {
"rules": "database.rules.json"
},
"firestore": {
"rules": "firestore.rules",
"indexes": "firestore.indexes.json"
},
"functions": {
"predeploy": [
"npm --prefix \"$RESOURCE_DIR\" run lint"
]
},
"hosting": {
"public": "public",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [{
"source": "/feed",
"destination": "/feed.html"
}]
},
"storage": {
"rules": "storage.rules"
}
}
}