Skip to content

Commit b3aff65

Browse files
committed
Merge branch 'feat/cert-key-parser' into chore/all-my-stuffs
# Conflicts: # package.json # pnpm-lock.yaml # src/components/TextareaCopyable.vue
2 parents 7a140fc + d0582b3 commit b3aff65

11 files changed

+836
-76
lines changed

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"iarna-toml-esm": "^3.0.5",
7676
"ibantools": "^4.3.3",
7777
"js-base64": "^3.7.7",
78-
"jsbarcode": "^3.11.6",
78+
"jsbarcode": "^3.11.7",
7979
"json5": "^2.2.3",
8080
"jwt-decode": "^3.1.2",
8181
"libphonenumber-js": "^1.10.28",
@@ -88,13 +88,15 @@
8888
"naive-ui": "^2.35.0",
8989
"netmask": "^2.0.2",
9090
"node-forge": "^1.3.1",
91+
"openpgp": "^5.11.1",
9192
"oui-data": "^1.0.10",
9293
"pdf-signature-reader": "^1.4.2",
9394
"pinia": "^2.0.34",
9495
"plausible-tracker": "^0.3.8",
9596
"qrcode": "^1.5.1",
9697
"randexp": "^0.5.3",
9798
"sql-formatter": "^13.0.0",
99+
"sshpk": "^1.18.0",
98100
"ua-parser-js": "^1.0.35",
99101
"ulid": "^2.3.0",
100102
"unicode-emoji-json": "^0.4.0",
@@ -127,6 +129,7 @@
127129
"@types/node": "^18.15.11",
128130
"@types/node-forge": "^1.3.2",
129131
"@types/qrcode": "^1.5.0",
132+
"@types/sshpk": "^1.17.4",
130133
"@types/ua-parser-js": "^0.7.36",
131134
"@types/uuid": "^9.0.0",
132135
"@unocss/eslint-config": "^0.57.0",
@@ -148,6 +151,7 @@
148151
"unplugin-icons": "^0.17.0",
149152
"unplugin-vue-components": "^0.25.0",
150153
"vite": "^4.4.9",
154+
"vite-plugin-node-polyfills": "^0.21.0",
151155
"vite-plugin-pwa": "^0.16.0",
152156
"vite-plugin-vue-markdown": "^0.23.5",
153157
"vite-svg-loader": "^4.0.0",

pnpm-lock.yaml

Lines changed: 4 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/InputCopyable.vue

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
import { useVModel } from '@vueuse/core';
33
import { useCopy } from '@/composable/copy';
44
5-
const props = defineProps<{ value: string }>();
5+
const props = defineProps<{
6+
value: string
7+
multiline?: boolean
8+
rows?: number | string
9+
autosize?: boolean
10+
}>();
611
const emit = defineEmits(['update:value']);
712
813
const value = useVModel(props, 'value', emit);
@@ -11,7 +16,12 @@ const tooltipText = computed(() => isJustCopied.value ? 'Copied!' : 'Copy to cli
1116
</script>
1217

1318
<template>
14-
<c-input-text v-model:value="value">
19+
<c-input-text
20+
v-model:value="value"
21+
:multiline="multiline"
22+
:rows="rows"
23+
:autosize="autosize"
24+
>
1525
<template #suffix>
1626
<c-tooltip :tooltip="tooltipText">
1727
<c-button circle variant="text" size="small" @click="copy()">

src/components/TextareaCopyable.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@ const props = withDefaults(
2525
copyPlacement?: 'top-right' | 'bottom-right' | 'outside' | 'none'
2626
copyMessage?: string
2727
wordWrap?: boolean
28+
<<<<<<< HEAD
2829
downloadFileName?: string
2930
downloadButtonText?: string
31+
=======
32+
>>>>>>> feat/cert-key-parser
3033
}>(),
3134
{
3235
followHeightOf: null,

0 commit comments

Comments
 (0)