diff --git a/assets/icon/noto-color-emoji/LICENSE-APACHE b/assets/icon/noto-color-emoji/LICENSE-APACHE
deleted file mode 100644
index 261eeb9e..00000000
--- a/assets/icon/noto-color-emoji/LICENSE-APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/assets/icon/noto-color-emoji/README.md b/assets/icon/noto-color-emoji/README.md
deleted file mode 100644
index dd6c50fd..00000000
--- a/assets/icon/noto-color-emoji/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Noto Emoji SVG
-
-Contents of this folder are all adapted from [adobe-fonts/noto-emoji-svg](https://github.com/adobe-fonts/noto-emoji-svg), which is derived from [googlefonts/noto-emoji](https://github.com/googlefonts/noto-emoji). Refer to respective links for details.
-
-## License
-
-As a derivative of [adobe-fonts/noto-emoji-svg](https://github.com/adobe-fonts/noto-emoji-svg) and [Noto Emoji](https://github.com/googlefonts/noto-emoji), the same licenses apply for Noto Emoji SVG:
-
-- Most image resources are licensed under the [Apache license, version 2.0](./LICENSE-APACHE).
-- Flag images under flags/ are in the public domain or
- otherwise exempt from copyright ([more info](https://github.com/googlefonts/noto-emoji/blob/main/third_party/region-flags/LICENSE)).
diff --git a/assets/icon/noto-color-emoji/hourglass-not-done.svg b/assets/icon/noto-color-emoji/hourglass-not-done.svg
deleted file mode 100644
index 185bec92..00000000
--- a/assets/icon/noto-color-emoji/hourglass-not-done.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-
\ No newline at end of file
diff --git a/assets/icon/noto-color-emoji/partying-face.svg b/assets/icon/noto-color-emoji/partying-face.svg
deleted file mode 100644
index daa8fc2b..00000000
--- a/assets/icon/noto-color-emoji/partying-face.svg
+++ /dev/null
@@ -1,66 +0,0 @@
-
\ No newline at end of file
diff --git a/assets/icon/noto-color-emoji/thinking-face.svg b/assets/icon/noto-color-emoji/thinking-face.svg
deleted file mode 100644
index 5653e4ec..00000000
--- a/assets/icon/noto-color-emoji/thinking-face.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-
\ No newline at end of file
diff --git a/assets/icon/noto-color-emoji/winking-face.svg b/assets/icon/noto-color-emoji/winking-face.svg
deleted file mode 100644
index 60c9439e..00000000
--- a/assets/icon/noto-color-emoji/winking-face.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-
\ No newline at end of file
diff --git a/src/components/gameControlBackdrop/DelayedIndefProgress.tsx b/src/components/gameControlBackdrop/DelayedIndefProgress.tsx
new file mode 100644
index 00000000..f154e969
--- /dev/null
+++ b/src/components/gameControlBackdrop/DelayedIndefProgress.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2021-present Rong "Mantle" Bao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see https://www.gnu.org/licenses/ .
+ */
+
+import React from "react"
+
+import Box from "@mui/material/Box"
+import CircularProgress from "@mui/material/CircularProgress"
+import Fade from "@mui/material/Fade"
+
+interface IDelayedIndefProgressProps {
+ readonly delayMs: number
+}
+
+export const DelayedIndefProgress = (props: IDelayedIndefProgressProps) => {
+ return (
+
+
+
+
+
+ )
+}
diff --git a/src/components/gameControlBackdrop/GameControlBackdrop.tsx b/src/components/gameControlBackdrop/GameControlBackdrop.tsx
index 473276ea..a76bc4fa 100644
--- a/src/components/gameControlBackdrop/GameControlBackdrop.tsx
+++ b/src/components/gameControlBackdrop/GameControlBackdrop.tsx
@@ -22,82 +22,45 @@ import Button from "@mui/material/Button"
import Stack from "@mui/material/Stack"
import Typography from "@mui/material/Typography"
-import hourglassNotDone from "../../../assets/icon/noto-color-emoji/hourglass-not-done.svg"
-import partyingFace from "../../../assets/icon/noto-color-emoji/partying-face.svg"
-import thinkingFace from "../../../assets/icon/noto-color-emoji/thinking-face.svg"
-import winkingFace from "../../../assets/icon/noto-color-emoji/winking-face.svg"
import { GameState } from "../../model"
import { useAppSelector } from "../../viewmodel"
+import { DelayedIndefProgress } from "./DelayedIndefProgress"
-interface IContentProps {
- readonly image: { readonly src: string; readonly alt: string }
- readonly title: string
- readonly description?: string
- readonly button?: {
- readonly caption: string
- readonly color: "primary" | "secondary"
- readonly onClick?: () => void
- }
+interface IGameNotStartedContentProps {
+ readonly startGameHandler: () => void
}
-const Content = ({
- image,
- title,
- description,
- button,
-}: IContentProps): React.ReactElement => {
+const GameNotStartedContent = (props: IGameNotStartedContentProps) => {
return (
<>
-
-
- {title}
+
+ Welcome! Your task: complete the Periodic Table.
+
+
+ A/D/S/Swipe: move by one. W/Tap: rotate. Space/Long press: drop.
- {description && (
-
- {description}
-
- )}
- {button && (
-
- )}
+
>
)
}
-interface IGameNotStartedContentProps {
- readonly startGameHandler: () => void
-}
-
-const GameNotStartedContent = (
- props: IGameNotStartedContentProps
-): React.ReactElement => {
+const GamePreparingContent = () => {
return (
-
- )
-}
-
-const GamePreparingContent = (): React.ReactElement => {
- return (
-
+ <>
+
+ Good luck!
+
+
+ Generating new map for you. The game will start in a few seconds.
+
+
+ >
)
}
@@ -105,18 +68,23 @@ interface IGameLostContentProps {
readonly startGameHandler: () => void
}
-const GameLostContent = (props: IGameLostContentProps): React.ReactElement => {
+const GameLostContent = (props: IGameLostContentProps) => {
return (
-
+ <>
+
+ Oops...
+
+
+ This does not seem to be right. Ready to give it another shot?
+
+
+ >
)
}
@@ -124,18 +92,23 @@ interface IGameWonContentProps {
readonly startGameHandler: () => void
}
-const GameWonContent = (props: IGameWonContentProps): React.ReactElement => {
+const GameWonContent = (props: IGameWonContentProps) => {
return (
-
+ <>
+
+ Congrats!
+
+
+ You finished the game! Don't hesitate to brag about it.
+
+
+ >
)
}
@@ -144,9 +117,7 @@ interface IGameStatusBackdropProps {
readonly switchPauseGameHandler: () => void
}
-export const GameControlBackdrop = (
- props: IGameStatusBackdropProps
-): React.ReactElement => {
+export const GameControlBackdrop = (props: IGameStatusBackdropProps) => {
const gameState = useAppSelector(
(state) => state.game.gameControlBackdrop.gameState
)
@@ -195,7 +166,7 @@ export const GameControlBackdrop = (
direction="column"
alignItems="center"
justifyContent="center"
- spacing={1}
+ spacing={2}
>
{content}
diff --git a/src/pages/about.tsx b/src/pages/about.tsx
index e025712b..ffef5cb4 100644
--- a/src/pages/about.tsx
+++ b/src/pages/about.tsx
@@ -94,8 +94,8 @@ const App = ({
You should have received a copy of the GNU General Public License
along with this program. If not, see{" "}
-
- LICENSE
+
+ {"https://www.gnu.org/licenses/"}
.
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 32541f08..dbd90c7f 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -117,7 +117,7 @@ const App = ({
aria-label="sponsor"
href="https://afdian.net/@CSharperMantle"
target="_blank"
- rel="noopener noreferrer"
+ rel="noopener"
>
@@ -128,7 +128,7 @@ const App = ({
aria-label="github"
href="https://github.com/CSharperMantle/periotrisjs"
target="_blank"
- rel="noopener noreferrer"
+ rel="noopener"
>