Merge branch 'develop' into 'main'

v0.36.0 update

See merge request technical-study/flash_anzan_web!41

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aurora-flash",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "description": "フラッシュ暗算",
   "type": "module",
   "dependencies": {
@@ -44,7 +44,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "lint:eslint": "eslint --fix './**/*.{js,ts}'",
     "lint:prettier": "prettier --write './**/*.{js,ts}'",
-    "update-version": "npm i --package-lock-only",
+    "update-version": "bash ./scripts/update_version",
     "prepare": "husky install",
     "tauri": "tauri"
   },

scripts/update_version

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+repo_root=$(cd "$(dirname "${BASH_SOURCE:-$0}")/.." && pwd)
+
+#
+# Update version of files such as package.json Cargo.toml
+#
+function main() {
+  local version
+  version=$1
+
+  if [[ -z "$version" ]]; then
+    echo 'version number is not passed'
+    return 1
+  fi
+  if ! [[ "$version" =~ ^([0-9]+\.)+[0-9]+ ]]; then
+    echo 'version number is invalid'
+    return 1
+  fi
+
+  pushd "$repo_root" || return 1
+
+  # package.json, package-lock.json
+  sed -i -Ee 's/^(\s+"version": ")([0-9]+\.)+[0-9]+(")/\1'"$version"'\3/' package.json
+  npm i --package-lock-only
+
+  pushd src-tauri || return 1
+
+  # Cargo.toml, Cargo.lock
+  sed -i -Ee 's/^(version = ")([0-9]+\.)+[0-9]+(")/\1'"$version"'\3/' Cargo.toml
+  cargo generate-lockfile
+
+  popd || return 1
+  popd || return 1
+}
+
+main "$@"

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aurora-flash"
-version = "0.35.0"
+version = "0.36.0"
 description = "フラッシュ暗算"
 authors = ["Noritaka IZUMI<noritaka.izumi@gmail.com>"]
 license = "MIT"

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
     "beforeBuildCommand": "npm run build"
   },
   "package": {
-    "productName": "aurora-flash"
+    "productName": "Aurora Flash"
   },
   "tauri": {
     "windows": [

src/config/flashParamSchema.ts

@@ -4,7 +4,7 @@ export const flashParamSchema: FlashParamSchema = {
     addition: {
         digit: {
             min: 1,
-            max: 8,
+            max: 14,
             default: 1,
             difficultySupportMax: 8,
         },
@@ -23,13 +23,13 @@ export const flashParamSchema: FlashParamSchema = {
     multiplication: {
         digit1: {
             min: 1,
-            max: 4,
+            max: 7,
             default: 1,
             difficultySupportMax: 4,
         },
         digit2: {
             min: 1,
-            max: 4,
+            max: 7,
             default: 1,
             difficultySupportMax: 4,
         },

src/index.html

@@ -246,6 +246,7 @@
                 <label class="form-check-label text-light" for="hide-answer">答えを表示せず正誤判定のみ行う</label>
             </div>
         </div>
+        <div id="error-message" class="d-none d-flex justify-content-start my-3 text-warning"></div>
     </div>
     <div class="container-fluid">
         <span id="version-number" class="text-light"><%- versionNumber %></span>

src/js/dom/htmlElement.ts

@@ -11,6 +11,7 @@ export function getHtmlElement<K extends keyof HTMLElementTagNameMap>(
 
 export const htmlElements = {
     soundExtension: getHtmlElement('select', 'sound-extension'),
+    errorMessage: getHtmlElement('div', 'error-message'),
 }
 export const headerMessage = getHtmlElement('div', 'header-message')
 export const questionNumberArea = getHtmlElement('div', 'question-number-area')

src/js/flash/errorMessage.ts

@@ -0,0 +1,44 @@
+import { htmlElements } from '../dom/htmlElement.js'
+
+const errorMessageMap = {
+    difficultyNotSupported: '難易度設定がサポートされていない桁数です',
+} as const
+
+type ErrorMessageMapKey = keyof typeof errorMessageMap
+
+export class ErrorMessage {
+    private readonly htmlElement: HTMLDivElement
+    private readonly errorsActivated: { [key in ErrorMessageMapKey]: boolean } = {
+        difficultyNotSupported: false,
+    }
+
+    constructor(htmlElement: HTMLDivElement) {
+        this.htmlElement = htmlElement
+    }
+
+    private render(): void {
+        const messages = (Object.keys(this.errorsActivated) as ErrorMessageMapKey[])
+            .map((key) => {
+                return this.errorsActivated[key] ? errorMessageMap[key] : null
+            })
+            .filter((message) => message !== null)
+        if (messages.length > 0) {
+            this.htmlElement.classList.remove('d-none')
+        } else {
+            this.htmlElement.classList.add('d-none')
+        }
+        this.htmlElement.innerHTML = messages.join('<br>')
+    }
+
+    addError(key: ErrorMessageMapKey): void {
+        this.errorsActivated[key] = true
+        this.render()
+    }
+
+    removeError(key: ErrorMessageMapKey): void {
+        this.errorsActivated[key] = false
+        this.render()
+    }
+}
+
+export const errorMessage = new ErrorMessage(htmlElements.errorMessage)