Skip to content
Permalink
Browse files

feat: fix aot build

  • Loading branch information
evereq committed Dec 22, 2019
1 parent 3f1c161 commit 73c8baf09faccce8724ae38f8628956d0c44eb1b
@@ -79,7 +79,7 @@ jobs:
command: yarn bootstrap
- run:
name: Run Build
command: yarn build:api
command: yarn build:api:prod
- save_cache:
name: Save Yarn Package Cache
key: yarn-packages-api-{{ checksum "yarn.lock" }}
@@ -117,7 +117,7 @@ jobs:
command: yarn bootstrap
- run:
name: Run Build
command: yarn build
command: yarn build:prod
- save_cache:
name: Save Yarn Package Cache
key: yarn-packages-web-{{ checksum "yarn.lock" }}
@@ -0,0 +1 @@
2019/12/22 13:34:29 [error] 6#6: *1 upstream timed out (110: Connection timed out) while reading response header from upstream, client: 172.18.0.1, server: , request: "GET / HTTP/1.1", upstream: "http://172.18.0.8:4200/", host: "localhost:8080"
@@ -2,6 +2,7 @@
"cSpell.words": [
"AGPL",
"Cloudinary",
"Datepicker",
"Fargate",
"Fullname",
"Tabset",
@@ -13,12 +13,14 @@ import { EmployeeService } from './employee.service';
import { Employee } from './employee.entity';
import { CrudController } from '../core/crud/crud.controller';
import { IPagination } from '../core';
import { EmployeeCreateInput as IEmployeeCreateInput } from '@gauzy/models';
import {
EmployeeCreateInput as IEmployeeCreateInput,
RolesEnum
} from '@gauzy/models';
import { CommandBus } from '@nestjs/cqrs';
import { EmployeeCreateCommand } from './commands';
import { RoleGuard } from '../shared/guards/auth/role.guard';
import { Roles } from '../shared/decorators/roles';
import { RolesEnum } from 'apps/common/enums/roles';

@UseGuards(RoleGuard)
@Roles(RolesEnum.ADMIN)
@@ -6,8 +6,8 @@ import { CrudController } from '../core/crud/crud.controller';
import { IPagination } from '../core';
import { UUIDValidationPipe } from '../shared';
import { RoleGuard } from '../shared/guards/auth/role.guard';
import { RolesEnum } from '@gauzy/models';
import { Roles } from '../shared/decorators/roles';
import { RolesEnum } from 'apps/common/enums/roles';

@UseGuards(RoleGuard)
@Roles(RolesEnum.ADMIN)
@@ -13,7 +13,6 @@ export class RoleGuard implements CanActivate {
async canActivate(context: ExecutionContext): Promise<boolean> {
const roles = this._reflector.get<string[]>(
'roles',
// context.getHandler()
context.getClass()
);

This file was deleted.

@@ -3,13 +3,12 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { ActivatedRoute, Params } from '@angular/router';
import { NbToastrService } from '@nebular/theme';
import { Employee } from 'apps/api/src/app/employee';
import { EmployeeStore } from 'apps/gauzy/src/app/@core/services/employee-store.service';
import { EmployeesService } from 'apps/gauzy/src/app/@core/services/employees.service';
import { UsersService } from 'apps/gauzy/src/app/@core/services/users.service';
import { Subject, Subscription } from 'rxjs';
import { first, takeUntil } from 'rxjs/operators';
import { UserFindInput, EmployeeUpdateInput } from '@gauzy/models';
import { UserFindInput, EmployeeUpdateInput, Employee } from '@gauzy/models';
import { Store } from 'apps/gauzy/src/app/@core/services/store.service';
import { ErrorHandlingService } from 'apps/gauzy/src/app/@core/services/error-handling.service';

@@ -1,6 +1,5 @@
import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core';
import { Employee } from 'apps/api/src/app/employee';
import { OrganizationTeams } from '@gauzy/models';
import { OrganizationTeams, Employee } from '@gauzy/models';

@Component({
selector: 'ngx-edit-organization-teams-mutation',
@@ -27,7 +27,6 @@ import { HttpClient } from '@angular/common/http';
import { EditOrganizationSettingsModule } from './edit-organization/edit-organization-settings/edit-organization-settings.module';
import { OrganizationsCurrencyComponent } from './table-components/organizations-currency/organizations-currency.component';
import { OrganizationsEmployeesComponent } from './table-components/organizations-employees/organizations-employees.component';
import { EmployeeModule } from 'apps/api/src/app/employee';

@NgModule({
imports: [
@@ -1,9 +1,8 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import { NavigationEnd, Router } from '@angular/router';
import { RolesEnum } from '@gauzy/models';
import { RolesEnum, Organization } from '@gauzy/models';
import { NbMenuItem } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import { Organization } from 'apps/api/src/app/organization';
import { Subject } from 'rxjs';
import { filter, first, takeUntil } from 'rxjs/operators';
import { AuthService } from '../@core/services/auth.service';
@@ -54,7 +54,7 @@ export class ProposalRegisterComponent implements OnInit, OnDestroy {
});
}

private async registerProposal() {
public async registerProposal() {
if (this.form.valid) {
const result = this.form.value;
const selectedEmployee = this.employeeSelector.selectedEmployee.id;
@@ -0,0 +1,42 @@
// NOTE: Auto-generated file
// The file contents for the current environment will overwrite these during build.
// The build system defaults to the dev environment which uses 'environment.ts', but if you do
// 'ng build --env=prod' then 'environment.prod.ts' will be used instead.
// The list of which env maps to which file can be found in '.angular-cli.json'.

import { Environment } from './model';
import { CloudinaryConfiguration } from '@cloudinary/angular-5.x';

export const environment: Environment = {
production: true,

API_BASE_URL: 'http://localhost:3000',
COMPANY_NAME: 'Ever Co. LTD',
COMPANY_SITE: 'Gauzy',
COMPANY_LINK: 'https://ever.co/',
COMPANY_SITE_LINK: 'https://gauzy.co',
COMPANY_GITHUB_LINK: 'https://github.com/ever-co',
COMPANY_FACEBOOK_LINK: 'https://www.facebook.com/gauzyplatform',
COMPANY_TWITTER_LINK: 'https://twitter.com/gauzyplatform',
COMPANY_LINKEDIN_LINK: 'https://www.linkedin.com/company/ever-co.',
CLOUDINARY_CLOUD_NAME: 'dv6ezkfxg',
CLOUDINARY_API_KEY: '256868982483961',
GOOGLE_AUTH_LINK: 'http://localhost:3000/api/auth/google',
FACEBOOK_AUTH_LINK: 'http://localhost:3000/api/auth/facebook',
LINKEDIN_AUTH_LINK: '#',
NO_INTERNET_LOGO: 'assets/images/logos/logo_Gauzy.svg'
};

export const cloudinaryConfiguration: CloudinaryConfiguration = {
cloud_name: environment.CLOUDINARY_CLOUD_NAME,
api_key: environment.CLOUDINARY_API_KEY
};

/*
* For easier debugging in development mode, you can import the following file
* to ignore zone related error stack frames such as 'zone.run', 'zoneDelegate.invokeTask'.
*
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
@@ -1,42 +0,0 @@
// NOTE: Auto-generated file
// The file contents for the current environment will overwrite these during build.
// The build system defaults to the dev environment which uses 'environment.ts', but if you do
// 'ng build --env=prod' then 'environment.prod.ts' will be used instead.
// The list of which env maps to which file can be found in '.angular-cli.json'.

import { Environment } from './model';
import { CloudinaryConfiguration } from '@cloudinary/angular-5.x';

export const environment: Environment = {
production: false,

API_BASE_URL: 'http://localhost:3000',
COMPANY_NAME: 'Ever Co. LTD',
COMPANY_SITE: 'Gauzy',
COMPANY_LINK: 'https://ever.co/',
COMPANY_SITE_LINK: 'https://gauzy.co',
COMPANY_GITHUB_LINK: 'https://github.com/ever-co',
COMPANY_FACEBOOK_LINK: 'https://www.facebook.com/gauzyplatform',
COMPANY_TWITTER_LINK: 'https://twitter.com/gauzyplatform',
COMPANY_LINKEDIN_LINK: 'https://www.linkedin.com/company/ever-co.',
CLOUDINARY_CLOUD_NAME: 'dv6ezkfxg',
CLOUDINARY_API_KEY: '256868982483961',
GOOGLE_AUTH_LINK: 'http://localhost:3000/api/auth/google',
FACEBOOK_AUTH_LINK: 'http://localhost:3000/api/auth/facebook',
LINKEDIN_AUTH_LINK: '#',
NO_INTERNET_LOGO: 'assets/images/logos/logo_Gauzy.svg'
};

export const cloudinaryConfiguration: CloudinaryConfiguration = {
cloud_name: environment.CLOUDINARY_CLOUD_NAME,
api_key: environment.CLOUDINARY_API_KEY
};

/*
* For easier debugging in development mode, you can import the following file
* to ignore zone related error stack frames such as 'zone.run', 'zoneDelegate.invokeTask'.
*
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
@@ -1,5 +1,5 @@
import { BaseEntityModel as IBaseEntityModel } from './base-entity.model';
import { Employee } from 'apps/api/src/app/employee';
import { Employee } from './employee.model';

export interface OrganizationTeams extends IBaseEntityModel {
name: string;

0 comments on commit 73c8baf

Please sign in to comment.
You can’t perform that action at this time.