Merge pull request #55 from bornova/dev

v5.0.1
bornova · Apr 23, 2024 · 43bd2f6 · 43bd2f6
2 parents 8a7f39f + 62148c6
commit 43bd2f6
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 69 deletions.
diff --git a/build/css/dark.css b/build/css/dark.css
diff --git a/build/css/light.css b/build/css/light.css
diff --git a/build/css/numara.css b/build/css/numara.css
diff --git a/build/index.html b/build/index.html
@@ -2,10 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, interactive-widget=resizes-content"
-    />
     <meta
       name="description"
       content="A simple but powerful notepad calculator that gives answers as you type. Features support for symbolic computation, with a large set of built-in functions and constants, unit conversion including currencies, variables, function plotting, percentages, and much more."
@@ -14,6 +10,10 @@
       name="keywords"
       content="numara, calculator, notepad, math, numbers, units, text calculator, expression, parser, mathjs, soulver, numi"
     />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, interactive-widget=resizes-content"
+    />
     <link rel="icon" type="image/x-icon" href="assets/icon.ico" />
     <link rel="manifest" href="numara.webmanifest" />
     <link rel="stylesheet" href="assets/fonts/fonts.css" />

diff --git a/build/js/numara.js b/build/js/numara.js
diff --git a/build/js/numara.js.map b/build/js/numara.js.map
diff --git a/electron-builder.yml b/electron-builder.yml
@@ -0,0 +1,31 @@
+appId: com.numara.app
+artifactName: '${productName}-${version}-${arch}.${ext}'
+publish:
+  - provider: github
+    releaseType: release
+directories:
+  buildResources: build/assets
+  output: 'dist/${version}/${os}'
+files:
+  - build
+  - src/main.cjs
+  - src/preload.cjs
+linux:
+  category: Utility
+  target:
+    - AppImage
+    - deb
+    - rpm
+mac:
+  category: public.app-category.utilities
+  entitlements: src/misc/entitlements.mac.plist
+  entitlementsInherit: src/misc/entitlements.mac.plist
+  hardenedRuntime: true
+  notarize:
+    teamId: 2VP53YFAQP
+win:
+  publisherName: Timur Atalay
+  verifyUpdateCodeSignature: false
+nsis:
+  deleteAppDataOnUninstall: true
+  oneClick: false
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "numara",
   "productName": "Numara",
   "description": "Numara Calculator",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "author": {
     "name": "Timur Atalay",
     "email": "[email protected]",
@@ -33,7 +33,7 @@
     "electron-builder": "^24.13.3",
     "esbuild": "^0.20.2",
     "esbuild-plugin-polyfill-node": "^0.3.0",
-    "eslint": "^9.1.0",
+    "eslint": "^9.1.1",
     "fs-extra": "^11.2.0",
     "function-plot": "^1.24.4",
     "lucide": "^0.372.0",
@@ -47,49 +47,5 @@
   "dependencies": {
     "electron-store": "^8.2.0",
     "electron-updater": "^6.1.8"
-  },
-  "build": {
-    "appId": "com.numara.app",
-    "artifactName": "${productName}-${version}-${arch}.${ext}",
-    "publish": [
-      {
-        "provider": "github",
-        "releaseType": "release"
-      }
-    ],
-    "directories": {
-      "buildResources": "build/assets",
-      "output": "dist/${version}/${os}"
-    },
-    "files": [
-      "build",
-      "src/main.cjs",
-      "src/preload.cjs"
-    ],
-    "linux": {
-      "category": "Utility",
-      "target": [
-        "AppImage",
-        "deb",
-        "rpm"
-      ]
-    },
-    "mac": {
-      "category": "public.app-category.utilities",
-      "entitlements": "src/misc/entitlements.mac.plist",
-      "entitlementsInherit": "src/misc/entitlements.mac.plist",
-      "hardenedRuntime": true,
-      "notarize": {
-        "teamId": "2VP53YFAQP"
-      }
-    },
-    "win": {
-      "publisherName": "Timur Atalay",
-      "verifyUpdateCodeSignature": false
-    },
-    "nsis": {
-      "deleteAppDataOnUninstall": true,
-      "oneClick": false
-    }
   }
 }
diff --git a/src/index.html b/src/index.html
@@ -2,10 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, interactive-widget=resizes-content"
-    />
     <meta
       name="description"
       content="A simple but powerful notepad calculator that gives answers as you type. Features support for symbolic computation, with a large set of built-in functions and constants, unit conversion including currencies, variables, function plotting, percentages, and much more."
@@ -14,6 +10,10 @@
       name="keywords"
       content="numara, calculator, notepad, math, numbers, units, text calculator, expression, parser, mathjs, soulver, numi"
     />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, interactive-widget=resizes-content"
+    />
     <link rel="icon" type="image/x-icon" href="assets/icon.ico" />
     <link rel="manifest" href="numara.webmanifest" />
     <link rel="stylesheet" href="assets/fonts/fonts.css" />

diff --git a/src/js/eval.js b/src/js/eval.js
@@ -88,7 +88,7 @@ export function calculate() {
           app.mathScope.ans = answer
           app.mathScope['line' + lineNo] = answer
 
-          if (!isNaN(answer)) {
+          if (typeof answer === 'number') {
             avgs.push(answer)
             totals.push(answer)
             subtotals.push(answer)