+
Game Over
-
+
diff --git a/wordtris/src/components/GameOverOverlay.tsx b/wordtris/src/components/GameOverOverlay.tsx
index 6327fa7..bdbfbb1 100644
--- a/wordtris/src/components/GameOverOverlay.tsx
+++ b/wordtris/src/components/GameOverOverlay.tsx
@@ -1,11 +1,7 @@
import * as React from "react";
-import { ReactNode } from "react";
-import {
- MENU_TEXT_COLOR,
- NORMAL_TEXT_SIZE,
- PLAYER_COLOR,
- UNIVERSAL_BORDER_RADIUS,
-} from "../setup";
+import { ReactNode, useState } from "react";
+import { MENU_TEXT_COLOR, NORMAL_TEXT_SIZE, PLAYER_COLOR, SMALL_TEXT_SIZE, UNIVERSAL_BORDER_RADIUS, } from "../setup";
+import { submitScore } from "../util/webUtil";
export const GameOverOverlay = React.memo(
(
@@ -41,7 +37,8 @@ export const GameOverOverlay = React.memo(
);
export const PlayAgainButton = React.memo(
- ({ stateHandler }: { stateHandler: { send: (arg0: string) => void } }) => {
+ ({ stateHandler, words }: { stateHandler: { send: (arg0: string) => void }, words: string[] }) => {
+
const buttonStyle = {
cursor: "pointer",
border: "none",
@@ -53,16 +50,40 @@ export const PlayAgainButton = React.memo(
marginTop: "0.4vmin",
fontSize: NORMAL_TEXT_SIZE,
};
+
+ const formStyle = {
+ size: "20",
+ fontSize: SMALL_TEXT_SIZE,
+ placeholder: "Enter name",
+ color: "black",
+ } as const;
+
+ const [name, setName] = useState("" as string);
+
+ const handleChange = event => {
+ setName(event.target.value);
+ console.log(typeof event.target.value)
+ };
+
return (
- {
- stateHandler.send("RESTART");
- }}
- >
- Play Again
-
+ <>
+
+ {
+ submitScore(words.length, name, words);
+ stateHandler.send("RESTART");
+ }}
+ >
+ Play Again
+
+
);
},
);
diff --git a/wordtris/src/protobuf_gen/PlayerSubmissionData.ts b/wordtris/src/protobuf_gen/PlayerSubmissionData.ts
index a2da6b4..3238727 100644
--- a/wordtris/src/protobuf_gen/PlayerSubmissionData.ts
+++ b/wordtris/src/protobuf_gen/PlayerSubmissionData.ts
@@ -4,193 +4,148 @@ import * as _m0 from "protobufjs/minimal";
export const protobufPackage = "";
export interface PlayerSubmissionData {
- score: number;
- name: string;
- ip: string;
- words: string[];
- checksum: Uint8Array;
+ score: number;
+ name: string;
+ words: string[];
+ checksum: Uint8Array;
}
function createBasePlayerSubmissionData(): PlayerSubmissionData {
- return {
- score: 0,
- name: "",
- ip: "",
- words: [],
- checksum: new Uint8Array(),
- };
+ return { score: 0, name: "", words: [], checksum: new Uint8Array() };
}
export const PlayerSubmissionData = {
- encode(
- message: PlayerSubmissionData,
- writer: _m0.Writer = _m0.Writer.create(),
- ): _m0.Writer {
- if (message.score !== 0) {
- writer.uint32(8).int32(message.score);
- }
- if (message.name !== "") {
- writer.uint32(18).string(message.name);
- }
- if (message.ip !== "") {
- writer.uint32(26).string(message.ip);
- }
- for (const v of message.words) {
- writer.uint32(34).string(v!);
- }
- if (message.checksum.length !== 0) {
- writer.uint32(42).bytes(message.checksum);
- }
- return writer;
- },
+ encode(message: PlayerSubmissionData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+ if (message.score !== 0) {
+ writer.uint32(8).int32(message.score);
+ }
+ if (message.name !== "") {
+ writer.uint32(18).string(message.name);
+ }
+ for (const v of message.words) {
+ writer.uint32(26).string(v!);
+ }
+ if (message.checksum.length !== 0) {
+ writer.uint32(34).bytes(message.checksum);
+ }
+ return writer;
+ },
- decode(
- input: _m0.Reader | Uint8Array,
- length?: number,
- ): PlayerSubmissionData {
- const reader = input instanceof _m0.Reader
- ? input
- : new _m0.Reader(input);
- let end = length === undefined ? reader.len : reader.pos + length;
- const message = createBasePlayerSubmissionData();
- while (reader.pos < end) {
- const tag = reader.uint32();
- switch (tag >>> 3) {
- case 1:
- message.score = reader.int32();
- break;
- case 2:
- message.name = reader.string();
- break;
- case 3:
- message.ip = reader.string();
- break;
- case 4:
- message.words.push(reader.string());
- break;
- case 5:
- message.checksum = reader.bytes();
- break;
- default:
- reader.skipType(tag & 7);
- break;
- }
- }
- return message;
- },
+ decode(input: _m0.Reader | Uint8Array, length?: number): PlayerSubmissionData {
+ const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+ let end = length === undefined ? reader.len : reader.pos + length;
+ const message = createBasePlayerSubmissionData();
+ while (reader.pos < end) {
+ const tag = reader.uint32();
+ switch (tag >>> 3) {
+ case 1:
+ message.score = reader.int32();
+ break;
+ case 2:
+ message.name = reader.string();
+ break;
+ case 3:
+ message.words.push(reader.string());
+ break;
+ case 4:
+ message.checksum = reader.bytes();
+ break;
+ default:
+ reader.skipType(tag & 7);
+ break;
+ }
+ }
+ return message;
+ },
- fromJSON(object: any): PlayerSubmissionData {
- return {
- score: isSet(object.score) ? Number(object.score) : 0,
- name: isSet(object.name) ? String(object.name) : "",
- ip: isSet(object.ip) ? String(object.ip) : "",
- words: Array.isArray(object?.words)
- ? object.words.map((e: any) => String(e))
- : [],
- checksum: isSet(object.checksum)
- ? bytesFromBase64(object.checksum)
- : new Uint8Array(),
- };
- },
+ fromJSON(object: any): PlayerSubmissionData {
+ return {
+ score: isSet(object.score) ? Number(object.score) : 0,
+ name: isSet(object.name) ? String(object.name) : "",
+ words: Array.isArray(object?.words) ? object.words.map((e: any) => String(e)) : [],
+ checksum: isSet(object.checksum) ? bytesFromBase64(object.checksum) : new Uint8Array(),
+ };
+ },
- toJSON(message: PlayerSubmissionData): unknown {
- const obj: any = {};
- message.score !== undefined && (obj.score = Math.round(message.score));
- message.name !== undefined && (obj.name = message.name);
- message.ip !== undefined && (obj.ip = message.ip);
- if (message.words) {
- obj.words = message.words.map((e) => e);
- } else {
- obj.words = [];
- }
- message.checksum !== undefined &&
- (obj.checksum = base64FromBytes(
- message.checksum !== undefined
- ? message.checksum
- : new Uint8Array(),
- ));
- return obj;
- },
+ toJSON(message: PlayerSubmissionData): unknown {
+ const obj: any = {};
+ message.score !== undefined && (obj.score = Math.round(message.score));
+ message.name !== undefined && (obj.name = message.name);
+ if (message.words) {
+ obj.words = message.words.map((e) => e);
+ } else {
+ obj.words = [];
+ }
+ message.checksum !== undefined &&
+ (obj.checksum = base64FromBytes(message.checksum !== undefined ? message.checksum : new Uint8Array()));
+ return obj;
+ },
- fromPartial, I>>(
- object: I,
- ): PlayerSubmissionData {
- const message = createBasePlayerSubmissionData();
- message.score = object.score ?? 0;
- message.name = object.name ?? "";
- message.ip = object.ip ?? "";
- message.words = object.words?.map((e) => e) || [];
- message.checksum = object.checksum ?? new Uint8Array();
- return message;
- },
+ fromPartial, I>>(object: I): PlayerSubmissionData {
+ const message = createBasePlayerSubmissionData();
+ message.score = object.score ?? 0;
+ message.name = object.name ?? "";
+ message.words = object.words?.map((e) => e) || [];
+ message.checksum = object.checksum ?? new Uint8Array();
+ return message;
+ },
};
declare var self: any | undefined;
declare var window: any | undefined;
declare var global: any | undefined;
var globalThis: any = (() => {
- if (typeof globalThis !== "undefined") {
- return globalThis;
- }
- if (typeof self !== "undefined") {
- return self;
- }
- if (typeof window !== "undefined") {
- return window;
- }
- if (typeof global !== "undefined") {
- return global;
- }
- throw "Unable to locate global object";
+ if (typeof globalThis !== "undefined") {
+ return globalThis;
+ }
+ if (typeof self !== "undefined") {
+ return self;
+ }
+ if (typeof window !== "undefined") {
+ return window;
+ }
+ if (typeof global !== "undefined") {
+ return global;
+ }
+ throw "Unable to locate global object";
})();
function bytesFromBase64(b64: string): Uint8Array {
- if (globalThis.Buffer) {
- return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
- } else {
- const bin = globalThis.atob(b64);
- const arr = new Uint8Array(bin.length);
- for (let i = 0; i < bin.length; ++i) {
- arr[i] = bin.charCodeAt(i);
- }
- return arr;
+ if (globalThis.Buffer) {
+ return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
+ } else {
+ const bin = globalThis.atob(b64);
+ const arr = new Uint8Array(bin.length);
+ for (let i = 0; i < bin.length; ++i) {
+ arr[i] = bin.charCodeAt(i);
}
+ return arr;
+ }
}
function base64FromBytes(arr: Uint8Array): string {
- if (globalThis.Buffer) {
- return globalThis.Buffer.from(arr).toString("base64");
- } else {
- const bin: string[] = [];
- arr.forEach((byte) => {
- bin.push(String.fromCharCode(byte));
- });
- return globalThis.btoa(bin.join(""));
- }
+ if (globalThis.Buffer) {
+ return globalThis.Buffer.from(arr).toString("base64");
+ } else {
+ const bin: string[] = [];
+ arr.forEach((byte) => {
+ bin.push(String.fromCharCode(byte));
+ });
+ return globalThis.btoa(bin.join(""));
+ }
}
-type Builtin =
- | Date
- | Function
- | Uint8Array
- | string
- | number
- | boolean
- | undefined;
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
export type DeepPartial = T extends Builtin ? T
- : T extends Array ? Array>
- : T extends ReadonlyArray ? ReadonlyArray>
- : T extends {} ? { [K in keyof T]?: DeepPartial }
- : Partial;
+ : T extends Array ? Array> : T extends ReadonlyArray ? ReadonlyArray>
+ : T extends {} ? { [K in keyof T]?: DeepPartial }
+ : Partial;
type KeysOfUnion = T extends T ? keyof T : never;
export type Exact = P extends Builtin ? P
- :
- & P
- & { [K in keyof P]: Exact }
- & { [K in Exclude>]: never };
+ : P & { [K in keyof P]: Exact } & { [K in Exclude>]: never };
function isSet(value: any): boolean {
- return value !== null && value !== undefined;
+ return value !== null && value !== undefined;
}
diff --git a/wordtris/src/util/webUtil.ts b/wordtris/src/util/webUtil.ts
index 1e0bb69..a13340a 100644
--- a/wordtris/src/util/webUtil.ts
+++ b/wordtris/src/util/webUtil.ts
@@ -4,14 +4,12 @@ import { hash } from "fast-sha256";
export function submitScore(
score: number,
name: string,
- ip: string,
words: string[],
checksum?: Uint8Array,
): Promise {
const data = PlayerSubmissionData.encode({
score,
name,
- ip,
words,
checksum: checksum ? checksum! : hash(serializeWordsArray(words)),
}).finish();