Merge develop into master

.editorconfig

@@ -5,6 +5,7 @@ root = true
 charset = utf-8
 indent_style = space
 indent_size = 2
+end_of_line = crlf
 insert_final_newline = true
 trim_trailing_whitespace = true
 

.gitignore

@@ -1,42 +1,38 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# compiled output
-/dist
-/tmp
-/out-tsc
-
-# dependencies
-/node_modules
-
-# IDEs and editors
-/.idea
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# 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
+# Server files
+/server/node_modules
+
+# Client files
+/client/.DS_Store
+/client/node_modules/
+/legacy-client/node_modules/
+/client/dist/
+/client/test/unit/reports/
+/client/test/e2e/reports/
+/client/test/e2e/features/undefined-steps.js
+/client/selenium-debug.log
+
+/client/src/components/projects/.DS_Store
+/client/src/components/root/.DS_Store
+/client/src/shared/.DS_Store
+/client/src/store/.DS_Store
+/client/src/store/modules/.DS_Store
+/src/app/.DS_Store
+/src/.DS_Store
+/client/src/.DS_Store
+/client/src/components/root/.DS_Store
+/.DS_Store
+
+# Editor directories and files
+.idea
+.vscode
+
+#misc
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+
+# Ignore Mac DS_Store files
 .DS_Store
-Thumbs.db
+
+

.travis.yml

@@ -0,0 +1,53 @@
+dist: trusty
+
+services:
+  - postgresql
+
+env:
+  # Use test credentials for sequelize
+  - NODE_ENV=test
+
+sudo: required
+before_install:
+  # Repo for Yarn
+  - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
+  - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+  - sudo apt-get update -qq
+  - sudo apt-get install -y -qq yarn=1.5.1-1
+addons:
+  chrome: stable
+
+language: node_js
+node_js:
+  - "9"
+
+cache:
+  yarn: true
+  directories:
+     - ./client/node_modules
+     - ./server/node_modules
+
+install:
+  - yarn run client-server:install
+
+script:
+  # Use Chromium instead of Chrome.
+  # - export CHROME_BIN=chromium-browser
+  # Initialize database: create, migrate, seed
+  - xvfb-run -a yarn run db
+  # Run backend
+  - xvfb-run -a yarn run server &
+  # Run linter
+  - xvfb-run -a yarn run client:lint
+  # Run unit tests
+  - xvfb-run -a yarn run client:unit
+  # Run e2e tests
+  - xvfb-run -a yarn run client:e2e
+#   - sleep 3
+
+after_script:
+  # Stop backend
+  - pkill node
+
+notifications:
+  email: false

README.md

@@ -1,39 +1,31 @@
-# Portfolio
+# T-Portfolio
 
-## How to run
-
-1. Get MySQL server locally or via docker:
-`docker run -p 3306:3306 --name some-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest`
-(where `my-secret-pw` is your `root` user password)
-
-2. Run `npm install` to install all dependencies
+[![Build Status](https://travis-ci.org/T-Systems-RUS/Portfolio.svg?branch=develop)](https://travis-ci.org/T-Systems-RUS/Portfolio)
 
-3. Run `npm run db:init` to initialize database (tweak DB connection settings via`server/config/config.json`)
-
-4. Run `npm run client-server` to run both client and server in development watch mode. 
+## How to run
 
+**PREREQUISITE**: Get PostgreSQL server locally or via docker:
+`docker run --name some-postgres -p 5432:5432 -e POSTGRES_PASSWORD=123 -d postgres` (where `123` is your `postgres` user password)
 
-## Development server
+There are to possible scenarios to start the app:
 
-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.
+### One process for client and server (easy to start with)
 
-## Code scaffolding
+1. Run `yarn run client-server:install` to install both server and client dependencies
 
-Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|module`.
+3. Run `yarn run db` to initialize database (tweak DB connection settings via`server/config/config.json`)
 
-## Build
+4. Run `yarn run client-server` to run both client and server in development watch mode. 
 
-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.
 
-## Running unit tests
+### Separate processes for client and server (easier to manage)
 
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+1. Go to `server` folder and run `yarn` to install server dependencies
 
-## Running end-to-end tests
+3. Run `yarn run db` to initialize database (tweak DB connection settings via`server/config/config.json`)
 
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-Before running the tests make sure you are serving the app via `ng serve`.
+4. Run `yarn run server:watch` to run server in development watch mode
 
-## Further help
+5. Go to `client` folder and run `yarn` to install client dependencies
 
-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).
+6. Run `yarn run dev` to run client in development watch mode. 

client/.babelrc

@@ -0,0 +1,18 @@
+{
+  "presets": [
+    ["env", {
+      "modules": false,
+      "targets": {
+        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+      }
+    }],
+    "stage-2"
+  ],
+  "plugins": ["transform-vue-jsx", "transform-runtime"],
+  "env": {
+    "test": {
+      "presets": ["env", "stage-2"],
+      "plugins": ["transform-vue-jsx", "transform-es2015-modules-commonjs", "dynamic-import-node"]
+    }
+  }
+}

client/.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

client/.eslintignore

@@ -0,0 +1,5 @@
+/build/
+/config/
+/dist/
+/*.js
+/test/unit/reports/