Skip to content

Commit 24f1ed1

Browse files
dOrgJellidOrgJelli
authored
Merge pull request #74 from dOrgTech/fixing_details
Latest improvements
2 parents 4b3dd20 + 11731db commit 24f1ed1

68 files changed

Lines changed: 658 additions & 296 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎documentation/api.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ id: string; // plugin id
139139
```html
140140
<Plugin id="0x">
141141
<Plugin.Data>
142-
{(pluginInfo: PluginData) => <div> Scheme name: ${pluginInfo.name} </div> }
142+
{(pluginInfo: PluginData) => <div> Plugin name: ${pluginInfo.name} </div> }
143143
</Plugin.Data>
144144
<Plugin.Entity>
145145
{(pluginEntity: PluginEntity) => (

‎env/docker-compose.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,21 @@ services:
2121
ipfs: ipfs:5001
2222
ethereum: private:http://ganache:8545
2323
GRAPH_LOG: "graph.log"
24-
GRAPH_IPFS_TIMEOUT: "2"
25-
GRAPH_MAX_IPFS_FILE_BYTES: "990000"
26-
GRAPH_GRAPHQL_MAX_FIRST: "1000"
24+
GRAPH_GRAPHQL_MAX_FIRST: 1000
2725

2826
ipfs:
29-
image: daostack/test-env-experimental-ipfs:4.0.6
27+
image: daostack/test-env-experimental-ipfs:4.0.10
3028
ports:
3129
- 5001:5001
3230

3331
postgres:
34-
image: daostack/test-env-experimental-postgres:4.0.6
32+
image: daostack/test-env-experimental-postgres:4.0.10
3533
ports:
3634
- 9432:5432
3735
environment:
3836
POSTGRES_PASSWORD: "letmein"
3937

4038
ganache:
41-
image: daostack/test-env-experimental-ganache:4.0.6
39+
image: daostack/test-env-experimental-ganache:4.0.10
4240
ports:
4341
- 8545:8545

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"start:subgraph": "concurrently \"npm:start:graphnode\"",
1010
"start:graphnode": "docker-compose -f ./env/docker-compose.yml up graph-node",
1111
"stop:graphnode": "docker-compose -f ./env/docker-compose.yml down -v",
12-
"test": "jest --forceExit --runInBand",
12+
"test": "jest --forceExit --runInBand test/**/*.spec.tsx",
1313
"lint": "eslint --quiet src/**/*.tsx test/**/*.tsx",
1414
"build": "tsc",
1515
"build:release": "rm -rf ./dist && tsc && rm -rf ./dist/storybook",
@@ -18,7 +18,7 @@
1818
"release": "npm run build:release && npm run package:release && npm publish ./package --access public"
1919
},
2020
"dependencies": {
21-
"@dorgtech/arc.js": "^2.0.0-experimental.9",
21+
"@daostack/arc.js": "2.0.0-experimental.33",
2222
"apollo-link-retry": "^2.2.16",
2323
"memoize-one": "^5.0.0",
2424
"ramda": "^0.26.1",

‎src/components/DAO.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from "react";
2-
import { DAO as Entity, IDAOState as Data } from "@dorgtech/arc.js";
2+
import { DAO as Entity, IDAOState as Data } from "@daostack/arc.js";
33
import {
44
Arc as Protocol,
55
ArcConfig as ProtocolConfig,

‎src/components/DAOs.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from "react";
22
import { Observable } from "rxjs";
3-
import { IDAOQueryOptions as FilterOptions } from "@dorgtech/arc.js";
3+
import { IDAOQueryOptions as FilterOptions } from "@daostack/arc.js";
44
import {
55
Arc as Protocol,
66
ArcConfig as ProtocolConfig,
@@ -52,24 +52,24 @@ class InferredDAOs extends ComponentList<InferredProps, Component> {
5252

5353
public static get Entities() {
5454
return CreateContextFeed(
55-
this._EntitiesContext.Consumer,
56-
this._LogsContext.Consumer,
55+
this.EntitiesContext.Consumer,
56+
this.LogsContext.Consumer,
5757
"DAOs"
5858
);
5959
}
6060

6161
public static get Logs() {
6262
return CreateContextFeed(
63-
this._LogsContext.Consumer,
64-
this._LogsContext.Consumer,
63+
this.LogsContext.Consumer,
64+
this.LogsContext.Consumer,
6565
"DAOs"
6666
);
6767
}
6868

69-
protected static _EntitiesContext = React.createContext<Entity[] | undefined>(
69+
protected static EntitiesContext = React.createContext<Entity[] | undefined>(
7070
undefined
7171
);
72-
protected static _LogsContext = React.createContext<
72+
protected static LogsContext = React.createContext<
7373
ComponentListLogs | undefined
7474
>(undefined);
7575
}

‎src/components/Member.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from "react";
2-
import { Member as Entity, IMemberState as Data } from "@dorgtech/arc.js";
2+
import { Member as Entity, IMemberState as Data } from "@daostack/arc.js";
33
import {
44
Arc as Protocol,
55
ArcConfig as ProtocolConfig,

‎src/components/Members.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from "react";
22
import { Observable } from "rxjs";
3-
import { IMemberQueryOptions as FilterOptions } from "@dorgtech/arc.js";
3+
import { IMemberQueryOptions as FilterOptions } from "@daostack/arc.js";
44
import {
55
Arc as Protocol,
66
ArcConfig as ProtocolConfig,
@@ -68,24 +68,24 @@ class InferredMembers extends ComponentList<InferredProps, Component> {
6868

6969
public static get Entities() {
7070
return CreateContextFeed(
71-
this._EntitiesContext.Consumer,
72-
this._LogsContext.Consumer,
71+
this.EntitiesContext.Consumer,
72+
this.LogsContext.Consumer,
7373
"Members"
7474
);
7575
}
7676

7777
public static get Logs() {
7878
return CreateContextFeed(
79-
this._LogsContext.Consumer,
80-
this._LogsContext.Consumer,
79+
this.LogsContext.Consumer,
80+
this.LogsContext.Consumer,
8181
"Members"
8282
);
8383
}
8484

85-
protected static _EntitiesContext = React.createContext<Entity[] | undefined>(
85+
protected static EntitiesContext = React.createContext<Entity[] | undefined>(
8686
undefined
8787
);
88-
protected static _LogsContext = React.createContext<
88+
protected static LogsContext = React.createContext<
8989
ComponentListLogs | undefined
9090
>(undefined);
9191
}

‎src/components/Queue.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from "react";
2-
import { Queue as Entity, IQueueState as Data } from "@dorgtech/arc.js";
2+
import { Queue as Entity, IQueueState as Data } from "@daostack/arc.js";
33
import {
44
Arc as Protocol,
55
ArcConfig as ProtocolConfig,

‎src/components/Queues.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from "react";
22
import { Observable } from "rxjs";
3-
import { IQueueQueryOptions as FilterOptions } from "@dorgtech/arc.js";
3+
import { IQueueQueryOptions as FilterOptions } from "@daostack/arc.js";
44
import {
55
Arc as Protocol,
66
ArcConfig as ProtocolConfig,
@@ -66,24 +66,24 @@ class InferredQueues extends ComponentList<InferredProps, Component> {
6666

6767
public static get Entities() {
6868
return CreateContextFeed(
69-
this._EntitiesContext.Consumer,
70-
this._LogsContext.Consumer,
69+
this.EntitiesContext.Consumer,
70+
this.LogsContext.Consumer,
7171
"Queues"
7272
);
7373
}
7474

7575
public static get Logs() {
7676
return CreateContextFeed(
77-
this._LogsContext.Consumer,
78-
this._LogsContext.Consumer,
77+
this.LogsContext.Consumer,
78+
this.LogsContext.Consumer,
7979
"Queues"
8080
);
8181
}
8282

83-
protected static _EntitiesContext = React.createContext<Entity[] | undefined>(
83+
protected static EntitiesContext = React.createContext<Entity[] | undefined>(
8484
undefined
8585
);
86-
protected static _LogsContext = React.createContext<
86+
protected static LogsContext = React.createContext<
8787
ComponentListLogs | undefined
8888
>(undefined);
8989
}

‎src/components/Reputation.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from "react";
22
import {
33
Reputation as Entity,
44
IReputationState as Data,
5-
} from "@dorgtech/arc.js";
5+
} from "@daostack/arc.js";
66
import {
77
Arc as Protocol,
88
ArcConfig as ProtocolConfig,

0 commit comments

Comments
 (0)