Merge Dev to Master

.travis.yml

@@ -4,7 +4,7 @@ dist: trusty
 language: node_js
 
 node_js:
-  - 6
+  - 8.11
 
 cache:
   directories:
@@ -27,18 +27,25 @@ matrix:
       - ng build --prod --aot --build-optimizer
 
   - script:
-      - ng test --single-run --code-coverage --reporters=coverage-istanbul
+      - ng test --watch=false --code-coverage
 
   - script:
-      - ng lint --format=stylish
-      - docker build -t loklak_server .
+      - ng lint loklak-search --format=stylish
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
   - bash ./pr_deploy.sh
   - bash ./deploy.sh
 
+deploy:
+  provider: surge
+  skip_cleanup: true
+  local_dir: dist
+  domain: http://loklak.surge.sh
+  on:
+    branch: development
+
 # safelist
 branches:
   only:
-  - master
+  - development

Dockerfile

@@ -1,5 +1,5 @@
 FROM node:6.9.1-alpine as builder
-LABEL MAINTAINER="singh.pratyush96@gmail.com"
+LABEL maintainer="singh.pratyush96@gmail.com"
 
 COPY package.json package-lock.json ./
 
@@ -11,7 +11,7 @@ WORKDIR /ng-app
 
 COPY . .
 
-RUN $(npm bin)/ng build --prod --build-optimizer
+RUN "$(npm bin)/ng build --prod --build-optimizer"
 
 FROM nginx:1.13.3-alpine
 

README.md

@@ -1,10 +1,15 @@
 # loklak_search
 
-[![Build Status](https://travis-ci.org/fossasia/loklak_search.svg?branch=master)](https://travis-ci.org/fossasia/loklak_search)
 [![Join the chat at https://gitter.im/loklak/loklak](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/loklak/loklak)
 [![Code Climate](https://codeclimate.com/github/fossasia/loklak_search/badges/gpa.svg)](https://codeclimate.com/github/fossasia/loklak_search)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/cf7beeb59bce451f9e02958f301554d8)](https://www.codacy.com/app/fossasia/loklak_search?utm_source=github.com&utm_medium=referral&utm_content=fossasia/loklak_search&utm_campaign=Badge_Grade)
 [![codecov](https://codecov.io/gh/fossasia/loklak_search/branch/master/graph/badge.svg)](https://codecov.io/gh/fossasia/loklak_search)
-[![Dependency Status](https://gemnasium.com/badges/github.com/fossasia/loklak_search.svg)](https://gemnasium.com/github.com/fossasia/loklak_search)
+[![Percentage of issues still open](http://isitmaintained.com/badge/open/fossasia/loklak_search.svg)](http://isitmaintained.com/project/fossasia/loklak_search "Percentage of issues still open")
+[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/fossasia/loklak_search.svg)](http://isitmaintained.com/project/fossasia/loklak_search "Average time to resolve an issue")
+
+Development: [![Build Status](https://travis-ci.org/fossasia/loklak_search.svg?branch=development)](https://travis-ci.org/fossasia/loklak_search)
+Master: [![Build Status](https://travis-ci.org/fossasia/loklak_search.svg?branch=master)](https://travis-ci.org/fossasia/loklak_search)
+Dependency: [![Gemnasium](https://img.shields.io/gemnasium/mathiasbynens/he.svg)](https://gemnasium.com/github.com/fossasia/loklak_search)
 
 The loklak_search creates a website using the loklak server as a data source. The goal is to get a search site, that offers timeline search as well as custom media search, account and geolocation search.
 
@@ -25,13 +30,13 @@ Our chat channel is on gitter here: https://gitter.im/loklak/loklak
 * HTML - Structure of the web page generated.
 * CSS - Styling options and details of the web page.
 * JavaScript(JSON) - Used to store information for deploying the application such as dependencies.
-* Angular 4 - Structure for deployment of the web page.
+* Angular 6 - Structure for deployment of the web page.
 * Bootstrap 3.3.2 - Responsive Design
 
 ## Requirements
 * [Angular-cli](https://github.com/angular/angular-cli#installation)
-* node v6.*
-* npm v3.*
+* node v8.9+
+* npm v5.5+
 
 ## Installation
 First, we will need to install angular-cli by using the following command:
@@ -83,14 +88,14 @@ This is an Open Source project and we would be happy to see contributors who rep
 
 ## Branch Policy
 
-We have the following branches
+We have the following branches:
+ * **development**
+   All development goes on in the development branch. If you're making a contribution, please make a pull request to _development_. PRs to the branch must pass a build check and a unit-test check on Travis.
  * **master**
-	 All development goes on in the master branch. If you're making a contribution,
-	 you are supposed to make a pull request to _master_.
-	 PRs to the branch must pass a build check and a unit-test check on Travis.
+	 This branch contains shipped code. After significant features/bug-fixes are accumulated on development, development branch is merged into master branch. (https://loklak.org - Is running off the lastest master branch.).
  * **gh-pages**
    This contains the autogenerated code of the master branch that is generated by Travis.
 
 ## License
 
-This project is currently licensed under The MIT License (MIT). A copy of LICENSE.md should be present along with the source code. To obtain the software under a different license, please contact FOSSASIA.
+This project is currently licensed under [GNU Lesser General Public License v3.0](./LICENSE). To obtain the software under a different license, please contact FOSSASIA.

angular.json

@@ -0,0 +1,134 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "loklak-search": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {
+        "@schematics/angular:component": {
+          "styleext": "scss"
+        }
+      },
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "assets": [
+              "src/assets",
+              "src/manifest.json"
+            ],
+            "styles": [
+              {
+                "input": "node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
+              },
+              "src/styles/main.scss"
+            ],
+            "scripts": [
+              "./node_modules/wicg-inert/dist/inert.min.js"
+            ]
+          },
+          "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
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "loklak-search:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "loklak-search:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "loklak-search:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "karmaConfig": "src/karma.conf.js",
+            "styles": [
+              {
+                "input": "node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
+              },
+              "src/styles/main.scss"
+            ],
+            "scripts": [],
+            "assets": [
+              "src/assets",
+              "src/manifest.json"
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "loklak-search-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "loklak-search:serve"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "loklak-search"
+}

e2e/tsconfig.e2e.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "module": "commonjs",
+    "target": "es5",
+    "types": [
+      "jasmine",
+      "jasminewd2",
+      "node"
+    ]
+  }
+}