Merge pull request #17 from ansrivas/angular4

ansrivas · web-flow · commit 0bc66b05afe6 · 2017-04-21T22:54:14.000+02:00
Angular4
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM gliderlabs/alpine:latest
+FROM alpine:latest
 
 COPY requirements.txt run.py /server/
 
diff --git a/backend/flask_app/app_utils/utilities.py b/backend/flask_app/app_utils/utilities.py
@@ -26,53 +26,3 @@ def to_dict(self):
         ret_val = dict(self.payload or ())
         ret_val['message'] = self.message
         return ret_val
-
-
-class LogFormatter(logging.Formatter):
-    """."""
-
-    datefmt = '%Y-%m-%d %H:%M:%S'
-
-    def format(self, record):
-        """."""
-        error_location = "%s.%s" % (record.name, record.funcName)
-        line_number = "%s" % (record.lineno)
-        location_line = error_location[:32] + ":" + line_number
-        s = "%.19s [%-8s] [%-36s] %s" % (self.formatTime(record, self.datefmt),
-                                         record.levelname,  location_line,
-                                         record.getMessage())
-        return s
-
-
-def setup_logger():
-    """Set up the global logging settings."""
-    generated_files = 'logs'
-    ALL_LOG_FILENAME = '{0}/all.log'.format(generated_files)
-    ERROR_LOG_FILENAME = '{0}/error.log'.format(generated_files)
-    if not os.path.exists(generated_files):
-        os.makedirs(generated_files)
-
-    logger = logging.getLogger()
-    logger.setLevel(logging.DEBUG)
-
-    # create console handler and set level to info
-    handler = logging.StreamHandler()
-    handler.setLevel(logging.INFO)
-    handler.setFormatter(LogFormatter())
-    logger.addHandler(handler)
-
-    # create error file handler and set level to error
-    handler = logging.handlers.RotatingFileHandler(ERROR_LOG_FILENAME,
-                                                   maxBytes=1000000,
-                                                   backupCount=100)
-    handler.setLevel(logging.ERROR)
-    handler.setFormatter(LogFormatter())
-    logger.addHandler(handler)
-
-    # create debug file handler and set level to debug
-    handler = logging.handlers.RotatingFileHandler(ALL_LOG_FILENAME,
-                                                   maxBytes=1000000,
-                                                   backupCount=100)
-    handler.setLevel(logging.DEBUG)
-    handler.setFormatter(LogFormatter())
-    logger.addHandler(handler)
diff --git a/backend/flask_app/factory.py b/backend/flask_app/factory.py
@@ -9,7 +9,6 @@
 from flask_cors import CORS
 from flask_security import Security, utils
 
-from .app_utils import utilities
 from .config import CONFIG
 from .models import User, db, user_datastore
 
@@ -20,7 +19,6 @@ def create_app():
     config_name = os.getenv('FLASK_CONFIGURATION', 'default')
     app.config.from_object(CONFIG[config_name])
     # app.secret_key = app.config['SECRET_KEY']
-    utilities.setup_logger()
     db.init_app(app)
     Security(app, user_datastore)
     CORS(app, headers=['Content-Type'])
@@ -29,6 +27,7 @@ def create_app():
 
 
 def create_user(app):
+    """Create first user if doesn't exist."""
     db.create_all()
     if not User.query.first():
         user_datastore.create_user(
diff --git a/backend/flask_app/server.py b/backend/flask_app/server.py
@@ -61,6 +61,5 @@ def main():
         logger.error(exc.message)
         logger.exception(traceback.format_exc())
     finally:
-        # get last entry and insert build appended if not completed
         # Do something here
         pass
diff --git a/backend/run.py b/backend/run.py
@@ -8,7 +8,7 @@
     setup_logger(log_directory='./logs',
                  file_handler_type=HandlerType.TIME_ROTATING_FILE_HANDLER,
                  allow_console_logging=True,
-                 allow_file_logging=True,
+                 allow_file_logging=False,
                  backup_count=100,
                  max_file_size_bytes=100000,
                  when_to_rotate='D',
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,16 +1,16 @@
 version: '2'
 services:
-  sample-backend:
+  backend-s:
     build: ./backend
-    image: server:latest
-    container_name: python-backend
-  sample-frontend:
+    image: ansrivas/server:latest
+    container_name: backend-c
+  frontend-s:
     build: ./front
-    image: angular2:latest
-    container_name: angular2-frontend
+    image: ansrivas/frontend:latest
+    container_name: frontend-c
     ports:
       - "3000:80"
     links:
-      - sample-backend
+      - backend-s
     depends_on:
-      - sample-backend
+      - backend-s
diff --git a/front/config/webpack.common.js b/front/config/webpack.common.js
@@ -249,7 +249,7 @@ module.exports = function (options) {
        */
       new ContextReplacementPlugin(
         // The (\\|\/) piece accounts for path separators in *nix and Windows
-        /angular(\\|\/)core(\\|\/)src(\\|\/)linker/,
+        /angular(\\|\/)core(\\|\/)@angular/,
         helpers.root('src'), // location of your src
         {
           // your Angular Async Route paths relative to this root directory
diff --git a/front/config/webpack.test.js b/front/config/webpack.test.js
@@ -213,7 +213,7 @@ module.exports = function (options) {
        */
       new ContextReplacementPlugin(
         // The (\\|\/) piece accounts for path separators in *nix and Windows
-        /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
+        /angular(\\|\/)core(\\|\/)@angular/,
         helpers.root('src'), // location of your src
         {
           // your Angular Async Route paths relative to this root directory
diff --git a/front/nginx.conf b/front/nginx.conf
@@ -9,7 +9,7 @@ http {
 
     ## host should be changed when there will be a proper link
     location ~ ^/(api|oauth) {
-      proxy_pass http://python-backend:8080;
+      proxy_pass http://backend-s:8080;
     }
 
     location / {
diff --git a/front/package.json b/front/package.json
@@ -1,8 +1,9 @@
 {
   "name": "angular2-webpack-starter",
-  "version": "5.4.1",
+  "version": "6.0.0",
   "description": "An Angular 2 Webpack Starter kit featuring Angular 2 (Router, Http, Forms, Services, Tests, E2E, Coverage), Karma, Protractor, Jasmine, Istanbul, TypeScript, and Webpack by AngularClass",
   "keywords": [
+    "angular",
     "angular2",
     "webpack",
     "typescript"
@@ -68,88 +69,88 @@
     "webpack": "webpack"
   },
   "dependencies": {
-    "@angular/common": "2.4.6",
-    "@angular/compiler": "2.4.6",
-    "@angular/core": "2.4.6",
-    "@angular/forms": "2.4.6",
-    "@angular/http": "2.4.6",
-    "@angular/platform-browser": "2.4.6",
-    "@angular/platform-browser-dynamic": "2.4.6",
-    "@angular/platform-server": "2.4.6",
-    "@angular/router": "3.4.6",
-    "@angularclass/conventions-loader": "^1.0.2",
+    "@angular/animations": "~4.0.3",
+    "@angular/common": "~4.0.3",
+    "@angular/compiler": "~4.0.3",
+    "@angular/core": "~4.0.3",
+    "@angular/forms": "~4.0.3",
+    "@angular/http": "~4.0.3",
+    "@angular/platform-browser": "~4.0.3",
+    "@angular/platform-browser-dynamic": "~4.0.3",
+    "@angular/platform-server": "~4.0.3",
+    "@angular/router": "~4.0.3",
+    "@angularclass/conventions-loader": "^1.0.13",
     "@angularclass/hmr": "~1.2.2",
     "@angularclass/hmr-loader": "~3.0.2",
     "core-js": "^2.4.1",
     "http-server": "^0.9.0",
     "ie-shim": "^0.1.0",
     "jasmine-core": "^2.5.2",
-    "reflect-metadata": "^0.1.9",
-    "rxjs": "5.0.2",
-    "zone.js": "0.7.6"
+    "reflect-metadata": "^0.1.10",
+    "rxjs": "~5.3.0",
+    "zone.js": "~0.8.5"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "2.4.6",
-    "@types/hammerjs": "^2.0.33",
-    "@types/jasmine": "^2.2.34",
-    "@types/node": "^7.0.0",
-    "@types/selenium-webdriver": "~2.53.39",
+    "@angular/compiler-cli": "~4.0.3",
+    "@types/hammerjs": "^2.0.34",
+    "@types/jasmine": "2.5.45",
+    "@types/node": "^7.0.13",
     "@types/source-map": "^0.5.0",
-    "@types/uglify-js": "^2.0.27",
-    "@types/webpack": "^2.0.0",
+    "@types/uglify-js": "^2.6.28",
+    "@types/webpack": "^2.2.15",
     "add-asset-html-webpack-plugin": "^1.0.2",
-    "angular2-template-loader": "^0.6.0",
+    "angular2-template-loader": "^0.6.2",
     "assets-webpack-plugin": "^3.5.1",
-    "awesome-typescript-loader": "~3.0.0-beta.18",
-    "codelyzer": "~2.0.0-beta.4",
-    "copy-webpack-plugin": "^4.0.0",
-    "css-loader": "^0.26.0",
-    "exports-loader": "^0.6.3",
-    "expose-loader": "^0.7.1",
-    "extract-text-webpack-plugin": "~2.0.0-rc.3",
-    "file-loader": "^0.10.0",
+    "awesome-typescript-loader": "~3.1.2",
+    "codelyzer": "~2.1.1",
+    "copy-webpack-plugin": "^4.0.1",
+    "css-loader": "^0.28.0",
+    "exports-loader": "^0.6.4",
+    "expose-loader": "^0.7.3",
+    "extract-text-webpack-plugin": "~2.1.0",
+    "file-loader": "^0.11.1",
     "find-root": "^1.0.0",
     "gh-pages": "^0.12.0",
     "html-webpack-plugin": "^2.28.0",
-    "imports-loader": "^0.7.0",
+    "imports-loader": "^0.7.1",
     "istanbul-instrumenter-loader": "2.0.0",
     "jasmine-core": "^2.5.2",
     "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
+    "karma": "^1.6.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "^1.1.1",
-    "karma-jasmine": "^1.0.2",
-    "karma-mocha-reporter": "^2.2.2",
+    "karma-jasmine": "^1.1.0",
+    "karma-mocha-reporter": "^2.2.3",
     "karma-remap-coverage": "^0.1.4",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "2.0.1",
+    "karma-webpack": "~2.0.3",
     "ng-router-loader": "^2.1.0",
-    "ngc-webpack": "1.1.0",
-    "node-sass": "^4.5.0",
-    "npm-run-all": "^4.0.1",
+    "ngc-webpack": "~2.0.0",
+    "node-sass": "^4.5.2",
+    "npm-run-all": "^4.0.2",
     "optimize-js-plugin": "0.0.4",
-    "parse5": "^3.0.1",
-    "protractor": "^4.0.14",
+    "parse5": "^3.0.2",
+    "protractor": "^5.1.1",
     "raw-loader": "0.5.1",
-    "rimraf": "~2.6.0",
-    "sass-loader": "^6.0.0",
-    "script-ext-html-webpack-plugin": "^1.6.2",
-    "source-map-loader": "^0.1.5",
-    "string-replace-loader": "1.0.5",
-    "style-loader": "^0.13.1",
-    "to-string-loader": "^1.1.4",
-    "ts-node": "^2.0.0",
-    "tslib": "^1.5.0",
+    "rimraf": "~2.6.1",
+    "sass-loader": "^6.0.3",
+    "script-ext-html-webpack-plugin": "^1.7.1",
+    "source-map-loader": "^0.2.1",
+    "string-replace-loader": "~1.2.0",
+    "style-loader": "^0.16.1",
+    "to-string-loader": "^1.1.5",
+    "ts-node": "^3.0.2",
+    "tslib": "^1.6.1",
     "tslint": "~4.5.1",
-    "tslint-loader": "^3.3.0",
-    "typedoc": "^0.5.3",
-    "typescript": "~2.1.6",
-    "url-loader": "^0.5.7",
-    "webpack": "2.2.0",
-    "webpack-dev-middleware": "^1.10.0",
-    "webpack-dev-server": "2.4.1",
+    "tslint-loader": "^3.5.2",
+    "typedoc": "^0.5.10",
+    "typescript": "~2.2.2",
+    "url-loader": "^0.5.8",
+    "webpack": "~2.4.1",
+    "webpack-dev-middleware": "^1.10.1",
+    "webpack-dev-server": "~2.4.2",
     "webpack-dll-bundles-plugin": "^1.0.0-beta.5",
-    "webpack-merge": "~3.0.0"
+    "webpack-merge": "~4.1.0"
   },
   "repository": {
     "type": "git",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM gliderlabs/alpine:latest`
	`1`	`+FROM alpine:latest`
`2`	`2`
`3`	`3`	`COPY requirements.txt run.py /server/`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ module.exports = function (options) {`
`249`	`249`	`*/`
`250`	`250`	`new ContextReplacementPlugin(`
`251`	`251`	`// The (\\\|\/) piece accounts for path separators in *nix and Windows`
`252`		`- /angular(\\\|\/)core(\\\|\/)src(\\\|\/)linker/,`
	`252`	`+ /angular(\\\|\/)core(\\\|\/)@angular/,`
`253`	`253`	`helpers.root('src'), // location of your src`
`254`	`254`	`{`
`255`	`255`	`// your Angular Async Route paths relative to this root directory`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ module.exports = function (options) {`
`213`	`213`	`*/`
`214`	`214`	`new ContextReplacementPlugin(`
`215`	`215`	`// The (\\\|\/) piece accounts for path separators in *nix and Windows`
`216`		`- /angular(\\\|\/)core(\\\|\/)(esm(\\\|\/)src\|src)(\\\|\/)linker/,`
	`216`	`+ /angular(\\\|\/)core(\\\|\/)@angular/,`
`217`	`217`	`helpers.root('src'), // location of your src`
`218`	`218`	`{`
`219`	`219`	`// your Angular Async Route paths relative to this root directory`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ http {`
`9`	`9`
`10`	`10`	`## host should be changed when there will be a proper link`
`11`	`11`	`location ~ ^/(api\|oauth) {`
`12`		`- proxy_pass http://python-backend:8080;`
	`12`	`+ proxy_pass http://backend-s:8080;`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`location / {`