-
-
+
+
+ 請輸入帳號
+
+
+
+ 密碼格式錯誤
+
-
+
@@ -40,17 +124,15 @@ function gotoSignup() {
}
.pages-login__form {
- display: flex;
- flex-direction: column;
- margin-bottom: 50px;
+ margin-bottom: 45px;
}
.pages-login__form-info {
- margin-bottom: 16px;
+ margin-bottom: 24px;
}
-.pages-login__form-input:not(:last-child) {
- margin-bottom: 16px;
+.pages-login__input:not(:first-child) {
+ margin-top: 24px;
}
.pages-login__form-action {
@@ -62,4 +144,22 @@ function gotoSignup() {
.pages-login__form-action > button:not(:last-child) {
margin-bottom: 16px;
}
+
+.pages-login__is-valid :last-child {
+ border: 2px solid #38c985;
+}
+
+.pages-login__is-invalid :last-child {
+ border: 2px solid #c63737;
+}
+
+.pages-login__warning {
+ margin-top: 12px;
+ color: #c63737;
+ font-size: 14px;
+}
+
+.d-none {
+ display: none;
+}
diff --git a/packages/incan-gold-core/src/events/GameOverEvent.ts b/packages/incan-gold-core/src/events/GameOverEvent.ts
new file mode 100644
index 0000000..c97f84c
--- /dev/null
+++ b/packages/incan-gold-core/src/events/GameOverEvent.ts
@@ -0,0 +1,32 @@
+import { Event } from "./Event";
+import { EventName } from "../constant/EventName";
+import IncanGold from "../entities/IncanGold";
+
+interface ExplorerAndPoints {
+ id: string,
+ totalPoints: number
+}
+
+function ExplorerAndPoints(id: string, totalPoints: number): ExplorerAndPoints {
+ return { id, totalPoints };
+}
+
+export interface GameOverEvent extends Event {
+ name: EventName.GameOver,
+ data: {
+ winnerId: string,
+ explorers: ExplorerAndPoints[],
+ }
+}
+
+export function GameOverEvent(game: IncanGold): Event {
+ const name = EventName.GameOver;
+
+ const winnerId = game.winnerId ?? "none(draw)";
+
+ const explorers = [...game.explorers]
+ .sort((e1, e2) => e2.points - e1.points)
+ .map(({ id, points }) => ExplorerAndPoints(id, points))
+
+ return Event(name, { winnerId, explorers })
+}
diff --git a/packages/incan-gold-core/src/events/GameoverEvent.ts b/packages/incan-gold-core/src/events/GameoverEvent.ts
new file mode 100644
index 0000000..c97f84c
--- /dev/null
+++ b/packages/incan-gold-core/src/events/GameoverEvent.ts
@@ -0,0 +1,32 @@
+import { Event } from "./Event";
+import { EventName } from "../constant/EventName";
+import IncanGold from "../entities/IncanGold";
+
+interface ExplorerAndPoints {
+ id: string,
+ totalPoints: number
+}
+
+function ExplorerAndPoints(id: string, totalPoints: number): ExplorerAndPoints {
+ return { id, totalPoints };
+}
+
+export interface GameOverEvent extends Event {
+ name: EventName.GameOver,
+ data: {
+ winnerId: string,
+ explorers: ExplorerAndPoints[],
+ }
+}
+
+export function GameOverEvent(game: IncanGold): Event {
+ const name = EventName.GameOver;
+
+ const winnerId = game.winnerId ?? "none(draw)";
+
+ const explorers = [...game.explorers]
+ .sort((e1, e2) => e2.points - e1.points)
+ .map(({ id, points }) => ExplorerAndPoints(id, points))
+
+ return Event(name, { winnerId, explorers })
+}