Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(server): add array and timeline valuetype to property #770

Merged
merged 9 commits into from
Oct 27, 2023
Merged

chore(server): add array and timeline valuetype to property #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
404a51d
chore(server): add map valueType to property
pyshx Oct 24, 2023
d6c0837
web changes
pyshx Oct 24, 2023
fba9564
Merge branch 'main' into chore/add-array-value-type
pyshx Oct 27, 2023
bf01670
chore(server): add array and timeline value type to property
pyshx Oct 27, 2023
65688dd
Merge branch 'main' into chore/add-array-value-type
pyshx Oct 27, 2023
bc1df11
lint fix and update manifest
pyshx Oct 27, 2023
9260f3f
Merge branch 'chore/add-array-value-type' of github.com:reearth/reear…
pyshx Oct 27, 2023
71f48da
remove redundant log
pyshx Oct 27, 2023
1d5b024
fix import error
pyshx Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion server/gql/_shared.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ scalar FileSize
scalar TranslatedString
scalar Cursor
scalar JSON
scalar Map
scalar Array

# Meta Type

Expand Down Expand Up @@ -94,6 +94,12 @@ type Typography {
underline: Boolean
}

type Timeline {
currentTime: String
startTime: String
endTime: String
}

enum TextAlign {
LEFT
CENTER
Expand Down
2 changes: 2 additions & 0 deletions server/gql/property.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ enum ValueType {
POLYGON
RECT
SPACING
ARRAY
TIMELINE
}

# InputType
Expand Down
2 changes: 2 additions & 0 deletions server/gqlgen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ models:
model: github.com/reearth/reearth/server/internal/adapter/gql/gqlmodel.ID
JSON:
model: github.com/reearth/reearth/server/internal/adapter/gql/gqlmodel.JSON
Array:
model: github.com/reearth/reearth/server/internal/adapter/gql/gqlmodel.Array
Asset:
fields:
team:
Expand Down
Loading
Loading