Update project (#98)

* Update client to angular v8

* Fix server database connection

* Fix client errors

* Add requirements file from pipfile

* Fix travis file

* Fix travis

* Fix server errors

* Fix travis errors

* Fix travis

* Fix travis

* Fix travis

* Fix travis

* Fix angular lint errors

* Fix travis

* Add chrome to travis

* Fix travis

* Fix travis

* Fix travis

* Fix travis last take?

* Fix travis

* Fix server errors

* Add pwa

* Cleanup

Author: Nir Galon

.travis.yml

@@ -1,52 +1,41 @@
-sudo: required
-dist: trusty
-
-addons:
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
-
-language: python
-python:
-  - 3.6
-
-services:
-  - postgresql
-
-cache:
-  npm: true
-  directories:
-    - client/node_modules
-
-before_install:
-  - npm install -g npm@latest local-web-server codecov
-  - export CHROME_BIN=chromium-browser
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-
-install:
-  # Client
-  - cd client && npm install
-
-  # Server
-  - cd ../server && pip install coverage pycodestyle
-  - pip install -r requirements.txt
-  - psql -c 'create database server;' -U postgres
-
-script:
-  # Client
-  - cd ../client && npm run lint
-  - npm run test
-  - npm run build
-  - cd dist && ws --port 4200&
-  - npm run e2e
-
-  # Server
-  - cd ../server && coverage run --source='.' manage.py test
-  - coverage xml
-  - pycodestyle --show-source --max-line-length=120 --show-pep8 .
-
-after_script:
-  - cd .. && codecov
+matrix:
+  include:
+    - language: python
+      python: 3.7
+      env:
+        - DB_URI="postgres://postgres:@localhost:5432/assp"
+        - DB_NAME="assp"
+        - DB_USER="postgres"
+        - DB_PASSWORD=""
+        - DB_PORT="5432"
+        - HOST="0.0.0.0"
+        - PORT="8000"
+        - LOG_LEVEL="info"
+        - ENV="development"
+      services:
+        - postgresql
+      before_script:
+        - cd server && pip install coverage pycodestyle python-dotenv
+        - pip install -r requirements.txt
+        - psql -c 'create database assp;' -U postgres
+      script:
+        - python -m unittest
+        - pycodestyle --show-source --max-line-length=120 --show-pep8 .
+
+    - language: node_js
+      node_js:
+        - v12
+      services:
+        - xvfb
+      addons:
+          chrome: stable
+      before_install:
+        - npm install -g npm@latest codecov
+        - export DISPLAY=:99.0
+      install:
+        - cd client && npm install
+      script:
+        - npm run lint
+        - npm run test
+        - npm run build
+        - npm run e2e

client/.editorconfig

@@ -1,4 +1,4 @@
-# Editor configuration, see http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]

client/.gitignore

@@ -1,24 +1,27 @@
 # Client
 
-The front end (client) side of the project written in Angular, with Angular-CLI, ngrx, and Material.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.3.7.
 
-## Prerequisites
+## Development server
 
-* Install [Angular-cli](https://github.com/angular/angular-cli).
-* Install [npm](https://nodejs.org/en/).
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 
-## Installation
+## Code scaffolding
 
-1. Run `npm install` to install dependencies.
-2. Run `npm start` to fire up the dev server.
-3. Open browser to [http://localhost:4200](http://localhost:4200).
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
 
-## Tests
+## Build
 
-* Run `npm run lint` to check for TSLint mistakes.
-* Run `npm run test` to execute the unit tests via Karma.
-* Run `npm run e2e` to execute the end-to-end tests via Protractor.
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
 
-## Deploy
+## Running unit tests
 
-1. Run `ng build --prod` to build the project.
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

client/README.md

@@ -4,15 +4,15 @@
   "newProjectRoot": "projects",
   "projects": {
     "client": {
-      "root": "",
-      "sourceRoot": "src",
       "projectType": "application",
-      "prefix": "client",
       "schematics": {
         "@schematics/angular:component": {
-          "styleext": "scss"
+          "style": "scss"
         }
       },
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "assp",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -21,14 +21,15 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
+            "aot": false,
             "assets": [
               "src/favicon.ico",
-              "src/assets"
+              "src/assets",
+              "src/manifest.webmanifest"
             ],
             "styles": [
-              "src/styles.scss",
-              "src/app-theme.scss"
+              "src/styles.scss"
             ],
             "scripts": []
           },
@@ -48,7 +49,21 @@
               "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": true
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
+                }
+              ],
+              "serviceWorker": true,
+              "ngswConfigPath": "ngsw-config.json"
             }
           }
         },
@@ -74,36 +89,32 @@
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets",
+              "src/manifest.webmanifest"
+            ],
             "styles": [
               "src/styles.scss"
             ],
-            "scripts": [],
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ]
+            "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
-        }
-      }
-    },
-    "client-e2e": {
-      "root": "e2e/",
-      "projectType": "application",
-      "architect": {
+        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
@@ -115,21 +126,8 @@
               "devServerTarget": "client:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
-    }
-  },
-  "defaultProject": "client",
-  "cli": {
-    "defaultCollection": "@ngrx/schematics"
-  }
+    }},
+  "defaultProject": "client"
 }

client/angular.json

@@ -0,0 +1,12 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+not IE 9-11 # For IE 9-11 support, remove 'not'.

client/browserslist

@@ -1,8 +1,12 @@
+// @ts-check
 // Protractor configuration file, see link for more information
 // https://github.com/angular/protractor/blob/master/lib/config.ts
 
 const { SpecReporter } = require('jasmine-spec-reporter');
 
+/**
+ * @type { import("protractor").Config }
+ */
 exports.config = {
   allScriptsTimeout: 11000,
   specs: [
@@ -21,7 +25,7 @@ exports.config = {
   },
   onPrepare() {
     require('ts-node').register({
-      project: require('path').join(__dirname, './tsconfig.e2e.json')
+      project: require('path').join(__dirname, './tsconfig.json')
     });
     jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
   }

client/e2e/protractor.conf.js

@@ -1,4 +1,5 @@
 import { AppPage } from './app.po';
+import { browser, logging } from 'protractor';
 
 describe('workspace-project App', () => {
   let page: AppPage;
@@ -7,8 +8,11 @@ describe('workspace-project App', () => {
     page = new AppPage();
   });
 
-  it('should display welcome message', () => {
-    page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to client!');
+  afterEach(async () => {
+    // Assert that there are no errors emitted from the browser
+    const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+    expect(logs).not.toContain(jasmine.objectContaining({
+      level: logging.Level.SEVERE,
+    } as logging.Entry));
   });
 });

client/e2e/src/app.e2e-spec.ts

@@ -2,10 +2,10 @@ import { browser, by, element } from 'protractor';
 
 export class AppPage {
   navigateTo() {
-    return browser.get('/');
+    return browser.get(browser.baseUrl) as Promise<any>;
   }
 
-  getParagraphText() {
-    return element(by.css('client-root h1')).getText();
+  getTitleText() {
+    return element(by.css('asp-root .content span')).getText() as Promise<string>;
   }
 }