rebase

Author: nirgn975

.gitignore

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> b72a69f (Update dependencies (#20))
 # Created by https://www.gitignore.io/api/python,django,node,sass,virtualenv,jetbrains
 
 ### Python ###
@@ -221,6 +225,7 @@ fabric.properties
 # .idea/misc.xml
 # *.ipr
 
+<<<<<<< HEAD
 
 ### OSX ###
 *.DS_Store
@@ -246,4 +251,6 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
+=======
+>>>>>>> b72a69f (Update dependencies (#20))
 # End of https://www.gitignore.io/api/python,django,node,sass,virtualenv,jetbrains

.travis.yml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 matrix:
   include:
     - language: python
@@ -39,3 +40,59 @@ matrix:
         - npm run test
         - npm run build
         - npm run e2e
+=======
+sudo: required
+dist: trusty
+
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+
+language: node_js
+node_js:
+  - "6"
+  - "7"
+
+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
+  - ng build --prod --aot
+  - 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=119 --show-pep8 .
+  - python manage.py test
+
+after_script:
+  - cd .. && codecov
+>>>>>>> b72a69f (Update dependencies (#20))

README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <img src="https://raw.githubusercontent.com/nirgn975/Angular-Django-Seed-Project/master/art/angular-django-seed-project.png" />
 
 [![license][license-image]][license-url] [![GitHub release][github-image]][github-url] [![Build Status][travis-image]][travis-url] [![codecov][codecov-image]][codecov-url] [![Dependency Status][dependencyci-image]][dependencyci-url] [![Codacy Badge][codacy-image]][codacy-url] [![Maintenance][maintenance-image]][maintenance-url] [![Donate][donate-image]][donate-url]
@@ -11,6 +12,28 @@ This repo is a production ready seed project. The app shows a list of users.
 * There is a `postgres` service for the database. The `database` directory contains the automatic backup script.
 * All the logs are going to `stdout` and can be collected through any service.
 * There are built in test that configured to run on `travis-ci`, and a code coverage analysis via `codecov`.
+=======
+# An opinionated Angular - Django cluster
+
+[![license][license-image]][license-url] [![Build Status][travis-image]][travis-url] [![codecov][codecov-image]][codecov-url] [![Python 3][python3-image]][python3-url] [![Updates][updates-image]][updates-url] [![Dependency Status][dependencyci-image]][dependencyci-url] [![Donate][donate-image]][donate-url]
+
+The `server` directory contain a simple [Django](https://www.djangoproject.com/) app that expose an `api` of Django `users` with [Django REST framework](http://www.django-rest-framework.org/). The `client` directory contain an [Angular](https://angular.io/) simple app, built with [Angular-Cli](https://github.com/angular/angular-cli), [ngrx](https://github.com/ngrx) to handle state, [Angular Material](https://github.com/angular/material2) as a design library, have service worker, and ready to `AOT` compilation. The simple Angular app show the users from the Django api.
+
+The repo is a production ready app, that uses `nginx` to serve static files (the client app and static files from the server), and `gunicorn` for the server (python) stuff. All the parts are in a separate [Docker](https://www.docker.com/) containers and we use [kubernetes](https://kubernetes.io/) to manage them.
+
+## Pre Requirements
+
+1. install [docker](https://www.docker.com/).
+2. Don't know yet.
+
+## Installation
+
+Automatic installation of the project with docker, for development.
+
+1. Run `$ docker-compose up` to build the docker images and run them.
+3. Open the browser at [http://localhost:8000](http://localhost:8000) to see your Django (server) app.
+3. Open the browser at [http://localhost:4200](http://localhost:4200) to see your Angular (client) app.
+>>>>>>> b72a69f (Update dependencies (#20))
 
 The `client` app is built via the cloud build CI on GCP and deployed to the GCP `storage`.
 The `server` app is built via the cloud build CI as a docker image and deployed to a `GKE cluster` on GCP (managed by Kubernetes).
@@ -39,13 +62,20 @@ Create a Cloud DNS record:
 
 ## Our Stack
 
+<<<<<<< HEAD
 * [Angular](https://angular.io/)
 * [Sanic](https://www.djangoproject.com/)
 * [PostgreSQL](https://sanic.readthedocs.io)
+=======
+* [Angular 2.3](https://angular.io/)
+* [Django 1.10.5](https://www.djangoproject.com/)
+* [PostgreSQL](http://www.postgresql.org/)
+>>>>>>> b72a69f (Update dependencies (#20))
 * [Docker](https://www.docker.com/)
 
 **Tools we use**
 
+<<<<<<< HEAD
   * [Angular Material](https://material.angular.io)
   * [ngrx](https://github.com/ngrx)
   * [Peewee](http://docs.peewee-orm.com)
@@ -106,12 +136,19 @@ Each Saturday morning a weekly backup will be created at the weekly directory. T
 Each month at the 1st of the month a monthly backup will be created at the monthly directory. Monthly backups are **NOT** rotated
 
 The backups are saved at `/var/backups/postgres` at the host machine via a shared volume. It can be configured in the `docker-compose.yml` at `volumes` section of the `database` service.
+=======
+  * [Angular Material](https://material.angular.io/)
+  * [ngrx](https://github.com/ngrx)
+  * [Django REST framework](http://www.django-rest-framework.org/)
+  * [kubernetes](https://kubernetes.io/)
+>>>>>>> b72a69f (Update dependencies (#20))
 
 ## Contribute
 
 Just fork and do a pull request (;
 
 [license-image]: https://img.shields.io/badge/license-ISC-blue.svg
+<<<<<<< HEAD
 [license-url]: https://github.com/nirgn975/Angular-Django-Seed-Project/blob/master/LICENSE
 [github-image]: https://img.shields.io/github/release/nirgn975/Angular-Django-Seed-Project.svg
 [github-url]: https://github.com/nirgn975/Angular-Django-Seed-Project/releases
@@ -126,4 +163,18 @@ Just fork and do a pull request (;
 [maintenance-image]: https://img.shields.io/maintenance/yes/2019.svg
 [maintenance-url]: https://github.com/nirgn975
 [donate-image]: https://img.shields.io/badge/PayPal-Donate-lightgrey.svg
+=======
+[license-url]: https://github.com/nirgn975/Angular2-Django-cluster/blob/master/LICENSE
+[travis-image]: https://travis-ci.org/nirgn975/Angular2-Django-cluster.svg?branch=master
+[travis-url]: https://travis-ci.org/nirgn975/Angular2-Django-cluster
+[codecov-image]: https://codecov.io/gh/nirgn975/Angular2-Django-cluster/branch/master/graph/badge.svg
+[codecov-url]: https://codecov.io/gh/nirgn975/Angular2-Django-cluster
+[python3-image]: https://pyup.io/repos/github/nirgn975/angular2-django-cluster/python-3-shield.svg
+[python3-url]: https://pyup.io/repos/github/nirgn975/angular2-django-cluster/
+[updates-image]: https://pyup.io/repos/github/nirgn975/angular2-django-cluster/shield.svg
+[updates-url]: https://pyup.io/repos/github/nirgn975/angular2-django-cluster/
+[dependencyci-image]: https://dependencyci.com/github/nirgn975/Angular2-Django-cluster/badge
+[dependencyci-url]: https://dependencyci.com/github/nirgn975/Angular2-Django-cluster
+[donate-image]: https://img.shields.io/badge/Donate-PayPal-lightgrey.svg
+>>>>>>> b72a69f (Update dependencies (#20))
 [donate-url]: https://www.paypal.me/nirgn/2

client/.gitignore

@@ -0,0 +1,40 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage/*
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+#System Files
+.DS_Store
+Thumbs.db

client/README.md

@@ -1,9 +1,16 @@
 # Client
 
+<<<<<<< HEAD
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.3.7.
+=======
+The front end (client) side of the project written in Angular, with Angular-CLI, ngrx, and material2.
+
+## Prerequisites
+>>>>>>> b72a69f (Update dependencies (#20))
 
 ## Development server
 
+<<<<<<< HEAD
 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.
 
 ## Code scaffolding
@@ -25,3 +32,21 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
 ## 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).
+=======
+## Manual Installation
+
+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)
+
+## Tests
+
+* Run `npm run lint` to check for TSLint mistakes
+* Run `npm test` to execute the unit tests via Karma
+* Run `npm run e2e` to execute the end-to-end tests via Protractor
+
+## Deploy
+
+1. Run `ng build -prod -aot` to build the project
+2. Run `npm run sw` to generate the service worker file (in dist directory)
+>>>>>>> b72a69f (Update dependencies (#20))

client/angular-cli.json

@@ -0,0 +1,67 @@
+{
+  "project": {
+    "version": "1.0.0-beta.28.3",
+    "name": "client"
+  },
+  "apps": [
+    {
+      "root": "src",
+      "outDir": "dist",
+      "assets": [
+        "assets",
+        "favicon.ico"
+      ],
+      "index": "index.html",
+      "main": "main.ts",
+      "polyfills": "polyfills.ts",
+      "test": "test.ts",
+      "tsconfig": "tsconfig.json",
+      "prefix": "app",
+      "styles": [
+        "styles.scss"
+      ],
+      "scripts": [],
+      "environments": {
+        "source": "environments/environment.ts",
+        "dev": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts"
+      }
+    }
+  ],
+  "e2e": {
+    "protractor": {
+      "config": "./protractor.conf.js"
+    }
+  },
+  "lint": [
+    {
+      "files": "src/**/*.ts",
+      "project": "src/tsconfig.json"
+    },
+    {
+      "files": "e2e/**/*.ts",
+      "project": "e2e/tsconfig.json"
+    }
+  ],
+  "test": {
+    "karma": {
+      "config": "./karma.conf.js"
+    }
+  },
+  "defaults": {
+    "styleExt": "scss",
+    "prefixInterfaces": false,
+    "inline": {
+      "style": false,
+      "template": false
+    },
+    "spec": {
+      "class": false,
+      "component": true,
+      "directive": true,
+      "module": false,
+      "pipe": true,
+      "service": true
+    }
+  }
+}

client/e2e/app.e2e-spec.ts

@@ -0,0 +1,14 @@
+import { ClientPage } from './app.po';
+
+describe('client App', function() {
+  let page: ClientPage;
+
+  beforeEach(() => {
+    page = new ClientPage();
+  });
+
+  it('should display message saying app works', () => {
+    page.navigateTo();
+    expect(page.getParagraphText()).toEqual('app works!');
+  });
+});

client/e2e/app.po.ts

@@ -0,0 +1,11 @@
+import { browser, element, by } from 'protractor';
+
+export class ClientPage {
+  navigateTo() {
+    return browser.get('/');
+  }
+
+  getParagraphText() {
+    return element(by.css('app-root h1')).getText();
+  }
+}

client/karma.conf.js

@@ -12,15 +12,38 @@ module.exports = function (config) {
       require('karma-coverage-istanbul-reporter'),
       require('@angular-devkit/build-angular/plugins/karma')
     ],
+<<<<<<< HEAD
     client: {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
+=======
+    files: [
+      { pattern: './src/test.ts', watched: false }
+    ],
+    preprocessors: {
+      './src/test.ts': ['angular-cli']
+    },
+    mime: {
+      'text/x-typescript': ['ts','tsx']
+    },
+    remapIstanbulReporter: {
+      reports: {
+        html: 'coverage',
+        lcovonly: './coverage/coverage.lcov'
+      }
+>>>>>>> b72a69f (Update dependencies (#20))
     },
     coverageIstanbulReporter: {
       dir: require('path').join(__dirname, './coverage/client'),
       reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },
+<<<<<<< HEAD
     reporters: ['progress', 'kjhtml'],
+=======
+    reporters: config.angularCli && config.angularCli.codeCoverage
+              ? ['progress', 'karma-remap-istanbul']
+              : ['progress'],
+>>>>>>> b72a69f (Update dependencies (#20))
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,