Merge branch 'feat/format-transformer-download' into chore/all-my-stuffs

# Conflicts:
#	package.json
#	pnpm-lock.yaml
#	src/components/TextareaCopyable.vue
This commit is contained in:
ShareVB committed 2024-11-03 20:31:07 +01:00
commit 2e30edf3c3
14 files changed
+35 -12

No files matched your search

-1
View File
@@ -99,7 +99,6 @@
"js-base64": "^3.7.7",
"jsbarcode": "^3.11.6",
"iconv-lite": "^0.6.3",
"js-base64": "^3.7.6",
"js-base64": "^3.7.7",
"json5": "^2.2.3",
"jwt-decode": "^3.1.2",
+2 -1
View File
@@ -3466,7 +3466,7 @@ packages:
/@types/lodash-es@4.17.10:
resolution: {integrity: sha512-YJP+w/2khSBwbUSFdGsSqmDvmnN3cCKoPOL7Zjle6s30ZtemkkqhjVfFqGwPN7ASil5VyjE2GtyU/yqYY6mC0A==}
dependencies:
'@types/lodash': 4.14.192
'@types/lodash': 4.14.200
dev: false
/@types/lodash.defaultsdeep@4.6.9:
@@ -3489,6 +3489,7 @@ packages:
/@types/lodash@4.14.192:
resolution: {integrity: sha512-km+Vyn3BYm5ytMO13k9KTp27O75rbQ0NFw+U//g+PX7VZyjCioXaRFisqSIJRECljcTv73G3i6BpglNGHgUQ5A==}
dev: true
/@types/lodash@4.14.200:
resolution: {integrity: sha512-YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q==}
+23 -2
View File
@@ -1,7 +1,9 @@
<script setup lang="ts">
import _ from 'lodash';
import { Base64 } from 'js-base64';
import type { UseValidationRule } from '@/composable/validation';
import CInputText from '@/ui/c-input-text/c-input-text.vue';
import { useDownloadFileFromBase64 } from '@/composable/downloadBase64';
const props = withDefaults(
defineProps<{
@@ -12,6 +14,8 @@ const props = withDefaults(
inputDefault?: string
outputLabel?: string
outputLanguage?: string
downloadFileName?: string
downloadButtonText?: string
}>(),
{
transformer: _.identity,
@@ -21,16 +25,27 @@ const props = withDefaults(
inputPlaceholder: 'Input...',
outputLabel: 'Output',
outputLanguage: '',
downloadFileName: '',
downloadButtonText: 'Download',
},
);
const { transformer, inputValidationRules, inputLabel, outputLabel, outputLanguage, inputPlaceholder, inputDefault }
= toRefs(props);
const {
transformer, inputValidationRules, inputLabel, outputLabel, outputLanguage,
inputPlaceholder, inputDefault, downloadFileName, downloadButtonText,
} = toRefs(props);
const inputElement = ref<typeof CInputText>();
const input = ref(inputDefault.value);
const output = computed(() => transformer.value(input.value));
const outputBase64 = computed(() => Base64.encode(output.value));
const { download } = useDownloadFileFromBase64(
{
source: outputBase64,
filename: downloadFileName,
});
</script>
<template>
@@ -53,5 +68,11 @@ const output = computed(() => transformer.value(input.value));
{{ outputLabel }}
</div>
<textarea-copyable :value="output" :language="outputLanguage" :follow-height-of="inputElement?.inputWrapperRef" />
<div v-if="downloadFileName !== '' && output !== ''" mt-5 flex justify-center>
<c-button secondary @click="download">
{{ downloadButtonText }}
</c-button>
</div>
</div>
</template>
-8
View File
@@ -25,16 +25,8 @@ const props = withDefaults(
copyPlacement?: 'top-right' | 'bottom-right' | 'outside' | 'none'
copyMessage?: string
wordWrap?: boolean
<<<<<<< HEAD
<<<<<<< HEAD
downloadFileName?: string
downloadButtonText?: string
=======
>>>>>>> feat/cert-key-parser
=======
downloadFileName?: string
downloadButtonText?: string
>>>>>>> feat/email-parser
}>(),
{
followHeightOf: null,
+1
View File
@@ -23,5 +23,6 @@ const rules: UseValidationRule<string>[] = [
output-language="json"
:input-validation-rules="rules"
:transformer="transformer"
download-file-name="output.json"
/>
</template>
+1
View File
@@ -28,5 +28,6 @@ const rules: UseValidationRule<string>[] = [
output-label="CSV version of your JSON"
:input-validation-rules="rules"
:transformer="transformer"
download-file-name="output.csv"
/>
</template>
+1
View File
@@ -24,5 +24,6 @@ const rules: UseValidationRule<string>[] = [
output-language="toml"
:input-validation-rules="rules"
:transformer="transformer"
download-file-name="output.toml"
/>
</template>
@@ -23,5 +23,6 @@ const rules: UseValidationRule<string>[] = [
output-language="yaml"
:input-validation-rules="rules"
:transformer="transformer"
download-file-name="output.yaml"
/>
</template>
@@ -119,5 +119,6 @@ function transformer(value: string) {
input-placeholder="Paste your input data here..."
output-label="Your transformed data"
:transformer="transformer"
download-file-name="output.txt"
/>
</template>
+1
View File
@@ -22,5 +22,6 @@ const rules: UseValidationRule<string>[] = [
output-language="json"
:input-validation-rules="rules"
:transformer="transformer"
download-file-name="output.json"
/>
</template>
+1
View File
@@ -23,5 +23,6 @@ const rules: UseValidationRule<string>[] = [
output-language="yaml"
:input-validation-rules="rules"
:transformer="transformer"
download-file-name="output.yaml"
/>
</template>
@@ -42,5 +42,6 @@ const rules: UseValidationRule<string>[] = [
:input-validation-rules="rules"
:transformer="transformer"
:input-default="defaultValue"
download-file-name="output.xml"
/>
</template>
@@ -27,5 +27,6 @@ const rules: UseValidationRule<string>[] = [
output-language="json"
:input-validation-rules="rules"
:transformer="transformer"
download-file-name="output.json"
/>
</template>
+1
View File
@@ -24,5 +24,6 @@ const rules: UseValidationRule<string>[] = [
output-language="toml"
:input-validation-rules="rules"
:transformer="transformer"
download-file-name="output.toml"
/>
</template>