conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
RenderVditorDOM(text: string): string[];
VditorDOMMarkdown(html: string): string[];
// SpinVditorDOM(html: string): string[];
=======
RenderEChartsJSON(text: string):string[];
>>>>>>>
RenderEChartsJSON(text: string):string[];
RenderVditorDOM(text: string): string[];
VditorDOMMarkdown(html: string): string[];
// SpinVditorDOM(html: string): string[];
<<<<<<<
currentEditorName: "markdown" | "wysiwyg";
=======
devtools?: HTMLElement;
>>>>>>>
currentEditorName: "markdown" | "wysiwyg";
devtools?: HTMLElement; |
<<<<<<<
import {
Mark,
MarkConfigMixins,
PRIMITIVE_MARKS,
VL_ONLY_MARK_CONFIG_PROPERTIES,
VL_ONLY_MARK_SPECIFIC_CONFIG_PROPERTY_INDEX,
} from './mark';
=======
>>>>>>> |
<<<<<<<
import {MarkConfig, markConfig} from './config.marks.schema';
=======
import {MarksConfig, marksConfig} from './config.marks.schema';
import {SceneConfig, sceneConfig} from './config.scene.schema';
>>>>>>>
import {MarkConfig, markConfig} from './config.marks.schema';
import {SceneConfig, sceneConfig} from './config.scene.schema';
<<<<<<<
mark?: MarkConfig;
scene?: any; // TODO: SceneConfig
=======
marks?: MarksConfig;
scene?: SceneConfig;
>>>>>>>
mark?: MarkConfig;
scene?: SceneConfig;
<<<<<<<
mark: markConfig,
scene: { // TODO: add SceneConfig
type: 'object',
default: undefined,
description: 'An object for styling the top-level scenegraph root. Available properties include `fill`, `fillOpacity`, `stroke`, `strokeOpacity`, `strokeWidth`, `strokeDash`, `strokeDashOffset`.'
}
=======
marks: marksConfig,
scene: sceneConfig
>>>>>>>
mark: markConfig,
scene: sceneConfig |
<<<<<<<
type: function(timeUnit, name) {
if (name === Enctype.COLOR) {
=======
export function type(timeUnit, name) {
if (name === COLOR) {
>>>>>>>
export function type(timeUnit, name) {
if (name === Enctype.COLOR) { |
<<<<<<<
// PROPERTIES
export var properties = {
axis: function(encoding, name, spec) {
if (name === Enctype.ROW || name === Enctype.COL) {
=======
namespace properties {
export function axis(encoding, name, spec) {
if (name === ROW || name === COL) {
>>>>>>>
namespace properties {
export function axis(encoding, name, spec) {
if (name === Enctype.ROW || name === Enctype.COL) {
<<<<<<<
title: function(encoding, name, spec, layout) {
if (name === Enctype.ROW) {
=======
export function title(encoding, name, spec, layout) {
if (name === ROW) {
>>>>>>>
export function title(encoding, name, spec, layout) {
if (name === Enctype.ROW) { |
<<<<<<<
import {SelectionParameter} from '../selection';
import {
BaseSpec,
DataMixins,
DeprecatedFrameMixins,
FrameMixins,
GenericCompositionLayout,
ResolveMixins
} from './base';
=======
import {SelectionDef} from '../selection';
import {Field} from './../channeldef';
import {BaseSpec, DataMixins, FrameMixins, GenericCompositionLayout, ResolveMixins} from './base';
>>>>>>>
import {SelectionParameter} from '../selection';
import {Field} from './../channeldef';
import {BaseSpec, DataMixins, FrameMixins, GenericCompositionLayout, ResolveMixins} from './base'; |
<<<<<<<
import {ImputeNode} from './impute';
import {IdentifierNode} from './indentifier';
=======
import {IdentifierNode} from './identifier';
>>>>>>>
import {IdentifierNode} from './identifier';
import {ImputeNode} from './impute'; |
<<<<<<<
/* tslint:disable:no-unused-variable */
// These imports exist so the TS compiler can name publicly exported members in
// The automatically created .d.ts correctly
import {Formula} from '../transform';
import {OneOfFilter, EqualFilter, RangeFilter} from '../filter';
/* tslint:enable:no-unused-variable */
import {SelectionComponent} from './selection/selection';
=======
>>>>>>>
import {SelectionComponent} from './selection/selection';
<<<<<<<
scale: Dict<ScaleComponents>;
selection: Dict<SelectionComponent>;
=======
scales: Dict<ScaleComponents>;
>>>>>>>
scales: Dict<ScaleComponents>;
selection: Dict<SelectionComponent>;
<<<<<<<
this.component = {
data: null,
mark: null,
scale: null,
axis: null,
legend: null,
layout: null,
selection: null,
axisGroup: null,
gridGroup: null
};
=======
this.component = {data: null, layout: null, mark: null, scales: null, axes: null, axisGroups: null, gridGroups: null, legends: null};
>>>>>>>
this.component = {data: null, layout: null, mark: null, scales: null, axes: null, axisGroups: null, gridGroups: null, legends: null, selection: null}; |
<<<<<<<
v4 = {
=======
v11 = {
>>>>>>>
v4 = {
<<<<<<<
v5 = {
=======
v12 = {
>>>>>>>
v5 = {
<<<<<<<
v6 = {
=======
v13 = {
>>>>>>>
v6 = {
<<<<<<<
v7 = {
=======
v14 = {
>>>>>>>
v7 = {
<<<<<<<
v8 = {
"kind": "ScalarField",
"alias": null,
"name": "id",
"args": null,
"storageKey": null
},
v9 = {
=======
v15 = {
>>>>>>>
v8 = {
"kind": "ScalarField",
"alias": null,
"name": "id",
"args": null,
"storageKey": null
},
v9 = {
<<<<<<<
v10 = {
=======
v16 = {
>>>>>>>
v10 = {
<<<<<<<
v11 = {
=======
v17 = {
>>>>>>>
v11 = {
<<<<<<<
v12 = {
=======
v18 = {
>>>>>>>
v12 = {
<<<<<<<
v11,
=======
v17,
>>>>>>>
v11,
<<<<<<<
"selections": v14
=======
"selections": v19
>>>>>>>
"selections": v14
<<<<<<<
"selections": v14
=======
"selections": v19
>>>>>>>
"selections": v14
<<<<<<<
v11,
=======
v17,
>>>>>>>
v11,
<<<<<<<
v16 = {
"kind": "ScalarField",
"alias": null,
"name": "name",
"args": null,
"storageKey": null
},
v17 = [
v16,
v1
],
v18 = {
=======
v21 = {
>>>>>>>
v16 = {
"kind": "ScalarField",
"alias": null,
"name": "name",
"args": null,
"storageKey": null
},
v17 = [
v16,
v1
],
v18 = {
<<<<<<<
v19 = {
=======
v22 = {
>>>>>>>
v19 = {
<<<<<<<
v22 = {
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
=======
>>>>>>>
v22 = {
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
<<<<<<<
"id": "c3d6f1b1b55ec61b4de0dcb22f4a9925",
=======
"id": "8701ef21bfb16e79fb7b6229af5e7e2a",
>>>>>>>
"id": "e8402172df695c559b730e97d060cdb5",
<<<<<<<
"selections": v17
=======
"selections": [
v4,
v1,
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": [
v2,
v5
]
},
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v2,
v5,
v6,
{
"kind": "LinkedField",
"alias": null,
"name": "profile",
"storageKey": null,
"args": null,
"concreteType": "Profile",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
v7,
v1
]
}
]
}
]
>>>>>>>
"selections": v17
<<<<<<<
v13,
=======
v8,
>>>>>>>
v13,
<<<<<<<
=======
v9,
v1,
v10,
v11,
v12,
v13,
v14,
v5,
v15,
v16,
v18,
v20,
>>>>>>>
<<<<<<<
v1,
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": [
v16,
v8
]
},
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v16,
v8,
v20
]
}
=======
v22,
v6
>>>>>>>
v1,
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": [
v16,
v8
]
},
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v16,
v8,
v20,
{
"kind": "LinkedField",
"alias": null,
"name": "profile",
"storageKey": null,
"args": null,
"concreteType": "Profile",
"plural": false,
"selections": [
v22,
v23,
v1
]
}
]
}
<<<<<<<
v22,
v16,
=======
v2,
v7,
>>>>>>>
v22,
v16,
<<<<<<<
v22,
v8,
v16,
=======
v2,
v7,
>>>>>>>
v22,
v8,
v16,
<<<<<<<
v9,
v8,
v3,
v4,
v5,
v6,
v7,
v2,
=======
v15,
v5,
v10,
v11,
v12,
v13,
v14,
v9,
>>>>>>>
v9,
v8,
v3,
v4,
v5,
v6,
v7,
v2,
<<<<<<<
v10,
v12,
v15,
v18,
v19,
=======
v16,
v18,
>>>>>>>
v10,
v12,
v15,
v18,
v19,
<<<<<<<
v21
=======
v21,
v22,
v6,
v4
>>>>>>>
v21 |
<<<<<<<
const isActive = await this.activeWorkflowRunner.isActive(id);
if (isActive) {
=======
await this.externalHooks.run('workflow.update', [newWorkflowData]);
if (this.activeWorkflowRunner.isActive(id)) {
>>>>>>>
await this.externalHooks.run('workflow.update', [newWorkflowData]);
const isActive = await this.activeWorkflowRunner.isActive(id);
if (isActive) {
<<<<<<<
const isActive = await this.activeWorkflowRunner.isActive(id);
if (isActive) {
=======
await this.externalHooks.run('workflow.delete', [id]);
if (this.activeWorkflowRunner.isActive(id)) {
>>>>>>>
await this.externalHooks.run('workflow.delete', [id]);
const isActive = await this.activeWorkflowRunner.isActive(id);
if (isActive) { |
<<<<<<<
v12 = [
=======
v15 = [
>>>>>>>
v13 = [
<<<<<<<
{
"kind": "ScalarField",
"alias": null,
"name": "is_closed",
"args": null,
"storageKey": null
},
=======
(v11/*: any*/),
>>>>>>>
{
"kind": "ScalarField",
"alias": null,
"name": "is_closed",
"args": null,
"storageKey": null
},
<<<<<<<
=======
"name": "opening_bid",
"storageKey": null,
"args": null,
"concreteType": "SaleArtworkOpeningBid",
"plural": false,
"selections": (v12/*: any*/)
},
{
"kind": "LinkedField",
"alias": null,
>>>>>>>
<<<<<<<
v13 = {
=======
v16 = {
>>>>>>>
v14 = {
<<<<<<<
v14 = {
=======
v17 = {
>>>>>>>
v15 = {
<<<<<<<
v15 = {
=======
v18 = {
>>>>>>>
v16 = {
<<<<<<<
v16 = {
=======
v19 = {
>>>>>>>
v17 = {
<<<<<<<
v17 = [
=======
v20 = [
>>>>>>>
v18 = [
<<<<<<<
"selections": (v12/*: any*/)
=======
"selections": (v15/*: any*/)
>>>>>>>
"selections": (v13/*: any*/)
<<<<<<<
(v13/*: any*/),
(v14/*: any*/),
(v15/*: any*/),
=======
(v16/*: any*/),
(v17/*: any*/),
(v18/*: any*/),
>>>>>>>
(v14/*: any*/),
(v15/*: any*/),
(v16/*: any*/),
<<<<<<<
(v14/*: any*/),
(v15/*: any*/),
(v13/*: any*/)
=======
(v17/*: any*/),
(v18/*: any*/),
(v16/*: any*/)
>>>>>>>
(v15/*: any*/),
(v16/*: any*/),
(v14/*: any*/)
<<<<<<<
(v11/*: any*/),
(v7/*: any*/),
(v2/*: any*/),
=======
>>>>>>>
<<<<<<<
(v16/*: any*/),
=======
(v2/*: any*/),
(v19/*: any*/),
>>>>>>>
(v2/*: any*/),
(v17/*: any*/),
<<<<<<<
(v13/*: any*/)
=======
(v16/*: any*/)
>>>>>>>
(v14/*: any*/)
<<<<<<<
(v2/*: any*/),
(v16/*: any*/),
=======
(v3/*: any*/),
(v19/*: any*/),
>>>>>>>
(v3/*: any*/),
(v17/*: any*/),
<<<<<<<
"selections": (v12/*: any*/)
=======
"selections": (v15/*: any*/)
>>>>>>>
"selections": (v13/*: any*/)
<<<<<<<
"selections": (v12/*: any*/)
=======
"selections": (v15/*: any*/)
>>>>>>>
"selections": (v13/*: any*/)
<<<<<<<
"selections": (v17/*: any*/)
=======
"selections": (v20/*: any*/)
>>>>>>>
"selections": (v18/*: any*/)
<<<<<<<
"selections": (v17/*: any*/)
=======
"selections": (v20/*: any*/)
>>>>>>>
"selections": (v18/*: any*/)
<<<<<<<
"selections": (v17/*: any*/)
=======
"selections": (v20/*: any*/)
>>>>>>>
"selections": (v18/*: any*/)
<<<<<<<
"selections": (v17/*: any*/)
=======
"selections": (v20/*: any*/)
>>>>>>>
"selections": (v18/*: any*/)
<<<<<<<
"id": "1031a180b6d73723279286bf4c59ddcc",
=======
"id": "28b19f8732764999b6dfe59a5cf134c4",
>>>>>>>
"id": "2ab21d852942795724e0139a0fd6e9ad", |
<<<<<<<
"name": "description",
=======
"name": "name",
>>>>>>>
"name": "name",
<<<<<<<
"name": "city",
=======
"name": "description",
>>>>>>>
"name": "description",
<<<<<<<
"name": "id",
=======
"name": "city",
>>>>>>>
"name": "city",
<<<<<<<
"name": "end_at",
=======
"name": "exhibition_period",
>>>>>>>
"name": "end_at",
<<<<<<<
"name": "exhibition_period",
=======
"name": "__typename",
>>>>>>>
"name": "exhibition_period",
<<<<<<<
"name": "__typename",
=======
"name": "href",
>>>>>>>
"name": "__typename",
<<<<<<<
v18 = {
"kind": "ScalarField",
"alias": null,
"name": "is_biddable",
"args": null,
"storageKey": null
},
v19 = {
=======
v17 = {
>>>>>>>
v18 = {
<<<<<<<
v20 = {
=======
v18 = {
>>>>>>>
v19 = {
<<<<<<<
v21 = {
=======
v19 = {
>>>>>>>
v20 = {
<<<<<<<
v22 = {
=======
v20 = {
>>>>>>>
v21 = {
<<<<<<<
v23 = {
=======
v21 = {
>>>>>>>
v22 = {
<<<<<<<
v24 = {
=======
v22 = {
"kind": "ScalarField",
"alias": null,
"name": "is_biddable",
"args": null,
"storageKey": null
},
v23 = {
>>>>>>>
v23 = {
"kind": "ScalarField",
"alias": null,
"name": "is_biddable",
"args": null,
"storageKey": null
},
v24 = {
<<<<<<<
v30 = [
v3,
=======
v29 = [
v4,
>>>>>>>
v30 = [
v4,
<<<<<<<
v6,
v7,
v8
=======
v3,
v7,
v8
>>>>>>>
v3,
v7,
v8
<<<<<<<
v9,
v10,
v11,
=======
v9,
v10,
>>>>>>>
v9,
v10,
v11,
<<<<<<<
=======
{
"kind": "LinkedField",
"alias": null,
"name": "partner",
"storageKey": null,
"args": null,
"concreteType": null,
"plural": false,
"selections": [
v11,
v1,
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v4,
v3,
v12,
{
"kind": "ScalarField",
"alias": null,
"name": "type",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "website",
"args": null,
"storageKey": null
}
]
}
]
},
>>>>>>>
<<<<<<<
v3,
v13,
v6,
v2,
=======
v4,
v12,
v3,
v2,
>>>>>>>
v4,
v13,
v3,
v2,
<<<<<<<
v32,
v13
=======
v12
>>>>>>>
v32,
v13
<<<<<<<
v12,
=======
v11,
>>>>>>>
v12,
<<<<<<<
v6,
v5,
=======
v3,
v6,
>>>>>>>
v3,
v6,
<<<<<<<
v12,
{
"kind": "InlineFragment",
"type": "OpeningHoursText",
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "text",
"args": null,
"storageKey": null
}
]
},
=======
v11,
>>>>>>>
v12,
<<<<<<<
v4,
=======
v5,
>>>>>>>
v5,
<<<<<<<
v13
=======
v12
>>>>>>>
v13
<<<<<<<
v6,
=======
>>>>>>>
<<<<<<<
v24,
v6,
=======
v3,
v1,
v17,
v18,
>>>>>>>
v3,
v1,
v18,
<<<<<<<
v23,
v18,
v1,
v25,
v27,
v29,
=======
v23,
v24,
v26,
v28,
v30,
>>>>>>>
v23,
v24,
v25,
v27,
v29,
<<<<<<<
v32,
v13,
v12
=======
v12,
v11
>>>>>>>
v32,
v13,
v12 |
<<<<<<<
v27 = [
{
"kind": "ScalarField",
"alias": null,
"name": "cents",
"args": null,
"storageKey": null
},
(v24/*: any*/)
],
v28 = {
=======
v26 = {
"kind": "ScalarField",
"alias": null,
"name": "cents",
"args": null,
"storageKey": null
},
v27 = {
>>>>>>>
v27 = {
"kind": "ScalarField",
"alias": null,
"name": "cents",
"args": null,
"storageKey": null
},
v28 = {
<<<<<<<
"name": "isAcquireable",
"args": null,
"storageKey": null
},
v30 = {
"kind": "ScalarField",
"alias": null,
"name": "isOfferable",
"args": null,
"storageKey": null
},
v31 = {
"kind": "ScalarField",
"alias": null,
=======
>>>>>>>
<<<<<<<
{
"kind": "ScalarField",
"alias": null,
"name": "isOpen",
"args": null,
"storageKey": null
},
(v12/*: any*/),
=======
(v11/*: any*/),
>>>>>>>
(v12/*: any*/),
<<<<<<<
{
"kind": "ScalarField",
"alias": null,
"name": "liveStartAt",
"args": null,
"storageKey": null
},
(v13/*: any*/),
=======
(v12/*: any*/),
(v8/*: any*/),
>>>>>>>
(v13/*: any*/),
(v8/*: any*/),
<<<<<<<
(v7/*: any*/),
(v15/*: any*/),
(v17/*: any*/)
=======
(v6/*: any*/),
(v14/*: any*/),
(v16/*: any*/)
>>>>>>>
(v6/*: any*/),
(v15/*: any*/),
(v17/*: any*/)
<<<<<<<
=======
(v11/*: any*/),
(v6/*: any*/),
>>>>>>>
<<<<<<<
(v7/*: any*/),
(v15/*: any*/),
=======
(v6/*: any*/),
(v14/*: any*/),
>>>>>>>
(v6/*: any*/),
(v15/*: any*/),
<<<<<<<
"concreteType": "Image",
"plural": false,
"selections": (v16/*: any*/)
}
=======
"storageKey": null
},
(v17/*: any*/)
>>>>>>>
"storageKey": null
},
(v18/*: any*/)
<<<<<<<
{
"kind": "ScalarField",
"alias": "is_in_auction",
"name": "isInAuction",
"args": null,
"storageKey": null
},
=======
(v20/*: any*/),
>>>>>>>
<<<<<<<
(v23/*: any*/),
=======
(v5/*: any*/),
>>>>>>>
(v23/*: any*/),
(v5/*: any*/),
<<<<<<<
(v6/*: any*/),
=======
(v8/*: any*/),
(v21/*: any*/),
>>>>>>>
(v8/*: any*/),
<<<<<<<
{
"kind": "LinkedField",
"alias": null,
"name": "shows",
"storageKey": "shows(size:1)",
"args": [
{
"kind": "Literal",
"name": "size",
"value": 1
}
],
"concreteType": "Show",
"plural": true,
"selections": [
(v3/*: any*/),
(v4/*: any*/),
(v7/*: any*/),
(v5/*: any*/),
(v6/*: any*/),
(v15/*: any*/),
(v9/*: any*/),
(v18/*: any*/)
]
},
(v19/*: any*/),
(v7/*: any*/),
=======
(v18/*: any*/),
(v6/*: any*/),
>>>>>>>
(v19/*: any*/),
(v6/*: any*/),
<<<<<<<
"selections": (v27/*: any*/)
},
{
"kind": "ScalarField",
"alias": null,
"name": "isWithReserve",
"args": null,
"storageKey": null
=======
"selections": [
(v26/*: any*/)
]
>>>>>>>
"selections": [
(v27/*: any*/)
]
<<<<<<<
"kind": "LinkedField",
"alias": null,
"name": "editionSets",
"storageKey": null,
"args": null,
"concreteType": "EditionSet",
"plural": true,
"selections": [
(v29/*: any*/),
(v30/*: any*/),
(v31/*: any*/),
(v3/*: any*/),
(v6/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "editionOf",
"args": null,
"storageKey": null
},
(v28/*: any*/)
]
},
(v31/*: any*/),
{
=======
>>>>>>>
<<<<<<<
(v29/*: any*/),
(v30/*: any*/),
=======
>>>>>>>
<<<<<<<
"selections": (v27/*: any*/)
=======
"selections": [
(v26/*: any*/),
(v23/*: any*/)
]
>>>>>>>
"selections": [
(v27/*: any*/),
(v24/*: any*/)
]
<<<<<<<
"id": "ca5176d10effd53c90f15709756515b8",
=======
"id": "0831b9db633bea149b03f2db36f513a5",
>>>>>>>
"id": "ed104f6ef54979802e66b135d227bb8a", |
<<<<<<<
// Load the credentials overwrites if any exist
const credentialsOverwrites = CredentialsOverwrites();
await credentialsOverwrites.init();
=======
// Load all external hooks
const externalHooks = ExternalHooks();
await externalHooks.init();
>>>>>>>
// Load the credentials overwrites if any exist
const credentialsOverwrites = CredentialsOverwrites();
await credentialsOverwrites.init();
// Load all external hooks
const externalHooks = ExternalHooks();
await externalHooks.init(); |
<<<<<<<
"name": "description",
=======
"name": "name",
>>>>>>>
"name": "name",
<<<<<<<
"name": "city",
=======
"name": "description",
>>>>>>>
"name": "description",
<<<<<<<
"name": "id",
=======
"name": "city",
>>>>>>>
"name": "city",
<<<<<<<
"name": "end_at",
=======
"name": "exhibition_period",
>>>>>>>
"name": "end_at",
<<<<<<<
"name": "exhibition_period",
=======
"name": "__typename",
>>>>>>>
"name": "exhibition_period",
<<<<<<<
"name": "__typename",
=======
"name": "href",
>>>>>>>
"name": "__typename",
<<<<<<<
v19 = {
"kind": "ScalarField",
"alias": null,
"name": "is_biddable",
"args": null,
"storageKey": null
},
v20 = {
=======
v18 = {
>>>>>>>
v19 = {
<<<<<<<
v21 = {
=======
v19 = {
>>>>>>>
v20 = {
<<<<<<<
v22 = {
=======
v20 = {
>>>>>>>
v21 = {
<<<<<<<
v23 = {
=======
v21 = {
>>>>>>>
v22 = {
<<<<<<<
v24 = {
=======
v22 = {
>>>>>>>
v23 = {
<<<<<<<
v25 = {
=======
v23 = {
"kind": "ScalarField",
"alias": null,
"name": "is_biddable",
"args": null,
"storageKey": null
},
v24 = {
>>>>>>>
v24 = {
"kind": "ScalarField",
"alias": null,
"name": "is_biddable",
"args": null,
"storageKey": null
},
v25 = {
<<<<<<<
v31 = [
v4,
=======
v30 = [
v5,
>>>>>>>
v31 = [
v5,
<<<<<<<
v7,
v8,
v9
=======
v4,
v8,
v9
>>>>>>>
v4,
v8,
v9
<<<<<<<
v10,
v11,
v12,
=======
v10,
v11,
>>>>>>>
v10,
v11,
v12,
<<<<<<<
=======
{
"kind": "LinkedField",
"alias": null,
"name": "partner",
"storageKey": null,
"args": null,
"concreteType": null,
"plural": false,
"selections": [
v12,
v2,
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v5,
v4,
v13,
{
"kind": "ScalarField",
"alias": null,
"name": "type",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "website",
"args": null,
"storageKey": null
}
]
}
]
},
>>>>>>>
<<<<<<<
v4,
v14,
v7,
v3,
=======
v5,
v13,
v4,
v3,
>>>>>>>
v5,
v14,
v4,
v3,
<<<<<<<
v33,
v14
=======
v13
>>>>>>>
v33,
v14
<<<<<<<
v13,
=======
v12,
>>>>>>>
v13,
<<<<<<<
v7,
v6,
=======
v4,
v7,
>>>>>>>
v4,
v7,
<<<<<<<
v13,
{
"kind": "InlineFragment",
"type": "OpeningHoursText",
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "text",
"args": null,
"storageKey": null
}
]
},
=======
v12,
>>>>>>>
v13,
<<<<<<<
v5,
=======
v6,
>>>>>>>
v6,
<<<<<<<
v14
=======
v13
>>>>>>>
v14
<<<<<<<
v7,
=======
>>>>>>>
<<<<<<<
v25,
v7,
=======
v4,
v2,
v18,
v19,
>>>>>>>
v4,
v2,
v19,
<<<<<<<
v24,
v19,
v2,
v26,
v28,
v30,
=======
v24,
v25,
v27,
v29,
v31,
>>>>>>>
v24,
v25,
v26,
v28,
v30,
<<<<<<<
v33,
v14,
v13
=======
v13,
v12
>>>>>>>
v33,
v14,
v13 |
<<<<<<<
...ArtworkHistory_artwork
=======
...ArtworkHeader_artwork
>>>>>>>
...ArtworkHeader_artwork
...ArtworkHistory_artwork
<<<<<<<
fragment ArtworkHistory_artwork on Artwork {
provenance
exhibition_history
literature
}
=======
fragment ArtworkHeader_artwork on Artwork {
...ArtworkActions_artwork
...ArtworkTombstone_artwork
images {
...ImageCarousel_images
}
}
fragment ArtworkActions_artwork on Artwork {
id
internalID
title
href
is_saved
artists {
name
id
}
}
fragment ArtworkTombstone_artwork on Artwork {
title
medium
date
cultural_maker
artists {
name
href
...FollowArtistButton_artist
id
}
dimensions {
in
cm
}
edition_of
attribution_class {
shortDescription
id
}
}
fragment ImageCarousel_images on Image {
url
width
height
thumbnail: resized(width: $screenWidth) {
width
height
url
}
}
fragment FollowArtistButton_artist on Artist {
gravityID
id
is_followed
}
>>>>>>>
fragment ArtworkHeader_artwork on Artwork {
...ArtworkActions_artwork
...ArtworkTombstone_artwork
images {
...ImageCarousel_images
}
}
fragment ArtworkHistory_artwork on Artwork {
provenance
exhibition_history
literature
}
fragment ArtworkActions_artwork on Artwork {
id
internalID
title
href
is_saved
artists {
name
id
}
}
fragment ArtworkTombstone_artwork on Artwork {
title
medium
date
cultural_maker
artists {
name
href
...FollowArtistButton_artist
id
}
dimensions {
in
cm
}
edition_of
attribution_class {
shortDescription
id
}
}
fragment ImageCarousel_images on Image {
url
width
height
thumbnail: resized(width: $screenWidth) {
width
height
url
}
}
fragment FollowArtistButton_artist on Artist {
gravityID
id
is_followed
}
<<<<<<<
},
{
"kind": "ScalarField",
"alias": null,
"name": "provenance",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "exhibition_history",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "literature",
"args": null,
"storageKey": null
=======
},
(v3/*: any*/),
(v13/*: any*/),
(v5/*: any*/),
(v9/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "is_saved",
"args": null,
"storageKey": null
},
(v6/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "cultural_maker",
"args": null,
"storageKey": null
},
{
"kind": "LinkedField",
"alias": null,
"name": "dimensions",
"storageKey": null,
"args": null,
"concreteType": "dimensions",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "in",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "cm",
"args": null,
"storageKey": null
}
]
},
{
"kind": "ScalarField",
"alias": null,
"name": "edition_of",
"args": null,
"storageKey": null
},
{
"kind": "LinkedField",
"alias": null,
"name": "attribution_class",
"storageKey": null,
"args": null,
"concreteType": "AttributionClass",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "shortDescription",
"args": null,
"storageKey": null
},
(v3/*: any*/)
]
},
{
"kind": "LinkedField",
"alias": null,
"name": "images",
"storageKey": null,
"args": null,
"concreteType": "Image",
"plural": true,
"selections": [
(v16/*: any*/),
(v18/*: any*/),
(v19/*: any*/),
{
"kind": "LinkedField",
"alias": "thumbnail",
"name": "resized",
"storageKey": null,
"args": [
{
"kind": "Variable",
"name": "width",
"variableName": "screenWidth"
}
],
"concreteType": "ResizedImageUrl",
"plural": false,
"selections": [
(v18/*: any*/),
(v19/*: any*/),
(v16/*: any*/)
]
}
]
>>>>>>>
},
(v3/*: any*/),
(v13/*: any*/),
(v5/*: any*/),
(v9/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "is_saved",
"args": null,
"storageKey": null
},
(v6/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "cultural_maker",
"args": null,
"storageKey": null
},
{
"kind": "LinkedField",
"alias": null,
"name": "dimensions",
"storageKey": null,
"args": null,
"concreteType": "dimensions",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "in",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "cm",
"args": null,
"storageKey": null
}
]
},
{
"kind": "ScalarField",
"alias": null,
"name": "edition_of",
"args": null,
"storageKey": null
},
{
"kind": "LinkedField",
"alias": null,
"name": "attribution_class",
"storageKey": null,
"args": null,
"concreteType": "AttributionClass",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "shortDescription",
"args": null,
"storageKey": null
},
(v3/*: any*/)
]
},
{
"kind": "LinkedField",
"alias": null,
"name": "images",
"storageKey": null,
"args": null,
"concreteType": "Image",
"plural": true,
"selections": [
(v16/*: any*/),
(v18/*: any*/),
(v19/*: any*/),
{
"kind": "LinkedField",
"alias": "thumbnail",
"name": "resized",
"storageKey": null,
"args": [
{
"kind": "Variable",
"name": "width",
"variableName": "screenWidth"
}
],
"concreteType": "ResizedImageUrl",
"plural": false,
"selections": [
(v18/*: any*/),
(v19/*: any*/),
(v16/*: any*/)
]
}
]
},
{
"kind": "ScalarField",
"alias": null,
"name": "provenance",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "exhibition_history",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "literature",
"args": null,
"storageKey": null
<<<<<<<
"id": "09f817b28c7b7b17c610911518b4644d",
=======
"id": "fd76f11a636d571ca6fd7ce3f83d89d9",
>>>>>>>
"id": "da1588320105cfa7edf1f20a1764f52a", |
<<<<<<<
import { CommercialInformation_artwork$ref } from "./CommercialInformation_artwork.graphql";
=======
import { ArtworkHistory_artwork$ref } from "./ArtworkHistory_artwork.graphql";
>>>>>>>
import { ArtworkHistory_artwork$ref } from "./ArtworkHistory_artwork.graphql";
import { CommercialInformation_artwork$ref } from "./CommercialInformation_artwork.graphql";
<<<<<<<
readonly " $fragmentRefs": PartnerCard_artwork$ref & AboutWork_artwork$ref & OtherWorks_artwork$ref & AboutArtist_artwork$ref & ArtworkDetails_artwork$ref & ArtworkHeader_artwork$ref & CommercialInformation_artwork$ref;
=======
readonly " $fragmentRefs": ArtworkAvailability_artwork$ref & PartnerCard_artwork$ref & SellerInfo_artwork$ref & AboutWork_artwork$ref & OtherWorks_artwork$ref & AboutArtist_artwork$ref & ArtworkDetails_artwork$ref & ArtworkHeader_artwork$ref & ArtworkHistory_artwork$ref;
>>>>>>>
readonly " $fragmentRefs": PartnerCard_artwork$ref & AboutWork_artwork$ref & OtherWorks_artwork$ref & AboutArtist_artwork$ref & ArtworkDetails_artwork$ref & ArtworkHeader_artwork$ref & CommercialInformation_artwork$ref & ArtworkHistory_artwork$ref;
<<<<<<<
},
{
"kind": "FragmentSpread",
"name": "CommercialInformation_artwork",
"args": null
=======
},
{
"kind": "FragmentSpread",
"name": "ArtworkHistory_artwork",
"args": null
>>>>>>>
},
{
"kind": "FragmentSpread",
"name": "CommercialInformation_artwork",
"args": null
},
{
"kind": "FragmentSpread",
"name": "ArtworkHistory_artwork",
"args": null
<<<<<<<
(node as any).hash = 'a759d1970a4793217ff76557d9669430';
=======
(node as any).hash = '38aa50c794e853557cd263c80aed2864';
>>>>>>>
(node as any).hash = '34a60cf78fa7ca2fbb3591edcbd2fc83'; |
<<<<<<<
import { Location_show$ref } from "./Location_show.graphql";
=======
import { ShowHeader_show$ref } from "./ShowHeader_show.graphql";
>>>>>>>
import { Location_show$ref } from "./Location_show.graphql";
import { ShowHeader_show$ref } from "./ShowHeader_show.graphql";
<<<<<<<
readonly name: string | null;
readonly description: string | null;
readonly press_release: string | null;
=======
readonly location: ({
readonly __id: string;
readonly id: string;
readonly city: string | null;
readonly address: string | null;
readonly address_2: string | null;
readonly coordinates: ({
readonly lat: number | null;
readonly lng: number | null;
}) | null;
readonly day_schedules: ReadonlyArray<({
readonly start_time: number | null;
readonly end_time: number | null;
readonly day_of_week: string | null;
}) | null> | null;
}) | null;
>>>>>>>
readonly name: string | null;
readonly description: string | null;
readonly press_release: string | null;
<<<<<<<
readonly exhibition_period: string | null;
readonly " $fragmentRefs": Location_show$ref;
=======
readonly partner: ({
readonly name?: string | null;
}) | null;
readonly " $fragmentRefs": ShowHeader_show$ref;
>>>>>>>
readonly partner: ({
readonly name?: string | null;
}) | null;
readonly " $fragmentRefs": ShowHeader_show$ref & Location_show$ref;
<<<<<<<
"kind": "LinkedField",
"alias": null,
"name": "artists",
"storageKey": null,
"args": null,
"concreteType": "Artist",
"plural": true,
"selections": [
v0,
v1,
v2,
{
"kind": "ScalarField",
"alias": null,
"name": "is_followed",
"args": null,
"storageKey": null
}
]
},
v1,
{
"kind": "ScalarField",
"alias": null,
"name": "description",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "press_release",
"args": null,
"storageKey": null
=======
"kind": "FragmentSpread",
"name": "ShowHeader_show",
"args": null
>>>>>>>
"kind": "FragmentSpread",
"name": "Location_show",
"args": null
<<<<<<<
"storageKey": null
},
=======
"concreteType": "DaySchedule",
"plural": true,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "start_time",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "end_time",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "day_of_week",
"args": null,
"storageKey": null
}
]
}
]
},
{
"kind": "LinkedField",
"alias": null,
"name": "artists",
"storageKey": null,
"args": null,
"concreteType": "Artist",
"plural": true,
"selections": [
v1,
v0,
v2,
>>>>>>>
"storageKey": null
},
<<<<<<<
"kind": "ScalarField",
"alias": null,
"name": "exhibition_period",
"args": null,
"storageKey": null
},
v0
=======
"kind": "LinkedField",
"alias": null,
"name": "partner",
"storageKey": null,
"args": null,
"concreteType": null,
"plural": false,
"selections": [
v1,
{
"kind": "InlineFragment",
"type": "Partner",
"selections": v3
},
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": v3
}
]
},
v1
>>>>>>>
"kind": "LinkedField",
"alias": null,
"name": "partner",
"storageKey": null,
"args": null,
"concreteType": null,
"plural": false,
"selections": [
v2,
{
"kind": "InlineFragment",
"type": "Partner",
"selections": v3
},
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": v3
}
]
},
v2
<<<<<<<
(node as any).hash = 'e71d00a8a48cf33584e2d9ff250d53b5';
=======
(node as any).hash = '3f7c6962f39801055cb6df605c2931bd';
>>>>>>>
(node as any).hash = '70c2bbd6d5d027cd769a67ca7a18b655'; |
<<<<<<<
"name": "_id",
=======
"name": "__id",
>>>>>>>
"name": "name",
<<<<<<<
"name": "name",
"args": null,
"storageKey": null
},
v3 = {
"kind": "ScalarField",
"alias": null,
"name": "__id",
=======
"name": "id",
>>>>>>>
"name": "__id",
"args": null,
"storageKey": null
},
v3 = {
"kind": "ScalarField",
"alias": null,
"name": "id",
<<<<<<<
v1,
v2,
=======
>>>>>>>
v1,
<<<<<<<
v2,
v3
=======
v0,
v1
>>>>>>>
v1,
v2
<<<<<<<
v0,
v1,
=======
v2,
>>>>>>>
v3,
v0,
<<<<<<<
v0,
v3
=======
v2,
v1
>>>>>>>
v3,
v2
<<<<<<<
v3,
=======
v1,
>>>>>>>
v2,
<<<<<<<
v3
=======
v1
>>>>>>>
v2
<<<<<<<
(node as any).hash = '831f9036f08b387f8a27660cebe4b1e3';
=======
(node as any).hash = '83085b22eada72661bd4fee6dfe0efb5';
>>>>>>>
(node as any).hash = '6cf4c1d34a7829446134360e9a11279e'; |
<<<<<<<
import {
OptionsWithUri,
} from 'request';
import {
IBinaryKeyData,
IDataObject,
INodeExecutionData,
} from 'n8n-workflow';
=======
import { OptionsWithUri } from 'request';
import { IDataObject, IPollFunctions } from 'n8n-workflow';
>>>>>>>
import {
OptionsWithUri,
} from 'request';
import {
IBinaryKeyData,
IDataObject,
INodeExecutionData,
IPollFunctions,
} from 'n8n-workflow';
<<<<<<<
export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: object, query?: IDataObject, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
=======
export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, endpoint: string, body: object, query?: IDataObject): Promise<any> { // tslint:disable-line:no-any
>>>>>>>
export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, endpoint: string, body: object, query?: IDataObject, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any |
<<<<<<<
artworksConnection(aggregations: [MERCHANDISABLE_ARTISTS], size: 9, sort: "-decayed_merch") {
merchandisableArtists {
=======
artworksConnection(aggregations: [MERCHANDISABLE_ARTISTS], size: 0, sort: "-decayed_merch") {
merchandisableArtists(size: 9) {
slug
>>>>>>>
artworksConnection(aggregations: [MERCHANDISABLE_ARTISTS], size: 0, sort: "-decayed_merch") {
merchandisableArtists(size: 9) {
<<<<<<<
"id": "2b782cbf9db1a74aca98412a6b46f828",
=======
"id": "85e9a4d21a3ef749506ceb646350eca4",
>>>>>>>
"id": "dc9b6cedf1bdb4040e81a84b24d28dc0", |
<<<<<<<
v9 = {
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
=======
>>>>>>>
<<<<<<<
"id": "58163ca76698b92ff2cfe8e81bc9554b",
=======
"id": "19bdd4e36db0b9fbe147040f057687a1",
>>>>>>>
"id": "9c18685021bdbffd5bbfd149e94c348a",
<<<<<<<
"selections": [
v5,
v2,
v9,
v1
]
=======
"selections": v6
>>>>>>>
"selections": [
v3,
v2,
v6,
v1
]
<<<<<<<
v9,
=======
>>>>>>>
<<<<<<<
"selections": v14
=======
"selections": v6
>>>>>>>
"selections": v14
<<<<<<<
"selections": v14
=======
"selections": v6
>>>>>>>
"selections": v14
<<<<<<<
v9,
=======
{
"kind": "LinkedField",
"alias": null,
"name": "partner",
"storageKey": null,
"args": null,
"concreteType": null,
"plural": false,
"selections": [
v4,
v1,
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": [
v5
]
},
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v5,
v7,
v2,
{
"kind": "LinkedField",
"alias": null,
"name": "profile",
"storageKey": null,
"args": null,
"concreteType": "Profile",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
v10,
v1
]
}
]
}
]
},
>>>>>>>
v6,
<<<<<<<
"selections": v14
=======
"selections": v6
>>>>>>>
"selections": v14 |
<<<<<<<
readonly slug: string | null;
=======
readonly sponsoredContent: ({
readonly introText: string | null;
readonly artGuideUrl: string | null;
}) | null;
>>>>>>>
readonly slug: string | null;
readonly sponsoredContent: ({
readonly introText: string | null;
readonly artGuideUrl: string | null;
}) | null;
<<<<<<<
{
"kind": "ScalarField",
"alias": null,
"name": "slug",
"args": null,
"storageKey": null
},
=======
{
"kind": "LinkedField",
"alias": null,
"name": "sponsoredContent",
"storageKey": null,
"args": null,
"concreteType": "CitySponsoredContent",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "introText",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "artGuideUrl",
"args": null,
"storageKey": null
}
]
},
>>>>>>>
{
"kind": "ScalarField",
"alias": null,
"name": "slug",
"args": null,
"storageKey": null
},
{
"kind": "LinkedField",
"alias": null,
"name": "sponsoredContent",
"storageKey": null,
"args": null,
"concreteType": "CitySponsoredContent",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "introText",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "artGuideUrl",
"args": null,
"storageKey": null
}
]
},
<<<<<<<
(node as any).hash = '777f640b8eb033a54f5de7e398fdbfe7';
=======
(node as any).hash = 'e0f75901030c23581bc6428c3fcad166';
>>>>>>>
(node as any).hash = '6ee441657aa6a50ea5094ff510073dda'; |
<<<<<<<
readonly screenWidth: number;
=======
readonly excludeArtworkIds?: ReadonlyArray<string> | null;
>>>>>>>
readonly excludeArtworkIds?: ReadonlyArray<string> | null;
readonly screenWidth: number;
<<<<<<<
$screenWidth: Int!
=======
$excludeArtworkIds: [String!]
>>>>>>>
$excludeArtworkIds: [String!]
$screenWidth: Int!
<<<<<<<
},
{
"kind": "LocalArgument",
"name": "screenWidth",
"type": "Int!",
"defaultValue": null
=======
},
{
"kind": "LocalArgument",
"name": "excludeArtworkIds",
"type": "[String!]",
"defaultValue": null
>>>>>>>
},
{
"kind": "LocalArgument",
"name": "excludeArtworkIds",
"type": "[String!]",
"defaultValue": null
},
{
"kind": "LocalArgument",
"name": "screenWidth",
"type": "Int!",
"defaultValue": null
<<<<<<<
"name": "url",
=======
"name": "title",
>>>>>>>
"name": "url",
<<<<<<<
"name": "width",
"args": null,
"storageKey": null
},
v4 = {
"kind": "ScalarField",
"alias": null,
"name": "height",
"args": null,
"storageKey": null
},
v5 = {
"kind": "ScalarField",
"alias": null,
"name": "name",
"args": null,
"storageKey": null
},
v6 = {
"kind": "ScalarField",
"alias": null,
=======
"name": "date",
"args": null,
"storageKey": null
},
v4 = {
"kind": "ScalarField",
"alias": null,
"name": "name",
"args": null,
"storageKey": null
},
v5 = {
"kind": "ScalarField",
"alias": null,
"name": "href",
"args": null,
"storageKey": null
},
v6 = {
"kind": "ScalarField",
"alias": null,
>>>>>>>
"name": "width",
"args": null,
"storageKey": null
},
v4 = {
"kind": "ScalarField",
"alias": null,
"name": "height",
"args": null,
"storageKey": null
},
v5 = {
"kind": "ScalarField",
"alias": null,
"name": "title",
"args": null,
"storageKey": null
},
v6 = {
"kind": "ScalarField",
"alias": null,
"name": "date",
"args": null,
"storageKey": null
},
v7 = {
"kind": "ScalarField",
"alias": null,
"name": "name",
"args": null,
"storageKey": null
},
v8 = {
"kind": "ScalarField",
"alias": null,
"name": "href",
"args": null,
"storageKey": null
},
v9 = {
"kind": "ScalarField",
"alias": null,
<<<<<<<
{
"kind": "LinkedField",
"alias": null,
"name": "images",
"storageKey": null,
"args": null,
"concreteType": "Image",
"plural": true,
"selections": [
(v2/*: any*/),
(v3/*: any*/),
(v4/*: any*/),
{
"kind": "LinkedField",
"alias": "thumbnail",
"name": "resized",
"storageKey": null,
"args": [
{
"kind": "Variable",
"name": "width",
"variableName": "screenWidth"
}
],
"concreteType": "ResizedImageUrl",
"plural": false,
"selections": [
(v3/*: any*/),
(v4/*: any*/),
(v2/*: any*/)
]
}
]
},
{
"kind": "ScalarField",
"alias": null,
"name": "title",
"args": null,
"storageKey": null
},
=======
(v2/*: any*/),
>>>>>>>
{
"kind": "LinkedField",
"alias": null,
"name": "images",
"storageKey": null,
"args": null,
"concreteType": "Image",
"plural": true,
"selections": [
(v2/*: any*/),
(v3/*: any*/),
(v4/*: any*/),
{
"kind": "LinkedField",
"alias": "thumbnail",
"name": "resized",
"storageKey": null,
"args": [
{
"kind": "Variable",
"name": "width",
"variableName": "screenWidth"
}
],
"concreteType": "ResizedImageUrl",
"plural": false,
"selections": [
(v3/*: any*/),
(v4/*: any*/),
(v2/*: any*/)
]
}
]
},
(v5/*: any*/),
<<<<<<<
(v5/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "href",
"args": null,
"storageKey": null
},
(v6/*: any*/)
=======
(v4/*: any*/),
(v5/*: any*/),
(v6/*: any*/)
>>>>>>>
(v7/*: any*/),
(v8/*: any*/),
(v9/*: any*/)
<<<<<<<
(v5/*: any*/),
(v6/*: any*/)
=======
(v4/*: any*/),
(v6/*: any*/),
{
"kind": "LinkedField",
"alias": null,
"name": "artworksConnection",
"storageKey": null,
"args": [
(v7/*: any*/),
(v8/*: any*/),
{
"kind": "Literal",
"name": "for_sale",
"value": true
},
(v9/*: any*/)
],
"concreteType": "ArtworkConnection",
"plural": false,
"selections": (v13/*: any*/)
}
]
},
{
"kind": "LinkedField",
"alias": null,
"name": "context",
"storageKey": null,
"args": null,
"concreteType": null,
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "__typename",
"args": null,
"storageKey": null
},
(v6/*: any*/)
]
},
{
"kind": "LinkedField",
"alias": null,
"name": "artist",
"storageKey": null,
"args": null,
"concreteType": "Artist",
"plural": false,
"selections": [
(v4/*: any*/),
{
"kind": "LinkedField",
"alias": null,
"name": "artworks_connection",
"storageKey": null,
"args": [
(v7/*: any*/),
(v8/*: any*/),
(v9/*: any*/)
],
"concreteType": "ArtworkConnection",
"plural": false,
"selections": (v13/*: any*/)
},
(v6/*: any*/)
]
},
{
"kind": "LinkedField",
"alias": null,
"name": "layer",
"storageKey": "layer(id:\"main\")",
"args": [
{
"kind": "Literal",
"name": "id",
"value": "main"
}
],
"concreteType": "ArtworkLayer",
"plural": false,
"selections": [
{
"kind": "LinkedField",
"alias": null,
"name": "artworksConnection",
"storageKey": "artworksConnection(first:8)",
"args": [
(v8/*: any*/)
],
"concreteType": "ArtworkConnection",
"plural": false,
"selections": (v13/*: any*/)
},
(v6/*: any*/)
>>>>>>>
(v7/*: any*/),
(v9/*: any*/),
{
"kind": "LinkedField",
"alias": null,
"name": "artworksConnection",
"storageKey": null,
"args": [
(v10/*: any*/),
(v11/*: any*/),
{
"kind": "Literal",
"name": "for_sale",
"value": true
},
(v12/*: any*/)
],
"concreteType": "ArtworkConnection",
"plural": false,
"selections": (v16/*: any*/)
}
]
},
{
"kind": "LinkedField",
"alias": null,
"name": "context",
"storageKey": null,
"args": null,
"concreteType": null,
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "__typename",
"args": null,
"storageKey": null
},
(v9/*: any*/)
]
},
{
"kind": "LinkedField",
"alias": null,
"name": "artist",
"storageKey": null,
"args": null,
"concreteType": "Artist",
"plural": false,
"selections": [
(v7/*: any*/),
{
"kind": "LinkedField",
"alias": null,
"name": "artworks_connection",
"storageKey": null,
"args": [
(v10/*: any*/),
(v11/*: any*/),
(v12/*: any*/)
],
"concreteType": "ArtworkConnection",
"plural": false,
"selections": (v16/*: any*/)
},
(v9/*: any*/)
]
},
{
"kind": "LinkedField",
"alias": null,
"name": "layer",
"storageKey": "layer(id:\"main\")",
"args": [
{
"kind": "Literal",
"name": "id",
"value": "main"
}
],
"concreteType": "ArtworkLayer",
"plural": false,
"selections": [
{
"kind": "LinkedField",
"alias": null,
"name": "artworksConnection",
"storageKey": "artworksConnection(first:8)",
"args": [
(v11/*: any*/)
],
"concreteType": "ArtworkConnection",
"plural": false,
"selections": (v16/*: any*/)
},
(v9/*: any*/)
<<<<<<<
"id": "fd5f54879966029cf0315ac313987f7d",
=======
"id": "d6e9107372a0f3fedca7359e70b5ed51",
>>>>>>>
"id": "05eceb14aaeb83d63d262941032e4c63",
<<<<<<<
(node as any).hash = '90954f9389d18c988bf5aa9ae9a95078';
=======
(node as any).hash = '8c594e52f5c996aecbaac4b08d7da014';
>>>>>>>
(node as any).hash = '2be034181818db394d253f760b167d76'; |
<<<<<<<
v10 = {
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
=======
>>>>>>>
<<<<<<<
"id": "5e83cc35ca7a008f6ee6531f3cbd3184",
=======
"id": "92e059b0a296a9a21b0bb6bb190fcc87",
>>>>>>>
"id": "9653e7abd47a758b329453caa2239a12",
<<<<<<<
"selections": [
v6,
v3,
v10,
v2
]
=======
"selections": v7
>>>>>>>
"selections": [
v4,
v3,
v7,
v2
]
<<<<<<<
v10,
=======
>>>>>>>
<<<<<<<
"selections": v15
=======
"selections": v7
>>>>>>>
"selections": v15
<<<<<<<
"selections": v15
=======
"selections": v7
>>>>>>>
"selections": v15
<<<<<<<
v10,
=======
{
"kind": "LinkedField",
"alias": null,
"name": "partner",
"storageKey": null,
"args": null,
"concreteType": null,
"plural": false,
"selections": [
v5,
v2,
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": [
v6
]
},
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v6,
v8,
v3,
{
"kind": "LinkedField",
"alias": null,
"name": "profile",
"storageKey": null,
"args": null,
"concreteType": "Profile",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
v11,
v2
]
}
]
}
]
},
>>>>>>>
v7,
<<<<<<<
"selections": v15
=======
"selections": v7
>>>>>>>
"selections": v15 |
<<<<<<<
v11 = {
=======
v11 = [
v4
],
v12 = {
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": v11
},
v13 = {
>>>>>>>
v11 = {
<<<<<<<
v14 = [
v3,
=======
v16 = [
v4,
>>>>>>>
v14 = [
v4,
<<<<<<<
"id": "a9b7e86173fa66a3b06e74af143ac1ab",
=======
"id": "d22b49acbafc82cc25fb7a4936e0f196",
>>>>>>>
"id": "66fcc4a8a64d192d7aa235a28c789afa",
<<<<<<<
v3,
v5,
v11,
=======
v4,
v6,
v13,
>>>>>>>
v4,
v6,
v11,
<<<<<<<
v3,
v11,
v5,
v2,
=======
v4,
v13,
v6,
v3,
>>>>>>>
v4,
v11,
v6,
v3,
<<<<<<<
v3,
v11,
v5,
v2,
=======
v4,
v13,
v6,
v3,
>>>>>>>
v4,
v11,
v6,
v3, |
<<<<<<<
"name": "name",
=======
"name": "id",
>>>>>>>
"name": "name",
<<<<<<<
"name": "address",
"args": null,
"storageKey": null
},
v7 = {
"kind": "ScalarField",
"alias": null,
"name": "address_2",
"args": null,
"storageKey": null
},
v8 = {
"kind": "ScalarField",
"alias": null,
"name": "state",
"args": null,
"storageKey": null
},
v9 = {
"kind": "ScalarField",
"alias": null,
"name": "postal_code",
=======
"name": "display",
>>>>>>>
"name": "display",
<<<<<<<
v14 = [
v4
=======
v11 = [
v9
>>>>>>>
v11 = [
v4
<<<<<<<
"id": "01aeccccf359c805bc3db1c6551a536d",
=======
"id": "298f53b0dc54e978cda4726b7075bfb0",
>>>>>>>
"id": "a7f8572e537ca8cbdfec4276b18440a7",
<<<<<<<
v3,
v6,
v7,
v5,
v8,
v9,
v2,
v10,
=======
v4,
{
"kind": "ScalarField",
"alias": null,
"name": "address",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "address_2",
"args": null,
"storageKey": null
},
v5,
{
"kind": "ScalarField",
"alias": null,
"name": "state",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "postal_code",
"args": null,
"storageKey": null
},
v2,
v6,
>>>>>>>
v3,
{
"kind": "ScalarField",
"alias": null,
"name": "address",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "address_2",
"args": null,
"storageKey": null
},
v5,
{
"kind": "ScalarField",
"alias": null,
"name": "state",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "postal_code",
"args": null,
"storageKey": null
},
v2,
v6,
<<<<<<<
=======
v12,
>>>>>>>
<<<<<<<
v4,
=======
v9,
>>>>>>>
v4,
<<<<<<<
v12,
=======
v8,
>>>>>>>
v8,
<<<<<<<
{
"kind": "ScalarField",
"alias": null,
"name": "is_biddable",
"args": null,
"storageKey": null
},
=======
v4,
>>>>>>>
{
"kind": "ScalarField",
"alias": null,
"name": "is_biddable",
"args": null,
"storageKey": null
},
<<<<<<<
v3,
v4,
=======
v4,
v9,
>>>>>>>
v3,
v4, |
<<<<<<<
(v4/*: any*/),
(v5/*: any*/),
(v18/*: any*/),
(v19/*: any*/),
(v20/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "is_inquireable",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "availability",
"args": null,
"storageKey": null
},
=======
>>>>>>>
<<<<<<<
(v13/*: any*/),
(v21/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "ctaTitle",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "ctaHref",
"args": null,
"storageKey": null
},
=======
>>>>>>>
<<<<<<<
(v21/*: any*/),
(v22/*: any*/),
=======
(v19/*: any*/),
(v20/*: any*/),
>>>>>>>
(v18/*: any*/),
(v19/*: any*/),
<<<<<<<
(v20/*: any*/),
(v18/*: any*/),
(v19/*: any*/),
=======
(v21/*: any*/),
(v22/*: any*/),
(v23/*: any*/),
>>>>>>>
(v20/*: any*/),
(v21/*: any*/),
(v22/*: any*/),
<<<<<<<
(v21/*: any*/),
=======
(v19/*: any*/),
>>>>>>>
(v18/*: any*/),
<<<<<<<
(v22/*: any*/),
=======
(v20/*: any*/),
>>>>>>>
(v19/*: any*/),
<<<<<<<
"id": "b88d4cd22f3e4464912039789130a5d1",
=======
"id": "b6e71360f571068cbf8bd6b7547ae633",
>>>>>>>
"id": "bd1bfeab968c4584215616e53f827746", |
<<<<<<<
import { ConcreteFragment } from "relay-runtime";
import { FollowArtistButton_artist$ref } from "./FollowArtistButton_artist.graphql";
=======
import { ReaderFragment } from "relay-runtime";
>>>>>>>
import { ReaderFragment } from "relay-runtime";
import { FollowArtistButton_artist$ref } from "./FollowArtistButton_artist.graphql";
<<<<<<<
readonly " $fragmentRefs": FollowArtistButton_artist$ref;
}) | null> | null;
readonly dimensions: ({
=======
} | null> | null;
readonly dimensions: {
>>>>>>>
readonly " $fragmentRefs": FollowArtistButton_artist$ref;
} | null> | null;
readonly dimensions: {
<<<<<<<
},
{
"kind": "FragmentSpread",
"name": "FollowArtistButton_artist",
"args": null
},
v0
=======
}
>>>>>>>
},
{
"kind": "FragmentSpread",
"name": "FollowArtistButton_artist",
"args": null
}
<<<<<<<
})();
(node as any).hash = 'c3bac2572caaeabbde7a8a1855295fe5';
=======
(node as any).hash = '936ac7c973aa593b37c8fdc05ab1a23e';
>>>>>>>
(node as any).hash = 'c3bac2572caaeabbde7a8a1855295fe5'; |
<<<<<<<
"name": "formattedStartDateTime",
=======
"name": "isAuction",
>>>>>>>
"name": "isAuction",
<<<<<<<
"name": "isLiveOpen",
=======
"name": "isLiveOpen",
"args": null,
"storageKey": null
},
v13 = {
"kind": "ScalarField",
"alias": null,
"name": "formattedStartDateTime",
>>>>>>>
"name": "formattedStartDateTime",
"args": null,
"storageKey": null
},
v13 = {
"kind": "ScalarField",
"alias": null,
"name": "isLiveOpen",
<<<<<<<
v23 = [
{
"kind": "ScalarField",
"alias": null,
"name": "display",
"args": null,
"storageKey": null
}
],
v24 = [
=======
v24 = {
"kind": "ScalarField",
"alias": null,
"name": "display",
"args": null,
"storageKey": null
},
v25 = [
(v24/*: any*/)
],
v26 = [
>>>>>>>
v24 = [
{
"kind": "ScalarField",
"alias": null,
"name": "display",
"args": null,
"storageKey": null
}
],
v25 = [
<<<<<<<
v25 = {
=======
v27 = {
"kind": "ScalarField",
"alias": null,
"name": "cents",
"args": null,
"storageKey": null
},
v28 = {
>>>>>>>
v26 = {
<<<<<<<
v26 = {
=======
v29 = {
>>>>>>>
v27 = {
<<<<<<<
=======
(v5/*: any*/),
{
"kind": "LinkedField",
"alias": null,
"name": "registrationStatus",
"storageKey": null,
"args": null,
"concreteType": "Bidder",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "qualifiedForBidding",
"args": null,
"storageKey": null
},
(v3/*: any*/)
]
},
{
"kind": "ScalarField",
"alias": null,
"name": "isPreview",
"args": null,
"storageKey": null
},
(v12/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "isRegistrationClosed",
"args": null,
"storageKey": null
},
>>>>>>>
<<<<<<<
(v11/*: any*/),
=======
(v13/*: any*/),
>>>>>>>
(v12/*: any*/),
<<<<<<<
(v6/*: any*/),
(v11/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "isAuction",
"args": null,
"storageKey": null
},
(v17/*: any*/)
=======
(v6/*: any*/),
(v13/*: any*/),
(v11/*: any*/),
(v18/*: any*/)
>>>>>>>
(v11/*: any*/),
(v18/*: any*/)
<<<<<<<
"selections": (v23/*: any*/)
=======
"selections": (v25/*: any*/)
>>>>>>>
"selections": (v24/*: any*/)
<<<<<<<
"selections": (v24/*: any*/)
=======
"selections": (v26/*: any*/)
>>>>>>>
"selections": (v25/*: any*/)
<<<<<<<
"selections": (v24/*: any*/)
=======
"selections": (v26/*: any*/)
>>>>>>>
"selections": (v25/*: any*/)
<<<<<<<
=======
"kind": "LinkedField",
"alias": null,
"name": "increments",
"storageKey": null,
"args": null,
"concreteType": "BidIncrementsFormatted",
"plural": true,
"selections": [
(v27/*: any*/)
]
},
{
>>>>>>>
<<<<<<<
"selections": (v23/*: any*/)
=======
"selections": (v25/*: any*/)
>>>>>>>
"selections": (v24/*: any*/)
<<<<<<<
(v25/*: any*/),
=======
(v28/*: any*/),
>>>>>>>
(v26/*: any*/),
<<<<<<<
(v26/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "isForSale",
"args": null,
"storageKey": null
},
=======
(v29/*: any*/),
>>>>>>>
(v27/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "isForSale",
"args": null,
"storageKey": null
},
<<<<<<<
(v26/*: any*/),
=======
(v29/*: any*/),
>>>>>>>
(v27/*: any*/),
<<<<<<<
(v25/*: any*/)
=======
(v28/*: any*/)
>>>>>>>
(v26/*: any*/)
<<<<<<<
"storageKey": null
=======
"concreteType": "BidderPositionMaxBid",
"plural": false,
"selections": [
(v27/*: any*/),
(v24/*: any*/)
]
>>>>>>>
"storageKey": null
<<<<<<<
"id": "cf09bca10fd7e8a3c305db7d5a574541",
=======
"id": "285c02307b67c6800e599d431f541781",
>>>>>>>
"id": "59cfe40abb6f4e8265eea3fa568be65a", |
<<<<<<<
v8 = [
=======
v5 = [
>>>>>>>
v7 = {
"kind": "ScalarField",
"alias": null,
"name": "is_followed",
"args": null,
"storageKey": null
},
v8 = {
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
v9 = [
<<<<<<<
v9 = {
=======
v6 = {
>>>>>>>
v10 = {
<<<<<<<
"id": "8371bca057d6ecc1199983479569b8fe",
=======
"id": "2f135b8c4bfb1a9f16decc69180124b6",
>>>>>>>
"id": "dc0a3968dd7028d15018c7b568a46604",
<<<<<<<
"args": v8,
=======
"args": v5,
>>>>>>>
"args": v9,
<<<<<<<
v9,
=======
v6,
>>>>>>>
v10,
<<<<<<<
"selections": [
v7,
v5,
v6,
v2
]
=======
"selections": v7
>>>>>>>
"selections": [
v6,
v3,
v8,
v2
]
<<<<<<<
"args": v8,
=======
"args": v5,
>>>>>>>
"args": v9,
<<<<<<<
v7,
v10,
v5,
v6,
=======
v4,
v8,
>>>>>>>
v6,
v4,
v3,
v8,
<<<<<<<
{
"kind": "LinkedField",
"alias": null,
"name": "partner",
"storageKey": null,
"args": null,
"concreteType": null,
"plural": false,
"selections": [
v9,
v2,
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": [
v7
]
},
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v7,
v10,
v5,
v6,
{
"kind": "LinkedField",
"alias": null,
"name": "profile",
"storageKey": null,
"args": null,
"concreteType": "Profile",
"plural": false,
"selections": [
v6,
v11,
v2
]
}
]
}
]
},
v5,
=======
v3,
>>>>>>>
{
"kind": "LinkedField",
"alias": null,
"name": "partner",
"storageKey": null,
"args": null,
"concreteType": null,
"plural": false,
"selections": [
v10,
v2,
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": [
v6
]
},
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v6,
v4,
v3,
v8,
{
"kind": "LinkedField",
"alias": null,
"name": "profile",
"storageKey": null,
"args": null,
"concreteType": "Profile",
"plural": false,
"selections": [
v8,
v7,
v2
]
}
]
}
]
},
v3,
<<<<<<<
"selections": v15
=======
"selections": v7
>>>>>>>
"selections": v15
<<<<<<<
v6,
=======
{
"kind": "LinkedField",
"alias": null,
"name": "partner",
"storageKey": null,
"args": null,
"concreteType": null,
"plural": false,
"selections": [
v6,
v2,
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": [
v4
]
},
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v4,
v8,
v3,
{
"kind": "LinkedField",
"alias": null,
"name": "profile",
"storageKey": null,
"args": null,
"concreteType": "Profile",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
v11,
v2
]
}
]
}
]
},
>>>>>>>
v8,
<<<<<<<
"selections": v15
=======
"selections": v7
>>>>>>>
"selections": v15
<<<<<<<
v9
=======
v6
>>>>>>>
v10 |
<<<<<<<
v27 = [
{
"kind": "ScalarField",
"alias": null,
"name": "cents",
"args": null,
"storageKey": null
},
(v24/*: any*/)
],
v28 = {
=======
v26 = {
"kind": "ScalarField",
"alias": null,
"name": "cents",
"args": null,
"storageKey": null
},
v27 = {
>>>>>>>
v27 = {
"kind": "ScalarField",
"alias": null,
"name": "cents",
"args": null,
"storageKey": null
},
v28 = {
<<<<<<<
"name": "isAcquireable",
"args": null,
"storageKey": null
},
v30 = {
"kind": "ScalarField",
"alias": null,
"name": "isOfferable",
"args": null,
"storageKey": null
},
v31 = {
"kind": "ScalarField",
"alias": null,
=======
>>>>>>>
<<<<<<<
{
"kind": "ScalarField",
"alias": null,
"name": "isOpen",
"args": null,
"storageKey": null
},
(v11/*: any*/),
=======
(v10/*: any*/),
>>>>>>>
(v11/*: any*/),
<<<<<<<
{
"kind": "ScalarField",
"alias": null,
"name": "liveStartAt",
"args": null,
"storageKey": null
},
(v12/*: any*/),
=======
(v11/*: any*/),
(v7/*: any*/),
>>>>>>>
(v12/*: any*/),
(v7/*: any*/),
<<<<<<<
(v6/*: any*/),
(v15/*: any*/),
(v17/*: any*/)
=======
(v5/*: any*/),
(v14/*: any*/),
(v16/*: any*/)
>>>>>>>
(v5/*: any*/),
(v15/*: any*/),
(v17/*: any*/)
<<<<<<<
=======
(v10/*: any*/),
(v5/*: any*/),
>>>>>>>
<<<<<<<
(v6/*: any*/),
(v15/*: any*/),
=======
(v5/*: any*/),
(v14/*: any*/),
>>>>>>>
(v5/*: any*/),
(v15/*: any*/),
<<<<<<<
"concreteType": "Image",
"plural": false,
"selections": (v16/*: any*/)
}
=======
"storageKey": null
},
(v17/*: any*/)
>>>>>>>
"storageKey": null
},
(v18/*: any*/)
<<<<<<<
{
"kind": "ScalarField",
"alias": "is_in_auction",
"name": "isInAuction",
"args": null,
"storageKey": null
},
=======
(v20/*: any*/),
>>>>>>>
<<<<<<<
(v23/*: any*/),
=======
(v4/*: any*/),
>>>>>>>
(v23/*: any*/),
(v4/*: any*/),
<<<<<<<
{
"kind": "LinkedField",
"alias": null,
"name": "shows",
"storageKey": "shows(size:1)",
"args": [
{
"kind": "Literal",
"name": "size",
"value": 1
}
],
"concreteType": "Show",
"plural": true,
"selections": [
(v2/*: any*/),
(v3/*: any*/),
(v6/*: any*/),
(v4/*: any*/),
(v5/*: any*/),
(v15/*: any*/),
(v8/*: any*/),
(v18/*: any*/)
]
},
(v19/*: any*/),
(v6/*: any*/),
=======
(v18/*: any*/),
(v5/*: any*/),
>>>>>>>
(v19/*: any*/),
(v5/*: any*/),
<<<<<<<
"selections": (v27/*: any*/)
},
{
"kind": "ScalarField",
"alias": null,
"name": "isWithReserve",
"args": null,
"storageKey": null
=======
"selections": [
(v26/*: any*/)
]
>>>>>>>
"selections": [
(v27/*: any*/)
]
<<<<<<<
"kind": "LinkedField",
"alias": null,
"name": "editionSets",
"storageKey": null,
"args": null,
"concreteType": "EditionSet",
"plural": true,
"selections": [
(v29/*: any*/),
(v30/*: any*/),
(v31/*: any*/),
(v2/*: any*/),
(v5/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "editionOf",
"args": null,
"storageKey": null
},
(v28/*: any*/)
]
},
(v31/*: any*/),
{
=======
>>>>>>>
<<<<<<<
(v29/*: any*/),
(v30/*: any*/),
=======
>>>>>>>
<<<<<<<
"selections": (v27/*: any*/)
=======
"selections": [
(v26/*: any*/),
(v23/*: any*/)
]
>>>>>>>
"selections": [
(v27/*: any*/),
(v24/*: any*/)
]
<<<<<<<
"id": "0cca7b8ec8579a2e1d8af01dda4be763",
=======
"id": "f3bb66d7266c14e7384e4224967303e2",
>>>>>>>
"id": "88f73000b32aee5f64a1f583b0c39028", |
<<<<<<<
v13 = [
v11
],
=======
v13 = [
v3
],
>>>>>>>
v13 = [
v11
],
<<<<<<<
"kind": "InlineFragment",
"type": "Partner",
"selections": v13
},
v15 = {
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": v13
},
v16 = {
=======
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": v13
},
v15 = {
>>>>>>>
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": v13
},
v15 = {
<<<<<<<
v17 = [
v8
],
v18 = [
v11,
=======
v16 = [
v9
],
v17 = [
v3,
>>>>>>>
v16 = [
v8
],
v17 = [
v11,
<<<<<<<
"id": "1fdefa8f1cf3587fdf8376e7ffabb4e7",
=======
"id": "635ea3de35c80ed2a0bf6107eeca3870",
>>>>>>>
"id": "d1f243ed8534cce91142d890ff7bfef1",
<<<<<<<
v16,
=======
v15,
>>>>>>>
v15,
<<<<<<<
"selections": v17
=======
"selections": v16
>>>>>>>
"selections": v16
<<<<<<<
"selections": v17
=======
"selections": v16
>>>>>>>
"selections": v16
<<<<<<<
v16,
=======
v15,
>>>>>>>
v15,
<<<<<<<
"selections": v18
=======
"selections": v17
>>>>>>>
"selections": v17
<<<<<<<
"selections": v18
=======
"selections": v17
>>>>>>>
"selections": v17
<<<<<<<
}
=======
},
{
"kind": "LinkedField",
"alias": null,
"name": "partner",
"storageKey": null,
"args": null,
"concreteType": null,
"plural": false,
"selections": [
v12,
v1,
v14,
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v3,
{
"kind": "ScalarField",
"alias": null,
"name": "type",
"args": null,
"storageKey": null
}
]
}
]
}
>>>>>>>
} |
<<<<<<<
"id": "c6e2f0fde0845574f2a0cf64e01166a3",
=======
"id": "b68718283d6288359bbbfd442a4d078c",
>>>>>>>
"id": "cc9b91e8a668770dba92719ac854b3da",
<<<<<<<
v3,
v1,
{
"kind": "LinkedField",
"alias": null,
"name": "counts",
"storageKey": null,
"args": null,
"concreteType": "FairCounts",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "partners",
"args": null,
"storageKey": null
}
]
},
v6,
=======
>>>>>>> |
<<<<<<<
v5 = {
=======
v12 = {
>>>>>>>
v5 = {
<<<<<<<
v6 = {
=======
v13 = {
>>>>>>>
v6 = {
<<<<<<<
v7 = {
=======
v14 = {
>>>>>>>
v7 = {
<<<<<<<
v8 = {
=======
v15 = {
>>>>>>>
v8 = {
<<<<<<<
v9 = {
"kind": "ScalarField",
"alias": null,
"name": "id",
"args": null,
"storageKey": null
},
v10 = {
=======
v16 = {
>>>>>>>
v9 = {
"kind": "ScalarField",
"alias": null,
"name": "id",
"args": null,
"storageKey": null
},
v10 = {
<<<<<<<
v11 = {
=======
v17 = {
>>>>>>>
v11 = {
<<<<<<<
v12 = {
=======
v18 = {
>>>>>>>
v12 = {
<<<<<<<
v13 = {
=======
v19 = {
>>>>>>>
v13 = {
<<<<<<<
v12,
=======
v18,
>>>>>>>
v12,
<<<<<<<
"selections": v15
=======
"selections": v20
>>>>>>>
"selections": v15
<<<<<<<
"selections": v15
=======
"selections": v20
>>>>>>>
"selections": v15
<<<<<<<
v12,
=======
v18,
>>>>>>>
v12,
<<<<<<<
v17 = {
"kind": "ScalarField",
"alias": null,
"name": "name",
"args": null,
"storageKey": null
},
v18 = [
v17,
v2
],
v19 = {
=======
v22 = {
>>>>>>>
v17 = {
"kind": "ScalarField",
"alias": null,
"name": "name",
"args": null,
"storageKey": null
},
v18 = [
v17,
v2
],
v19 = {
<<<<<<<
v20 = {
=======
v23 = {
>>>>>>>
v20 = {
<<<<<<<
v23 = {
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
=======
>>>>>>>
v23 = {
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
<<<<<<<
"id": "52cde662fdadcb2b3be2fce4f58a22bb",
=======
"id": "6354fb44a328a12b9f3272581260f8d3",
>>>>>>>
"id": "e6d0ff9400db5ce4aa3f75991ff8ced7",
<<<<<<<
"selections": v18
=======
"selections": [
v5,
v2,
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": [
v3,
v6
]
},
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v3,
v6,
v7,
{
"kind": "LinkedField",
"alias": null,
"name": "profile",
"storageKey": null,
"args": null,
"concreteType": "Profile",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
v8,
v2
]
}
]
}
]
>>>>>>>
"selections": v18
<<<<<<<
v14,
=======
v9,
>>>>>>>
v14,
<<<<<<<
=======
v10,
v2,
v11,
v12,
v13,
v14,
v15,
v6,
v16,
v17,
v19,
v21,
>>>>>>>
<<<<<<<
v2,
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": [
v17,
v9
]
},
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v17,
v9,
v21
]
}
=======
v23,
v7
>>>>>>>
v2,
{
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": [
v17,
v9
]
},
{
"kind": "InlineFragment",
"type": "Partner",
"selections": [
v17,
v9,
v21,
{
"kind": "LinkedField",
"alias": null,
"name": "profile",
"storageKey": null,
"args": null,
"concreteType": "Profile",
"plural": false,
"selections": [
v23,
v24,
v2
]
}
]
}
<<<<<<<
v23,
v17,
=======
v3,
v8,
>>>>>>>
v23,
v17,
<<<<<<<
v23,
v9,
v17,
=======
v3,
v8,
>>>>>>>
v23,
v9,
v17,
<<<<<<<
v10,
v9,
v4,
v5,
v6,
v7,
v8,
v3,
=======
v16,
v6,
v11,
v12,
v13,
v14,
v15,
v10,
>>>>>>>
v10,
v9,
v4,
v5,
v6,
v7,
v8,
v3,
<<<<<<<
v11,
v13,
v16,
v19,
v20,
=======
v17,
v19,
>>>>>>>
v11,
v13,
v16,
v19,
v20,
<<<<<<<
v22
=======
v22,
v23,
v7,
v5
>>>>>>>
v22 |
<<<<<<<
readonly fairs: ReadonlyArray<({
readonly id: string;
readonly name: string | null;
readonly counts: ({
readonly partners: any | null;
}) | null;
readonly location: ({
readonly coordinates: ({
readonly lat: number | null;
readonly lng: number | null;
}) | null;
}) | null;
readonly image: ({
readonly image_url: string | null;
readonly aspect_ratio: number;
readonly url: string | null;
}) | null;
readonly profile: ({
readonly icon: ({
readonly id: string | null;
readonly href: string | null;
readonly height: number | null;
readonly width: number | null;
readonly url: string | null;
=======
readonly fairs: ({
readonly edges: ReadonlyArray<({
readonly node: ({
readonly id: string;
readonly name: string | null;
readonly location: ({
readonly coordinates: ({
readonly lat: number | null;
readonly lng: number | null;
}) | null;
}) | null;
readonly image: ({
readonly image_url: string | null;
readonly aspect_ratio: number;
readonly url: string | null;
}) | null;
readonly profile: ({
readonly icon: ({
readonly id: string | null;
readonly href: string | null;
readonly height: number | null;
readonly width: number | null;
readonly url: string | null;
}) | null;
readonly __id: string;
readonly id: string;
readonly name: string | null;
}) | null;
readonly start_at: string | null;
readonly end_at: string | null;
>>>>>>>
readonly fairs: ({
readonly edges: ReadonlyArray<({
readonly node: ({
readonly id: string;
readonly name: string | null;
readonly counts: ({
readonly partners: any | null;
}) | null;
readonly location: ({
readonly coordinates: ({
readonly lat: number | null;
readonly lng: number | null;
}) | null;
}) | null;
readonly image: ({
readonly image_url: string | null;
readonly aspect_ratio: number;
readonly url: string | null;
}) | null;
readonly profile: ({
readonly icon: ({
readonly id: string | null;
readonly href: string | null;
readonly height: number | null;
readonly width: number | null;
readonly url: string | null;
}) | null;
readonly __id: string;
readonly id: string;
readonly name: string | null;
}) | null;
readonly start_at: string | null;
readonly end_at: string | null;
<<<<<<<
v2,
v0,
{
"kind": "LinkedField",
"alias": null,
"name": "counts",
"storageKey": null,
"args": null,
"concreteType": "FairCounts",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "partners",
"args": null,
"storageKey": null
}
]
},
v5,
{
"kind": "LinkedField",
"alias": null,
"name": "image",
"storageKey": null,
"args": null,
"concreteType": "Image",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "image_url",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "aspect_ratio",
"args": null,
"storageKey": null
},
v3
]
},
=======
>>>>>>>
<<<<<<<
(node as any).hash = '2c17f566fca207edec20d2557f1583f1';
=======
(node as any).hash = '88c4f000f907732cab4a7f112069d8da';
>>>>>>>
(node as any).hash = '328df30386b033ab3eafaa2de4a9f296'; |
<<<<<<<
"kind": "ScalarField",
"alias": null,
"name": "internalID",
"args": null,
"storageKey": null
},
v8 = {
"kind": "ScalarField",
"alias": null,
"name": "gravityID",
"args": null,
"storageKey": null
},
v9 = {
=======
"kind": "ScalarField",
"alias": null,
"name": "id",
"args": null,
"storageKey": null
},
v8 = {
>>>>>>>
"kind": "ScalarField",
"alias": null,
"name": "id",
"args": null,
"storageKey": null
},
v8 = {
"kind": "ScalarField",
"alias": null,
"name": "internalID",
"args": null,
"storageKey": null
},
v9 = {
<<<<<<<
v10 = {
=======
v9 = {
>>>>>>>
v10 = {
<<<<<<<
v11 = {
=======
v10 = {
>>>>>>>
v11 = {
<<<<<<<
v12 = {
=======
v11 = {
>>>>>>>
v12 = {
<<<<<<<
v13 = [
=======
v12 = [
>>>>>>>
v13 = [
<<<<<<<
v14 = [
=======
v13 = [
>>>>>>>
v14 = [
<<<<<<<
v15 = [
=======
v14 = [
>>>>>>>
v15 = [
<<<<<<<
(v8/*: any*/),
{
=======
{
>>>>>>>
{
<<<<<<<
(v12/*: any*/),
=======
(v11/*: any*/),
>>>>>>>
(v12/*: any*/),
<<<<<<<
"selections": (v13/*: any*/)
=======
"selections": (v12/*: any*/)
>>>>>>>
"selections": (v13/*: any*/)
<<<<<<<
"selections": (v13/*: any*/)
=======
"selections": (v12/*: any*/)
>>>>>>>
"selections": (v13/*: any*/)
<<<<<<<
(v12/*: any*/),
(v6/*: any*/)
=======
(v11/*: any*/),
(v7/*: any*/)
>>>>>>>
(v12/*: any*/),
(v7/*: any*/)
<<<<<<<
(v6/*: any*/),
(v7/*: any*/),
(v8/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "is_followed",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "nationality",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "birthday",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "deathday",
"args": null,
"storageKey": null
},
{
"kind": "LinkedField",
"alias": null,
"name": "image",
"storageKey": null,
"args": null,
"concreteType": "Image",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "url",
"args": null,
"storageKey": null
}
]
}
=======
(v6/*: any*/),
(v7/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "is_followed",
"args": null,
"storageKey": null
}
>>>>>>>
(v6/*: any*/),
(v7/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "is_followed",
"args": null,
"storageKey": null
},
(v8/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "nationality",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "birthday",
"args": null,
"storageKey": null
},
{
"kind": "ScalarField",
"alias": null,
"name": "deathday",
"args": null,
"storageKey": null
},
{
"kind": "LinkedField",
"alias": null,
"name": "image",
"storageKey": null,
"args": null,
"concreteType": "Image",
"plural": false,
"selections": [
{
"kind": "ScalarField",
"alias": null,
"name": "url",
"args": null,
"storageKey": null
}
]
}
<<<<<<<
(v6/*: any*/),
(v7/*: any*/),
=======
(v7/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "internalID",
"args": null,
"storageKey": null
},
>>>>>>>
(v7/*: any*/),
(v8/*: any*/),
<<<<<<<
(v9/*: any*/),
(v10/*: any*/),
=======
(v8/*: any*/),
(v9/*: any*/),
>>>>>>>
(v9/*: any*/),
(v10/*: any*/),
<<<<<<<
"id": "8c60faa269069172f1218eea53d6d1a7",
=======
"id": "fac7c092c9e0ab601ccf55379ea1d734",
>>>>>>>
"id": "aa83457af5ce0160d6397f1b92e4ca1c", |
<<<<<<<
summary(ns, metric) {
let res = 0;
let postfix = null;
if (ns.pods) {
res = ns.pods.reduce((prevValue, pod) => {
if (pod.metrics[metric] && pod.metrics[metric] !== 'N-A') {
const match = pod.metrics[metric].match(/([a-zA-Z]+)$/)
let value = 0
if (match[1]) {
switch (match[1]) {
case('m'):
value = parseInt(pod.metrics[metric], 10);
postfix = 'm';
break;
case('MiB'):
value = parseFloat(pod.metrics[metric]);
if (postfix === 'GiB') {
value = value / 1024;
} else {
postfix = 'MiB';
}
break;
case('GiB'):
value = parseFloat(pod.metrics[metric]);
if (postfix === 'MiB') {
prevValue = prevValue / 1024
}
postfix = 'GiB';
break;
}
}
return prevValue + value
}
return prevValue
}, 0)
}
if (res !== 0) {
switch (postfix) {
case "m":
return res + postfix;
case "GiB":
return Math.round(res * 1000) / 1000 + ' ' + postfix;
case "MiB":
if(res / 1024 > 1){
return Math.round((res / 1024) * 1000) / 1000 + ' GiB';
}
return Math.round(res * 1000) / 1000 + ' ' + postfix;
}
}
return 'N-A'
}
__showAll() {
=======
nodeClick(event, node) {
if (event.ctrlKey) {
if(node.open) {
event.preventDefault();
}
store.delete('nodeStore');
let nodeStore = [];
this.nodesMap.map(ns => {
ns.open = node.name === ns.name;
nodeStore.push({name: ns.name, open: ns.open});
});
store.setObject('nodeStore', nodeStore);
} else {
node.toggle();
}
}
__showAll(){
>>>>>>>
summary(ns, metric) {
let res = 0;
let postfix = null;
if (ns.pods) {
res = ns.pods.reduce((prevValue, pod) => {
if (pod.metrics[metric] && pod.metrics[metric] !== 'N-A') {
const match = pod.metrics[metric].match(/([a-zA-Z]+)$/)
let value = 0
if (match[1]) {
switch (match[1]) {
case('m'):
value = parseInt(pod.metrics[metric], 10);
postfix = 'm';
break;
case('MiB'):
value = parseFloat(pod.metrics[metric]);
if (postfix === 'GiB') {
value = value / 1024;
} else {
postfix = 'MiB';
}
break;
case('GiB'):
value = parseFloat(pod.metrics[metric]);
if (postfix === 'MiB') {
prevValue = prevValue / 1024
}
postfix = 'GiB';
break;
}
}
return prevValue + value
}
return prevValue
}, 0)
}
if (res !== 0) {
switch (postfix) {
case "m":
return res + postfix;
case "GiB":
return Math.round(res * 1000) / 1000 + ' ' + postfix;
case "MiB":
if(res / 1024 > 1){
return Math.round((res / 1024) * 1000) / 1000 + ' GiB';
}
return Math.round(res * 1000) / 1000 + ' ' + postfix;
}
}
return 'N-A'
}
nodeClick(event, node) {
if (event.ctrlKey) {
if(node.open) {
event.preventDefault();
}
store.delete('nodeStore');
let nodeStore = [];
this.nodesMap.map(ns => {
ns.open = node.name === ns.name;
nodeStore.push({name: ns.name, open: ns.open});
});
store.setObject('nodeStore', nodeStore);
} else {
node.toggle();
}
}
__showAll(){ |
<<<<<<<
namespaceClick(event, namespace) {
if (event.ctrlKey) {
if(namespace.open) {
event.preventDefault();
}
store.delete('namespaceStore');
let namespaceStore = [];
this.namespaceMap.map(ns => {
ns.open = namespace.name === ns.name;
namespaceStore.push({name: ns.name, open: ns.open});
});
store.setObject('namespaceStore', namespaceStore);
} else {
namespace.toggle();
}
}
=======
__hideAll(){
store.delete('namespaceStore');
let namespaceStore = [];
this.namespaceMap.map(ns => {
ns.open = false;
namespaceStore.push({name: ns.name, open: ns.open});
});
store.setObject('namespaceStore', namespaceStore);
}
>>>>>>>
__hideAll(){
store.delete('namespaceStore');
let namespaceStore = [];
this.namespaceMap.map(ns => {
ns.open = false;
namespaceStore.push({name: ns.name, open: ns.open});
});
store.setObject('namespaceStore', namespaceStore);
}
namespaceClick(event, namespace) {
if (event.ctrlKey) {
if(namespace.open) {
event.preventDefault();
}
store.delete('namespaceStore');
let namespaceStore = [];
this.namespaceMap.map(ns => {
ns.open = namespace.name === ns.name;
namespaceStore.push({name: ns.name, open: ns.open});
});
store.setObject('namespaceStore', namespaceStore);
} else {
namespace.toggle();
}
} |
<<<<<<<
import { AnimeOwl } from './AnimeOwl/main';
=======
import { BSTO } from './BSTO/main';
import { Pantsubase } from './Pantsubase/main';
import { Fastani } from './Fastani/main';
>>>>>>>
import { BSTO } from './BSTO/main';
import { Pantsubase } from './Pantsubase/main';
import { Fastani } from './Fastani/main';
import { AnimeOwl } from './AnimeOwl/main';
<<<<<<<
AnimeOwl,
=======
BSTO,
Pantsubase,
Fastani,
>>>>>>>
BSTO,
Pantsubase,
Fastani,
AnimeOwl, |
<<<<<<<
import {Kissanime} from "./Kissanime/main";
import {Kissmanga} from "./Kissmanga/main";
import {nineAnime} from "./nineAnime/main";
import {Crunchyroll} from "./Crunchyroll/main";
import {Mangadex} from "./Mangadex/main";
import {Gogoanime} from "./Gogoanime/main";
import {Anime4you} from "./Anime4you/main";
import {Branitube} from "./Branitube/main";
import {Turkanime} from "./Turkanime/main";
import {Twistmoe} from "./Twistmoe/main";
import {Emby} from "./Emby/main";
import {Plex} from "./Plex/main";
import {Netflix} from "./Netflix/main";
import {animepahe} from "./animepahe/main";
import {animeflv} from "./Animeflv/main";
import {Jkanime} from "./Jkanime/main";
import {Vrv} from "./Vrv/main";
import {Proxer} from "./Proxer/main";
import {Novelplanet} from "./Novelplanet/main";
import {fourAnime} from "./fourAnime/main";
import {DreamAnimes} from "./DreamAnimes/main";
import {animeultima} from "./animeultima/main";
import {Aniflix} from "./Aniflix/main";
import {AnimeDaisuki} from "./AnimeDaisuki/main";
import {Animefreak} from "./Animefreak/main";
import {AnimePlanet} from "./AnimePlanet/main";
import {KickAssAnime} from "./KickAssAnime/main";
import {AnimeKisa} from "./AnimeKisa/main";
import {Wakanim} from "./Wakanim/main";
import {AnimeIndo} from "./AnimeIndo/main";
import {Shinden} from "./Shinden/main";
import {Funimation} from "./Funimation/main";
import {Voiranime} from "./Voiranime/main";
import {DubbedAnime} from "./DubbedAnime/main";
import {VIZ} from "./VIZ/main";
import {MangaNelo} from "./MangaNelo/main";
import {Mangakakalot} from "./Mangakakalot/main";
import {NekoSama} from "./NekoSama/main";
import {AnimeZone} from "./AnimeZone/main";
import {AnimeOdcinki} from "./AnimeOdcinki/main";
import {Animeflix} from "./Animeflix/main";
import {serimanga} from "./serimanga/main";
import {mangadenizi} from "./mangadenizi/main";
import {moeclip} from "./moeclip/main";
import {mangalivre} from "./mangalivre/main";
import {tmofans} from "./tmofans/main";
import {unionmangas} from "./unionmangas/main";
import {MangaPlus} from "./MangaPlus/main";
import {JapScan} from "./JapScan/main";
import {MangaKisa} from "./MangaKisa/main";
import {Goyabu} from "./Goyabu/main";
import {AnimesVision} from "./AnimesVision/main";
import {Hulu} from "./Hulu/main";
import {Aniwatch} from "./Aniwatch/main";
import {Hidive} from "./Hidive/main";
import {JaiminisBox} from "./JaiminisBox/main";
import {FallenAngels} from "./FallenAngels/main";
import {animestrue} from "./animestrue/main";
import {PrimeVideo} from "./PrimeVideo/main";
import {MangaKatana} from "./MangaKatana/main";
import {manga4life} from "./manga4life/main";
import {bato} from "./bato/main";
import {DreamSub} from "./DreamSub/main";
import {MangaPark} from "./MangaPark/main";
import {AnimesHouse} from "./AnimesHouse/main";
import {AnimeXin} from "./AnimeXin/main";
import {MonosChinos} from "./MonosChinos/main";
import {AnimeFire} from "./AnimeFire/main";
import {OtakuFR} from "./OtakuFR/main";
import {Samehadaku} from "./Samehadaku/main";
import {TsukiMangas} from "./TsukiMangas/main";
import {mangatx} from "./mangatx/main";
import {TRanimeizle} from "./TRanimeizle/main";
import {Scantrad} from "./Scantrad/main";
=======
import { Kissanime } from './Kissanime/main';
import { Kissmanga } from './Kissmanga/main';
import { nineAnime } from './nineAnime/main';
import { Crunchyroll } from './Crunchyroll/main';
import { Mangadex } from './Mangadex/main';
import { Gogoanime } from './Gogoanime/main';
import { Anime4you } from './Anime4you/main';
import { Branitube } from './Branitube/main';
import { Turkanime } from './Turkanime/main';
import { Twistmoe } from './Twistmoe/main';
import { Emby } from './Emby/main';
import { Plex } from './Plex/main';
import { Netflix } from './Netflix/main';
import { animepahe } from './animepahe/main';
import { animeflv } from './Animeflv/main';
import { Jkanime } from './Jkanime/main';
import { Vrv } from './Vrv/main';
import { Proxer } from './Proxer/main';
import { fourAnime } from './fourAnime/main';
import { animeultima } from './animeultima/main';
import { Aniflix } from './Aniflix/main';
import { AnimeDaisuki } from './AnimeDaisuki/main';
import { Animefreak } from './Animefreak/main';
import { KickAssAnime } from './KickAssAnime/main';
import { AnimeKisa } from './AnimeKisa/main';
import { Wakanim } from './Wakanim/main';
import { AnimeIndo } from './AnimeIndo/main';
import { Shinden } from './Shinden/main';
import { Funimation } from './Funimation/main';
import { Voiranime } from './Voiranime/main';
import { DubbedAnime } from './DubbedAnime/main';
import { VIZ } from './VIZ/main';
import { MangaNelo } from './MangaNelo/main';
import { Mangakakalot } from './Mangakakalot/main';
import { NekoSama } from './NekoSama/main';
import { AnimeZone } from './AnimeZone/main';
import { AnimeOdcinki } from './AnimeOdcinki/main';
import { Animeflix } from './Animeflix/main';
import { serimanga } from './serimanga/main';
import { mangadenizi } from './mangadenizi/main';
import { moeclip } from './moeclip/main';
import { mangalivre } from './mangalivre/main';
import { tmofans } from './tmofans/main';
import { unionmangas } from './unionmangas/main';
import { MangaPlus } from './MangaPlus/main';
import { JapScan } from './JapScan/main';
import { MangaKisa } from './MangaKisa/main';
import { Goyabu } from './Goyabu/main';
import { AnimesVision } from './AnimesVision/main';
import { Hulu } from './Hulu/main';
import { Aniwatch } from './Aniwatch/main';
import { Hidive } from './Hidive/main';
import { JaiminisBox } from './JaiminisBox/main';
import { FallenAngels } from './FallenAngels/main';
import { animestrue } from './animestrue/main';
import { PrimeVideo } from './PrimeVideo/main';
import { MangaKatana } from './MangaKatana/main';
import { manga4life } from './manga4life/main';
import { bato } from './bato/main';
import { DreamSub } from './DreamSub/main';
import { MangaPark } from './MangaPark/main';
import { AnimesHouse } from './AnimesHouse/main';
import { AnimeXin } from './AnimeXin/main';
import { MonosChinos } from './MonosChinos/main';
import { AnimeFire } from './AnimeFire/main';
import { OtakuFR } from './OtakuFR/main';
import { Samehadaku } from './Samehadaku/main';
import { TsukiMangas } from './TsukiMangas/main';
import { mangatx } from './mangatx/main';
import { TRanimeizle } from './TRanimeizle/main';
import { Anihub } from './Anihub/main';
import { AnimeStreamingFR } from './AnimeStreamingFR/main';
>>>>>>>
import { Kissanime } from './Kissanime/main';
import { Kissmanga } from './Kissmanga/main';
import { nineAnime } from './nineAnime/main';
import { Crunchyroll } from './Crunchyroll/main';
import { Mangadex } from './Mangadex/main';
import { Gogoanime } from './Gogoanime/main';
import { Anime4you } from './Anime4you/main';
import { Branitube } from './Branitube/main';
import { Turkanime } from './Turkanime/main';
import { Twistmoe } from './Twistmoe/main';
import { Emby } from './Emby/main';
import { Plex } from './Plex/main';
import { Netflix } from './Netflix/main';
import { animepahe } from './animepahe/main';
import { animeflv } from './Animeflv/main';
import { Jkanime } from './Jkanime/main';
import { Vrv } from './Vrv/main';
import { Proxer } from './Proxer/main';
import { fourAnime } from './fourAnime/main';
import { animeultima } from './animeultima/main';
import { Aniflix } from './Aniflix/main';
import { AnimeDaisuki } from './AnimeDaisuki/main';
import { Animefreak } from './Animefreak/main';
import { KickAssAnime } from './KickAssAnime/main';
import { AnimeKisa } from './AnimeKisa/main';
import { Wakanim } from './Wakanim/main';
import { AnimeIndo } from './AnimeIndo/main';
import { Shinden } from './Shinden/main';
import { Funimation } from './Funimation/main';
import { Voiranime } from './Voiranime/main';
import { DubbedAnime } from './DubbedAnime/main';
import { VIZ } from './VIZ/main';
import { MangaNelo } from './MangaNelo/main';
import { Mangakakalot } from './Mangakakalot/main';
import { NekoSama } from './NekoSama/main';
import { AnimeZone } from './AnimeZone/main';
import { AnimeOdcinki } from './AnimeOdcinki/main';
import { Animeflix } from './Animeflix/main';
import { serimanga } from './serimanga/main';
import { mangadenizi } from './mangadenizi/main';
import { moeclip } from './moeclip/main';
import { mangalivre } from './mangalivre/main';
import { tmofans } from './tmofans/main';
import { unionmangas } from './unionmangas/main';
import { MangaPlus } from './MangaPlus/main';
import { JapScan } from './JapScan/main';
import { MangaKisa } from './MangaKisa/main';
import { Goyabu } from './Goyabu/main';
import { AnimesVision } from './AnimesVision/main';
import { Hulu } from './Hulu/main';
import { Aniwatch } from './Aniwatch/main';
import { Hidive } from './Hidive/main';
import { JaiminisBox } from './JaiminisBox/main';
import { FallenAngels } from './FallenAngels/main';
import { animestrue } from './animestrue/main';
import { PrimeVideo } from './PrimeVideo/main';
import { MangaKatana } from './MangaKatana/main';
import { manga4life } from './manga4life/main';
import { bato } from './bato/main';
import { DreamSub } from './DreamSub/main';
import { MangaPark } from './MangaPark/main';
import { AnimesHouse } from './AnimesHouse/main';
import { AnimeXin } from './AnimeXin/main';
import { MonosChinos } from './MonosChinos/main';
import { AnimeFire } from './AnimeFire/main';
import { OtakuFR } from './OtakuFR/main';
import { Samehadaku } from './Samehadaku/main';
import { TsukiMangas } from './TsukiMangas/main';
import { mangatx } from './mangatx/main';
import { TRanimeizle } from './TRanimeizle/main';
import { Anihub } from './Anihub/main';
import { AnimeStreamingFR } from './AnimeStreamingFR/main';
import { Scantrad } from './Scantrad/main';
<<<<<<<
Kissanime,
Kissmanga,
nineAnime,
Crunchyroll,
Vrv,
Mangadex,
Gogoanime,
Twistmoe,
Anime4you,
Branitube,
Turkanime,
animepahe,
Netflix,
animeflv,
Jkanime,
Proxer,
Wakanim,
Emby,
Plex,
Novelplanet,
fourAnime,
DreamAnimes,
animeultima,
Aniflix,
Animefreak,
AnimeDaisuki,
AnimePlanet,
KickAssAnime,
AnimeKisa,
AnimeIndo,
Shinden,
Funimation,
Voiranime,
DubbedAnime,
MangaNelo,
Mangakakalot,
VIZ,
NekoSama,
AnimeOdcinki,
AnimeZone,
Animeflix,
serimanga,
mangadenizi,
moeclip,
mangalivre,
tmofans,
unionmangas,
MangaPlus,
JapScan,
MangaKisa,
Goyabu,
AnimesVision,
Hulu,
Aniwatch,
Hidive,
JaiminisBox,
FallenAngels,
animestrue,
PrimeVideo,
MangaKatana,
manga4life,
bato,
DreamSub,
MangaPark,
AnimesHouse,
AnimeXin,
MonosChinos,
AnimeFire,
OtakuFR,
Samehadaku,
TsukiMangas,
mangatx,
TRanimeizle,
Scantrad,
=======
Kissanime,
Kissmanga,
nineAnime,
Crunchyroll,
Vrv,
Mangadex,
Gogoanime,
Twistmoe,
Anime4you,
Branitube,
Turkanime,
animepahe,
Netflix,
animeflv,
Jkanime,
Proxer,
Wakanim,
Emby,
Plex,
fourAnime,
animeultima,
Aniflix,
Animefreak,
AnimeDaisuki,
KickAssAnime,
AnimeKisa,
AnimeIndo,
Shinden,
Funimation,
Voiranime,
DubbedAnime,
MangaNelo,
Mangakakalot,
VIZ,
NekoSama,
AnimeOdcinki,
AnimeZone,
Animeflix,
serimanga,
mangadenizi,
moeclip,
mangalivre,
tmofans,
unionmangas,
MangaPlus,
JapScan,
MangaKisa,
Goyabu,
AnimesVision,
Hulu,
Aniwatch,
Hidive,
JaiminisBox,
FallenAngels,
animestrue,
PrimeVideo,
MangaKatana,
manga4life,
bato,
DreamSub,
MangaPark,
AnimesHouse,
AnimeXin,
MonosChinos,
AnimeFire,
OtakuFR,
Samehadaku,
TsukiMangas,
mangatx,
TRanimeizle,
Anihub,
AnimeStreamingFR,
>>>>>>>
Kissanime,
Kissmanga,
nineAnime,
Crunchyroll,
Vrv,
Mangadex,
Gogoanime,
Twistmoe,
Anime4you,
Branitube,
Turkanime,
animepahe,
Netflix,
animeflv,
Jkanime,
Proxer,
Wakanim,
Emby,
Plex,
fourAnime,
animeultima,
Aniflix,
Animefreak,
AnimeDaisuki,
KickAssAnime,
AnimeKisa,
AnimeIndo,
Shinden,
Funimation,
Voiranime,
DubbedAnime,
MangaNelo,
Mangakakalot,
VIZ,
NekoSama,
AnimeOdcinki,
AnimeZone,
Animeflix,
serimanga,
mangadenizi,
moeclip,
mangalivre,
tmofans,
unionmangas,
MangaPlus,
JapScan,
MangaKisa,
Goyabu,
AnimesVision,
Hulu,
Aniwatch,
Hidive,
JaiminisBox,
FallenAngels,
animestrue,
PrimeVideo,
MangaKatana,
manga4life,
bato,
DreamSub,
MangaPark,
AnimesHouse,
AnimeXin,
MonosChinos,
AnimeFire,
OtakuFR,
Samehadaku,
TsukiMangas,
mangatx,
TRanimeizle,
Anihub,
AnimeStreamingFR,
Scantrad, |
<<<<<<<
import {PrimeVideo} from "./PrimeVideo/main";
import {MangaKatana} from "./MangaKatana/main";
=======
import {manga4life} from "./manga4life/main";
>>>>>>>
import {PrimeVideo} from "./PrimeVideo/main";
import {MangaKatana} from "./MangaKatana/main";
import {manga4life} from "./manga4life/main";
<<<<<<<
PrimeVideo,
MangaKatana,
=======
manga4life,
>>>>>>>
PrimeVideo,
MangaKatana,
manga4life, |
<<<<<<<
import { Komga } from './Komga/main';
=======
import { An1me } from './An1me/main';
import { MangaJar } from './MangaJar/main';
import { AnimeDao } from './AnimeDao/main';
import { Otakustv } from './Otakustv/main';
>>>>>>>
import { An1me } from './An1me/main';
import { MangaJar } from './MangaJar/main';
import { AnimeDao } from './AnimeDao/main';
import { Otakustv } from './Otakustv/main';
import { Komga } from './Komga/main';
<<<<<<<
Komga,
=======
An1me,
MangaJar,
AnimeDao,
Otakustv,
>>>>>>>
An1me,
MangaJar,
AnimeDao,
Otakustv,
Komga, |
<<<<<<<
import { AnimeUnity } from './AnimeUnity/main';
=======
import { AnimeSimple } from './AnimeSimple/main';
>>>>>>>
import { AnimeSimple } from './AnimeSimple/main';
import { AnimeUnity } from './AnimeUnity/main';
<<<<<<<
AnimeUnity,
=======
AnimeSimple,
>>>>>>>
AnimeSimple,
AnimeUnity, |
<<<<<<<
import {AnimeFever} from "./AnimeFever/main";
=======
import {serimanga} from "./serimanga/main";
>>>>>>>
import {AnimeFever} from "./AnimeFever/main";
import {serimanga} from "./serimanga/main";
<<<<<<<
AnimeFever,
=======
serimanga,
>>>>>>>
AnimeFever,
serimanga, |
<<<<<<<
import { Fumetsu } from './Fumetsu/main';
=======
import { Toonily } from './Toonily/main';
>>>>>>>
import { Toonily } from './Toonily/main';
import { Fumetsu } from './Fumetsu/main';
<<<<<<<
Fumetsu,
=======
Toonily,
>>>>>>>
Toonily,
Fumetsu, |
<<<<<<<
import { NonstopScans } from './NonstopScans/main';
=======
import { Toonily } from './Toonily/main';
import { Fumetsu } from './Fumetsu/main';
>>>>>>>
import { Toonily } from './Toonily/main';
import { Fumetsu } from './Fumetsu/main';
import { NonstopScans } from './NonstopScans/main';
<<<<<<<
NonstopScans,
=======
Toonily,
Fumetsu,
>>>>>>>
Toonily,
Fumetsu,
NonstopScans, |
<<<<<<<
import {craftingActions} from './sources/crafting-actions';
import {actions} from './sources/actions';
=======
import {Language} from './language';
>>>>>>>
import {craftingActions} from './sources/crafting-actions';
import {actions} from './sources/actions';
import {Language} from './language';
<<<<<<<
return this.getIndexByName(places, name, 'en');
}
public getCraftingActionByName(name: string, language: 'en' | 'fr' | 'de' | 'ja'): I18nName {
const result = this.getRowByName(craftingActions, name, language) || this.getRowByName(actions, name, language);
if (result === undefined) {
throw new Error('Data row not found.');
}
return result;
=======
return this.getIndexByName(places, name, 'en');
>>>>>>>
return this.getIndexByName(places, name, 'en');
}
public getCraftingActionByName(name: string, language: 'en' | 'fr' | 'de' | 'ja'): I18nName {
const result = this.getRowByName(craftingActions, name, language) || this.getRowByName(actions, name, language);
if (result === undefined) {
throw new Error('Data row not found.');
}
return result;
<<<<<<<
private getRowByName(array: { [index: number]: I18nName }, name: string, language: 'en' | 'fr' | 'de' | 'ja'): I18nName {
const res = this.getIndexByName(array, name, language);
=======
private getRowByName(array: { [index: number]: I18nName }, name: string, language: Language): I18nName {
const res = this.getIndexByName(array, name, language);
>>>>>>>
private getRowByName(array: { [index: number]: I18nName }, name: string, language: Language): I18nName {
const res = this.getIndexByName(array, name, language);
<<<<<<<
private getIndexByName(array: { [index: number]: I18nName }, name: string, language: string): number {
=======
/**
* Gets the id of a row by english name.
* @param array
* @param {string} name
* @param language
* @returns {number}
*/
private getIndexByName(array: { [index: number]: I18nName }, name: string, language: Language): number {
>>>>>>>
/**
* Gets the id of a row by english name.
* @param array
* @param {string} name
* @param language
* @returns {number}
*/
private getIndexByName(array: { [index: number]: I18nName }, name: string, language: string): number { |
<<<<<<<
@ViewChild('inputElement', { static: false }) inputElement: ElementRef;
=======
amountInInventory$: Observable<{ containerName: string, amount: number, hq: boolean, isRetainer: boolean }[]> = this.item$.pipe(
switchMap(item => {
return this.inventoryService.getUserInventory().pipe(
map(inventory => {
return inventory.getItem(item.id).map(entry => {
return {
isRetainer: entry.retainerName !== undefined,
containerName: entry.retainerName ? entry.retainerName : this.inventoryService.getContainerName(entry.containerId),
amount: entry.quantity,
hq: entry.hq
};
}).reduce((res, entry) => {
const resEntry = res.find(e => e.containerName === entry.containerName && e.hq === entry.hq);
if (resEntry !== undefined) {
resEntry.amount += entry.amount;
} else {
res.push(entry);
}
return res;
}, []);
})
);
})
);
@ViewChild('inputElement') inputElement: ElementRef;
>>>>>>>
@ViewChild('inputElement', { static: false }) inputElement: ElementRef;
amountInInventory$: Observable<{ containerName: string, amount: number, hq: boolean, isRetainer: boolean }[]> = this.item$.pipe(
switchMap(item => {
return this.inventoryService.getUserInventory().pipe(
map(inventory => {
return inventory.getItem(item.id).map(entry => {
return {
isRetainer: entry.retainerName !== undefined,
containerName: entry.retainerName ? entry.retainerName : this.inventoryService.getContainerName(entry.containerId),
amount: entry.quantity,
hq: entry.hq
};
}).reduce((res, entry) => {
const resEntry = res.find(e => e.containerName === entry.containerName && e.hq === entry.hq);
if (resEntry !== undefined) {
resEntry.amount += entry.amount;
} else {
res.push(entry);
}
return res;
}, []);
})
);
})
); |
<<<<<<<
import {AngularFirestoreModule} from 'angularfire2/firestore';
import {FeaturesModule} from './pages/features/features.module';
=======
import {BetaDisclaimerModule} from './modules/beta-disclaimer/beta-disclaimer.module';
>>>>>>>
import {BetaDisclaimerModule} from './modules/beta-disclaimer/beta-disclaimer.module';
import {AngularFirestoreModule} from 'angularfire2/firestore';
import {FeaturesModule} from './pages/features/features.module';
<<<<<<<
FeaturesModule,
=======
BetaDisclaimerModule,
>>>>>>>
FeaturesModule,
BetaDisclaimerModule, |
<<<<<<<
@Inject(PLATFORM_ID) private platform: Object, @Inject(REQUEST) @Optional() private request: any) {
=======
private message: NzMessageService, @Inject(PLATFORM_ID) private platform: Object) {
>>>>>>>
private message: NzMessageService, @Inject(PLATFORM_ID) private platform: Object, @Inject(REQUEST) @Optional() private request: any) { |
<<<<<<<
import {GRID_SIZE, LEFT_MOUSE_BUTTON} from "../Constants";
=======
import {ROTATION_CIRCLE_R1,
ROTATION_CIRCLE_R2,
SHIFT_KEY,
LEFT_MOUSE_BUTTON,
SPACEBAR_KEY} from "../Constants";
import {CopyGroup} from "../ComponentUtils";
>>>>>>>
import {GRID_SIZE,
ROTATION_CIRCLE_R1,
ROTATION_CIRCLE_R2,
SHIFT_KEY,
LEFT_MOUSE_BUTTON,
SPACEBAR_KEY} from "../Constants";
import {CopyGroup} from "../ComponentUtils";
<<<<<<<
=======
import {CircuitDesigner} from "../../models/CircuitDesigner";
import {IOObject} from "../../models/ioobjects/IOObject";
import {Wire} from "../../models/ioobjects/Wire";
>>>>>>>
import {CircuitDesigner} from "../../models/CircuitDesigner";
import {IOObject} from "../../models/ioobjects/IOObject";
import {Wire} from "../../models/ioobjects/Wire";
<<<<<<<
=======
if (currentPressedObj != undefined) {
if (currentPressedObj instanceof Wire)
return false;
let objects = [currentPressedObj];
>>>>>>> |
<<<<<<<
private splitWireTool : SplitWireTool;
=======
private actionHelper : ActionHelper;
private actionManager : ActionManager;
>>>>>>>
private splitWireTool : SplitWireTool;
private actionHelper : ActionHelper;
private actionManager : ActionManager;
<<<<<<<
this.splitWireTool = new SplitWireTool(designer, camera);
=======
this.actionHelper = new ActionHelper(this.actionManager);
>>>>>>>
this.splitWireTool = new SplitWireTool(designer, camera);
this.actionHelper = new ActionHelper(this.actionManager); |
<<<<<<<
public startRotation(objs: Array<IOObject>, midpoint: Vector, mousePos: Vector): void {
this.midpoint = midpoint;
this.rotating = true;
this.startAngle = mousePos.sub(midpoint).angle();
this.action = new RotateAction(objs, midpoint);
=======
public activate(currentTool: Tool, event: string, input: Input, button?: number): boolean {
if (!(currentTool instanceof SelectionTool))
return false;
if (!(event == "mousedown"))
return false;
let selections = currentTool.getSelections();
if (selections.length == 0)
return false;
let worldMousePos = this.camera.getWorldPos(input.getMousePos());
// Check if mouse clicked on rotation circle
let midpoint = currentTool.calculateMidpoint();
let d = worldMousePos.sub(midpoint).len2();
if (d <= ROTATION_CIRCLE_R2 && d >= ROTATION_CIRCLE_R1) {
// Activate
this.objects = selections;
this.midpoint = midpoint;
this.rotating = true;
this.startAngle = worldMousePos.sub(midpoint).angle();
this.prevAngle = this.startAngle;
return true;
}
return false;
}
public deactivate(event: string, input: Input, button?: number): boolean {
return (event == "mouseup");
>>>>>>>
public deactivate(event: string, input: Input, button?: number): boolean {
return (event == "mouseup"); |
<<<<<<<
SHIFT_KEY, DELETE_KEY,
BACKSPACE_KEY, ESC_KEY, A_KEY} from "../Constants";
import {Vector,V} from "../math/Vector";
import {Transform} from "../math/Transform";
import {TransformContains} from "../math/MathUtils";
import {SeparatedComponentCollection,
GatherGroup} from "../ComponentUtils";
=======
OPTION_KEY, SHIFT_KEY,
DELETE_KEY, BACKSPACE_KEY,
ESC_KEY, A_KEY, IO_PORT_RADIUS} from "../Constants";
import {Vector,V} from "../math/Vector";
import {Transform} from "../math/Transform";
import {TransformContains,
CircleContains,
BezierContains} from "../math/MathUtils";
>>>>>>>
SHIFT_KEY, DELETE_KEY,
BACKSPACE_KEY, ESC_KEY,
A_KEY, IO_PORT_RADIUS} from "../Constants";
import {Vector,V} from "../math/Vector";
import {Transform} from "../math/Transform";
import {TransformContains,
CircleContains,
BezierContains} from "../math/MathUtils";
import {SeparatedComponentCollection,
GatherGroup} from "../ComponentUtils"; |
<<<<<<<
let dragStart = V(0,0);
child.onclick = () => {
place(CreateComponentFromXML(xmlId, not), false);
}
child.ondragstart = (event) => {
dragStart = V(event.offsetX, event.offsetY);
}
child.ondragend = (event) => {
if (!(child instanceof HTMLButtonElement))
return;
const component = CreateComponentFromXML(xmlId, not);
// Calculate world mouse pos from event
const canvas = MainDesignerController.GetCanvas();
const rect = canvas.getBoundingClientRect();
const mousePos = V(event.pageX - dragStart.x - rect.left,
event.pageY - dragStart.y + headerHeight - rect.top);
const pos = MainDesignerController.GetCamera().getWorldPos(mousePos);
component.setPos(pos);
place(component, true);
MainDesignerController.Render();
}
=======
child.onclick = () => {
place(CreateComponentFromXML(xmlId, not));
// Unfocus element
if (child instanceof HTMLElement)
child.blur();
}
>>>>>>>
let dragStart = V(0,0);
child.onclick = () => {
place(CreateComponentFromXML(xmlId, not), false);
// Unfocus element
if (child instanceof HTMLElement)
child.blur();
}
child.ondragstart = (event) => {
dragStart = V(event.offsetX, event.offsetY);
}
child.ondragend = (event) => {
if (!(child instanceof HTMLButtonElement))
return;
const component = CreateComponentFromXML(xmlId, not);
// Calculate world mouse pos from event
const canvas = MainDesignerController.GetCanvas();
const rect = canvas.getBoundingClientRect();
const mousePos = V(event.pageX - dragStart.x - rect.left,
event.pageY - dragStart.y + headerHeight - rect.top);
const pos = MainDesignerController.GetCamera().getWorldPos(mousePos);
component.setPos(pos);
place(component, true);
MainDesignerController.Render();
} |
<<<<<<<
public isLocked(): boolean {
return this.locked;
}
=======
public getSelectionPopup(): SelectionPopupController {
return this.selectionPopup;
}
>>>>>>>
public isLocked(): boolean {
return this.locked;
}
public getSelectionPopup(): SelectionPopupController {
return this.selectionPopup;
} |
<<<<<<<
},
CanvasToScreen: function(p: Vector): Vector {
return view.getCamera().getScreenPos(p);
},
ScreenToCanvas: function(p: Vector): Vector {
return view.getCamera().getWorldPos(p);
=======
},
GetActionManager: function(): ActionManager {
return actions;
>>>>>>>
},
CanvasToScreen: function(p: Vector): Vector {
return view.getCamera().getScreenPos(p);
},
ScreenToCanvas: function(p: Vector): Vector {
return view.getCamera().getWorldPos(p);
},
GetActionManager: function(): ActionManager {
return actions; |
<<<<<<<
import {ICRenderer} from "./other/ICRenderer";
import {Transform} from "../../math/Transform";
=======
import {FlipFlopRenderer} from "./flipflops/FlipFlopRenderer";
>>>>>>>
import {ICRenderer} from "./other/ICRenderer";
import {FlipFlopRenderer} from "./flipflops/FlipFlopRenderer";
import {Transform} from "../../math/Transform";
<<<<<<<
// Specific renderers
if (object instanceof Gate)
GateRenderer.render(renderer, camera, object, selected);
if (object instanceof IC)
ICRenderer.render(renderer, camera, object, selected);
if (object instanceof SevenSegmentDisplay)
drawBox(renderer, transform, selected);
=======
// Seven Segment renderer
if (object instanceof SevenSegmentDisplay) {
let borderCol = (selected ? SELECTED_BORDER_COLOR : DEFAULT_BORDER_COLOR);
let fillCol = (selected ? SELECTED_FILL_COLOR : DEFAULT_FILL_COLOR);
renderer.rect(0, 0, transform.getSize().x, transform.getSize().y, fillCol, borderCol, DEFAULT_BORDER_WIDTH);
}
>>>>>>>
// Specific renderers
if (object instanceof Gate)
GateRenderer.render(renderer, camera, object, selected);
if (object instanceof FlipFlop)
FlipFlopRenderer.render(renderer, camera, object, selected);
if (object instanceof IC)
ICRenderer.render(renderer, camera, object, selected);
if (object instanceof SevenSegmentDisplay)
drawBox(renderer, transform, selected);
<<<<<<<
if (Images.GetImage(imgName))
=======
if (object instanceof LED)
tint = object.getColor();
if (Images.GetImage(imgName))
>>>>>>>
if (object instanceof LED)
tint = object.getColor();
if (Images.GetImage(imgName)) |
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
let pickerCtrl = new PickerController(mockApp(), mockConfig());
datetime = new DateTime(new Form(), mockConfig(), mockElementRef(), mockRenderer(), null, pickerCtrl);
=======
datetime = new DateTime(new Form(), mockConfig(), mockElementRef(), mockRenderer(), null, <PickerController>{});
datetime._picker = picker = new Picker(mockApp());
>>>>>>>
let pickerCtrl = new PickerController(mockApp(), mockConfig());
datetime = new DateTime(new Form(), mockConfig(), mockElementRef(), mockRenderer(), null, pickerCtrl); |
<<<<<<<
'<input [placeholder]="i.placeholder" [(ngModel)]="i.value" [type]="i.type" [attr.id]="i.id" class="alert-input">' +
=======
'<input [placeholder]="i.placeholder" [(ngModel)]="i.value" [type]="i.type" [min]="i.min" [max]="i.max" class="alert-input">' +
>>>>>>>
'<input [placeholder]="i.placeholder" [(ngModel)]="i.value" [type]="i.type" [min]="i.min" [max]="i.max" [attr.id]="i.id" class="alert-input">' + |
<<<<<<<
import select from './select';
import evaluate from "./evaluate"
import refresh from "./refresh";
import * as replWindow from "./repl-window";
import { format } from 'url';
import * as greetings from "./greet";
=======
import select from './repl/middleware/select';
import * as util from './utilities';
import evaluate from "./repl/middleware/evaluate"
import { nClient } from "./connector"
import { readFileSync, stat } from 'fs';
import Analytics from './analytics';
const greetings = require('@cospaia/calva-lib/lib/calva.greet');
>>>>>>>
import select from './select';
import evaluate from "./evaluate"
import refresh from "./refresh";
import * as replWindow from "./repl-window";
import { format } from 'url';
import * as greetings from "./greet";
import Analytics from './analytics';
<<<<<<<
EvaluateMiddleWare.loadFile(document);
=======
EvaluateMiddleWare.evaluateFile(document);
state.analytics().logEvent("Calva", "OnSaveLoad");
>>>>>>>
EvaluateMiddleWare.loadFile(document);
state.analytics().logEvent("Calva", "OnSaveLoad");
<<<<<<<
let fmtExtension = vscode.extensions.getExtension('cospaia.calva-fmt'),
pareEditExtension = vscode.extensions.getExtension('cospaia.paredit-revived');
state.setExtensionContext(context);
if (!fmtExtension) {
fmt.activate(context);
} else {
vscode.window.showErrorMessage("Calva Format extension detected, which will break things. Please uninstall it before continuing using Calva.", ...["Got it. Will do!"]);
}
if (!pareEditExtension) {
paredit.activate(context);
} else {
vscode.window.showErrorMessage("Calva Paredit extension detected, which can cause pronlems. Please uninstall it.", ...["Got it. Doing it!"]);
}
replWindow.activate(context);
=======
state.cursor.set('analytics', new Analytics(context));
state.analytics().logPath("/start");
state.analytics().logEvent("LifeCycle", "Started");
>>>>>>>
state.cursor.set('analytics', new Analytics(context));
state.analytics().logPath("/start");
state.analytics().logEvent("LifeCycle", "Started");
let fmtExtension = vscode.extensions.getExtension('cospaia.calva-fmt'),
pareEditExtension = vscode.extensions.getExtension('cospaia.paredit-revived');
state.setExtensionContext(context);
if (!fmtExtension) {
fmt.activate(context);
} else {
vscode.window.showErrorMessage("Calva Format extension detected, which will break things. Please uninstall it before continuing using Calva.", ...["Got it. Will do!"]);
}
if (!pareEditExtension) {
paredit.activate(context);
} else {
vscode.window.showErrorMessage("Calva Paredit extension detected, which can cause pronlems. Please uninstall it.", ...["Got it. Doing it!"]);
}
replWindow.activate(context);
<<<<<<<
context.subscriptions.push(vscode.commands.registerCommand('calva.jackIn', jackIn.calvaJackIn))
=======
/*
context.subscriptions.push(vscode.commands.registerCommand('calva.openReplWindow', async function () {
const panel = vscode.window.createWebviewPanel("replInteractor", "REPL Interactor", vscode.ViewColumn.Active, { retainContextWhenHidden: true, enableScripts: true, localResourceRoots: [vscode.Uri.file(path.join(context.extensionPath, 'html'))] })
let html = readFileSync(path.join(context.extensionPath, "html/index.html")).toString()
html = html.replace("{{baseUri}}", getUrl())
html = html.replace("{{script}}", getUrl("main.js"))
html = html.replace("{{logo}}", getUrl("/clojure-logo.svg"))
panel.webview.html = html;
let session = await nClient.createSession();
let res = session.eval("*ns*");
await res.value;
let ns = res.ns;
panel.webview.onDidReceiveMessage(async function (msg) {
if(msg.type == "init") {
panel.webview.postMessage({ type: "init", value: "", ns: ns });
}
if(msg.type == "read-line") {
let res = session.eval(msg.line, {
stderr: m => panel.webview.postMessage({type: "stderr", value: m}),
stdout: m => panel.webview.postMessage({type: "stdout", value: m})})
try {
panel.webview.postMessage({type: "repl-response", value: await res.value, ns: res.ns});
} catch(e) {
panel.webview.postMessage({type: "repl-error", ex: e});
}
}
})
}));
*/
>>>>>>>
context.subscriptions.push(vscode.commands.registerCommand('calva.jackIn', jackIn.calvaJackIn)) |
<<<<<<<
* 'tabbarPlacement': 'bottom',
* platforms: {
=======
* tabbarPlacement: 'bottom',
* platform: {
>>>>>>>
* tabbarPlacement: 'bottom',
* platforms: { |
<<<<<<<
present(navOptions: NavOptions = {}) {
return this._app.present(this, navOptions, PORTAL_LOADING);
=======
present(navOptions: NavOptions = {}): Promise<any> {
return this._app.present(this, navOptions, AppPortal.LOADING);
>>>>>>>
present(navOptions: NavOptions = {}): Promise<any> {
return this._app.present(this, navOptions, PORTAL_LOADING);
<<<<<<<
=======
}
/**
* @name LoadingController
* @description
* An overlay that can be used to indicate activity while blocking user
* interaction. The loading indicator appears on top of the app's content,
* and can be dismissed by the app to resume user interaction with
* the app. It includes an optional backdrop, which can be disabled
* by setting `showBackdrop: false` upon creation.
*
* ### Creating
* You can pass all of the loading options in the first argument of
* the create method: `create(opts)`. The spinner name should be
* passed in the `spinner` property, and any optional HTML can be passed
* in the `content` property. If you do not pass a value to `spinner`
* the loading indicator will use the spinner specified by the mode. To
* set the spinner name across the app, set the value of `loadingSpinner`
* in your app's config. To hide the spinner, set `loadingSpinner: 'hide'`
* in the app's config or pass `spinner: 'hide'` in the loading
* options. See the [create](#create) method below for all available options.
*
* ### Dismissing
* The loading indicator can be dismissed automatically after a specific
* amount of time by passing the number of milliseconds to display it in
* the `duration` of the loading options. By default the loading indicator
* will show even during page changes, but this can be disabled by setting
* `dismissOnPageChange` to `true`. To dismiss the loading indicator after
* creation, call the `dismiss()` method on the Loading instance. The
* `onDidDismiss` function can be called to perform an action after the loading
* indicator is dismissed.
*
* >Note that after the component is dismissed, it will not be usable anymore
* and another one must be created. This can be avoided by wrapping the
* creation and presentation of the component in a reusable function as shown
* in the `usage` section below.
*
* ### Limitations
* The element is styled to appear on top of other content by setting its
* `z-index` property. You must ensure no element has a stacking context with
* a higher `z-index` than this element.
*
* @usage
* ```ts
* constructor(public loadingCtrl: LoadingController) {
*
* }
*
* presentLoadingDefault() {
* let loading = this.loadingCtrl.create({
* content: 'Please wait...'
* });
*
* loading.present();
*
* setTimeout(() => {
* loading.dismiss();
* }, 5000);
* }
*
* presentLoadingCustom() {
* let loading = this.loadingCtrl.create({
* spinner: 'hide',
* content: `
* <div class="custom-spinner-container">
* <div class="custom-spinner-box"></div>
* </div>`,
* duration: 5000
* });
*
* loading.onDidDismiss(() => {
* console.log('Dismissed loading');
* });
*
* loading.present();
* }
*
* presentLoadingText() {
* let loading = this.loadingCtrl.create({
* spinner: 'hide',
* content: 'Loading Please Wait...'
* });
*
* loading.present();
*
* setTimeout(() => {
* this.nav.push(Page2);
* }, 1000);
*
* setTimeout(() => {
* loading.dismiss();
* }, 5000);
* }
* ```
* @advanced
*
* Loading options
*
* | Option | Type | Description |
* |-----------------------|------------|------------------------------------------------------------------------------------------------------------------|
* | spinner |`string` | The name of the SVG spinner for the loading indicator. |
* | content |`string` | The html content for the loading indicator. |
* | cssClass |`string` | Additional classes for custom styles, separated by spaces. |
* | showBackdrop |`boolean` | Whether to show the backdrop. Default true. |
* | dismissOnPageChange |`boolean` | Whether to dismiss the indicator when navigating to a new page. Default false. |
* | duration |`number` | How many milliseconds to wait before hiding the indicator. By default, it will show until `dismiss()` is called. |
*
* @demo /docs/v2/demos/src/loading/
* @see {@link /docs/v2/api/components/spinner/Spinner Spinner API Docs}
*/
@Injectable()
export class LoadingController {
constructor(private _app: App) {}
/**
* Create a loading indicator. See below for options.
* @param {LoadingOptions} opts Loading options
* @returns {Loading} Returns a Loading Instance
*/
create(opts: LoadingOptions = {}): Loading {
return new Loading(this._app, opts);
}
>>>>>>> |
<<<<<<<
await resultsOutput.openResultsDoc();
resultsOutput.appendToResultsDoc(`; Evaluation of file ${fileName} failed: ${e}`);
=======
await resultsOutput.appendToResultsDoc(`; Evaluation of file ${fileName} failed: ${e}`);
>>>>>>>
resultsOutput.appendToResultsDoc(`; Evaluation of file ${fileName} failed: ${e}`); |
<<<<<<<
import {Directive, Component, ElementRef, Renderer, Host, EventEmitter, Input, Output, ChangeDetectionStrategy, ViewEncapsulation} from 'angular2/core';
import {NgClass} from 'angular2/common';
=======
import {Directive, Component, ElementRef, Host, EventEmitter, Input, Output, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
import {NgClass} from '@angular/common';
>>>>>>>
import {Directive, Component, ElementRef, Renderer, Host, EventEmitter, Input, Output, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
import {NgClass} from '@angular/common'; |
<<<<<<<
import { nClient, cljSession, cljsSession } from "../connector";
=======
import { nClient } from "../connector";
>>>>>>>
import { nClient } from "../connector";
<<<<<<<
import { isReplWindowOpen } from "../repl-window";
import { JackInTerminal, JackInTerminalOptions } from "./jack-in-terminal";
=======
import * as outputWindow from '../result-output';
>>>>>>>
import * as outputWindow from '../result-output';
import { JackInTerminal, JackInTerminalOptions } from "./jack-in-terminal";
<<<<<<<
async function executeJackInTask(projectType: projectTypes.ProjectType, projectTypeSelection: any, executable: string, args: any, isWin: boolean, cljTypes: string[], outputChannel: vscode.OutputChannel, connectSequence: ReplConnectSequence) {
=======
async function executeJackInTask(projectType: projectTypes.ProjectType, projectTypeSelection: any, executable: string, args: any, cljTypes: string[], connectSequence: ReplConnectSequence) {
>>>>>>>
async function executeJackInTask(projectType: projectTypes.ProjectType, projectTypeSelection: any, executable: string, args: any, isWin: boolean, cljTypes: string[], connectSequence: ReplConnectSequence) {
<<<<<<<
});
} catch (exception) {
outputChannel.appendLine("Error in Jack-in: unable to read port file");
outputChannel.appendLine(exception);
outputChannel.appendLine("You may have chosen the wrong jack-in configuration for your project.");
vscode.window.showErrorMessage("Error in Jack-in: unable to read port file. See output channel for more information.");
cancelJackInTask();
}
});
jackInTerminal = (<any>vscode.window).createTerminal({ name: `Calva Jack-in: ${connectSequence.name}`, pty: jackInPTY });
jackInTerminal.show();
jackInPTY.onDidClose((e) => {
calvaJackout();
});
} catch (exception) {
console.error("Failed executing task: ", exception.message);
}
=======
utilities.setLaunchingState(null);
watcher.removeAllListeners();
await connector.connect(connectSequence, true);
outputWindow.append("; Jack-in done.");
}
});
} catch(exception) {
outputWindow.append("; Error in Jack-in: unable to read port file");
outputWindow.append("; " + exception);
outputWindow.append("; You may have chosen the wrong jack-in configuration for your project.");
vscode.window.showErrorMessage("Error in Jack-in: unable to read port file. See output channel for more information.");
cancelJackInTask();
}
}, (reason) => {
watcher.removeAllListeners();
outputWindow.append("; Error in Jack-in: ");
outputWindow.append("; " + reason);
vscode.window.showErrorMessage("Error in Jack-in. See output channel for more information.");
cancelJackInTask();
});
>>>>>>>
});
} catch (exception) {
outputWindow.append("; Error in Jack-in: unable to read port file");
outputWindow.append(`; ${exception}`);
outputWindow.append("; You may have chosen the wrong jack-in configuration for your project.");
vscode.window.showErrorMessage("Error in Jack-in: unable to read port file. See output window for more information.");
cancelJackInTask();
}
});
jackInTerminal = (<any>vscode.window).createTerminal({ name: `Calva Jack-in: ${connectSequence.name}`, pty: jackInPTY });
jackInTerminal.show();
jackInPTY.onDidClose((e) => {
calvaJackout();
});
} catch (exception) {
console.error("Failed executing task: ", exception.message);
}
<<<<<<<
executeJackInTask(projectType, projectConnectSequence.name, executable, args, projectTypes.isWin, cljTypes, outputChannel, projectConnectSequence)
=======
executeJackInTask(projectType, projectConnectSequence.name, executable, args, cljTypes, projectConnectSequence)
>>>>>>>
executeJackInTask(projectType, projectConnectSequence.name, executable, args, projectTypes.isWin, cljTypes, projectConnectSequence)
<<<<<<<
if (utilities.getSession("clj")) {
if (!isReplWindowOpen("clj")) {
commands["Open the Clojure REPL Window"] = "calva.openCljReplWindow";
} else {
commands["Clear Clojure REPL Window + History"] = "calva.clearClojureREPLWindow";
}
}
if (utilities.getSession("cljs")) {
if (!isReplWindowOpen("cljs")) {
commands["Open the ClojureScript REPL Window"] = "calva.openCljsReplWindow";
} else {
commands["Clear ClojureScript REPL Window + History"] = "calva.clearClojureScriptREPLWindow";
}
=======
if(utilities.getSession("clj")) {
commands["Open the Output Window"] = "calva.showOutputWindow";
>>>>>>>
if(utilities.getSession("clj")) {
commands["Open the Output Window"] = "calva.showOutputWindow"; |
<<<<<<<
'<div class="item-content" id="{{labelId}}">' +
'<content></content>' +
=======
'<div class="item-content">' +
'<ng-content></ng-content>' +
>>>>>>>
'<div class="item-content" id="{{labelId}}">' +
'<ng-content></ng-content>' + |
<<<<<<<
* ``` javascript
* // iOS
* activator: 'highlight',
* actionSheetEnter: 'action-sheet-slide-in',
* actionSheetLeave: 'action-sheet-slide-out',
* actionSheetCancelIcon: '',
* actionSheetDestructiveIcon: '',
* backButtonText: 'Back',
* backButtonIcon: 'ion-ios-arrow-back',
* iconMode: 'ios',
* menuType: 'reveal',
* modalEnter: 'modal-slide-in',
* modalLeave: 'modal-slide-out',
* pageTransition: 'ios-transition',
* pageTransitionDelay: 16,
* popupEnter: 'popup-pop-in',
* popupLeave: 'popup-pop-out',
* tabbarPlacement: 'bottom',
* // MD
* activator: 'ripple',
* actionSheetEnter: 'action-sheet-md-slide-in',
* actionSheetLeave: 'action-sheet-md-slide-out',
* actionSheetCancelIcon: 'ion-md-close',
* actionSheetDestructiveIcon: 'ion-md-trash',
* backButtonText: '',
* backButtonIcon: 'ion-md-arrow-back',
* iconMode: 'md',
* menuType: 'overlay',
* modalEnter: 'modal-md-slide-in',
* modalLeave: 'modal-md-slide-out',
* pageTransition: 'md-transition',
* pageTransitionDelay: 120,
* popupEnter: 'popup-md-pop-in',
* popupLeave: 'popup-md-pop-out',
* tabbarHighlight: true,
* tabbarPlacement: 'top',
* tabSubPages: true,
* ```
* @demo /docs/v2/demos/config/
=======
*
* | Config property | Default iOS Value | Default MD Value |
* |----------------------------|------------------------|---------------------------|
* | activator | highlight | ripple |
* | actionSheetEnter | action-sheet-slide-in | action-sheet-md-slide-in |
* | actionSheetLeave | action-sheet-slide-out | action-sheet-md-slide-out |
* | actionSheetCancelIcon | | ion-md-close |
* | actionSheetDestructiveIcon | | ion-md-trash |
* | backButtonText | Back | |
* | backButtonIcon | ion-ios-arrow-back | ion-md-arrow-back |
* | iconMode | ios | md |
* | menuType | reveal | overlay |
* | modalEnter | modal-slide-in | modal-md-slide-in |
* | modalLeave | modal-slide-out | modal-md-slide-out |
* | pageTransition | ios-transition | md-transition |
* | pageTransitionDelay | 16 | 120 |
* | popupEnter | popup-pop-in | popup-md-pop-in |
* | popupLeave | popup-pop-out | popup-md-pop-out |
* | tabbarPlacement | bottom | true |
* | tabbarHighlight | | top |
* | tabSubPage | | true |
>>>>>>>
* ``` javascript
* // iOS
* activator: 'highlight',
* actionSheetEnter: 'action-sheet-slide-in',
* actionSheetLeave: 'action-sheet-slide-out',
* actionSheetCancelIcon: '',
* actionSheetDestructiveIcon: '',
* backButtonText: 'Back',
* backButtonIcon: 'ion-ios-arrow-back',
* iconMode: 'ios',
* menuType: 'reveal',
* modalEnter: 'modal-slide-in',
* modalLeave: 'modal-slide-out',
* pageTransition: 'ios-transition',
* pageTransitionDelay: 16,
* popupEnter: 'popup-pop-in',
* popupLeave: 'popup-pop-out',
* tabbarPlacement: 'bottom',
* // MD
* activator: 'ripple',
* actionSheetEnter: 'action-sheet-md-slide-in',
* actionSheetLeave: 'action-sheet-md-slide-out',
* actionSheetCancelIcon: 'ion-md-close',
* actionSheetDestructiveIcon: 'ion-md-trash',
* backButtonText: '',
* backButtonIcon: 'ion-md-arrow-back',
* iconMode: 'md',
* menuType: 'overlay',
* modalEnter: 'modal-md-slide-in',
* modalLeave: 'modal-md-slide-out',
* pageTransition: 'md-transition',
* pageTransitionDelay: 120,
* popupEnter: 'popup-md-pop-in',
* popupLeave: 'popup-md-pop-out',
* tabbarHighlight: true,
* tabbarPlacement: 'top',
* tabSubPages: true,
* ```
*
* | Config property | Default iOS Value | Default MD Value |
* |----------------------------|------------------------|---------------------------|
* | activator | highlight | ripple |
* | actionSheetEnter | action-sheet-slide-in | action-sheet-md-slide-in |
* | actionSheetLeave | action-sheet-slide-out | action-sheet-md-slide-out |
* | actionSheetCancelIcon | | ion-md-close |
* | actionSheetDestructiveIcon | | ion-md-trash |
* | backButtonText | Back | |
* | backButtonIcon | ion-ios-arrow-back | ion-md-arrow-back |
* | iconMode | ios | md |
* | menuType | reveal | overlay |
* | modalEnter | modal-slide-in | modal-md-slide-in |
* | modalLeave | modal-slide-out | modal-md-slide-out |
* | pageTransition | ios-transition | md-transition |
* | pageTransitionDelay | 16 | 120 |
* | popupEnter | popup-pop-in | popup-md-pop-in |
* | popupLeave | popup-pop-out | popup-md-pop-out |
* | tabbarPlacement | bottom | true |
* | tabbarHighlight | | top |
* | tabSubPage | | true | |
<<<<<<<
import { EnsureHttpsPipe } from './pipes/ensure-https.pipe';
import { UserFollowsComponent } from './components/stream/user-follows/user-follows.component';
import { AccountComponent } from './components/common/account/account.component';
=======
import { TutorialEnhancedComponent } from './components/tutorial-enhanced/tutorial-enhanced.component';
import { NotificationsTutorialComponent } from './components/tutorial-enhanced/notifications-tutorial/notifications-tutorial.component';
import { LabelsTutorialComponent } from './components/tutorial-enhanced/labels-tutorial/labels-tutorial.component';
>>>>>>>
import { EnsureHttpsPipe } from './pipes/ensure-https.pipe';
import { UserFollowsComponent } from './components/stream/user-follows/user-follows.component';
import { AccountComponent } from './components/common/account/account.component';
import { TutorialEnhancedComponent } from './components/tutorial-enhanced/tutorial-enhanced.component';
import { NotificationsTutorialComponent } from './components/tutorial-enhanced/notifications-tutorial/notifications-tutorial.component';
import { LabelsTutorialComponent } from './components/tutorial-enhanced/labels-tutorial/labels-tutorial.component';
<<<<<<<
AttachementImageComponent,
EnsureHttpsPipe,
UserFollowsComponent,
AccountComponent
=======
AttachementImageComponent,
TutorialEnhancedComponent,
NotificationsTutorialComponent,
LabelsTutorialComponent
>>>>>>>
AttachementImageComponent,
EnsureHttpsPipe,
UserFollowsComponent,
AccountComponent
TutorialEnhancedComponent,
NotificationsTutorialComponent,
LabelsTutorialComponent |
<<<<<<<
import { Injectable, Inject } from '@angular/core';
import { Subject } from 'rxjs';
=======
import { Injectable, Inject, Optional, Injector } from '@angular/core';
import { RedirectService } from './redirect.service';
import { Location } from '@angular/common';
>>>>>>>
import { Injectable, Inject } from '@angular/core';
import { Subject } from 'rxjs';
import { Injectable, Inject, Optional, Injector } from '@angular/core';
import { RedirectService } from './redirect.service';
import { Location } from '@angular/common';
<<<<<<<
this.isReady$.next(true);
=======
this.redirectToRootIfInvalidDomain();
>>>>>>>
this.isReady$.next(true);
this.redirectToRootIfInvalidDomain(); |
<<<<<<<
import { MetaService } from '../../common/services/meta.service';
=======
import { PagesService } from '../../common/services/pages.service';
>>>>>>>
import { MetaService } from '../../common/services/meta.service';
import { PagesService } from '../../common/services/pages.service'; |
<<<<<<<
import { ShadowboxHeaderTabsComponent } from './components/shadowbox-header-tabs/shadowbox-header-tabs.component';
import { TimespanFilterComponent } from './components/timespan-filter/timespan-filter.component';
import { EmailConfirmationComponent } from './components/email-confirmation/email-confirmation.component';
=======
import { PagesService } from './services/pages.service';
import { V2TopbarService } from './layout/v2-topbar/v2-topbar.service';
import { DateDropdownsComponent } from './components/date-dropdowns/date-dropdowns.component';
import { SidebarMarkersService } from './layout/sidebar/markers.service';
import { EmailConfirmationComponent } from './components/email-confirmation/email-confirmation.component';
>>>>>>>
import { ShadowboxHeaderTabsComponent } from './components/shadowbox-header-tabs/shadowbox-header-tabs.component';
import { TimespanFilterComponent } from './components/timespan-filter/timespan-filter.component';
import { PagesService } from './services/pages.service';
import { V2TopbarService } from './layout/v2-topbar/v2-topbar.service';
import { DateDropdownsComponent } from './components/date-dropdowns/date-dropdowns.component';
import { SidebarMarkersService } from './layout/sidebar/markers.service';
import { EmailConfirmationComponent } from './components/email-confirmation/email-confirmation.component';
<<<<<<<
ShadowboxHeaderTabsComponent,
TimespanFilterComponent,
EmailConfirmationComponent,
=======
EmailConfirmationComponent,
DateDropdownsComponent,
>>>>>>>
ShadowboxHeaderTabsComponent,
TimespanFilterComponent,
EmailConfirmationComponent,
EmailConfirmationComponent,
DateDropdownsComponent,
<<<<<<<
ShadowboxHeaderTabsComponent,
TimespanFilterComponent,
EmailConfirmationComponent,
=======
EmailConfirmationComponent,
DateDropdownsComponent,
>>>>>>>
ShadowboxHeaderTabsComponent,
TimespanFilterComponent,
EmailConfirmationComponent,
EmailConfirmationComponent,
DateDropdownsComponent, |
<<<<<<<
import { ConfigsService } from '../../common/services/configs.service';
=======
import { OnboardingV2Service } from '../onboarding-v2/service/onboarding.service';
>>>>>>>
import { ConfigsService } from '../../common/services/configs.service';
import { OnboardingV2Service } from '../onboarding-v2/service/onboarding.service';
<<<<<<<
private featuresService: FeaturesService,
configs: ConfigsService
=======
private featuresService: FeaturesService,
private onboardingService: OnboardingV2Service
>>>>>>>
private featuresService: FeaturesService,
configs: ConfigsService,
private onboardingService: OnboardingV2Service |
<<<<<<<
import { isPlatformBrowser } from '@angular/common';
import { ConfigsService } from '../../services/configs.service';
=======
import { NavigationEnd, Router } from '@angular/router';
import { Location } from '@angular/common';
import { filter } from 'rxjs/operators';
>>>>>>>
import { isPlatformBrowser } from '@angular/common';
import { ConfigsService } from '../../services/configs.service';
import { NavigationEnd, Router } from '@angular/router';
import { Location } from '@angular/common';
import { filter } from 'rxjs/operators';
<<<<<<<
protected cd: ChangeDetectorRef,
@Inject(PLATFORM_ID) protected platformId,
configs: ConfigsService
) {
this.fromEmailConfirmation = configs.get('from_email_confirmation');
}
=======
protected router: Router,
protected location: Location,
protected cd: ChangeDetectorRef
) {}
>>>>>>>
protected cd: ChangeDetectorRef,
@Inject(PLATFORM_ID) protected platformId,
configs: ConfigsService,
protected router: Router,
protected location: Location
) {
this.fromEmailConfirmation = configs.get('from_email_confirmation');
}
<<<<<<<
if (isPlatformBrowser(this.platformId)) {
this.canCloseTimer = window.setTimeout(() => {
this.canClose = true;
this.detectChanges();
}, 3000);
}
=======
this.canCloseTimer = window.setTimeout(() => {
this.canClose = true;
this.detectChanges();
}, 3000);
this.routerEvent$ = this.router.events
.pipe(filter(event => event instanceof NavigationEnd))
.subscribe(() => {
this.setShouldShow(this.session.getLoggedInUser());
this.detectChanges();
});
>>>>>>>
if (isPlatformBrowser(this.platformId)) {
this.canCloseTimer = window.setTimeout(() => {
this.canClose = true;
this.detectChanges();
}, 3000);
}
this.routerEvent$ = this.router.events
.pipe(filter(event => event instanceof NavigationEnd))
.subscribe(() => {
this.setShouldShow(this.session.getLoggedInUser());
this.detectChanges();
});
<<<<<<<
!this.fromEmailConfirmation && user && user.email_confirmed === false;
=======
!(this.location.path().indexOf('/onboarding') === 0) &&
!this.minds.from_email_confirmation &&
user &&
user.email_confirmed === false;
>>>>>>>
!(this.location.path().indexOf('/onboarding') === 0) &&
!this.fromEmailConfirmation &&
user &&
user.email_confirmed === false; |
<<<<<<<
import { ConfigsService } from '../../services/configs.service';
=======
import { V2TopbarService } from './v2-topbar.service';
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
import { Location } from '@angular/common';
>>>>>>>
import { ConfigsService } from '../../services/configs.service';
import { V2TopbarService } from './v2-topbar.service';
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
import { Location } from '@angular/common';
<<<<<<<
protected componentFactoryResolver: ComponentFactoryResolver,
configs: ConfigsService
) {
this.cdnAssetsUrl = configs.get('cdn_assets_url');
}
=======
protected componentFactoryResolver: ComponentFactoryResolver,
protected topbarService: V2TopbarService,
protected router: Router
) {}
>>>>>>>
protected componentFactoryResolver: ComponentFactoryResolver,
configs: ConfigsService,
protected topbarService: V2TopbarService,
protected router: Router
) {
this.cdnAssetsUrl = configs.get('cdn_assets_url');
} |
<<<<<<<
import { SidebarWidgetComponent } from './components/sidebar-widget/sidebar-widget.component';
=======
import { SidebarNavigationSubnavDirective } from './layout/sidebar/subnav.directive';
>>>>>>>
import { SidebarWidgetComponent } from './components/sidebar-widget/sidebar-widget.component';
import { SidebarNavigationSubnavDirective } from './layout/sidebar/subnav.directive';
<<<<<<<
SidebarWidgetComponent,
=======
SidebarNavigationSubnavDirective,
>>>>>>>
SidebarWidgetComponent,
SidebarNavigationSubnavDirective, |
<<<<<<<
constructor(
private router: Router,
public scroll: ScrollService,
private cookieService: CookieService
) {
// console.log('modal service constructed');
this.initOnScroll();
=======
static _(router: Router, scroll: ScrollService) {
return new SignupModalService(router, scroll);
}
constructor(private router: Router, public scroll: ScrollService) {
// this.initOnScroll();
>>>>>>>
constructor(
private router: Router,
public scroll: ScrollService,
private cookieService: CookieService
) {
// console.log('modal service constructed');
// this.initOnScroll(); |
<<<<<<<
import { V3TopbarComponent } from './layout/v3-topbar/v3-topbar.component';
import { SidebarNavigationService } from './layout/sidebar/navigation.service';
import { TopbarService } from './layout/topbar.service';
=======
import { RedirectService } from './services/redirect.service';
>>>>>>>
import { RedirectService } from './services/redirect.service';
import { V3TopbarComponent } from './layout/v3-topbar/v3-topbar.component';
import { SidebarNavigationService } from './layout/sidebar/navigation.service';
import { TopbarService } from './layout/topbar.service'; |
<<<<<<<
import { AdminPledgesComponent } from './controllers/admin/pledges/pledges.component';
=======
import { AdminWithdrawals } from './controllers/admin/withdrawals/withdrawals.component';
>>>>>>>
import { AdminPledgesComponent } from './controllers/admin/pledges/pledges.component';
import { AdminWithdrawals } from './controllers/admin/withdrawals/withdrawals.component';
<<<<<<<
AdminPledgesComponent,
=======
AdminWithdrawals,
>>>>>>>
AdminPledgesComponent,
AdminWithdrawals, |
<<<<<<<
import { TopbarWrapperComponent } from './page/topbar.component';
import { PageComponent } from './page/page.component';
=======
import { AppRoutingModule } from './app-routing.module';
import { Pages } from './controllers/pages/pages';
>>>>>>>
import { TopbarWrapperComponent } from './page/topbar.component';
import { PageComponent } from './page/page.component';
import { AppRoutingModule } from './app-routing.module';
import { Pages } from './controllers/pages/pages';
<<<<<<<
declarations: [
Minds,
TopbarWrapperComponent,
PageComponent,
MINDS_APP_ROUTING_DECLARATIONS,
MINDS_DECLARATIONS,
MINDS_PLUGIN_DECLARATIONS,
],
=======
declarations: [Minds, Pages],
>>>>>>>
declarations: [Minds, TopbarWrapperComponent, PageComponent, Pages], |
<<<<<<<
import { NestedMenuComponent } from './layout/nested-menu/nested-menu.component';
=======
import { StackableModalComponent } from './components/stackable-modal/stackable-modal.component';
>>>>>>>
import { NestedMenuComponent } from './layout/nested-menu/nested-menu.component';
import { StackableModalComponent } from './components/stackable-modal/stackable-modal.component';
<<<<<<<
NestedMenuComponent,
=======
StackableModalComponent,
>>>>>>>
NestedMenuComponent,
StackableModalComponent,
<<<<<<<
NestedMenuComponent,
=======
StackableModalComponent,
>>>>>>>
NestedMenuComponent,
StackableModalComponent, |
<<<<<<<
import { Component, ChangeDetectionStrategy, ChangeDetectorRef, EventEmitter, ElementRef, Input } from '@angular/core';
=======
import { Component, EventEmitter, ElementRef, Input, ViewChild } from '@angular/core';
>>>>>>>
import { Component, ChangeDetectionStrategy, ChangeDetectorRef, EventEmitter, ElementRef, Input, ViewChild } from '@angular/core'; |
<<<<<<<
import {
ChangeDetectorRef,
Component,
NgZone,
PLATFORM_ID,
Inject,
} from '@angular/core';
import { isPlatformBrowser } from '@angular/common';
=======
import { ChangeDetectorRef, Component, HostBinding } from '@angular/core';
>>>>>>>
import {
ChangeDetectorRef,
Component,
PLATFORM_ID,
Inject,
HostBinding,
} from '@angular/core';
import { isPlatformBrowser } from '@angular/common';
<<<<<<<
@Inject(PLATFORM_ID) private platformId,
=======
private diagnostics: DiagnosticsService,
private routerHistoryService: RouterHistoryService,
private site: SiteService,
private sso: SsoService,
private cd: ChangeDetectorRef
>>>>>>>
@Inject(PLATFORM_ID) private platformId,
private diagnostics: DiagnosticsService,
private routerHistoryService: RouterHistoryService,
private site: SiteService,
private sso: SsoService,
private cd: ChangeDetectorRef
<<<<<<<
this.session.isLoggedIn(async (is) => {
if (is) {
this.showOnboarding = await this.onboardingService.showModal();
=======
try {
this.diagnostics.setUser(this.minds.user);
this.diagnostics.listen(); // Listen for user changes
if (this.sso.isRequired()) {
await this.sso.connect();
}
} catch (e) {
console.error('ngOnInit()', e);
}
this.ready = true;
this.detectChanges();
try {
await this.initialize();
} catch (e) {
console.error('initialize()', e);
}
}
async initialize() {
this.blockListService.fetch();
if (!this.site.isProDomain) {
this.notificationService.getNotifications();
}
this.session.isLoggedIn(async is => {
if (is && !this.site.isProDomain) {
if (!this.site.isProDomain) {
this.showOnboarding = await this.onboardingService.showModal();
}
>>>>>>>
try {
this.diagnostics.setUser(this.minds.user);
this.diagnostics.listen(); // Listen for user changes
if (this.sso.isRequired()) {
await this.sso.connect();
}
} catch (e) {
console.error('ngOnInit()', e);
}
this.ready = true;
this.detectChanges();
try {
await this.initialize();
} catch (e) {
console.error('initialize()', e);
}
}
async initialize() {
this.blockListService.fetch();
if (!this.site.isProDomain) {
this.notificationService.getNotifications();
}
this.session.isLoggedIn(async is => {
if (is && !this.site.isProDomain) {
if (!this.site.isProDomain) {
this.showOnboarding = await this.onboardingService.showModal();
}
<<<<<<<
if (isPlatformBrowser(this.platformId) && this.session.isLoggedIn()) {
this.blockListService.sync();
}
=======
this.themeService.setUp();
>>>>>>>
this.themeService.setUp();
<<<<<<<
//this.paramsSubscription.unsubscribe();
=======
}
@HostBinding('class') get cssColorSchemeOverride() {
if (!this.site.isProDomain || !this.site.pro.scheme) {
return '';
}
return `m-theme--wrapper m-theme--wrapper__${this.site.pro.scheme}`;
}
get isProDomain() {
return this.site.isProDomain;
}
detectChanges() {
this.cd.markForCheck();
this.cd.detectChanges();
>>>>>>>
}
@HostBinding('class') get cssColorSchemeOverride() {
if (!this.site.isProDomain || !this.site.pro.scheme) {
return '';
}
return `m-theme--wrapper m-theme--wrapper__${this.site.pro.scheme}`;
}
get isProDomain() {
return this.site.isProDomain;
}
detectChanges() {
this.cd.markForCheck();
this.cd.detectChanges(); |
<<<<<<<
this.configs = await this.client.get('api/v1/minds/config');
this.isReady$.next(true);
=======
this.configs = await this.client.get(
`api/v1/minds/config${this.queryString}`
);
>>>>>>>
this.configs = await this.client.get(
`api/v1/minds/config${this.queryString}`
);
this.isReady$.next(true); |
<<<<<<<
import { ConfigsService } from './services/configs.service';
import { CookieService } from './services/cookie.service';
import { MetaService } from './services/meta.service';
import { Title, Meta } from '@angular/platform-browser';
import { MediaProxyService } from './services/media-proxy.service';
=======
import { HorizontalFeedService } from './services/horizontal-feed.service';
PlotlyModule.plotlyjs = PlotlyJS;
>>>>>>>
import { ConfigsService } from './services/configs.service';
import { CookieService } from './services/cookie.service';
import { MetaService } from './services/meta.service';
import { Title, Meta } from '@angular/platform-browser';
import { MediaProxyService } from './services/media-proxy.service';
import { HorizontalFeedService } from './services/horizontal-feed.service';
<<<<<<<
AttachmentService,
CookieService,
=======
PagesService,
{
provide: AttachmentService,
useFactory: AttachmentService._,
deps: [Session, Client, Upload, HttpClient],
},
>>>>>>>
AttachmentService,
CookieService,
PagesService,
<<<<<<<
{
provide: ConfigsService,
useFactory: client => new ConfigsService(client),
deps: [Client],
},
{
provide: MetaService,
useFactory: (
titleService,
metaService,
siteService,
location,
configsService
) =>
new MetaService(
titleService,
metaService,
siteService,
location,
configsService
),
deps: [Title, Meta, SiteService, Location, ConfigsService],
},
MediaProxyService,
=======
{
provide: V2TopbarService,
useFactory: V2TopbarService._,
},
{
provide: SidebarMarkersService,
useFactory: SidebarMarkersService._,
},
HorizontalFeedService,
>>>>>>>
{
provide: ConfigsService,
useFactory: client => new ConfigsService(client),
deps: [Client],
},
{
provide: MetaService,
useFactory: (
titleService,
metaService,
siteService,
location,
configsService
) =>
new MetaService(
titleService,
metaService,
siteService,
location,
configsService
),
deps: [Title, Meta, SiteService, Location, ConfigsService],
},
MediaProxyService,
V2TopbarService,
{
provide: SidebarMarkersService,
useFactory: SidebarMarkersService._,
},
HorizontalFeedService, |
<<<<<<<
import {
Component,
EventEmitter,
Output,
ViewChild,
Inject,
PLATFORM_ID,
} from '@angular/core';
=======
import {
Component,
EventEmitter,
OnInit,
Output,
ViewChild,
} from '@angular/core';
>>>>>>>
import {
Component,
EventEmitter,
Output,
Inject,
PLATFORM_ID,
OnInit,
} from '@angular/core';
<<<<<<<
export class ChannelSidebar {
=======
export class ChannelSidebar implements OnInit {
minds = window.Minds;
>>>>>>>
export class ChannelSidebar implements OnInit {
<<<<<<<
isPlatformBrowser(this.platformId) &&
=======
!this.featuresService.has('onboarding-december-2019') &&
>>>>>>>
isPlatformBrowser(this.platformId) &&
!this.featuresService.has('onboarding-december-2019') && |
<<<<<<<
{ provide: FeaturesService, useValue: MockService(FeaturesService) },
=======
{ provide: FormToastService, useValue: MockService(FormToastService) },
>>>>>>>
{ provide: FeaturesService, useValue: MockService(FeaturesService) },
{ provide: FormToastService, useValue: MockService(FormToastService) }, |
<<<<<<<
import { FeaturesService } from "../../services/features.service";
=======
import { PosterComponent } from '../newsfeed/poster/poster.component';
import { Observable } from 'rxjs';
import { DialogService } from '../../common/services/confirm-leave-dialog.service'
>>>>>>>
import { FeaturesService } from "../../services/features.service";
import { PosterComponent } from '../newsfeed/poster/poster.component';
import { Observable } from 'rxjs';
import { DialogService } from '../../common/services/confirm-leave-dialog.service'
<<<<<<<
setSort(algorithm: string, period: string | null, customType: string | null) {
if (algorithm === 'latest') {
// Cassandra listing.
// TODO: Remove when ElasticSearch is fully implemented
this.algorithm = algorithm;
this.period = null;
this.customType = null;
this.router.navigate(['/', this.username]);
return;
}
this.algorithm = algorithm;
this.period = period;
this.customType = customType;
let route: any[] = [ '/', this.username, 'sort', algorithm ];
const params: any = {};
if (period) {
params.period = period;
}
if (customType && customType !== 'activities') {
params.type = customType;
}
route.push(params);
this.router.navigate(route);
}
=======
/**
* canDeactivate()
* Determines whether a page can be deactivated.
* In this instance, a confirmation is needed from the user
* when requesting a new page if editing === true
*
* @returns { Observable<boolean> | boolean }
*/
canDeactivate(): Observable<boolean> | boolean {
if (!this.editing) {
return true;
}
return this.dialogService.confirm('Discard changes?');
}
>>>>>>>
setSort(algorithm: string, period: string | null, customType: string | null) {
if (algorithm === 'latest') {
// Cassandra listing.
// TODO: Remove when ElasticSearch is fully implemented
this.algorithm = algorithm;
this.period = null;
this.customType = null;
this.router.navigate(['/', this.username]);
return;
}
this.algorithm = algorithm;
this.period = period;
this.customType = customType;
let route: any[] = [ '/', this.username, 'sort', algorithm ];
const params: any = {};
if (period) {
params.period = period;
}
if (customType && customType !== 'activities') {
params.type = customType;
}
route.push(params);
this.router.navigate(route);
}
/**
* canDeactivate()
* Determines whether a page can be deactivated.
* In this instance, a confirmation is needed from the user
* when requesting a new page if editing === true
*
* @returns { Observable<boolean> | boolean }
*/
canDeactivate(): Observable<boolean> | boolean {
if (!this.editing) {
return true;
}
return this.dialogService.confirm('Discard changes?');
} |
<<<<<<<
import { CanDeactivateGuardService } from './can-deactivate-guard';
=======
import { OverlayModalService } from './ux/overlay-modal';
>>>>>>>
import { CanDeactivateGuardService } from './can-deactivate-guard';
import { OverlayModalService } from './ux/overlay-modal';
<<<<<<<
{
provide: CanDeactivateGuardService,
useFactory: CanDeactivateGuardService._
},
=======
{
provide: OverlayModalService,
useFactory: OverlayModalService._
}
>>>>>>>
{
provide: CanDeactivateGuardService,
useFactory: CanDeactivateGuardService._
},
{
provide: OverlayModalService,
useFactory: OverlayModalService._
} |
<<<<<<<
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { ConfigsService } from '../../services/configs.service';
=======
import {
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
HostListener,
OnInit,
} from '@angular/core';
>>>>>>>
import {
ChangeDetectionStrategy,
Component,
ChangeDetectorRef,
OnInit,
HostListener,
} from '@angular/core';
import { ConfigsService } from '../../services/configs.service';
<<<<<<<
readonly cdnAssetsUrl: string;
constructor(private configs: ConfigsService) {
this.cdnAssetsUrl = configs.get('cdn_assets_url');
}
=======
readonly cdnAssetsUrl: string = window.Minds.cdn_assets_url;
isMobile: boolean;
constructor(protected cd: ChangeDetectorRef) {}
ngOnInit() {
this.onResize();
}
@HostListener('window:resize')
onResize() {
this.isMobile = window.innerWidth <= 480;
this.detectChanges();
}
detectChanges() {
this.cd.markForCheck();
this.cd.detectChanges();
}
>>>>>>>
readonly cdnAssetsUrl: string;
isMobile: boolean;
constructor(
private configs: ConfigsService,
protected cd: ChangeDetectorRef
) {
this.cdnAssetsUrl = configs.get('cdn_assets_url');
}
ngOnInit() {
this.onResize();
}
@HostListener('window:resize')
onResize() {
this.isMobile = window.innerWidth <= 480;
this.detectChanges();
}
detectChanges() {
this.cd.markForCheck();
this.cd.detectChanges();
} |
<<<<<<<
const useFanControl = this.getFanControlStatus();
=======
// Decide on a fan control approach
// Per default fans are controlled individually depending on temp sensor and their chosen logic
wmiAPI.getModuleInfo(moduleInfo);
// Use 'same speed' approach for uniwill devices. Necessary since the fans on some
// devices can not be controlled individually.
if (moduleInfo.activeInterface === 'uniwill') {
this.modeSameSpeed = true;
}
const profile = this.tccd.getCurrentProfile();
let useFanControl;
if (profile.fan === undefined || profile.fan.useControl === undefined || profile.fan.fanProfile === undefined) {
useFanControl = this.tccd.getDefaultProfile().fan.useControl;
} else {
useFanControl = profile.fan.useControl;
}
>>>>>>>
const useFanControl = this.getFanControlStatus();
// Decide on a fan control approach
// Per default fans are controlled individually depending on temp sensor and their chosen logic
wmiAPI.getModuleInfo(moduleInfo);
// Use 'same speed' approach for uniwill devices. Necessary since the fans on some
// devices can not be controlled individually.
if (moduleInfo.activeInterface === 'uniwill') {
this.modeSameSpeed = true;
} |
<<<<<<<
import { TuxedoWMIAPI as wmiAPI, TuxedoWMIAPI, ObjWrapper } from '../../native-lib/TuxedoWMIAPI';
import { FanControlLogic } from './FanControlLogic';
=======
import { TuxedoWMIAPI as wmiAPI, IFanInfo, TuxedoWMIAPI } from '../../native-lib/TuxedoWMIAPI';
import { FanControlLogic, FAN_LOGIC } from './FanControlLogic';
>>>>>>>
import { TuxedoWMIAPI as wmiAPI, TuxedoWMIAPI, ObjWrapper } from '../../native-lib/TuxedoWMIAPI';
import { FanControlLogic, FAN_LOGIC } from './FanControlLogic'; |
<<<<<<<
import extraScopePlugin from 'stylis-plugin-extra-scope';
import { Upgrade } from '../Upgrades';
=======
import { Context, Plugin } from '@emotion/stylis';
import Upgrade from '../Upgrades';
>>>>>>>
import { Context, Plugin } from '@emotion/stylis';
import { Upgrade } from '../Upgrades'; |
<<<<<<<
displayDiagnostics: configOptions.get('displayDiagnostics') as boolean,
=======
hideReplUi: configOptions.get('hideReplUi') as boolean,
>>>>>>>
displayDiagnostics: configOptions.get('displayDiagnostics') as boolean,
hideReplUi: configOptions.get('hideReplUi') as boolean, |
<<<<<<<
import { AuthService } from '../../auth.service';
import { MaterializeAction } from 'angular2-materialize';
=======
import { ImageDisplayService } from '../../_services/image-display.service';
>>>>>>>
import { AuthService } from '../../auth.service';
import { MaterializeAction } from 'angular2-materialize';
import { ImageDisplayService } from '../../_services/image-display.service';
<<<<<<<
currentUserId: string;
globalActions = new EventEmitter<string|MaterializeAction>();
=======
projectImage: any = '';
>>>>>>>
currentUserId: string;
globalActions = new EventEmitter<string|MaterializeAction>();
projectImage: any = '';
<<<<<<<
private router: Router,
private auth: AuthService) {
=======
private router: Router,
private location: Location,
private imageDisplay: ImageDisplayService) {
>>>>>>>
private router: Router,
private auth: AuthService,
private location: Location,
private imageDisplay: ImageDisplayService) {
<<<<<<<
const id = +params['projectId'];
=======
const id = params['projectId'];
>>>>>>>
const id = params['projectId']; |
<<<<<<<
import { Organization } from '../common/organization';
=======
import { Organization } from './organization';
>>>>>>>
import { Organization } from './organization';
<<<<<<<
getUserOrganization(id: number): Observable<Organization> {
return this.http.get(
`${organizationUrl}/user/${id}`
).map(res => res.json());
}
=======
>>>>>>>
getUserOrganization(id: number): Observable<Organization> {
return this.http.get(
`${organizationUrl}/user/${id}`
).map(res => res.json());
} |
<<<<<<<
context.subscriptions.push(vscode.commands.registerCommand('calva.evaluateTopLevelFormAsComment', EvaluateMiddleWare.evaluateTopLevelFormAsComment));
=======
context.subscriptions.push(vscode.commands.registerCommand('calva.togglePrettyPrint', EvaluateMiddleWare.togglePrettyPrint));
>>>>>>>
context.subscriptions.push(vscode.commands.registerCommand('calva.evaluateTopLevelFormAsComment', EvaluateMiddleWare.evaluateTopLevelFormAsComment));
context.subscriptions.push(vscode.commands.registerCommand('calva.togglePrettyPrint', EvaluateMiddleWare.togglePrettyPrint)); |
<<<<<<<
import { Component, DoCheck } from '@angular/core';
import { Router } from '@angular/router';
import { AuthService } from './auth.service';
import { OrganizationService } from './organization/common/organization.service';
import { Organization } from './organization/common/organization';
@Component({
// moduleId: module.id, // For webpack, remove this
selector: 'my-app',
providers: [AuthService],
templateUrl: './app.component.html',
styleUrls: [ 'app.component.scss' ]
})
export class AppComponent implements DoCheck {
currentUserId: string;
organizationId: string;
constructor(private router: Router, private auth: AuthService, private organizationService: OrganizationService) {
this.auth.handleAuthentication();
}
// control nav style by changing the class name
isAtHome() {
if (this.router.url === '/' || this.router.url === '/#!') {
return 'at-home';
} else {
return 'off-home';
}
}
ngDoCheck() {
if (this.auth.authenticated() && this.currentUserId == null) {
this.currentUserId = this.auth.getCurrentUserId();
if (this.currentUserId !== '0' && this.currentUserId !== null ) {
// for a non-profit user, get the associated org-id
this.organizationService.getUserOrganization(+this.currentUserId).subscribe(
res => {
let organization: Organization;
// will contain at most 1 entry in the array when a match is found,
// otherwise, data is undefined
organization = res[0];
if (organization !== undefined) {
this.organizationId = organization.id.toString();
localStorage.setItem('userOrganizationId', organization.id.toString());
}
},
error => console.log(error)
);
}
}
}
}
=======
import { Component, DoCheck } from '@angular/core';
import { Router } from '@angular/router';
import { AuthService } from './auth.service';
import { OrganizationService } from './organization/common/organization.service';
import { Organization } from './organization/common/organization';
@Component({
// moduleId: module.id, // For webpack, remove this
selector: 'my-app',
providers: [AuthService],
templateUrl: './app.component.html',
styleUrls: [ 'app.component.scss' ]
})
export class AppComponent {
currentUserId: string;
organizationId: string;
authSvc: AuthService;
constructor(private router: Router, private auth: AuthService, private organizationService: OrganizationService) {
this.authSvc = this.auth;
}
// control nav style by changing the class name
isAtHome() {
if (this.router.url === '/' || this.router.url === '/#!') {
return 'at-home';
} else {
return 'off-home';
}
}
/*ngDoCheck() {
if (this.auth.authenticated() && this.currentUserId == null) {
this.currentUserId = this.auth.getCurrentUserId();
if (this.currentUserId !== '0' && this.currentUserId !== null ) {
// for a non-profit user, get the associated org-id
this.organizationService.getUserOrganization(+this.currentUserId).subscribe(
res => {
let organization: Organization;
// will contain at most 1 entry in the array when a match is found,
// otherwise, data is undefined
organization = res[0];
if (organization !== undefined) {
this.organizationId = organization.id.toString();
localStorage.setItem('userOrganizationId', organization.id.toString());
}
},
error => console.log(error)
);
}
}
}*/
}
>>>>>>>
import { Component, DoCheck } from '@angular/core';
import { Router } from '@angular/router';
import { AuthService } from './auth.service';
import { OrganizationService } from './organization/common/organization.service';
import { Organization } from './organization/common/organization';
@Component({
// moduleId: module.id, // For webpack, remove this
selector: 'my-app',
providers: [AuthService],
templateUrl: './app.component.html',
styleUrls: [ 'app.component.scss' ]
})
export class AppComponent {
currentUserId: string;
organizationId: string;
constructor(private router: Router, private auth: AuthService, private organizationService: OrganizationService) {
this.auth.handleAuthentication();
}
// control nav style by changing the class name
isAtHome() {
if (this.router.url === '/' || this.router.url === '/#!') {
return 'at-home';
} else {
return 'off-home';
}
}
/*ngDoCheck() {
if (this.auth.authenticated() && this.currentUserId == null) {
this.currentUserId = this.auth.getCurrentUserId();
if (this.currentUserId !== '0' && this.currentUserId !== null ) {
// for a non-profit user, get the associated org-id
this.organizationService.getUserOrganization(+this.currentUserId).subscribe(
res => {
let organization: Organization;
// will contain at most 1 entry in the array when a match is found,
// otherwise, data is undefined
organization = res[0];
if (organization !== undefined) {
this.organizationId = organization.id.toString();
localStorage.setItem('userOrganizationId', organization.id.toString());
}
},
error => console.log(error)
);
}
}
}*/
} |
<<<<<<<
import {Component, OnInit} from '@angular/core';
import {Router, ActivatedRoute} from '@angular/router';
=======
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
>>>>>>>
import {Component, OnInit, OnDestroy} from '@angular/core';
import {Router, ActivatedRoute} from '@angular/router';
<<<<<<<
import {Project} from '../common/project';
import {ProjectService} from '../common/project.service';
import { PagerService } from '../../_services/pager.service';
import { AuthService } from '../../auth.service';
import { OrganizationService } from '../../organization/common/organization.service';
import { User } from '../../user/common/user';
=======
import { Project } from '../common/project';
import { ProjectService } from '../common/project.service';
import { AuthService } from '../../auth.service';
>>>>>>>
import {Project} from '../common/project';
import {ProjectService} from '../common/project.service';
import { AuthService } from '../../auth.service';
import { OrganizationService } from '../../organization/common/organization.service';
import { User } from '../../user/common/user';
<<<<<<<
pagedItems: any[]; // paged items
pager: any = {}; // pager Object
=======
>>>>>>>
pagedItems: any[]; // paged items
pager: any = {}; // pager Object
<<<<<<<
userId: number;
orgId: number;
from: any;
=======
userId: number;
>>>>>>>
userId: number;
orgId: number;
from: any;
<<<<<<<
private pagerService: PagerService,
private organizationService: OrganizationService,
=======
>>>>>>>
private organizationService: OrganizationService,
<<<<<<<
private auth: AuthService,
private route: ActivatedRoute
=======
private auth: AuthService
>>>>>>>
private auth: AuthService,
private route: ActivatedRoute |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.