Skip to content

Open source personal finance application

chore: refactor

ilkomed4114e122b53
diff --git a/components/categories/Delete.vue b/components/categories/Delete.vue
index f4985272..38af0a95 100644
--- a/components/categories/Delete.vue
+++ b/components/categories/Delete.vue
@@ -48,7 +48,7 @@ function onClickDelete() {
// TODO: translate
async function onDeleteConfirm() {
- // Disable reactive to have data when user have already redirected to categories page
+ // Disable reactive when user has already redirected to categories page
const uid = JSON.parse(JSON.stringify($store.state.user.user.uid))
const trnsIdsS = JSON.parse(JSON.stringify(trnsIds.value))
const categoryIdS = JSON.parse(JSON.stringify(categoryId.value))
diff --git a/components/trnForm/calculator/useCalculator.ts b/components/trnForm/calculator/useCalculator.ts
index 77e60cf6..de4718ca 100644
--- a/components/trnForm/calculator/useCalculator.ts
+++ b/components/trnForm/calculator/useCalculator.ts
@@ -45,7 +45,7 @@ export default function useCalculator() {
*/
function separateExpression(value: string): string[] {
return value
- .split(/(\/|\*|-|\+)/)
+ .split(/([\/*\-+])/)
.filter(i => i)
}
@@ -230,7 +230,7 @@ export default function useCalculator() {
if (!isKeysActive.value)
return
- const allowValue = (event.key).match(/[0-9%/*\-+=.,]|Backspace|Enter/)
+ const allowValue = (event.key).match(/[\d%/*\-+=.,]|Backspace|Enter/)
let input = allowValue ? allowValue.input : false
if (input) {
@@ -250,7 +250,7 @@ export default function useCalculator() {
const result = makeCalculation(getExpression.value)
return Number(result)
})
- const getformattedResult = computed(() => { return formatInput(expression.value) })
+ const getFormattedResult = computed(() => { return formatInput(expression.value) })
const isSum = computed(() => String(getResult.value) === removeSpaces(expression.value))
return {
@@ -258,7 +258,7 @@ export default function useCalculator() {
formatInput,
isSum,
getExpression,
- getformattedResult,
+ getFormattedResult,
setExpression,
getResult,
isKeysActive,
diff --git a/static/icons/close.svg b/static/icons/close.svg
index 0730bf80..31840dc3 100644
--- a/static/icons/close.svg
+++ b/static/icons/close.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" xmlns:v="https://vecta.io/nano"><path d="M.75 23.249l22.5-22.5"/><path d="M23.25 23.249L.75.749"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"><path d="m.75 23.249 22.5-22.5m0 22.5L.75.749"/></svg>