conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
=======
import { CustomFormValidators } from '../../../ui/validators/custom-form-validators';
import { AuthService, RoutingService } from '@spartacus/core';
>>>>>>> |
<<<<<<<
countries: fromCountries.DeliveryCountriesState;
=======
deliveryCountries: fromCountries.DeliveryCountriesState;
titles: fromTitles.TitlesState;
>>>>>>>
countries: fromCountries.DeliveryCountriesState;
titles: fromTitles.TitlesState;
<<<<<<<
countries: fromCountries.reducer
=======
deliveryCountries: fromCountries.reducer,
titles: fromTitles.reducer
>>>>>>>
countries: fromCountries.reducer,
titles: fromTitles.reducer |
<<<<<<<
import {
OccModule,
UiModule,
CmsLibModule,
UiFrameworkModule } from 'storefrontlib';
import {
CmsModule,
RoutingModule,
SiteContextModule,
ProductModule } from 'storefrontlib';
import { appRoutes } from './app.routes';
=======
import { RoutingModule } from 'storefrontlib';
import { OccModule } from 'storefrontlib';
import { UserModule } from 'storefrontlib';
import { UiModule } from 'storefrontlib';
import { CmsLibModule } from 'storefrontlib';
import { CmsModule } from 'storefrontlib';
import { UiFrameworkModule } from 'storefrontlib';
>>>>>>>
import {
OccModule,
UiModule,
CmsLibModule,
UiFrameworkModule } from 'storefrontlib';
import {
CmsModule,
RoutingModule,
SiteContextModule,
ProductModule } from 'storefrontlib';
import { appRoutes } from './app.routes';
<<<<<<<
import {
UserModule,
CartModule,
CheckoutModule,
GlobalMessageModule,
StoreFinderModule } from 'storefrontlib';
=======
>>>>>>>
import {
UserModule,
CartModule,
CheckoutModule,
GlobalMessageModule,
StoreFinderModule } from 'storefrontlib';
<<<<<<<
CartModule,
GlobalMessageModule,
CartModule,
StoreFinderModule
=======
CmsLibModule,
CmsModule.forRoot(ConfigService),
UiModule,
UiFrameworkModule
>>>>>>>
CmsLibModule,
CmsModule.forRoot(ConfigService),
UiModule,
UiFrameworkModule |
<<<<<<<
userDetails: fromUserDetailsReducer.UserDetailsState;
token: fromUserToken.UserTokenState;
=======
auth: fromUserToken.UserTokenState;
// TODO user-details here
>>>>>>>
userDetails: fromUserDetailsReducer.UserDetailsState;
auth: fromUserToken.UserTokenState;
<<<<<<<
userDetails: fromUserDetailsReducer.reducer,
token: fromUserToken.reducer
=======
auth: fromUserToken.reducer
// TODO user-details here
>>>>>>>
userDetails: fromUserDetailsReducer.reducer,
auth: fromUserToken.reducer |
<<<<<<<
import { SiteContextConfig, ConfigurableRoutesService } from '@spartacus/core';
=======
import { SiteContextConfig } from '@spartacus/core';
import { GlobalMessageService } from '../../../global-message/facade/global-message.service';
>>>>>>>
import { SiteContextConfig, ConfigurableRoutesService } from '@spartacus/core';
import { GlobalMessageService } from '../../../global-message/facade/global-message.service';
<<<<<<<
},
{
provide: ConfigurableRoutesService,
useClass: MockConfigurableRoutesService
}
=======
},
GlobalMessageService
>>>>>>>
},
{
provide: ConfigurableRoutesService,
useClass: MockConfigurableRoutesService
},
GlobalMessageService |
<<<<<<<
import { CmsPageGuards } from './newcms/guards/cms-page.guard';
import { ProductGuard } from './product/guards/product.guard';
=======
import { CmsPageGuards } from './cms/guards/cms-page.guard';
>>>>>>>
import { CmsPageGuards } from './cms/guards/cms-page.guard';
import { ProductGuard } from './product/guards/product.guard';
<<<<<<<
=======
data: { pageLabel: 'homepage' },
>>>>>>>
data: { pageLabel: 'homepage' }, |
<<<<<<<
import { StoreListPageModule } from './store-list-page/store-list-page.module';
=======
import { StoreDescriptionPageModule } from './store-description-page/store-description-page.module';
>>>>>>>
import { StoreListPageModule } from './store-list-page/store-list-page.module';
import { StoreDescriptionPageModule } from './store-description-page/store-description-page.module';
<<<<<<<
OrderHistoryPageModule,
HomePageModule,
CategoryPageModule,
CartPageModule,
MultiStepCheckoutPageModule,
OrderDetailsPageModule,
OrderConfirmationPageModule,
ProductPageModule,
RegisterPageModule,
LoginPageModule,
ResetPasswordPageModule,
StoreFinderPageModule,
StoreListPageModule,
StoreDescriptionPageModule,
ContactPageModule,
SalePageModule,
HelpPageModule,
ResetNewPasswordPageModule,
// new pages should be added above this line
PageNotFoundModule
],
=======
@NgModule({
imports: [CommonModule, ...pageModules],
>>>>>>>
@NgModule({
imports: [CommonModule, ...pageModules],
<<<<<<<
exports: [
OrderHistoryPageModule,
HomePageModule,
CategoryPageModule,
CartPageModule,
MultiStepCheckoutPageModule,
OrderDetailsPageModule,
OrderConfirmationPageModule,
ProductPageModule,
RegisterPageModule,
LoginPageModule,
ResetPasswordPageModule,
StoreFinderPageModule,
StoreListPageModule,
StoreDescriptionPageModule,
ContactPageModule,
SalePageModule,
HelpPageModule,
ResetNewPasswordPageModule,
// new pages should be added above this line
PageNotFoundModule
]
=======
exports: [...pageModules]
>>>>>>>
exports: [...pageModules] |
<<<<<<<
import { Header } from './../cmslib/header.po';
import { browser, element, by, ElementFinder } from 'protractor';
=======
import { browser } from 'protractor';
>>>>>>>
import { browser, ElementFinder } from 'protractor'; |
<<<<<<<
export * from './src/occ/index';
export * from './src/route/index';
=======
export * from './src/occ/index';
export * from './src/routing/index';
>>>>>>>
export * from './src/occ/index';
export * from './src/route/index';
export * from './src/routing/index'; |
<<<<<<<
import { ReactiveFormsModule } from '@angular/forms';
=======
>>>>>>>
<<<<<<<
import { RouterTestingModule } from '@angular/router/testing';
import { Component, Input } from '@angular/core';
import { StoreModule } from '@ngrx/store';
import {
NgbTabsetModule,
NgbAccordionModule
} from '@ng-bootstrap/ng-bootstrap';
import { ProductService } from '@spartacus/core';
import { RoutingService } from '@spartacus/core';
=======
import { Component, Input } from '@angular/core';
>>>>>>>
import { Component, Input } from '@angular/core';
import { RoutingService } from '@spartacus/core';
<<<<<<<
import { OutletDirective } from '../../../outlet';
import { ComponentsModule } from './../../components/components.module';
import { CartService } from '../../../cart/facade';
import {
CmsModuleConfig,
defaultCmsModuleConfig
} from '../../../cms/cms-module-config';
import { ComponentWrapperDirective } from '../../../cms/components';
import { ComponentMapperService } from '../../../cms/services';
import { ProductDetailsPageLayoutComponent } from '../../layout/product-details-page-layout/product-details-page-layout.component';
import { AddToCartComponent } from '../../../cart/components/add-to-cart/add-to-cart.component';
import { ProductDetailsComponent } from '../../../product/components/product-details/container/product-details.component';
import { ProductAttributesComponent } from '../../../product/components/product-details/product-attributes/product-attributes.component';
import { ProductImagesComponent } from '../../../product/components/product-details/product-images/product-images.component';
import { ProductReviewsComponent } from '../../../product/components/product-details/product-reviews/product-reviews.component';
import { ProductSummaryComponent } from '../../../product/components/product-details/product-summary/product-summary.component';
import { ProductPageComponent } from './product-page.component';
=======
import { ProductPageComponent } from './product-page.component';
import { RoutingService } from '@spartacus/core';
>>>>>>>
import { ProductPageComponent } from './product-page.component'; |
<<<<<<<
import { Component, OnInit } from '@angular/core';
import { ATHSPrompt } from '../../../../pwa/addToHomScreen';
=======
import { Component, OnDestroy } from '@angular/core';
import { Router } from '@angular/router';
import { Subscription } from 'rxjs';
>>>>>>>
import { ATHSPrompt } from '../../../../pwa/addToHomScreen';
import { Component, OnDestroy } from '@angular/core';
import { Router } from '@angular/router';
import { Subscription } from 'rxjs';
<<<<<<<
ngOnInit() {}
canAddToHomeScreen(): boolean {
return ATHSPrompt.canPrompt;
}
addToHomeScreen(): void {
ATHSPrompt.prompt();
}
=======
ngOnDestroy() {
if (this.subscription) {
this.subscription.unsubscribe();
}
}
>>>>>>>
ngOnInit() {}
canAddToHomeScreen(): boolean {
return ATHSPrompt.canPrompt;
}
addToHomeScreen(): void {
ATHSPrompt.prompt();
}
ngOnDestroy() {
if (this.subscription) {
this.subscription.unsubscribe();
}
} |
<<<<<<<
=======
import * as fromAuthStore from '../../../auth/store';
import * as fromRouting from '../../../routing/store';
>>>>>>>
import * as fromAuthStore from '../../../auth/store'; |
<<<<<<<
deliveryAddress$: Observable<any>;
=======
titles$: Observable<any>;
>>>>>>>
deliveryAddress$: Observable<any>;
titles$: Observable<any>;
<<<<<<<
this.deliveryAddress$ = this.store
.select(fromCheckoutStore.getDeliveryAddress)
.pipe(
filter(deliveryAddress => Object.keys(deliveryAddress).length !== 0),
take(1)
);
=======
this.titles$ = this.store.select(fromCheckoutStore.getAllTitles).pipe(
tap(titles => {
if (Object.keys(titles).length === 0) {
this.store.dispatch(new fromCheckoutStore.LoadTitles());
}
})
);
>>>>>>>
this.deliveryAddress$ = this.store
.select(fromCheckoutStore.getDeliveryAddress)
.pipe(
filter(deliveryAddress => Object.keys(deliveryAddress).length !== 0),
take(1)
);
this.titles$ = this.store.select(fromCheckoutStore.getAllTitles).pipe(
tap(titles => {
if (Object.keys(titles).length === 0) {
this.store.dispatch(new fromCheckoutStore.LoadTitles());
}
})
); |
<<<<<<<
import { AuthModuleConfig, ServerConfig, SiteContextConfig } from '@spartacus/core';
=======
import { OccConfig } from '@spartacus/core';
import { AuthModuleConfig } from '../auth/auth-module.config';
>>>>>>>
import { AuthModuleConfig, ServerConfig, OccConfig } from '@spartacus/core'; |
<<<<<<<
import { ContactPageModule } from './contact-page/contact-page.module';
=======
import { HelpPageModule } from './help-page/help-page.module';
import { ResetNewPasswordPageModule } from './reset-new-password-page/reset-new-password-page.module';
>>>>>>>
import { ContactPageModule } from './contact-page/contact-page.module';
import { HelpPageModule } from './help-page/help-page.module';
import { ResetNewPasswordPageModule } from './reset-new-password-page/reset-new-password-page.module';
<<<<<<<
ContactPageModule,
=======
HelpPageModule,
ResetNewPasswordPageModule,
>>>>>>>
ContactPageModule,
HelpPageModule,
ResetNewPasswordPageModule,
<<<<<<<
ContactPageModule,
=======
HelpPageModule,
ResetNewPasswordPageModule,
>>>>>>>
ContactPageModule,
HelpPageModule,
ResetNewPasswordPageModule, |
<<<<<<<
import { SalePageModule } from './sale-page/sale-page.module';
=======
import { HelpPageModule } from './help-page/help-page.module';
import { ResetNewPasswordPageModule } from './reset-new-password-page/reset-new-password-page.module';
>>>>>>>
import { SalePageModule } from './sale-page/sale-page.module';
import { HelpPageModule } from './help-page/help-page.module';
import { ResetNewPasswordPageModule } from './reset-new-password-page/reset-new-password-page.module';
<<<<<<<
SalePageModule,
=======
HelpPageModule,
ResetNewPasswordPageModule,
>>>>>>>
SalePageModule,
HelpPageModule,
ResetNewPasswordPageModule,
<<<<<<<
SalePageModule,
=======
HelpPageModule,
ResetNewPasswordPageModule,
>>>>>>>
SalePageModule,
HelpPageModule,
ResetNewPasswordPageModule, |
<<<<<<<
import { UserLoaderService } from '../data/user-loader.service';
import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { UserTokenInterceptor } from './http-interceptors/user-token.interceptor';
=======
import { OccUserService } from '../newocc/user/user.service';
>>>>>>>
import { OccUserService } from '../newocc/user/user.service';
import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { UserTokenInterceptor } from './http-interceptors/user-token.interceptor';
<<<<<<<
providers: [
UserLoaderService,
{
provide: HTTP_INTERCEPTORS,
useClass: UserTokenInterceptor,
multi: true
}
]
=======
providers: [OccUserService]
>>>>>>>
providers: [
OccUserService,
{
provide: HTTP_INTERCEPTORS,
useClass: UserTokenInterceptor,
multi: true
}
] |
<<<<<<<
import { combineReducers, StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects';
import { SiteContextConfig } from '@spartacus/core';
=======
import { StoreModule } from '@ngrx/store';
>>>>>>>
import { StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects';
import { SiteContextConfig } from '@spartacus/core';
<<<<<<<
=======
import * as fromAuth from '../../../../auth/store';
import * as fromCms from '../../../../cms/store';
import * as fromUser from '../../../../user/store';
import { CmsModule } from './../../../../cms/cms.module';
import { LoginModule } from './../../../../user/components/login/login.module';
import { MobileMenuComponent } from './mobile-menu.component';
import { By } from '@angular/platform-browser';
import { CmsModuleConfig } from '../../../../cms/cms-module-config';
>>>>>>> |
<<<<<<<
import { PwaModule } from './../../../pwa/pwa.module';
import {
PWAModuleConfig,
defaultPWAModuleConfig
} from '../../../pwa/pwa.module-config';
=======
import { SiteContextConfig } from '@spartacus/core';
>>>>>>>
import { PwaModule } from './../../../pwa/pwa.module';
import {
PWAModuleConfig,
defaultPWAModuleConfig
} from '../../../pwa/pwa.module-config';
import { SiteContextConfig } from '@spartacus/core';
<<<<<<<
}),
PwaModule
=======
}),
EffectsModule.forRoot([]),
SiteContextModule
>>>>>>>
}),
PwaModule,
EffectsModule.forRoot([]),
SiteContextModule |
<<<<<<<
@Input() locationId: number = null;
@Output() storeItemClick: EventEmitter<number> = new EventEmitter();
readonly daysOfWeek = ['Mon', 'Tues', 'Wed', 'Thurs', 'Fri', 'Sat', 'Sun'];
=======
readonly current_date = new Date();
>>>>>>>
@Input() locationId: number = null;
@Output() storeItemClick: EventEmitter<number> = new EventEmitter();
readonly current_date = new Date(); |
<<<<<<<
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Component, Input } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { of, BehaviorSubject } from 'rxjs';
import { By } from '@angular/platform-browser';
=======
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute } from '@angular/router';
import { Component, Input } from '@angular/core';
import { of, BehaviorSubject } from 'rxjs';
import { CmsService } from '../../../cms/facade/cms.service';
>>>>>>>
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Component, Input } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { of, BehaviorSubject } from 'rxjs';
import { By } from '@angular/platform-browser';
<<<<<<<
@Component({ selector: 'cx-product-list-page-layout', template: '' })
export class MockProductListPageLayoutComponent {
@Input()
gridMode: String;
@Input()
categoryCode;
@Input()
brandCode;
@Input()
query;
}
@Component({ selector: 'cx-category-page-layout', template: '' })
export class MockCategoryPageLayoutComponent {
@Input()
categoryCode;
@Input()
query;
}
=======
import { Page } from '../../../cms/models/page.model';
>>>>>>>
@Component({ selector: 'cx-product-list-page-layout', template: '' })
export class MockProductListPageLayoutComponent {
@Input()
gridMode: String;
@Input()
categoryCode;
@Input()
brandCode;
@Input()
query;
}
@Component({ selector: 'cx-category-page-layout', template: '' })
export class MockCategoryPageLayoutComponent {
@Input()
categoryCode;
@Input()
query;
}
<<<<<<<
const mockCmsService = {
cmsPage$: new BehaviorSubject(null)
};
=======
const mockCmsService = {
currentPage$: new BehaviorSubject(null)
};
@Component({
selector: 'cx-product-list-page-layout',
template: ''
})
export class MockProductListPageLayoutComponent {
@Input()
gridMode: String;
@Input()
categoryCode;
@Input()
brandCode;
@Input()
query;
}
@Component({
selector: 'cx-category-page-layout',
template: ''
})
export class MockCategoryPageLayoutComponent {
@Input()
categoryCode;
}
const mockPage: Page = {
pageId: 'testPageId',
name: 'testPage',
seen: [],
slots: {}
};
>>>>>>>
const mockCmsService = {
currentPage$: new BehaviorSubject(null)
};
<<<<<<<
MockProductListPageLayoutComponent,
MockCategoryPageLayoutComponent
=======
MockCategoryPageLayoutComponent,
MockProductListPageLayoutComponent
>>>>>>>
MockProductListPageLayoutComponent,
MockCategoryPageLayoutComponent
<<<<<<<
it('should be able to get product list page', () => {
mockCmsService.cmsPage$.next({ template: 'ProductListPageTemplate' });
component.ngOnInit();
fixture.detectChanges();
const childDebugElement = fixture.debugElement.query(
By.css('cx-product-list-page-layout')
);
expect(childDebugElement).toBeTruthy();
const productListPageComponent = childDebugElement.componentInstance;
expect(productListPageComponent.gridMode).toEqual('list');
expect(productListPageComponent.categoryCode).toEqual('123');
expect(productListPageComponent.brandCode).toEqual('456');
});
it('should be able to get product grid page', () => {
mockCmsService.cmsPage$.next({ template: 'ProductGridPageTemplate' });
=======
it('should initialize component state when ngOnInit() is called', () => {
mockCmsService.currentPage$.next(mockPage);
>>>>>>>
it('should be able to get product list page', () => {
mockCmsService.currentPage$.next({ template: 'ProductListPageTemplate' });
component.ngOnInit();
fixture.detectChanges();
const childDebugElement = fixture.debugElement.query(
By.css('cx-product-list-page-layout')
);
expect(childDebugElement).toBeTruthy();
const productListPageComponent = childDebugElement.componentInstance;
expect(productListPageComponent.gridMode).toEqual('list');
expect(productListPageComponent.categoryCode).toEqual('123');
expect(productListPageComponent.brandCode).toEqual('456');
});
it('should be able to get product grid page', () => {
mockCmsService.currentPage$.next({ template: 'ProductGridPageTemplate' }); |
<<<<<<<
@Component({ selector: 'cx-add-to-home-screen-banner', template: '' })
class MockAddtoHomeScreenBannerComponent {}
class CheckoutServiceMock {
entries;
orderDetails = {
=======
const mockCheckoutService = {
orderDetails$: of({
>>>>>>>
@Component({ selector: 'cx-add-to-home-screen-banner', template: '' })
class MockAddtoHomeScreenBannerComponent {}
const mockCheckoutService = {
orderDetails$: of({ |
<<<<<<<
StoreDescriptionPageModule,
=======
ContactPageModule,
SalePageModule,
HelpPageModule,
ResetNewPasswordPageModule,
>>>>>>>
StoreDescriptionPageModule,
ContactPageModule,
SalePageModule,
HelpPageModule,
ResetNewPasswordPageModule,
<<<<<<<
StoreDescriptionPageModule,
=======
ContactPageModule,
SalePageModule,
HelpPageModule,
ResetNewPasswordPageModule,
>>>>>>>
StoreDescriptionPageModule,
ContactPageModule,
SalePageModule,
HelpPageModule,
ResetNewPasswordPageModule, |
<<<<<<<
import { ProductSearchService } from '../../../facade/product-search.service';
import { ActivatedRoute } from '@angular/router';
=======
import { ProductSearchService } from '@spartacus/core';
>>>>>>>
import { ActivatedRoute } from '@angular/router';
import { ProductSearchService } from '@spartacus/core'; |
<<<<<<<
export * from './checkout.selectors';
export * from './delivery-countries.selectors';
=======
export * from './delivery-countries.selectors';
export * from './titles.selectors';
>>>>>>>
export * from './checkout.selectors';
export * from './delivery-countries.selectors';
export * from './titles.selectors'; |
<<<<<<<
import { UserOrdersEffect } from './user-orders.effect';
=======
import { TitlesEffects } from './titles.effect';
import { DeliveryCountriesEffects } from './delivery-countries.effect';
>>>>>>>
import { UserOrdersEffect } from './user-orders.effect';
import { TitlesEffects } from './titles.effect';
import { DeliveryCountriesEffects } from './delivery-countries.effect';
<<<<<<<
export * from './user-register.effect';
export * from './user-orders.effect';
=======
export * from './user-register.effect';
export * from './titles.effect';
export * from './delivery-countries.effect';
>>>>>>>
export * from './user-register.effect';
export * from './user-orders.effect';
export * from './titles.effect';
export * from './delivery-countries.effect'; |
<<<<<<<
import * as fromStore from './../../store';
import * as fromAuthStore from '@auth/store';
import { tap, map, take, filter } from 'rxjs/operators';
=======
import { Observable, Subscription } from 'rxjs';
>>>>>>>
import { Observable, Subscription } from 'rxjs';
import { UserToken } from '../../../auth/models/token-types.model';
import * as fromStore from '../../store';
import * as fromAuthStore from './../../../auth/store';
<<<<<<<
import { UserToken } from '../../../auth/models/token-types.model';
=======
import { UserToken } from '../../models/token-types.model';
import * as fromStore from '../../store';
>>>>>>>
<<<<<<<
.select(fromAuthStore.getUserToken)
.pipe(
filter((token: UserToken) => !this.isLogin),
tap((token: UserToken) => {
if (token.access_token !== undefined) {
this.isLogin = true;
this.store.dispatch(new fromStore.LoadUserDetails(token.userId));
this.store.dispatch(new fromStore.Login());
}
})
)
.subscribe();
}
openLogin() {
const dialogRef = this.dialog.open(LoginDialogComponent, {
data: {
username: this.username,
password: this.password,
rememberMe: this.rememberMe
}
});
dialogRef.afterClosed().subscribe(result => {
this.username = result.username;
this.password = result.password;
this.rememberMe = result.rememberMe;
if (this.username !== undefined && this.password !== undefined) {
this.login();
}
});
=======
.select(fromStore.getUserToken)
.subscribe((token: UserToken) => {
if (token && token.access_token && !this.isLogin) {
this.isLogin = true;
this.store.dispatch(new fromStore.LoadUserDetails(token.userId));
this.store.dispatch(new fromStore.Login());
}
});
>>>>>>>
.select(fromAuthStore.getUserToken)
.subscribe((token: UserToken) => {
if (token && token.access_token && !this.isLogin) {
this.isLogin = true;
this.store.dispatch(new fromStore.LoadUserDetails(token.userId));
this.store.dispatch(new fromStore.Login());
}
});
<<<<<<<
login() {
this.store.dispatch(
new fromAuthStore.LoadUserToken({
userId: this.username,
password: this.password
})
);
=======
if (
state.routeConfig.canActivate &&
state.routeConfig.canActivate.find(
child => child.GUARD_NAME === 'AuthGuard'
)
) {
this.store.dispatch(
new fromRouting.Go({
path: ['/login']
})
);
}
>>>>>>>
if (
state.routeConfig.canActivate &&
state.routeConfig.canActivate.find(
child => child.GUARD_NAME === 'AuthGuard'
)
) {
this.store.dispatch(
new fromRouting.Go({
path: ['/login']
})
);
} |
<<<<<<<
let pulsetime = 1000;
@Component({
selector: 'abstractsection',
templateUrl: './section.component.html',
})
=======
>>>>>>>
let pulsetime = 1000;
@Component({
selector: 'abstractsection',
templateUrl: './section.component.html',
})
<<<<<<<
protected circles: Circle[] = [];
public pulsetimeup: number;
public pulsetimedown: number;
public pulsetimeright: number;
=======
>>>>>>> |
<<<<<<<
console.log("Start query", performance.now());
this.device.query(fromDate, toDate);
=======
this.device.query(fromDate, toDate, { ess0: ["Soc", "ActivePower"] });
>>>>>>>
this.device.query(fromDate, toDate); |
<<<<<<<
progressActions: IProgressAction[];
currentProgressActionIndex?: number;
dateTimeValue: Date;
richTextValue: string;
=======
currentCarouselElement: JSX.Element;
canMovePrev: boolean;
canMoveNext: boolean;
>>>>>>>
progressActions: IProgressAction[];
currentProgressActionIndex?: number;
dateTimeValue: Date;
richTextValue: string;
currentCarouselElement: JSX.Element;
canMovePrev: boolean;
canMoveNext: boolean; |
<<<<<<<
export * from './WebPartTitle';
export * from './ListPicker';
=======
export * from './WebPartTitle';
export * from './IFrameDialog';
export * from './Common';
export * from './Utilities';
export * from './IFrameDialog';
export * from './FieldCommon';
export * from './FieldAttachmentsRenderer';
export * from './FieldBaseTextRenderer';
export * from './FieldDateRenderer';
export * from './FieldFileTypeRenderer';
export * from './FieldLookupRenderer';
export * from './FieldNameRenderer';
export * from './FieldTaxonomyRenderer';
export * from './FieldTextRenderer';
export * from './FieldTitleRenderer';
export * from './FieldUrlRenderer';
export * from './FieldUserRenderer';
>>>>>>>
export * from './WebPartTitle';
export * from './ListPicker';
export * from './IFrameDialog';
export * from './Common';
export * from './Utilities';
export * from './IFrameDialog';
export * from './FieldCommon';
export * from './FieldAttachmentsRenderer';
export * from './FieldBaseTextRenderer';
export * from './FieldDateRenderer';
export * from './FieldFileTypeRenderer';
export * from './FieldLookupRenderer';
export * from './FieldNameRenderer';
export * from './FieldTaxonomyRenderer';
export * from './FieldTextRenderer';
export * from './FieldTitleRenderer';
export * from './FieldUrlRenderer';
export * from './FieldUserRenderer'; |
<<<<<<<
const web = Web(webAbsoluteUrl);
=======
const web = new Web(webAbsoluteUrl);
folderRelativeUrl = folderRelativeUrl.replace(/\'/ig, "''");
>>>>>>>
const web = Web(webAbsoluteUrl);
folderRelativeUrl = folderRelativeUrl.replace(/\'/ig, "''"); |
<<<<<<<
// folder explorer
NewFolderNamePlaceholder: string;
FolderFilterBoxPlaceholder: string;
FolderExplorerLoading: string;
FolderExplorerNoItems: string;
=======
//Icon picker
SelectedLabel: string;
SelectIcon: string;
>>>>>>>
// folder explorer
NewFolderNamePlaceholder: string;
FolderFilterBoxPlaceholder: string;
FolderExplorerLoading: string;
FolderExplorerNoItems: string;
//Icon picker
SelectedLabel: string;
SelectIcon: string; |
<<<<<<<
export interface IFunction {
name: string;
=======
interface IFunction {
>>>>>>>
export interface IFunction {
<<<<<<<
export interface IFunctionOptions {
volatile: boolean;
stream: boolean;
=======
interface IFunctionOptions {
>>>>>>>
export interface IFunctionOptions { |
<<<<<<<
if (!firebaseInitialized) return
const unsubscribe = firebase.auth().onAuthStateChanged((newUser) => {
=======
const unsubscribe = firebase.auth().onAuthStateChanged(newUser => {
>>>>>>>
const unsubscribe = firebase.auth().onAuthStateChanged((newUser) => { |
<<<<<<<
const svnConfig = workspace.getConfiguration(
"svn",
Uri.file(repository.workspaceRoot)
);
=======
const svnConfig = workspace.getConfiguration("svn");
>>>>>>>
const svnConfig = workspace.getConfiguration("svn");
<<<<<<<
private getSCMResource(uri?: Uri): Resource | undefined {
uri = uri
? uri
: window.activeTextEditor && window.activeTextEditor.document.uri;
if (!uri) {
return undefined;
}
if (uri.scheme === "svn") {
const { path } = fromSvnUri(uri);
uri = Uri.file(path);
}
if (uri.scheme === "file") {
const repository = this.model.getRepository(uri);
if (!repository) {
return undefined;
}
return repository.getResourceFromFile(uri);
}
}
=======
@command("svn.resolve", { repository: true })
async resolve(repository: Repository) {
const conflicts = repository.conflicts.resourceStates;
if (!conflicts.length) {
window.showInformationMessage("No Conflicts");
}
for (const conflict of conflicts) {
const placeHolder = `Select conflict option for ${
conflict.resourceUri.path
}`;
const picks = getConflictPickOptions();
const choice = await window.showQuickPick(picks, { placeHolder });
if (!choice) {
return;
}
await repository.resolve(conflict.resourceUri.path, choice.label);
}
}
@command("svn.log", { repository: true })
async log(repository: Repository) {
try {
const result = await repository.repository.log();
// send the log results to a new tab
workspace.openTextDocument({ content: result }).then(doc => {
window.showTextDocument(doc);
});
} catch (error) {
console.error(error);
window.showErrorMessage("Unable to log");
}
}
>>>>>>>
@command("svn.resolve", { repository: true })
async resolve(repository: Repository) {
const conflicts = repository.conflicts.resourceStates;
if (!conflicts.length) {
window.showInformationMessage("No Conflicts");
}
for (const conflict of conflicts) {
const placeHolder = `Select conflict option for ${
conflict.resourceUri.path
}`;
const picks = getConflictPickOptions();
const choice = await window.showQuickPick(picks, { placeHolder });
if (!choice) {
return;
}
await repository.resolve(conflict.resourceUri.path, choice.label);
}
}
@command("svn.log", { repository: true })
async log(repository: Repository) {
try {
const result = await repository.repository.log();
// send the log results to a new tab
workspace.openTextDocument({ content: result }).then(doc => {
window.showTextDocument(doc);
});
} catch (error) {
console.error(error);
window.showErrorMessage("Unable to log");
}
}
private getSCMResource(uri?: Uri): Resource | undefined {
uri = uri
? uri
: window.activeTextEditor && window.activeTextEditor.document.uri;
if (!uri) {
return undefined;
}
if (uri.scheme === "svn") {
const { path } = fromSvnUri(uri);
uri = Uri.file(path);
}
if (uri.scheme === "file") {
const repository = this.model.getRepository(uri);
if (!repository) {
return undefined;
}
return repository.getResourceFromFile(uri);
}
} |
<<<<<<<
<mat-form-field
[class]="options?.htmlClass || null"
[floatPlaceholder]="options?.floatPlaceholder || (options?.notitle ? 'never' : 'auto')"
[style.width]="'100%'">
<span matPrefix *ngIf="options?.prefix || options?.fieldAddonLeft"
[innerHTML]="options?.prefix || options?.fieldAddonLeft"></span>
<mat-select #inputControl *ngIf="boundControl"
[formControl]="formControl"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.name]="controlName"
[attr.readonly]="options?.readonly ? 'readonly' : null"
[id]="'control' + layoutNode?._id"
[multiple]="options?.multiple"
[placeholder]="options?.notitle ? options?.placeholder : options?.title"
[required]="options?.required"
[style.width]="'100%'">
<ng-template ngFor let-selectItem [ngForOf]="selectList">
<mat-option *ngIf="!isArray(selectItem?.items)"
[value]="selectItem?.value">
<span [innerHTML]="selectItem?.name"></span>
</mat-option>
<mat-optgroup *ngIf="isArray(selectItem?.items)"
[label]="selectItem?.group">
<mat-option *ngFor="let subItem of selectItem.items"
[value]="subItem?.value">
<span [innerHTML]="subItem?.name"></span>
</mat-option>
</mat-optgroup>
</ng-template>
</mat-select>
<mat-select #inputControl *ngIf="!boundControl"
=======
<section [style.width]="'100%'" [class]="options?.htmlClass || null">
<md-select #inputControl *ngIf="isConditionallyShown()"
>>>>>>>
<mat-form-field *ngIf="isConditionallyShown()"
[class]="options?.htmlClass || null"
[floatPlaceholder]="options?.floatPlaceholder || (options?.notitle ? 'never' : 'auto')"
[style.width]="'100%'">
<span matPrefix *ngIf="options?.prefix || options?.fieldAddonLeft"
[innerHTML]="options?.prefix || options?.fieldAddonLeft"></span>
<mat-select #inputControl *ngIf="boundControl"
[formControl]="formControl"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.name]="controlName"
[attr.readonly]="options?.readonly ? 'readonly' : null"
[id]="'control' + layoutNode?._id"
[multiple]="options?.multiple"
[placeholder]="options?.notitle ? options?.placeholder : options?.title"
[required]="options?.required"
[style.width]="'100%'">
<ng-template ngFor let-selectItem [ngForOf]="selectList">
<mat-option *ngIf="!isArray(selectItem?.items)"
[value]="selectItem?.value">
<span [innerHTML]="selectItem?.name"></span>
</mat-option>
<mat-optgroup *ngIf="isArray(selectItem?.items)"
[label]="selectItem?.group">
<mat-option *ngFor="let subItem of selectItem.items"
[value]="subItem?.value">
<span [innerHTML]="subItem?.name"></span>
</mat-option>
</mat-optgroup>
</ng-template>
</mat-select>
<mat-select #inputControl *ngIf="!boundControl" |
<<<<<<<
search: async (_, data, { vtex: ioContext }: ColossusContext, info) => {
const { map, query, rest } = data
const facetsMap = map.split(',').slice(0, query.split('/').length).join(',')
const queryWithRest = query + (rest && '/' + rest.replace(/,/g, '/'))
const facetsValue = query + '?map=' + facetsMap
const facetsValueWithRest = queryWithRest + '?map=' + map
const productsPromise = queries.products(_, { ...data, query: queryWithRest }, { vtex: ioContext }, info)
const facetsPromise = queries.facets(_, { facets: facetsValue }, { vtex: ioContext })
const facetsWithRestPromise = queries.facets(_, { facets: facetsValueWithRest }, { vtex: ioContext })
const [products, facets, facetsWithRest] = await Promise.all([
productsPromise, facetsPromise, facetsWithRestPromise
])
const recordsFiltered = facetsWithRest.Departments.reduce((total, dept) => total + dept.Quantity, 0)
return { facets, products, recordsFiltered }
}
=======
searchContextFromParams: async (_, args, { vtex: ioContext }: ColossusContext) => {
const response = {
brand: null,
category: null,
contextKey: 'search',
}
if (args.brand) {
const urlBrand = paths.brand(ioContext.account)
const { data: brands }: {data: Brand[]} = await axios.get(urlBrand, {
headers: withAuthToken()(ioContext),
})
const found = brands.find(brand => brand.isActive && slugify(brand.name, { lower: true }) === args.brand)
response.brand = found && found.id
}
if (args.department) {
const urlCategories = paths.categories(ioContext.account, {treeLevel: 2})
const { data: departments }: {data: Category[]} = await axios.get(urlCategories, {
headers: withAuthToken()(ioContext),
})
let found: Category
found = departments.find(department => department.url.endsWith(`/${args.department.toLowerCase()}`))
if (args.category && found) {
found = found.children.find(category => category.url.endsWith(`/${args.category.toLowerCase()}`))
}
if (args.subcategory && found) {
found = found.children.find(subcategory => subcategory.url.endsWith(`/${args.subcategory.toLowerCase()}`))
}
response.category = found && found.id
}
return response
},
}
interface Brand {
id: string
name: string
isActive: boolean
}
interface Category {
id: string
name: string
url: string
children: Category[]
>>>>>>>
search: async (_, data, { vtex: ioContext }: ColossusContext, info) => {
const { map, query, rest } = data
const facetsMap = map.split(',').slice(0, query.split('/').length).join(',')
const queryWithRest = query + (rest && '/' + rest.replace(/,/g, '/'))
const facetsValue = query + '?map=' + facetsMap
const facetsValueWithRest = queryWithRest + '?map=' + map
const productsPromise = queries.products(_, { ...data, query: queryWithRest }, { vtex: ioContext }, info)
const facetsPromise = queries.facets(_, { facets: facetsValue }, { vtex: ioContext })
const facetsWithRestPromise = queries.facets(_, { facets: facetsValueWithRest }, { vtex: ioContext })
const [products, facets, facetsWithRest] = await Promise.all([
productsPromise, facetsPromise, facetsWithRestPromise
])
const recordsFiltered = facetsWithRest.Departments.reduce((total, dept) => total + dept.Quantity, 0)
return { facets, products, recordsFiltered }
},
searchContextFromParams: async (_, args, { vtex: ioContext }: ColossusContext) => {
const response = {
brand: null,
category: null,
contextKey: 'search',
}
if (args.brand) {
const urlBrand = paths.brand(ioContext.account)
const { data: brands }: {data: Brand[]} = await axios.get(urlBrand, {
headers: withAuthToken()(ioContext),
})
const found = brands.find(brand => brand.isActive && slugify(brand.name, { lower: true }) === args.brand)
response.brand = found && found.id
}
if (args.department) {
const urlCategories = paths.categories(ioContext.account, {treeLevel: 2})
const { data: departments }: {data: Category[]} = await axios.get(urlCategories, {
headers: withAuthToken()(ioContext),
})
let found: Category
found = departments.find(department => department.url.endsWith(`/${args.department.toLowerCase()}`))
if (args.category && found) {
found = found.children.find(category => category.url.endsWith(`/${args.category.toLowerCase()}`))
}
if (args.subcategory && found) {
found = found.children.find(subcategory => subcategory.url.endsWith(`/${args.subcategory.toLowerCase()}`))
}
response.category = found && found.id
}
return response
},
}
interface Brand {
id: string
name: string
isActive: boolean
}
interface Category {
id: string
name: string
url: string
children: Category[] |
<<<<<<<
<md-select #inputControl *ngIf="isConditionallyShown()"
[(ngModel)]="controlValue"
=======
<md-select #inputControl
>>>>>>>
<md-select #inputControl *ngIf="isConditionallyShown()" |
<<<<<<<
=======
import { FrameworkLibraryService } from './framework-library/framework-library.service';
>>>>>>>
<<<<<<<
=======
],
providers: [
JsonSchemaFormService, FrameworkLibraryService
>>>>>>> |
<<<<<<<
<mat-form-field
[class]="options?.htmlClass || null"
=======
<md-form-field *ngIf="isConditionallyShown()"
>>>>>>>
<mat-form-field *ngIf="isConditionallyShown()"
[class]="options?.htmlClass || null"
<<<<<<<
if (!this.options.notitle && !this.options.description && this.options.placeholder) {
this.options.description = this.options.placeholder;
}
=======
>>>>>>>
if (!this.options.notitle && !this.options.description && this.options.placeholder) {
this.options.description = this.options.placeholder;
} |
<<<<<<<
errorMessage: string;
orgChartEnabled: boolean;
=======
inputDebounce: number;
>>>>>>>
errorMessage: string;
inputDebounce: number;
orgChartEnabled: boolean; |
<<<<<<<
.config(translations)
.service('PeopleService', PeopleService)
.service('ConfigService', ConfigService);
=======
.config(['$translateProvider', ($translateProvider: angular.translate.ITranslateProvider) => {
$translateProvider.translations('en', require('i18n/translations_en.json'));
$translateProvider.useSanitizeValueStrategy('escapeParameters');
$translateProvider.preferredLanguage('en');
}])
.service('PeopleService', PeopleService);
>>>>>>>
.config(['$translateProvider', ($translateProvider: angular.translate.ITranslateProvider) => {
$translateProvider.translations('en', require('i18n/translations_en.json'));
$translateProvider.useSanitizeValueStrategy('escapeParameters');
$translateProvider.preferredLanguage('en');
}])
.service('PeopleService', PeopleService)
.service('ConfigService', ConfigService); |
<<<<<<<
import {
CreateUserDto,
CreateUserProfileDto,
CreateCloseContactsRequestDto,
} from './dto/create-user.dto'
import { User } from './interfaces/user.interface'
=======
import { CreateUserDto, CreateUserProfileDto } from './dto/create-user.dto'
import { User } from './classes/user.class'
>>>>>>>
import {
CreateUserDto,
CreateUserProfileDto,
CreateCloseContactsRequestDto,
} from './dto/create-user.dto'
import { User } from './classes/user.class' |
<<<<<<<
import * as Dropzone from 'dropzone';
import { Directive, Optional, OnInit, DoCheck, OnChanges, OnDestroy, Input, Output,
NgZone, EventEmitter, ElementRef, Renderer, SimpleChanges, KeyValueDiffers } from '@angular/core';
=======
import { Directive, Optional, OnInit, DoCheck, OnChanges, OnDestroy, Input, Output } from '@angular/core';
import { NgZone, EventEmitter, ElementRef, Renderer, SimpleChanges, KeyValueDiffers } from '@angular/core';
>>>>>>>
import { Directive, Optional, OnInit, DoCheck, OnChanges, OnDestroy, Input, Output,
NgZone, EventEmitter, ElementRef, Renderer, SimpleChanges, KeyValueDiffers } from '@angular/core';
<<<<<<<
this.zone.runOutsideAngular(() => {
this.dropzone = new Dropzone(element, options);
=======
if (this.runInsideAngular) {
this.dropzone = new AngularDropzone(element, options);
} else {
this.zone.runOutsideAngular(() => {
this.dropzone = new AngularDropzone(element, options);
});
}
// Add auto reset handling for events
this.dropzone.on('error', (error) => {
if (options.errorReset != null) {
setTimeout(() => this.reset(), options.errorReset);
}
>>>>>>>
this.zone.runOutsideAngular(() => {
this.dropzone = new AngularDropzone(element, options); |
<<<<<<<
import { depositToken, issueToken, provider } from './utils';
import { TransferStatus } from '../src/pods/transfer/transfer-status';
=======
import { depositToken, issueToken, provider, MWh } from './utils';
>>>>>>>
import { depositToken, issueToken, provider, MWh } from './utils';
import { TransferStatus } from '../src/pods/transfer/transfer-status'; |
<<<<<<<
@Post(`${CERTIFICATION_REQUEST_ENDPOINT}/:id`)
@UseGuards(AuthGuard(), UserGuard, RolesGuard)
=======
@Post(CERTIFICATION_REQUEST_ENDPOINT)
@UseGuards(AuthGuard(), RolesGuard)
>>>>>>>
@Post(CERTIFICATION_REQUEST_ENDPOINT)
@UseGuards(AuthGuard(), UserGuard, RolesGuard) |
<<<<<<<
import { Certificate } from './pods/certificate/certificate.entity';
=======
>>>>>>>
import { Certificate } from './pods/certificate/certificate.entity'; |
<<<<<<<
export class Asset extends BaseEntity implements IAsset {
=======
export class Asset extends ExtendedBaseEntity {
>>>>>>>
export class Asset extends ExtendedBaseEntity implements IAsset { |
<<<<<<<
async getAllLogDeviceStatusChangedEvents(eventFilter?: PastEventOptions) {
return this.web3Contract.getPastEvents('DeviceStatusChanged', eventFilter);
=======
async getAllLogDeviceSetActiveEvents(eventFilter?: PastEventOptions) {
return this.web3Contract.getPastEvents('LogDeviceSetActive', this.createFilter(eventFilter));
}
async getAllLogDeviceSetInactiveEvents(eventFilter?: PastEventOptions) {
return this.web3Contract.getPastEvents('LogDeviceSetInactive', this.createFilter(eventFilter));
>>>>>>>
async getAllLogDeviceStatusChangedEvents(eventFilter?: PastEventOptions) {
return this.web3Contract.getPastEvents('DeviceStatusChanged', this.createFilter(eventFilter)); |
<<<<<<<
return parseInt(process.env.PORT, 10) || parseInt(process.env.BACKEND_PORT, 10) || 3030;
}
export function getEventsServerPort(): number {
return getPort() + 1;
=======
return parseInt(process.env.BACKEND_PORT, 10) || 3030;
>>>>>>>
return parseInt(process.env.PORT, 10) || parseInt(process.env.BACKEND_PORT, 10) || 3030; |
<<<<<<<
import { BigNumber } from 'ethers/utils';
=======
export const MAX_ENERGY_PER_CERTIFICATE = 1e16;
>>>>>>>
import { BigNumber } from 'ethers/utils';
export const MAX_ENERGY_PER_CERTIFICATE = 1e16; |
<<<<<<<
export class Order extends BaseEntity {
constructor(order: Partial<Order>) {
super();
Object.assign(this, order);
}
=======
export class Order extends ExtendedBaseEntity {
>>>>>>>
export class Order extends ExtendedBaseEntity {
constructor(order: Partial<Order>) {
super();
Object.assign(this, order);
} |
<<<<<<<
rights
=======
autoPublish,
rights,
status,
kycStatus
>>>>>>>
rights,
status,
kycStatus
<<<<<<<
rights
=======
autoPublish,
rights,
status,
kycStatus
>>>>>>>
rights,
status,
kycStatus |
<<<<<<<
getOwnBundles(): Promise<Bundle[]>;
=======
getBundleSplits(bundle: Bundle): Promise<Bundle[]>;
>>>>>>>
getOwnBundles(): Promise<Bundle[]>;
getBundleSplits(bundle: Bundle): Promise<Bundle[]>;
<<<<<<<
public async getOwnBundles() {
const response = await this.requestClient.get<unknown, Bundle[]>(`${this.bundleEndpoint}`);
return response.data;
}
public async cancelBundle(id: string): Promise<Bundle> {
const response = await this.requestClient.put<Bundle, string>(
`${this.bundleEndpoint}/${id}/cancel`
);
return response.data;
}
=======
public async getBundleSplits(bundle: Bundle): Promise<Bundle[]> {
const response = await this.requestClient.get<unknown, Bundle[]>(
`${this.bundleEndpoint}/${bundle.id}/splits`
);
return response.data;
}
>>>>>>>
public async getOwnBundles() {
const response = await this.requestClient.get<unknown, Bundle[]>(`${this.bundleEndpoint}`);
return response.data;
}
public async cancelBundle(id: string): Promise<Bundle> {
const response = await this.requestClient.put<Bundle, string>(
`${this.bundleEndpoint}/${id}/cancel`
);
}
public async getBundleSplits(bundle: Bundle): Promise<Bundle[]> {
const response = await this.requestClient.get<unknown, Bundle[]>(
`${this.bundleEndpoint}/${bundle.id}/splits`
);
return response.data;
}
<<<<<<<
},
// eslint-disable-next-line @typescript-eslint/no-unused-vars
cancelBundle(id: string) {
return null;
=======
},
// eslint-disable-next-line @typescript-eslint/no-unused-vars
getBundleSplits(bundle: Bundle) {
return null;
>>>>>>>
},
// eslint-disable-next-line @typescript-eslint/no-unused-vars
cancelBundle(id: string) {
return null;
},
// eslint-disable-next-line @typescript-eslint/no-unused-vars
getBundleSplits(bundle: Bundle) {
return null; |
<<<<<<<
import { marketContractLookupGetAction } from './controller/MarketContractLookupGet';
import { marketContractLookupPostAction } from './controller/MarketContractLookupPost';
import { marketContractLookupDeleteAction } from './controller/MarketContractLookupDelete';
import { jsonEntityGetAction } from './controller/JsonEntityGet';
import { jsonEntityPostAction } from './controller/JsonEntityPost';
import { jsonEntityDeleteAction } from './controller/JsonEntityDelete';
import { currencyGetAction } from './controller/CurrencyGet';
import { currencyPostAction } from './controller/CurrencyPost';
import { currencyDeleteAction } from './controller/CurrencyDelete';
import { imagePostActions } from './controller/ImagePost';
=======
import { MarketContractLookupActions } from './controller/MarketContractLookupActions';
import { JsonEntityActions } from './controller/JsonEntityActions';
import { CurrencyActions } from './controller/CurrencyActions';
import { ComplianceActions } from './controller/ComplianceActions';
>>>>>>>
import { MarketContractLookupActions } from './controller/MarketContractLookupActions';
import { JsonEntityActions } from './controller/JsonEntityActions';
import { CurrencyActions } from './controller/CurrencyActions';
import { ComplianceActions } from './controller/ComplianceActions';
import { imagePostActions } from './controller/ImagePost';
<<<<<<<
actions: [marketContractLookupGetAction]
=======
action: MarketContractLookupActions.get
>>>>>>>
actions: [MarketContractLookupActions.get]
<<<<<<<
actions: [marketContractLookupPostAction]
=======
action: MarketContractLookupActions.post
>>>>>>>
actions: [MarketContractLookupActions.post]
<<<<<<<
actions: [marketContractLookupDeleteAction]
=======
action: MarketContractLookupActions.delete
>>>>>>>
actions: [MarketContractLookupActions.delete]
<<<<<<<
actions: [jsonEntityGetAction]
=======
action: JsonEntityActions.get
>>>>>>>
actions: [JsonEntityActions.get]
<<<<<<<
actions: [jsonEntityPostAction]
=======
action: JsonEntityActions.post
>>>>>>>
actions: [JsonEntityActions.post]
<<<<<<<
actions: [jsonEntityDeleteAction]
=======
action: JsonEntityActions.delete
},
{
path: '/Currency',
method: 'get',
action: CurrencyActions.get
},
{
path: '/Currency',
method: 'post',
action: CurrencyActions.post
},
{
path: '/Currency',
method: 'delete',
action: CurrencyActions.delete
>>>>>>>
actions: [JsonEntityActions.delete]
},
{
path: '/Currency',
method: 'get',
actions: [CurrencyActions.get]
},
{
path: '/Currency',
method: 'post',
actions: [CurrencyActions.post]
},
{
path: '/Currency',
method: 'delete',
actions: [CurrencyActions.delete]
<<<<<<<
actions: [currencyGetAction]
=======
action: ComplianceActions.get
>>>>>>>
actions: [ComplianceActions.get]
<<<<<<<
actions: [currencyPostAction]
=======
action: ComplianceActions.post
>>>>>>>
actions: [ComplianceActions.post]
<<<<<<<
actions: [currencyDeleteAction]
},
{
path: '/Image',
method: 'post',
actions: imagePostActions
=======
action: ComplianceActions.delete
>>>>>>>
actions: [ComplianceActions.delete]
},
{
path: '/Image',
method: 'post',
actions: imagePostActions |
<<<<<<<
import { NewDeviceDTO } from './new-device.dto';
=======
import { NewDeviceDTO } from './dto/new-device.dto';
import { ValidateDeviceOwnershipQuery } from './queries/validate-device-ownership.query';
>>>>>>>
import { NewDeviceDTO } from './dto/new-device.dto'; |
<<<<<<<
=======
import { Organization } from './pods/organization/organization.entity';
import { User } from './pods/user/user.entity';
import { Device } from './pods/device/device.entity';
import { Demand } from './pods/demand/demand.entity';
import { UserModule } from './pods/user/user.module';
>>>>>>>
<<<<<<<
import { ImageModule } from './pods/image/image.module';
import { JsonEntity } from './pods/json-entity/json-entity.entity';
=======
import { FileModule } from './pods/file/file.module';
>>>>>>>
import { Demand } from './pods/demand/demand.entity';
import { DemandModule } from './pods/demand/demand.module';
import { DeviceTypes } from './pods/device-types/device-types.entity';
import { DeviceTypesModule } from './pods/device-types/device-types.module';
import { Device } from './pods/device/device.entity';
import { DeviceModule } from './pods/device/device.module';
import { FileModule } from './pods/file/file.module';
import { JsonEntity } from './pods/json-entity/json-entity.entity';
<<<<<<<
=======
import { DeviceModule } from './pods/device/device.module';
import { DemandModule } from './pods/demand/demand.module';
import { AuthModule } from './auth/auth.module';
import { EventsModule } from './events/events.module';
import { AppController } from './app.controller';
>>>>>>>
<<<<<<<
import { User } from './pods/user/user.entity';
import { UserModule } from './pods/user/user.module';
=======
import { DeviceTypes } from './pods/device-types/device-types.entity';
import { DeviceTypesModule } from './pods/device-types/device-types.module';
import { CertificationRequest } from './pods/certificate/certification-request.entity';
import { CertificationRequestModule } from './pods/certificate/certificate.module';
>>>>>>>
import { User } from './pods/user/user.entity';
import { UserModule } from './pods/user/user.module';
<<<<<<<
AuthModule,
ExchangeAppModule
=======
DeviceModule,
DemandModule,
AuthModule,
EventsModule,
DeviceTypesModule,
CertificationRequestModule
>>>>>>>
DeviceModule,
DemandModule,
AuthModule,
EventsModule,
DeviceTypesModule,
CertificationRequestModule,
ExchangeAppModule |
<<<<<<<
PinchZoomInteractionComponent, TranslateInteractionComponent,
=======
PinchZoomInteractionComponent, ModifyInteractionComponent,
>>>>>>>
PinchZoomInteractionComponent, ModifyInteractionComponent, TranslateInteractionComponent,
<<<<<<<
TranslateInteractionComponent,
=======
ModifyInteractionComponent,
>>>>>>>
TranslateInteractionComponent,
ModifyInteractionComponent, |
<<<<<<<
PinchZoomInteractionComponent, DrawInteractionComponent, SelectInteractionComponent, ModifyInteractionComponent,
=======
PinchZoomInteractionComponent, ModifyInteractionComponent, TranslateInteractionComponent,
DrawInteractionComponent,
>>>>>>>
PinchZoomInteractionComponent, DrawInteractionComponent, SelectInteractionComponent, ModifyInteractionComponent, TranslateInteractionComponent,
<<<<<<<
SelectInteractionComponent,
ModifyInteractionComponent,
=======
TranslateInteractionComponent,
ModifyInteractionComponent,
>>>>>>>
SelectInteractionComponent,
ModifyInteractionComponent,
TranslateInteractionComponent, |
<<<<<<<
this.exercise = exerciseResponse.body!;
this.exercise.isAtLeastTutor = this.accountService.isAtLeastTutorInCourse(this.exercise!.course!);
this.exercise.participations = cachedParticipations;
=======
this.exercise = exerciseResponse.body;
this.exercise.participations = this.filterParticipations(cachedParticipations);
>>>>>>>
this.exercise = exerciseResponse.body!;
this.exercise.participations = this.filterParticipations(cachedParticipations);
<<<<<<<
this.exerciseService.findResultsForExercise(this.exerciseId).subscribe((exercise: Exercise) => {
this.exercise = exercise;
this.exercise.isAtLeastTutor = this.accountService.isAtLeastTutorInCourse(this.exercise.course!);
=======
this.exerciseService.findResultsForExercise(this.exerciseId).subscribe((exerciseResponse: HttpResponse<Exercise>) => {
this.exercise = exerciseResponse.body;
this.exercise.participations = this.filterParticipations(this.exercise.participations);
>>>>>>>
this.exerciseService.findResultsForExercise(this.exerciseId).subscribe((exerciseResponse: HttpResponse<Exercise>) => {
this.exercise = exerciseResponse.body!;
this.exercise.participations = this.filterParticipations(this.exercise.participations); |
<<<<<<<
constructor(
private languageService: JhiLanguageService,
private principal: Principal,
private websocketService: JhiWebsocketService,
private authServerProvider: AuthServerProvider
) {}
=======
constructor(private principal: Principal, private trackerService: JhiTrackerService, private authServerProvider: AuthServerProvider) {}
>>>>>>>
constructor(private principal: Principal, private trackerService: JhiTrackerService, private authServerProvider: AuthServerProvider) {}
<<<<<<<
// After the login the language will be changed to
// the language selected by the user during his registration
if (account !== null) {
this.languageService.changeLanguage(account.langKey);
}
this.websocketService.sendActivity();
=======
this.trackerService.sendActivity();
>>>>>>>
this.websocketService.sendActivity(); |
<<<<<<<
const isInstructorInCourse = this.participation.student == null && this.accountService.isAtLeastInstructorInCourse(exercise.course!);
const isSameUser = this.participation.student && user!.id === this.participation.student.id;
const exerciseNotOver = exercise.dueDate == null || exercise.dueDate.isAfter(moment());
=======
const isInstructorInCourse = this.participation.student == null && exercise.course && this.accountService.isAtLeastInstructorInCourse(exercise.course);
const isSameUser = this.participation.student && user.id === this.participation.student.id;
const exerciseNotOver = exercise.dueDate == null || (moment(exercise.dueDate).isValid() && moment(exercise.dueDate).isAfter(moment()));
>>>>>>>
const isInstructorInCourse = this.participation.student == null && exercise.course && this.accountService.isAtLeastInstructorInCourse(exercise.course);
const isSameUser = this.participation.student && user!.id === this.participation.student.id;
const exerciseNotOver = exercise.dueDate == null || (moment(exercise.dueDate).isValid() && moment(exercise.dueDate).isAfter(moment())); |
<<<<<<<
=======
accepted: boolean;
handled: boolean;
>>>>>>>
accepted: boolean;
handled: boolean;
<<<<<<<
this.jhiAlertService.success('arTeMiSApp.complaint.submitted');
this.submittedDate = res.body!.submittedTime!;
=======
this.submittedDate = res.body.submittedTime;
>>>>>>>
this.submittedDate = res.body!.submittedTime!;
<<<<<<<
this.jhiAlertService.error(error, null, undefined);
=======
this.jhiAlertService.error('error.http.400', null, null);
>>>>>>>
this.jhiAlertService.error('error.http.400', null, undefined); |
<<<<<<<
const billingGroup = projectOpenShift.groups.find(i => i.type == "billing" ) || ""
if (billingGroup.uptimeRobotStatusPageId && !R.isEmpty(billingGroup.uptimeRobotStatusPageId)){
uptimeRobotStatusPageIds.push(billingGroup.uptimeRobotStatusPageId)
}
var uptimeRobotStatusPageId = uptimeRobotStatusPageIds.join('-')
=======
const billingGroup = projectBillingGroup.groups.find(i => i.type == "billing" ) || ""
var uptimeRobotStatusPageId = billingGroup.uptimeRobotStatusPageId || ""
>>>>>>>
const billingGroup = projectBillingGroup.groups.find(i => i.type == "billing" ) || ""
if (billingGroup.uptimeRobotStatusPageId && !R.isEmpty(billingGroup.uptimeRobotStatusPageId)){
uptimeRobotStatusPageIds.push(billingGroup.uptimeRobotStatusPageId)
}
var uptimeRobotStatusPageId = uptimeRobotStatusPageIds.join('-') |
<<<<<<<
export function CurrentToken(): Expr
=======
export function HasCurrentIdentity(): Expr
>>>>>>>
export function HasCurrentIdentity(): Expr
export function CurrentToken(): Expr |
<<<<<<<
export function HasCurrentToken(): Expr
=======
export function HasCurrentIdentity(): Expr
export function CurrentToken(): Expr
>>>>>>>
export function HasCurrentIdentity(): Expr
export function CurrentToken(): Expr
export function HasCurrentToken(): Expr |
<<<<<<<
market.authenticate(property.address, '', '', '', '', '')
watch(dev.metricsFactory, WEB3_URI)('Create', (_, values) =>
=======
market.authenticate(property.address, 'id1', '', '', '', '')
watch(dev.metricsFactory, uri)('Create', (_, values) =>
>>>>>>>
market.authenticate(property.address, 'id1', '', '', '', '')
watch(dev.metricsFactory, WEB3_URI)('Create', (_, values) => |
<<<<<<<
const block = await getBlock()
await this._lockup.createStorage()
await this._lockup.setDIP4GenesisBlock(block)
=======
>>>>>>>
const block = await getBlock() |
<<<<<<<
import * as util from './lib/util';
import Connection from './lib/connection';
import AuthInfo from './lib/authInfo';
=======
import * as util from './lib/util';
>>>>>>>
import Connection from './lib/connection';
import AuthInfo from './lib/authInfo';
import * as util from './lib/util';
<<<<<<<
LoggerLevel,
Connection,
AuthInfo
}
=======
LoggerLevel
};
>>>>>>>
LoggerLevel,
Connection,
AuthInfo
} |
<<<<<<<
describe('findUpperCaseKeys', () => {
it('should return the first upper case key', () => {
const testObj = { lowercase: true, UpperCase: false, nested: { camelCase: true } };
expect(SfdxUtil.findUpperCaseKeys(testObj)).to.equal('UpperCase');
});
it('should return the first nested upper case key', () => {
const testObj = { lowercase: true, uppercase: false, nested: { NestedUpperCase: true } };
expect(SfdxUtil.findUpperCaseKeys(testObj)).to.equal('NestedUpperCase');
});
it('should return undefined when no upper case key is found', () => {
const testObj = { lowercase: true, uppercase: false, nested: { camelCase: true } };
expect(SfdxUtil.findUpperCaseKeys(testObj)).to.be.undefined;
});
});
=======
it ('should trim an 18 character id to 15 characters', () => {
const id: string = SfdxUtil.trimTo15('ABCDEFGHIJKLMNOPQR');
const trimmed = SfdxUtil.trimTo15(id);
expect(trimmed.length).to.eq(15);
expect(trimmed.endsWith('O')).to.be.true;
});
>>>>>>>
describe('findUpperCaseKeys', () => {
it('should return the first upper case key', () => {
const testObj = { lowercase: true, UpperCase: false, nested: { camelCase: true } };
expect(SfdxUtil.findUpperCaseKeys(testObj)).to.equal('UpperCase');
});
it('should return the first nested upper case key', () => {
const testObj = { lowercase: true, uppercase: false, nested: { NestedUpperCase: true } };
expect(SfdxUtil.findUpperCaseKeys(testObj)).to.equal('NestedUpperCase');
});
it('should return undefined when no upper case key is found', () => {
const testObj = { lowercase: true, uppercase: false, nested: { camelCase: true } };
expect(SfdxUtil.findUpperCaseKeys(testObj)).to.be.undefined;
});
});
it ('should trim an 18 character id to 15 characters', () => {
const id: string = SfdxUtil.trimTo15('ABCDEFGHIJKLMNOPQR');
const trimmed = SfdxUtil.trimTo15(id);
expect(trimmed.length).to.eq(15);
expect(trimmed.endsWith('O')).to.be.true;
}); |
<<<<<<<
import { Signale } from 'signale'
import Context from './context'
=======
import { Context } from './context'
>>>>>>>
import { Signale } from 'signale'
import { Context } from './context' |
<<<<<<<
describe('#warnForMissingEnvVars', () => {
it('throws with the expected string', () => {
delete process.env.HOME
expect(() => new Toolkit()).toThrowErrorMatchingSnapshot()
})
=======
describe('Toolkit#constructor', () => {
let logger: any
let exit: (code?: number) => never
beforeEach(() => {
logger = {
error: jest.fn(),
log: jest.fn(),
warn: jest.fn()
}
exit = global.process.exit
const p = global.process as any
p.exit = jest.fn()
})
it('exits if the event is not allowed with an array of events', () => {
// tslint:disable-next-line:no-unused-expression
new Toolkit({ logger, event: ['pull_request'] })
expect(process.exit).toHaveBeenCalledWith(1)
expect(logger.error.mock.calls).toMatchSnapshot()
})
it('does not exit if the event is one of the allowed with an array of events', () => {
// tslint:disable-next-line:no-unused-expression
new Toolkit({ logger, event: ['pull_request', 'issues'] })
expect(process.exit).not.toHaveBeenCalled()
expect(logger.error).not.toHaveBeenCalled()
})
it('exits if the event is not allowed with a single event', () => {
// tslint:disable-next-line:no-unused-expression
new Toolkit({ logger, event: 'pull_request' })
expect(process.exit).toHaveBeenCalledWith(1)
expect(logger.error.mock.calls).toMatchSnapshot()
})
it('exits if the event is not allowed with an array of events with actions', () => {
// tslint:disable-next-line:no-unused-expression
new Toolkit({ logger, event: ['pull_request.opened'] })
expect(process.exit).toHaveBeenCalledWith(1)
expect(logger.error.mock.calls).toMatchSnapshot()
})
it('exits if the event is not allowed with a single event with an action', () => {
// tslint:disable-next-line:no-unused-expression
new Toolkit({ logger, event: 'pull_request.opened' })
expect(process.exit).toHaveBeenCalledWith(1)
expect(logger.error.mock.calls).toMatchSnapshot()
})
it('logs the expected string with missing env vars', () => {
delete process.env.HOME
new Toolkit({ logger }) // tslint:disable-line:no-unused-expression
expect(logger.warn.mock.calls).toMatchSnapshot()
})
afterEach(() => {
global.process.exit = exit
>>>>>>>
describe('Toolkit#constructor', () => {
let logger: any
let exit: (code?: number) => never
beforeEach(() => {
logger = {
error: jest.fn(),
log: jest.fn(),
warn: jest.fn()
}
exit = global.process.exit
const p = global.process as any
p.exit = jest.fn()
})
it('exits if the event is not allowed with an array of events', () => {
// tslint:disable-next-line:no-unused-expression
new Toolkit({ logger, event: ['pull_request'] })
expect(process.exit).toHaveBeenCalledWith(1)
expect(logger.error.mock.calls).toMatchSnapshot()
})
it('does not exit if the event is one of the allowed with an array of events', () => {
// tslint:disable-next-line:no-unused-expression
new Toolkit({ logger, event: ['pull_request', 'issues'] })
expect(process.exit).not.toHaveBeenCalled()
expect(logger.error).not.toHaveBeenCalled()
})
it('exits if the event is not allowed with a single event', () => {
// tslint:disable-next-line:no-unused-expression
new Toolkit({ logger, event: 'pull_request' })
expect(process.exit).toHaveBeenCalledWith(1)
expect(logger.error.mock.calls).toMatchSnapshot()
})
it('exits if the event is not allowed with an array of events with actions', () => {
// tslint:disable-next-line:no-unused-expression
new Toolkit({ logger, event: ['pull_request.opened'] })
expect(process.exit).toHaveBeenCalledWith(1)
expect(logger.error.mock.calls).toMatchSnapshot()
})
it('exits if the event is not allowed with a single event with an action', () => {
// tslint:disable-next-line:no-unused-expression
new Toolkit({ logger, event: 'pull_request.opened' })
expect(process.exit).toHaveBeenCalledWith(1)
expect(logger.error.mock.calls).toMatchSnapshot()
})
afterEach(() => {
global.process.exit = exit |
<<<<<<<
private menuManager: MenuManager;
=======
private descriptionManager: DescriptionManager;
>>>>>>>
private menuManager: MenuManager;
private descriptionManager: DescriptionManager; |
<<<<<<<
import { types } from "@cosmwasm/sdk";
=======
>>>>>>>
<<<<<<<
export declare type TokenConfiguration = readonly (types.TokenInfo & {
=======
import { TokenInfo } from "./types";
export declare type TokenConfiguration = readonly (TokenInfo & {
>>>>>>>
import { TokenInfo } from "./types";
export declare type TokenConfiguration = (TokenInfo & { |
<<<<<<<
=======
import { Decimal } from "@iov/encoding";
import amino from "@tendermint/amino-js";
>>>>>>>
import { Decimal } from "@iov/encoding";
<<<<<<<
export declare function decodeFullSignature(signature: types.StdSignature, nonce: number): FullSignature;
export declare function decodeAmount(tokens: TokenInfos, coin: types.Coin): Amount;
export declare function parseMsg(msg: types.Msg, chainId: ChainId, tokens: TokenInfos): SendTransaction;
export declare function parseFee(fee: types.StdFee, tokens: TokenInfos): Fee;
=======
export declare function decodeFullSignature(signature: amino.StdSignature, nonce: number): FullSignature;
export declare function coinToDecimal(tokens: TokenInfos, coin: amino.Coin): readonly [Decimal, string];
export declare function decodeAmount(tokens: TokenInfos, coin: amino.Coin): Amount;
export declare function parseMsg(msg: amino.Msg, chainId: ChainId, tokens: TokenInfos): SendTransaction;
export declare function parseFee(fee: amino.StdFee, tokens: TokenInfos): Fee;
>>>>>>>
export declare function decodeFullSignature(signature: types.StdSignature, nonce: number): FullSignature;
export declare function coinToDecimal(tokens: TokenInfos, coin: types.Coin): readonly [Decimal, string];
export declare function decodeAmount(tokens: TokenInfos, coin: types.Coin): Amount;
export declare function parseMsg(msg: types.Msg, chainId: ChainId, tokens: TokenInfos): SendTransaction;
export declare function parseFee(fee: types.StdFee, tokens: TokenInfos): Fee; |
<<<<<<<
/**
* a.multiply(b) returns a*b.
*
* We only allow multiplication by unsigned integers to avoid rounding errors.
*/
multiply(b: Uint32 | Uint53 | Uint64): Decimal;
=======
/**
* a.minus(b) returns a-b.
*
* Both values need to have the same fractional digits.
* The resulting difference needs to be non-negative.
*/
minus(b: Decimal): Decimal;
>>>>>>>
/**
* a.minus(b) returns a-b.
*
* Both values need to have the same fractional digits.
* The resulting difference needs to be non-negative.
*/
minus(b: Decimal): Decimal;
/**
* a.multiply(b) returns a*b.
*
* We only allow multiplication by unsigned integers to avoid rounding errors.
*/
multiply(b: Uint32 | Uint53 | Uint64): Decimal; |
<<<<<<<
import { coinToDecimal, TxsResponse, types } from "@cosmwasm/sdk";
=======
import { isAminoStdTx, TxsResponse } from "@cosmwasm/sdk";
>>>>>>>
import { TxsResponse, types } from "@cosmwasm/sdk";
<<<<<<<
import { Encoding } from "@iov/encoding";
=======
import { Decimal, Encoding } from "@iov/encoding";
import amino from "@tendermint/amino-js";
>>>>>>>
import { Decimal, Encoding } from "@iov/encoding";
<<<<<<<
export function decodeAmount(tokens: TokenInfos, coin: types.Coin): Amount {
=======
export function coinToDecimal(tokens: TokenInfos, coin: amino.Coin): readonly [Decimal, string] {
const match = tokens.find(({ denom }) => denom === coin.denom);
if (!match) {
throw Error(`unknown denom: ${coin.denom}`);
}
const value = Decimal.fromAtomics(coin.amount, match.fractionalDigits);
return [value, match.ticker];
}
export function decodeAmount(tokens: TokenInfos, coin: amino.Coin): Amount {
>>>>>>>
export function coinToDecimal(tokens: TokenInfos, coin: types.Coin): readonly [Decimal, string] {
const match = tokens.find(({ denom }) => denom === coin.denom);
if (!match) {
throw Error(`unknown denom: ${coin.denom}`);
}
const value = Decimal.fromAtomics(coin.amount, match.fractionalDigits);
return [value, match.ticker];
}
export function decodeAmount(tokens: TokenInfos, coin: types.Coin): Amount { |
<<<<<<<
=======
/**
* @returns {TStatement[]}
*/
protected getNodeStructure (): TStatement[] {
const decodeNodeTemplate: string = this.getDecodeStringArrayTemplate();
return NodeUtils.convertCodeToStructure(
JavaScriptObfuscator.obfuscate(
StringArrayCallsWrapperTemplate().formatUnicorn({
decodeNodeTemplate,
stringArrayCallsWrapperName: this.stringArrayCallsWrapperName,
stringArrayName: this.stringArrayName
}),
Object.assign({}, NO_CUSTOM_NODES_PRESET, {
seed: this.options.seed
})
).getObfuscatedCode()
);
}
>>>>>>> |
<<<<<<<
=======
import {SignalToValue} from '../../Core/Audio/Components/SignalToValue';
import {GranularVoice} from './GranularComponents/GranularVoice';
import {Grain} from './GranularComponents/Grain';
>>>>>>> |
<<<<<<<
import { GraphQLContext } from "./types";
=======
import { GraphQLMiddlewarePlugin, Context } from "./types";
>>>>>>>
import { Context } from "./types"; |
<<<<<<<
export class MenuItem {
=======
import MainScene = require("./../MainScene");
import Grid = require("./../Grid");
import IBlock = require("../Blocks/IBlock");
import LFO = require("../Blocks/Effects/Pre/LFO");
import Recorder = require("../Blocks/Sources/Recorder");
import Size = minerva.Size;
import IApp = require("../IApp");
declare var App: IApp;
class MenuItem {
>>>>>>>
declare var App: IApp;
export class MenuItem { |
<<<<<<<
export class AccumulativeConnectionMethod extends ConnectionManager {
=======
import IApp = require("../../../../IApp");
declare var App: IApp;
class AccumulativeConnectionMethod extends ConnectionManager {
>>>>>>>
declare var App: IApp;
export class AccumulativeConnectionMethod extends ConnectionManager { |
<<<<<<<
export class MoveBlockCommandHandler implements ICommandHandler {
=======
import IApp = require("../IApp");
declare var App: IApp;
class MoveBlockCommandHandler implements ICommandHandler {
>>>>>>>
declare var App: IApp;
export class MoveBlockCommandHandler implements ICommandHandler { |
<<<<<<<
static InputManager: InputManager;
=======
static Particles: Particle[];
>>>>>>>
static InputManager: InputManager;
static Particles: Particle[];
<<<<<<<
App.InputManager = new InputManager();
=======
App.Particles = [];
>>>>>>>
App.InputManager = new InputManager();
App.Particles = []; |
<<<<<<<
public Sources: Tone.Oscillator[];
=======
public Source: Tone.Oscillator;
>>>>>>>
public Sources: Tone.Oscillator[];
<<<<<<<
// is there specific source to attack?
//if (env){
this.Envelopes[0].triggerAttack();
//} else {
// // Else attack all
// this.Envelopes.forEach((e: any)=> {
// e.triggerAttack();
// });
//}
=======
if (this.IsDisposed) return;
this.Envelope.triggerAttack();
>>>>>>>
if (this.IsDisposed) return;
// is there specific source to attack?
//if (env){
this.Envelopes[0].triggerAttack();
//} else {
// // Else attack all
// this.Envelopes.forEach((e: any)=> {
// e.triggerAttack();
// });
//} |
<<<<<<<
export class SaveAsCommandHandler implements ICommandHandler {
=======
import IApp = require("../IApp");
declare var App: IApp;
class SaveAsCommandHandler implements ICommandHandler {
>>>>>>>
declare var App: IApp;
export class SaveAsCommandHandler implements ICommandHandler { |
<<<<<<<
import { ErrorResponse, NotFoundResponse, Response } from "@webiny/graphql";
import { FormsCRUD } from "../../../types";
=======
import { ErrorResponse, NotFoundResponse, Response } from "@webiny/handler-graphql/responses";
>>>>>>>
import { ErrorResponse, NotFoundResponse, Response } from "@webiny/handler-graphql/responses";
import { FormsCRUD } from "../../../types"; |
<<<<<<<
export class BlockSprites {
=======
import IBlock = require("./IBlock");
import Grid = require("../Grid");
import DisplayObject = require("../DisplayObject");
import MainScene = require("../MainScene");
import IApp = require("../IApp");
declare var App: IApp;
class BlockSprites {
>>>>>>>
declare var App: IApp;
export class BlockSprites { |
<<<<<<<
=======
this.ConnectionLines = new ConnectionLines();
this.ConnectionLines.Init(this);
>>>>>>>
this.ConnectionLines = new ConnectionLines();
this.ConnectionLines.Init(this);
<<<<<<<
this._LaserBeams = new LaserBeams();
this.DisplayList.Add(this._LaserBeams);
this._LaserBeams.Init(this);
=======
this.LaserBeams = new LaserBeams();
this.LaserBeams.Init(this);
>>>>>>>
this._LaserBeams = new LaserBeams();
this.DisplayList.Add(this._LaserBeams);
this._LaserBeams.Init(this);
<<<<<<<
=======
this.LaserBeams.Update();
this._RecorderPanel.Update();
this.MainSceneDragger.Update();
this.OptionsPanel.Update();
>>>>>>>
this.OptionsPanel.Update();
<<<<<<<
=======
// LINES //
this.ConnectionLines.Draw();
// BLOCKS //
this.DisplayList.Draw();
>>>>>>>
<<<<<<<
=======
// LASER BEAMS //
this.LaserBeams.Draw();
// BLOCK ANIMATIONS //
App.AnimationsLayer.Draw();
// UI //
this._ToolTip.Draw();
this._RecorderPanel.Draw();
this.OptionsPanel.Draw();
this.ZoomButtons.Draw();
this.MainSceneDragger.Draw();
this._TrashCan.Draw();
this._Header.Draw();
this.SoundcloudPanel.Draw();
this.SharePanel.Draw();
this.SettingsPanel.Draw();
this.MessagePanel.Draw();
>>>>>>>
<<<<<<<
=======
this.ConnectionLines.UpdateList();
>>>>>>>
this.ConnectionLines.UpdateList();
<<<<<<<
=======
this.ConnectionLines.UpdateList();
>>>>>>>
<<<<<<<
}
Resize(): void {
this.OptionsPanel.Close();
this._Header.Populate(this._Header.MenuJson);
this.SettingsPanel.Populate(this.SettingsPanel.MenuJson);
=======
>>>>>>>
}
Resize(): void {
this.OptionsPanel.Close();
this._Header.Populate(this._Header.MenuJson);
this.SettingsPanel.Populate(this.SettingsPanel.MenuJson); |
<<<<<<<
export class Pitch extends PostEffect {
=======
import IApp = require("../../../IApp");
declare var App: IApp;
class Pitch extends PostEffect {
>>>>>>>
declare var App: IApp;
export class Pitch extends PostEffect { |
<<<<<<<
=======
import {MainScene} from './../MainScene';
import {Line} from '../MathObjects/Line';
import {LineList} from '../MathObjects/LineList';
>>>>>>>
import {Line} from '../MathObjects/Line';
import {LineList} from '../MathObjects/LineList';
<<<<<<<
Init(drawTo: IDisplayContext): void {
super.Init(drawTo);
=======
private _Ctx: CanvasRenderingContext2D;
private _Sketch: MainScene;
private _Unpowered: Line[];
private _Powered: Line[];
Init(sketch: MainScene): void {
this._Ctx = sketch.Ctx;
this._Sketch = sketch;
this.UpdateList();
>>>>>>>
private _Ctx: CanvasRenderingContext2D;
private _Sketch: MainScene;
private _Unpowered: Line[];
private _Powered: Line[];
Init(sketch: MainScene): void {
this._Ctx = sketch.Ctx;
this._Sketch = sketch;
this.UpdateList();
<<<<<<<
this.Ctx.strokeStyle = App.Palette[15];// BLUE
this.Ctx.lineWidth = 1;
this.Ctx.beginPath();
=======
var grd = App.ScaledGridSize; // this.Grid.Width / this.Grid.Divisor;
this._Ctx.strokeStyle = App.Palette[15];// BLUE
this._Ctx.lineWidth = 1;
this._Ctx.beginPath();
for (var j = 0; j < this._Unpowered.length; j++) {
var myPos = App.Metrics.PointOnGrid(this._Unpowered[j].Points[0]);
this._Ctx.moveTo(myPos.x, myPos.y);
for(var i = 1; i < this._Unpowered[j].Points.length; i++){
var myPos = App.Metrics.PointOnGrid(this._Unpowered[j].Points[i]);
this._Ctx.lineTo(myPos.x, myPos.y);
}
}
this._Ctx.stroke();
this._Ctx.lineWidth = 2;
this._Ctx.beginPath();
for (var j = 0; j < this._Powered.length; j++) {
var myPos = App.Metrics.PointOnGrid(this._Powered[j].Points[0]);
this._Ctx.moveTo(myPos.x, myPos.y);
for(var i = 1; i < this._Powered[j].Points.length; i++){
var myPos = App.Metrics.PointOnGrid(this._Powered[j].Points[i]);
this._Ctx.lineTo(myPos.x, myPos.y);
}
}
this._Ctx.stroke();
}
/*OldDraw() {
this._Ctx.strokeStyle = App.Palette[15];// BLUE
this._Ctx.lineWidth = 1;
this._Ctx.beginPath();
>>>>>>>
var grd = App.ScaledGridSize; // this.Grid.Width / this.Grid.Divisor;
this._Ctx.strokeStyle = App.Palette[15];// BLUE
this._Ctx.lineWidth = 1;
this._Ctx.beginPath();
for (var j = 0; j < this._Unpowered.length; j++) {
var myPos = App.Metrics.PointOnGrid(this._Unpowered[j].Points[0]);
this._Ctx.moveTo(myPos.x, myPos.y);
for(var i = 1; i < this._Unpowered[j].Points.length; i++){
var myPos = App.Metrics.PointOnGrid(this._Unpowered[j].Points[i]);
this._Ctx.lineTo(myPos.x, myPos.y);
}
}
this._Ctx.stroke();
this._Ctx.lineWidth = 2;
this._Ctx.beginPath();
for (var j = 0; j < this._Powered.length; j++) {
var myPos = App.Metrics.PointOnGrid(this._Powered[j].Points[0]);
this._Ctx.moveTo(myPos.x, myPos.y);
for(var i = 1; i < this._Powered[j].Points.length; i++){
var myPos = App.Metrics.PointOnGrid(this._Powered[j].Points[i]);
this._Ctx.lineTo(myPos.x, myPos.y);
}
}
this._Ctx.stroke();
}
/*OldDraw() {
this._Ctx.strokeStyle = App.Palette[15];// BLUE
this._Ctx.lineWidth = 1;
this._Ctx.beginPath();
<<<<<<<
this.Ctx.stroke();
=======
this._Ctx.stroke();
}*/
UpdateList() {
this._Powered = [];
this._Unpowered = [];
for (var j = 0; j < App.Sources.length; j++) {
var block: ISource = App.Sources[j];
if ((<ISource>block).Connections.Count) {
// draw connections to modifiers
var modifiers = (<ISource>block).Connections.ToArray();
var grd = App.ScaledGridSize; // this.Grid.Width / this.Grid.Divisor;
for(var i = 0; i < modifiers.length; i++){
var target: IEffect = modifiers[i];
var myPos = block.Position;
var targetPos = target.Position;
var myLine = new Line();
var xDif = (targetPos.x - myPos.x);
var yDif = (targetPos.y - myPos.y);
myLine.Points.push(new Point(myPos.x, myPos.y));
if (xDif > 0) { // RIGHT HALF
if (yDif < 0) { // UPPER
if (-yDif < xDif) {
myLine.Points.push(new Point(Math.round(myPos.x + ((xDif - (-yDif)))), Math.round(myPos.y)));
}
if (-yDif > xDif) {
myLine.Points.push(new Point(Math.round(myPos.x), Math.round(myPos.y - (((-yDif) - xDif)))));
}
}
if (yDif > 0) { // LOWER
if (yDif < xDif) {
myLine.Points.push(new Point(Math.round(myPos.x + ((xDif - yDif))), Math.round(myPos.y)));
}
if (yDif > xDif) {
myLine.Points.push(new Point(Math.round(myPos.x), Math.round(myPos.y + ((yDif - xDif)))));
}
}
}
if (xDif < 0) { // LEFT HALF
if (yDif < 0) { // UPPER
if (yDif > xDif) {
myLine.Points.push(new Point(Math.round(myPos.x - ((yDif - xDif))), Math.round(myPos.y)));
}
if (yDif < xDif) {
myLine.Points.push(new Point(Math.round(myPos.x), Math.round(myPos.y - ((xDif - yDif)))));
}
}
if (yDif > 0) { // LOWER
if (yDif < -xDif) {
myLine.Points.push(new Point(Math.round(myPos.x - (((-xDif) - yDif))), Math.round(myPos.y)));
}
if (yDif > -xDif) {
myLine.Points.push(new Point(Math.round(myPos.x), Math.round(myPos.y + ((yDif - (-xDif))))));
}
}
}
myLine.Points.push(new Point(targetPos.x, targetPos.y));
//console.log(block.IsPowered)
if (block.IsPowered()) {
this._Powered.push(myLine);
} else {
this._Unpowered.push(myLine);
}
}
}
} // end loop
console.log(this._Powered);
console.log(this._Unpowered);
>>>>>>>
this.Ctx.stroke();
}*/
UpdateList() {
this._Powered = [];
this._Unpowered = [];
for (var j = 0; j < App.Sources.length; j++) {
var block: ISource = App.Sources[j];
if ((<ISource>block).Connections.Count) {
// draw connections to modifiers
var modifiers = (<ISource>block).Connections.ToArray();
var grd = App.ScaledGridSize; // this.Grid.Width / this.Grid.Divisor;
for(var i = 0; i < modifiers.length; i++){
var target: IEffect = modifiers[i];
var myPos = block.Position;
var targetPos = target.Position;
var myLine = new Line();
var xDif = (targetPos.x - myPos.x);
var yDif = (targetPos.y - myPos.y);
myLine.Points.push(new Point(myPos.x, myPos.y));
if (xDif > 0) { // RIGHT HALF
if (yDif < 0) { // UPPER
if (-yDif < xDif) {
myLine.Points.push(new Point(Math.round(myPos.x + ((xDif - (-yDif)))), Math.round(myPos.y)));
}
if (-yDif > xDif) {
myLine.Points.push(new Point(Math.round(myPos.x), Math.round(myPos.y - (((-yDif) - xDif)))));
}
}
if (yDif > 0) { // LOWER
if (yDif < xDif) {
myLine.Points.push(new Point(Math.round(myPos.x + ((xDif - yDif))), Math.round(myPos.y)));
}
if (yDif > xDif) {
myLine.Points.push(new Point(Math.round(myPos.x), Math.round(myPos.y + ((yDif - xDif)))));
}
}
}
if (xDif < 0) { // LEFT HALF
if (yDif < 0) { // UPPER
if (yDif > xDif) {
myLine.Points.push(new Point(Math.round(myPos.x - ((yDif - xDif))), Math.round(myPos.y)));
}
if (yDif < xDif) {
myLine.Points.push(new Point(Math.round(myPos.x), Math.round(myPos.y - ((xDif - yDif)))));
}
}
if (yDif > 0) { // LOWER
if (yDif < -xDif) {
myLine.Points.push(new Point(Math.round(myPos.x - (((-xDif) - yDif))), Math.round(myPos.y)));
}
if (yDif > -xDif) {
myLine.Points.push(new Point(Math.round(myPos.x), Math.round(myPos.y + ((yDif - (-xDif))))));
}
}
}
myLine.Points.push(new Point(targetPos.x, targetPos.y));
//console.log(block.IsPowered)
if (block.IsPowered()) {
this._Powered.push(myLine);
} else {
this._Unpowered.push(myLine);
}
}
}
} // end loop
console.log(this._Powered);
console.log(this._Unpowered); |
<<<<<<<
/**
* Created by luketwyman on 12/07/2015.
*/
import MainScene = require("./../MainScene");
import IEffect = require("../Blocks/IEffect");
import ISource = require("../Blocks/ISource");
import IBlock = require("../Blocks/IBlock");
import DisplayObject = require("../DisplayObject");
import Recorder = require("../Blocks/Sources/Recorder");
import ISketchContext = Fayde.Drawing.ISketchContext;
class RecorderPanel extends DisplayObject {
=======
import {DisplayObject} from '../DisplayObject';
import {IApp} from '../IApp';
import {IBlock} from '../Blocks/IBlock';
import {IEffect} from '../Blocks/IEffect';
import {ISource} from '../Blocks/ISource';
import {MainScene} from './../MainScene';
import {Recorder} from '../Blocks/Sources/Recorder';
declare var App: IApp;
export class RecorderPanel extends DisplayObject {
>>>>>>>
import {DisplayObject} from '../DisplayObject';
import {IApp} from '../IApp';
import {IBlock} from '../Blocks/IBlock';
import {IEffect} from '../Blocks/IEffect';
import {ISource} from '../Blocks/ISource';
import {MainScene} from './../MainScene';
import {Recorder} from '../Blocks/Sources/Recorder';
import ISketchContext = Fayde.Drawing.ISketchContext;
declare var App: IApp;
export class RecorderPanel extends DisplayObject { |
<<<<<<<
import PreEffect = require("../PreEffect");
import ISource = require("../../ISource");
import Grid = require("../../../Grid");
import MainScene = require("../../../MainScene");
import AudioChain = require("../../../Core/Audio/Connections/AudioChain");
import ISketchContext = Fayde.Drawing.ISketchContext;
=======
import {IAudioChain} from '../../../Core/Audio/Connections/IAudioChain';
import {ISource} from '../../ISource';
import {MainScene} from '../../../MainScene';
import {PreEffect} from '../PreEffect';
>>>>>>>
import {IAudioChain} from '../../../Core/Audio/Connections/IAudioChain';
import {ISource} from '../../ISource';
import {MainScene} from '../../../MainScene';
import {PreEffect} from '../PreEffect';
import ISketchContext = Fayde.Drawing.ISketchContext; |
<<<<<<<
export class Sampler extends SamplerBase {
=======
import IApp = require("../../IApp");
declare var App: IApp;
class Sampler extends SamplerBase {
>>>>>>>
declare var App: IApp;
export class Sampler extends SamplerBase { |
<<<<<<<
import Keyboard = require("./Keyboard");
import Voice = require("./VoiceObject");
import ISource = require("../ISource");
import MainScene = require("../../MainScene");
import Microphone = require("../Sources/Microphone");
import Power = require("../Power/Power");
import AudioChain = require("../../Core/Audio/Connections/AudioChain");
import ISketchContext = Fayde.Drawing.ISketchContext;
=======
import {IApp} from '../../IApp';
import {ISource} from '../ISource';
import {Keyboard} from './Keyboard';
import {MainScene} from '../../MainScene';
import {Microphone} from '../Sources/Microphone';
import {MIDIManager} from '../../Core/Audio/MIDIManager';
import {MIDIMessageArgs} from '../../Core/Audio/MIDIMessageArgs';
import {Power} from '../Power/Power';
import {VoiceCreator as Voice} from './VoiceObject';
>>>>>>>
import {IApp} from '../../IApp';
import {ISource} from '../ISource';
import {Keyboard} from './Keyboard';
import {MainScene} from '../../MainScene';
import {Microphone} from '../Sources/Microphone';
import {MIDIManager} from '../../Core/Audio/MIDIManager';
import {MIDIMessageArgs} from '../../Core/Audio/MIDIMessageArgs';
import {Power} from '../Power/Power';
import {VoiceCreator as Voice} from './VoiceObject';
import ISketchContext = Fayde.Drawing.ISketchContext; |
<<<<<<<
=======
import EarlyDotRefreshes from './modules/features/EarlyDotRefreshes';
import EarlyDotRefreshesInstants from './modules/features/EarlyDotRefreshesInstants';
import BalanceOfAllThingsOpener from './modules/features/BalanceOfAllThingsOpener';
import Buffs from './modules/features/Buffs';
//Talents
import StellarFlareUptime from './modules/talents/StellarFlareUptime';
import TwinMoons from './modules/talents/TwinMoons';
import StellarDrift from './modules/talents/StellarDrift';
import Starlord from './modules/talents/Starlord';
import SoulOfTheForest from './modules/talents/SoulOfTheForest';
//Resources
>>>>>>> |
<<<<<<<
export class ParticleEmitter extends PowerSource {
=======
import IApp = require("../../IApp");
declare var App: IApp;
class ParticleEmitter extends PowerSource {
>>>>>>>
declare var App: IApp;
export class ParticleEmitter extends PowerSource { |
<<<<<<<
public Params: any;
=======
public PolySources: any[];
public PolyEnvelopes: any[];
//public Params: any;
>>>>>>>
//public Params: any;
<<<<<<<
CreateSource(){}
=======
Stop() {
this.TriggerRelease();
}
TriggerAttack(){
>>>>>>>
CreateSource(){}
<<<<<<<
if (this.Envelopes.length){
this.Envelopes.forEach((e: any, i:number)=> {
e.triggerAttackRelease("4n", "+0");
});
=======
if (this.IsDisposed) return;
if (this.Envelope){
this.Envelope.triggerAttackRelease("4n", "+0");
>>>>>>>
if (this.IsDisposed) return;
if (this.Envelopes.length){
this.Envelopes.forEach((e: any, i:number)=> {
e.triggerAttackRelease("4n", "+0");
}); |
<<<<<<<
export class ComputerKeyboard extends Keyboard {
=======
import IApp = require("../../IApp");
declare var App: IApp;
class ComputerKeyboard extends Keyboard {
>>>>>>>
declare var App: IApp;
export class ComputerKeyboard extends Keyboard { |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.