From d5dc4b86a0e6f20fa75159855b23edceb3a99ded Mon Sep 17 00:00:00 2001 From: default Date: Fri, 16 Aug 2024 15:56:43 +0000 Subject: [PATCH] fixed regex for ReverseCalc and class for MainPage --- src/pages/PageMain.vue | 6 +---- src/pages/ReverseCalc.vue | 4 +++- ....timestamp-1722883381837-489e7ed531982.mjs | 23 ------------------- ....timestamp-1723483646169-001a5be2d0f82.mjs | 23 ------------------- 4 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 vite.config.ts.timestamp-1722883381837-489e7ed531982.mjs delete mode 100644 vite.config.ts.timestamp-1723483646169-001a5be2d0f82.mjs diff --git a/src/pages/PageMain.vue b/src/pages/PageMain.vue index 5e46638..b4d4ce5 100644 --- a/src/pages/PageMain.vue +++ b/src/pages/PageMain.vue @@ -143,7 +143,7 @@ watch(gasCondition, val => { - + Состою Не состою @@ -233,8 +233,4 @@ watch(gasCondition, val => { .course > button { border-radius: 0 !important; } - -.union-membership { - margin: 100; -} diff --git a/src/pages/ReverseCalc.vue b/src/pages/ReverseCalc.vue index ce60dbc..63aeacd 100644 --- a/src/pages/ReverseCalc.vue +++ b/src/pages/ReverseCalc.vue @@ -98,7 +98,9 @@ const combinations: Array = getSumAndTax(getCombinations(flattenStipend( const inputSum = ref(''); function formatInput(input: string) { - if (!/[^0-9.]/.test(input)) { + if (input.length === 0) { + return true; + } else if (/^[0-9]+\.?[0-9]{0,2}$/.test(input)) { return true; } else { return 'Недопустимые символы'; diff --git a/vite.config.ts.timestamp-1722883381837-489e7ed531982.mjs b/vite.config.ts.timestamp-1722883381837-489e7ed531982.mjs deleted file mode 100644 index 93d7052..0000000 --- a/vite.config.ts.timestamp-1722883381837-489e7ed531982.mjs +++ /dev/null @@ -1,23 +0,0 @@ -// vite.config.ts -import { defineConfig } from "file:///home/batuevio/calculator-ui/node_modules/.pnpm/vite@5.3.4/node_modules/vite/dist/node/index.js"; -import vue from "file:///home/batuevio/calculator-ui/node_modules/.pnpm/@vitejs+plugin-vue@4.4.0_vite@5.3.4_vue@3.3.6_typescript@5.2.2_/node_modules/@vitejs/plugin-vue/dist/index.mjs"; -import postcssPresetEnv from "file:///home/batuevio/calculator-ui/node_modules/.pnpm/postcss-preset-env@9.2.0_postcss@8.4.31/node_modules/postcss-preset-env/dist/index.mjs"; -import vuetify from "file:///home/batuevio/calculator-ui/node_modules/.pnpm/vite-plugin-vuetify@1.0.2_vite@5.3.4_vue@3.3.6_typescript@5.2.2__vuetify@3.3.22/node_modules/vite-plugin-vuetify/dist/index.js"; -var vite_config_default = defineConfig({ - plugins: [vue(), vuetify()], - css: { - postcss: { - plugins: [ - postcssPresetEnv({ - features: { - "nesting-rules": true - } - }) - ] - } - } -}); -export { - vite_config_default as default -}; -//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvaG9tZS9iYXR1ZXZpby9jYWxjdWxhdG9yLXVpXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCIvaG9tZS9iYXR1ZXZpby9jYWxjdWxhdG9yLXVpL3ZpdGUuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9ob21lL2JhdHVldmlvL2NhbGN1bGF0b3ItdWkvdml0ZS5jb25maWcudHNcIjtpbXBvcnQgeyBkZWZpbmVDb25maWcgfSBmcm9tICd2aXRlJztcbmltcG9ydCB2dWUgZnJvbSAnQHZpdGVqcy9wbHVnaW4tdnVlJztcbmltcG9ydCBwb3N0Y3NzUHJlc2V0RW52IGZyb20gJ3Bvc3Rjc3MtcHJlc2V0LWVudic7XG5pbXBvcnQgdnVldGlmeSBmcm9tICd2aXRlLXBsdWdpbi12dWV0aWZ5JztcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKHtcblx0cGx1Z2luczogW3Z1ZSgpLCB2dWV0aWZ5KCldLFxuXHRjc3M6IHtcblx0XHRwb3N0Y3NzOiB7XG5cdFx0XHRwbHVnaW5zOiBbXG5cdFx0XHRcdHBvc3Rjc3NQcmVzZXRFbnYoe1xuXHRcdFx0XHRcdGZlYXR1cmVzOiB7XG5cdFx0XHRcdFx0XHQnbmVzdGluZy1ydWxlcyc6IHRydWUsXG5cdFx0XHRcdFx0fSxcblx0XHRcdFx0fSksXG5cdFx0XHRdLFxuXHRcdH0sXG5cdH0sXG59KTtcbiJdLAogICJtYXBwaW5ncyI6ICI7QUFBc1EsU0FBUyxvQkFBb0I7QUFDblMsT0FBTyxTQUFTO0FBQ2hCLE9BQU8sc0JBQXNCO0FBQzdCLE9BQU8sYUFBYTtBQUVwQixJQUFPLHNCQUFRLGFBQWE7QUFBQSxFQUMzQixTQUFTLENBQUMsSUFBSSxHQUFHLFFBQVEsQ0FBQztBQUFBLEVBQzFCLEtBQUs7QUFBQSxJQUNKLFNBQVM7QUFBQSxNQUNSLFNBQVM7QUFBQSxRQUNSLGlCQUFpQjtBQUFBLFVBQ2hCLFVBQVU7QUFBQSxZQUNULGlCQUFpQjtBQUFBLFVBQ2xCO0FBQUEsUUFDRCxDQUFDO0FBQUEsTUFDRjtBQUFBLElBQ0Q7QUFBQSxFQUNEO0FBQ0QsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K diff --git a/vite.config.ts.timestamp-1723483646169-001a5be2d0f82.mjs b/vite.config.ts.timestamp-1723483646169-001a5be2d0f82.mjs deleted file mode 100644 index 93d7052..0000000 --- a/vite.config.ts.timestamp-1723483646169-001a5be2d0f82.mjs +++ /dev/null @@ -1,23 +0,0 @@ -// vite.config.ts -import { defineConfig } from "file:///home/batuevio/calculator-ui/node_modules/.pnpm/vite@5.3.4/node_modules/vite/dist/node/index.js"; -import vue from "file:///home/batuevio/calculator-ui/node_modules/.pnpm/@vitejs+plugin-vue@4.4.0_vite@5.3.4_vue@3.3.6_typescript@5.2.2_/node_modules/@vitejs/plugin-vue/dist/index.mjs"; -import postcssPresetEnv from "file:///home/batuevio/calculator-ui/node_modules/.pnpm/postcss-preset-env@9.2.0_postcss@8.4.31/node_modules/postcss-preset-env/dist/index.mjs"; -import vuetify from "file:///home/batuevio/calculator-ui/node_modules/.pnpm/vite-plugin-vuetify@1.0.2_vite@5.3.4_vue@3.3.6_typescript@5.2.2__vuetify@3.3.22/node_modules/vite-plugin-vuetify/dist/index.js"; -var vite_config_default = defineConfig({ - plugins: [vue(), vuetify()], - css: { - postcss: { - plugins: [ - postcssPresetEnv({ - features: { - "nesting-rules": true - } - }) - ] - } - } -}); -export { - vite_config_default as default -}; -//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvaG9tZS9iYXR1ZXZpby9jYWxjdWxhdG9yLXVpXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCIvaG9tZS9iYXR1ZXZpby9jYWxjdWxhdG9yLXVpL3ZpdGUuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9ob21lL2JhdHVldmlvL2NhbGN1bGF0b3ItdWkvdml0ZS5jb25maWcudHNcIjtpbXBvcnQgeyBkZWZpbmVDb25maWcgfSBmcm9tICd2aXRlJztcbmltcG9ydCB2dWUgZnJvbSAnQHZpdGVqcy9wbHVnaW4tdnVlJztcbmltcG9ydCBwb3N0Y3NzUHJlc2V0RW52IGZyb20gJ3Bvc3Rjc3MtcHJlc2V0LWVudic7XG5pbXBvcnQgdnVldGlmeSBmcm9tICd2aXRlLXBsdWdpbi12dWV0aWZ5JztcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKHtcblx0cGx1Z2luczogW3Z1ZSgpLCB2dWV0aWZ5KCldLFxuXHRjc3M6IHtcblx0XHRwb3N0Y3NzOiB7XG5cdFx0XHRwbHVnaW5zOiBbXG5cdFx0XHRcdHBvc3Rjc3NQcmVzZXRFbnYoe1xuXHRcdFx0XHRcdGZlYXR1cmVzOiB7XG5cdFx0XHRcdFx0XHQnbmVzdGluZy1ydWxlcyc6IHRydWUsXG5cdFx0XHRcdFx0fSxcblx0XHRcdFx0fSksXG5cdFx0XHRdLFxuXHRcdH0sXG5cdH0sXG59KTtcbiJdLAogICJtYXBwaW5ncyI6ICI7QUFBc1EsU0FBUyxvQkFBb0I7QUFDblMsT0FBTyxTQUFTO0FBQ2hCLE9BQU8sc0JBQXNCO0FBQzdCLE9BQU8sYUFBYTtBQUVwQixJQUFPLHNCQUFRLGFBQWE7QUFBQSxFQUMzQixTQUFTLENBQUMsSUFBSSxHQUFHLFFBQVEsQ0FBQztBQUFBLEVBQzFCLEtBQUs7QUFBQSxJQUNKLFNBQVM7QUFBQSxNQUNSLFNBQVM7QUFBQSxRQUNSLGlCQUFpQjtBQUFBLFVBQ2hCLFVBQVU7QUFBQSxZQUNULGlCQUFpQjtBQUFBLFVBQ2xCO0FBQUEsUUFDRCxDQUFDO0FBQUEsTUFDRjtBQUFBLElBQ0Q7QUFBQSxFQUNEO0FBQ0QsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K