Skip to content

Thurs quang #43

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

Merged
TheQuangNguyen merged 7 commits into from
Nov 21, 2019
Merged

Thurs quang #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7caf88f
added distance filter for display neabry sessions on the main page
TheQuangNguyen Nov 21, 2019
6fc1809
prepare for merging Dev
TheQuangNguyen Nov 21, 2019
0e8587c
fixed issue with null pointers when creating or joining a game
TheQuangNguyen Nov 21, 2019
dfcd736
prepare to pull from Dev
TheQuangNguyen Nov 21, 2019
2cd82b1
fixed merge conflicts
TheQuangNguyen Nov 21, 2019
fb21afa
merged most recent Dev
TheQuangNguyen Nov 21, 2019
69b52c3
updated GraphQL schema for player object to include photo
TheQuangNguyen Nov 21, 2019
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
1 change: 1 addition & 0 deletions amplify/backend/api/javatag/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ type Player @model {
isIt: Boolean!
lat: Float!
lon: Float!
Photo: String
}
6 changes: 6 additions & 0 deletions app/src/main/graphql/com/amazonaws/amplify/generated/graphql/mutations.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ mutation CreateSession($input: CreateSessionInput!) {
isIt
lat
lon
Photo
}
nextToken
}
Expand All @@ -29,6 +30,7 @@ mutation UpdateSession($input: UpdateSessionInput!) {
isIt
lat
lon
Photo
}
nextToken
}
Expand All @@ -48,6 +50,7 @@ mutation DeleteSession($input: DeleteSessionInput!) {
isIt
lat
lon
Photo
}
nextToken
}
Expand All @@ -73,6 +76,7 @@ mutation CreatePlayer($input: CreatePlayerInput!) {
isIt
lat
lon
Photo
}
}
mutation UpdatePlayer($input: UpdatePlayerInput!) {
Expand All @@ -92,6 +96,7 @@ mutation UpdatePlayer($input: UpdatePlayerInput!) {
isIt
lat
lon
Photo
}
}
mutation DeletePlayer($input: DeletePlayerInput!) {
Expand All @@ -111,5 +116,6 @@ mutation DeletePlayer($input: DeletePlayerInput!) {
isIt
lat
lon
Photo
}
}
3 changes: 3 additions & 0 deletions app/src/main/graphql/com/amazonaws/amplify/generated/graphql/queries.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ query GetSession($id: ID!) {
isIt
lat
lon
Photo
}
nextToken
}
Expand Down Expand Up @@ -54,6 +55,7 @@ query GetPlayer($id: ID!) {
isIt
lat
lon
Photo
}
}
query ListPlayers(
Expand All @@ -75,6 +77,7 @@ query ListPlayers(
isIt
lat
lon
Photo
}
nextToken
}
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/graphql/com/amazonaws/amplify/generated/graphql/subscriptions.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ subscription OnCreateSession {
isIt
lat
lon
Photo
}
nextToken
}
Expand All @@ -29,6 +30,7 @@ subscription OnUpdateSession {
isIt
lat
lon
Photo
}
nextToken
}
Expand All @@ -48,6 +50,7 @@ subscription OnDeleteSession {
isIt
lat
lon
Photo
}
nextToken
}
Expand All @@ -73,6 +76,7 @@ subscription OnCreatePlayer {
isIt
lat
lon
Photo
}
}
subscription OnUpdatePlayer {
Expand All @@ -92,6 +96,7 @@ subscription OnUpdatePlayer {
isIt
lat
lon
Photo
}
}
subscription OnDeletePlayer {
Expand All @@ -111,5 +116,6 @@ subscription OnDeletePlayer {
isIt
lat
lon
Photo
}
}
42 changes: 42 additions & 0 deletions app/src/main/graphql/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,16 @@
},
"defaultValue": null
},
{
"name": "Photo",
"description": null,
"type": {
"kind": "INPUT_OBJECT",
"name": "ModelStringFilterInput",
"ofType": null
},
"defaultValue": null
},
{
"name": "and",
"description": null,
Expand Down Expand Up @@ -978,6 +988,18 @@
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "Photo",
"description": null,
"args": [],
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
}
],
"inputFields": null,
Expand Down Expand Up @@ -1636,6 +1658,16 @@
},
"defaultValue": null
},
{
"name": "Photo",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
},
{
"name": "playerSessionId",
"description": null,
Expand Down Expand Up @@ -1711,6 +1743,16 @@
},
"defaultValue": null
},
{
"name": "Photo",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
},
{
"name": "playerSessionId",
"description": null,
Expand Down
Loading