Skip to content

Commit 79bebab

Browse files
authored
Merge pull request #30 from metaversecloud-com/dev
Update SDK & fix breaking changes
2 parents 770ae7a + e0715f6 commit 79bebab

File tree

9 files changed

+21
-13
lines changed

9 files changed

+21
-13
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @cpsiaki @LinaBell @liebeskind

.github/workflows/aws_prod_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
9393
- name: Build and version tag
9494
run: |
95-
docker build --build-arg REF=${{ github.ref}} --build-arg COMMIT_HASH=${{ github.sha}} -t ${{ steps.metadata.outputs.tags }} .
95+
docker build --build-arg REF=${{ github.ref}} --build-arg COMMIT_HASH=$(git rev-parse --short ${{ github.sha }}) -t ${{ steps.metadata.outputs.tags }} .
9696
docker tag ${{ steps.metadata.outputs.tags }} ${{ steps.metadata-latest.outputs.tags }}
9797
9898
- name: push docker image to Amazon ECR

client/src/pages/QuestItemClicked.tsx

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,28 @@ export const QuestItemClicked = () => {
1616

1717
// context
1818
const { questDetails, hasInteractiveParams } = useContext(GlobalStateContext);
19-
const { questItemImage } = questDetails
19+
const { questItemImage } = questDetails;
2020

2121
useEffect(() => {
2222
if (hasInteractiveParams) {
23-
backendAPI.post("/quest-item-clicked")
23+
backendAPI
24+
.post("/quest-item-clicked")
2425
.then((result) => {
2526
const { addedClick, numberAllowedToCollect, totalCollectedToday, success } = result.data;
2627
if (addedClick) {
2728
setCollectedText(`${totalCollectedToday}/${numberAllowedToCollect} collected today`);
28-
setMessage(`🎉 Congratulations! You are one step closer to completing your daily quest!`);
29+
if (totalCollectedToday === numberAllowedToCollect) {
30+
setMessage(`🎉 Congratulations! You have completed your daily quest!`);
31+
} else {
32+
setMessage(`🎉 Congratulations! You are one step closer to completing your daily quest!`);
33+
}
2934
} else if (success) {
3035
setMessage(`🎉 You have already completed your daily quest! Come back tomorrow!`);
3136
setCollectedText(`${numberAllowedToCollect}/${numberAllowedToCollect} collected today`);
3237
}
3338
})
3439
.catch(() => console.error("Error collecting Quest item"))
35-
.finally(() => setIsLoading(false))
40+
.finally(() => setIsLoading(false));
3641
}
3742
}, [hasInteractiveParams]);
3843

@@ -61,4 +66,4 @@ export const QuestItemClicked = () => {
6166
);
6267
};
6368

64-
export default QuestItemClicked
69+
export default QuestItemClicked;

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"dependencies": {
1717
"@googleapis/sheets": "^7.0.0",
18-
"@rtsdk/topia": "^0.12.0",
18+
"@rtsdk/topia": "^0.15.4",
1919
"axios": "^1.6.8",
2020
"concurrently": "^8.2.2",
2121
"typescript": "^5.4.3",

server/controllers/droppedAssets/handleDropQuestItem.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export const handleDropQuestItem = async (req: Request, res: Response) => {
1818

1919
const { dataObject, world } = await getWorldDetails(credentials, true);
2020
const { questItemImage } = dataObject as DataObjectType;
21+
if (!questItemImage) throw "questItemImage is required";
2122

2223
// Randomly place the quest item asset
2324
const position = getRandomCoordinates(world.width, world.height);

server/controllers/handleUpdateAdminSettings.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ export const handleUpdateAdminSettings = async (req: Request, res: Response) =>
77
const sceneDropId = credentials.sceneDropId || credentials.assetId;
88
const { numberAllowedToCollect, questItemImage } = req.body;
99

10+
if (!questItemImage) throw "questItemImage is required";
11+
1012
const { world } = await getWorldDetails(credentials, false);
1113

1214
const lockId = `${sceneDropId}-adminUpdates-${new Date(Math.round(new Date().getTime() / 10000) * 10000)}`;

server/utils/addNewRowToGoogleSheets.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ const sheetsClient = sheets.sheets({ version: "v4", auth });
2121

2222
export const addNewRowToGoogleSheets = async (SSAEvents: SSAEvent[]) => {
2323
try {
24-
// Only execute this function if we have GOOGLESHEETS_SHEET_ID in the environment variables.
2524
if (!process.env.GOOGLESHEETS_SHEET_ID) return;
2625

2726
const data = [];

server/utils/errorHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export const errorHandler = ({
2828
reqQueryParams,
2929
reqBody: req?.body,
3030
},
31-
error: JSON.stringify(error),
31+
error: JSON.stringify(error, Object.getOwnPropertyNames(error)),
3232
}),
3333
);
3434
}

0 commit comments

Comments
 (0)