Merge pull request #76 from derechtenap/dev-0.2.1

0.2.1 Update

Author: timderes

.vscode/launch.json

@@ -2,7 +2,7 @@
   // Use IntelliSense to learn about possible attributes.
   // Hover to view descriptions of existing attributes.
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
+  "version": "0.2.1",
   "configurations": [
     {
       "name": "Nextron: Main",

package-lock.json

@@ -3,7 +3,7 @@
   "name": "dartsmate",
   "productName": "DartsMate",
   "description": "Analyze, track and compare your dart games.",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "author": "DartsMate Contributors",
   "main": "app/background.js",
   "repository": "https://github.com/derechtenap/dartsmate",
@@ -22,9 +22,9 @@
     "release": "electron-builder --publish always"
   },
   "dependencies": {
-    "electron-log": "^5.2.0",
+    "electron-log": "^5.2.4",
     "electron-serve": "^1.3.0",
-    "electron-store": "^8.1.0"
+    "electron-store": "^8.2.0"
   },
   "devDependencies": {
     "@mantine/charts": "^7.15.0",
@@ -34,26 +34,26 @@
     "@mantine/hooks": "^7.15.0",
     "@mantine/modals": "^7.15.0",
     "@mantine/notifications": "^7.15.0",
-    "@next/eslint-plugin-next": "^14.2.15",
-    "@tabler/icons-react": "^3.19.0",
-    "@types/node": "^20.10.4",
-    "@types/react": "^18.3.11",
+    "@next/eslint-plugin-next": "^14.2.20",
+    "@tabler/icons-react": "^3.24.0",
+    "@types/node": "^20.17.10",
+    "@types/react": "^18.3.16",
     "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "dexie": "^4.0.10",
     "dexie-react-hooks": "^1.1.7",
-    "electron": "^29.0.0-beta.4",
-    "electron-builder": "^24.9.1",
+    "electron": "^33.2.1",
+    "electron-builder": "^24.13.3",
     "embla-carousel-react": "^7.1.0",
     "eslint": "^8.55.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-config-standard-with-typescript": "^34.0.1",
     "eslint-plugin-prettier": "^4.2.1",
-    "next": "^14.2.15",
-    "next-i18next": "^15.3.1",
-    "nextron": "^9.1.0",
-    "postcss": "^8.4.47",
+    "next": "^14.2.20",
+    "next-i18next": "^15.4.0",
+    "nextron": "^9.4.0",
+    "postcss": "^8.4.49",
     "postcss-preset-mantine": "^1.17.0",
     "postcss-simple-vars": "^7.0.1",
     "prettier": "2.8.8",

package.json

@@ -0,0 +1,27 @@
+import type { MatchRound } from "types/match";
+import { THROWS_PER_ROUND } from "utils/constants";
+
+/**
+ * Calculates the average score of the first nine throws based on the player's rounds.
+ *
+ * @param {MatchRound[]} playerRounds - An array of match rounds containing round data.
+ * @returns {number} The average score of the first nine throws, or 0 if no rounds are available.
+ *
+ */
+const getFirstNineAverage = (playerRounds: MatchRound[]): number => {
+  if (playerRounds.length === 0) return 0;
+
+  const MaxRounds = Math.floor(9 / THROWS_PER_ROUND);
+
+  // Take the rounds needed for nine darts  and calculate the average of the scores
+  const firstThreeRounds = playerRounds.slice(0, MaxRounds);
+
+  const totalScore = firstThreeRounds.reduce(
+    (sum, round) => sum + round.roundTotal,
+    0
+  );
+
+  return totalScore / firstThreeRounds.length;
+};
+
+export default getFirstNineAverage;

renderer/lib/playing/stats/getFirstNineAverage.ts

@@ -0,0 +1,26 @@
+import type { Checkout } from "types/match";
+
+/**
+ * Checks if the current throw results in a bust situation based on the remaining score.
+ * A bust occurs when a player attempts to throw a score that would exceed the remaining score or violates
+ * specific throw rules (e.g., attempting a double with a score less than 2).
+ *
+ * @param {Checkout} checkout - The type of checkout being attempted. Can be "Any", "Single", "Double" or "Triple".
+ * @param {number} remainingScore - The remaining score to be reduced. Should be a positive number.
+ * @returns {boolean} - Returns `true` if it's a bust, `false` otherwise.
+ *
+ * @example
+ * isBust("Double", 1); // returns true (because a Double requires at least 2 points)
+ * isBust("Triple", 2); // returns true (because a Triple requires at least 3 points)
+ * isBust("Double", 4); // returns false (valid Double checkout with remaining score of 4)
+ */
+const isBust = (checkout: Checkout, remainingScore: number): boolean => {
+  if (remainingScore < 0) return true;
+
+  if (checkout === "Double" && remainingScore < 2) return true;
+  if (checkout === "Triple" && remainingScore < 3) return true;
+
+  return false;
+};
+
+export default isBust;

renderer/lib/playing/stats/isBust.ts

@@ -60,6 +60,8 @@ import { useRouter } from "next/router";
 import { useElapsedTime } from "use-elapsed-time";
 import { modals } from "@mantine/modals";
 import addMatchToDatabase from "@/lib/db/matches/addMatch";
+import getFirstNineAverage from "@/lib/playing/stats/getFirstNineAverage";
+import isBust from "@/lib/playing/stats/isBust";
 
 const PlayingPage: NextPage = () => {
   const theme = useMantineTheme();
@@ -177,6 +179,10 @@ const PlayingPage: NextPage = () => {
       return false;
     }
 
+    if (checkout === "Single") {
+      return !lastThrow.isDouble && !lastThrow.isTriple;
+    }
+
     if (checkout === "Double") {
       return lastThrow.isDouble || lastThrow.isBullseye;
     }
@@ -224,7 +230,7 @@ const PlayingPage: NextPage = () => {
 
     const updatedMatchRound: MatchRound = {
       elapsedTime: elapsedTime,
-      isBust: newScoreLeft < 0 ? true : false,
+      isBust: isBust(checkout, newScoreLeft),
       roundAverage:
         matchRound.length > 0 ? totalRoundScore / matchRound.length : 0,
       roundTotal: totalRoundScore,
@@ -234,7 +240,6 @@ const PlayingPage: NextPage = () => {
           ? matchRound
           : filledThrowDetails.slice(0, THROWS_PER_ROUND),
     };
-
     const updatedCurrentPlayer: Player = {
       ...currentPlayer,
       rounds: [...currentPlayer.rounds, updatedMatchRound],
@@ -243,7 +248,8 @@ const PlayingPage: NextPage = () => {
       scoreLeft:
         isWinner && newScoreLeft === 0
           ? 0
-          : newScoreLeft > 0
+          : // Update score only if >0 and is not a bust!
+          newScoreLeft > 0 && !isBust(checkout, newScoreLeft)
           ? newScoreLeft
           : currentPlayer.scoreLeft,
     };
@@ -427,10 +433,13 @@ const PlayingPage: NextPage = () => {
                         opacity={0.7}
                         justify="space-between"
                       >
-                        {/* TODO: Calc first nine average... */}
                         <span>
-                          {t("stats.firstNineAvg")}
-                          {""}: 0
+                          {t("stats.firstNineAvg")}:{" "}
+                          <NumberFormatter
+                            decimalScale={2}
+                            defaultValue={0}
+                            value={getFirstNineAverage(players[_idx].rounds)}
+                          />
                         </span>
                         <span>
                           {t("stats.highestScore")}:{" "}

renderer/pages/[locale]/match/playing.tsx

@@ -12,6 +12,7 @@ import {
   DefaultMantineColor,
   Group,
   Stack,
+  Textarea,
   TextInput,
   Tooltip,
   useMantineTheme,
@@ -47,6 +48,22 @@ const EditProfilePage: NextPage = () => {
   >(defaultProfile?.color);
 
   const form = useForm<Profile>({
+    /*
+     * Providing initial values prevents runtime errors by ensuring the validate
+     * function has data to work with, even before user input.
+     */
+    initialValues: {
+      bio: "",
+      color: "red",
+      createdAt: 0,
+      name: {
+        firstName: "",
+        lastName: "",
+      },
+      username: "",
+      updatedAt: 0,
+      uuid: "",
+    },
     validate: {
       // Error messages are currently not used. The form only proceeds if all fields are valid.
       name: {
@@ -198,6 +215,11 @@ const EditProfilePage: NextPage = () => {
             placeholder={t("profile:formLabels.username.placeholder")}
             {...form.getInputProps("username")}
           />
+          <Textarea
+            label={t("profile:formLabels.bio.label")}
+            placeholder={t("profile:formLabels.bio.placeholder")}
+            {...form.getInputProps("bio")}
+          />
           <Group>
             <Button
               disabled={!form.isValid() || !form.isTouched()}

renderer/pages/[locale]/profile/edit.tsx

@@ -35,7 +35,7 @@ const ProfileIndexPage: NextPage = () => {
   return (
     <DefaultLayout withNavbarOpen>
       <Paper component="header" radius={0} p="xl" m={0}>
-        <Stack>
+        <Stack gap="lg">
           <Group align="start">
             <ProfileAvatar
               color={defaultProfile.color}
@@ -58,7 +58,19 @@ const ProfileIndexPage: NextPage = () => {
               </Tooltip>
             </Group>
           </Group>
-          <Group gap="xl" ta="center" grow mt="lg">
+          <Paper>
+            <Text
+              fs={defaultProfile.bio ? "" : "italic"}
+              c={defaultProfile.bio ? "" : "dimmed"}
+            >
+              {defaultProfile.bio ||
+                t("profile:emptyBioPlaceholder", {
+                  FIRST_NAME: defaultProfile.name.firstName,
+                })}
+            </Text>
+          </Paper>
+          <Divider />
+          <Group gap="xl" ta="center" grow>
             <Stat text={t("stats.darts")} value={0} />
             <Stat text={t("stats.180s")} value={0} />
             <Stat text={t("stats.matches")} value={0} />
@@ -71,9 +83,9 @@ const ProfileIndexPage: NextPage = () => {
               }}
             />
           </Group>
+          <Divider />
         </Stack>
       </Paper>
-      <Divider />
     </DefaultLayout>
   );
 };

renderer/pages/[locale]/profile/index.tsx

@@ -56,6 +56,7 @@
   "webcam": "Webcam",
   "removePhotoUpload": "Bild entfernen",
   "exportProfile": "Profil exportieren",
+  "emptyBioPlaceholder": "{{FIRST_NAME}} hat keine Beschreibung hinzugefügt.",
   "notifications": {
     "updateProfileSuccess": {
       "title": "Profil erfolgreich aktualisiert!",

renderer/public/locales/de/profile.json

@@ -56,6 +56,7 @@
   "webcam": "Webcam",
   "removePhotoUpload": "Remove Photo",
   "exportProfile": "Export Profile",
+  "emptyBioPlaceholder": "{{FIRST_NAME}} has not added a description.",
   "notifications": {
     "updateProfileSuccess": {
       "title": "Profile successfully updated!",