Skip to content

Commit f5c784b

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/develop' into fix/search_functionality
# Conflicts: # src/services/SupabaseDataService.ts
2 parents 4b7031c + cbefb22 commit f5c784b

29 files changed

+4783
-457
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"commitlint": "commitlint --config commitlintrc.ts --edit"
2525
},
2626
"dependencies": {
27-
"@envelop/graphql-middleware": "^6.0.0",
2827
"@graphql-tools/merge": "^9.0.3",
2928
"@graphql-yoga/plugin-response-cache": "^3.5.0",
3029
"@hypercerts-org/marketplace-sdk": "0.3.36",

pnpm-lock.yaml

Lines changed: 104 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

schema.graphql

Lines changed: 113 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -252,40 +252,20 @@ input BooleanSearchOptions {
252252

253253
"""Collection of hypercerts for reference and display purposes"""
254254
type Collection {
255-
"""Address of the collection owner"""
256-
admin_id: String!
257-
258-
"""Background image of the collection"""
259-
background_image: String
255+
admins: [User!]!
260256

261257
"""Chain ID of the collection"""
262-
chain_id: EthBigInt
258+
chain_ids: [EthBigInt!]
263259

264-
"""Whether the collection should be rendered as a grayscale image"""
265-
grayscale_image: Boolean
260+
"""Creation timestamp of the collection"""
261+
created_at: String!
262+
263+
"""Description of the collection"""
264+
description: String!
266265
id: ID!
267266

268267
"""Name of the collection"""
269268
name: String!
270-
271-
"""Color of the borders of the hypercert collection"""
272-
tile_border_color: String
273-
}
274-
275-
input CollectionFetchInput {
276-
by: CollectionSortOptions
277-
}
278-
279-
input CollectionSortOptions {
280-
admin_id: SortOrder
281-
chainId: SortOrder
282-
name: SortOrder
283-
}
284-
285-
input CollectionWhereInput {
286-
admin_id: StringSearchOptions
287-
chain_id: BigIntSearchOptions
288-
id: IdSearchOptions
289269
}
290270

291271
"""Pointer to a contract deployed on a chain"""
@@ -404,11 +384,6 @@ type GetAttestationsSchemaResponse {
404384
data: [AttestationSchema!]
405385
}
406386

407-
type GetCollectionsResponse {
408-
count: Int
409-
data: [Collection!]
410-
}
411-
412387
"""Pointer to a contract deployed on a chain"""
413388
type GetContractsResponse {
414389
count: Int
@@ -421,6 +396,11 @@ type GetFractionsResponse {
421396
data: [Fraction!]
422397
}
423398

399+
type GetHyperboardsResponse {
400+
count: Int
401+
data: [Hyperboard!]
402+
}
403+
424404
"""
425405
Hypercert with metadata, contract, orders, sales and fraction information
426406
"""
@@ -456,6 +436,44 @@ type GetUsersResponse {
456436
data: [User!]
457437
}
458438

439+
"""Hyperboard of hypercerts for reference and display purposes"""
440+
type Hyperboard {
441+
admins: [User!]!
442+
443+
"""Background image of the hyperboard"""
444+
background_image: String
445+
446+
"""Chain ID of the hyperboard"""
447+
chain_ids: [EthBigInt!]
448+
449+
"""Whether the hyperboard should be rendered as a grayscale image"""
450+
grayscale_images: Boolean
451+
id: ID!
452+
453+
"""Name of the hyperboard"""
454+
name: String!
455+
sections: SectionResponseType!
456+
457+
"""Color of the borders of the hyperboard"""
458+
tile_border_color: String
459+
}
460+
461+
input HyperboardFetchInput {
462+
by: HyperboardSortOptions
463+
}
464+
465+
input HyperboardSortOptions {
466+
admin_id: SortOrder
467+
chainId: SortOrder
468+
name: SortOrder
469+
}
470+
471+
input HyperboardWhereInput {
472+
admin_id: StringSearchOptions
473+
chain_id: BigIntSearchOptions
474+
id: IdSearchOptions
475+
}
476+
459477
"""
460478
Hypercert with metadata, contract, orders, sales and fraction information
461479
"""
@@ -757,9 +775,9 @@ type Query {
757775
allowlistRecords(first: Int, offset: Int, sort: AllowlistRecordFetchInput, where: AllowlistRecordWhereInput): GetAllowlistRecordResponse!
758776
attestationSchemas(first: Int, offset: Int): GetAttestationsSchemaResponse!
759777
attestations(first: Int, offset: Int, sort: AttestationFetchInput, where: AttestationWhereInput): GetAttestationsResponse!
760-
collections(first: Int, offset: Int, sort: CollectionFetchInput, where: CollectionWhereInput): GetCollectionsResponse!
761778
contracts(first: Int, offset: Int, sort: ContractFetchInput, where: ContractWhereInput): GetContractsResponse!
762779
fractions(first: Int, offset: Int, sort: FractionFetchInput, where: FractionWhereInput): GetFractionsResponse!
780+
hyperboards(first: Int, offset: Int, sort: HyperboardFetchInput, where: HyperboardWhereInput): GetHyperboardsResponse!
763781
hypercerts(first: Int, offset: Int, sort: HypercertFetchInput, where: HypercertsWhereArgs): GetHypercertsResponse!
764782
metadata(first: Int, offset: Int, sort: MetadataFetchInput, where: MetadataWhereInput): GetMetadataResponse!
765783
orders(first: Int, offset: Int, sort: OrderFetchInput, where: OrderWhereInput): GetOrdersResponse!
@@ -837,6 +855,65 @@ input SaleWhereInput {
837855
transaction_hash: IdSearchOptions
838856
}
839857

858+
"""Section representing a collection within a hyperboard"""
859+
type Section {
860+
collection: Collection!
861+
entries: [SectionEntry!]!
862+
label: String!
863+
owners: [SectionOwner!]!
864+
}
865+
866+
"""Entry representing a hypercert or blueprint within a section"""
867+
type SectionEntry {
868+
display_size: Float!
869+
870+
"""ID of the hypercert or blueprint"""
871+
id: String!
872+
is_blueprint: Boolean!
873+
874+
"""Name of the hypercert or blueprint"""
875+
name: String
876+
owners: [SectionEntryOwner!]!
877+
percentage_of_section: Float!
878+
total_units: BigInt
879+
}
880+
881+
type SectionEntryOwner {
882+
"""The address of the user"""
883+
address: String!
884+
885+
"""The avatar of the user"""
886+
avatar: String
887+
888+
"""The chain ID of the user"""
889+
chain_id: EthBigInt
890+
891+
"""The display name of the user"""
892+
display_name: String
893+
percentage: Float!
894+
units: BigInt
895+
}
896+
897+
type SectionOwner {
898+
"""The address of the user"""
899+
address: String!
900+
901+
"""The avatar of the user"""
902+
avatar: String
903+
904+
"""The chain ID of the user"""
905+
chain_id: EthBigInt
906+
907+
"""The display name of the user"""
908+
display_name: String
909+
percentage_owned: Float!
910+
}
911+
912+
type SectionResponseType {
913+
count: Float!
914+
data: [Section!]!
915+
}
916+
840917
"""The direction to sort the query results"""
841918
enum SortOrder {
842919
"""Ascending order"""
@@ -870,6 +947,9 @@ type User {
870947
"""The avatar of the user"""
871948
avatar: String
872949

950+
"""The chain ID of the user"""
951+
chain_id: EthBigInt
952+
873953
"""The display name of the user"""
874954
display_name: String
875955
}

src/__generated__/routes/routes.ts

Lines changed: 134 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)