Merge pull request #15 from supermurat/develop

Develop

.gitignore

@@ -86,7 +86,6 @@ testem.log
 yarn-error.log
 
 # e2e
-/e2e/*.js
 /e2e/*.map
 
 # System Files

.travis.yml

@@ -18,7 +18,7 @@ before_install:
 - npm i -g firebase-tools @angular/cli selenium-webdriver @commitlint/travis-cli
 install:
 - echo "!install!"
-- npm i -g ncp del-cli
+- npm i -g ncp del-cli @compodoc/compodoc
 - npm install
 - cd functions && npm install && cd ..
 before_script:

angular.json

@@ -278,12 +278,12 @@
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
-            "protractorConfig": "./protractor.conf.js",
+            "protractorConfig": "./e2e/protractor.conf.js",
             "devServerTarget": "super-firebase-angular:serve"
           },
           "configurations": {
             "browserstack": {
-              "protractorConfig": "./protractor.browserstack.conf.js"
+              "protractorConfig": "./e2e/protractor.browserstack.conf.js"
             }
           }
         },

e2e/app.e2e-spec.ts

@@ -1,15 +1,19 @@
 import { AppPage } from './app.po';
 
 describe('super-firebase-angular App', () => {
-  let page: AppPage;
+    let page: AppPage;
 
-  beforeEach(() => {
-    page = new AppPage();
-  });
+    beforeEach(() => {
+        page = new AppPage();
+    });
 
-  it('should display welcome message', () => {
-    page.navigateTo();
-    expect(page.getParagraphText())
-        .toEqual('Welcome!');
-  });
+    it('should display welcome message', async () => {
+        page.navigateTo()
+            .catch(reason => {
+                console.error(reason);
+            });
+
+        return expect(page.getParagraphText())
+            .toEqual('Welcome!');
+    });
 });

e2e/app.po.ts

@@ -7,14 +7,14 @@ export class AppPage {
     /**
      * go to home page
      */
-    navigateTo(): wdpromise.Promise<any> {
+    async navigateTo(): wdpromise.Promise<any> {
         return browser.get('/');
     }
 
     /**
      * get text of first h1 element in app-root
      */
-    getParagraphText(): wdpromise.Promise<string> {
+    async getParagraphText(): wdpromise.Promise<string> {
         return element(by.css('app-root h1'))
             .getText();
     }

protractor.browserstack.base.conf.js → e2e/protractor.browserstack.base.conf.js

@@ -15,7 +15,7 @@ exports.config = {
     getPageTimeout: 1000 * 60 * 2,
     maxSessions: 2,
     specs: [
-        "./e2e/**/*.e2e-spec.ts"
+        "./**/*.e2e-spec.ts"
     ],
     commonCapabilities: {
         // https://www.browserstack.com/automate/capabilities

protractor.conf.js → e2e/protractor.conf.js

@@ -6,7 +6,7 @@ const { SpecReporter } = require("jasmine-spec-reporter");
 exports.config = {
   allScriptsTimeout: 11000,
   specs: [
-    "./e2e/**/*.e2e-spec.ts"
+    "./**/*.e2e-spec.ts"
   ],
   capabilities: {
     "browserName": "chrome"

firebase/firestore.rules

@@ -4,6 +4,14 @@ service cloud.firestore {
       allow read, update, delete: if request.auth.uid == resource.data.uid;
       allow create: if request.auth.uid != null;
     }
+    match /articles_en-US/{document=**} {
+      allow read: if true;
+      allow write: if false;
+    }
+    match /articles_tr-TR/{document=**} {
+      allow read: if true;
+      allow write: if false;
+    }
     match /blogs_en-US/{document=**} {
       allow read: if true;
       allow write: if false;
@@ -12,6 +20,14 @@ service cloud.firestore {
       allow read: if true;
       allow write: if false;
     }
+    match /jokes_en-US/{document=**} {
+      allow read: if true;
+      allow write: if false;
+    }
+    match /jokes_tr-TR/{document=**} {
+      allow read: if true;
+      allow write: if false;
+    }
     match /pages_en-US/{document=**} {
       allow read: if true;
       allow write: if false;
@@ -20,6 +36,22 @@ service cloud.firestore {
       allow read: if true;
       allow write: if false;
     }
+    match /quotes_en-US/{document=**} {
+      allow read: if true;
+      allow write: if false;
+    }
+    match /quotes_tr-TR/{document=**} {
+      allow read: if true;
+      allow write: if false;
+    }
+    match /taxonomy_en-US/{document=**} {
+      allow read: if true;
+      allow write: if false;
+    }
+    match /taxonomy_tr-TR/{document=**} {
+      allow read: if true;
+      allow write: if false;
+    }
     match /{document=**} {
       allow read, write: if false;
     }

functions/package.json

@@ -11,38 +11,38 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "firebase-admin": "~6.3.0",
+    "firebase-admin": "~6.4.0",
     "firebase-functions": "^2.1.0",
     "express": "~4.16.4",
-    "@angular/animations": "7.1.2",
-    "@angular/common": "7.1.2",
-    "@angular/compiler": "7.1.2",
-    "@angular/core": "7.1.2",
+    "@angular/animations": "7.1.4",
+    "@angular/common": "7.1.4",
+    "@angular/compiler": "7.1.4",
+    "@angular/core": "7.1.4",
     "@angular/fire": "5.1.1",
-    "@angular/forms": "7.1.2",
-    "@angular/http": "7.1.2",
-    "@angular/platform-browser": "7.1.2",
-    "@angular/platform-browser-dynamic": "7.1.2",
-    "@angular/platform-server": "7.1.2",
-    "@angular/pwa": "^0.11.2",
-    "@angular/router": "7.1.2",
-    "@angular/service-worker": "7.1.2",
-    "@fortawesome/fontawesome-free": "^5.6.0",
-    "@ng-bootstrap/ng-bootstrap": "4.0.0",
-    "bootstrap": "^4.1.3",
+    "@angular/forms": "7.1.4",
+    "@angular/http": "7.1.4",
+    "@angular/platform-browser": "7.1.4",
+    "@angular/platform-browser-dynamic": "7.1.4",
+    "@angular/platform-server": "7.1.4",
+    "@angular/pwa": "^0.11.4",
+    "@angular/router": "7.1.4",
+    "@angular/service-worker": "7.1.4",
+    "@fortawesome/fontawesome-free": "^5.6.3",
+    "@ng-bootstrap/ng-bootstrap": "4.0.1",
+    "bootstrap": "^4.2.1",
     "classlist.js": "^1.1.20150312",
-    "core-js": "^2.6.0",
-    "firebase": "5.7.0",
-    "grpc": "^1.16.1",
-    "protractor": "~5.4.1",
+    "core-js": "^2.6.1",
+    "firebase": "5.7.1",
+    "grpc": "^1.17.0",
+    "protractor": "~5.4.2",
     "rxjs": "~6.3.3",
     "tslib": "^1.9.3",
     "zone.js": "~0.8.26"
   },
   "devDependencies": {
     "jquery": "^3.3.1",
     "popper.js": "^1.14.6",
-    "tslint": "~5.11.0",
+    "tslint": "~5.12.0",
     "typescript": "3.1.6"
   },
   "private": true

migrate-to-firebase/README.md

@@ -1,7 +1,9 @@
 # super-firebase-angular / migrate-to-firebase
-- Import your data directly to Cloud Firestore
-- Upload your files directly to Firebase Storage
-- Fix file/image paths on your json data
+  - Import your data directly to Cloud Firestore
+
+  - Upload your files directly to Firebase Storage
+
+  - Fix file/image paths on your json data
 (in html, just before import) for web projects
 
 ## Install dependencies