Merge branch 'develop' into feat/#806-adding-OKR-module

.vscode/settings.json

@@ -7,6 +7,7 @@
 		"Fullname",
 		"HUBSTAFF",
 		"Tabset",
+		"Timesheet",
 		"UPWORK",
 		"adminer",
 		"compodoc",
@@ -25,6 +26,7 @@
 		"postgres",
 		"prebuild",
 		"pulumi",
+		"timesheets",
 		"toastr",
 		"typeorm",
 		"uploader",

README.md

@@ -81,14 +81,18 @@ Note: together with Gauzy, Docker Compose will run following:
 -   Install and run latest [PostgreSQL](https://www.postgresql.org) (optionally, other DB can be configured manually).
 -   Install [Yarn](https://github.com/yarnpkg/yarn) (if you don't have it) with `npm i -g yarn`
 -   Install NPM packages with `yarn install`
+-   Optionally, if you want to seed a lot of fake data for demo testing, run `yarn seed:all`
 -   Run API with `yarn start:api` (by default runs on <http://localhost:3000/api>)
 -   Run Gauzy front-end with `yarn start`
 -   Open <http://localhost:4200> in your browser
 -   Login with email `admin@ever.co` and password: `admin`
 -   Enjoy
 
-Note: during the first API start, DB will be automatically seed with initial data if no users found.
-You can run seed any moment manually (e.g. if you changed entities schemas) with `yarn run seed` command to re-initialize DB (warning: unsafe for production!).
+Notes:
+
+-   during the first API start, DB will be automatically seed with minimum set of initial data if no users found.
+-   you can run seed any moment manually (e.g. if you changed entities schemas) with `yarn seed` command to re-initialize DB (warning: unsafe for production!).
+-   it is possible to run generation of extremely large amount of fake data for demo purposes / testing with `yarn seed:all` (warning: takes ~10 min to complete)
 
 ### Production
 
@@ -101,7 +105,7 @@ Note: it's WIP, currently supports AWS EKS (Kubernetes) and Fargate Clusters (fo
 -   [TypeScript](https://www.typescriptlang.org)
 -   [Node.js](https://nodejs.org)
 -   [Nx](https://nx.dev)
--   [Angular 8](https://angular.io)
+-   [Angular](https://angular.io)
 -   [Nest](https://github.com/nestjs/nest)
 -   [RxJS](http://reactivex.io/rxjs)
 -   [TypeORM](https://github.com/typeorm/typeorm)

angular.json

@@ -233,7 +233,31 @@
 					"builder": "@nrwl/node:build",
 					"options": {
 						"outputPath": "dist/apps/api",
-						"main": "apps/api/src/app/core/seeds/index.ts",
+						"main": "apps/api/src/seed.ts",
+						"showCircularDependencies": false,
+						"sourceMap": true,
+						"tsConfig": "apps/api/tsconfig.app.json"
+					},
+					"configurations": {
+						"production": {
+							"optimization": true,
+							"extractLicenses": true,
+							"inspect": false,
+							"sourceMap": false,
+							"fileReplacements": [
+								{
+									"replace": "apps/api/src/environments/environment.ts",
+									"with": "apps/api/src/environments/environment.prod.ts"
+								}
+							]
+						}
+					}
+				},
+				"seed-all": {
+					"builder": "@nrwl/node:build",
+					"options": {
+						"outputPath": "dist/apps/api",
+						"main": "apps/api/src/seedAll.ts",
 						"showCircularDependencies": false,
 						"sourceMap": true,
 						"tsConfig": "apps/api/tsconfig.app.json"

apps/api/.gitignore

@@ -1 +1,2 @@
-public/screenshots
+public/screenshots
+report.*.json

apps/api/package.json

@@ -14,47 +14,59 @@
 		"start:debug": "nodemon --config nodemon-debug.json",
 		"build": "yarn ng build api",
 		"build:prod": "yarn ng build api --prod",
-		"seed": "yarn ts-node -r tsconfig-paths/register --project tsconfig.app.json src/app/core/seeds/index.ts",
-		"seed:all": "yarn ts-node -r tsconfig-paths/register --project tsconfig.app.json src/app/core/seeds/seedAll.ts",
-		"seed:prod": "yarn ng run api:seed -c=production"
+		"seed": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn ts-node -r tsconfig-paths/register --project apps/api/tsconfig.app.json src/seed.ts",
+		"seed:build": "yarn ng run api:seed",
+		"seed:all": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 yarn ts-node -r tsconfig-paths/register --project apps/api/tsconfig.app.json src/seedAll.ts",
+		"seed:all:build": "yarn ng run api:seed-all",
+		"seed:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 yarn ts-node -r tsconfig-paths/register --project apps/api/tsconfig.app.json src/seed.ts",
+		"seed:prod:build": "yarn ng run api:seed -c=production"		
 	},
 	"dependencies": {
-		"@godaddy/terminus": "^4.3.1",
-		"@nestjs/common": "^7.0.9",
-		"@nestjs/core": "^7.0.9",
-		"@nestjs/cqrs": "^6.1.0",
-		"@nestjs/graphql": "^7.3.5",
-		"@nestjs/jwt": "^7.0.0",
-		"@nestjs/microservices": "^7.0.6",
-		"@nestjs/passport": "^7.0.0",
-		"@nestjs/platform-express": "^7.0.9",
-		"@nestjs/platform-socket.io": "^7.0.9",
-		"@nestjs/swagger": "^4.5.4",
+		"@godaddy/terminus": "^4.4.1",
+		"@nestjs/common": "^7.4.2",
+		"@nestjs/core": "^7.4.2",
+		"@nestjs/cqrs": "^7.0.0",
+		"@nestjs/graphql": "^7.6.0",
+		"@nestjs/jwt": "^7.1.0",		
+		"@nestjs/passport": "^7.1.0",
+		"@nestjs/platform-express": "^7.4.2",
+		"@nestjs/platform-socket.io": "^7.4.2",
+		"@nestjs/swagger": "^4.5.12",
 		"@nestjs/terminus": "^7.0.1",
-		"@nestjs/typeorm": "^7.0.0",
-		"@nestjs/websockets": "^7.0.9",
-		"@nestjsx/crud": "^4.5.0",
-		"@nestjsx/crud-typeorm": "^4.5.0",
-		"@ntegral/nestjs-sentry": "^1.0.2",
+		"@nestjs/typeorm": "^7.1.0",
+		"@nestjs/websockets": "^7.4.2",
+		"@nestjs/microservices": "^7.4.2",
+		"amqp-connection-manager": "^3.2.0",
+		"amqplib": "^0.6.0",
+		"grpc": "^1.24.3",
+		"kafkajs": "^1.12.0",
+		"mqtt": "^4.1.0",
+		"nats": "^1.4.12",
+		"redis": "^3.0.2",
+		"@nestjsx/crud": "^4.6.2",
+		"@nestjsx/crud-typeorm": "^4.6.2",
+		"@ntegral/nestjs-sentry": "^1.0.3",
 		"@nestjs/serve-static": "^2.1.3",
 		"bcrypt": "^4.0.1",
 		"cache-manager": "^3.3.0",
-		"class-transformer": "^0.2.3",
+		"class-transformer": "^0.3.1",
 		"class-validator": "^0.12.2",
-		"cli-ux": "^5.4.5",
+		"cli-ux": "^5.4.10",
 		"cls-hooked": "^4.2.2",
 		"csurf": "^1.11.0",
-		"currency.js": "^1.2.2",
+		"currency.js": "^2.0.3",
 		"express-session": "^1.17.1",
 		"faker": "^4.1.0",
-		"fastify-swagger": "^2.5.1",
+		"fastify-swagger": "^3.2.0",
 		"helmet": "^3.23.3",
-		"mjml": "^4.6.2",
-		"moment": "^2.25.2",
+		"mjml": "^4.6.3",
+		"moment": "^2.25.3",
+		"moment-range": "^4.0.2",
 		"nest-router": "^1.0.9",
-		"nestjs-i18n": "^8.0.2",
-		"nodemailer": "^6.4.6",
-		"nodemon": "^1.19.4",
+		"nestjs-i18n": "^8.0.8",
+		"nodemailer": "^6.4.11",
+		"nodemailer-handlebars": "^1.0.0",
+		"nodemon": "^2.0.4",
 		"passport": "^0.4.1",
 		"passport-auth0": "^1.3.3",
 		"passport-azure-ad-oauth2": "^0.0.4",
@@ -64,30 +76,31 @@
 		"passport-twitter": "^1.0.4",
 		"passport-github2": "^0.1.12",
 		"passport-jwt": "^4.0.0",
-		"pg": "^8.0.3",
-		"pm2": "^4.2.3",
+		"pg": "^8.3.0",
+		"pm2": "^4.4.0",
 		"reflect-metadata": "^0.1.13",
 		"request": "^2.88.2",
-		"rxjs": "^6.5.2",
+		"rxjs": "^6.6.2",
 		"rimraf": "^3.0.2",
-		"sharp": "^0.25.2",
+		"sharp": "^0.25.4",
 		"supertest": "^4.0.2",
 		"swagger-ui-express": "^4.1.4",
-		"typeorm": "^0.2.24",
+		"typeorm": "^0.2.25",
 		"typeorm-express-query-builder": "^1.2.0",
-		"web-push": "^3.4.3"
+		"web-push": "^3.4.4",
+		"upwork-api": "^1.3.6"
 	},
 	"devDependencies": {
-		"@nestjs/schematics": "^7.0.0",
-		"@nestjs/testing": "^7.0.6",
+		"@nestjs/schematics": "^7.0.1",
+		"@nestjs/testing": "^7.4.2",
 		"@types/helmet": "^0.0.47",
 		"@types/nodemailer": "^6.4.0",
-		"@types/passport": "^1.0.3",
+		"@types/passport": "^1.0.4",
 		"@types/passport-jwt": "^3.0.3",
-		"@types/socket.io": "^2.1.4",
-		"@types/supertest": "^2.0.8",
+		"@types/socket.io": "^2.1.10",
+		"@types/supertest": "^2.0.10",
 		"@types/web-push": "^3.3.0",
 		"dotenv": "^8.2.0",
-		"ts-node": "^8.8.2"
+		"ts-node": "^8.10.2"
 	}
 }